Fixed parsing of conditionals in COUNTIF functions

Conditional operators in the selection parameter of COUNTIF
functions were not being parsed properly, causing evaluations
of formulae with such functions to sometimes fail.

Fixes PHPOffice#526
Closes PHPOffice#528

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Xlsx reader do not read rows and columns filtered out in readFilter at all - [#370](https://github.com/PHPOffice/PhpSpreadsheet/issues/370)
 - Make newer Excel versions properly recalculate formulas on document open - [#456](https://github.com/PHPOffice/PhpSpreadsheet/issues/456)
 - `Coordinate::extractAllCellReferencesInRange()` throws an exception for an invalid range – [#519](https://github.com/PHPOffice/PhpSpreadsheet/issues/519)
+- Fixed parsing of conditionals in COUNTIF functions - [#526](https://github.com/PHPOffice/PhpSpreadsheet/issues/526)
 
 ## [1.2.1] - 2018-04-10
 

src/PhpSpreadsheet/Calculation/Functions.php

@@ -277,7 +277,7 @@ public static function ifCondition($condition)
 
             return '=' . $condition;
         }
-        preg_match('/([<>=]+)(.*)/', $condition, $matches);
+        preg_match('/(=|<[>=]?|>=?)(.*)/', $condition, $matches);
         list(, $operator, $operand) = $matches;
 
         if (!is_numeric($operand)) {

tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php

@@ -307,4 +307,20 @@ public function providerIsFormula()
     {
         return require 'data/Calculation/Functions/ISFORMULA.php';
     }
+
+    /**
+     * @dataProvider providerIfCondition
+     *
+     * @param mixed $expectedResult
+     */
+    public function testIfCondition($expectedResult, ...$args)
+    {
+        $result = Functions::ifCondition(...$args);
+        self::assertEquals($expectedResult, $result);
+    }
+
+    public function providerIfCondition()
+    {
+        return require 'data/Calculation/Functions/IF_CONDITION.php';
+    }
 }

tests/data/Calculation/Functions/IF_CONDITION.php

@@ -0,0 +1,36 @@
+<?php
+
+return [
+    [
+        '<"A"',
+        '<A',
+    ],
+    [
+        '>"A"',
+        '>A',
+    ],
+    [
+        '<="A"',
+        '<=A',
+    ],
+    [
+        '>"A"',
+        '>A',
+    ],
+    [
+        '>="A"',
+        '>=A',
+    ],
+    [
+        '<>"A"',
+        '<>A',
+    ],
+    [
+        '<"<A"',
+        '<<A',
+    ],
+    [
+        '<>"< PLEASE SELECT >"',
+        '<>< Please Select >',
+    ],
+];