update deps to phpunit 6.x, fix code and tests

.travis.yml

@@ -8,14 +8,9 @@ cache:
 
 matrix:
   include:
-    - php: 5.3
-      env: DEPENDENCIES='low'
-    - php: 5.3
-    - php: 5.4
-    - php: 5.5
-    - php: 5.6
     - php: 7.0
-    - php: hhvm
+      env: DEPENDENCIES='low'
+    - php: 7.1
 
 before_install:
   - composer self-update

composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=7.0.0",
         "ext-filter": "*",
         "coduo/php-to-string": "^2",
         "symfony/property-access": "^2.3|^3.0",
@@ -24,7 +24,7 @@
         "openlss/lib-array2xml": "~0.0.9"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^6.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -7,7 +7,7 @@
         <testsuite name="PHP Matcher Test Suite">
             <directory>./tests/</directory>
             <exclude>tests/PHPUnit/PHPMatcherAssertionsTest.php</exclude>
-            <file phpVersion="5.4.0" phpVersionOperator=">=">tests/PHPUnit/PHPMatcherAssertionsTest.php</file>
+            <file phpVersion="7.0.0" phpVersionOperator=">=">tests/PHPUnit/PHPMatcherAssertionsTest.php</file>
         </testsuite>
     </testsuites>
     <filter>

src/PHPUnit/PHPMatcherAssertions.php

