Fix #120: Move check exists function "idn_to_ascii" from constructor of the url rule to method enableIDN

kriptogenic · web-flow · commit 467f57e4958c · 2021-03-04T16:14:43.000+03:00
diff --git a/src/Rule/Url.php b/src/Rule/Url.php
@@ -9,7 +9,6 @@
 use Yiisoft\Validator\Rule;
 use Yiisoft\Validator\ValidationContext;
 
-use function function_exists;
 use function is_string;
 use function strlen;
 
@@ -44,13 +43,6 @@ class Url extends Rule
 
     private string $message = 'This value is not a valid URL.';
 
-    public function __construct()
-    {
-        if ($this->enableIDN && !function_exists('idn_to_ascii')) {
-            throw new \RuntimeException('In order to use IDN validation intl extension must be installed and enabled.');
-        }
-    }
-
     protected function validateValue($value, ValidationContext $context = null): Result
     {
         $result = new Result();
@@ -107,6 +99,10 @@ public function pattern(string $pattern): self
 
     public function enableIDN(): self
     {
+        if (!function_exists('idn_to_ascii')) {
+            throw new \RuntimeException('In order to use IDN validation intl extension must be installed and enabled.');
+        }
+
         $new = clone $this;
         $new->enableIDN = true;
         return $new;
diff --git a/tests/Rule/UrlTest.php b/tests/Rule/UrlTest.php
@@ -2,6 +2,18 @@
 
 declare(strict_types=1);
 
+namespace Yiisoft\Validator\Rule;
+
+use Yiisoft\Validator\Tests\Rule\UrlTest;
+
+function function_exists($function)
+{
+    if ($function === 'idn_to_ascii' && UrlTest::$idnFunctionException) {
+        return false;
+    }
+    return \function_exists($function);
+}
+
 namespace Yiisoft\Validator\Tests\Rule;
 
 use PHPUnit\Framework\TestCase;
@@ -13,6 +25,13 @@
  */
 class UrlTest extends TestCase
 {
+    public static bool $idnFunctionException = false;
+
+    protected function setUp(): void
+    {
+        static::$idnFunctionException = false;
+    }
+
     public function testValidate(): void
     {
         $val = new Url();
@@ -67,7 +86,7 @@ public function testValidateWithCustomScheme(): void
 
     public function testValidateWithIdn(): void
     {
-        if (!function_exists('idn_to_ascii')) {
+        if (!\function_exists('idn_to_ascii')) {
             $this->markTestSkipped('intl package required');
             return;
         }
@@ -78,6 +97,14 @@ public function testValidateWithIdn(): void
         $this->assertTrue($val->validate('http://xn--zcack7ayc9a.de')->isValid());
     }
 
+    public function testEnableIdnException(): void
+    {
+        static::$idnFunctionException = true;
+
+        $this->expectException(\RuntimeException::class);
+        (new Url())->enableIDN();
+    }
+
     public function testValidateLength(): void
     {
         $url = 'http://' . str_pad('base', 2000, 'url') . '.de';
@@ -87,7 +114,7 @@ public function testValidateLength(): void
 
     public function testValidateWithIdnWithoutScheme(): void
     {
-        if (!function_exists('idn_to_ascii')) {
+        if (!\function_exists('idn_to_ascii')) {
             $this->markTestSkipped('intl package required');
             return;
         }
