Resolve merge conflicts for master -> 2.0-dev

Author: MarkBaker

phpstan-baseline.neon

@@ -85,7 +85,7 @@ public function getSamples()
  foreach ($regex as $file) {
  $file = str_replace(str_replace('\\', '/', $baseDir) . '/', '', str_replace('\\', '/', $file[0]));
  $info = pathinfo($file);
- $category = str_replace('_', ' ', $info['dirname']);
+ $category = str_replace('_', ' ', $info['dirname'] ?? '');
  $name = str_replace('_', ' ', (string) preg_replace('/(|\.php)/', '', $info['filename']));
  if (!in_array($category, ['.', 'boostrap', 'templates'])) {
  if (!isset($files[$category])) {

src/PhpSpreadsheet/Helper/Sample.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}";
@@ -1615,7 +1616,7 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
  if (strpos((string) $definedName, '!') !== false) {
  $range[0] = str_replace("''", "'", $range[0]);
  $range[0] = str_replace("'", '', $range[0]);
- if ($worksheet = $excel->getSheetByName($range[0])) { // @phpstan-ignore-line
+ if ($worksheet = $excel->getSheetByName($range[0])) {
  $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
  } else {
  $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $scope, $extractedRange, true, $scope));

src/PhpSpreadsheet/Reader/Xlsx.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',

tests/PhpSpreadsheetTests/Calculation/ArrayFormulaTest.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

tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.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

tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.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

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 ErfTest extends TestCase

tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php

@@ -2,11 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Financial;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Variable\Periodic;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
-use PHPUnit\Framework\TestCase;
-
-class IrrTest extends TestCase
 class IrrTest extends AllSetupTeardown
 {
  /**