update

Author: ilsanbao

example.php

@@ -3,8 +3,17 @@
 require_once __DIR__ . '/src/ipip/db/Info.php';
 require_once __DIR__ . '/src/ipip/db/Reader.php';
 
-$db = new ipip\db\Reader('c:\work\tiantexin\bb\v6\mydatavipday2.ipdb');
+$db = new ipip\db\Reader('c:\work\tiantexin\bb\v6\mydata6vipday4.ipdb');
 $loc = $db->find("2001:250:200::");
 $map = $db->findMap("2001:250:200::");
 $obj = $db->findInfo("2001:250:200::");
-var_dump($loc, $map, $obj);
+var_dump($loc, $map, $obj);
+
+try
+{
+    var_dump($db->find("255.255.255.1"));
+}
+catch (Exception $e)
+{
+    exit($e->getMessage());
+}

src/ipip/db/Reader.php

@@ -23,17 +23,21 @@ class Reader
      */
     public function __construct($database)
     {
+        if (is_readable($database) === FALSE)
+        {
+            throw new \InvalidArgumentException("The IP Database file \"{$database}\" does not exist or is not readable.");
+        }
+
         $this->database = $database;
 
         $this->init();
     }
 
+    /**
+     * @throws \Exception
+     */
     private function init()
     {
-        if (is_readable($this->database) === FALSE)
-        {
-            throw new \InvalidArgumentException("The IP Database file \"{$this->database}\" does not exist or is not readable.");
-        }
         $this->file = @fopen($this->database, 'rb');
         if ($this->file === FALSE)
         {
@@ -67,7 +71,7 @@ private function init()
     /**
      * @param $ip
      * @param string $language
-     * @return array|NULL
+     * @return array|null
      */
     public function find($ip, $language = 'CN')
     {
@@ -90,32 +94,25 @@ public function find($ip, $language = 'CN')
         {
             if (!$this->supportV4())
             {
-
+                throw new \InvalidArgumentException("The Database not support IPv4 address.");
             }
         }
         elseif (strpos($ip, ':') !== FALSE)
         {
             if (!$this->supportV6())
             {
-
+                throw new \InvalidArgumentException("The Database not support IPv6 address.");
             }
         }
 
-        try
+        $node = $this->findNode($ip);
+        if ($node > 0)
         {
-            $node = $this->findNode($ip);
-            if ($node > 0)
-            {
-                $data = $this->resolve($node);
+            $data = $this->resolve($node);
 
-                $values = explode("\t", $data);
+            $values = explode("\t", $data);
 
-                return array_slice($values, $this->meta['languages'][$language], count($this->meta['fields']));
-            }
-        }
-        catch (\Exception $e)
-        {
-            return NULL;
+            return array_slice($values, $this->meta['languages'][$language], count($this->meta['fields']));
         }
 
         return NULL;
@@ -124,7 +121,7 @@ public function find($ip, $language = 'CN')
     public function findMap($ip, $language = 'CN')
     {
         $array = $this->find($ip, $language);
-        if (NULL == $array)
+        if (NULL === $array)
         {
             return NULL;
         }
@@ -135,7 +132,7 @@ public function findMap($ip, $language = 'CN')
     public function findInfo($ip, $language = 'CN')
     {
         $map = $this->findMap($ip, $language);
-        if (NULL == $map)
+        if (NULL === $map)
         {
             return NULL;
         }
@@ -146,7 +143,7 @@ public function findInfo($ip, $language = 'CN')
     /**
      * @param $ip
      * @return int
-     * @throws \Exception
+     * @throws \RuntimeException
      */
     private function findNode($ip)
     {
@@ -218,7 +215,7 @@ private function findNode($ip)
             return $node;
         }
 
-        throw new \Exception("find node failed");
+        throw new \RuntimeException("find node failed");
     }
 
     /**