Merge branch 'feature/44' into develop

Close #44 Fixes #43
zendframework · Feb 4, 2019 · dc2167e · dc2167e
2 parents 0a2bd8e + ae45d9a
commit dc2167e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,7 +22,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#44](https://github.com/zendframework/zend-console/pull/44) fixes usage of `array_unique()` within the `DefaultRouteMatcher` to
+  properly re-assign the array when invoked.
 
 ## 2.7.1 - TBD
 

diff --git a/src/RouteMatcher/DefaultRouteMatcher.php b/src/RouteMatcher/DefaultRouteMatcher.php
@@ -305,7 +305,7 @@ protected function parseDefinition($def)
                 $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
 
                 // remove dupes
-                array_unique($options);
+                $options = array_unique($options);
 
                 // prepare item
                 $item = [
@@ -343,7 +343,7 @@ protected function parseDefinition($def)
                 $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
 
                 // remove dupes
-                array_unique($options);
+                $options = array_unique($options);
 
                 // prepare item
                 $item = [
@@ -381,7 +381,7 @@ protected function parseDefinition($def)
                 $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
 
                 // remove dupes
-                array_unique($options);
+                $options = array_unique($options);
 
                 // remove prefix
                 array_walk($options, function (&$val) {
@@ -424,7 +424,7 @@ protected function parseDefinition($def)
                 $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
 
                 // remove dupes
-                array_unique($options);
+                $options = array_unique($options);
 
                 // remove prefix
                 array_walk($options, function (&$val) {

diff --git a/test/RouteMatcher/DefaultRouteMatcherTest.php b/test/RouteMatcher/DefaultRouteMatcherTest.php
@@ -86,6 +86,15 @@ public static function routeProvider()
                 ['--baz'],
                 null
             ],
+            'mandatory-long-flag-alternative-duplicates' => [
+                '(--foo | --foo | --bar)',
+                ['--foo'],
+                [
+                    'foo' => true,
+                    'bar' => false,
+                    'baz' => null,
+                ]
+            ],
 
             // -- mandatory short flags
             'mandatory-short-flag-no-match' => [
@@ -375,6 +384,11 @@ public static function routeProvider()
                 ['foo','bar'],
                 ['foo' => null, 'altGroup' => 'bar', 'bar' => true, 'baz' => false]
             ],
+            'mandatory-literal-namedAlternative-match-1-duplicates' => [
+                'foo ( bar | bar | baz ):altGroup',
+                ['foo','bar'],
+                ['foo' => null, 'altGroup' => 'bar', 'bar' => true, 'baz' => false]
+            ],
             'mandatory-literal-namedAlternative-match-2' => [
                 'foo ( bar |   baz   ):altGroup9',
                 ['foo','baz'],