Added php 7 support

norberttech · norberttech · commit e33853d4906f · 2015-12-13T14:31:23.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ matrix:
     - php: 5.4
     - php: 5.5
     - php: 5.6
+    - php: 7.0
     - php: hhvm
   allow_failures:
     - env: DEPENDENCIES='low'
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": ">=5.3.0",
         "ext-filter": "*",
-        "coduo/php-to-string": "~1.0",
+        "coduo/php-to-string": "~2.0",
         "symfony/property-access": "~2.3",
         "symfony/expression-language": "~2.4",
         "doctrine/lexer": "1.0.*",
@@ -37,7 +37,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "2.1-dev"
         }
     }
 }
diff --git a/src/Coduo/PHPMatcher/Matcher/ArrayMatcher.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/BooleanMatcher.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/ChainMatcher.php b/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)
             );
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/DoubleMatcher.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/ExpressionMatcher.php b/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;
diff --git a/src/Coduo/PHPMatcher/Matcher/IntegerMatcher.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/NullMatcher.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/NumberMatcher.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/Contains.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/EndsWith.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/GreaterThan.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/InArray.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsDateTime.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsEmail.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/IsUrl.php b/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;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/LowerThan.php b/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/LowerThan.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 LowerThan implements PatternExpander
 {
@@ -23,7 +23,7 @@ class LowerThan 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)) {
-            $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 lower than \"%s\".", new String($value), new String($this->boundary));
+            $this->error = sprintf("Value \"%s\" is not lower than \"%s\".", new StringConverter($value), new StringConverter($this->boundary));
             return false;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/NotEmpty.php b/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/NotEmpty.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 NotEmpty implements PatternExpander
 {
@@ -16,7 +16,7 @@ class NotEmpty implements PatternExpander
     public function match($value)
     {
         if (false === $value || (empty($value) && '0' != $value)) {
-            $this->error = sprintf("Value %s is not blank.", new String($value));
+            $this->error = sprintf("Value %s is not blank.", new StringConverter($value));
             return false;
         }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/OneOf.php b/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/OneOf.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 OneOf implements PatternExpander
 {
@@ -40,7 +40,7 @@ public function match($value)
             }
         }
 
-        $this->error = sprintf("Any expander available in OneOf expander does not match \"%s\".", new String($value));
+        $this->error = sprintf("Any expander available in OneOf expander does not match \"%s\".", new StringConverter($value));
         return false;
     }
 
diff --git a/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/StartsWith.php b/src/Coduo/PHPMatcher/Matcher/Pattern/Expander/StartsWith.php
diff --git a/src/Coduo/PHPMatcher/Matcher/PropertyMatcher.php b/src/Coduo/PHPMatcher/Matcher/PropertyMatcher.php
diff --git a/src/Coduo/PHPMatcher/Matcher/ScalarMatcher.php b/src/Coduo/PHPMatcher/Matcher/ScalarMatcher.php
diff --git a/src/Coduo/PHPMatcher/Matcher/StringMatcher.php b/src/Coduo/PHPMatcher/Matcher/StringMatcher.php
diff --git a/src/Coduo/PHPMatcher/Matcher/TextMatcher.php b/src/Coduo/PHPMatcher/Matcher/TextMatcher.php
diff --git a/src/Coduo/PHPMatcher/Matcher/TypeMatcher.php b/src/Coduo/PHPMatcher/Matcher/TypeMatcher.php
diff --git a/tests/Coduo/PHPMatcher/Matcher/ChainMatcherTest.php b/tests/Coduo/PHPMatcher/Matcher/ChainMatcherTest.php
diff --git a/tests/Coduo/PHPMatcher/Matcher/TypeMatcherTest.php b/tests/Coduo/PHPMatcher/Matcher/TypeMatcherTest.php

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"require": {`
`17`	`17`	`"php": ">=5.3.0",`
`18`	`18`	`"ext-filter": "*",`
`19`		`- "coduo/php-to-string": "~1.0",`
	`19`	`+ "coduo/php-to-string": "~2.0",`
`20`	`20`	`"symfony/property-access": "~2.3",`
`21`	`21`	`"symfony/expression-language": "~2.4",`
`22`	`22`	`"doctrine/lexer": "1.0.*",`
`@@ -37,7 +37,7 @@`
`37`	`37`	`},`
`38`	`38`	`"extra": {`
`39`	`39`	`"branch-alias": {`
`40`		`- "dev-master": "1.2-dev"`
	`40`	`+ "dev-master": "2.1-dev"`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace Coduo\PHPMatcher\Matcher;`
`4`	`4`
`5`	`5`	`use Coduo\PHPMatcher\Parser;`
`6`		`-use Coduo\ToString\String;`
	`6`	`+use Coduo\ToString\StringConverter;`
`7`	`7`	`use Symfony\Component\PropertyAccess\PropertyAccess;`
`8`	`8`	`use Symfony\Component\PropertyAccess\PropertyAccessor;`
`9`	`9`
`@@ -41,7 +41,7 @@ public function __construct(ValueMatcher $propertyMatcher, Parser $parser)`
`41`	`41`	`public function match($value, $pattern)`
`42`	`42`	`{`
`43`	`43`	`if (!is_array($value)) {`
`44`		`- $this->error = sprintf("%s \"%s\" is not a valid array.", gettype($value), new String($value));`
	`44`	`+ $this->error = sprintf("%s \"%s\" is not a valid array.", gettype($value), new StringConverter($value));`
`45`	`45`	`return false;`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Coduo\PHPMatcher\Matcher;`
`4`	`4`
`5`		`-use Coduo\ToString\String;`
	`5`	`+use Coduo\ToString\StringConverter;`
`6`	`6`
`7`	`7`	`class BooleanMatcher extends Matcher`
`8`	`8`	`{`
`@@ -14,7 +14,7 @@ class BooleanMatcher extends Matcher`
`14`	`14`	`public function match($value, $pattern)`
`15`	`15`	`{`
`16`	`16`	`if (!is_bool($value)) {`
`17`		`- $this->error = sprintf("%s \"%s\" is not a valid boolean.", gettype($value), new String($value));`
	`17`	`+ $this->error = sprintf("%s \"%s\" is not a valid boolean.", gettype($value), new StringConverter($value));`
`18`	`18`	`return false;`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;`
`4`	`4`
`5`	`5`	`use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;`
`6`		`-use Coduo\ToString\String;`
	`6`	`+use Coduo\ToString\StringConverter;`
`7`	`7`
`8`	`8`	`class Contains implements PatternExpander`
`9`	`9`	`{`
`@@ -39,7 +39,7 @@ public function __construct($string, $ignoreCase = false)`
`39`	`39`	`public function match($value)`
`40`	`40`	`{`
`41`	`41`	`if (!is_string($value)) {`
`42`		`- $this->error = sprintf("Contains expander require \"string\", got \"%s\".", new String($value));`
	`42`	`+ $this->error = sprintf("Contains expander require \"string\", got \"%s\".", new StringConverter($value));`
`43`	`43`	`return false;`
`44`	`44`	`}`
`45`	`45`