Merging develop to master in preparation for 2.8.0 release.

zendframework · Feb 4, 2019 · 95817ae · 95817ae
2 parents 64c5688 + 95a22c6
commit 95817ae
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 cache:
@@ -53,6 +51,15 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
+    - php: 7.3
+      env:
+        - DEPS=lowest
+    - php: 7.3
+      env:
+        - DEPS=locked
+    - php: 7.3
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.1 - TBD
+## 2.8.0 - 2019-02-04
 
 ### Added
 
-- Nothing.
+- [#41](https://github.com/zendframework/zend-console/pull/41) adds support for PHP 7.3.
 
 ### Changed
 
@@ -18,11 +18,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#41](https://github.com/zendframework/zend-console/pull/41) removes support for zend-stdlib v2 releases.
 
 ### 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.0 - 2018-01-25
 

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+        "zendframework/zend-stdlib": "^3.2.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7.23 || ^6.4.3",
@@ -45,8 +45,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7.x-dev",
-            "dev-develop": "2.8.x-dev"
+            "dev-master": "2.8.x-dev",
+            "dev-develop": "2.9.x-dev"
         }
     },
     "scripts": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Console.php b/src/Console.php
@@ -50,7 +50,7 @@ public static function getInstance($forceAdapter = null, $forceCharset = null)
 
         if ($forceAdapter !== null) {
             // Use the supplied adapter class
-            if (substr($forceAdapter, 0, 1) == '\\') {
+            if (0 === strpos($forceAdapter, '\\')) {
                 $className = $forceAdapter;
             } elseif (stristr($forceAdapter, '\\')) {
                 $className = __NAMESPACE__ . '\\' . ltrim($forceAdapter, '\\');
@@ -79,9 +79,9 @@ public static function getInstance($forceAdapter = null, $forceCharset = null)
 
         // Try to use the supplied charset class
         if ($forceCharset !== null) {
-            if (substr($forceCharset, 0, 1) == '\\') {
+            if (0 === strpos($forceCharset, '\\')) {
                 $className = $forceCharset;
-            } elseif (stristr($forceAdapter, '\\')) {
+            } elseif (false !== stripos($forceAdapter, '\\')) {
                 $className = __NAMESPACE__ . '\\' . ltrim($forceCharset, '\\');
             } else {
                 $className = __NAMESPACE__ . '\\Charset\\' . $forceCharset;

diff --git a/src/Getopt.php b/src/Getopt.php
@@ -670,9 +670,9 @@ public function parse()
                     break;
                 }
             }
-            if (substr($argv[0], 0, 2) == '--') {
+            if (0 === strpos($argv[0], '--')) {
                 $this->_parseLongOption($argv);
-            } elseif (substr($argv[0], 0, 1) == '-' && ('-' != $argv[0] || count($argv) > 1)) {
+            } elseif (0 === strpos($argv[0], '-') && ('-' != $argv[0] || count($argv) > 1)) {
                 $this->_parseShortOptionCluster($argv);
             } elseif ($this->getoptConfig[self::CONFIG_PARSEALL]) {
                 $this->remainingArgs[] = array_shift($argv);
@@ -823,7 +823,7 @@ protected function _parseSingleOption($flag, &$argv)
                 }
                 break;
             case 'optional':
-                if (count($argv) > 0 && substr($argv[0], 0, 1) != '-') {
+                if (count($argv) > 0 && 0 !== strpos($argv[0], '-')) {
                     $param = array_shift($argv);
                     $this->_checkParameterType($realFlag, $param);
                 } else {
@@ -979,7 +979,7 @@ protected function _addRulesModeGnu($rules)
                 $flag = strtolower($flag);
             }
             $r['alias'][] = $flag;
-            if (substr($rule, 1, 1) == ':') {
+            if (1 === strpos($rule, ':', 1)) {
                 $r['param'] = 'required';
                 $r['paramType'] = 'string';
             } else {

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'],