bug #9624 [Console] Fix undefined offset when formatting namespace suggestions (GromNaN)

fabpot · fabpot · commit 96f58e3bc9c3 · 2013-11-27T10:10:40.000+01:00
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #9624). Discussion ---------- [Console] Fix undefined offset when formatting namespace suggestions [`preg_grep`](http://www.php.net/manual/en/function.preg-grep.php) returns an array indexed using the keys from the input array. `array_values` is used in the method `find`, but was missing in `findNamespace`. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #9614 | License | MIT | Doc PR | n/a Edit: should be merged to 2.4 Commits ------- f5c4011 [Console] Fix undefined offset when formatting namespace suggestions
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -515,8 +515,8 @@ public function findNamespace($namespace)
         }
 
         $exact = in_array($namespace, $namespaces, true);
-        if (1 < count($namespaces) && !$exact) {
-            throw new \InvalidArgumentException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions($namespaces)));
+        if (count($namespaces) > 1 && !$exact) {
+            throw new \InvalidArgumentException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))));
         }
 
         return $exact ? $namespace : reset($namespaces);
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -44,6 +44,7 @@ public static function setUpBeforeClass()
         require_once self::$fixturesPath.'/Foo4Command.php';
         require_once self::$fixturesPath.'/Foo5Command.php';
         require_once self::$fixturesPath.'/FoobarCommand.php';
+        require_once self::$fixturesPath.'/BarBucCommand.php';
     }
 
     protected function normalizeLineBreaks($text)
@@ -207,6 +208,7 @@ public function testFindNamespace()
     public function testFindAmbiguousNamespace()
     {
         $application = new Application();
+        $application->add(new \BarBucCommand());
         $application->add(new \FooCommand());
         $application->add(new \Foo2Command());
         $application->findNamespace('f');
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/BarBucCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/BarBucCommand.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+
+class BarBucCommand extends Command
+{
+    protected function configure()
+    {
+        $this->setName('bar:buc');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -515,8 +515,8 @@ public function findNamespace($namespace)`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`$exact = in_array($namespace, $namespaces, true);`
`518`		`- if (1 < count($namespaces) && !$exact) {`
`519`		`- throw new \InvalidArgumentException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions($namespaces)));`
	`518`	`+ if (count($namespaces) > 1 && !$exact) {`
	`519`	`+ throw new \InvalidArgumentException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))));`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`return $exact ? $namespace : reset($namespaces);`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public static function setUpBeforeClass()`
`44`	`44`	`require_once self::$fixturesPath.'/Foo4Command.php';`
`45`	`45`	`require_once self::$fixturesPath.'/Foo5Command.php';`
`46`	`46`	`require_once self::$fixturesPath.'/FoobarCommand.php';`
	`47`	`+ require_once self::$fixturesPath.'/BarBucCommand.php';`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`protected function normalizeLineBreaks($text)`
`@@ -207,6 +208,7 @@ public function testFindNamespace()`
`207`	`208`	`public function testFindAmbiguousNamespace()`
`208`	`209`	`{`
`209`	`210`	`$application = new Application();`
	`211`	`+ $application->add(new \BarBucCommand());`
`210`	`212`	`$application->add(new \FooCommand());`
`211`	`213`	`$application->add(new \Foo2Command());`
`212`	`214`	`$application->findNamespace('f');`