Merge branch '1.1'

library/Exceptions/ValidationException.php

@@ -305,6 +305,9 @@ class ValidationException extends InvalidArgumentException implements ExceptionI
     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();

library/Rules/Domain.php

@@ -29,16 +29,12 @@ class Domain extends AbstractComposite
             new Alnum('-'),
             new Not(new StartsWith('-')),
             new AnyOf(
-                new Not(
-                    new Contains('--')
-                ),
-                new AllOf(
-                    new StartsWith('xn--'),
-                    new Callback(function ($str) {
-                        return mb_substr_count($str, '--') == 1;
-                    })
-                )
-            )
+                new Not(new Contains('--')),
+                new Callback(function ($str) {
+                    return substr_count($str, '--') == 1;
+                })
+            ),
+            new Not(new EndsWith('-'))
         );
     }
 

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

tests/unit/Rules/DomainTest.php

@@ -68,6 +68,9 @@ class DomainTest extends TestCase
             ['xn--bcher-kva.ch'],
             ['mail.xn--bcher-kva.ch'],
             ['example-hyphen.com'],
+            ['example--valid.com'],
+            ['std--a.com'],
+            ['r--w.com'],
         ];
     }
 
@@ -77,10 +80,10 @@ class DomainTest extends TestCase
             [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'],
         ];