Added php 7 support

.travis.yml

@@ -8,9 +8,8 @@ matrix:
     - php: 5.4
     - php: 5.5
     - php: 5.6
+    - php: 7.0
     - php: hhvm
-  allow_failures:
-    - env: DEPENDENCIES='low'
 
 before_install:
   - composer self-update
@@ -21,4 +20,4 @@ install:
   - if [ "$DEPENDENCIES" == "low" ]; then composer update --prefer-lowest; fi;
 
 script:
-  - ./bin/phpunit --coverage-text
+  - ./bin/phpunit

composer.json

@@ -16,28 +16,27 @@
     "require": {
         "php": ">=5.3.0",
         "ext-filter": "*",
-        "coduo/php-to-string": "~1.0",
-        "symfony/property-access": "~2.3",
-        "symfony/expression-language": "~2.4",
+        "coduo/php-to-string": "^2",
+        "symfony/property-access": "^2.3|^3.0",
+        "symfony/expression-language": "^2.3|^3.0",
         "doctrine/lexer": "1.0.*",
-        "openlss/lib-array2xml": "0.0.9"
+        "openlss/lib-array2xml": "0.0.10"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "^4.8"
     },
     "autoload": {
         "psr-0": {
             "Coduo\\PHPMatcher": "src/",
             "Coduo\\PHPMatcher\\Tests": "tests/"
-        },
-        "files": ["match.php"]
+        }
     },
     "config": {
         "bin-dir": "bin"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "2.1-dev"
         }
     }
 }

phpunit.xml.dist

@@ -11,7 +11,7 @@
     bootstrap="tests/bootstrap.php"
     >
     <testsuites>
-        <testsuite name="Json Matcher Test Suite">
+        <testsuite name="PHP Matcher Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>

src/Coduo/PHPMatcher/Matcher/ArrayMatcher.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher;
 
 use Coduo\PHPMatcher\Parser;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
