Phpstan Bleeding Edge Part 1 of Many

We currently use Phpstan Release 1. Release 2 has been available for some time, and we would like to stay current if possible. In order to get to Release 2, we first have to pass the "bleeding edge" tests for Release 1. I will do this by generating a new baseline using bleeding edge, then fix the baseline errors over several different PR's. This is the first of those.

Author: oleibman

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();