Commitc232ecb

committed

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

Use Command::setHelperSet rather than Command#setHelperSet in exception msgSimplify exception message

1 parentb44abe3 commitc232ecbCopy full SHA for c232ecb

File tree

+16

-1

lines changed

src/Symfony/Component/Console
- Command
  - Command.php
- Tests/Command
  - CommandTest.php

+16

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -601,10 +601,15 @@ public function getUsages()`
`601`	`601`	`*`
`602`	`602`	`* @return mixed The helper value`
`603`	`603`	`*`
`604`		`- * @throws InvalidArgumentException if the helper is not defined`
	`604`	`+ * @throws LogicException If no helperSet is defined`
	`605`	`+ * @throws InvalidArgumentException If the helper is not defined`
`605`	`606`	`*/`
`606`	`607`	`publicfunctiongetHelper($name)`
`607`	`608`	`{`
	`609`	`+if (null ===$this->helperSet) {`
	`610`	`+thrownewLogicException(sprintf('Cannot retrieve helper "%s" because there is no HelperSet defined.',$name));`
	`611`	`+ }`
	`612`	`+`
`608`	`613`	`return$this->helperSet->get($name);`
`609`	`614`	`}`
`610`	`615`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,16 @@ public function testGetHelper()`
`173`	`173`	`$this->assertEquals($formatterHelper->getName(),$command->getHelper('formatter')->getName(),'->getHelper() returns the correct helper');`
`174`	`174`	`}`
`175`	`175`
	`176`	`+/**`
	`177`	`+ * @expectedException \LogicException`
	`178`	`+ * @expectedExceptionMessage Cannot retrieve helper "formatter" because there is no HelperSet defined.`
	`179`	`+ */`
	`180`	`+publicfunctiontestGetHelperWithoutHelperSet()`
	`181`	`+ {`
	`182`	`+$command =new \TestCommand();`
	`183`	`+$command->getHelper('formatter');`
	`184`	`+ }`
	`185`	`+`
`176`	`186`	`publicfunctiontestMergeApplicationDefinition()`
`177`	`187`	`{`
`178`	`188`	`$application1 =newApplication();`

Comments

(0)