Merge branch 'master' into fix/notice-biff8

Author: aternowy

CHANGELOG.md

@@ -35,7 +35,8 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Improve Coverage for ODS Reader [#1545](https://github.com/phpoffice/phpspreadsheet/pull/1545)
 - Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
-  - fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
+- fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
+- Drop $this->spreadSheet null check from Xlsx Writer [#1646](https://github.com/phpoffice/phpspreadsheet/pull/1646)
 
 ### Deprecated
 
@@ -50,6 +51,10 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - PrintArea causes exception [#1544](https://github.com/phpoffice/phpspreadsheet/pull/1544)
 - Fix for notice during accessing "cached magnification factor" offset [#1354](https://github.com/PHPOffice/PhpSpreadsheet/pull/1354) 
+- Calculation/DateTime Failure With PHP8 [#1661](https://github.com/phpoffice/phpspreadsheet/pull/1661)
+- Reader/Gnumeric Failure with PHP8 [#1662](https://github.com/phpoffice/phpspreadsheet/pull/1662)
+- ReverseSort bug, exposed but not caused by PHP8 [#1660](https://github.com/phpoffice/phpspreadsheet/pull/1660)
+- Bug setting Superscript/Subscript to false [#1567](https://github.com/phpoffice/phpspreadsheet/pull/1567)
 
 ## 1.14.1 - 2020-07-19
 
@@ -556,6 +561,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Ignore inlineStr type if formula element exists - @ncrypthic [#570](https://github.com/PHPOffice/PHPExcel/issues/570)
 - Excel 2007 Reader freezes because of conditional formatting - @rentalhost [#575](https://github.com/PHPOffice/PHPExcel/issues/575)
 - Readers will now parse files containing worksheet titles over 31 characters [#176](https://github.com/PHPOffice/PhpSpreadsheet/pull/176)
+- Fixed PHP8 deprecation warning for libxml_disable_entity_loader() [#1625](https://github.com/phpoffice/phpspreadsheet/pull/1625) 
 
 ### General
 
@@ -577,4 +583,4 @@ For a comprehensive list of all class changes, and a semi-automated migration pa
 
 ## Previous versions of PHPExcel
 
-The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
+The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).

README.md

@@ -8,7 +8,8 @@
 [![License](https://poser.pugx.org/phpoffice/phpspreadsheet/license.png)](https://packagist.org/packages/phpoffice/phpspreadsheet)
 [![Join the chat at https://gitter.im/PHPOffice/PhpSpreadsheet](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PhpSpreadsheet)
 
-PhpSpreadsheet is a library written in pure PHP and providing a set of classes that allow you to read from and to write to different spreadsheet file formats, like Excel and LibreOffice Calc.
+PhpSpreadsheet is a library written in pure PHP and offers a set of classes that
+allow you to read and write various spreadsheet file formats such as Excel and LibreOffice Calc.
 
 ## Documentation
 

docs/index.md

@@ -2,9 +2,8 @@
 
 ![Logo](./assets/logo.svg)
 
-PhpSpreadsheet is a library written in pure PHP and providing a set of
-classes that allow you to read from and to write to different
-spreadsheet file formats, like Excel and LibreOffice Calc.
+PhpSpreadsheet is a library written in pure PHP and offers a set of classes that
+allow you to read and write various spreadsheet file formats such as Excel and LibreOffice Calc.
 
 ## File formats supported
 

src/PhpSpreadsheet/Calculation/DateTime.php

@@ -489,7 +489,7 @@ public static function DATEVALUE($dateValue = 1)
             if ($yearFound) {
                 array_unshift($t1, 1);
             } else {
-                if ($t1[1] > 29) {
+                if (is_numeric($t1[1]) && $t1[1] > 29) {
                     $t1[1] += 1900;
                     array_unshift($t1, 1);
                 } else {

src/PhpSpreadsheet/Reader/Gnumeric.php

@@ -543,7 +543,8 @@ public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): S
 
                     $endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
                     $endColumn = Coordinate::stringFromColumnIndex($endColumn + 1);
-                    $endRow = 1 + (($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow']);
+
+                    $endRow = 1 + (($styleAttributes['endRow'] > $maxRow) ? $maxRow : (int) $styleAttributes['endRow']);
                     $cellRange = $startColumn . $startRow . ':' . $endColumn . $endRow;
 
                     $styleAttributes = $styleRegion->Style->attributes();

src/PhpSpreadsheet/Reader/Security/XmlScanner.php

@@ -63,7 +63,7 @@ public static function threadSafeLibxmlDisableEntityLoaderAvailability()
 
     private function disableEntityLoaderCheck(): void
     {
-        if (Settings::getLibXmlDisableEntityLoader()) {
+        if (Settings::getLibXmlDisableEntityLoader() && \PHP_VERSION_ID < 80000) {
             $libxmlDisableEntityLoaderValue = libxml_disable_entity_loader(true);
 
             if (self::$libxmlDisableEntityLoaderValue === null) {
@@ -74,7 +74,7 @@ private function disableEntityLoaderCheck(): void
 
     public static function shutdown(): void
     {
-        if (self::$libxmlDisableEntityLoaderValue !== null) {
+        if (self::$libxmlDisableEntityLoaderValue !== null && \PHP_VERSION_ID < 80000) {
             libxml_disable_entity_loader(self::$libxmlDisableEntityLoaderValue);
             self::$libxmlDisableEntityLoaderValue = null;
         }

src/PhpSpreadsheet/ReferenceHelper.php

@@ -69,7 +69,7 @@ public static function columnSort($a, $b)
      */
     public static function columnReverseSort($a, $b)
     {
-        return 1 - strcasecmp(strlen($a) . $a, strlen($b) . $b);
+        return -strcasecmp(strlen($a) . $a, strlen($b) . $b);
     }
 
     /**
@@ -108,7 +108,7 @@ public static function cellReverseSort($a, $b)
         [$bc, $br] = sscanf($b, '%[A-Z]%d');
 
         if ($ar === $br) {
-            return 1 - strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
+            return -strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
         }
 
         return ($ar < $br) ? 1 : -1;

src/PhpSpreadsheet/Style/Font.php

@@ -357,21 +357,18 @@ public function getSuperscript()
     /**
      * Set Superscript.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setSuperscript($pValue)
+    public function setSuperscript(bool $pValue)
     {
-        if ($pValue == '') {
-            $pValue = false;
-        }
         if ($this->isSupervisor) {
             $styleArray = $this->getStyleArray(['superscript' => $pValue]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
             $this->superscript = $pValue;
-            $this->subscript = !$pValue;
+            if ($this->superscript) {
+                $this->subscript = false;
+            }
         }
 
         return $this;
@@ -394,21 +391,18 @@ public function getSubscript()
     /**
      * Set Subscript.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setSubscript($pValue)
+    public function setSubscript(bool $pValue)
     {
-        if ($pValue == '') {
-            $pValue = false;
-        }
         if ($this->isSupervisor) {
             $styleArray = $this->getStyleArray(['subscript' => $pValue]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
             $this->subscript = $pValue;
-            $this->superscript = !$pValue;
+            if ($this->subscript) {
+                $this->superscript = false;
+            }
         }
 
         return $this;