Added support for Symfony 3.* components

webmozart · Dec 16, 2015 · 8715458 · 8715458
1 parent 7899d8b
commit 8715458
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -11,12 +11,12 @@
     "require": {
         "php": ">=5.3.9",
         "webmozart/assert": "^1.0",
-        "symfony/console": "^2.7",
-        "symfony/process": "^2.5",
-        "symfony/event-dispatcher": "^2.5"
+        "symfony/console": "^2.7|^3.0",
+        "symfony/process": "^2.5|^3.0",
+        "symfony/event-dispatcher": "^2.5|^3.0"
     },
     "require-dev": {
-        "symfony/filesystem": "^2.3",
+        "symfony/filesystem": "^2.3|^3.0",
         "phpunit/phpunit": "^4.6",
         "sebastian/version": "^1.0.1"
     },

diff --git a/src/Adapter/ArgsInput.php b/src/Adapter/ArgsInput.php
@@ -76,12 +76,17 @@ public function getFirstArgument()
     /**
      * {@inheritdoc}
      */
-    public function hasParameterOption($values)
+    public function hasParameterOption($values, $onlyParams = false)
     {
         $tokens = $this->rawArgs->getTokens();
 
         foreach ((array) $values as $value) {
             foreach ($tokens as $token) {
+                // end of options (--) signal reached, stop now
+                if ($onlyParams && $token === '--') {
+                    return false;
+                }
+
                 if ($token === $value || 0 === strpos($token, $value.'=')) {
                     return true;
                 }
@@ -96,17 +101,24 @@ public function hasParameterOption($values)
     /**
      * {@inheritdoc}
      */
-    public function getParameterOption($values, $default = false)
+    public function getParameterOption($values, $default = false, $onlyParams = false)
     {
         $tokens = $this->rawArgs->getTokens();
 
         foreach ((array) $values as $value) {
             for (reset($tokens); null !== key($tokens); next($tokens)) {
                 $token = current($tokens);
 
+                if ($onlyParams && ($token === '--')) {
+                    // end of options (--) signal reached, stop now
+                    return $default;
+                }
+
                 // Long/short option with value in the next argument
                 if ($token === $value) {
-                    return next($tokens) ?: null;
+                    $next = next($tokens);
+
+                    return ($next && ($next !== '--')) ? $next : null;
                 }
 
                 // Long option with =

diff --git a/src/Adapter/CommandAdapter.php b/src/Adapter/CommandAdapter.php
@@ -101,7 +101,7 @@ public function setHelperSet(HelperSet $helperSet)
      *
      * @return static The current instance.
      */
-    public function setCode($code)
+    public function setCode(callable $code)
     {
         return $this;
     }

diff --git a/src/Adapter/IOOutput.php b/src/Adapter/IOOutput.php
@@ -106,25 +106,57 @@ public function setVerbosity($level)
      */
     public function getVerbosity()
     {
-        if ($this->io->isQuiet()) {
+        if ($this->isQuiet()) {
             return self::VERBOSITY_QUIET;
         }
 
-        if ($this->io->isDebug()) {
+        if ($this->isDebug()) {
             return self::VERBOSITY_DEBUG;
         }
 
-        if ($this->io->isVeryVerbose()) {
+        if ($this->isVeryVerbose()) {
             return self::VERBOSITY_VERY_VERBOSE;
         }
 
-        if ($this->io->isVerbose()) {
+        if ($this->isVerbose()) {
             return self::VERBOSITY_VERBOSE;
         }
 
         return self::VERBOSITY_NORMAL;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function isQuiet()
+    {
+        return $this->io->isQuiet();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isVerbose()
+    {
+        return $this->io->isVerbose();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isVeryVerbose()
+    {
+        return $this->io->isVeryVerbose();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isDebug()
+    {
+        return $this->io->isDebug();
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/tests/Adapter/ArgsInputTest.php b/tests/Adapter/ArgsInputTest.php
@@ -80,33 +80,40 @@ public function testGetNoFirstArgument()
 
     public function testHasParameterOption()
     {
-        $input = new ArgsInput(new StringArgs('-o --option --value=value'));
+        $input = new ArgsInput(new StringArgs('-o --option --value=value -- --foo=bar'));
 
         $this->assertTrue($input->hasParameterOption('-o'));
         $this->assertTrue($input->hasParameterOption('--option'));
         $this->assertTrue($input->hasParameterOption('--value'));
-        $this->assertFalse($input->hasParameterOption('--foo'));
+        $this->assertTrue($input->hasParameterOption('--foo'));
+        // only check real parameters, skip those following an end of options (--) signal
+        $this->assertFalse($input->hasParameterOption('--foo', true));
     }
 
     public function testHasMultipleParameterOptions()
     {
-        $input = new ArgsInput(new StringArgs('-o --option --value=value'));
+        $input = new ArgsInput(new StringArgs('-o --option --value=value -- --foo=bar'));
 
         $this->assertTrue($input->hasParameterOption(array('-o', '--option')));
         // sufficient if any of the options exists
         $this->assertTrue($input->hasParameterOption(array('-o', '--foo')));
-        $this->assertFalse($input->hasParameterOption(array('--foo', '--bar')));
+        $this->assertFalse($input->hasParameterOption(array('--bar', '--baz')));
+        // only check real parameters, skip those following an end of options (--) signal
+        $this->assertTrue($input->hasParameterOption(array('--foo', '--bar')));
+        $this->assertFalse($input->hasParameterOption(array('--foo', '--bar'), true));
     }
 
     public function testGetParameterOption()
     {
-        $input = new ArgsInput(new StringArgs('-vvalue1  --value=value2 --space value3 --last'));
+        $input = new ArgsInput(new StringArgs('-vvalue1  --value=value2 --space value3 --last -- --foo=bar'));
 
         $this->assertSame('value1', $input->getParameterOption('-v'));
         $this->assertSame('value2', $input->getParameterOption('--value'));
         $this->assertSame('value3', $input->getParameterOption('--space'));
         $this->assertNull($input->getParameterOption('--last'));
-        $this->assertSame('default', $input->getParameterOption('--foo', 'default'));
+        $this->assertSame('bar', $input->getParameterOption('--foo', 'default'));
+        // only check real parameters, skip those following an end of options (--) signal
+        $this->assertSame('default', $input->getParameterOption('--foo', 'default', true));
     }
 
     public function testGetArguments()

diff --git a/tests/Args/DefaultArgsParserTest.php b/tests/Args/DefaultArgsParserTest.php
@@ -192,7 +192,7 @@ public function testParseIgnoresMissingOptionalArguments()
 
     /**
      * @expectedException \Webmozart\Console\Api\Args\CannotParseArgsException
-     * @expectedExceptionMessage Not enough arguments.
+     * @expectedExceptionMessage Not enough arguments
      */
     public function testParseFailsIfMissingRequiredArgument()
     {
@@ -223,7 +223,7 @@ public function testParseDoesNotFailIfMissingRequiredArgumentAndLenient()
 
     /**
      * @expectedException \Webmozart\Console\Api\Args\CannotParseArgsException
-     * @expectedExceptionMessage Not enough arguments.
+     * @expectedExceptionMessage Not enough arguments
      */
     public function testParseFailsIfMissingRequiredArgumentWithMissingCommandNames()
     {
@@ -254,7 +254,7 @@ public function testParseDoesNotFailIfMissingRequiredArgumentWithMissingCommandN
 
     /**
      * @expectedException \Webmozart\Console\Api\Args\CannotParseArgsException
-     * @expectedExceptionMessage Not enough arguments.
+     * @expectedExceptionMessage Not enough arguments
      */
     public function testParseFailsIfMissingRequiredArgumentWithMissingCommandOptions()
     {