Merge pull request #2995 from PHPOffice/Matrix-Operations-Additional

MarkBaker · web-flow · commit d13b07ba6e9f · 2022-08-07T19:15:57.000+02:00
Additional for PR #2964; validate value after extracting from flattened array
diff --git a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
@@ -1164,13 +1164,13 @@ public function det()
      */
     private function validateExtractedValue($value, bool $validValues): array
     {
+        if (!is_numeric($value) && is_array($value)) {
+            $value = Functions::flattenArray($value)[0];
+        }
         if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
             $value = trim($value, '"');
             $validValues &= StringHelper::convertToNumberIfFraction($value);
         }
-        if (!is_numeric($value) && is_array($value)) {
-            $value = Functions::flattenArray($value)[0];
-        }
 
         return [$value, $validValues];
     }

Original file line number	Diff line number	Diff line change
`@@ -1164,13 +1164,13 @@ public function det()`
`1164`	`1164`	`*/`
`1165`	`1165`	`private function validateExtractedValue($value, bool $validValues): array`
`1166`	`1166`	`{`
	`1167`	`+ if (!is_numeric($value) && is_array($value)) {`
	`1168`	`+ $value = Functions::flattenArray($value)[0];`
	`1169`	`+ }`
`1167`	`1170`	`if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {`
`1168`	`1171`	`$value = trim($value, '"');`
`1169`	`1172`	`$validValues &= StringHelper::convertToNumberIfFraction($value);`
`1170`	`1173`	`}`
`1171`		`- if (!is_numeric($value) && is_array($value)) {`
`1172`		`- $value = Functions::flattenArray($value)[0];`
`1173`		`- }`
`1174`	`1174`
`1175`	`1175`	`return [$value, $validValues];`
`1176`	`1176`	`}`