chore: use FILTER_FLAG_HOSTNAME, more test cases

utopia-php · Nov 13, 2023 · 641a7a0 · 641a7a0
1 parent f37ba14
commit 641a7a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/Validator/Domain.php b/src/Validator/Domain.php
@@ -49,11 +49,7 @@ public function isValid($value): bool
             return false;
         }
 
-        if (\filter_var($value, FILTER_VALIDATE_DOMAIN) === false) {
-            return false;
-        }
-
-        return true;
+        return \filter_var($value, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) !== false;
     }
 
     /**

diff --git a/tests/Validator/DomainTest.php b/tests/Validator/DomainTest.php
@@ -31,13 +31,14 @@ public function testIsValid()
         $this->assertEquals(true, $this->domain->isValid('example.com'));
         $this->assertEquals(true, $this->domain->isValid('subdomain.example.com'));
         $this->assertEquals(true, $this->domain->isValid('subdomain.example-app.com'));
-        $this->assertEquals(true, $this->domain->isValid('subdomain.example_app.com'));
         $this->assertEquals(true, $this->domain->isValid('subdomain-new.example.com'));
-        $this->assertEquals(true, $this->domain->isValid('subdomain_new.example.com'));
         $this->assertEquals(true, $this->domain->isValid('localhost'));
         $this->assertEquals(true, $this->domain->isValid('example.io'));
         $this->assertEquals(true, $this->domain->isValid('example.org'));
         $this->assertEquals(true, $this->domain->isValid('example.org'));
+        $this->assertEquals(false, $this->domain->isValid('example.com/path'));
+        $this->assertEquals(false, $this->domain->isValid('subdomain_new.example.com'));
+        $this->assertEquals(false, $this->domain->isValid('subdomain.example_app.com'));
         $this->assertEquals(false, $this->domain->isValid('http://example.com'));
         $this->assertEquals(false, $this->domain->isValid('https://example.com'));
         $this->assertEquals(false, $this->domain->isValid('ftp://example.com'));