Merge branch 'develop' of git://github.com/Saeven/php-domain-parser into Saeven-develop

Resolving merge conflicts I caused so @Saeven doesn't have to sort out
what I broke :-)

Author: jeremykendall

README.md

@@ -11,10 +11,10 @@ domain parser implemented in PHP.
 
 While there are plenty of excellent URL parsers and builders available, there
 are very few projects that can accurately parse a url into its component
-subdomain, registerable domain, and public suffix parts.
+subdomain, registrable domain, and public suffix parts.
 
 Consider the domain www.pref.okinawa.jp.  In this domain, the
-*public suffix* portion is **okinawa.jp**, the *registerable domain* is
+*public suffix* portion is **okinawa.jp**, the *registrable domain* is
 **pref.okinawa.jp**, and the *subdomain* is **www**. You can't regex that.
 
 Other similar libraries focus primarily on URL building, parsing, and
@@ -77,7 +77,7 @@ class Pdp\Uri\Url#6 (8) {
     class Pdp\Uri\Url\Host#5 (3) {
         private $subdomain =>
         string(3) "www"
-        private $registerableDomain =>
+        private $registrableDomain =>
         string(15) "pref.okinawa.jp"
         private $publicSuffix =>
         string(10) "okinawa.jp"
@@ -139,7 +139,7 @@ class Pdp\Uri\Url#6 (8) {
   class Pdp\Uri\Url\Host#5 (4) {
     private $subdomain =>
     NULL
-    private $registerableDomain =>
+    private $registrableDomain =>
     string(17) "яндекс.рф"
     private $publicSuffix =>
     string(4) "рф"
@@ -175,7 +175,7 @@ class Pdp\Uri\Url#6 (8) {
   class Pdp\Uri\Url\Host#5 (4) {
     private $subdomain =>
     NULL
-    private $registerableDomain =>
+    private $registrableDomain =>
     string(22) "xn--d1acpjx3f.xn--p1ai"
     private $publicSuffix =>
     string(8) "xn--p1ai"
@@ -211,7 +211,7 @@ class Pdp\Uri\Url#6 (8) {
   class Pdp\Uri\Url\Host#5 (4) {
     private $subdomain =>
     NULL
-    private $registerableDomain =>
+    private $registrableDomain =>
     NULL
     private $publicSuffix =>
     NULL
@@ -257,7 +257,7 @@ The above will output:
 class Pdp\Uri\Url\Host#7 (3) {
     private $subdomain =>
     string(1) "a"
-    private $registerableDomain =>
+    private $registrableDomain =>
     string(6) "b.c.cy"
     private $publicSuffix =>
     string(4) "c.cy"
@@ -292,7 +292,7 @@ retrieve only the component you're interested in
 <?php
 
 var_dump($parser->getSubdomain('www.scottwills.co.uk'));
