included public suffix #150

Author: oscarotero

.gitattributes

@@ -1,7 +1,9 @@
-/demo           export-ignore
-/tests          export-ignore
-.gitattributes  export-ignore
-.gitignore      export-ignore
-.travis.yml     export-ignore
-composer.lock   export-ignore
-phpunit.xml     export-ignore
+/demo                                export-ignore
+/tests                               export-ignore
+.gitattributes                       export-ignore
+.gitignore                           export-ignore
+.travis.yml                          export-ignore
+composer.lock                        export-ignore
+phpunit.xml                          export-ignore
+src/resources/public_suffix_list.dat export-ignore
+src/resources/dat2php.php            export-ignore

src/Url.php

@@ -10,6 +10,7 @@ class Url
     protected $info;
 
     public static $validate = false;
+    private static $public_suffix_list;
 
     /**
      * Constructor. Sets the url.
@@ -181,13 +182,14 @@ public function getDomain($first_level = false)
                 return $first_level ? ($host[1].'.'.$host[0]) : $host[1];
 
             default:
-                $subdomains = ['co', 'com', 'org'];
+                $tld = $host[1].'.'.$host[0];
+                $suffixes = self::getSuffixes();
 
-                if ($first_level) {
-                    return in_array($host[1], $subdomains, true) ? ($host[2].'.'.$host[1].'.'.$host[0]) : ($host[1].'.'.$host[0]);
+                if (in_array($tld, $suffixes, true)) {
+                    return $first_level ? $host[2].'.'.$tld : $host[2];
                 }
 
-                return in_array($host[1], $subdomains, true) ? $host[2] : $host[1];
+                return $first_level ? $host[1].'.'.$host[0] : $host[1];
         }
     }
 
@@ -561,4 +563,13 @@ private function setPath($path)
             }
         }
     }
+
+    private function getSuffixes()
+    {
+        if (self::$public_suffix_list === null) {
+            self::$public_suffix_list = include __DIR__.'/resources/public_suffix_list.php';
+        }
+
+        return self::$public_suffix_list;
+    }
 }

src/resources/dat2php.php

@@ -0,0 +1,15 @@
+<?php
+
+$input = __DIR__.'/public_suffix_list.dat';
+$output = __DIR__.'/public_suffix_list.php';
+
+$lines = file($input, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+$lines = array_filter($lines, function ($line) {
+    return $line[0] !== '/';
+});
+
+$php = "<?php\n\nreturn ".var_export(array_values($lines), true).";\n";
+$php = str_replace('array (', 'array(', $php);
+
+file_put_contents($output, $php);