Merge pull request #4359 from oleibman/stanbleed01

Phpstan Bleeding Edge Part 1 of Many
PHPOffice · Feb 15, 2025 · 9978d06 · 9978d06
2 parents cf58236 + d9f4912
commit 9978d06
Show file tree

Hide file tree

Showing 12 changed files with 973 additions and 131 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Changed
 
-- Nothing yet.
+- Start migration to Phpstan 2. [PR #4359](https://github.com/PHPOffice/PhpSpreadsheet/pull/4359)
 
 ### Moved
 
@@ -29,7 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- Nothing yet.
+- Refactor Helper/Html. [PR #4359](https://github.com/PHPOffice/PhpSpreadsheet/pull/4359)
 
 ## 2025-02-08 - 4.0.0
 

diff --git a/infra/LocaleGenerator.php b/infra/LocaleGenerator.php
@@ -6,8 +6,6 @@
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Worksheet\Column;
-use PhpOffice\PhpSpreadsheet\Worksheet\Row;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class LocaleGenerator
@@ -280,11 +278,9 @@ protected function mapLanguageColumns(Worksheet $translationWorksheet): array
 
         $languageNameMap = [];
         foreach ($languagesList as $languageColumn) {
-            /** @var Column $languageColumn */
             $cells = $languageColumn->getCellIterator(self::LOCALE_NAME_ROW, self::LOCALE_NAME_ROW);
             $cells->setIterateOnlyExistingCells(true);
             foreach ($cells as $cell) {
-                /** @var Cell $cell */
                 if ($this->localeCanBeSupported($translationWorksheet, $cell)) {
                     $languageNameMap[$cell->getColumn()] = $cell->getValue();
                     $this->log($cell->getColumn() . ' -> ' . $cell->getValue());
@@ -316,11 +312,9 @@ protected function mapErrorCodeRows(): void
         $errorList = $this->localeTranslations->getRowIterator(self::ERROR_CODES_FIRST_ROW);
 
         foreach ($errorList as $errorRow) {
-            /** @var Row $errorList */
             $cells = $errorRow->getCellIterator(self::ENGLISH_REFERENCE_COLUMN, self::ENGLISH_REFERENCE_COLUMN);
             $cells->setIterateOnlyExistingCells(true);
             foreach ($cells as $cell) {
-                /** @var Cell $cell */
                 if ($cell->getValue() != '') {
                     $this->log($cell->getRow() . ' -> ' . $cell->getValue());
                     $this->errorCodeMap[$cell->getValue()] = $cell->getRow();
@@ -335,11 +329,9 @@ protected function mapFunctionNameRows(): void
         $functionList = $this->functionNameTranslations->getRowIterator(self::FUNCTION_NAME_LIST_FIRST_ROW);
 
         foreach ($functionList as $functionRow) {
-            /** @var Row $functionRow */
             $cells = $functionRow->getCellIterator(self::ENGLISH_REFERENCE_COLUMN, self::ENGLISH_REFERENCE_COLUMN);
             $cells->setIterateOnlyExistingCells(true);
             foreach ($cells as $cell) {
-                /** @var Cell $cell */
                 if ($this->isFunctionCategoryEntry($cell)) {
                     if (!empty($cell->getValue())) {
                         $this->log('CATEGORY: ' . $cell->getValue());
@@ -348,7 +340,7 @@ protected function mapFunctionNameRows(): void
 
                     continue;
                 }
-                if ($cell->getValue() !== '') {
+                if ($cell->getValue() !== '' && $cell->getValue() !== null) {
                     if (is_bool($cell->getValue())) {
                         $this->log($cell->getRow() . ' -> ' . ($cell->getValue() ? 'TRUE' : 'FALSE'));
                         $this->functionNameMap[($cell->getValue() ? 'TRUE' : 'FALSE')] = $cell->getRow();