Merge pull request #4644 from oleibman/phpstan2123

oleibman · web-flow · commit 9b28b9e9c103 · 2025-09-12T03:08:23.000Z
Upgrade Phpstan
diff --git a/composer.lock b/composer.lock
diff --git a/infra/LocaleGenerator.php b/infra/LocaleGenerator.php
@@ -327,7 +327,7 @@ protected function mapErrorCodeRows(): void
             foreach ($cells as $cell) {
                 if ($cell->getValue() != '') {
                     $this->log($cell->getRow() . ' -> ' . $cell->getValueString());
-                    $this->errorCodeMap[$cell->getValue()] = $cell->getRow();
+                    $this->errorCodeMap[$cell->getValueString()] = $cell->getRow();
                 }
             }
         }
@@ -345,7 +345,7 @@ protected function mapFunctionNameRows(): void
                 if ($this->isFunctionCategoryEntry($cell)) {
                     if (!empty($cell->getValue())) {
                         $this->log('CATEGORY: ' . $cell->getValueString());
-                        $this->functionNameMap[$cell->getValue()] = $cell->getRow();
+                        $this->functionNameMap[$cell->getValueString()] = $cell->getRow();
                     }
 
                     continue;
@@ -356,7 +356,7 @@ protected function mapFunctionNameRows(): void
                         $this->functionNameMap[($cell->getValue() ? 'TRUE' : 'FALSE')] = $cell->getRow();
                     } else {
                         $this->log($cell->getRow() . ' -> ' . $cell->getValueString());
-                        $this->functionNameMap[$cell->getValue()] = $cell->getRow();
+                        $this->functionNameMap[$cell->getValueString()] = $cell->getRow();
                     }
                 }
             }
diff --git a/samples/Wizards/NumberFormat/Currency.php b/samples/Wizards/NumberFormat/Currency.php
@@ -104,7 +104,7 @@
         $helper->log('Unrecognized currency symbol');
     } else {
         try {
-            $negative = $negatives[$_POST['negative']] ?? CurrencyNegative::minus;
+            $negative = $negatives[$_POST['negative']] ?? CurrencyNegative::minus; //* @phpstan-ignore-line
             $wizard = new Wizard\Currency($_POST['currency'], (int) $_POST['decimals'], isset($_POST['thousands']), (bool) $_POST['position']);
             $wizard->setNegative($negative);
             $mask = $wizard->format();
@@ -118,7 +118,7 @@
                 . ', Wizard\Currency::' . (((bool) $_POST['position']) ? 'LEADING_SYMBOL' : 'TRAILING_SYMBOL')
                 . ');'
             );
-            $helper->log('$wizard->setNegative(' . $negativesString[$_POST['negative']] . ');');
+            $helper->log('$wizard->setNegative(' . $negativesString[$_POST['negative']] . ');'); //* @phpstan-ignore-line
             $helper->log('$mask = $wizard->format();');
             $helper->log('<br />echo (string) $mask;');
             $helper->log('<hr /><b>Mask:</b><br />');
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -1699,7 +1699,7 @@ private function processTokenStack(false|array $tokens, ?string $cellID = null,
                         return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
                     }
                 }
