merged branch stof/fix_5_3 (PR #7662)

This PR was merged into the master branch. Discussion ---------- Fixed the Console code on PHP 5.3 | Q | A | ------------- | --- | Fixed tickets | none (catched by the Travis builds) | License | MIT The PR #7657 introduced a requirement on PHP 5.4 by mistake. Commits ------- 1356050 Fixed the Console code on PHP 5.3
symfony · Apr 13, 2013 · 9b6d30c · 9b6d30c
2 parents bedac11 + 1356050
commit 9b6d30c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -320,11 +320,14 @@ public function getParameterOption($values, $default = false)
      */
     public function __toString()
     {
-        $tokens = array_map(function ($token) {
+        $self = $this;
+        $tokens = array_map(function ($token) use ($self) {
             if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-                return $match[1] . $this->escapeToken($match[2]);
-            } elseif ($token && $token[0] !== '-') {
-                return $this->escapeToken($token);
+                return $match[1] . $self->escapeToken($match[2]);
+            }
+
+            if ($token && $token[0] !== '-') {
+                return $self->escapeToken($token);
             }
 
             return $token;

diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php
@@ -214,9 +214,11 @@ public function hasOption($name)
     /**
      * Escapes a token through escapeshellarg if it contains unsafe chars
      *
+     * @param string $token
+     *
      * @return string
      */
-    protected function escapeToken($token)
+    public function escapeToken($token)
     {
         return preg_match('{^[\w-]+$}', $token) ? $token : escapeshellarg($token);
     }