Merge branch 'develop'

jeremykendall · Sep 28, 2017 · 737f253 · 737f253
2 parents 0ed5037 + c706854
commit 737f253
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/src/Pdp/Parser.php b/src/Pdp/Parser.php
@@ -263,6 +263,18 @@ public function getRegistrableDomain($host)
         return implode('.', array_reverse($registrableDomainParts));
     }
 
+    /**
+     * @see Parser::getRegistrableDomain
+     *
+     * @param string $host host
+     *
+     * @return string|null registrable domain
+     */
+    public function getRegisterableDomain($host)
+    {
+        return $this->getRegistrableDomain($host);
+    }
+
     /**
      * Returns the subdomain portion of provided host.
      *

diff --git a/src/Pdp/Uri/Url/Host.php b/src/Pdp/Uri/Url/Host.php
@@ -69,6 +69,16 @@ public function getRegistrableDomain()
         return $this->registrableDomain;
     }
 
+    /**
+     * @see Host::getRegistrableDomain
+     *
+     * @return string
+     */
+    public function getRegisterableDomain()
+    {
+        return $this->getRegistrableDomain();
+    }
+
     /**
      * Get Public suffix.
      *
@@ -116,9 +126,12 @@ public function __toString()
      */
     public function toArray()
     {
+        $registrableDomain = $this->getRegistrableDomain();
+
         return array(
             'subdomain' => $this->getSubdomain(),
-            'registrableDomain' => $this->getRegistrableDomain(),
+            'registrableDomain' => $registrableDomain,
+            'registerableDomain' => $registrableDomain,
             'publicSuffix' => $this->getPublicSuffix(),
             'host' => $this->getHost(),
         );

diff --git a/tests/src/Pdp/ParserTest.php b/tests/src/Pdp/ParserTest.php
@@ -150,6 +150,7 @@ public function testGetPublicSuffixHandlesWrongCaseProperly()
     /**
      * @covers Pdp\Parser::parseUrl()
      * @covers Pdp\Parser::getRegistrableDomain()
+     * @covers Pdp\Parser::getRegisterableDomain()
      * @dataProvider parseDataProvider
      *
      * @param $url
@@ -162,7 +163,9 @@ public function testGetRegistrableDomain($url, $publicSuffix, $registrableDomain
     {
         $pdpUrl = $this->parser->parseUrl($url);
         $this->assertSame($registrableDomain, $pdpUrl->getHost()->getRegistrableDomain());
-        $this->assertSame($registrableDomain, $this->parser->getRegistrableDomain($hostPart));
+        $this->assertSame($registrableDomain, $this->parser->getRegisterableDomain($hostPart));
+        $this->assertSame($registrableDomain, $pdpUrl->getHost()->getRegistrableDomain());
+        $this->assertSame($registrableDomain, $this->parser->getRegisterableDomain($hostPart));
     }
 
     /**

diff --git a/tests/src/Pdp/Uri/Url/HostTest.php b/tests/src/Pdp/Uri/Url/HostTest.php
@@ -48,6 +48,7 @@ public function testToArray($publicSuffix, $registrableDomain, $subdomain, $host
         $parts = array(
             'subdomain' => $subdomain,
             'registrableDomain' => $registrableDomain,
+            'registerableDomain' => $registrableDomain,
             'publicSuffix' => $publicSuffix,
             'host' => $hostPart,
         );