Merge pull request #39 from leth/fix-ipv6-addr-compression

Only compress 2 or more zeroed IPv6 Hextets

Author: leth

classes/Leth/IPAddress/IP/NetworkAddress.php

@@ -183,6 +183,7 @@ public static function merge(array $network_addresses): array
 				usort($net_addrs, array(__CLASS__, 'compare'));
 
 				$last_added = NULL;
+				$a = $b = NULL;
 				for ($i = 0; $i < count($net_addrs) - 1; $i++) {
 					$a = $net_addrs[$i];
 					$b = $net_addrs[$i + 1];

classes/Leth/IPAddress/IPv6/Address.php

@@ -241,7 +241,8 @@ public function format(int $mode): string
 
 			case IP\Address::FORMAT_COMPACT:
 				$best_pos   = $zeros_pos = FALSE;
-				$best_count = $zeros_count = 0;
+				$best_count = 1;
+				$zeros_count = 0;
 				foreach ($parts as $i => $quad)
 				{
 					$parts[$i] = ($quad === '0000') ? '0' : ltrim($quad, '0');

tests/IPv6AddressTest.php

@@ -47,6 +47,11 @@ public function providerFactory(): array
 				'::ffff:127:0:0:1',
 				'0:0:0:ffff:127:0:0:1',
 				'0000:0000:0000:ffff:0127:0000:0000:0001'),
+			array(
+				'2001:504:0:1:0:3:1898:1',
+				'2001:504:0:1:0:3:1898:1',
+				'2001:504:0:1:0:3:1898:1',
+				'2001:0504:0000:0001:0000:0003:1898:0001'),
 		);
 	}