[Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet

chalasr · chalasr · commit 6b99f2042c52 · 2016-04-25T19:20:20.000+02:00
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -605,6 +605,10 @@ public function getUsages()
      */
     public function getHelper($name)
     {
+        if (null === $this->helperSet) {
+            throw new LogicException(sprintf('Unable to retrieve helper "%s" because there is no HelperSet defined for this command. Did you forget to call %s#setHelperSet()?', $name, get_class($this)));
+        }
+
         return $this->helperSet->get($name);
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -173,6 +173,16 @@ public function testGetHelper()
         $this->assertEquals($formatterHelper->getName(), $command->getHelper('formatter')->getName(), '->getHelper() returns the correct helper');
     }
 
+    /**
+     * @expectedException        \LogicException
+     * @expectedExceptionMessage Unable to retrieve helper "formatter" because there is no HelperSet defined for this command.
+     */
+    public function testGetHelperWithoutHelperSet()
+    {
+        $command = new \TestCommand();
+        $command->getHelper('formatter');
+    }
+
     public function testMergeApplicationDefinition()
     {
         $application1 = new Application();

Original file line number	Diff line number	Diff line change
`@@ -605,6 +605,10 @@ public function getUsages()`
`605`	`605`	`*/`
`606`	`606`	`public function getHelper($name)`
`607`	`607`	`{`
	`608`	`+ if (null === $this->helperSet) {`
	`609`	`+ throw new LogicException(sprintf('Unable to retrieve helper "%s" because there is no HelperSet defined for this command. Did you forget to call %s#setHelperSet()?', $name, get_class($this)));`
	`610`	`+ }`
	`611`	`+`
`608`	`612`	`return $this->helperSet->get($name);`
`609`	`613`	`}`
`610`	`614`