Merge pull request #95 from clue-labs/wmic-multiple

Support parsing multiple DNS entries for same interface from WMIC

Author: jsor

src/Config/Config.php

@@ -115,7 +115,7 @@ public static function loadResolvConfBlocking($path = null)
     public static function loadWmicBlocking($command = null)
     {
         $contents = shell_exec($command === null ? 'wmic NICCONFIG get "DNSServerSearchOrder" /format:CSV' : $command);
-        preg_match_all('/(?:{|,|")([\da-f.:]{4,})(?:}|,|")/i', $contents, $matches);
+        preg_match_all('/(?<=[{;,"])([\da-f.:]{4,})(?=[};,"])/i', $contents, $matches);
 
         $config = new self();
         $config->nameservers = $matches[1];

tests/Config/ConfigTest.php

@@ -152,7 +152,22 @@ public function testLoadsSingleEntryForMultipleNicsFromWmicOutput()
         $this->assertEquals($expected, $config->nameservers);
     }
 
-    public function testLoadsMultipleEntriesForSingleNicFromWmicOutput()
+    public function testLoadsMultipleEntriesForSingleNicWithSemicolonFromWmicOutput()
+    {
+        $contents = '
+Node,DNSServerSearchOrder
+ACE,
+ACE,{192.168.2.1;192.168.2.2}
+ACE,
+';
+        $expected = array('192.168.2.1', '192.168.2.2');
+
+        $config = Config::loadWmicBlocking($this->echoCommand($contents));
+
+        $this->assertEquals($expected, $config->nameservers);
+    }
+
+    public function testLoadsMultipleEntriesForSingleNicWithQuotesFromWmicOutput()
     {
         $contents = '
 Node,DNSServerSearchOrder