Merge branch '1.0' into 1.1

Respect · Jan 2, 2018 · ee9e697 · ee9e697
2 parents 22f1f14 + c931e25
commit ee9e697
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 543 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,6 @@
     },
     "require-dev": {
         "egulias/email-validator": "~1.2",
-        "malkusch/bav": "~1.0",
         "mikey179/vfsStream": "^1.5",
         "phpunit/phpunit": "~4.0",
         "symfony/validator": "~2.6.9",
@@ -27,7 +26,6 @@
         "ext-bcmath": "Arbitrary Precision Mathematics",
         "ext-mbstring": "Multibyte String Functions",
         "egulias/email-validator": "Strict (RFC compliant) email validation",
-        "malkusch/bav": "German bank account validation",
         "symfony/validator": "Use Symfony validator through Respect\\Validation",
         "zendframework/zend-validator": "Use Zend Framework validator through Respect\\Validation",
         "fabpot/php-cs-fixer": "Fix PSR2 and other coding style issues"

diff --git a/library/Exceptions/ValidationException.php b/library/Exceptions/ValidationException.php
@@ -305,6 +305,9 @@ public function hasCustomTemplate()
     public function setTemplate($template)
     {
         $this->customTemplate = true;
+        if (isset(static::$defaultTemplates[$this->mode][$template])) {
+            $template = static::$defaultTemplates[$this->mode][$template];
+        }
         $this->template = $template;
 
         $this->buildMessage();

diff --git a/library/Rules/Domain.php b/library/Rules/Domain.php
@@ -29,16 +29,12 @@ public function __construct($tldCheck = true)
             new Alnum('-'),
             new Not(new StartsWith('-')),
             new OneOf(
-                new Not(
-                    new Contains('--')
-                ),
-                new AllOf(
-                    new StartsWith('xn--'),
-                    new Callback(function ($str) {
-                        return substr_count($str, '--') == 1;
-                    })
-                )
-            )
+                new Not(new Contains('--')),
+                new Callback(function ($str) {
+                    return substr_count($str, '--') == 1;
+                })
+            ),
+            new Not(new EndsWith('-'))
         );
     }
 

diff --git a/tests/integration/issue-739.phpt b/tests/integration/issue-739.phpt
@@ -0,0 +1,16 @@
+--FILE--
+<?php
+
+require 'vendor/autoload.php';
+
+use Respect\Validation\Exceptions\ValidationException;
+use Respect\Validation\Validator as v;
+
+try {
+    v::when(v::alwaysInvalid(), v::alwaysValid())->check('foo');
+} catch (ValidationException $exception) {
+    echo $exception->getMainMessage();
+}
+?>
+--EXPECT--
+"foo" is not valid
diff --git a/tests/library/Rules/LocaleTestCase.php b/tests/library/Rules/LocaleTestCase.php
diff --git a/tests/unit/Rules/BankAccountTest.php b/tests/unit/Rules/BankAccountTest.php
diff --git a/tests/unit/Rules/BankTest.php b/tests/unit/Rules/BankTest.php
diff --git a/tests/unit/Rules/BicTest.php b/tests/unit/Rules/BicTest.php
diff --git a/tests/unit/Rules/DomainTest.php b/tests/unit/Rules/DomainTest.php
@@ -67,6 +67,9 @@ public function providerForDomain()
             ['xn--bcher-kva.ch'],
             ['mail.xn--bcher-kva.ch'],
             ['example-hyphen.com'],
+            ['example--valid.com'],
+            ['std--a.com'],
+            ['r--w.com'],
         ];
     }
 
@@ -76,10 +79,10 @@ public function providerForNotDomain()
             [null],
             [''],
             ['2222222domain.local'],
-            ['example--invalid.com'],
             ['-example-invalid.com'],
             ['example.invalid.-com'],
             ['xn--bcher--kva.ch'],
+            ['example.invalid-.com'],
             ['1.2.3.256'],
             ['1.2.3.4'],
         ];

diff --git a/tests/unit/Rules/Locale/FactoryTest.php b/tests/unit/Rules/Locale/FactoryTest.php