Merge branch 'cs/zendframework/zendframework#7021-s-join-to-implode' …

…into develop Close zendframework/zendframework#7021
zendframework · Dec 16, 2014 · 446f01b · 446f01b
commit 446f01b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Adapter/Windows.php b/src/Adapter/Windows.php
@@ -299,7 +299,7 @@ public function readChar($mask = null)
 
             exec(
                 'powershell -NonInteractive -NoProfile -NoLogo -OutputFormat Text -Command "'
-                . '[int[]] $mask = ' . join(',', $asciiMask) . ';'
+                . '[int[]] $mask = ' . implode(',', $asciiMask) . ';'
                 . 'do {'
                     . '$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\').VirtualKeyCode;'
                 . '} while ( !($mask -contains $key) );'

diff --git a/src/Adapter/WindowsAnsicon.php b/src/Adapter/WindowsAnsicon.php
@@ -259,7 +259,7 @@ public function readChar($mask = null)
             $result = $return = null;
             exec(
                 'powershell -NonInteractive -NoProfile -NoLogo -OutputFormat Text -Command "'
-                . '[int[]] $mask = '.join(',', $asciiMask).';'
+                . '[int[]] $mask = '.implode(',', $asciiMask).';'
                 . 'do {'
                 . '$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\').VirtualKeyCode;'
                 . '} while ( !($mask -contains $key) );'

diff --git a/src/RouteMatcher/DefaultRouteMatcher.php b/src/RouteMatcher/DefaultRouteMatcher.php
@@ -510,7 +510,7 @@ public function match($params)
                     $alternativeAliases[] = '(?:' . implode('|', $this->getAliases($alternative)) . ')';
                 }
 
-                $regex .= join('|', $alternativeAliases);
+                $regex .= implode('|', $alternativeAliases);
 
                 if ($part['hasValue']) {
                     $regex .= ')(?:\=(?P<value>.*?)$)?$/';