@@ -11,7 +11,7 @@ trait PHPMatcherAssertions
      */
     protected function assertMatchesPattern($pattern, $value, $message = '')
     {
-        \PHPUnit_Framework_TestCase::assertThat($value, self::matchesPattern($pattern), $message);
+        \PHPUnit\Framework\TestCase::assertThat($value, self::matchesPattern($pattern), $message);
     }
 
     /**
@@ -23,4 +23,4 @@ protected static function matchesPattern($pattern)
     {
         return new PHPMatcherConstraint($pattern);
     }
-}
+}

src/PHPUnit/PHPMatcherConstraint.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Factory\SimpleFactory;
 use Coduo\PHPMatcher\Matcher;
 
-final class PHPMatcherConstraint extends \PHPUnit_Framework_Constraint
+final class PHPMatcherConstraint extends \PHPUnit\Framework\Constraint\Constraint
 {
     /**
      * @var string
@@ -65,4 +65,4 @@ private function createMatcher()
 
         return $factory->createMatcher();
     }
-}
+}

src/PHPUnit/PHPMatcherTestCase.php

@@ -2,7 +2,7 @@
 
 namespace Coduo\PHPMatcher\PHPUnit;
 
-abstract class PHPMatcherTestCase extends \PHPUnit_Framework_TestCase
+abstract class PHPMatcherTestCase extends \PHPUnit\Framework\TestCase
 {
     /**
      * @param string $pattern
@@ -23,4 +23,4 @@ protected static function matchesPattern($pattern)
     {
         return new PHPMatcherConstraint($pattern);
     }
-}
+}

tests/Factory/SimpleFactoryTest.php

@@ -4,7 +4,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Factory\SimpleFactory;
 
-class SimpleFactoryTest extends \PHPUnit_Framework_TestCase
+class SimpleFactoryTest extends \PHPUnit\Framework\TestCase
 {
     public function test_creating_matcher()
     {

tests/LexerTest.php

@@ -4,7 +4,7 @@
 
 use Coduo\PHPMatcher\Lexer;
 
-class LexerTest extends \PHPUnit_Framework_TestCase
+class LexerTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider validStringValuesProvider

tests/Matcher/ArrayMatcherTest.php

@@ -6,7 +6,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Parser;
 
-class ArrayMatcherTest extends \PHPUnit_Framework_TestCase
+class ArrayMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Matcher\ArrayMatcher

tests/Matcher/BooleanMatcherTest.php

@@ -3,7 +3,7 @@
 
 use Coduo\PHPMatcher\Matcher\BooleanMatcher;
 
-class BooleanMatcherTest extends \PHPUnit_Framework_TestCase
+class BooleanMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider positiveCanMatchData

tests/Matcher/CallbackMatcherTest.php

@@ -3,7 +3,7 @@
 
 use Coduo\PHPMatcher\Matcher\CallbackMatcher;
 
-class CallbackMatcherTest extends \PHPUnit_Framework_TestCase
+class CallbackMatcherTest extends \PHPUnit\Framework\TestCase
 {
     function test_positive_can_match()
     {

tests/Matcher/ChainMatcherTest.php

@@ -4,7 +4,7 @@
 use Coduo\PHPMatcher\Matcher\ArrayMatcher;
 use Coduo\PHPMatcher\Matcher\ChainMatcher;
 
-class ChainMatcherTest extends \PHPUnit_Framework_TestCase
+class ChainMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ArrayMatcher
@@ -23,8 +23,8 @@ class ChainMatcherTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->firstMatcher = $this->getMock('Coduo\PHPMatcher\Matcher\ValueMatcher');
-        $this->secondMatcher = $this->getMock('Coduo\PHPMatcher\Matcher\ValueMatcher');
+        $this->firstMatcher = $this->createMock('Coduo\PHPMatcher\Matcher\ValueMatcher');
+        $this->secondMatcher = $this->createMock('Coduo\PHPMatcher\Matcher\ValueMatcher');
 
         $this->matcher = new ChainMatcher(array(
             $this->firstMatcher,

tests/Matcher/DoubleMatcherTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher\DoubleMatcher;
 use Coduo\PHPMatcher\Parser;
 
-class DoubleMatcherTest extends \PHPUnit_Framework_TestCase
+class DoubleMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var DoubleMatcher

tests/Matcher/ExpressionMatcherTest.php

@@ -3,7 +3,7 @@
 
 use Coduo\PHPMatcher\Matcher\ExpressionMatcher;
 
-class ExpressionMatcherTest extends \PHPUnit_Framework_TestCase
+class ExpressionMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider positiveCanMatchData

tests/Matcher/IntegerMatcherTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher\IntegerMatcher;
 use Coduo\PHPMatcher\Parser;
 
-class IntegerMatcherTest extends \PHPUnit_Framework_TestCase
+class IntegerMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var IntegerMatcher

tests/Matcher/JsonMatcherTest.php

@@ -6,7 +6,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Parser;
 
-class JsonMatcherTest extends \PHPUnit_Framework_TestCase
+class JsonMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Matcher\JsonMatcher

tests/Matcher/NullMatcherTest.php

@@ -3,7 +3,7 @@
 
 use Coduo\PHPMatcher\Matcher\NullMatcher;
 
-class NullMatcherTest extends \PHPUnit_Framework_TestCase
+class NullMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider positiveCanMatchData

tests/Matcher/NumberMatcherTest.php

@@ -3,7 +3,7 @@
 
 use Coduo\PHPMatcher\Matcher\NumberMatcher;
 
-class NumberMatcherTest extends \PHPUnit_Framework_TestCase
+class NumberMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider positiveCanMatchData

tests/Matcher/OrMatcherTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Parser;
 
-class OrMatcherTest extends \PHPUnit_Framework_TestCase
+class OrMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Matcher\OrMatcher

tests/Matcher/Pattern/Expander/ContainsTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\Contains;
 
-class ContainsTest extends \PHPUnit_Framework_TestCase
+class ContainsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesIgnoreCaseProvider

tests/Matcher/Pattern/Expander/CountTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\Count;
 
-class CountTest extends \PHPUnit_Framework_TestCase
+class CountTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesProvider

tests/Matcher/Pattern/Expander/EndsWithTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\EndsWith;
 
-class EndsWithTest extends \PHPUnit_Framework_TestCase
+class EndsWithTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider notIgnoringCaseExamplesProvider

tests/Matcher/Pattern/Expander/GreaterThanTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\GreaterThan;
 
-class GreaterThanTest extends \PHPUnit_Framework_TestCase
+class GreaterThanTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesProvider

tests/Matcher/Pattern/Expander/InArrayTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\InArray;
 
-class InArrayTest extends \PHPUnit_Framework_TestCase
+class InArrayTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesProvider

tests/Matcher/Pattern/Expander/IsDateTimeTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\IsDateTime;
 
-class IsDateTimeTest extends \PHPUnit_Framework_TestCase
+class IsDateTimeTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesDatesProvider

tests/Matcher/Pattern/Expander/IsEmailTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\IsEmail;
 
-class IsEmailTest extends \PHPUnit_Framework_TestCase
+class IsEmailTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesEmailsProvider

tests/Matcher/Pattern/Expander/IsEmptyTest.php

@@ -7,7 +7,7 @@
 /**
  * @author Benjamin Lazarecki <[email protected]>
  */
