Merge branch 'master' into bit32b

Author: oleibman

CHANGELOG.md

@@ -7,11 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ## Unreleased - TBD
 
-### MINOR BREAKING CHANGE
+### BREAKING CHANGE
 
-- Typing was strengthened by leveraging native typing. While this should not change any behavior, it might need minor
-  adaption of your code if you use static analysis tools such as PHPStan or
-  Psalm. [PR #3718](https://github.com/PHPOffice/PhpSpreadsheet/pull/3718)
+- Typing was strengthened by leveraging native typing. This should not change any behavior. However, if you implement
+  any interfaces or inherit from any classes, you will need to adapt your typing accordingly. If you use static analysis 
+  tools such as PHPStan or Psalm, new errors might be found. If you find actual bugs because of the new typing, please
+  open a PR that fixes it with a **detailed** explanation of the reason. We'll try to merge and release typing-related
+  fixes quickly in the coming days. [PR #3718](https://github.com/PHPOffice/PhpSpreadsheet/pull/3718)
+- All deprecated things have been removed, for details, see [816b91d0b4](https://github.com/PHPOffice/PhpSpreadsheet/commit/816b91d0b4a0c7285a9e3fc88c58f7730d922044)
 
 ### Added
 
@@ -28,11 +31,12 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Check if Coordinate is Inside Range [PR #3779](https://github.com/PHPOffice/PhpSpreadsheet/pull/3779)
 - Flipping Images [Issue #731](https://github.com/PHPOffice/PhpSpreadsheet/issues/731) [PR #3801](https://github.com/PHPOffice/PhpSpreadsheet/pull/3801)
 - Chart Dynamic Title and Font Properties [Issue #3797](https://github.com/PHPOffice/PhpSpreadsheet/issues/3797) [PR #3800](https://github.com/PHPOffice/PhpSpreadsheet/pull/3800)
-- Chart Axis Display Units and Logarithmic Scale. [Issue #3833](https://github.com/PHPOffice/PhpSpreadsheet/pull/3833) [PR #3836](https://github.com/PHPOffice/PhpSpreadsheet/pull/3836)
+- Chart Axis Display Units and Logarithmic Scale. [Issue #3833](https://github.com/PHPOffice/PhpSpreadsheet/issues/3833) [PR #3836](https://github.com/PHPOffice/PhpSpreadsheet/pull/3836)
+- Partial Support of Fill Handles. [Discussion #3847](https://github.com/PHPOffice/PhpSpreadsheet/discussions/3847) [PR #3855](https://github.com/PHPOffice/PhpSpreadsheet/pull/3855)
 
 ### Changed
 
-- Drop support for PHP 7.4, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support [PR #3713](https://github.com/PHPOffice/PhpSpreadsheet/pull/3713)
+- **Drop support for PHP 7.4**, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support [PR #3713](https://github.com/PHPOffice/PhpSpreadsheet/pull/3713)
 - RLM Added to NumberFormatter Currency. This happens depending on release of ICU which Php is using (it does not yet happen with any official release). PhpSpreadsheet will continue to use the value returned by Php, but a method is added to keep the result unchanged from release to release. [Issue #3571](https://github.com/PHPOffice/PhpSpreadsheet/issues/3571) [PR #3640](https://github.com/PHPOffice/PhpSpreadsheet/pull/3640)
 - `toFormattedString` will now always return a string. This was introduced with 1.28.0, but was not properly documented at the time. This can affect the results of `toArray`, `namedRangeToArray`, and `rangeToArray`. [PR #3304](https://github.com/PHPOffice/PhpSpreadsheet/pull/3304)
 - Value of constants FORMAT_CURRENCY_EUR and FORMAT_CURRENCY_USD was changed in 1.28.0, but was not properly documented at the time. [Issue #3577](https://github.com/PHPOffice/PhpSpreadsheet/issues/3577)
@@ -85,10 +89,14 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - COUNTIFS Does Not Require xlfn. [Issue #3819](https://github.com/PHPOffice/PhpSpreadsheet/issues/3819) [PR #3827](https://github.com/PHPOffice/PhpSpreadsheet/pull/3827)
 - Strip `xlfn.` and `xlws.` from Formula Translations. [Issue #3819](https://github.com/PHPOffice/PhpSpreadsheet/issues/3819) [PR #3828](https://github.com/PHPOffice/PhpSpreadsheet/pull/3828)
 - Recurse directories searching for font file. [Issue #2809](https://github.com/PHPOffice/PhpSpreadsheet/issues/2809) [PR #3830](https://github.com/PHPOffice/PhpSpreadsheet/pull/3830)
-- Reduce memory consumption of Worksheet::rangeToArray() when many empty rows are read. [Issue #3814](https://github.com/PHPOffice/PhpSpreadsheet/pull/3814) [PR #3834](https://github.com/PHPOffice/PhpSpreadsheet/pull/3834)
+- Reduce memory consumption of Worksheet::rangeToArray() when many empty rows are read. [Issue #3814](https://github.com/PHPOffice/PhpSpreadsheet/issues/3814) [PR #3834](https://github.com/PHPOffice/PhpSpreadsheet/pull/3834)
 - Reduce time used by Worksheet::rangeToArray() when many empty rows are read. [PR #3839](https://github.com/PHPOffice/PhpSpreadsheet/pull/3839)
 - Html Reader Tolerate Invalid Sheet Title. [PR #3845](https://github.com/PHPOffice/PhpSpreadsheet/pull/3845)
-- Do not include unparsed drawings when new drawing added. [Issue #3843](https://github.com/PHPOffice/PhpSpreadsheet/pull/3843) [PR #3846](https://github.com/PHPOffice/PhpSpreadsheet/pull/3846)
+- Do not include unparsed drawings when new drawing added. [Issue #3843](https://github.com/PHPOffice/PhpSpreadsheet/issues/3843) [PR #3846](https://github.com/PHPOffice/PhpSpreadsheet/pull/3846)
+- Do not include unparsed drawings when new drawing added. [Issue #3861](https://github.com/PHPOffice/PhpSpreadsheet/issues/3861) [PR #3862](https://github.com/PHPOffice/PhpSpreadsheet/pull/3862)
+- Excel omits `between` operator for data validation. [Issue #3863](https://github.com/PHPOffice/PhpSpreadsheet/issues/3863) [PR #3865](https://github.com/PHPOffice/PhpSpreadsheet/pull/3865)
+- Use less space when inserting rows and columns. [Issue #3687](https://github.com/PHPOffice/PhpSpreadsheet/issues/3687) [PR #3856](https://github.com/PHPOffice/PhpSpreadsheet/pull/3856)
+- Excel inconsistent handling of MIN/MAX/MINA/MAXA. [Issue #3866](https://github.com/PHPOffice/PhpSpreadsheet/issues/3866) [PR #3868](https://github.com/PHPOffice/PhpSpreadsheet/pull/3868)
 
 ## 1.29.0 - 2023-06-15
 

docs/topics/recipes.md

@@ -415,6 +415,7 @@ At present, the following locale settings are supported:
 
 Language             |                      | Locale Code
 ---------------------|----------------------|-------------
+Bulgarian            | български            | bg
 Czech                | Ceština              | cs
 Danish               | Dansk                | da
 German               | Deutsch              | de

infra/LocaleGenerator.php

@@ -86,7 +86,13 @@ public function generateLocales(): void
     protected function buildConfigFileForLocale(string $column, string $locale): void
     {
         $language = $this->localeTranslations->getCell($column . self::ENGLISH_LANGUAGE_NAME_ROW)->getValue();
+        if (!is_string($language)) {
+            throw new Exception('Non-string language value at ' . $column . self::ENGLISH_LANGUAGE_NAME_ROW);
+        }
         $localeLanguage = $this->localeTranslations->getCell($column . self::LOCALE_LANGUAGE_NAME_ROW)->getValue();
+        if (!is_string($localeLanguage)) {
+            throw new Exception('Non-string locale language value at ' . $column . self::LOCALE_LANGUAGE_NAME_ROW);
+        }
         $configFile = $this->openConfigFile($locale, $language, $localeLanguage);
 
         $this->writeConfigArgumentSeparator($configFile, $column);
@@ -96,6 +102,9 @@ protected function buildConfigFileForLocale(string $column, string $locale): voi
         foreach ($this->errorCodeMap as $errorCode => $row) {
             $translationCell = $this->localeTranslations->getCell($column . $row);
             $translationValue = $translationCell->getValue();
+            if ($translationValue !== null && !is_string($translationValue)) {
+                throw new Exception('Non-string translation value at ' . $column . $row);
+            }
             if (!empty($translationValue)) {
                 $errorCodeTranslation = "{$errorCode} = {$translationValue}" . self::EOL;
                 fwrite($configFile, $errorCodeTranslation);
@@ -114,6 +123,9 @@ protected function writeConfigArgumentSeparator($configFile, string $column): vo
     {
         $translationCell = $this->localeTranslations->getCell($column . self::ARGUMENT_SEPARATOR_ROW);
         $localeValue = $translationCell->getValue();
+        if ($localeValue !== null && !is_string($localeValue)) {
+            throw new Exception('Non-string locale value at ' . $column . self::CURRENCY_SYMBOL_ROW);
+        }
         if (!empty($localeValue)) {
             $functionTranslation = "ArgumentSeparator = {$localeValue}" . self::EOL;
             fwrite($configFile, $functionTranslation);
@@ -127,6 +139,9 @@ protected function writeConfigCurrencySymbol($configFile, string $column): void
     {
         $translationCell = $this->localeTranslations->getCell($column . self::CURRENCY_SYMBOL_ROW);
         $localeValue = $translationCell->getValue();
+        if ($localeValue !== null && !is_string($localeValue)) {
+            throw new Exception('Non-string locale value at ' . $column . self::CURRENCY_SYMBOL_ROW);
+        }
         if (!empty($localeValue)) {
             $functionTranslation = "currencySymbol = {$localeValue}" . self::EOL;
             fwrite($configFile, '##' . self::EOL);
@@ -141,13 +156,22 @@ protected function writeConfigCurrencySymbol($configFile, string $column): void
     protected function buildFunctionsFileForLocale(string $column, string $locale): void
     {
         $language = $this->functionNameTranslations->getCell($column . self::ENGLISH_LANGUAGE_NAME_ROW)->getValue();
+        if (!is_string($language)) {
+            throw new Exception('Non-string language value at ' . $column . self::ENGLISH_LANGUAGE_NAME_ROW);
+        }
         $localeLanguage = $this->functionNameTranslations->getCell($column . self::LOCALE_LANGUAGE_NAME_ROW)
             ->getValue();
+        if (!is_string($localeLanguage)) {
+            throw new Exception('Non-string locale language value at ' . $column . self::LOCALE_LANGUAGE_NAME_ROW);
+        }
         $functionFile = $this->openFunctionNameFile($locale, $language, $localeLanguage);
 
         foreach ($this->functionNameMap as $functionName => $row) {
             $translationCell = $this->functionNameTranslations->getCell($column . $row);
             $translationValue = $translationCell->getValue();
+            if ($translationValue !== null && !is_string($translationValue)) {
+                throw new Exception('Non-string translation value at ' . $column . $row);
+            }
             if ($this->isFunctionCategoryEntry($translationCell)) {
                 $this->writeFileSectionHeader($functionFile, "{$translationValue} ({$functionName})");
             } elseif (!array_key_exists($functionName, $this->phpSpreadsheetFunctions) && substr($functionName, 0, 1) !== '*') {

phpstan.neon.dist

@@ -23,6 +23,7 @@ parameters:
     parallel:
         processTimeout: 300.0
     checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
         # Accept a bit anything for assert methods
         - '~^Parameter \#2 .* of static method PHPUnit\\Framework\\Assert\:\:assert\w+\(\) expects .*, .* given\.$~'

samples/Basic/13_Calculation.php

@@ -157,8 +157,9 @@
 $helper->log('Calculated data');
 for ($col = 'B'; $col != 'G'; ++$col) {
     for ($row = 14; $row <= 41; ++$row) {
+        $formula = $spreadsheet->getActiveSheet()->getCell($col . $row)->getValue();
         if (
-            (($formula = $spreadsheet->getActiveSheet()->getCell($col . $row)->getValue()) !== null)
+            is_string($formula)
             && ($formula[0] == '=')
         ) {
             $helper->log('Value of ' . $col . $row . ' [' . $formula . ']: ' . $spreadsheet->getActiveSheet()->getCell($col . $row)->getCalculatedValue());

samples/Basic/13_CalculationCyclicFormulae.php

@@ -22,8 +22,9 @@
 $helper->log('Calculated data');
 for ($row = 1; $row <= 2; ++$row) {
     for ($col = 'A'; $col != 'C'; ++$col) {
+        $formula = $spreadsheet->getActiveSheet()->getCell($col . $row)->getValue();
         if (
-            (($formula = $spreadsheet->getActiveSheet()->getCell($col . $row)->getValue()) !== null)
+            is_string($formula)
                 && ($formula[0] == '=')
         ) {
             $helper->log('Value of ' . $col . $row . ' [' . $formula . ']: ' . $spreadsheet->getActiveSheet()->getCell($col . $row)->getCalculatedValue());

samples/Basic/31_Document_properties_write.php

@@ -56,7 +56,7 @@
     $propertyValue = $spreadsheet->getProperties()->getCustomPropertyValue($customProperty);
     $propertyType = $spreadsheet->getProperties()->getCustomPropertyType($customProperty);
     if ($propertyType == Properties::PROPERTY_TYPE_DATE) {
-        $formattedValue = date('d-M-Y H:i:s', (int) $propertyValue);
+        $formattedValue = is_numeric($propertyValue) ? date('d-M-Y H:i:s', (int) $propertyValue) : '*****INVALID*****';
     } elseif ($propertyType == Properties::PROPERTY_TYPE_BOOLEAN) {
         $formattedValue = $propertyValue ? 'TRUE' : 'FALSE';
     } else {

samples/Basic/31_Document_properties_write_xls.php

@@ -56,7 +56,7 @@
     $propertyValue = $spreadsheet->getProperties()->getCustomPropertyValue($customProperty);
     $propertyType = $spreadsheet->getProperties()->getCustomPropertyType($customProperty);
     if ($propertyType == Properties::PROPERTY_TYPE_DATE) {
-        $formattedValue = date('d-M-Y H:i:s', (int) $propertyValue);
+        $formattedValue = is_numeric($propertyValue) ? date('d-M-Y H:i:s', (int) $propertyValue) : '*****INVALID*****';
     } elseif ($propertyType == Properties::PROPERTY_TYPE_BOOLEAN) {
         $formattedValue = $propertyValue ? 'TRUE' : 'FALSE';
     } else {

samples/Basic/45_Quadratic_equation_solver.php

@@ -59,8 +59,12 @@
         $r1Formula = '=IMDIV(IMSUM(-' . $_POST['B'] . ',IMSQRT(' . $discriminant . ')),2 * ' . $_POST['A'] . ')';
         $r2Formula = '=IF(' . $discriminant . '=0,"Only one root",IMDIV(IMSUB(-' . $_POST['B'] . ',IMSQRT(' . $discriminant . ')),2 * ' . $_POST['A'] . '))';
 
-        $helper->log(Calculation::getInstance()->calculateFormula($r1Formula));
-        $helper->log(Calculation::getInstance()->calculateFormula($r2Formula));
+        /** @var string */
+        $output = Calculation::getInstance()->calculateFormula($r1Formula);
+        $helper->log("$output");
+        /** @var string */
+        $output = Calculation::getInstance()->calculateFormula($r2Formula);
+        $helper->log("$output");
         $callEndTime = microtime(true);
         $helper->logEndingNotes();
     }

samples/Calculations/DateTime/DAYS360.php

@@ -49,9 +49,11 @@
         $worksheet->getCell('E' . $row)->getFormattedValue(),
         $worksheet->getCell('F' . $row)->getFormattedValue()
     ));
-    $helper->log(sprintf(
-        'Days: %d (US) %d (European)',
-        $worksheet->getCell('G' . $row)->getCalculatedValue(),
-        $worksheet->getCell('H' . $row)->getCalculatedValue()
-    ));
+    $helper->log(
+        'Days: '
+        . $worksheet->getCell('G' . $row)->getCalculatedValue()
+        . ' (US) '
+        . $worksheet->getCell('H' . $row)->getCalculatedValue()
+        . ' (European)'
+    );
 }