Merge pull request #3 from MaartenGDev/master

Added matchRange function

Author: akalongman

src/Ip.php

@@ -350,4 +350,21 @@ public static function long2ip($dec, $ipv6 = false)
         }
         return $ipstr;
     }
+
+    public static function matchRange($ip, $range)
+    {
+        $ipItems = explode('.', $ip);
+        $rangeItems = explode('.', $range);
+
+        $ipItems = array_filter($ipItems, function ($subnet) {
+            return $subnet !== '';
+        });
+        $rangeItems = array_filter($rangeItems, function ($subnet) {
+            return $subnet !== '';
+        });
+
+        $ipItems = array_slice($ipItems, 0, count($rangeItems));
+
+        return implode('.', $rangeItems) === implode('.', $ipItems);
+    }
 }

tests/Unit/IpTest.php

@@ -153,7 +153,7 @@ public function test8()
         $this->assertTrue($status);
 
         $status = Ip::match('2001:cdba:0000:0000:0000:0000:3257:9652',
-                            '2001:cdba:0000:0000:0000:0000:3257:1234-2001:cdba:0000:0000:0000:0000:3257:9999');
+            '2001:cdba:0000:0000:0000:0000:3257:1234-2001:cdba:0000:0000:0000:0000:3257:9999');
         $this->assertTrue($status);
 
 
@@ -166,7 +166,7 @@ public function test8()
 
 
         $status = Ip::match('2001:cdba:0000:0000:0000:0000:3257:7778',
-                            '2001:cdba:0000:0000:0000:0000:3257:1234-2001:cdba:0000:0000:0000:0000:3257:7777');
+            '2001:cdba:0000:0000:0000:0000:3257:1234-2001:cdba:0000:0000:0000:0000:3257:7777');
         $this->assertFalse($status);
     }
 
@@ -193,6 +193,20 @@ public function test9()
     /**
      * @test
      */
+
+
+    public function test_match_range()
+    {
+        $range = Ip::matchRange('192.168.100.', '192.168..');
+        $this->assertTrue($range);
+
+        $range = Ip::matchRange('192.168.1.200', '192.168.1.');
+        $this->assertTrue($range);
+
+        $range = Ip::matchRange('192.168.1.200', '192.168.2.');
+        $this->assertFalse($range);
+    }
+
     public function testLocal()
     {
         $status = Ip::isLocal('192.168.5.5');