From 93ce9cb93ae1fb07c19ffb3d047ddce10f3f47d7 Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Sat, 4 Nov 2017 08:21:40 -0200 Subject: [PATCH] Updated to PHPUnit 6 --- CONTRIBUTING.md | 4 ++-- composer.json | 2 +- tests/library/Rules/RuleTestCase.php | 3 ++- tests/unit/Exceptions/CheckExceptionsTest.php | 3 ++- tests/unit/Exceptions/NestedValidationExceptionTest.php | 4 +++- tests/unit/Exceptions/ValidationExceptionTest.php | 3 ++- tests/unit/FactoryTest.php | 3 ++- tests/unit/Rules/AbstractCompositeTest.php | 3 ++- tests/unit/Rules/AbstractCtypeRuleTest.php | 4 +++- tests/unit/Rules/AbstractFilterRuleTest.php | 4 +++- tests/unit/Rules/AbstractRegexRuleTest.php | 4 +++- tests/unit/Rules/AbstractRelatedTest.php | 3 ++- tests/unit/Rules/AbstractRuleTest.php | 3 ++- tests/unit/Rules/AbstractSearcherTest.php | 4 +++- tests/unit/Rules/AbstractWrapperTest.php | 3 ++- tests/unit/Rules/AgeTest.php | 3 ++- tests/unit/Rules/AllOfTest.php | 4 +++- tests/unit/Rules/AlnumTest.php | 4 +++- tests/unit/Rules/AlphaTest.php | 4 +++- tests/unit/Rules/AlwaysInvalidTest.php | 4 +++- tests/unit/Rules/AlwaysValidTest.php | 4 +++- tests/unit/Rules/AnyOfTest.php | 4 +++- tests/unit/Rules/AttributeTest.php | 4 +++- tests/unit/Rules/BaseTest.php | 4 +++- tests/unit/Rules/BetweenTest.php | 3 ++- tests/unit/Rules/BoolTypeTest.php | 4 +++- tests/unit/Rules/BsnTest.php | 4 ++-- tests/unit/Rules/CallTest.php | 4 +++- tests/unit/Rules/CallableTypeTest.php | 4 +++- tests/unit/Rules/CallbackTest.php | 4 +++- tests/unit/Rules/CharsetTest.php | 4 +++- tests/unit/Rules/CnhTest.php | 4 +++- tests/unit/Rules/CnpjTest.php | 4 +++- tests/unit/Rules/CntrlTest.php | 4 +++- tests/unit/Rules/ConsonantTest.php | 4 +++- tests/unit/Rules/ContainsTest.php | 4 +++- tests/unit/Rules/CountryCodeTest.php | 4 +++- tests/unit/Rules/CpfTest.php | 4 +++- tests/unit/Rules/CreditCardTest.php | 2 +- tests/unit/Rules/DateTimeTest.php | 3 ++- tests/unit/Rules/DigitTest.php | 4 +++- tests/unit/Rules/DirectoryTest.php | 4 +++- tests/unit/Rules/DomainTest.php | 3 ++- tests/unit/Rules/EmailTest.php | 3 ++- tests/unit/Rules/EndsWithTest.php | 4 +++- tests/unit/Rules/EqualsTest.php | 3 ++- tests/unit/Rules/EvenTest.php | 4 +++- tests/unit/Rules/ExecutableTest.php | 4 +++- tests/unit/Rules/ExistsTest.php | 4 ++-- tests/unit/Rules/ExtensionTest.php | 4 ++-- tests/unit/Rules/FactorTest.php | 7 ++++--- tests/unit/Rules/FalseValTest.php | 4 +++- tests/unit/Rules/FileTest.php | 4 +++- tests/unit/Rules/FilterVarTest.php | 4 +++- tests/unit/Rules/FiniteTest.php | 4 +++- tests/unit/Rules/FloatValTest.php | 4 +++- tests/unit/Rules/GraphTest.php | 4 +++- tests/unit/Rules/HexRgbColorTest.php | 4 +++- tests/unit/Rules/IdenticalTest.php | 3 ++- tests/unit/Rules/InTest.php | 4 +++- tests/unit/Rules/InfiniteTest.php | 4 +++- tests/unit/Rules/InstanceTest.php | 4 +++- tests/unit/Rules/IntTypeTest.php | 4 +++- tests/unit/Rules/IntValTest.php | 4 +++- tests/unit/Rules/IpTest.php | 4 +++- tests/unit/Rules/KeyNestedTest.php | 3 ++- tests/unit/Rules/KeySetTest.php | 4 ++-- tests/unit/Rules/KeyTest.php | 4 +++- tests/unit/Rules/KeyValueTest.php | 4 ++-- tests/unit/Rules/LeapDateTest.php | 3 ++- tests/unit/Rules/LeapYearTest.php | 3 ++- tests/unit/Rules/LengthTest.php | 4 +++- tests/unit/Rules/LowercaseTest.php | 4 +++- tests/unit/Rules/MacAddressTest.php | 4 +++- tests/unit/Rules/MaxTest.php | 4 +++- tests/unit/Rules/MimetypeTest.php | 4 ++-- tests/unit/Rules/MinTest.php | 3 ++- tests/unit/Rules/MininumAgeTest.php | 4 +++- tests/unit/Rules/MultipleTest.php | 4 +++- tests/unit/Rules/NegativeTest.php | 4 +++- tests/unit/Rules/NfeAccessKeyTest.php | 4 +++- tests/unit/Rules/NoTest.php | 4 +++- tests/unit/Rules/NoWhitespaceTest.php | 4 +++- tests/unit/Rules/NoneOfTest.php | 4 +++- tests/unit/Rules/NotBlankTest.php | 3 ++- tests/unit/Rules/NotEmptyTest.php | 4 +++- tests/unit/Rules/NotOptionalTest.php | 3 ++- tests/unit/Rules/NotTest.php | 3 ++- tests/unit/Rules/NullTypeTest.php | 4 +++- tests/unit/Rules/NumericValTest.php | 4 +++- tests/unit/Rules/ObjectTypeTest.php | 4 +++- tests/unit/Rules/OddTest.php | 4 +++- tests/unit/Rules/OneOfTest.php | 4 +++- tests/unit/Rules/OptionalTest.php | 3 ++- tests/unit/Rules/PerfectSquareTest.php | 4 +++- tests/unit/Rules/PhoneTest.php | 4 +++- tests/unit/Rules/PositiveTest.php | 4 +++- tests/unit/Rules/PostalCodeTest.php | 4 +++- tests/unit/Rules/PrimeNumberTest.php | 4 +++- tests/unit/Rules/PrntTest.php | 4 +++- tests/unit/Rules/PunctTest.php | 4 +++- tests/unit/Rules/ReadableTest.php | 4 +++- tests/unit/Rules/ResourceTypeTest.php | 4 +++- tests/unit/Rules/RomanTest.php | 4 +++- tests/unit/Rules/ScalarValTest.php | 4 +++- tests/unit/Rules/SfTest.php | 3 ++- tests/unit/Rules/SizeTest.php | 4 ++-- tests/unit/Rules/SlugTest.php | 4 +++- tests/unit/Rules/SortedTest.php | 4 +++- tests/unit/Rules/SpaceTest.php | 4 +++- tests/unit/Rules/StartsWithTest.php | 4 +++- tests/unit/Rules/StringTypeTest.php | 4 +++- tests/unit/Rules/SubdivisionCodeTest.php | 4 ++-- tests/unit/Rules/SymbolicLinkTest.php | 4 +++- tests/unit/Rules/TldTest.php | 4 +++- tests/unit/Rules/TrueValTest.php | 4 +++- tests/unit/Rules/TypeTest.php | 3 ++- tests/unit/Rules/UploadedTest.php | 4 +++- tests/unit/Rules/UppercaseTest.php | 4 +++- tests/unit/Rules/UrlTest.php | 4 +++- tests/unit/Rules/VatinTest.php | 3 ++- tests/unit/Rules/VersionTest.php | 4 +++- tests/unit/Rules/VideoUrlTest.php | 4 +++- tests/unit/Rules/VowelTest.php | 4 +++- tests/unit/Rules/WritableTest.php | 4 +++- tests/unit/Rules/XdigitTest.php | 4 +++- tests/unit/Rules/YesTest.php | 4 +++- tests/unit/Rules/ZendTest.php | 3 ++- tests/unit/ValidatorTest.php | 5 +++-- 129 files changed, 348 insertions(+), 141 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ca3b1319..0a0629fe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -110,9 +110,9 @@ class HelloWorldException extends ValidationException Finally, we need to test if everything is running smooth. We have `RuleTestCase` that allows us to make easier to test rules, but you fell free to use the -`PHPUnit_Framework_TestCase` if you want or you need it's necessary. +`PHPUnit\Framework\TestCase` if you want or you need it's necessary. -The `RuleTestCase` extends PHPUnit's `PHPUnit_Framework_TestCase` class, so you +The `RuleTestCase` extends PHPUnit's `PHPUnit\Framework\TestCase` class, so you are able to use any methods of it. By extending `RuleTestCase` you should implement two methods that should return a [data provider][] with the rule as first item of the arrays: diff --git a/composer.json b/composer.json index b0bf881b..34ce86c0 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "egulias/email-validator": "^2.0", "malukenho/docheader": "^0.1.4", "mikey179/vfsStream": "^1.6", - "phpunit/phpunit": "^5.6", + "phpunit/phpunit": "^6.4", "symfony/validator": "^3.0", "zendframework/zend-validator": "^2.0" }, diff --git a/tests/library/Rules/RuleTestCase.php b/tests/library/Rules/RuleTestCase.php index fa8f03c4..bb0fc179 100644 --- a/tests/library/Rules/RuleTestCase.php +++ b/tests/library/Rules/RuleTestCase.php @@ -11,10 +11,11 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Exceptions\ValidationException; use Respect\Validation\Validatable; -abstract class RuleTestCase extends \PHPUnit_Framework_TestCase +abstract class RuleTestCase extends TestCase { /** * It is to provide constructor arguments and. diff --git a/tests/unit/Exceptions/CheckExceptionsTest.php b/tests/unit/Exceptions/CheckExceptionsTest.php index beb3311a..f8839779 100644 --- a/tests/unit/Exceptions/CheckExceptionsTest.php +++ b/tests/unit/Exceptions/CheckExceptionsTest.php @@ -12,9 +12,10 @@ namespace Respect\Validation\Exceptions; use DirectoryIterator; +use PHPUnit\Framework\TestCase; use ReflectionClass; -class CheckExceptionsTest extends \PHPUnit_Framework_TestCase +class CheckExceptionsTest extends TestCase { protected $deprecateds = []; diff --git a/tests/unit/Exceptions/NestedValidationExceptionTest.php b/tests/unit/Exceptions/NestedValidationExceptionTest.php index 0109d1ec..06b62561 100644 --- a/tests/unit/Exceptions/NestedValidationExceptionTest.php +++ b/tests/unit/Exceptions/NestedValidationExceptionTest.php @@ -11,6 +11,8 @@ namespace Respect\Validation\Exceptions; +use PHPUnit\Framework\TestCase; + /** * phpunit has an issue with mocking exceptions when in HHVM: * https://github.com/sebastianbergmann/phpunit-mock-objects/issues/207. @@ -19,7 +21,7 @@ class PrivateNestedValidationException extends NestedValidationException { } -class NestedValidationExceptionTest extends \PHPUnit_Framework_TestCase +class NestedValidationExceptionTest extends TestCase { public function testGetRelatedShouldReturnExceptionAddedByAddRelated() { diff --git a/tests/unit/Exceptions/ValidationExceptionTest.php b/tests/unit/Exceptions/ValidationExceptionTest.php index f839194d..4bc3ca47 100644 --- a/tests/unit/Exceptions/ValidationExceptionTest.php +++ b/tests/unit/Exceptions/ValidationExceptionTest.php @@ -14,10 +14,11 @@ namespace Respect\Validation\Exceptions; use ArrayIterator; use DateTime; use Exception; +use PHPUnit\Framework\TestCase; use SplFileInfo; use stdClass; -class ValidationExceptionTest extends \PHPUnit_Framework_TestCase +class ValidationExceptionTest extends TestCase { public function testItImplementsExceptionInterface() { diff --git a/tests/unit/FactoryTest.php b/tests/unit/FactoryTest.php index 7ef0522a..a76f86d5 100644 --- a/tests/unit/FactoryTest.php +++ b/tests/unit/FactoryTest.php @@ -11,12 +11,13 @@ namespace Respect\Validation; +use PHPUnit\Framework\TestCase; use Respect\Validation\Rules\Uppercase; /** * @covers \Respect\Validation\Factory */ -class FactoryTest extends \PHPUnit_Framework_TestCase +class FactoryTest extends TestCase { public function testShouldHaveRulePrefixesByDefault() { diff --git a/tests/unit/Rules/AbstractCompositeTest.php b/tests/unit/Rules/AbstractCompositeTest.php index 93304de5..b6232a53 100644 --- a/tests/unit/Rules/AbstractCompositeTest.php +++ b/tests/unit/Rules/AbstractCompositeTest.php @@ -11,9 +11,10 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Validatable; -class AbstractCompositeTest extends \PHPUnit_Framework_TestCase +class AbstractCompositeTest extends TestCase { public function testShouldDefineNameForInternalWhenAppendRuleToCompositeRule() { diff --git a/tests/unit/Rules/AbstractCtypeRuleTest.php b/tests/unit/Rules/AbstractCtypeRuleTest.php index 2cb52b9b..d3394621 100644 --- a/tests/unit/Rules/AbstractCtypeRuleTest.php +++ b/tests/unit/Rules/AbstractCtypeRuleTest.php @@ -11,7 +11,9 @@ namespace Respect\Validation\Rules; -class AbstractCtypeRuleTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class AbstractCtypeRuleTest extends TestCase { public function testValidateCleanShouldReturnTrueWhenCtypeFunctionReturnsTrue() { diff --git a/tests/unit/Rules/AbstractFilterRuleTest.php b/tests/unit/Rules/AbstractFilterRuleTest.php index db08d243..2e6de0d5 100644 --- a/tests/unit/Rules/AbstractFilterRuleTest.php +++ b/tests/unit/Rules/AbstractFilterRuleTest.php @@ -11,7 +11,9 @@ namespace Respect\Validation\Rules; -class AbstractFilterRuleTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class AbstractFilterRuleTest extends TestCase { /** * @expectedException \Respect\Validation\Exceptions\ComponentException diff --git a/tests/unit/Rules/AbstractRegexRuleTest.php b/tests/unit/Rules/AbstractRegexRuleTest.php index a6dff461..0eaba866 100644 --- a/tests/unit/Rules/AbstractRegexRuleTest.php +++ b/tests/unit/Rules/AbstractRegexRuleTest.php @@ -11,7 +11,9 @@ namespace Respect\Validation\Rules; -class AbstractRegexRuleTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class AbstractRegexRuleTest extends TestCase { public function testValidateCleanShouldReturnOneIfPatternIsFound() { diff --git a/tests/unit/Rules/AbstractRelatedTest.php b/tests/unit/Rules/AbstractRelatedTest.php index a901dfd9..468ce1ca 100644 --- a/tests/unit/Rules/AbstractRelatedTest.php +++ b/tests/unit/Rules/AbstractRelatedTest.php @@ -11,9 +11,10 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Validatable; -final class AbstractRelatedTest extends \PHPUnit_Framework_TestCase +final class AbstractRelatedTest extends TestCase { public function providerForOperations() { diff --git a/tests/unit/Rules/AbstractRuleTest.php b/tests/unit/Rules/AbstractRuleTest.php index 403c5bf0..3a769b02 100644 --- a/tests/unit/Rules/AbstractRuleTest.php +++ b/tests/unit/Rules/AbstractRuleTest.php @@ -11,9 +11,10 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Exceptions\ValidationException; -class AbstractRuleTest extends \PHPUnit_Framework_TestCase +class AbstractRuleTest extends TestCase { public function providerForTrueAndFalse() { diff --git a/tests/unit/Rules/AbstractSearcherTest.php b/tests/unit/Rules/AbstractSearcherTest.php index d6a7f73f..639a142d 100644 --- a/tests/unit/Rules/AbstractSearcherTest.php +++ b/tests/unit/Rules/AbstractSearcherTest.php @@ -11,7 +11,9 @@ namespace Respect\Validation\Rules; -class AbstractSearcherTest extends \PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class AbstractSearcherTest extends TestCase { protected $searcherRuleMock; diff --git a/tests/unit/Rules/AbstractWrapperTest.php b/tests/unit/Rules/AbstractWrapperTest.php index 4104a717..d2f71342 100644 --- a/tests/unit/Rules/AbstractWrapperTest.php +++ b/tests/unit/Rules/AbstractWrapperTest.php @@ -11,10 +11,11 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use ReflectionObject; use Respect\Validation\Validatable; -class AbstractWrapperTest extends \PHPUnit_Framework_TestCase +class AbstractWrapperTest extends TestCase { /** * @expectedException \Respect\Validation\Exceptions\ComponentException diff --git a/tests/unit/Rules/AgeTest.php b/tests/unit/Rules/AgeTest.php index bda72a33..42989875 100644 --- a/tests/unit/Rules/AgeTest.php +++ b/tests/unit/Rules/AgeTest.php @@ -12,13 +12,14 @@ namespace Respect\Validation\Rules; use DateTime; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\Age * @covers \Respect\Validation\Exceptions\AgeException */ -class AgeTest extends \PHPUnit_Framework_TestCase +class AgeTest extends TestCase { /** * @expectedException \Respect\Validation\Exceptions\ComponentException diff --git a/tests/unit/Rules/AllOfTest.php b/tests/unit/Rules/AllOfTest.php index 61a136c5..07dc2777 100644 --- a/tests/unit/Rules/AllOfTest.php +++ b/tests/unit/Rules/AllOfTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\AllOf * @covers \Respect\Validation\Exceptions\AllOfException */ -class AllOfTest extends \PHPUnit_Framework_TestCase +class AllOfTest extends TestCase { public function testRemoveRulesShouldRemoveAllRules() { diff --git a/tests/unit/Rules/AlnumTest.php b/tests/unit/Rules/AlnumTest.php index a60bcdb4..c96932dc 100644 --- a/tests/unit/Rules/AlnumTest.php +++ b/tests/unit/Rules/AlnumTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Alnum * @covers \Respect\Validation\Exceptions\AlnumException */ -class AlnumTest extends \PHPUnit_Framework_TestCase +class AlnumTest extends TestCase { /** * @dataProvider providerForValidAlnum diff --git a/tests/unit/Rules/AlphaTest.php b/tests/unit/Rules/AlphaTest.php index 5f323f72..e91bbb26 100644 --- a/tests/unit/Rules/AlphaTest.php +++ b/tests/unit/Rules/AlphaTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Alpha * @covers \Respect\Validation\Exceptions\AlphaException */ -class AlphaTest extends \PHPUnit_Framework_TestCase +class AlphaTest extends TestCase { /** * @dataProvider providerForValidAlpha diff --git a/tests/unit/Rules/AlwaysInvalidTest.php b/tests/unit/Rules/AlwaysInvalidTest.php index 10a255e7..e2433590 100644 --- a/tests/unit/Rules/AlwaysInvalidTest.php +++ b/tests/unit/Rules/AlwaysInvalidTest.php @@ -11,11 +11,13 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\AlwaysInvalid */ -class AlwaysInvalidTest extends \PHPUnit_Framework_TestCase +class AlwaysInvalidTest extends TestCase { public function providerForValidAlwaysInvalid() { diff --git a/tests/unit/Rules/AlwaysValidTest.php b/tests/unit/Rules/AlwaysValidTest.php index 9bf55005..f3ad6e63 100644 --- a/tests/unit/Rules/AlwaysValidTest.php +++ b/tests/unit/Rules/AlwaysValidTest.php @@ -11,11 +11,13 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\AlwaysValid */ -class AlwaysValidTest extends \PHPUnit_Framework_TestCase +class AlwaysValidTest extends TestCase { public function providerForValidAlwaysValid() { diff --git a/tests/unit/Rules/AnyOfTest.php b/tests/unit/Rules/AnyOfTest.php index d103c7c7..4a52d619 100644 --- a/tests/unit/Rules/AnyOfTest.php +++ b/tests/unit/Rules/AnyOfTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\AnyOf * @covers \Respect\Validation\Exceptions\AnyOfException */ -class AnyOfTest extends \PHPUnit_Framework_TestCase +class AnyOfTest extends TestCase { public function testValid() { diff --git a/tests/unit/Rules/AttributeTest.php b/tests/unit/Rules/AttributeTest.php index 426677db..b0209516 100644 --- a/tests/unit/Rules/AttributeTest.php +++ b/tests/unit/Rules/AttributeTest.php @@ -11,6 +11,8 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + class PrivClass { private $bar = 'foo'; @@ -21,7 +23,7 @@ class PrivClass * @covers \Respect\Validation\Rules\Attribute * @covers \Respect\Validation\Exceptions\AttributeException */ -class AttributeTest extends \PHPUnit_Framework_TestCase +class AttributeTest extends TestCase { public function testAttributeWithNoExtraValidationShouldCheckItsPresence() { diff --git a/tests/unit/Rules/BaseTest.php b/tests/unit/Rules/BaseTest.php index 3fd70404..9613df69 100644 --- a/tests/unit/Rules/BaseTest.php +++ b/tests/unit/Rules/BaseTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Base * @covers \Respect\Validation\Exceptions\BaseException */ -class BaseTest extends \PHPUnit_Framework_TestCase +class BaseTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/BetweenTest.php b/tests/unit/Rules/BetweenTest.php index 150b5601..91a8549d 100644 --- a/tests/unit/Rules/BetweenTest.php +++ b/tests/unit/Rules/BetweenTest.php @@ -12,13 +12,14 @@ namespace Respect\Validation\Rules; use DateTime; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\Between * @covers \Respect\Validation\Exceptions\BetweenException */ -class BetweenTest extends \PHPUnit_Framework_TestCase +class BetweenTest extends TestCase { public function providerValid() { diff --git a/tests/unit/Rules/BoolTypeTest.php b/tests/unit/Rules/BoolTypeTest.php index 90b409ff..a949c877 100644 --- a/tests/unit/Rules/BoolTypeTest.php +++ b/tests/unit/Rules/BoolTypeTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\BoolType * @covers \Respect\Validation\Exceptions\BoolTypeException */ -class BoolTypeTest extends \PHPUnit_Framework_TestCase +class BoolTypeTest extends TestCase { public function testBooleanValuesONLYShouldReturnTrue() { diff --git a/tests/unit/Rules/BsnTest.php b/tests/unit/Rules/BsnTest.php index fdbdb5aa..765733d0 100644 --- a/tests/unit/Rules/BsnTest.php +++ b/tests/unit/Rules/BsnTest.php @@ -11,14 +11,14 @@ namespace Respect\Validation\Rules; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\Bsn * @covers \Respect\Validation\Exceptions\BsnException */ -class BsnTest extends PHPUnit_Framework_TestCase +class BsnTest extends TestCase { /** * @var Bsn diff --git a/tests/unit/Rules/CallTest.php b/tests/unit/Rules/CallTest.php index 5a3e3a2d..399cbb63 100644 --- a/tests/unit/Rules/CallTest.php +++ b/tests/unit/Rules/CallTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Call * @covers \Respect\Validation\Exceptions\CallException */ -class CallTest extends \PHPUnit_Framework_TestCase +class CallTest extends TestCase { public function thisIsASampleCallbackUsedInsideThisTest() { diff --git a/tests/unit/Rules/CallableTypeTest.php b/tests/unit/Rules/CallableTypeTest.php index e0375921..0ea0196e 100644 --- a/tests/unit/Rules/CallableTypeTest.php +++ b/tests/unit/Rules/CallableTypeTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\CallableType * @covers \Respect\Validation\Exceptions\CallableTypeException */ -class CallableTypeTest extends \PHPUnit_Framework_TestCase +class CallableTypeTest extends TestCase { protected $rule; diff --git a/tests/unit/Rules/CallbackTest.php b/tests/unit/Rules/CallbackTest.php index a0ce9afa..fbc6b665 100644 --- a/tests/unit/Rules/CallbackTest.php +++ b/tests/unit/Rules/CallbackTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Callback * @covers \Respect\Validation\Exceptions\CallbackException */ -class CallbackTest extends \PHPUnit_Framework_TestCase +class CallbackTest extends TestCase { private $truthy, $falsy; diff --git a/tests/unit/Rules/CharsetTest.php b/tests/unit/Rules/CharsetTest.php index e330bf5d..4fc38c95 100644 --- a/tests/unit/Rules/CharsetTest.php +++ b/tests/unit/Rules/CharsetTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Charset * @covers \Respect\Validation\Exceptions\CharsetException */ -class CharsetTest extends \PHPUnit_Framework_TestCase +class CharsetTest extends TestCase { /** * @dataProvider providerForValidCharset diff --git a/tests/unit/Rules/CnhTest.php b/tests/unit/Rules/CnhTest.php index bae223fd..f13f93eb 100644 --- a/tests/unit/Rules/CnhTest.php +++ b/tests/unit/Rules/CnhTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Cnh * @covers \Respect\Validation\Exceptions\CnhException */ -class CnhTest extends \PHPUnit_Framework_TestCase +class CnhTest extends TestCase { protected $cnhValidator; diff --git a/tests/unit/Rules/CnpjTest.php b/tests/unit/Rules/CnpjTest.php index bb5418ec..c19ade6f 100644 --- a/tests/unit/Rules/CnpjTest.php +++ b/tests/unit/Rules/CnpjTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Cnpj * @covers \Respect\Validation\Exceptions\CnpjException */ -class CnpjTest extends \PHPUnit_Framework_TestCase +class CnpjTest extends TestCase { protected $cnpjValidator; diff --git a/tests/unit/Rules/CntrlTest.php b/tests/unit/Rules/CntrlTest.php index 60347131..6e17ccea 100644 --- a/tests/unit/Rules/CntrlTest.php +++ b/tests/unit/Rules/CntrlTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Cntrl * @covers \Respect\Validation\Exceptions\CntrlException */ -class CntrlTest extends \PHPUnit_Framework_TestCase +class CntrlTest extends TestCase { /** * @dataProvider providerForValidCntrl diff --git a/tests/unit/Rules/ConsonantTest.php b/tests/unit/Rules/ConsonantTest.php index d7661932..b978e88f 100644 --- a/tests/unit/Rules/ConsonantTest.php +++ b/tests/unit/Rules/ConsonantTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Consonant * @covers \Respect\Validation\Exceptions\ConsonantException */ -class ConsonantTest extends \PHPUnit_Framework_TestCase +class ConsonantTest extends TestCase { /** * @dataProvider providerForValidConsonants diff --git a/tests/unit/Rules/ContainsTest.php b/tests/unit/Rules/ContainsTest.php index 7f6b476f..9d5b2e9a 100644 --- a/tests/unit/Rules/ContainsTest.php +++ b/tests/unit/Rules/ContainsTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Contains * @covers \Respect\Validation\Exceptions\ContainsException */ -class ContainsTest extends \PHPUnit_Framework_TestCase +class ContainsTest extends TestCase { /** * @dataProvider providerForContainsIdentical diff --git a/tests/unit/Rules/CountryCodeTest.php b/tests/unit/Rules/CountryCodeTest.php index 5a6f2085..8ac7e192 100644 --- a/tests/unit/Rules/CountryCodeTest.php +++ b/tests/unit/Rules/CountryCodeTest.php @@ -11,11 +11,13 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\CountryCode */ -class CountryCodeTest extends \PHPUnit_Framework_TestCase +class CountryCodeTest extends TestCase { /** * @expectedException \Respect\Validation\Exceptions\ComponentException diff --git a/tests/unit/Rules/CpfTest.php b/tests/unit/Rules/CpfTest.php index ba29f2c5..0af55243 100644 --- a/tests/unit/Rules/CpfTest.php +++ b/tests/unit/Rules/CpfTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Cpf * @covers \Respect\Validation\Exceptions\CpfException */ -class CpfTest extends \PHPUnit_Framework_TestCase +class CpfTest extends TestCase { protected $cpfValidator; diff --git a/tests/unit/Rules/CreditCardTest.php b/tests/unit/Rules/CreditCardTest.php index f5c52f2b..625aaaff 100644 --- a/tests/unit/Rules/CreditCardTest.php +++ b/tests/unit/Rules/CreditCardTest.php @@ -38,7 +38,7 @@ class CreditCardTest extends RuleTestCase $message = '"RespectCard" is not a valid credit card brand'; $message .= ' (Available: American Express, Diners Club, Discover, JCB, MasterCard, Visa).'; - $this->setExpectedException(ComponentException::class, $message); + $this->expectException(ComponentException::class, $message); new CreditCard('RespectCard'); } diff --git a/tests/unit/Rules/DateTimeTest.php b/tests/unit/Rules/DateTimeTest.php index c2a7f6dc..4e17bcb1 100644 --- a/tests/unit/Rules/DateTimeTest.php +++ b/tests/unit/Rules/DateTimeTest.php @@ -12,13 +12,14 @@ namespace Respect\Validation\Rules; use DateTimeImmutable; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\DateTime * @covers \Respect\Validation\Exceptions\DateTimeException */ -class DateTimeTest extends \PHPUnit_Framework_TestCase +class DateTimeTest extends TestCase { protected $dateValidator; diff --git a/tests/unit/Rules/DigitTest.php b/tests/unit/Rules/DigitTest.php index 4d067fa9..a7b08140 100644 --- a/tests/unit/Rules/DigitTest.php +++ b/tests/unit/Rules/DigitTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Digit * @covers \Respect\Validation\Exceptions\DigitException */ -class DigitTest extends \PHPUnit_Framework_TestCase +class DigitTest extends TestCase { /** * @dataProvider providerForValidDigits diff --git a/tests/unit/Rules/DirectoryTest.php b/tests/unit/Rules/DirectoryTest.php index e734f4f7..a817ec28 100644 --- a/tests/unit/Rules/DirectoryTest.php +++ b/tests/unit/Rules/DirectoryTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Directory * @covers \Respect\Validation\Exceptions\DirectoryException */ -class DirectoryTest extends \PHPUnit_Framework_TestCase +class DirectoryTest extends TestCase { /** * @dataProvider providerForValidDirectory diff --git a/tests/unit/Rules/DomainTest.php b/tests/unit/Rules/DomainTest.php index 6fed84a6..576f948d 100644 --- a/tests/unit/Rules/DomainTest.php +++ b/tests/unit/Rules/DomainTest.php @@ -11,6 +11,7 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Validator as v; /** @@ -18,7 +19,7 @@ use Respect\Validation\Validator as v; * @covers \Respect\Validation\Rules\Domain * @covers \Respect\Validation\Exceptions\DomainException */ -class DomainTest extends \PHPUnit_Framework_TestCase +class DomainTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/EmailTest.php b/tests/unit/Rules/EmailTest.php index b374d82a..81c90622 100644 --- a/tests/unit/Rules/EmailTest.php +++ b/tests/unit/Rules/EmailTest.php @@ -13,6 +13,7 @@ namespace Respect\Validation\Rules; use Egulias\EmailValidator\EmailValidator; use Egulias\EmailValidator\Validation\RFCValidation; +use PHPUnit\Framework\TestCase; function class_exists($className) { @@ -28,7 +29,7 @@ function class_exists($className) * @covers \Respect\Validation\Rules\Email * @covers \Respect\Validation\Exceptions\EmailException */ -class EmailTest extends \PHPUnit_Framework_TestCase +class EmailTest extends TestCase { private function setEmailValidatorExists($value) { diff --git a/tests/unit/Rules/EndsWithTest.php b/tests/unit/Rules/EndsWithTest.php index 7181d4a1..07671377 100644 --- a/tests/unit/Rules/EndsWithTest.php +++ b/tests/unit/Rules/EndsWithTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\EndsWith * @covers \Respect\Validation\Exceptions\EndsWithException */ -class EndsWithTest extends \PHPUnit_Framework_TestCase +class EndsWithTest extends TestCase { /** * @dataProvider providerForEndsWith diff --git a/tests/unit/Rules/EqualsTest.php b/tests/unit/Rules/EqualsTest.php index 7453a7ab..11ce8974 100644 --- a/tests/unit/Rules/EqualsTest.php +++ b/tests/unit/Rules/EqualsTest.php @@ -11,6 +11,7 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use stdClass; /** @@ -18,7 +19,7 @@ use stdClass; * @covers \Respect\Validation\Rules\Equals * @covers \Respect\Validation\Exceptions\EqualsException */ -class EqualsTest extends \PHPUnit_Framework_TestCase +class EqualsTest extends TestCase { /** * @dataProvider providerForEquals diff --git a/tests/unit/Rules/EvenTest.php b/tests/unit/Rules/EvenTest.php index 41a20158..70f6f48f 100644 --- a/tests/unit/Rules/EvenTest.php +++ b/tests/unit/Rules/EvenTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Even * @covers \Respect\Validation\Exceptions\EvenException */ -class EvenTest extends \PHPUnit_Framework_TestCase +class EvenTest extends TestCase { protected $evenValidator; diff --git a/tests/unit/Rules/ExecutableTest.php b/tests/unit/Rules/ExecutableTest.php index 309fc1b1..fbd6d742 100644 --- a/tests/unit/Rules/ExecutableTest.php +++ b/tests/unit/Rules/ExecutableTest.php @@ -11,6 +11,8 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + $GLOBALS['is_executable'] = null; function is_executable($executable) @@ -29,7 +31,7 @@ function is_executable($executable) * @covers \Respect\Validation\Rules\Executable * @covers \Respect\Validation\Exceptions\ExecutableException */ -class ExecutableTest extends \PHPUnit_Framework_TestCase +class ExecutableTest extends TestCase { public function testValidExecutableFileShouldReturnTrue() { diff --git a/tests/unit/Rules/ExistsTest.php b/tests/unit/Rules/ExistsTest.php index 95b68e09..6608df18 100644 --- a/tests/unit/Rules/ExistsTest.php +++ b/tests/unit/Rules/ExistsTest.php @@ -13,7 +13,7 @@ namespace Respect\Validation\Rules; use org\bovigo\vfs\content\LargeFileContent; use org\bovigo\vfs\vfsStream; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use SplFileInfo; /** @@ -21,7 +21,7 @@ use SplFileInfo; * @covers \Respect\Validation\Rules\Exists * @covers \Respect\Validation\Exceptions\ExistsException */ -class ExistsTest extends PHPUnit_Framework_TestCase +class ExistsTest extends TestCase { /** * @dataProvider fileProvider diff --git a/tests/unit/Rules/ExtensionTest.php b/tests/unit/Rules/ExtensionTest.php index f9275769..69860340 100644 --- a/tests/unit/Rules/ExtensionTest.php +++ b/tests/unit/Rules/ExtensionTest.php @@ -11,7 +11,7 @@ namespace Respect\Validation\Rules; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use SplFileInfo; /** @@ -20,7 +20,7 @@ use SplFileInfo; * @covers \Respect\Validation\Rules\Extension * @covers \Respect\Validation\Exceptions\ExtensionException */ -class ExtensionTest extends PHPUnit_Framework_TestCase +class ExtensionTest extends TestCase { public function providerValidExtension() { diff --git a/tests/unit/Rules/FactorTest.php b/tests/unit/Rules/FactorTest.php index 7b7d4fc8..074bdb96 100644 --- a/tests/unit/Rules/FactorTest.php +++ b/tests/unit/Rules/FactorTest.php @@ -11,6 +11,7 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Exceptions\ComponentException; use Respect\Validation\Exceptions\FactorException; use Respect\Validation\Exceptions\ValidationException; @@ -22,7 +23,7 @@ use Respect\Validation\Exceptions\ValidationException; * * @author David Meister */ -class FactorTest extends \PHPUnit_Framework_TestCase +class FactorTest extends TestCase { /** * @dataProvider providerForValidFactor @@ -40,7 +41,7 @@ class FactorTest extends \PHPUnit_Framework_TestCase */ public function testInvalidFactorShouldThrowFactorException($dividend, $input) { - $this->setExpectedException( + $this->expectException( FactorException::class, ValidationException::stringify($input).' must be a factor of '.$dividend ); @@ -55,7 +56,7 @@ class FactorTest extends \PHPUnit_Framework_TestCase */ public function testInvalidDividentShouldThrowComponentException($dividend, $input) { - $this->setExpectedException( + $this->expectException( ComponentException::class, 'Dividend '.ValidationException::stringify($dividend).' must be an integer' ); diff --git a/tests/unit/Rules/FalseValTest.php b/tests/unit/Rules/FalseValTest.php index 5ce896c4..793737a8 100644 --- a/tests/unit/Rules/FalseValTest.php +++ b/tests/unit/Rules/FalseValTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\FalseVal * @covers \Respect\Validation\Exceptions\FalseValException */ -class FalseValTest extends \PHPUnit_Framework_TestCase +class FalseValTest extends TestCase { /** * @dataProvider validFalseProvider diff --git a/tests/unit/Rules/FileTest.php b/tests/unit/Rules/FileTest.php index fa4dbfff..0202d4a0 100644 --- a/tests/unit/Rules/FileTest.php +++ b/tests/unit/Rules/FileTest.php @@ -11,6 +11,8 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + $GLOBALS['is_file'] = null; function is_file($file) @@ -29,7 +31,7 @@ function is_file($file) * @covers \Respect\Validation\Rules\File * @covers \Respect\Validation\Exceptions\FileException */ -class FileTest extends \PHPUnit_Framework_TestCase +class FileTest extends TestCase { /** * @covers \Respect\Validation\Rules\File::validate diff --git a/tests/unit/Rules/FilterVarTest.php b/tests/unit/Rules/FilterVarTest.php index 40ca1d4b..44f4b435 100644 --- a/tests/unit/Rules/FilterVarTest.php +++ b/tests/unit/Rules/FilterVarTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\FilterVar * @covers \Respect\Validation\Exceptions\FilterVarException */ -class FilterVarTest extends \PHPUnit_Framework_TestCase +class FilterVarTest extends TestCase { /** * @expectedException \Respect\Validation\Exceptions\ComponentException diff --git a/tests/unit/Rules/FiniteTest.php b/tests/unit/Rules/FiniteTest.php index 9fc8b8d2..9063b98a 100644 --- a/tests/unit/Rules/FiniteTest.php +++ b/tests/unit/Rules/FiniteTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Finite * @covers \Respect\Validation\Exceptions\FiniteException */ -class FiniteTest extends \PHPUnit_Framework_TestCase +class FiniteTest extends TestCase { protected $rule; diff --git a/tests/unit/Rules/FloatValTest.php b/tests/unit/Rules/FloatValTest.php index e1671d19..073b7d99 100644 --- a/tests/unit/Rules/FloatValTest.php +++ b/tests/unit/Rules/FloatValTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\FloatVal * @covers \Respect\Validation\Exceptions\FloatValException */ -class FloatValTest extends \PHPUnit_Framework_TestCase +class FloatValTest extends TestCase { protected $floatValidator; diff --git a/tests/unit/Rules/GraphTest.php b/tests/unit/Rules/GraphTest.php index d8729227..f87af642 100644 --- a/tests/unit/Rules/GraphTest.php +++ b/tests/unit/Rules/GraphTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Graph * @covers \Respect\Validation\Exceptions\GraphException */ -class GraphTest extends \PHPUnit_Framework_TestCase +class GraphTest extends TestCase { /** * @dataProvider providerForValidGraph diff --git a/tests/unit/Rules/HexRgbColorTest.php b/tests/unit/Rules/HexRgbColorTest.php index c2de7e33..4daf7471 100644 --- a/tests/unit/Rules/HexRgbColorTest.php +++ b/tests/unit/Rules/HexRgbColorTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\HexRgbColor * @covers \Respect\Validation\Exceptions\HexRgbColorException */ -class HexRgbColorTest extends \PHPUnit_Framework_TestCase +class HexRgbColorTest extends TestCase { /** * @dataProvider providerForValidHexRgbColor diff --git a/tests/unit/Rules/IdenticalTest.php b/tests/unit/Rules/IdenticalTest.php index 2f96f5ae..3564eef9 100644 --- a/tests/unit/Rules/IdenticalTest.php +++ b/tests/unit/Rules/IdenticalTest.php @@ -11,6 +11,7 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use stdClass; /** @@ -18,7 +19,7 @@ use stdClass; * @covers \Respect\Validation\Rules\Identical * @covers \Respect\Validation\Exceptions\IdenticalException */ -class IdenticalTest extends \PHPUnit_Framework_TestCase +class IdenticalTest extends TestCase { /** * @dataProvider providerForIdentical diff --git a/tests/unit/Rules/InTest.php b/tests/unit/Rules/InTest.php index 790ae213..6b25500c 100644 --- a/tests/unit/Rules/InTest.php +++ b/tests/unit/Rules/InTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\In * @covers \Respect\Validation\Exceptions\InException */ -class InTest extends \PHPUnit_Framework_TestCase +class InTest extends TestCase { /** * @dataProvider providerForIn diff --git a/tests/unit/Rules/InfiniteTest.php b/tests/unit/Rules/InfiniteTest.php index d1bf3d09..d245c516 100644 --- a/tests/unit/Rules/InfiniteTest.php +++ b/tests/unit/Rules/InfiniteTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Infinite * @covers \Respect\Validation\Exceptions\InfiniteException */ -class InfiniteTest extends \PHPUnit_Framework_TestCase +class InfiniteTest extends TestCase { protected $rule; diff --git a/tests/unit/Rules/InstanceTest.php b/tests/unit/Rules/InstanceTest.php index 9e051bda..02f9b11a 100644 --- a/tests/unit/Rules/InstanceTest.php +++ b/tests/unit/Rules/InstanceTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Instance * @covers \Respect\Validation\Exceptions\InstanceException */ -class InstanceTest extends \PHPUnit_Framework_TestCase +class InstanceTest extends TestCase { protected $instanceValidator; diff --git a/tests/unit/Rules/IntTypeTest.php b/tests/unit/Rules/IntTypeTest.php index 3d705ba2..f505fe83 100644 --- a/tests/unit/Rules/IntTypeTest.php +++ b/tests/unit/Rules/IntTypeTest.php @@ -11,11 +11,13 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\IntType */ -class IntTypeTest extends \PHPUnit_Framework_TestCase +class IntTypeTest extends TestCase { public function providerForValidIntType() { diff --git a/tests/unit/Rules/IntValTest.php b/tests/unit/Rules/IntValTest.php index fe1f7e98..4efa8535 100644 --- a/tests/unit/Rules/IntValTest.php +++ b/tests/unit/Rules/IntValTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\IntVal * @covers \Respect\Validation\Exceptions\IntValException */ -class IntValTest extends \PHPUnit_Framework_TestCase +class IntValTest extends TestCase { protected $intValidator; diff --git a/tests/unit/Rules/IpTest.php b/tests/unit/Rules/IpTest.php index 78b5ce64..469f9cfe 100644 --- a/tests/unit/Rules/IpTest.php +++ b/tests/unit/Rules/IpTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Ip * @covers \Respect\Validation\Exceptions\IpException */ -class IpTest extends \PHPUnit_Framework_TestCase +class IpTest extends TestCase { /** * @dataProvider providerForIp diff --git a/tests/unit/Rules/KeyNestedTest.php b/tests/unit/Rules/KeyNestedTest.php index 2470c885..e605e58f 100644 --- a/tests/unit/Rules/KeyNestedTest.php +++ b/tests/unit/Rules/KeyNestedTest.php @@ -12,13 +12,14 @@ namespace Respect\Validation\Rules; use ArrayObject; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\KeyNested * @covers \Respect\Validation\Exceptions\KeyNestedException */ -class KeyNestedTest extends \PHPUnit_Framework_TestCase +class KeyNestedTest extends TestCase { public function testArrayWithPresentKeysWillReturnTrueForFullPathValidator() { diff --git a/tests/unit/Rules/KeySetTest.php b/tests/unit/Rules/KeySetTest.php index 75f1ad2f..8c89cd24 100644 --- a/tests/unit/Rules/KeySetTest.php +++ b/tests/unit/Rules/KeySetTest.php @@ -11,14 +11,14 @@ namespace Respect\Validation\Rules; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\KeySet * @covers \Respect\Validation\Exceptions\KeySetException */ -class KeySetTest extends PHPUnit_Framework_TestCase +class KeySetTest extends TestCase { public function testShouldAcceptKeyRule() { diff --git a/tests/unit/Rules/KeyTest.php b/tests/unit/Rules/KeyTest.php index 8b33bdff..5d8b151a 100644 --- a/tests/unit/Rules/KeyTest.php +++ b/tests/unit/Rules/KeyTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Key * @covers \Respect\Validation\Exceptions\KeyException */ -class KeyTest extends \PHPUnit_Framework_TestCase +class KeyTest extends TestCase { public function testArrayWithPresentKeyShouldReturnTrue() { diff --git a/tests/unit/Rules/KeyValueTest.php b/tests/unit/Rules/KeyValueTest.php index 2d7edb52..03ec51a5 100644 --- a/tests/unit/Rules/KeyValueTest.php +++ b/tests/unit/Rules/KeyValueTest.php @@ -11,14 +11,14 @@ namespace Respect\Validation\Rules; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\KeyValue * @covers \Respect\Validation\Exceptions\KeyValueException */ -class KeyValueTest extends PHPUnit_Framework_TestCase +class KeyValueTest extends TestCase { public function testShouldDefineValuesOnConstructor() { diff --git a/tests/unit/Rules/LeapDateTest.php b/tests/unit/Rules/LeapDateTest.php index 5afe27d0..59f78b4f 100644 --- a/tests/unit/Rules/LeapDateTest.php +++ b/tests/unit/Rules/LeapDateTest.php @@ -12,13 +12,14 @@ namespace Respect\Validation\Rules; use DateTime; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\LeapDate * @covers \Respect\Validation\Exceptions\LeapDateException */ -class LeapDateTest extends \PHPUnit_Framework_TestCase +class LeapDateTest extends TestCase { protected $leapDateValidator; diff --git a/tests/unit/Rules/LeapYearTest.php b/tests/unit/Rules/LeapYearTest.php index 9099d189..58841779 100644 --- a/tests/unit/Rules/LeapYearTest.php +++ b/tests/unit/Rules/LeapYearTest.php @@ -12,13 +12,14 @@ namespace Respect\Validation\Rules; use DateTime; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\LeapYear * @covers \Respect\Validation\Exceptions\LeapYearException */ -class LeapYearTest extends \PHPUnit_Framework_TestCase +class LeapYearTest extends TestCase { protected $leapYearValidator; diff --git a/tests/unit/Rules/LengthTest.php b/tests/unit/Rules/LengthTest.php index 5e014beb..536ea8ce 100644 --- a/tests/unit/Rules/LengthTest.php +++ b/tests/unit/Rules/LengthTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Length * @covers \Respect\Validation\Exceptions\LengthException */ -class LengthTest extends \PHPUnit_Framework_TestCase +class LengthTest extends TestCase { /** * @dataProvider providerForValidLengthInclusive diff --git a/tests/unit/Rules/LowercaseTest.php b/tests/unit/Rules/LowercaseTest.php index 6f07da03..68c2b0c7 100644 --- a/tests/unit/Rules/LowercaseTest.php +++ b/tests/unit/Rules/LowercaseTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Lowercase * @covers \Respect\Validation\Exceptions\LowercaseException */ -class LowercaseTest extends \PHPUnit_Framework_TestCase +class LowercaseTest extends TestCase { /** * @dataProvider providerForValidLowercase diff --git a/tests/unit/Rules/MacAddressTest.php b/tests/unit/Rules/MacAddressTest.php index ac52f1c1..027ef2df 100644 --- a/tests/unit/Rules/MacAddressTest.php +++ b/tests/unit/Rules/MacAddressTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\MacAddress * @covers \Respect\Validation\Exceptions\MacAddressException */ -class MacAddressTest extends \PHPUnit_Framework_TestCase +class MacAddressTest extends TestCase { protected $macaddressValidator; diff --git a/tests/unit/Rules/MaxTest.php b/tests/unit/Rules/MaxTest.php index dc39ba43..aa4ddad0 100644 --- a/tests/unit/Rules/MaxTest.php +++ b/tests/unit/Rules/MaxTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Max * @covers \Respect\Validation\Exceptions\MaxException */ -class MaxTest extends \PHPUnit_Framework_TestCase +class MaxTest extends TestCase { /** * @dataProvider providerForValidMax diff --git a/tests/unit/Rules/MimetypeTest.php b/tests/unit/Rules/MimetypeTest.php index 11598df7..0f29633f 100644 --- a/tests/unit/Rules/MimetypeTest.php +++ b/tests/unit/Rules/MimetypeTest.php @@ -11,7 +11,7 @@ namespace Respect\Validation\Rules; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use SplFileInfo; /** @@ -20,7 +20,7 @@ use SplFileInfo; * @covers \Respect\Validation\Rules\Mimetype * @covers \Respect\Validation\Exceptions\MimetypeException */ -class MimetypeTest extends PHPUnit_Framework_TestCase +class MimetypeTest extends TestCase { private $filename; diff --git a/tests/unit/Rules/MinTest.php b/tests/unit/Rules/MinTest.php index 3b68a847..7412260a 100644 --- a/tests/unit/Rules/MinTest.php +++ b/tests/unit/Rules/MinTest.php @@ -12,13 +12,14 @@ namespace Respect\Validation\Rules; use DateTime; +use PHPUnit\Framework\TestCase; /** * @group rule * @covers \Respect\Validation\Rules\Min * @covers \Respect\Validation\Exceptions\MinException */ -class MinTest extends \PHPUnit_Framework_TestCase +class MinTest extends TestCase { /** * @dataProvider providerForValidMin diff --git a/tests/unit/Rules/MininumAgeTest.php b/tests/unit/Rules/MininumAgeTest.php index fc7016fc..aa6be81a 100644 --- a/tests/unit/Rules/MininumAgeTest.php +++ b/tests/unit/Rules/MininumAgeTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\MinimumAge * @covers \Respect\Validation\Exceptions\MinimumAgeException */ -class MininumAgeTest extends \PHPUnit_Framework_TestCase +class MininumAgeTest extends TestCase { /** * @dataProvider providerForValidDateValidMinimumAge diff --git a/tests/unit/Rules/MultipleTest.php b/tests/unit/Rules/MultipleTest.php index 42961927..f1d7e113 100644 --- a/tests/unit/Rules/MultipleTest.php +++ b/tests/unit/Rules/MultipleTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Multiple * @covers \Respect\Validation\Exceptions\MultipleException */ -class MultipleTest extends \PHPUnit_Framework_TestCase +class MultipleTest extends TestCase { /** * @dataProvider providerForMultiple diff --git a/tests/unit/Rules/NegativeTest.php b/tests/unit/Rules/NegativeTest.php index edc323cb..26d1ea07 100644 --- a/tests/unit/Rules/NegativeTest.php +++ b/tests/unit/Rules/NegativeTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Negative * @covers \Respect\Validation\Exceptions\NegativeException */ -class NegativeTest extends \PHPUnit_Framework_TestCase +class NegativeTest extends TestCase { protected $negativeValidator; diff --git a/tests/unit/Rules/NfeAccessKeyTest.php b/tests/unit/Rules/NfeAccessKeyTest.php index 01e06a36..84dd9861 100644 --- a/tests/unit/Rules/NfeAccessKeyTest.php +++ b/tests/unit/Rules/NfeAccessKeyTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\NfeAccessKey * @covers \Respect\Validation\Exceptions\NfeAccessKeyException */ -class NfeAccessKeyTest extends \PHPUnit_Framework_TestCase +class NfeAccessKeyTest extends TestCase { protected $nfeValidator; diff --git a/tests/unit/Rules/NoTest.php b/tests/unit/Rules/NoTest.php index bc10d3f5..58a12f78 100644 --- a/tests/unit/Rules/NoTest.php +++ b/tests/unit/Rules/NoTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\No * @covers \Respect\Validation\Exceptions\NoException */ -class NoTest extends \PHPUnit_Framework_TestCase +class NoTest extends TestCase { public function testShouldUseDefaultPattern() { diff --git a/tests/unit/Rules/NoWhitespaceTest.php b/tests/unit/Rules/NoWhitespaceTest.php index d556de80..ca25c60c 100644 --- a/tests/unit/Rules/NoWhitespaceTest.php +++ b/tests/unit/Rules/NoWhitespaceTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\NoWhitespace * @covers \Respect\Validation\Exceptions\NoWhitespaceException */ -class NoWhitespaceTest extends \PHPUnit_Framework_TestCase +class NoWhitespaceTest extends TestCase { protected $noWhitespaceValidator; diff --git a/tests/unit/Rules/NoneOfTest.php b/tests/unit/Rules/NoneOfTest.php index b672953a..0c945b00 100644 --- a/tests/unit/Rules/NoneOfTest.php +++ b/tests/unit/Rules/NoneOfTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\NoneOf * @covers \Respect\Validation\Exceptions\NoneOfException */ -class NoneOfTest extends \PHPUnit_Framework_TestCase +class NoneOfTest extends TestCase { public function testValid() { diff --git a/tests/unit/Rules/NotBlankTest.php b/tests/unit/Rules/NotBlankTest.php index 187d1cf3..97ed2026 100644 --- a/tests/unit/Rules/NotBlankTest.php +++ b/tests/unit/Rules/NotBlankTest.php @@ -11,6 +11,7 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use stdClass; /** @@ -18,7 +19,7 @@ use stdClass; * @covers \Respect\Validation\Rules\NotBlank * @covers \Respect\Validation\Exceptions\NotBlankException */ -class NotBlankTest extends \PHPUnit_Framework_TestCase +class NotBlankTest extends TestCase { /** * @dataProvider providerForNotBlank diff --git a/tests/unit/Rules/NotEmptyTest.php b/tests/unit/Rules/NotEmptyTest.php index 2b0991a0..638cc7e8 100644 --- a/tests/unit/Rules/NotEmptyTest.php +++ b/tests/unit/Rules/NotEmptyTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\NotEmpty * @covers \Respect\Validation\Exceptions\NotEmptyException */ -class NotEmptyTest extends \PHPUnit_Framework_TestCase +class NotEmptyTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/NotOptionalTest.php b/tests/unit/Rules/NotOptionalTest.php index f1145a4a..5f52e7a0 100644 --- a/tests/unit/Rules/NotOptionalTest.php +++ b/tests/unit/Rules/NotOptionalTest.php @@ -11,13 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use stdClass; /** * @group rule * @covers \Respect\Validation\Rules\NotOptional */ -class NotOptionalTest extends \PHPUnit_Framework_TestCase +class NotOptionalTest extends TestCase { /** * @dataProvider providerForNotOptional diff --git a/tests/unit/Rules/NotTest.php b/tests/unit/Rules/NotTest.php index 1a899f24..20335acc 100644 --- a/tests/unit/Rules/NotTest.php +++ b/tests/unit/Rules/NotTest.php @@ -11,6 +11,7 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Validator; /** @@ -18,7 +19,7 @@ use Respect\Validation\Validator; * @covers \Respect\Validation\Rules\Not * @covers \Respect\Validation\Exceptions\NotException */ -class NotTest extends \PHPUnit_Framework_TestCase +class NotTest extends TestCase { /** * @dataProvider providerForValidNot diff --git a/tests/unit/Rules/NullTypeTest.php b/tests/unit/Rules/NullTypeTest.php index 8f894c32..fbfd8326 100644 --- a/tests/unit/Rules/NullTypeTest.php +++ b/tests/unit/Rules/NullTypeTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\NullType * @covers \Respect\Validation\Exceptions\NullTypeException */ -class NullTypeTest extends \PHPUnit_Framework_TestCase +class NullTypeTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/NumericValTest.php b/tests/unit/Rules/NumericValTest.php index 2c57ad78..13d68182 100644 --- a/tests/unit/Rules/NumericValTest.php +++ b/tests/unit/Rules/NumericValTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\NumericVal * @covers \Respect\Validation\Exceptions\NumericValException */ -class NumericValTest extends \PHPUnit_Framework_TestCase +class NumericValTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/ObjectTypeTest.php b/tests/unit/Rules/ObjectTypeTest.php index d113bffe..30beba82 100644 --- a/tests/unit/Rules/ObjectTypeTest.php +++ b/tests/unit/Rules/ObjectTypeTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\ObjectType * @covers \Respect\Validation\Exceptions\ObjectTypeException */ -class ObjectTypeTest extends \PHPUnit_Framework_TestCase +class ObjectTypeTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/OddTest.php b/tests/unit/Rules/OddTest.php index 436dd359..bb135c57 100644 --- a/tests/unit/Rules/OddTest.php +++ b/tests/unit/Rules/OddTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Odd * @covers \Respect\Validation\Exceptions\OddException */ -class OddTest extends \PHPUnit_Framework_TestCase +class OddTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/OneOfTest.php b/tests/unit/Rules/OneOfTest.php index 8bf0a7c6..034f842e 100644 --- a/tests/unit/Rules/OneOfTest.php +++ b/tests/unit/Rules/OneOfTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\OneOf * @covers \Respect\Validation\Exceptions\OneOfException */ -class OneOfTest extends \PHPUnit_Framework_TestCase +class OneOfTest extends TestCase { public function testValid() { diff --git a/tests/unit/Rules/OptionalTest.php b/tests/unit/Rules/OptionalTest.php index 7527c67e..3d57aea2 100644 --- a/tests/unit/Rules/OptionalTest.php +++ b/tests/unit/Rules/OptionalTest.php @@ -11,6 +11,7 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Validatable; use stdClass; @@ -18,7 +19,7 @@ use stdClass; * @group rule * @covers \Respect\Validation\Rules\Optional */ -class OptionalTest extends \PHPUnit_Framework_TestCase +class OptionalTest extends TestCase { public function providerForOptional() { diff --git a/tests/unit/Rules/PerfectSquareTest.php b/tests/unit/Rules/PerfectSquareTest.php index 31a638aa..3b48658a 100644 --- a/tests/unit/Rules/PerfectSquareTest.php +++ b/tests/unit/Rules/PerfectSquareTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\PerfectSquare * @covers \Respect\Validation\Exceptions\PerfectSquareException */ -class PerfectSquareTest extends \PHPUnit_Framework_TestCase +class PerfectSquareTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/PhoneTest.php b/tests/unit/Rules/PhoneTest.php index 654c9335..485868c7 100644 --- a/tests/unit/Rules/PhoneTest.php +++ b/tests/unit/Rules/PhoneTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Phone * @covers \Respect\Validation\Exceptions\PhoneException */ -class PhoneTest extends \PHPUnit_Framework_TestCase +class PhoneTest extends TestCase { protected $phoneValidator; diff --git a/tests/unit/Rules/PositiveTest.php b/tests/unit/Rules/PositiveTest.php index 42716454..bb3e8b5f 100644 --- a/tests/unit/Rules/PositiveTest.php +++ b/tests/unit/Rules/PositiveTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Positive * @covers \Respect\Validation\Exceptions\PositiveException */ -class PositiveTest extends \PHPUnit_Framework_TestCase +class PositiveTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/PostalCodeTest.php b/tests/unit/Rules/PostalCodeTest.php index 131b4828..65b16d90 100644 --- a/tests/unit/Rules/PostalCodeTest.php +++ b/tests/unit/Rules/PostalCodeTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\PostalCode * @covers \Respect\Validation\Exceptions\PostalCodeException */ -class PostalCodeTest extends \PHPUnit_Framework_TestCase +class PostalCodeTest extends TestCase { public function testShouldUsePatternAccordingToCountryCode() { diff --git a/tests/unit/Rules/PrimeNumberTest.php b/tests/unit/Rules/PrimeNumberTest.php index 92c9784e..af3147db 100644 --- a/tests/unit/Rules/PrimeNumberTest.php +++ b/tests/unit/Rules/PrimeNumberTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\PrimeNumber * @covers \Respect\Validation\Exceptions\PrimeNumberException */ -class PrimeNumberTest extends \PHPUnit_Framework_TestCase +class PrimeNumberTest extends TestCase { protected $object; diff --git a/tests/unit/Rules/PrntTest.php b/tests/unit/Rules/PrntTest.php index f391cfa8..5e2af306 100644 --- a/tests/unit/Rules/PrntTest.php +++ b/tests/unit/Rules/PrntTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Prnt * @covers \Respect\Validation\Exceptions\PrntException */ -class PrntTest extends \PHPUnit_Framework_TestCase +class PrntTest extends TestCase { /** * @dataProvider providerForValidPrint diff --git a/tests/unit/Rules/PunctTest.php b/tests/unit/Rules/PunctTest.php index 1a8c8c8f..e8e04b3d 100644 --- a/tests/unit/Rules/PunctTest.php +++ b/tests/unit/Rules/PunctTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Punct * @covers \Respect\Validation\Exceptions\PunctException */ -class PunctTest extends \PHPUnit_Framework_TestCase +class PunctTest extends TestCase { /** * @dataProvider providerForValidPunct diff --git a/tests/unit/Rules/ReadableTest.php b/tests/unit/Rules/ReadableTest.php index a9219014..7d74479e 100644 --- a/tests/unit/Rules/ReadableTest.php +++ b/tests/unit/Rules/ReadableTest.php @@ -11,6 +11,8 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + $GLOBALS['is_readable'] = null; function is_readable($readable) @@ -29,7 +31,7 @@ function is_readable($readable) * @covers \Respect\Validation\Rules\Readable * @covers \Respect\Validation\Exceptions\ReadableException */ -class ReadableTest extends \PHPUnit_Framework_TestCase +class ReadableTest extends TestCase { /** * @covers \Respect\Validation\Rules\Readable::validate diff --git a/tests/unit/Rules/ResourceTypeTest.php b/tests/unit/Rules/ResourceTypeTest.php index 7368d965..7e1eb29e 100644 --- a/tests/unit/Rules/ResourceTypeTest.php +++ b/tests/unit/Rules/ResourceTypeTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\ResourceType * @covers \Respect\Validation\Exceptions\ResourceTypeException */ -class ResourceTypeTest extends \PHPUnit_Framework_TestCase +class ResourceTypeTest extends TestCase { protected $rule; diff --git a/tests/unit/Rules/RomanTest.php b/tests/unit/Rules/RomanTest.php index 22eda878..7d5da754 100644 --- a/tests/unit/Rules/RomanTest.php +++ b/tests/unit/Rules/RomanTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Roman * @covers \Respect\Validation\Exceptions\RomanException */ -class RomanTest extends \PHPUnit_Framework_TestCase +class RomanTest extends TestCase { protected $romanValidator; diff --git a/tests/unit/Rules/ScalarValTest.php b/tests/unit/Rules/ScalarValTest.php index bc8bf758..67ac6d84 100644 --- a/tests/unit/Rules/ScalarValTest.php +++ b/tests/unit/Rules/ScalarValTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\ScalarVal * @covers \Respect\Validation\Exceptions\ScalarValException */ -class ScalarValTest extends \PHPUnit_Framework_TestCase +class ScalarValTest extends TestCase { protected $rule; diff --git a/tests/unit/Rules/SfTest.php b/tests/unit/Rules/SfTest.php index 10e99dfe..f7406d9b 100644 --- a/tests/unit/Rules/SfTest.php +++ b/tests/unit/Rules/SfTest.php @@ -11,6 +11,7 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Exceptions\AllOfException; use Respect\Validation\Validator as v; @@ -19,7 +20,7 @@ use Respect\Validation\Validator as v; * @covers \Respect\Validation\Rules\Sf * @covers \Respect\Validation\Exceptions\SfException */ -class SfTest extends \PHPUnit_Framework_TestCase +class SfTest extends TestCase { public function testValidationWithAnExistingValidationConstraint() { diff --git a/tests/unit/Rules/SizeTest.php b/tests/unit/Rules/SizeTest.php index 17b46af9..a537c420 100644 --- a/tests/unit/Rules/SizeTest.php +++ b/tests/unit/Rules/SizeTest.php @@ -13,7 +13,7 @@ namespace Respect\Validation\Rules; use org\bovigo\vfs\content\LargeFileContent; use org\bovigo\vfs\vfsStream; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use SplFileInfo; /** @@ -22,7 +22,7 @@ use SplFileInfo; * @covers \Respect\Validation\Rules\Size * @covers \Respect\Validation\Exceptions\SizeException */ -class SizeTest extends PHPUnit_Framework_TestCase +class SizeTest extends TestCase { public function validSizeProvider() { diff --git a/tests/unit/Rules/SlugTest.php b/tests/unit/Rules/SlugTest.php index e1ff4b86..738238a7 100644 --- a/tests/unit/Rules/SlugTest.php +++ b/tests/unit/Rules/SlugTest.php @@ -11,11 +11,13 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Slug */ -class SlugTest extends \PHPUnit_Framework_TestCase +class SlugTest extends TestCase { /** * @dataProvider providerValidSlug diff --git a/tests/unit/Rules/SortedTest.php b/tests/unit/Rules/SortedTest.php index bba34214..c68fb648 100644 --- a/tests/unit/Rules/SortedTest.php +++ b/tests/unit/Rules/SortedTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Sorted * @covers \Respect\Validation\Exceptions\SortedException */ -class SortedTest extends \PHPUnit_Framework_TestCase +class SortedTest extends TestCase { public function testPasses() { diff --git a/tests/unit/Rules/SpaceTest.php b/tests/unit/Rules/SpaceTest.php index bf3ed706..7e49f83b 100644 --- a/tests/unit/Rules/SpaceTest.php +++ b/tests/unit/Rules/SpaceTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Space * @covers \Respect\Validation\Exceptions\SpaceException */ -class SpaceTest extends \PHPUnit_Framework_TestCase +class SpaceTest extends TestCase { /** * @dataProvider providerForValidSpace diff --git a/tests/unit/Rules/StartsWithTest.php b/tests/unit/Rules/StartsWithTest.php index c03835f2..ad15a7ee 100644 --- a/tests/unit/Rules/StartsWithTest.php +++ b/tests/unit/Rules/StartsWithTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\StartsWith * @covers \Respect\Validation\Exceptions\StartsWithException */ -class StartsWithTest extends \PHPUnit_Framework_TestCase +class StartsWithTest extends TestCase { /** * @dataProvider providerForStartsWith diff --git a/tests/unit/Rules/StringTypeTest.php b/tests/unit/Rules/StringTypeTest.php index 79115f06..e929b10b 100644 --- a/tests/unit/Rules/StringTypeTest.php +++ b/tests/unit/Rules/StringTypeTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\StringType * @covers \Respect\Validation\Exceptions\StringTypeException */ -class StringTypeTest extends \PHPUnit_Framework_TestCase +class StringTypeTest extends TestCase { /** * @dataProvider providerForString diff --git a/tests/unit/Rules/SubdivisionCodeTest.php b/tests/unit/Rules/SubdivisionCodeTest.php index 98486c6b..ea889379 100644 --- a/tests/unit/Rules/SubdivisionCodeTest.php +++ b/tests/unit/Rules/SubdivisionCodeTest.php @@ -11,13 +11,13 @@ namespace Respect\Validation\Rules; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * @covers \Respect\Validation\Rules\SubdivisionCode * @covers \Respect\Validation\Exceptions\SubdivisionCodeException */ -class SubdivisionCodeTest extends PHPUnit_Framework_TestCase +class SubdivisionCodeTest extends TestCase { /** * @expectedException \Respect\Validation\Exceptions\ComponentException diff --git a/tests/unit/Rules/SymbolicLinkTest.php b/tests/unit/Rules/SymbolicLinkTest.php index df793329..3908e151 100644 --- a/tests/unit/Rules/SymbolicLinkTest.php +++ b/tests/unit/Rules/SymbolicLinkTest.php @@ -11,6 +11,8 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + $GLOBALS['is_link'] = null; function is_link($link) @@ -29,7 +31,7 @@ function is_link($link) * @covers \Respect\Validation\Rules\SymbolicLink * @covers \Respect\Validation\Exceptions\SymbolicLinkException */ -class SymbolicLinkTest extends \PHPUnit_Framework_TestCase +class SymbolicLinkTest extends TestCase { /** * @covers \Respect\Validation\Rules\SymbolicLink::validate diff --git a/tests/unit/Rules/TldTest.php b/tests/unit/Rules/TldTest.php index e1699bea..f3a07033 100644 --- a/tests/unit/Rules/TldTest.php +++ b/tests/unit/Rules/TldTest.php @@ -11,11 +11,13 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Tld */ -class TldTest extends \PHPUnit_Framework_TestCase +class TldTest extends TestCase { public function providerForValidTld() { diff --git a/tests/unit/Rules/TrueValTest.php b/tests/unit/Rules/TrueValTest.php index 988c7487..3d80d6e0 100644 --- a/tests/unit/Rules/TrueValTest.php +++ b/tests/unit/Rules/TrueValTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\TrueVal * @covers \Respect\Validation\Exceptions\TrueValException */ -class TrueValTest extends \PHPUnit_Framework_TestCase +class TrueValTest extends TestCase { /** * @dataProvider validTrueProvider diff --git a/tests/unit/Rules/TypeTest.php b/tests/unit/Rules/TypeTest.php index f4643696..7a97c459 100644 --- a/tests/unit/Rules/TypeTest.php +++ b/tests/unit/Rules/TypeTest.php @@ -11,6 +11,7 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use stdClass; /** @@ -18,7 +19,7 @@ use stdClass; * @covers \Respect\Validation\Rules\Type * @covers \Respect\Validation\Exceptions\TypeException */ -class TypeTest extends \PHPUnit_Framework_TestCase +class TypeTest extends TestCase { public function testShouldDefineTypeOnConstructor() { diff --git a/tests/unit/Rules/UploadedTest.php b/tests/unit/Rules/UploadedTest.php index fde3d309..74460462 100644 --- a/tests/unit/Rules/UploadedTest.php +++ b/tests/unit/Rules/UploadedTest.php @@ -11,6 +11,8 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + $GLOBALS['is_uploaded_file'] = null; function is_uploaded_file($uploaded) @@ -29,7 +31,7 @@ function is_uploaded_file($uploaded) * @covers \Respect\Validation\Rules\Uploaded * @covers \Respect\Validation\Exceptions\UploadedException */ -class UploadedTest extends \PHPUnit_Framework_TestCase +class UploadedTest extends TestCase { /** * @covers \Respect\Validation\Rules\Uploaded::validate diff --git a/tests/unit/Rules/UppercaseTest.php b/tests/unit/Rules/UppercaseTest.php index 52254e0d..5700a4bf 100644 --- a/tests/unit/Rules/UppercaseTest.php +++ b/tests/unit/Rules/UppercaseTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Uppercase * @covers \Respect\Validation\Exceptions\UppercaseException */ -class UppercaseTest extends \PHPUnit_Framework_TestCase +class UppercaseTest extends TestCase { /** * @dataProvider providerForValidUppercase diff --git a/tests/unit/Rules/UrlTest.php b/tests/unit/Rules/UrlTest.php index 9b6b75cc..f854b158 100644 --- a/tests/unit/Rules/UrlTest.php +++ b/tests/unit/Rules/UrlTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Url * @covers \Respect\Validation\Exceptions\UrlException */ -class UrlTest extends \PHPUnit_Framework_TestCase +class UrlTest extends TestCase { /** * @dataProvider providerForValidUrl diff --git a/tests/unit/Rules/VatinTest.php b/tests/unit/Rules/VatinTest.php index 6b262be7..948b0db7 100644 --- a/tests/unit/Rules/VatinTest.php +++ b/tests/unit/Rules/VatinTest.php @@ -11,13 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; use Respect\Validation\Validatable; /** * @group rule * @covers \Respect\Validation\Rules\Vatin */ -final class VatinTest extends \PHPUnit_Framework_TestCase +final class VatinTest extends TestCase { public function testShouldAcceptCountryCodeOnConstructor() { diff --git a/tests/unit/Rules/VersionTest.php b/tests/unit/Rules/VersionTest.php index 1f05c0f9..e47f77c7 100644 --- a/tests/unit/Rules/VersionTest.php +++ b/tests/unit/Rules/VersionTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Version * @covers \Respect\Validation\Exceptions\VersionException */ -class VersionTest extends \PHPUnit_Framework_TestCase +class VersionTest extends TestCase { /** * @dataProvider providerForValidVersion diff --git a/tests/unit/Rules/VideoUrlTest.php b/tests/unit/Rules/VideoUrlTest.php index 0769aa8b..4bfe4589 100644 --- a/tests/unit/Rules/VideoUrlTest.php +++ b/tests/unit/Rules/VideoUrlTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\VideoUrl * @covers \Respect\Validation\Exceptions\VideoUrlException */ -class VideoUrlTest extends \PHPUnit_Framework_TestCase +class VideoUrlTest extends TestCase { /** * @expectedException \Respect\Validation\Exceptions\ComponentException diff --git a/tests/unit/Rules/VowelTest.php b/tests/unit/Rules/VowelTest.php index 0a660592..c7663a89 100644 --- a/tests/unit/Rules/VowelTest.php +++ b/tests/unit/Rules/VowelTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Vowel * @covers \Respect\Validation\Exceptions\VowelException */ -class VowelTest extends \PHPUnit_Framework_TestCase +class VowelTest extends TestCase { /** * @dataProvider providerForValidVowels diff --git a/tests/unit/Rules/WritableTest.php b/tests/unit/Rules/WritableTest.php index 1c5a001e..0943e8cd 100644 --- a/tests/unit/Rules/WritableTest.php +++ b/tests/unit/Rules/WritableTest.php @@ -11,6 +11,8 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + $GLOBALS['is_writable'] = null; function is_writable($writable) @@ -29,7 +31,7 @@ function is_writable($writable) * @covers \Respect\Validation\Rules\Writable * @covers \Respect\Validation\Exceptions\WritableException */ -class WritableTest extends \PHPUnit_Framework_TestCase +class WritableTest extends TestCase { /** * @covers \Respect\Validation\Rules\Writable::validate diff --git a/tests/unit/Rules/XdigitTest.php b/tests/unit/Rules/XdigitTest.php index 7989b7c5..fa68c6ad 100644 --- a/tests/unit/Rules/XdigitTest.php +++ b/tests/unit/Rules/XdigitTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Xdigit * @covers \Respect\Validation\Exceptions\XdigitException */ -class XdigitTest extends \PHPUnit_Framework_TestCase +class XdigitTest extends TestCase { protected $xdigitsValidator; diff --git a/tests/unit/Rules/YesTest.php b/tests/unit/Rules/YesTest.php index bc5927f7..2cf2556a 100644 --- a/tests/unit/Rules/YesTest.php +++ b/tests/unit/Rules/YesTest.php @@ -11,12 +11,14 @@ namespace Respect\Validation\Rules; +use PHPUnit\Framework\TestCase; + /** * @group rule * @covers \Respect\Validation\Rules\Yes * @covers \Respect\Validation\Exceptions\YesException */ -class YesTest extends \PHPUnit_Framework_TestCase +class YesTest extends TestCase { public function testShouldUseDefaultPattern() { diff --git a/tests/unit/Rules/ZendTest.php b/tests/unit/Rules/ZendTest.php index 0cc2e3a5..acacdcb2 100644 --- a/tests/unit/Rules/ZendTest.php +++ b/tests/unit/Rules/ZendTest.php @@ -12,6 +12,7 @@ namespace Respect\Validation\Rules; use DateTime; +use PHPUnit\Framework\TestCase; use Zend\Validator\Date as ZendDate; use Zend\Validator\ValidatorInterface; @@ -20,7 +21,7 @@ use Zend\Validator\ValidatorInterface; * @covers \Respect\Validation\Rules\Zend * @covers \Respect\Validation\Exceptions\ZendException */ -class ZendTest extends \PHPUnit_Framework_TestCase +class ZendTest extends TestCase { public function testConstructorWithValidatorName() { diff --git a/tests/unit/ValidatorTest.php b/tests/unit/ValidatorTest.php index 0b97691b..7204a70e 100644 --- a/tests/unit/ValidatorTest.php +++ b/tests/unit/ValidatorTest.php @@ -11,9 +11,10 @@ namespace Respect\Validation; +use PHPUnit\Framework\TestCase; use Respect\Validation\Exceptions\ComponentException; -class ValidatorTest extends \PHPUnit_Framework_TestCase +class ValidatorTest extends TestCase { public function testStaticCreateShouldReturnNewValidator() { @@ -22,7 +23,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase public function testInvalidRuleClassShouldThrowComponentException() { - $this->setExpectedException(ComponentException::class); + $this->expectException(ComponentException::class); Validator::iDoNotExistSoIShouldThrowException(); }