Merge branch '1.1'

.travis.yml

@@ -13,6 +13,7 @@ matrix:
       env: COMPOSER_ARGUMENTS="--prefer-lowest --prefer-stable"
     - php: 7.1
     - php: 7.2
+      env: PHPUNIT_COVERAGE_ARGUMENT="--coverage-clover=coverage.clover"
     - php: 7.3
       env: COMPOSER_ARGUMENTS="--ignore-platform-reqs"
     - php: nightly
@@ -29,7 +30,7 @@ before_script:
   - composer update --prefer-dist ${COMPOSER_ARGUMENTS}
 
 script:
-  - vendor/bin/phpunit --configuration phpunit.xml.dist --colors --coverage-clover=coverage.clover
+  - vendor/bin/phpunit --configuration phpunit.xml.dist --verbose --colors ${PHPUNIT_COVERAGE_ARGUMENT}
   - |
     if [[ "${TRAVIS_PHP_VERSION}" == "7.2" ]]; then
       vendor/bin/docheader check library tests
@@ -45,7 +46,7 @@ script:
 
 after_script:
   - |
-    if [[ "${TRAVIS_PHP_VERSION}" == "7.2" ]]; then
+    if [[ ! -z "${PHPUNIT_COVERAGE_ARGUMENT}" ]]; then
       wget https://scrutinizer-ci.com/ocular.phar
       php ocular.phar code-coverage:upload --format=php-clover coverage.clover
     fi

library/Rules/PostalCode.php

@@ -46,7 +46,7 @@ class PostalCode extends Regex
         'BN' => '/^([A-Z]{2}\d{4})$/',
         'BR' => '/^\d{5}-?\d{3}$/',
         'BY' => '/^(\d{6})$/',
-        'CA' => '/^([ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ]) ?(\d[ABCEGHJKLMNPRSTVWXYZ]\d)$ /',
+        'CA' => '/^([ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ]) ?(\d[ABCEGHJKLMNPRSTVWXYZ]\d)$/',
         'CH' => '/^(\d{4})$/',
         'CL' => '/^(\d{7})$/',
         'CN' => '/^(\d{6})$/',
@@ -101,7 +101,7 @@ class PostalCode extends Regex
         'KG' => '/^(\d{6})$/',
         'KH' => '/^(\d{5})$/',
         'KP' => '/^(\d{6})$/',
-        'KR' => '/^(?:SEOUL)*(\d{6})$/',
+        'KR' => '/^(\d{5})$/',
         'KW' => '/^(\d{5})$/',
         'KZ' => '/^(\d{6})$/',
         'LA' => '/^(\d{5})$/',

tests/fixtures/symbolic-link

@@ -0,0 +1 @@
+./valid-image.jpg

tests/library/RuleTestCase.php

@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Test;
 
-use PHPUnit\Framework\TestCase;
 use Respect\Validation\Exceptions\ValidationException;
 use Respect\Validation\Validatable;
 use function realpath;

tests/library/TestCase.php

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of Respect/Validation.
+ *
+ * (c) Alexandre Gomes Gaigalas <alexandre@gaigalas.net>
+ *
+ * For the full copyright and license information, please view the "LICENSE.md"
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Respect\Validation\Test;
+
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+
+abstract class TestCase extends PHPUnitTestCase
+{
+}

tests/unit/Exceptions/CheckExceptionsTest.php

@@ -14,8 +14,8 @@ declare(strict_types=1);
 namespace Respect\Validation\Exceptions;
 
 use DirectoryIterator;
-use PHPUnit\Framework\TestCase;
 use ReflectionClass;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @coversNothing

tests/unit/Exceptions/NestedValidationExceptionTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Exceptions;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @covers \Respect\Validation\Exceptions\NestedValidationException

tests/unit/Exceptions/ValidationExceptionTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Exceptions;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group core

tests/unit/FactoryTest.php

@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace Respect\Validation;
 
-use PHPUnit\Framework\TestCase;
 use Respect\Validation\Exceptions\ComponentException;
 use Respect\Validation\Exceptions\InvalidClassException;
 use Respect\Validation\Exceptions\ValidationException;
@@ -22,6 +21,7 @@ use Respect\Validation\Test\Rules\AbstractClass;
 use Respect\Validation\Test\Rules\Invalid;
 use Respect\Validation\Test\Rules\Stub;
 use Respect\Validation\Test\Rules\Valid;
