Remove setters, update tests.

Author: jeremykendall

src/Pdp/Uri/Url.php

@@ -156,17 +156,17 @@ public function __toString()
     public function toArray()
     {
         return array(
-            'scheme' => $this->scheme,
-            'user' => $this->user,
-            'pass' => $this->pass,
-            'host' => $this->host->__toString(),
-            'subdomain' => $this->host->getSubdomain(),
-            'registrableDomain' => $this->host->getRegistrableDomain(),
-            'publicSuffix' => $this->host->getPublicSuffix(),
-            'port' => $this->port,
-            'path' => $this->path,
-            'query' => $this->query,
-            'fragment' => $this->fragment,
+            'scheme' => $this->getScheme(),
+            'user' => $this->getUser(),
+            'pass' => $this->getPass(),
+            'host' => $this->getHost()->__toString(),
+            'subdomain' => $this->getHost()->getSubdomain(),
+            'registrableDomain' => $this->getHost()->getRegistrableDomain(),
+            'publicSuffix' => $this->getHost()->getPublicSuffix(),
+            'port' => $this->getPort(),
+            'path' => $this->getPath(),
+            'query' => $this->getQuery(),
+            'fragment' => $this->getFragment(),
         );
     }
 

src/Pdp/Uri/Url/Host.php

@@ -61,14 +61,6 @@ public function getSubdomain()
         return $this->subdomain;
     }
 
-    /**
-     * @param string $subdomain
-     */
-    public function setSubdomain($subdomain)
-    {
-        $this->subdomain = $subdomain;
-    }
-
     /**
      * @return string
      */
@@ -77,14 +69,6 @@ public function getRegistrableDomain()
         return $this->registrableDomain;
     }
 
-    /**
-     * @param string $registrableDomain
-     */
-    public function setRegistrableDomain($registrableDomain)
-    {
-        $this->registrableDomain = $registrableDomain;
-    }
-
     /**
      * Get Public suffix.
      *
@@ -95,14 +79,6 @@ public function getPublicSuffix()
         return $this->publicSuffix;
     }
 
-    /**
-     * @param string $publicSuffix
-     */
-    public function setPublicSuffix($publicSuffix)
-    {
-        $this->publicSuffix = $publicSuffix;
-    }
-
     /**
      * Get Entire host part.
      *
@@ -113,14 +89,6 @@ public function getHost()
         return $this->host;
     }
 
-    /**
-     * @param string $host
-     */
-    public function setHost($host)
-    {
-        $this->host = $host;
-    }
-
     /**
      * Get string representation of host.
      *
@@ -149,10 +117,10 @@ public function __toString()
     public function toArray()
     {
         return array(
-            'subdomain' => $this->subdomain,
-            'registrableDomain' => $this->registrableDomain,
-            'publicSuffix' => $this->publicSuffix,
-            'host' => $this->host,
+            'subdomain' => $this->getSubdomain(),
+            'registrableDomain' => $this->getRegistrableDomain(),
+            'publicSuffix' => $this->getPublicSuffix(),
+            'host' => $this->getHost(),
         );
     }
 }

tests/src/Pdp/Uri/Url/HostTest.php

@@ -35,36 +35,6 @@ public function test__toStringWhenHostPartIsNull()
         $this->assertEquals('www.example.com', $host->__toString());
     }
 
-    /**
-     * @dataProvider hostDataProvider
-     *
-     * @param $publicSuffix
-     * @param $registrableDomain
-     * @param $subdomain
-     * @param $hostPart
-     */
-    public function test__get($publicSuffix, $registrableDomain, $subdomain, $hostPart)
-    {
-        $parts = array(
-            'subdomain' => $subdomain,
-            'registrableDomain' => $registrableDomain,
-            'publicSuffix' => $publicSuffix,
-            'host' => $hostPart,
-        );
-
-        $host = new Host(
-            $parts['subdomain'],
-            $parts['registrableDomain'],
-            $parts['publicSuffix'],
-            $parts['host']
-        );
-
-        $this->assertSame($hostPart, $host->getHost());
-        $this->assertSame($parts['subdomain'], $host->getSubdomain());
-        $this->assertEquals($parts['registrableDomain'], $host->getRegistrableDomain());
-        $this->assertEquals($parts['publicSuffix'], $host->getPublicSuffix());
-    }
-
     /**
      * @dataProvider hostDataProvider
      *

tests/src/Pdp/Uri/UrlTest.php

@@ -74,29 +74,6 @@ public function testGetSchemeless()
         $this->assertEquals($schemeless, $this->url->getSchemeless());
     }
 
-    public function test__getProperties()
-    {
-        $expected = array(
-            'scheme' => 'http',
-            'user' => 'anonymous',
-            'pass' => 'guest',
-            'host' => 'example.com',
-            'port' => 8080,
-            'path' => '/path/to/index.php/foo/bar.xml',
-            'query' => 'baz=dib',
-            'fragment' => 'anchor',
-        );
-
-        $this->assertEquals($expected['scheme'], $this->url->getScheme());
-        $this->assertEquals($expected['user'], $this->url->getUser());
-        $this->assertEquals($expected['pass'], $this->url->getPass());
-        $this->assertEquals($expected['host'], $this->url->getHost()->__toString());
-        $this->assertEquals($expected['port'], $this->url->getPort());
-        $this->assertEquals($expected['path'], $this->url->getPath());
-        $this->assertEquals($expected['query'], $this->url->getQuery());
-        $this->assertEquals($expected['fragment'], $this->url->getFragment());
-    }
-
     public function testToArray()
     {
         $expected = array(