-class IsEmptyTest extends \PHPUnit_Framework_TestCase
+class IsEmptyTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesProvider

tests/Matcher/Pattern/Expander/IsNotEmptyTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\IsNotEmpty;
 
-class IsNotEmptyTest extends \PHPUnit_Framework_TestCase
+class IsNotEmptyTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesProvider

tests/Matcher/Pattern/Expander/IsUrlTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\IsUrl;
 
-class IsUrlTest extends \PHPUnit_Framework_TestCase
+class IsUrlTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesUrlsProvider

tests/Matcher/Pattern/Expander/LowerThanTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\LowerThan;
 
-class LowerThanTest extends \PHPUnit_Framework_TestCase
+class LowerThanTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesProvider

tests/Matcher/Pattern/Expander/MatchRegexTest.php

@@ -7,7 +7,7 @@
 /**
  * @author Benjamin Lazarecki <[email protected]>
  */
-class MatchRegexTest extends \PHPUnit_Framework_TestCase
+class MatchRegexTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider examplesProvider

tests/Matcher/Pattern/Expander/OneOfTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\Contains;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\OneOf;
 
-class OneOfTest extends \PHPUnit_Framework_TestCase
+class OneOfTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @expectedException \InvalidArgumentException

tests/Matcher/Pattern/Expander/StartsWithTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Matcher\Pattern\Expander\StartsWith;
 
-class StartsWithTest extends \PHPUnit_Framework_TestCase
+class StartsWithTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider notIgnoringCaseExamplesProvider

tests/Matcher/Pattern/RegexConverterTest.php

@@ -5,7 +5,7 @@
 use Coduo\PHPMatcher\Matcher\Pattern\TypePattern;
 use Coduo\PHPMatcher\Matcher\Pattern\RegexConverter;
 
-class RegexConverterTest  extends \PHPUnit_Framework_TestCase
+class RegexConverterTest  extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var RegexConverter

tests/Matcher/ScalarMatcherTest.php

@@ -3,7 +3,7 @@
 
 use Coduo\PHPMatcher\Matcher\ScalarMatcher;
 
-class ScalarMatcherTest extends \PHPUnit_Framework_TestCase
+class ScalarMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @dataProvider positiveCanMatches

tests/Matcher/StringMatcherTest.php

@@ -6,7 +6,7 @@
 use Coduo\PHPMatcher\Matcher\StringMatcher;
 use Coduo\PHPMatcher\Parser;
 
-class StringMatcherTest extends \PHPUnit_Framework_TestCase
+class StringMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var StringMatcher

tests/Matcher/TextMatcherTest.php

@@ -6,7 +6,7 @@
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Parser;
 
-class TextMatcherTest extends \PHPUnit_Framework_TestCase
+class TextMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Matcher\TextMatcher

tests/Matcher/UuidMatcherTest.php

@@ -4,7 +4,7 @@
 
 use Coduo\PHPMatcher\Matcher\UuidMatcher;
 
-class UuidMatcherTest extends \PHPUnit_Framework_TestCase
+class UuidMatcherTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var UuidMatcher

tests/Matcher/WildcardMatcherTest.php

@@ -3,7 +3,7 @@
 
 use Coduo\PHPMatcher\Matcher\WildcardMatcher;
 
-class WildcardMatcherTest extends \PHPUnit_Framework_TestCase
+class WildcardMatcherTest extends \PHPUnit\Framework\TestCase
 {
 
     /**