+use Respect\Validation\Test\TestCase;
 use function sprintf;
 
 /**

tests/unit/Helpers/DateTimeHelperTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Helpers;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group helper

tests/unit/Helpers/UndefinedHelperTest.php

@@ -13,8 +13,8 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Helpers;
 
-use PHPUnit\Framework\TestCase;
 use Respect\Validation\Test\DataProvider\UndefinedProvider;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group helper

tests/unit/Rules/AbstractCompositeTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validatable;
 
 /**

tests/unit/Rules/AbstractEnvelopeTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validatable;
 
 /**

tests/unit/Rules/AbstractRelatedTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validatable;
 
 /**

tests/unit/Rules/AbstractRuleTest.php

@@ -13,8 +13,8 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
 use Respect\Validation\Exceptions\ValidationException;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @covers \Respect\Validation\Rules\AbstractRule

tests/unit/Rules/AbstractSearcherTest.php

@@ -13,8 +13,8 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
 use Respect\Validation\Test\DataProvider\UndefinedProvider;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group core

tests/unit/Rules/AbstractWrapperTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validatable;
 
 /**

tests/unit/Rules/AllOfTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/AlwaysInvalidTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group rule

tests/unit/Rules/AlwaysValidTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/AnyOfTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/CallTest.php

@@ -14,9 +14,9 @@ declare(strict_types=1);
 namespace Respect\Validation\Rules;
 
 use Exception;
-use PHPUnit\Framework\TestCase;
 use Respect\Validation\Exceptions\AlwaysInvalidException;
 use Respect\Validation\Exceptions\CallException;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validatable;
 
 /**

tests/unit/Rules/CntrlTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/ConsonantTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/DomainTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validator as v;
 
 /**

tests/unit/Rules/EmailTest.php

@@ -18,6 +18,8 @@ use Egulias\EmailValidator\Validation\RFCValidation;
 use ReflectionException;
 use ReflectionProperty;
 use Respect\Validation\Test\RuleTestCase;
+use stdClass;
+use function tmpfile;
 
 /**
  * @group  rule
@@ -89,6 +91,10 @@ final class EmailTest extends RuleTestCase
             [$sut, 'test@test..com'],
             [$sut, 'test@test.com.'],
             [$sut, '.test@test.com'],
+            [$sut, []],
+            [$sut, new stdClass()],
+            [$sut, null],
+            [$sut, tmpfile()],
         ];
     }
 

tests/unit/Rules/GraphTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/HexRgbColorTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/IpTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/KeyNestedTest.php

@@ -14,7 +14,7 @@ declare(strict_types=1);
 namespace Respect\Validation\Rules;
 
 use ArrayObject;
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validatable;
 
 /**

tests/unit/Rules/KeySetTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group rule

tests/unit/Rules/KeyTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/KeyValueTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/NfeAccessKeyTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/NoTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/NoneOfTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/NotTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validator;
 
 /**

tests/unit/Rules/NullableTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validatable;
 use stdClass;
 

tests/unit/Rules/OneOfTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/OptionalTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validatable;
 use stdClass;
 

tests/unit/Rules/PhoneTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/PostalCodeTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule
@@ -103,6 +103,7 @@ class PostalCodeTest extends TestCase
         return [
             ['BR', '02179-000'],
             ['BR', '02179000'],
+            ['CA', 'A1A 2B2'],
             ['GB', 'GIR 0AA'],
             ['GB', 'PR1 9LY'],
             ['US', '02179'],
@@ -113,6 +114,7 @@ class PostalCodeTest extends TestCase
             ['PT', '3660-606'],
             ['PT', '3660606'],
             ['CO', '110231'],
+            ['KR', '03187'],
         ];
     }
 
@@ -145,12 +147,15 @@ class PostalCodeTest extends TestCase
         return [
             ['BR', '02179'],
             ['BR', '02179.000'],
+            ['CA', '1A1B2B'],
             ['GB', 'GIR 00A'],
             ['GB', 'GIR0AA'],
             ['GB', 'PR19LY'],
             ['US', '021 79'],
             ['YE', '02179'],
             ['PL', '99300'],
+            ['KR', '548940'],
+            ['KR', '548-940'],
         ];
     }
 }

tests/unit/Rules/PunctTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/RomanTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/SfTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use stdClass;
 use Symfony\Component\Validator\Constraints\IsFalse;
 use Symfony\Component\Validator\Constraints\IsNull;

tests/unit/Rules/SizeTest.php

@@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
 
 use org\bovigo\vfs\content\LargeFileContent;
 use org\bovigo\vfs\vfsStream;
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use SplFileInfo;
 
 /**

tests/unit/Rules/SlugTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/SortedTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/SpaceTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/StartsWithTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/SubdivisionCodeTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @covers \Respect\Validation\Exceptions\SubdivisionCodeException

tests/unit/Rules/SymbolicLinkTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 $GLOBALS['is_link'] = null;
 

tests/unit/Rules/VatinTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Respect\Validation\Validatable;
 
 /**

tests/unit/Rules/VowelTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/XdigitTest.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Respect\Validation\Rules;
 
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @group  rule

tests/unit/Rules/ZendTest.php

@@ -14,7 +14,7 @@ declare(strict_types=1);
 namespace Respect\Validation\Rules;
 
 use DateTime;
-use PHPUnit\Framework\TestCase;
+use Respect\Validation\Test\TestCase;
 use Zend\Validator\Date as ZendDate;
 use Zend\Validator\ValidatorInterface;
 

tests/unit/ValidatorTest.php

@@ -13,8 +13,8 @@ declare(strict_types=1);
 
 namespace Respect\Validation;
 
-use PHPUnit\Framework\TestCase;
 use Respect\Validation\Exceptions\ComponentException;
+use Respect\Validation\Test\TestCase;
 
 /**
  * @covers \Respect\Validation\Validator