Merge pull request #13 from utopia-php/meldiron/getregisterable-doesn-1

Improve edge cases
utopia-php · Feb 2, 2022 · 2c83bc8 · 2c83bc8
2 parents 4740d64 + 4a7158b
commit 2c83bc8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/Domains/Domain.php b/src/Domains/Domain.php
@@ -60,8 +60,8 @@ class Domain
      */
     public function __construct(string $domain)
     {
-        if ((strpos($domain, 'http') === 0) || (strpos($domain, 'https') === 0)) {
-            throw new Exception('$domain must be a valid domain or hostname');
+        if ((strpos($domain, 'http://') === 0) || (strpos($domain, 'https://') === 0)) {
+            throw new Exception("'{$domain}' must be a valid domain or hostname");
         }
 
         $this->domain = \mb_strtolower($domain);

diff --git a/tests/DomainTest.php b/tests/DomainTest.php
@@ -24,6 +24,26 @@ class DomainTest extends TestCase
      */
     protected $test = null;
 
+    public function testEdgecaseDomains()
+    {
+        $domain = new Domain('httpmydomain.com');
+        $this->assertEquals('httpmydomain.com', $domain->getRegisterable());
+    }
+
+    public function testEdgecaseDomainsError()
+    {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage("'http://httpmydomain.com' must be a valid domain or hostname");
+        $domain = new Domain('http://httpmydomain.com');
+    }
+
+    public function testEdgecaseDomainsError2()
+    {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage("'https://httpmydomain.com' must be a valid domain or hostname");
+        $domain = new Domain('https://httpmydomain.com');
+    }
+
     public function testExampleCoUk()
     {
         $domain = new Domain('demo.example.co.uk');