@@ -41,7 +41,7 @@ public function __construct(ValueMatcher $propertyMatcher, Parser $parser)
     public function match($value, $pattern)
     {
         if (!is_array($value)) {
-            $this->error = sprintf("%s \"%s\" is not a valid array.", gettype($value), new String($value));
+            $this->error = sprintf("%s \"%s\" is not a valid array.", gettype($value), new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/BooleanMatcher.php

@@ -2,7 +2,7 @@
 
 namespace Coduo\PHPMatcher\Matcher;
 
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class BooleanMatcher extends Matcher
 {
@@ -14,7 +14,7 @@ class BooleanMatcher extends Matcher
     public function match($value, $pattern)
     {
         if (!is_bool($value)) {
-            $this->error = sprintf("%s \"%s\" is not a valid boolean.", gettype($value), new String($value));
+            $this->error = sprintf("%s \"%s\" is not a valid boolean.", gettype($value), new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/ChainMatcher.php

@@ -2,7 +2,7 @@
 
 namespace Coduo\PHPMatcher\Matcher;
 
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class ChainMatcher extends Matcher
 {
@@ -45,8 +45,8 @@ public function match($value, $pattern)
         if (!isset($this->error)) {
             $this->error = sprintf(
                 'Any matcher from chain can\'t match value "%s" to pattern "%s"',
-                new String($value),
-                new String($pattern)
+                new StringConverter($value),
+                new StringConverter($pattern)
             );
         }
 

src/Coduo/PHPMatcher/Matcher/DoubleMatcher.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher;
 
 use Coduo\PHPMatcher\Parser;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class DoubleMatcher extends Matcher
 {
@@ -26,7 +26,7 @@ public function __construct(Parser $parser)
     public function match($value, $pattern)
     {
         if (!is_double($value)) {
-            $this->error = sprintf("%s \"%s\" is not a valid double.", gettype($value), new String($value));
+            $this->error = sprintf("%s \"%s\" is not a valid double.", gettype($value), new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/ExpressionMatcher.php

@@ -2,7 +2,7 @@
 
 namespace Coduo\PHPMatcher\Matcher;
 
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 
 class ExpressionMatcher extends Matcher
@@ -19,7 +19,7 @@ public function match($value, $pattern)
         $expressionResult = $language->evaluate($matches[1], array('value' => $value));
 
         if (!$expressionResult) {
-            $this->error = sprintf("\"%s\" expression fails for value \"%s\".", $pattern, new String($value));
+            $this->error = sprintf("\"%s\" expression fails for value \"%s\".", $pattern, new StringConverter($value));
         }
 
         return (bool) $expressionResult;

src/Coduo/PHPMatcher/Matcher/IntegerMatcher.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher;
 
 use Coduo\PHPMatcher\Parser;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class IntegerMatcher extends Matcher
 {
@@ -26,7 +26,7 @@ public function __construct(Parser $parser)
     public function match($value, $pattern)
     {
         if (!is_integer($value)) {
-            $this->error = sprintf("%s \"%s\" is not a valid integer.", gettype($value), new String($value));
+            $this->error = sprintf("%s \"%s\" is not a valid integer.", gettype($value), new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/NullMatcher.php

@@ -2,7 +2,7 @@
 
 namespace Coduo\PHPMatcher\Matcher;
 
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class NullMatcher extends Matcher
 {
@@ -14,7 +14,7 @@ class NullMatcher extends Matcher
     public function match($value, $pattern)
     {
         if (null !== $value) {
-            $this->error = sprintf("%s \"%s\" does not match null.", gettype($value), new String($value));
+            $this->error = sprintf("%s \"%s\" does not match null.", gettype($value), new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/NumberMatcher.php

@@ -2,7 +2,7 @@
 
 namespace Coduo\PHPMatcher\Matcher;
 
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class NumberMatcher extends Matcher
 {
@@ -14,7 +14,7 @@ class NumberMatcher extends Matcher
     public function match($value, $pattern)
     {
         if (!is_numeric($value)) {
-            $this->error = sprintf("%s \"%s\" is not a valid number.", gettype($value), new String($value));
+            $this->error = sprintf("%s \"%s\" is not a valid number.", gettype($value), new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/Pattern/Expander/Contains.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
 
 use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class Contains implements PatternExpander
 {
@@ -39,7 +39,7 @@ public function __construct($string, $ignoreCase = false)
     public function match($value)
     {
         if (!is_string($value)) {
-            $this->error = sprintf("Contains expander require \"string\", got \"%s\".", new String($value));
+            $this->error = sprintf("Contains expander require \"string\", got \"%s\".", new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/Pattern/Expander/EndsWith.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
 
 use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class EndsWith implements PatternExpander
 {
@@ -43,7 +43,7 @@ public function __construct($stringEnding, $ignoreCase = false)
     public function match($value)
     {
         if (!is_string($value)) {
-            $this->error = sprintf("EndsWith expander require \"string\", got \"%s\".", new String($value));
+            $this->error = sprintf("EndsWith expander require \"string\", got \"%s\".", new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/Pattern/Expander/GreaterThan.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
 
 use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class GreaterThan implements PatternExpander
 {
@@ -23,7 +23,7 @@ class GreaterThan implements PatternExpander
     public function __construct($boundary)
     {
         if (!is_float($boundary) && !is_integer($boundary) && !is_double($boundary)) {
-            throw new \InvalidArgumentException(sprintf("Boundary value \"%s\" is not a valid number.", new String($boundary)));
+            throw new \InvalidArgumentException(sprintf("Boundary value \"%s\" is not a valid number.", new StringConverter($boundary)));
         }
 
         $this->boundary = $boundary;
@@ -36,12 +36,12 @@ public function __construct($boundary)
     public function match($value)
     {
         if (!is_float($value) && !is_integer($value) && !is_double($value) && !is_numeric($value)) {
-            $this->error = sprintf("Value \"%s\" is not a valid number.", new String($value));
+            $this->error = sprintf("Value \"%s\" is not a valid number.", new StringConverter($value));
             return false;
         }
 
         if ($value <= $this->boundary) {
-            $this->error = sprintf("Value \"%s\" is not greater than \"%s\".", new String($value), new String($this->boundary));
+            $this->error = sprintf("Value \"%s\" is not greater than \"%s\".", new StringConverter($value), new StringConverter($this->boundary));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/Pattern/Expander/InArray.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
 
 use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class InArray implements PatternExpander
 {
@@ -32,12 +32,12 @@ public function __construct($value)
     public function match($value)
     {
         if (!is_array($value)) {
-            $this->error = sprintf("InArray expander require \"array\", got \"%s\".", new String($value));
+            $this->error = sprintf("InArray expander require \"array\", got \"%s\".", new StringConverter($value));
             return false;
         }
 
         if (!in_array($this->value, $value, true)) {
-            $this->error = sprintf("%s doesn't have \"%s\" element.", new String($value), new String($this->value));
+            $this->error = sprintf("%s doesn't have \"%s\" element.", new StringConverter($value), new StringConverter($this->value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsDateTime.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
 
 use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class IsDateTime implements PatternExpander
 {
@@ -19,7 +19,7 @@ class IsDateTime implements PatternExpander
     public function match($value)
     {
         if (false === is_string($value)) {
-            $this->error = sprintf("IsDateTime expander require \"string\", got \"%s\".", new String($value));
+            $this->error = sprintf("IsDateTime expander require \"string\", got \"%s\".", new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsEmail.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
 
 use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class IsEmail implements PatternExpander
 {
@@ -19,7 +19,7 @@ class IsEmail implements PatternExpander
     public function match($value)
     {
         if (false === is_string($value)) {
-            $this->error = sprintf("IsEmail expander require \"string\", got \"%s\".", new String($value));
+            $this->error = sprintf("IsEmail expander require \"string\", got \"%s\".", new StringConverter($value));
             return false;
         }
 

src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsUrl.php

@@ -3,7 +3,7 @@
 namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
 
 use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
-use Coduo\ToString\String;
+use Coduo\ToString\StringConverter;
 
 class IsUrl implements PatternExpander
 {
@@ -19,7 +19,7 @@ class IsUrl implements PatternExpander
     public function match($value)
     {
         if (false === is_string($value)) {
-            $this->error = sprintf("IsUrl expander require \"string\", got \"%s\".", new String($value));
+            $this->error = sprintf("IsUrl expander require \"string\", got \"%s\".", new StringConverter($value));
             return false;
         }