Resolve merge conflicts for master -> 2.0-dev

MarkBaker · MarkBaker · commit 73ca0e5f1181 · 2022-09-26T09:39:49.000+02:00
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -320,11 +320,12 @@ private static function castToString(?SimpleXMLElement $c): ?string
      * @param mixed $value
      * @param mixed $calculatedValue
      */
-    private function castToFormula(?SimpleXMLElement $c, string $r, string &$cellDataType, &$value, &$calculatedValue, array &$sharedFormulas, string $castBaseType): void
+    private function castToFormula(Worksheet $docSheet, ?SimpleXMLElement $c, string $r, string &$cellDataType, &$value, &$calculatedValue, array &$sharedFormulas, string $castBaseType): void
     {
         if ($c === null) {
             return;
         }
+
         $formulaAttributes = $c->f->attributes();
         $cellDataType = 'f';
         $value = "={$c->f}";
diff --git a/tests/PhpSpreadsheetTests/Calculation/ArrayFormulaTest.php b/tests/PhpSpreadsheetTests/Calculation/ArrayFormulaTest.php
@@ -260,27 +260,27 @@ public function providerArrayArithmetic(): array
             ],
             'Division: row vector / column vector' => [
                 '={1,2,3} / {4;5;6}',
-                [[0.25, 0.5, 0.75], [0.2, 0.4, 0.6], [0.16666666666667, 0.33333333333333, 0.5]],
+                [[0.25, 0.5, 0.75], [0.2, 0.4, 0.6], [0.16666666666666667, 0.3333333333333333, 0.5]],
             ],
             'Division: column vector / row vector' => [
                 '={1;2;3} / {4,5,6}',
-                [[0.25, 0.2, 0.16666666666667], [0.5, 0.4, 0.33333333333333], [0.75, 0.6, 0.5]],
+                [[0.25, 0.2, 0.16666666666666667], [0.5, 0.4, 0.3333333333333333], [0.75, 0.6, 0.5]],
             ],
             'Division: matrix 3x2 / 3x2' => [
                 '={1,2,3;4,5,6} / {7,8,9;10,11,12}',
-                [[0.142857142857143, 0.25, 0.33333333333333], [0.4, 0.45454545454545, 0.5]],
+                [[0.14285714285714285, 0.25, 0.3333333333333333], [0.4, 0.45454545454545453, 0.5]],
             ],
             'Division: matrix 2x3 / 2x3' => [
                 '={1,4;2,5;3,6} / {7,10;8,11;9,12}',
-                [[0.142857142857143, 0.4], [0.25, 0.45454545454545], [0.33333333333333, 0.5]],
+                [[0.14285714285714285, 0.4], [0.25, 0.45454545454545453], [0.3333333333333333, 0.5]],
             ],
             'Division: row vector 2 / column vector 2' => [
                 '={2,3} / {4;5}',
                 [[0.5, 0.75], [0.4, 0.6]],
             ],
             'Division: matrix 3x2 / 2x3' => [
                 '={1,2,3;4,5,6} / {7,10;8,11;9,12}',
-                [[0.14285714285714, 0.2], [0.5, 0.45454545454545]],
+                [[0.14285714285714285, 0.2], [0.5, 0.45454545454545453]],
             ],
             'Division: matrix 2x3 / 3x2' => [
                 '={7,10;8,11;9,12} / {1,2,3;4,5,6}',
@@ -289,7 +289,7 @@ public function providerArrayArithmetic(): array
             // Power
             'Power: square matrix 2x2 ^ 2x2' => [
                 '={1,2;3,4} ^ {-2,4;-6,8}',
-                [[1, 16], [0.00137174211248, 65536]],
+                [[1, 16], [0.0013717421124828531, 65536]],
             ],
             'Power: square matrix 2x2 ^ scalar' => [
                 '={1,2;3,4} ^ 2',
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php
@@ -4,8 +4,6 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering\ConvertUOM;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
-use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 use PHPUnit\Framework\TestCase;
 
 class ConvertUoMTest extends TestCase
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php
@@ -4,8 +4,6 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering\ErfC;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
-use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 use PHPUnit\Framework\TestCase;
 
 class ErfCTest extends TestCase
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php
@@ -4,8 +4,6 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering\Erf;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
-use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 use PHPUnit\Framework\TestCase;
 
 class ErfPreciseTest extends TestCase
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php
@@ -4,8 +4,6 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering\Erf;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
-use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 use PHPUnit\Framework\TestCase;
 
 class ErfTest extends TestCase
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ParseComplexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ParseComplexTest.php
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php
@@ -6,7 +6,6 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PHPUnit\Framework\TestCase;
 
-class IrrTest extends TestCase
 class IrrTest extends AllSetupTeardown
 {
     /**
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php
@@ -3,9 +3,7 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Address;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 use PHPUnit\Framework\TestCase;
 
 class AddressTest extends TestCase
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php
@@ -3,9 +3,7 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\RowColumnInformation;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 use PHPUnit\Framework\TestCase;
 
 class ColumnsTest extends TestCase
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php
@@ -3,9 +3,7 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Matrix;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 use PHPUnit\Framework\TestCase;
 
 class IndexTest extends TestCase
@@ -17,7 +15,7 @@ class IndexTest extends TestCase
      */
     public function testINDEX($expectedResult, ...$args): void
     {
-        $result = LookupRef::INDEX(/** @scrutinizer ignore-type */ ...$args);
+        $result = Matrix::index(/** @scrutinizer ignore-type */ ...$args);
         self::assertEquals($expectedResult, $result);
     }
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php
@@ -4,6 +4,8 @@
 
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx as ReaderXlsx;
+use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Indirect;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class IndirectTest extends AllSetupTeardown
 {
@@ -123,16 +125,6 @@ public function testIndirectFile2(): void
         }
     }
 
-    public function testDeprecatedCall(): void
-    {
-        $sheet = $this->getSheet();
-        $sheet->getCell('A1')->setValue('A2');
-        $sheet->getCell('A2')->setValue('This is it');
-        $result = \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::INDIRECT('A2', $sheet->getCell('A1'));
-        $result = \PhpOffice\PhpSpreadsheet\Calculation\Functions::flattenSingleValue($result);
-        self::assertSame('This is it', $result);
-    }
-
     /**
      * @param null|int|string $expectedResult
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php
@@ -3,9 +3,7 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\RowColumnInformation;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 use PHPUnit\Framework\TestCase;
 
 class RowsTest extends TestCase
@@ -17,7 +15,7 @@ class RowsTest extends TestCase
      */
     public function testROWS($expectedResult, ...$args): void
     {
-        $result = LookupRef::ROWS(/** @scrutinizer ignore-type */ ...$args);
+        $result = RowColumnInformation::rows(/** @scrutinizer ignore-type */ ...$args);
         self::assertEquals($expectedResult, $result);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -320,11 +320,12 @@ private static function castToString(?SimpleXMLElement $c): ?string`
`320`	`320`	`* @param mixed $value`
`321`	`321`	`* @param mixed $calculatedValue`
`322`	`322`	`*/`
`323`		`- private function castToFormula(?SimpleXMLElement $c, string $r, string &$cellDataType, &$value, &$calculatedValue, array &$sharedFormulas, string $castBaseType): void`
	`323`	`+ private function castToFormula(Worksheet $docSheet, ?SimpleXMLElement $c, string $r, string &$cellDataType, &$value, &$calculatedValue, array &$sharedFormulas, string $castBaseType): void`
`324`	`324`	`{`
`325`	`325`	`if ($c === null) {`
`326`	`326`	`return;`
`327`	`327`	`}`
	`328`	`+`
`328`	`329`	`$formulaAttributes = $c->f->attributes();`
`329`	`330`	`$cellDataType = 'f';`
`330`	`331`	`$value = "={$c->f}";`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`use PhpOffice\PhpSpreadsheet\Calculation\Functions;`
`7`	`7`	`use PHPUnit\Framework\TestCase;`
`8`	`8`
`9`		`-class IrrTest extends TestCase`
`10`	`9`	`class IrrTest extends AllSetupTeardown`
`11`	`10`	`{`
`12`	`11`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`use PhpOffice\PhpSpreadsheet\NamedRange;`
`6`	`6`	`use PhpOffice\PhpSpreadsheet\Reader\Xlsx as ReaderXlsx;`
	`7`	`+use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Indirect;`
	`8`	`+use PhpOffice\PhpSpreadsheet\Calculation\Functions;`
`7`	`9`
`8`	`10`	`class IndirectTest extends AllSetupTeardown`
`9`	`11`	`{`
`@@ -123,16 +125,6 @@ public function testIndirectFile2(): void`
`123`	`125`	`}`
`124`	`126`	`}`
`125`	`127`
`126`		`- public function testDeprecatedCall(): void`
`127`		`- {`
`128`		`- $sheet = $this->getSheet();`
`129`		`- $sheet->getCell('A1')->setValue('A2');`
`130`		`- $sheet->getCell('A2')->setValue('This is it');`
`131`		`- $result = \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::INDIRECT('A2', $sheet->getCell('A1'));`
`132`		`- $result = \PhpOffice\PhpSpreadsheet\Calculation\Functions::flattenSingleValue($result);`
`133`		`- self::assertSame('This is it', $result);`
`134`		`- }`
`135`		`-`
`136`	`128`	`/**`
`137`	`129`	`* @param null\|int\|string $expectedResult`
`138`	`130`	`*`