Merge pull request #4872 from oleibman/upgrades

Combine Dependabot Changes

Author: oleibman

composer.lock

@@ -86,7 +86,7 @@
     $toUnit = $post['toUnit'];
     if (!is_numeric($quantity)) {
         $helper->log('Quantity is not numeric');
-    } elseif (isset($units[$post['category']][$fromUnit], $units[$post['category']][$toUnit])) {
+    } elseif (isset($post['category'], $units[$post['category']][$fromUnit], $units[$post['category']][$toUnit])) {
         /** @var float|string */
         $result = ConvertUOM::CONVERT($quantity, $fromUnit, $toUnit);
 

samples/Engineering/Convert-Online.php

@@ -192,7 +192,8 @@ public static function compareKeys(): bool
         $retVal = true;
         $array = array_merge(array_keys(self::SINGLE_OPERATORS), array_keys(self::RANGE_OPERATORS));
         foreach ($array as $value) {
-            $retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true);
+            // PhpStan is correct about next statement, but we want to test anyhow
+            $retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true); // @phpstan-ignore-line
         }
 
         return $retVal;

src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php

@@ -169,7 +169,8 @@ public static function compareKeys(): bool
         $retVal = true;
         $array = array_keys(self::OPERATORS);
         foreach ($array as $value) {
-            $retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true);
+            // PhpStan is correct about next statement, but we want to test anyhow
+            $retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true); // @phpstan-ignore-line
         }
 
         return $retVal;

src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php

@@ -796,7 +796,8 @@ public function calculateColumnWidths(): static
             $this->activePane = $holdActivePane;
         }
         if ($activeSheet !== null && $activeSheet >= 0) {
-            $this->getParent()?->setActiveSheetIndex($activeSheet);
+            // Not sure what PhpStan doesn't like about next stmt
+            $this->getParent()?->setActiveSheetIndex($activeSheet); // @phpstan-ignore-line
         }
         $this->setSelectedCells($selectedCells);
 

src/PhpSpreadsheet/Worksheet/Worksheet.php

@@ -154,8 +154,7 @@ public function testCloneSheetWithTrendLines(): void
         self::assertCount(1, $oldLabels);
         self::assertCount(3, $oldLabels[0]->getTrendLines());
 
-        $plotGroup = $chart->getPlotArea()?->getPlotGroup();
-        self::assertNotNull($plotGroup);
+        $plotGroup = $chart->getPlotArea()->getPlotGroup();
         self::assertCount(1, $plotGroup);
         $plotLabels = $plotGroup[0]->getPlotLabels();
         self::assertCount(1, $plotLabels);

tests/PhpSpreadsheetTests/Chart/ChartCloneTest.php

@@ -31,13 +31,13 @@ public function testWriteRepeats(): void
         $divs = $body->getElementsByTagName('div');
         $tbl = $divs->item(0)?->getElementsByTagName('table');
         self::assertSame('', $tbl?->item(0)?->getAttribute('style'));
-        $thd = $divs->item(0)?->getElementsByTagName('thead');
+        $thd = $divs->item(0)->getElementsByTagName('thead');
         self::assertCount(1, $thd);
-        $trw = $thd?->item(0)?->getElementsByTagName('tr');
+        $trw = $thd->item(0)?->getElementsByTagName('tr');
         self::assertCount(2, $trw);
-        $tbd = $divs->item(0)?->getElementsByTagName('tbody');
+        $tbd = $divs->item(0)->getElementsByTagName('tbody');
         self::assertCount(1, $tbd);
-        $trw = $tbd?->item(0)?->getElementsByTagName('tr');
+        $trw = $tbd->item(0)?->getElementsByTagName('tr');
         self::assertCount(98, $trw);
 
         $rls = $this->writeAndReload($spreadsheet, 'Html');
@@ -100,13 +100,13 @@ public function testWriteRepeatsInline(): void
         $divs = $body->getElementsByTagName('div');
         $tbl = $divs->item(0)?->getElementsByTagName('table');
         self::assertSame('border-collapse:collapse', $tbl?->item(0)?->getAttribute('style'));
-        $thd = $divs->item(0)?->getElementsByTagName('thead');
+        $thd = $divs->item(0)->getElementsByTagName('thead');
         self::assertCount(1, $thd);
-        $trw = $thd?->item(0)?->getElementsByTagName('tr');
+        $trw = $thd->item(0)?->getElementsByTagName('tr');
         self::assertCount(2, $trw);
-        $tbd = $divs->item(0)?->getElementsByTagName('tbody');
+        $tbd = $divs->item(0)->getElementsByTagName('tbody');
         self::assertCount(1, $tbd);
-        $trw = $tbd?->item(0)?->getElementsByTagName('tr');
+        $trw = $tbd->item(0)?->getElementsByTagName('tr');
         self::assertCount(98, $trw);
 
         $rls = $this->writeAndReload($spreadsheet, 'Html');