Merge branch 'develop'

Author: jeremykendall

.gitignore

@@ -1,8 +1,8 @@
 tags
-data/*.txt
 composer.lock
 vendor
 *.swp
 docs
 *~
 build
+.idea

.php_cs

@@ -9,8 +9,10 @@ $finder = \Symfony\CS\Finder\DefaultFinder::create()
 return \Symfony\CS\Config\Config::create()
     ->setUsingCache(true)
     ->fixers([
+        '-pre_increment',
         '-concat_without_spaces',
         'concat_with_spaces',
         'ordered_use',
+        'long_array_syntax',
     ])
     ->finder($finder);

.travis.yml

@@ -5,6 +5,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 script: phpunit

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] => /

bin/parse

@@ -23,13 +23,13 @@ try {
     $manager = new \Pdp\PublicSuffixListManager();
     $parser = new Pdp\Parser($manager->getList());
     $url = $parser->parseUrl($domain);
-    $suffixValid = ($parser->isSuffixValid((string) $url->host)) ? 'IS' : 'IS NOT';
+    $suffixValid = ($parser->isSuffixValid((string) $url->getHost())) ? 'IS' : 'IS NOT';
 
     print_r($url->toArray());
     echo sprintf('Host: %s', $url) . PHP_EOL;
     echo sprintf(
         "'%s' %s a valid public suffix.",
-        $url->host->publicSuffix,
+        $url->getHost()->getPublicSuffix(),
         $suffixValid
     ) . PHP_EOL;
 } catch (\Exception $e) {

build.xml

@@ -14,13 +14,13 @@
         <exec
             passthru="${passthru}"
             dir="${project.basedir}"
-            command="phpunit" />
+            command="./vendor/bin/phpunit" />
     </target>
 
     <target name="php-cs-fixer" description="PHP Codings Standards fixer">
         <exec
             passthru="${passthru}"
-            command="php-cs-fixer --verbose fix" />
+            command="./vendor/bin/php-cs-fixer fix --config-file=.php_cs --verbose" />
     </target>
 
     <target name="phpdoc" description="Generate API documentation">
@@ -39,6 +39,5 @@
         <phingCall target="clean" />
         <phingCall target="php-cs-fixer" />
         <phingCall target="phpunit" />
-        <phingCall target="phpdoc" />
     </target>
 </project>

composer.json

@@ -34,9 +34,11 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "mikey179/vfsStream": "~1.4",
-        "phpunit/phpunit": "~4.4",
-        "jeremykendall/debug-die": "0.0.1.*"
+        "mikey179/vfsStream": "~1.6",
+        "phpunit/phpunit": "~4.8",
+        "jeremykendall/debug-die": "0.0.1.*",
+        "phing/phing": "^2.13",
+        "fabpot/php-cs-fixer": "^1.11"
     },
     "autoload": {
         "psr-0": {