fixed *.org.uk domains #150

Author: oscarotero

src/Url.php

@@ -181,11 +181,13 @@ public function getDomain($first_level = false)
                 return $first_level ? ($host[1].'.'.$host[0]) : $host[1];
 
             default:
+                $subdomains = ['co', 'com', 'org'];
+
                 if ($first_level) {
-                    return ($host[1] === 'co' || $host[1] === 'com') ? ($host[2].'.'.$host[1].'.'.$host[0]) : ($host[1].'.'.$host[0]);
+                    return in_array($host[1], $subdomains, true) ? ($host[2].'.'.$host[1].'.'.$host[0]) : ($host[1].'.'.$host[0]);
                 }
 
-                return ($host[1] === 'co' || $host[1] === 'com') ? $host[2] : $host[1];
+                return in_array($host[1], $subdomains, true) ? $host[2] : $host[1];
         }
     }
 

tests/UrlTest.php

@@ -18,6 +18,7 @@ public function urlsParserProvider()
             ['http://test.drupal.dd:8083/tests/localport.html', 'http://test.drupal.dd:8083/tests/localport.html'],
             ['http://testuser@test.drupal.dd:8083/tests/identified.html', 'http://testuser@test.drupal.dd:8083/tests/identified.html'],
             ['http://testuser:testpass@test.drupal.dd:8083/tests/authenticated.html', 'http://testuser:testpass@test.drupal.dd:8083/tests/authenticated.html'],
+            ['http://testuser:testpass@test.drupal.dd:8083/tests/authenticated.html', 'http://testuser:testpass@test.drupal.dd:8083/tests/authenticated.html'],
         ];
     }
 
@@ -54,17 +55,22 @@ public function testDomain()
         $url = new Embed\Url('http://www.domain.com');
 
         $this->assertSame('domain', $url->getDomain());
-        $this->assertSame('domain.com', $url->getDomain(1));
+        $this->assertSame('domain.com', $url->getDomain(true));
 
         $url = new Embed\Url('http://www.domain.co.uk');
 
         $this->assertSame('domain', $url->getDomain());
-        $this->assertSame('domain.co.uk', $url->getDomain(1));
+        $this->assertSame('domain.co.uk', $url->getDomain(true));
 
         $url = new Embed\Url('http://www.domain.com.au');
 
         $this->assertSame('domain', $url->getDomain());
-        $this->assertSame('domain.com.au', $url->getDomain(1));
+        $this->assertSame('domain.com.au', $url->getDomain(true));
+
+        $url = new Embed\Url('http://www.redrooster.org.uk');
+
+        $this->assertSame('redrooster', $url->getDomain());
+        $this->assertSame('redrooster.org.uk', $url->getDomain(true));
     }
 
     public function testPathsWithDots()