Merge branch 'master' of git://github.com/AllenJB/DomainParser

Author: maxzvonkov

Additional.php

@@ -52,4 +52,10 @@
                 'qc.com', 'ru.com', 'sa.com', 'se.com', 'se.net', 'uk.com', 'uk.net', 'us.com', 
                 'us.org', 'uy.com', 'za.com', 'com.de'), 'de.vu' => array('de.vu'), 
         'co.cc' => array(), 'com.cc' => array('com.cc'), 'org.cc' => array('org.cc'), 
-        'edu.cc' => array('edu.cc'), 'net.cc' => array('net.cc'));
+        'edu.cc' => array('edu.cc'), 'net.cc' => array('net.cc'),
+    'venez' => array(
+        '0rg.fr', '1s.fr', 'ass0.fr', 'be.ma', 'c0m.at', 'c4.fr', 'ch.ma', 'fr.ht', 'fr.mu',
+        'gaming.cx', 'ht.cx', 'lachezvos.com', 'laschezvoscoms.com', 'no-ip.be', 'no-ip.fr',
+        'qc.cx', 'sarl.tk', 'venez.fr', 'viens.la', 'vu.cx', 'x-plosif.com', 'xl.cx', 'ze.tc', 'zik.dj',
+    ),
+);

Parser.php

@@ -127,16 +127,25 @@ class Parser
      */
     protected $path;
 
+
+    /**
+     * Custom list of additional domain groups / tlds
+     *
+     * @var array
+     */
+    protected $customDomains = array();
+
+
     /**
      * Creates a DomainParser object
      *
      * @param  string $format
      * @return void
      */
-    public function __construct($format = 'object')
+    public function __construct($format = 'object', $path = null)
     {
         $this->setFormat($format);
-        $this->setCachePath();
+        $this->setCachePath($path);
     }
 
     /**
@@ -312,6 +321,7 @@ private function load()
 
             fclose($file);
         }
+        $this->tldList['content'] = array_merge_recursive($this->tldList['content'], $this->customDomains);
 
         $this->loaded = true;
     }
@@ -466,4 +476,28 @@ public function cacheTime($cacheTime = 432000)
     {
         $this->cacheTime = filter_var($cacheTime, FILTER_VALIDATE_INT);
     }
+
+
+    /**
+     * Add a custom domain group. This will override the built-in domain groups.
+     *
+     * @param string $groupName
+     * @param array $tldList
+     */
+    public function addCustomDomainGroup($groupName, array $tldList)
+    {
+        $this->customDomains[$groupName] = $tldList;
+    }
+
+
+    /**
+     * Set the custom domain groups. The array should be in the same format as in Additional.php.
+     * These will override the built-in domain groups
+     *
+     * @param array $domainGroups Array of domain groups and their tld lists
+     */
+    public function setCustomDomainGroups(array $domainGroups)
+    {
+        $this->customDomains = $domainGroups;
+    }
 }