Improved regex for capturing arguments. Updated unit test

Author: pointybeard

src/CLILib/Argument/Iterator.php

@@ -35,18 +35,23 @@ public function __construct(array $args = null, $ignoreFirst = true)
          */
         // 1 - Fixed <name> capturing group so it handles hyphens.
         preg_match_all(
-            '@(?:-{1,2}|\/)(?<name>[\w-]+)(?:[=:]?|\s+)(?<value>[^-\s"][^"]*?|"[^"]*")?(?=\s+[-/]|$)@i',
+            '@(?:-{1,2}|\/)(?<name>[\w-]+)(?:(?:[:=]|\s+)(?:(?<value>[^-\s"][^"\s]+)|(?:"(?<value_in_quotes>[^"]+?)")))?@i',
             $string,
             $matches,
             PREG_SET_ORDER
         );
 
         foreach ($matches as $arg) {
             $name = $arg['name'];
-            $value = isset($arg['value'])
-                ? $arg['value']
-                : true
-            ;
+
+            $value = true;
+            if(isset($arg['value_in_quotes'])) {
+                $value = $arg['value_in_quotes'];
+
+            } elseif(isset($arg['value'])) {
+                $value = $arg['value'];
+            }
+
             $this->args[] = new CLILib\Argument($name, $value);
             $this->keys[] = $name;
         }

tests/Argument/Iterator/Test.php

@@ -16,19 +16,25 @@ public function testValidPassArgsToConstructor()
             '--database myDB',
             '-h:local:host',
             '--lots-of-hyphens',
-            '--with-hyphen=alrighty',
+            '--with-hyphen="alrighty"',
+            '-j /var/path/to/some_interesting_file.json',
+            '-x "/var/path/to/some/otherfile.xml"'
         ], false);
 
-        $this->assertEquals(7, iterator_count($it));
+        $this->assertEquals(9, iterator_count($it));
         $this->assertTrue($it->find('hithere')->value());
         $this->assertEquals('cheese', $it->find('c')->value());
 
         // 1 - Added tests to check for hyphens in argument names
         $this->assertTrue($it->find('lots-of-hyphens')->value());
         $this->assertEquals('alrighty', $it->find('with-hyphen')->value());
 
+        $this->assertEquals('/var/path/to/some_interesting_file.json', $it->find('j')->value());
+
+        $this->assertEquals('/var/path/to/some/otherfile.xml', $it->find('x')->value());
+
         // Since iterator_count() was used, the iterator position should be at the end.
-        $this->assertEquals(7, $it->key());
+        $this->assertEquals(9, $it->key());
 
         // Return to start and check the first item is "hithere" with a value of true
         $it->rewind();