first pass at tweaking jeremy's work

Author: Paul M. Jones

psl/public-suffix-list.php data/public-suffix-list.php

@@ -3,8 +3,5 @@
 require_once __DIR__ . '/src/Aura/Uri/Path.php';
 require_once __DIR__ . '/src/Aura/Uri/Query.php';
 require_once __DIR__ . '/src/Aura/Uri/PublicSuffixList.php';
-require_once __DIR__ . '/src/Aura/Uri/PublicSuffixListManager.php';
 require_once __DIR__ . '/src/Aura/Uri/Url.php';
-require_once __DIR__ . '/src/Aura/Uri/HttpAdapter/HttpAdapterInterface.php';
-require_once __DIR__ . '/src/Aura/Uri/HttpAdapter/CurlHttpAdapter.php';
 require_once __DIR__ . '/src/Aura/Uri/Url/Factory.php';

psl/public-suffix-list.txt data/public-suffix-list.txt

@@ -17,28 +17,41 @@
  * @package Aura.Uri
  *
  */
-class Host extends \ArrayObject
+class Host
 {
     /**
      * @var PublicSuffixList Public Suffix List
      */
-    protected $publicSuffixList;
+    protected $psl;
+
+
+    protected $subdomain;
+    protected $registerableDomain;
+    protected $publicSuffix;
+
 
     /**
      *
      * Constructor
      *
-     * @param PublicSuffixList $publicSuffixList Public Suffix List
+     * @param PublicSuffixList $psl Public Suffix List
      *
      * @param array $spec Host elements
      *
      */
-    public function __construct(PublicSuffixList $publicSuffixList, array $spec = array())
+    public function __construct(PublicSuffixList $psl, array $spec = [])
     {
-        $this->publicSuffixList = $publicSuffixList;
-        parent::__construct($spec);
+        $this->psl = $psl;
+        foreach ($spec as $key => $val) {
+            $this->$key = $val;
+        }
     }
 
+    public function __get($key)
+    {
+        return $this->$key;
+    }
+    
     /**
      *
      * Converts the Host object to a string and returns it.
@@ -49,7 +62,7 @@ public function __construct(PublicSuffixList $publicSuffixList, array $spec = ar
     public function __toString()
     {
         $toString = array_filter(
-            [$this['subdomain'], $this['registerableDomain']],
+            [$this->subdomain, $this->registerableDomain],
             'strlen'
         );
 
@@ -69,18 +82,16 @@ public function __toString()
      */
     public function setFromString($spec)
     {
-        $this->exchangeArray([]);
-
-        $this['registerableDomain'] = $this->getRegisterableDomain($spec);
-        $this['publicSuffix'] = substr($this['registerableDomain'], strpos($this['registerableDomain'], '.') + 1);
+        $this->registerableDomain = $this->getRegisterableDomain($spec);
+        $this->publicSuffix = substr($this->registerableDomain, strpos($this->registerableDomain, '.') + 1);
 
-        $registerableDomainParts = explode('.', $this['registerableDomain']);
+        $registerableDomainParts = explode('.', $this->registerableDomain);
         $hostParts = explode('.', $spec);
         $subdomainParts = array_diff($hostParts, $registerableDomainParts);
-        $this['subdomain'] = implode('.', $subdomainParts);
+        $this->subdomain = implode('.', $subdomainParts);
 
-        if (empty($this['subdomain']) && !is_null($this['subdomain'])) {
-            $this['subdomain'] = null;
+        if (empty($this->subdomain) && !is_null($this->subdomain)) {
+            $this->subdomain = null;
         }
     }
 
@@ -108,7 +119,7 @@ public function getRegisterableDomain($domain)
         $publicSuffix = array();
 
         $domainParts = explode('.', strtolower($domain));
-        $registerableDomain = $this->breakdown($domainParts, $this->publicSuffixList, $publicSuffix);
+        $registerableDomain = $this->breakdown($domainParts, $this->psl, $publicSuffix);
 
         // Remove null values
         $publicSuffix = array_filter($publicSuffix, 'strlen');
@@ -131,28 +142,28 @@ public function getRegisterableDomain($domain)
      * @link https://github.com/usrflo/registered-domain-libs/blob/master/PHP/regDomain.inc.php regDomain.inc.php
      *
      * @param array $domainParts      Domain parts as array
-     * @param array $publicSuffixList Array representation of the Public Suffix
+     * @param array $psl Array representation of the Public Suffix
      * List
      * @param  array  $publicSuffix Builds the public suffix during recursion
      * @return string Public suffix
      */
-    protected function breakdown(array $domainParts, $publicSuffixList, &$publicSuffix)
+    protected function breakdown(array $domainParts, $psl, &$publicSuffix)
     {
         $part = array_pop($domainParts);
         $result = null;
 
-        if (array_key_exists($part, $publicSuffixList) && array_key_exists('!', $publicSuffixList[$part])) {
+        if (array_key_exists($part, $psl) && array_key_exists('!', $psl[$part])) {
             return $part;
         }
 
-        if (array_key_exists($part, $publicSuffixList)) {
+        if (array_key_exists($part, $psl)) {
             array_unshift($publicSuffix, $part);
-            $result = $this->breakdown($domainParts, $publicSuffixList[$part], $publicSuffix);
+            $result = $this->breakdown($domainParts, $psl[$part], $publicSuffix);
         }
 
-        if (array_key_exists('*', $publicSuffixList)) {
+        if (array_key_exists('*', $psl)) {
             array_unshift($publicSuffix, $part);
-            $result = $this->breakdown($domainParts, $publicSuffixList['*'], $publicSuffix);
+            $result = $this->breakdown($domainParts, $psl['*'], $publicSuffix);
         }
 
         if ($result === null) {

src/Aura/Uri/HttpAdapter/CurlHttpAdapter.php hold/HttpAdapter/CurlHttpAdapter.php

@@ -19,20 +19,4 @@
  */
 class PublicSuffixList extends \ArrayObject
 {
-    /**
-     * Public constructor
-     *
-     * @param mixed $list Array representing Public Suffix List or PHP Public
-     * Suffix List file
-     * @throws \InvalidArgumentException If $list is not array, file did not
-     * contain an array, or $list is not an object
-     */
-    public function __construct($list)
-    {
-        if (!is_array($list)) {
-            $list = include $list;
-        }
-
-        parent::__construct($list);
-    }
 }

src/Aura/Uri/HttpAdapter/HttpAdapterInterface.php hold/HttpAdapter/HttpAdapterInterface.php

@@ -14,7 +14,7 @@
 use Aura\Uri\Path;
 use Aura\Uri\Query;
 use Aura\Uri\Host;
-use Aura\Uri\PublicSuffixListManager;
+use Aura\Uri\PublicSuffixList;
 
 /**
  *
@@ -34,14 +34,16 @@ class Factory
      */
     protected $current;
 
+    protected $psl;
+    
     /**
      *
      * Constructor.
      *
      * @param array $server An array copy of $_SERVER.
      *
      */
-    public function __construct(array $server)
+    public function __construct(array $server, PublicSuffixList $psl)
     {
         $https  = isset($server['HTTPS'])
                && strtolower($server['HTTPS']) == 'on';
@@ -68,6 +70,8 @@ public function __construct(array $server)
         }
 
         $this->current = $scheme . '://' . $host . $resource;
+        
+        $this->psl = $psl;
     }
 
     /**
@@ -104,8 +108,7 @@ public function newInstance($spec)
         $query = new Query([]);
         $query->setFromString($elem['query']);
 
-        $listManager = new PublicSuffixListManager();
-        $host = new Host($listManager->getList(), []);
+        $host = new Host($this->psl, []);
         $host->setFromString($elem['host']);
 
         return new Url(

src/Aura/Uri/PublicSuffixListManager.php hold/PublicSuffixListManager.php

@@ -12,7 +12,12 @@ class HostTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         parent::setUp();
-        $list = new PublicSuffixList(__DIR__ . '/../../_files/public-suffix-list.php');
+        
+        $file = dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR
+              . 'data' . DIRECTORY_SEPARATOR
+              . 'public-suffix-list.php';
+        
+        $list = new PublicSuffixList(require $file);
         $this->host = new Host($list);
     }
 
@@ -55,9 +60,9 @@ public function testParse($url, $publicSuffix, $registerableDomain, $subdomain)
     {
         $this->host->setFromString($url);
 
-        $this->assertSame($subdomain, $this->host['subdomain']);
-        $this->assertEquals($publicSuffix, $this->host['publicSuffix']);
-        $this->assertEquals($registerableDomain, $this->host['registerableDomain']);
+        $this->assertSame($subdomain, $this->host->subdomain);
+        $this->assertEquals($publicSuffix, $this->host->publicSuffix);
+        $this->assertEquals($registerableDomain, $this->host->registerableDomain);
     }
 
     public function parseDataProvider()