Fixed parsing of conditionals in COUNTIF functions

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

CHANGELOG.md

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `Helper\Html` support UTF-8 HTML input - [#444](https://github.com/PHPOffice/PhpSpreadsheet/issues/444)
 - Xlsx loaded an extra empty comment for each real comment - [#375](https://github.com/PHPOffice/PhpSpreadsheet/issues/375)
 - Xlsx reader do not read rows and columns filtered out in readFilter at all - [#370](https://github.com/PHPOffice/PhpSpreadsheet/issues/370)
+- 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 >',
+    ],
+];