Merge branch 'master' of https://github.com/PHPOffice/PhpSpreadsheet

Author: jimmy4o4

.travis.yml

@@ -1,16 +1,11 @@
 language: php
-dist: trusty
+dist: bionic
 
 php:
   - 7.1
   - 7.2
   - 7.3
-  - 7.4snapshot
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: 7.4snapshot
+  - 7.4
 
 cache:
   directories:
@@ -20,7 +15,7 @@ cache:
 
 before_script:
   # Deactivate xdebug
-  - if [ -z "$KEEP_XDEBUG" ]; then rm -rfv /home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ; fi
+  - phpenv config-rm xdebug.ini
   - composer install --ignore-platform-reqs
 
 script:
@@ -37,9 +32,11 @@ jobs:
 
     - stage: Coverage
       php: 7.2
-      env: KEEP_XDEBUG=1
       script:
-        - travis_wait 40 ./vendor/bin/phpunit --debug --coverage-clover coverage-clover.xml
+        - pecl install pcov
+        - composer require pcov/clobber --dev
+        - ./vendor/bin/pcov clobber
+        - ./vendor/bin/phpunit --coverage-clover coverage-clover.xml
       after_script:
         - wget https://scrutinizer-ci.com/ocular.phar
         - php ocular.phar code-coverage:upload --format=php-clover tests/coverage-clover.xml

CHANGELOG.md

@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [Unreleased]
+
+- Conditionals - Extend Support for (NOT)CONTAINSBLANKS [#1278](https://github.com/PHPOffice/PhpSpreadsheet/pull/1278)
+- Handle Error in Formula Processing Better for Xls [#1267](https://github.com/PHPOffice/PhpSpreadsheet/pull/1267)
+- Handle ConditionalStyle NumberFormat When Reading Xlsx File [#1296](https://github.com/PHPOffice/PhpSpreadsheet/pull/1296)
+- Fix Xlsx Writer's handling of decimal commas [#1282](https://github.com/PHPOffice/PhpSpreadsheet/pull/1282)
+
+## [1.10.1] - 2019-12-02
+
+### Changed
+
+- PHP 7.4 compatibility
+
+### Fixed
+
+- FLOOR() function accept negative number and negative significance [#1245](https://github.com/PHPOffice/PhpSpreadsheet/pull/1245)
+- Correct column style even when using rowspan [#1249](https://github.com/PHPOffice/PhpSpreadsheet/pull/1249)
+- Do not confuse defined names and cell refs [#1263](https://github.com/PHPOffice/PhpSpreadsheet/pull/1263)
+- XLSX reader/writer keep decimal for floats with a zero decimal part [#1262](https://github.com/PHPOffice/PhpSpreadsheet/pull/1262)
+- ODS writer prevent invalid numeric value if locale decimal separator is comma [#1268](https://github.com/PHPOffice/PhpSpreadsheet/pull/1268)
+- Xlsx writer actually writes plotVisOnly and dispBlanksAs from chart properties [#1266](https://github.com/PHPOffice/PhpSpreadsheet/pull/1266)
+
 ## [1.10.0] - 2019-11-18
 
 ### Changed

composer.lock

@@ -25,7 +25,7 @@ class Calculation
     //    Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
     const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?([A-Z][A-Z0-9\.]*)[\s]*\(';
     //    Cell reference (cell or range of cells, with or without a sheet reference)
-    const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d{1,7})';
+    const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
     //    Named Range of cells
     const CALCULATION_REGEXP_NAMEDRANGE = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_A-Z][_A-Z0-9\.]*)';
     //    Error
@@ -2864,13 +2864,13 @@ public function calculateFormula($formula, $cellID = null, Cell $pCell = null)
         $this->debugLog->clearLog();
         $this->cyclicReferenceStack->clear();
 
+        $resetCache = $this->getCalculationCacheEnabled();
         if ($this->spreadsheet !== null && $cellID === null && $pCell === null) {
             $cellID = 'A1';
             $pCell = $this->spreadsheet->getActiveSheet()->getCell($cellID);
         } else {
             //    Disable calculation cacheing because it only applies to cell calculations, not straight formulae
             //    But don't actually flush any cache
-            $resetCache = $this->getCalculationCacheEnabled();
             $this->calculationCacheEnabled = false;
         }
 
@@ -3239,7 +3239,7 @@ private function showTypeDetails($value)
     /**
      * @param string $formula
      *
-     * @return string
+     * @return false|string False indicates an error
      */
     private function convertMatrixReferences($formula)
     {
@@ -3459,7 +3459,7 @@ private function _parseFormula($formula, Cell $pCell = null)
                     $parenthesisDepthMap[$pendingStoreKey] -= 1;
                 }
 
-                if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
+                if (is_array($d) && preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
                     if (!empty($pendingStoreKey) && $parenthesisDepthMap[$pendingStoreKey] == -1) {
                         // we are closing an IF(
                         if ($d['value'] != 'IF(') {

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -491,7 +491,7 @@ public static function DATEVALUE($dateValue = 1)
                 $yearFound = true;
             }
         }
-        if ((count($t1) == 1) && (strpos($t, ':') != false)) {
+        if ((count($t1) == 1) && (strpos($t, ':') !== false)) {
             //    We've been fed a time value without any date
             return 0.0;
         } elseif (count($t1) == 2) {
@@ -892,7 +892,7 @@ public static function DAYS360($startDate = 0, $endDate = 0, $method = false)
      *                                        3                Actual/365
      *                                        4                European 30/360
      *
-     * @return float fraction of the year
+     * @return float|string fraction of the year, or a string containing an error
      */
     public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
     {

src/PhpSpreadsheet/Calculation/DateTime.php

@@ -785,7 +785,7 @@ private static function nbrConversionFormat($xVal, $places)
      *                                If $ord is nonnumeric, BESSELI returns the #VALUE! error value.
      *                                If $ord < 0, BESSELI returns the #NUM! error value.
      *
-     * @return float
+     * @return float|string Result, or a string containing an error
      */
     public static function BESSELI($x, $ord)
     {
@@ -839,7 +839,7 @@ public static function BESSELI($x, $ord)
      *                                If $ord is nonnumeric, BESSELJ returns the #VALUE! error value.
      *                                If $ord < 0, BESSELJ returns the #NUM! error value.
      *
-     * @return float
+     * @return float|string Result, or a string containing an error
      */
     public static function BESSELJ($x, $ord)
     {
@@ -932,7 +932,7 @@ private static function besselK1($fNum)
      *                                If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
      *                                If $ord < 0, BESSELK returns the #NUM! error value.
      *
-     * @return float
+     * @return float|string Result, or a string containing an error
      */
     public static function BESSELK($x, $ord)
     {
@@ -1021,7 +1021,7 @@ private static function besselY1($fNum)
      *                                If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
      *                                If $ord < 0, BESSELK returns the #NUM! error value.
      *
-     * @return float
+     * @return float|string Result, or a string containing an error
      */
     public static function BESSELY($x, $ord)
     {