-var_dump($parser->getRegisterableDomain('www.scottwills.co.uk'));
+var_dump($parser->getRegistrableDomain('www.scottwills.co.uk'));
 var_dump($parser->getPublicSuffix('www.scottwills.co.uk'));
 ```
 
@@ -331,7 +331,7 @@ Array
     [pass] =>
     [host] => www.waxaudio.com.au
     [subdomain] => www
-    [registerableDomain] => waxaudio.com.au
+    [registrableDomain] => waxaudio.com.au
     [publicSuffix] => com.au
     [port] =>
     [path] => /

example.php

@@ -15,31 +15,31 @@
 // Accessing elements of the URL
 var_dump($url);
 var_dump($url->__toString());
-var_dump($url->path);
-var_dump($url->fragment);
+var_dump($url->getPath());
+var_dump($url->getFragment());
 
 // Getting the Host object from the URL
-$host = $url->host;
+$host = $url->getHost();
 
 // Accessing elements of the Host
 var_dump($host);
 var_dump($host->__toString());
-var_dump($host->subdomain);
-var_dump($host->registerableDomain);
-var_dump($host->publicSuffix);
+var_dump($host->getSubdomain());
+var_dump($host->getRegistrableDomain());
+var_dump($host->getPublicSuffix());
 
 // It's possible to parse a host only, if you prefer
 $host = $parser->parseHost('a.b.c.cy');
 
 // Accessing elements of the Host
 var_dump($host);
 var_dump($host->__toString());
-var_dump($host->subdomain);
-var_dump($host->registerableDomain);
-var_dump($host->publicSuffix);
+var_dump($host->getSubdomain());
+var_dump($host->getRegistrableDomain());
+var_dump($host->getPublicSuffix());
 
-// If you just need to know subdomain/registerable domain/public suffix info 
+// If you just need to know subdomain/registrable domain/public suffix info
 // about a host, there are public methods available for that in the Parser
 var_dump($parser->getSubdomain('www.scottwills.co.uk'));
-var_dump($parser->getRegisterableDomain('www.scottwills.co.uk'));
+var_dump($parser->getRegistrableDomain('www.scottwills.co.uk'));
 var_dump($parser->getPublicSuffix('www.scottwills.co.uk'));

src/Pdp/Parser.php

@@ -120,21 +120,21 @@ public function parseHost($host)
         $host = mb_strtolower($host, 'UTF-8');
 
         $subdomain = null;
-        $registerableDomain = null;
+        $registrableDomain = null;
         $publicSuffix = null;
 
         // Fixes #22: Single label domains are set as Host::$host and all other
         // properties are null.
         // Fixes #43: Ip Addresses should not be parsed
-        if ($this->isMutliLabelDomain($host) || !$this->isIpv4Address($host)) {
+        if ($this->isMultiLabelDomain($host) || !$this->isIpv4Address($host)) {
             $subdomain = $this->getSubdomain($host);
-            $registerableDomain = $this->getRegisterableDomain($host);
+            $registrableDomain = $this->getRegistrableDomain($host);
             $publicSuffix = $this->getPublicSuffix($host);
         }
 
         return new Host(
             $subdomain,
-            $registerableDomain,
+            $registrableDomain,
             $publicSuffix,
             $host
         );
@@ -210,7 +210,7 @@ public function getPublicSuffix($host)
         // Fixes #22: If a single label domain makes it this far (e.g.,
         // localhost, foo, etc.), this stops it from incorrectly being set as
         // the public suffix.
-        if (!$this->isMutliLabelDomain($host)) {
+        if (!$this->isMultiLabelDomain($host)) {
             return;
         }
 
@@ -245,7 +245,7 @@ public function isSuffixValid($host)
     }
 
     /**
-     * Returns registerable domain portion of provided host.
+     * Returns registrable domain portion of provided host.
      *
      * Per the test cases provided by Mozilla
      * (http://mxr.mozilla.org/mozilla-central/source/netwerk/test/unit/data/test_psl.txt?raw=1),
@@ -255,7 +255,7 @@ public function isSuffixValid($host)
      *
      * @return string|null registerable domain
      */
-    public function getRegisterableDomain($host)
+    public function getRegistrableDomain($host)
     {
         if (strpos($host, '.') === false) {
             return;
@@ -269,9 +269,9 @@ public function getRegisterableDomain($host)
 
         $publicSuffixParts = array_reverse(explode('.', $publicSuffix));
         $hostParts = array_reverse(explode('.', $host));
-        $registerableDomainParts = $publicSuffixParts + array_slice($hostParts, 0, count($publicSuffixParts) + 1);
+        $registrableDomainParts = $publicSuffixParts + array_slice($hostParts, 0, count($publicSuffixParts) + 1);
 
-        return implode('.', array_reverse($registerableDomainParts));
+        return implode('.', array_reverse($registrableDomainParts));
     }
 
     /**
@@ -283,18 +283,18 @@ public function getRegisterableDomain($host)
      */
     public function getSubdomain($host)
     {
-        $registerableDomain = $this->getRegisterableDomain($host);
+        $registrableDomain = $this->getRegistrableDomain($host);
 
-        if ($registerableDomain === null || $host === $registerableDomain) {
+        if ($registrableDomain === null || $host === $registrableDomain) {
             return;
         }
 
-        $registerableDomainParts = array_reverse(explode('.', $registerableDomain));
+        $registrableDomainParts = array_reverse(explode('.', $registrableDomain));
 
         $host = $this->normalize($host);
 
         $hostParts = array_reverse(explode('.', $host));
-        $subdomainParts = array_slice($hostParts, count($registerableDomainParts));
+        $subdomainParts = array_slice($hostParts, count($registrableDomainParts));
 
         $subdomain = implode('.', array_reverse($subdomainParts));
 
@@ -348,7 +348,7 @@ protected function denormalize($part)
      *
      * @return bool True if multi-label domain, false otherwise
      */
-    protected function isMutliLabelDomain($host)
+    protected function isMultiLabelDomain($host)
     {
         return strpos($host, '.') !== false;
     }

src/Pdp/Uri/Url.php

@@ -21,42 +21,42 @@ class Url
     /**
      * @var string scheme
      */
-    private $scheme;
+    protected $scheme;
 
     /**
      * @var Host Host object
      */
-    private $host;
+    protected $host;
 
     /**
      * @var int port
      */
-    private $port;
+    protected $port;
 
     /**
      * @var string user
      */
-    private $user;
+    protected $user;
 
     /**
      * @var string pass
      */
-    private $pass;
+    protected $pass;
 
     /**
      * @var string path
      */
-    private $path;
+    protected $path;
 
     /**
      * @var string query
      */
-    private $query;
+    protected $query;
 
     /**
      * @var string fragment
      */
-    private $fragment;
+    protected $fragment;
 
     /**
      * Public constructor.
@@ -90,15 +90,6 @@ public function __construct(
         $this->fragment = $fragment;
     }
 
-    /**
-     * Magic getter.
-     *
-     * @param mixed $name Property name to get
-     */
-    public function __get($name)
-    {
-        return $this->$name;
-    }
 
     /**
      * Gets schemeless url.
@@ -169,7 +160,7 @@ public function toArray()
             'pass' => $this->pass,
             'host' => $this->host->__toString(),
             'subdomain' => $this->host->getSubdomain(),
-            'registerableDomain' => $this->host->getRegisterableDomain(),
+            'registrableDomain' => $this->host->getRegistrableDomain(),
             'publicSuffix' => $this->host->getPublicSuffix(),
             'port' => $this->port,
             'path' => $this->path,