-            } elseif (!is_numeric($token) && !is_object($token) && isset($token, self::BINARY_OPERATORS[$token])) {
+            } elseif (!is_numeric($token) && !is_object($token) && isset($token, self::BINARY_OPERATORS[$token])) { //* @phpstan-ignore-line
                 // if the token is a binary operator, pop the top two values off the stack, do the operation, and push the result back on the stack
                 //    We must have two operands, error if we don't
                 $operand2Data = $stack->pop();
@@ -2879,6 +2879,7 @@ private static function swapOperands(Stack $stack, string $opCharacter): bool
         if ($stack->count() > 0) {
             $o2 = $stack->last();
             if ($o2) {
+                /** @var array{value: string} $o2 */
                 if (isset(self::CALCULATION_OPERATORS[$o2['value']])) {
                     $retVal = (self::OPERATOR_PRECEDENCE[$opCharacter] ?? 0) <= self::OPERATOR_PRECEDENCE[$o2['value']];
                 }
diff --git a/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php b/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php
@@ -102,7 +102,7 @@ private static function evaluateVectorMatrixPair(callable $method, array $matrix
     }
 
     /**
-     * @param mixed[] $matrixIndexes
+     * @param array<int|string> $matrixIndexes
      *
      * @return mixed[]
      */
diff --git a/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php b/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php
@@ -21,8 +21,10 @@ public function count(): int
 
     /**
      * Push a new entry onto the stack.
+     *
+     * @param int|string $value The value to test
      */
-    public function push(mixed $value): void
+    public function push($value): void
     {
         $this->stack[$value] = $value;
     }
@@ -38,9 +40,9 @@ public function pop(): mixed
     /**
      * Test to see if a specified entry exists on the stack.
      *
-     * @param mixed $value The value to test
+     * @param int|string $value The value to test
      */
-    public function onStack(mixed $value): bool
+    public function onStack($value): bool
     {
         return isset($this->stack[$value]);
     }
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php b/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php
@@ -135,14 +135,14 @@ public static function index(mixed $matrix, mixed $rowNum = 0, mixed $columnNum
             return self::extractRowValue($matrix, $rowKeys, $rowNum);
         }
 
-        $columnNum = $columnKeys[--$columnNum];
+        $columnNum = $columnKeys[--$columnNum]; //* @phpstan-ignore-line
         if ($rowNum === 0) {
             return array_map(
                 fn ($value): array => [$value],
                 array_column($matrix, $columnNum)
             );
         }
-        $rowNum = $rowKeys[--$rowNum];
+        $rowNum = $rowKeys[--$rowNum]; //* @phpstan-ignore-line
         /** @var mixed[][] $matrix */
 
         return $matrix[$rowNum][$columnNum];
@@ -159,7 +159,7 @@ private static function extractRowValue(array $matrix, array $rowKeys, int $rowN
         }
 
         $rowNum = $rowKeys[--$rowNum];
-        $row = $matrix[$rowNum];
+        $row = $matrix[$rowNum]; //* @phpstan-ignore-line
         if (is_array($row)) {
             return [$rowNum => $row];
         }
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php b/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php
@@ -335,6 +335,7 @@ private static function sortLookupArrayFromVector(array $sortArray, array $sortV
         // Building a new array in the correct (sorted) order works; but may be memory heavy for larger arrays
         $sortedArray = [];
         foreach ($sortVector as $index) {
+            /** @var int|string $index */
             $sortedArray[] = $sortArray[$index];
         }
 
diff --git a/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php b/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php
@@ -23,7 +23,7 @@ class Arabic
     /**
      * Recursively calculate the arabic value of a roman numeral.
      *
-     * @param mixed[] $roman
+     * @param string[] $roman
      */
     private static function calculateArabic(array $roman, int &$sum = 0, int $subtract = 0): int
     {
diff --git a/src/PhpSpreadsheet/Calculation/Statistical/Averages.php b/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
@@ -163,7 +163,7 @@ public static function median(mixed ...$args): float|string
             sort($aArgs, SORT_NUMERIC);
             $valueCount = $valueCount / 2;
             if ($valueCount == floor($valueCount)) {
-                $returnValue = ($aArgs[$valueCount--] + $aArgs[$valueCount]) / 2;
+                $returnValue = ($aArgs[$valueCount--] + $aArgs[$valueCount]) / 2; //* @phpstan-ignore-line
             } else {
                 $valueCount = (int) floor($valueCount);
                 $returnValue = $aArgs[$valueCount];
@@ -243,7 +243,7 @@ private static function modeCalc(array $data): float|string
                         $maxfreqkey = $key;
                         $maxfreqdatum = $datum;
                     } elseif ($freq == $maxfreq) {
-                        if ($frequencyArray[$key]['index'] < $frequencyArray[$maxfreqkey]['index']) {
+                        if ($frequencyArray[$key]['index'] < $frequencyArray[$maxfreqkey]['index']) { //* @phpstan-ignore-line
                             $maxfreqkey = $key;
                             $maxfreqdatum = $datum;
                         }
diff --git a/src/PhpSpreadsheet/Chart/DataSeriesValues.php b/src/PhpSpreadsheet/Chart/DataSeriesValues.php
@@ -333,16 +333,12 @@ public function setFillColor($color): static
      * Method for validating hex color.
      *
      * @param string $color value for color
-     *
-     * @return bool true if validation was successful
      */
-    private function validateColor(string $color): bool
+    private function validateColor(string $color): void
     {
         if (!preg_match('/^[a-f0-9]{6}$/i', $color)) {
             throw new Exception(sprintf('Invalid hex color for chart series (color: "%s")', $color));
         }
-
-        return true;
     }
 
     /**
diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
@@ -140,7 +140,7 @@ class Xls extends XlsBase
     /**
      * REF structures. Only applies to BIFF8.
      *
-     * @var mixed[][]
+     * @var array<int, array{'externalBookIndex': int, 'firstSheetIndex': int, 'lastSheetIndex': int}>
      */
     protected array $ref;
 
@@ -2022,8 +2022,8 @@ protected function readSst(): void
 
                     // repeated option flags
                     // OpenOffice.org documentation 5.21
-                    $option = ord($recordData[$pos]);
                     /** @var int $pos */
+                    $option = ord($recordData[$pos]);
                     ++$pos;
 
                     /** @var int $limitpos */
diff --git a/src/PhpSpreadsheet/Reader/Xls/LoadSpreadsheet.php b/src/PhpSpreadsheet/Reader/Xls/LoadSpreadsheet.php
@@ -549,6 +549,7 @@ protected function loadSpreadsheetFromFile2(string $filename, Xls $xls): Spreads
                 foreach ($xls->sharedFormulaParts as $cell => $baseCell) {
                     /** @var int $row */
                     [$column, $row] = Coordinate::coordinateFromString($cell);
+                    /** @var string $baseCell */
                     if ($xls->getReadFilter()->readCell($column, $row, $xls->phpSheet->getTitle())) {
                         /** @var string */
                         $temp = $xls->sharedFormulas[$baseCell];
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -1079,7 +1079,8 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                             $childNode = $node->addChild('formula1');
                                             if ($childNode !== null) { // null should never happen
                                                 // see https://github.com/phpstan/phpstan/issues/8236
-                                                $childNode[0] = (string) $item->formula1->children(Namespaces::DATA_VALIDATIONS2)->f; // @phpstan-ignore-line
+                                                // resolved with Phpstan 2.1.23
+                                                $childNode[0] = (string) $item->formula1->children(Namespaces::DATA_VALIDATIONS2)->f;
                                             }
                                         }
                                     }
diff --git a/src/PhpSpreadsheet/Reader/Xml/Style/Border.php b/src/PhpSpreadsheet/Reader/Xml/Style/Border.php
@@ -85,6 +85,7 @@ public function parseStyle(SimpleXMLElement $styleData, array $namespaces): arra
                 }
             }
 
+            /** @var int|string $borderPosition */
             if ($borderPosition) {
                 $style['borders'][$borderPosition] = $thisBorder;
             } elseif ($diagonalDirection) {
@@ -99,6 +100,7 @@ public function parseStyle(SimpleXMLElement $styleData, array $namespaces): arra
     /** @return mixed[] */
     protected function parsePosition(string $borderStyleValue, string $diagonalDirection): array
     {
+        // TODO diagonalDirection seems to return int not string
         $borderStyleValue = strtolower($borderStyleValue);
 
         if (in_array($borderStyleValue, self::BORDER_POSITIONS)) {
diff --git a/src/PhpSpreadsheet/Reader/Xml/Style/NumberFormat.php b/src/PhpSpreadsheet/Reader/Xml/Style/NumberFormat.php
@@ -15,7 +15,7 @@ public function parseStyle(SimpleXMLElement $styleAttributes): array
         $toFormats = ['-', ' '];
 
         foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-            $styleAttributeValue = str_replace($fromFormats, $toFormats, $styleAttributeValue);
+            $styleAttributeValue = str_replace($fromFormats, $toFormats, (string) $styleAttributeValue);
 
             switch ($styleAttributeValue) {
                 case 'Short Date':
diff --git a/src/PhpSpreadsheet/Style/Style.php b/src/PhpSpreadsheet/Style/Style.php
@@ -400,6 +400,7 @@ public function applyFromArray(array $styleArray, bool $advancedBorders = true):
                     }
 
                     // Find existing style by hash.
+                    /** @var string $styleHash */
                     $existingStyle = self::$cachedStyles['styleByHash'][$styleHash] ?? null;
 
                     if (!$existingStyle) {
diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php b/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
@@ -274,7 +274,8 @@ public function setValue($value): static
                 throw new PhpSpreadsheetException('Invalid rule value for column AutoFilter Rule.');
             }
             //    Set the dateTime grouping that we've anticipated
-            $this->setGrouping(self::DATE_TIME_GROUPS[$grouping]);
+            //    I have no idea what Phpstan is complaining about below
+            $this->setGrouping(self::DATE_TIME_GROUPS[$grouping]); // @phpstan-ignore-line
         }
         $this->value = $value;
 
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -3005,6 +3005,7 @@ public function rangeToArray(
 
         // Loop through rows
         foreach ($this->rangeToArrayYieldRows($range, $nullValue, $calculateFormulas, $formatData, $returnCellRef, $ignoreHidden, $reduceArrays) as $rowRef => $rowArray) {
+            /** @var int $rowRef */
             $returnValue[$rowRef] = $rowArray;
         }
 
@@ -3040,6 +3041,7 @@ public function rangesToArray(
         foreach ($parts as $part) {
             // Loop through rows
             foreach ($this->rangeToArrayYieldRows($part, $nullValue, $calculateFormulas, $formatData, $returnCellRef, $ignoreHidden, $reduceArrays) as $rowRef => $rowArray) {
+                /** @var int $rowRef */
                 $returnValue[$rowRef] = $rowArray;
             }
         }
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
@@ -2093,6 +2093,7 @@ private function calculateSpansOmitRows(Worksheet $sheet, int $sheetIndex, array
         // For each of the omitted rows we found above, the affected rowspans should be subtracted by 1
         if (isset($this->isSpannedRow[$sheetIndex])) {
             foreach ($this->isSpannedRow[$sheetIndex] as $rowIndex) {
+                /** @var int $rowIndex */
                 $adjustedBaseCells = [];
                 $c = -1;
                 $e = $countColumns - 1;
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php b/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
@@ -35,6 +35,7 @@ public function createStringTable(ActualWorksheet $worksheet, ?array $existingTa
         foreach ($worksheet->getCellCollection()->getCoordinates() as $coordinate) {
             /** @var Cell $cell */
             $cell = $worksheet->getCellCollection()->get($coordinate);
+            /** @var null|int|RichText|string */
             $cellValue = $cell->getValue();
             if (
                 !is_object($cellValue)
diff --git a/tests/PhpSpreadsheetTests/Issue1449Test.php b/tests/PhpSpreadsheetTests/Issue1449Test.php
@@ -7,8 +7,7 @@
 
 class Issue1449Test extends TestCase
 {
-    /** @var bool */
-    private $skipTests = true;
+    protected bool $skipTests = true;
 
     public function testDeleteColumns(): void
     {
diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericStylesTest.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericStylesTest.php
@@ -33,7 +33,6 @@ public function testBorderStyleCoverage(): void
         foreach ($expected as $key => $val) {
             $covered[$key] = 0;
         }
-        /** @var mixed[][] */
         $tests = $this->providerBorderStyle();
         foreach ($tests as $test) {
             $covered[$test[0]] = 1;
@@ -88,7 +87,6 @@ public function testHorizontalCoverage(): void
         foreach ($expected as $key => $val) {
             $covered[$key] = 0;
         }
-        /** @var mixed[][] */
         $tests = $this->providerHorizontal();
         foreach ($tests as $test) {
             $covered[$test[0]] = 1;
@@ -117,7 +115,6 @@ public function testUnderlineCoverage(): void
         foreach ($expected as $key => $val) {
             $covered[$key] = 0;
         }
-        /** @var mixed[][] */
         $tests = $this->providerUnderline();
         foreach ($tests as $test) {
             $covered[$test[0]] = 1;
@@ -185,6 +182,7 @@ public function testDataTypeCoverage(): void
         }
     }
 
+    /** @return array<int, array{0: string, 1:string}> */
     public static function providerBorderStyle(): array
     {
         return [
@@ -205,7 +203,7 @@ public static function providerBorderStyle(): array
         ];
     }
 
-    /** @return string[][] */
+    /** @return array<int, array{0: string, 1:string}> */
     public static function providerFillType(): array
     {
         return [
@@ -230,6 +228,7 @@ public static function providerFillType(): array
         ];
     }
 
+    /** @return array<int, array{0: string, 1:string}> */
     public static function providerHorizontal(): array
     {
         return [
@@ -243,6 +242,7 @@ public static function providerHorizontal(): array
         ];
     }
 
+    /** @return array<int, array{0: string, 1:string}> */
     public static function providerUnderline(): array
     {
         return [

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ protected function mapErrorCodeRows(): void`
`327`	`327`	`foreach ($cells as $cell) {`
`328`	`328`	`if ($cell->getValue() != '') {`
`329`	`329`	`$this->log($cell->getRow() . ' -> ' . $cell->getValueString());`
`330`		`- $this->errorCodeMap[$cell->getValue()] = $cell->getRow();`
	`330`	`+ $this->errorCodeMap[$cell->getValueString()] = $cell->getRow();`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`	`}`
`@@ -345,7 +345,7 @@ protected function mapFunctionNameRows(): void`
`345`	`345`	`if ($this->isFunctionCategoryEntry($cell)) {`
`346`	`346`	`if (!empty($cell->getValue())) {`
`347`	`347`	`$this->log('CATEGORY: ' . $cell->getValueString());`
`348`		`- $this->functionNameMap[$cell->getValue()] = $cell->getRow();`
	`348`	`+ $this->functionNameMap[$cell->getValueString()] = $cell->getRow();`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`continue;`
`@@ -356,7 +356,7 @@ protected function mapFunctionNameRows(): void`
`356`	`356`	`$this->functionNameMap[($cell->getValue() ? 'TRUE' : 'FALSE')] = $cell->getRow();`
`357`	`357`	`} else {`
`358`	`358`	`$this->log($cell->getRow() . ' -> ' . $cell->getValueString());`
`359`		`- $this->functionNameMap[$cell->getValue()] = $cell->getRow();`
	`359`	`+ $this->functionNameMap[$cell->getValueString()] = $cell->getRow();`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1699,7 +1699,7 @@ private function processTokenStack(false\|array $tokens, ?string $cellID = null,`
`1699`	`1699`	`return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);`
`1700`	`1700`	`}`
`1701`	`1701`	`}`
`1702`		`- } elseif (!is_numeric($token) && !is_object($token) && isset($token, self::BINARY_OPERATORS[$token])) {`
	`1702`	`+ } elseif (!is_numeric($token) && !is_object($token) && isset($token, self::BINARY_OPERATORS[$token])) { //* @phpstan-ignore-line`
`1703`	`1703`	`// if the token is a binary operator, pop the top two values off the stack, do the operation, and push the result back on the stack`
`1704`	`1704`	`// We must have two operands, error if we don't`
`1705`	`1705`	`$operand2Data = $stack->pop();`
`@@ -2879,6 +2879,7 @@ private static function swapOperands(Stack $stack, string $opCharacter): bool`
`2879`	`2879`	`if ($stack->count() > 0) {`
`2880`	`2880`	`$o2 = $stack->last();`
`2881`	`2881`	`if ($o2) {`
	`2882`	`+ /** @var array{value: string} $o2 */`
`2882`	`2883`	`if (isset(self::CALCULATION_OPERATORS[$o2['value']])) {`
`2883`	`2884`	`$retVal = (self::OPERATOR_PRECEDENCE[$opCharacter] ?? 0) <= self::OPERATOR_PRECEDENCE[$o2['value']];`
`2884`	`2885`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private static function evaluateVectorMatrixPair(callable $method, array $matrix`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`
`105`		`- * @param mixed[] $matrixIndexes`
	`105`	`+ * @param array<int\|string> $matrixIndexes`
`106`	`106`	`*`
`107`	`107`	`* @return mixed[]`
`108`	`108`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,10 @@ public function count(): int`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* Push a new entry onto the stack.`
	`24`	`+ *`
	`25`	`+ * @param int\|string $value The value to test`
`24`	`26`	`*/`
`25`		`- public function push(mixed $value): void`
	`27`	`+ public function push($value): void`
`26`	`28`	`{`
`27`	`29`	`$this->stack[$value] = $value;`
`28`	`30`	`}`
`@@ -38,9 +40,9 @@ public function pop(): mixed`
`38`	`40`	`/**`
`39`	`41`	`* Test to see if a specified entry exists on the stack.`
`40`	`42`	`*`
`41`		`- * @param mixed $value The value to test`
	`43`	`+ * @param int\|string $value The value to test`
`42`	`44`	`*/`
`43`		`- public function onStack(mixed $value): bool`
	`45`	`+ public function onStack($value): bool`
`44`	`46`	`{`
`45`	`47`	`return isset($this->stack[$value]);`
`46`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,14 +135,14 @@ public static function index(mixed $matrix, mixed $rowNum = 0, mixed $columnNum`
`135`	`135`	`return self::extractRowValue($matrix, $rowKeys, $rowNum);`
`136`	`136`	`}`
`137`	`137`
`138`		`- $columnNum = $columnKeys[--$columnNum];`
	`138`	`+ $columnNum = $columnKeys[--$columnNum]; //* @phpstan-ignore-line`
`139`	`139`	`if ($rowNum === 0) {`
`140`	`140`	`return array_map(`
`141`	`141`	`fn ($value): array => [$value],`
`142`	`142`	`array_column($matrix, $columnNum)`
`143`	`143`	`);`
`144`	`144`	`}`
`145`		`- $rowNum = $rowKeys[--$rowNum];`
	`145`	`+ $rowNum = $rowKeys[--$rowNum]; //* @phpstan-ignore-line`
`146`	`146`	`/** @var mixed[][] $matrix */`
`147`	`147`
`148`	`148`	`return $matrix[$rowNum][$columnNum];`
`@@ -159,7 +159,7 @@ private static function extractRowValue(array $matrix, array $rowKeys, int $rowN`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`$rowNum = $rowKeys[--$rowNum];`
`162`		`- $row = $matrix[$rowNum];`
	`162`	`+ $row = $matrix[$rowNum]; //* @phpstan-ignore-line`
`163`	`163`	`if (is_array($row)) {`
`164`	`164`	`return [$rowNum => $row];`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,7 @@ private static function sortLookupArrayFromVector(array $sortArray, array $sortV`
`335`	`335`	`// Building a new array in the correct (sorted) order works; but may be memory heavy for larger arrays`
`336`	`336`	`$sortedArray = [];`
`337`	`337`	`foreach ($sortVector as $index) {`
	`338`	`+ /** @var int\|string $index */`
`338`	`339`	`$sortedArray[] = $sortArray[$index];`
`339`	`340`	`}`
`340`	`341`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class Arabic`
`23`	`23`	`/**`
`24`	`24`	`* Recursively calculate the arabic value of a roman numeral.`
`25`	`25`	`*`
`26`		`- * @param mixed[] $roman`
	`26`	`+ * @param string[] $roman`
`27`	`27`	`*/`
`28`	`28`	`private static function calculateArabic(array $roman, int &$sum = 0, int $subtract = 0): int`
`29`	`29`	`{`