diff --git a/.travis.yml b/.travis.yml index f1651ee7..48733d91 100644 --- a/.travis.yml +++ b/.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 diff --git a/composer.json b/composer.json index 50a49813..a2586f54 100644 --- a/composer.json +++ b/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": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 8668c2cb..30afd0f2 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -7,7 +7,7 @@ ./tests/ tests/PHPUnit/PHPMatcherAssertionsTest.php - tests/PHPUnit/PHPMatcherAssertionsTest.php + tests/PHPUnit/PHPMatcherAssertionsTest.php diff --git a/src/PHPUnit/PHPMatcherAssertions.php b/src/PHPUnit/PHPMatcherAssertions.php index 4a71afc1..338777a6 100644 --- a/src/PHPUnit/PHPMatcherAssertions.php +++ b/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); } -} \ No newline at end of file +} diff --git a/src/PHPUnit/PHPMatcherConstraint.php b/src/PHPUnit/PHPMatcherConstraint.php index 8a30c762..5c19b04f 100644 --- a/src/PHPUnit/PHPMatcherConstraint.php +++ b/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(); } -} \ No newline at end of file +} diff --git a/src/PHPUnit/PHPMatcherTestCase.php b/src/PHPUnit/PHPMatcherTestCase.php index 42c92762..32cba249 100644 --- a/src/PHPUnit/PHPMatcherTestCase.php +++ b/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); } -} \ No newline at end of file +} diff --git a/tests/Factory/SimpleFactoryTest.php b/tests/Factory/SimpleFactoryTest.php index 241d6ae5..d922bc95 100644 --- a/tests/Factory/SimpleFactoryTest.php +++ b/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() { diff --git a/tests/LexerTest.php b/tests/LexerTest.php index f4330f39..6a7a5d55 100644 --- a/tests/LexerTest.php +++ b/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 diff --git a/tests/Matcher/ArrayMatcherTest.php b/tests/Matcher/ArrayMatcherTest.php index eb009740..e9481adf 100644 --- a/tests/Matcher/ArrayMatcherTest.php +++ b/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 diff --git a/tests/Matcher/BooleanMatcherTest.php b/tests/Matcher/BooleanMatcherTest.php index 752d4073..6ffcb473 100644 --- a/tests/Matcher/BooleanMatcherTest.php +++ b/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 diff --git a/tests/Matcher/CallbackMatcherTest.php b/tests/Matcher/CallbackMatcherTest.php index f7ce5837..5dba0498 100644 --- a/tests/Matcher/CallbackMatcherTest.php +++ b/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() { diff --git a/tests/Matcher/ChainMatcherTest.php b/tests/Matcher/ChainMatcherTest.php index 27beddcb..74204ecc 100644 --- a/tests/Matcher/ChainMatcherTest.php +++ b/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, diff --git a/tests/Matcher/DoubleMatcherTest.php b/tests/Matcher/DoubleMatcherTest.php index 33b67e27..f4916eda 100644 --- a/tests/Matcher/DoubleMatcherTest.php +++ b/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 diff --git a/tests/Matcher/ExpressionMatcherTest.php b/tests/Matcher/ExpressionMatcherTest.php index f511fec6..d895090a 100644 --- a/tests/Matcher/ExpressionMatcherTest.php +++ b/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 diff --git a/tests/Matcher/IntegerMatcherTest.php b/tests/Matcher/IntegerMatcherTest.php index 0e164dc3..f2401706 100644 --- a/tests/Matcher/IntegerMatcherTest.php +++ b/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 diff --git a/tests/Matcher/JsonMatcherTest.php b/tests/Matcher/JsonMatcherTest.php index c89aa296..9fe42880 100644 --- a/tests/Matcher/JsonMatcherTest.php +++ b/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 diff --git a/tests/Matcher/NullMatcherTest.php b/tests/Matcher/NullMatcherTest.php index 3b4426fb..891f03fb 100644 --- a/tests/Matcher/NullMatcherTest.php +++ b/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 diff --git a/tests/Matcher/NumberMatcherTest.php b/tests/Matcher/NumberMatcherTest.php index 6fa18613..26995234 100644 --- a/tests/Matcher/NumberMatcherTest.php +++ b/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 diff --git a/tests/Matcher/OrMatcherTest.php b/tests/Matcher/OrMatcherTest.php index 5ec8909f..a8be5833 100644 --- a/tests/Matcher/OrMatcherTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/ContainsTest.php b/tests/Matcher/Pattern/Expander/ContainsTest.php index 1c25056e..73daee95 100644 --- a/tests/Matcher/Pattern/Expander/ContainsTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/CountTest.php b/tests/Matcher/Pattern/Expander/CountTest.php index cb99fd22..5e61969e 100644 --- a/tests/Matcher/Pattern/Expander/CountTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/EndsWithTest.php b/tests/Matcher/Pattern/Expander/EndsWithTest.php index 4c0aac50..3ad04e5e 100644 --- a/tests/Matcher/Pattern/Expander/EndsWithTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/GreaterThanTest.php b/tests/Matcher/Pattern/Expander/GreaterThanTest.php index b143fd52..2110f13a 100644 --- a/tests/Matcher/Pattern/Expander/GreaterThanTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/InArrayTest.php b/tests/Matcher/Pattern/Expander/InArrayTest.php index e30a0687..73d2a334 100644 --- a/tests/Matcher/Pattern/Expander/InArrayTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/IsDateTimeTest.php b/tests/Matcher/Pattern/Expander/IsDateTimeTest.php index 151c05e7..d3b0bc54 100644 --- a/tests/Matcher/Pattern/Expander/IsDateTimeTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/IsEmailTest.php b/tests/Matcher/Pattern/Expander/IsEmailTest.php index 1f554540..7789a82f 100644 --- a/tests/Matcher/Pattern/Expander/IsEmailTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/IsEmptyTest.php b/tests/Matcher/Pattern/Expander/IsEmptyTest.php index fc13e6a0..908f59b2 100644 --- a/tests/Matcher/Pattern/Expander/IsEmptyTest.php +++ b/tests/Matcher/Pattern/Expander/IsEmptyTest.php @@ -7,7 +7,7 @@ /** * @author Benjamin Lazarecki */ -class IsEmptyTest extends \PHPUnit_Framework_TestCase +class IsEmptyTest extends \PHPUnit\Framework\TestCase { /** * @dataProvider examplesProvider diff --git a/tests/Matcher/Pattern/Expander/IsNotEmptyTest.php b/tests/Matcher/Pattern/Expander/IsNotEmptyTest.php index 507ca8fd..cf53d5a2 100644 --- a/tests/Matcher/Pattern/Expander/IsNotEmptyTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/IsUrlTest.php b/tests/Matcher/Pattern/Expander/IsUrlTest.php index db5085aa..01000969 100644 --- a/tests/Matcher/Pattern/Expander/IsUrlTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/LowerThanTest.php b/tests/Matcher/Pattern/Expander/LowerThanTest.php index f7f47435..428b964e 100644 --- a/tests/Matcher/Pattern/Expander/LowerThanTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/MatchRegexTest.php b/tests/Matcher/Pattern/Expander/MatchRegexTest.php index 58b97a21..53a2bcfb 100644 --- a/tests/Matcher/Pattern/Expander/MatchRegexTest.php +++ b/tests/Matcher/Pattern/Expander/MatchRegexTest.php @@ -7,7 +7,7 @@ /** * @author Benjamin Lazarecki */ -class MatchRegexTest extends \PHPUnit_Framework_TestCase +class MatchRegexTest extends \PHPUnit\Framework\TestCase { /** * @dataProvider examplesProvider diff --git a/tests/Matcher/Pattern/Expander/OneOfTest.php b/tests/Matcher/Pattern/Expander/OneOfTest.php index 9a309fd2..c3b37c3c 100644 --- a/tests/Matcher/Pattern/Expander/OneOfTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/Expander/StartsWithTest.php b/tests/Matcher/Pattern/Expander/StartsWithTest.php index 37e4c1f2..29799230 100644 --- a/tests/Matcher/Pattern/Expander/StartsWithTest.php +++ b/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 diff --git a/tests/Matcher/Pattern/RegexConverterTest.php b/tests/Matcher/Pattern/RegexConverterTest.php index 8f8a740c..872f1a48 100644 --- a/tests/Matcher/Pattern/RegexConverterTest.php +++ b/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 diff --git a/tests/Matcher/ScalarMatcherTest.php b/tests/Matcher/ScalarMatcherTest.php index a4de1836..73795268 100644 --- a/tests/Matcher/ScalarMatcherTest.php +++ b/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 diff --git a/tests/Matcher/StringMatcherTest.php b/tests/Matcher/StringMatcherTest.php index 81d90dc0..6fb46e47 100644 --- a/tests/Matcher/StringMatcherTest.php +++ b/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 diff --git a/tests/Matcher/TextMatcherTest.php b/tests/Matcher/TextMatcherTest.php index 2434ecc5..7a50c2cd 100644 --- a/tests/Matcher/TextMatcherTest.php +++ b/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 diff --git a/tests/Matcher/UuidMatcherTest.php b/tests/Matcher/UuidMatcherTest.php index 1267ea9d..6b3ca6d7 100644 --- a/tests/Matcher/UuidMatcherTest.php +++ b/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 diff --git a/tests/Matcher/WildcardMatcherTest.php b/tests/Matcher/WildcardMatcherTest.php index 48075314..8dc3bd6c 100644 --- a/tests/Matcher/WildcardMatcherTest.php +++ b/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 { /** diff --git a/tests/Matcher/XmlMatcherTest.php b/tests/Matcher/XmlMatcherTest.php index 7f38bd0f..d7b302ae 100644 --- a/tests/Matcher/XmlMatcherTest.php +++ b/tests/Matcher/XmlMatcherTest.php @@ -6,7 +6,7 @@ use Coduo\PHPMatcher\Matcher; use Coduo\PHPMatcher\Parser; -class XmlMatcherTest extends \PHPUnit_Framework_TestCase +class XmlMatcherTest extends \PHPUnit\Framework\TestCase { /** * @var Matcher\XmlMatcher diff --git a/tests/MatcherTest.php b/tests/MatcherTest.php index dc7db940..bea8b381 100644 --- a/tests/MatcherTest.php +++ b/tests/MatcherTest.php @@ -7,7 +7,7 @@ use Coduo\PHPMatcher\Parser; use Coduo\PHPMatcher\PHPMatcher; -class MatcherTest extends \PHPUnit_Framework_TestCase +class MatcherTest extends \PHPUnit\Framework\TestCase { /** * @var Matcher diff --git a/tests/PHPUnit/PHPMatcherAssertionsTest.php b/tests/PHPUnit/PHPMatcherAssertionsTest.php index bc394055..ff46bca0 100644 --- a/tests/PHPUnit/PHPMatcherAssertionsTest.php +++ b/tests/PHPUnit/PHPMatcherAssertionsTest.php @@ -4,7 +4,7 @@ use Coduo\PHPMatcher\PHPUnit\PHPMatcherAssertions; -class PHPMatcherAssertionsTest extends \PHPUnit_Framework_TestCase +class PHPMatcherAssertionsTest extends \PHPUnit\Framework\TestCase { use PHPMatcherAssertions; @@ -14,7 +14,7 @@ public function test_it_asserts_if_a_value_matches_the_pattern() } /** - * @expectedException \PHPUnit_Framework_ExpectationFailedException + * @expectedException \PHPUnit\Framework\AssertionFailedError * @expectedExceptionMessage Failed asserting that '{"foo":"bar"}' matches the pattern */ public function test_it_throws_an_expectation_failed_exception_if_a_value_does_not_match_the_pattern() @@ -23,7 +23,7 @@ public function test_it_throws_an_expectation_failed_exception_if_a_value_does_n } /** - * @expectedException \PHPUnit_Framework_ExpectationFailedException + * @expectedException \PHPUnit\Framework\AssertionFailedError * @expectedExceptionMessage Failed asserting that 42 matches the pattern. */ public function test_it_creates_a_constraint_for_stubs() diff --git a/tests/PHPUnit/PHPMatcherConstraintTest.php b/tests/PHPUnit/PHPMatcherConstraintTest.php index a0870977..a4f87a94 100644 --- a/tests/PHPUnit/PHPMatcherConstraintTest.php +++ b/tests/PHPUnit/PHPMatcherConstraintTest.php @@ -4,11 +4,11 @@ use Coduo\PHPMatcher\PHPUnit\PHPMatcherConstraint; -class PHPMatcherConstraintTest extends \PHPUnit_Framework_TestCase +class PHPMatcherConstraintTest extends \PHPUnit\Framework\TestCase { public function test_it_is_a_phpunit_constraint() { - $this->assertInstanceOf('PHPUnit_Framework_Constraint', new PHPMatcherConstraint('@string@')); + $this->assertInstanceOf('PHPUnit\Framework\Constraint\Constraint', new PHPMatcherConstraint('@string@')); } public function test_it_returns_true_if_a_value_matches_the_pattern() @@ -33,7 +33,7 @@ public function test_it_returns_false_if_a_pattern_is_not_a_string() } /** - * @expectedException \PHPUnit_Framework_ExpectationFailedException + * @expectedException \PHPUnit\Framework\AssertionFailedError * @expectedExceptionMessage Failed asserting that 42 matches the pattern */ public function test_it_sets_a_failure_description_if_not_given() @@ -44,7 +44,7 @@ public function test_it_sets_a_failure_description_if_not_given() } /** - * @expectedException \PHPUnit_Framework_ExpectationFailedException + * @expectedException \PHPUnit\Framework\AssertionFailedError * @expectedExceptionMessage integer "42" is not a valid string */ public function test_it_sets_additional_failure_description() diff --git a/tests/PHPUnit/PHPMatcherTestCaseTest.php b/tests/PHPUnit/PHPMatcherTestCaseTest.php index b5f63a22..8c954d4f 100644 --- a/tests/PHPUnit/PHPMatcherTestCaseTest.php +++ b/tests/PHPUnit/PHPMatcherTestCaseTest.php @@ -12,7 +12,7 @@ public function test_it_asserts_if_a_value_matches_the_pattern() } /** - * @expectedException \PHPUnit_Framework_ExpectationFailedException + * @expectedException \PHPUnit\Framework\AssertionFailedError * @expectedExceptionMessage Failed asserting that '{"foo":"bar"}' matches the pattern */ public function test_it_throws_an_expectation_failed_exception_if_a_value_does_not_match_the_pattern() @@ -21,7 +21,7 @@ public function test_it_throws_an_expectation_failed_exception_if_a_value_does_n } /** - * @expectedException \PHPUnit_Framework_ExpectationFailedException + * @expectedException \PHPUnit\Framework\AssertionFailedError * @expectedExceptionMessage Failed asserting that 42 matches the pattern. */ public function test_it_creates_a_constraint_for_stubs() diff --git a/tests/ParserSyntaxErrorTest.php b/tests/ParserSyntaxErrorTest.php index 0ca75c91..4ec037f6 100644 --- a/tests/ParserSyntaxErrorTest.php +++ b/tests/ParserSyntaxErrorTest.php @@ -5,7 +5,7 @@ use Coduo\PHPMatcher\Lexer; use Coduo\PHPMatcher\Parser; -class ParserSyntaxErrorTest extends \PHPUnit_Framework_TestCase +class ParserSyntaxErrorTest extends \PHPUnit\Framework\TestCase { /** * @var Parser diff --git a/tests/ParserTest.php b/tests/ParserTest.php index 9f47c607..5d9be863 100644 --- a/tests/ParserTest.php +++ b/tests/ParserTest.php @@ -6,7 +6,7 @@ use Coduo\PHPMatcher\Lexer; use Coduo\PHPMatcher\Parser; -class ParserTest extends \PHPUnit_Framework_TestCase +class ParserTest extends \PHPUnit\Framework\TestCase { /** * @var Parser