[Console] make parent constructor test more reliable

Tobion · Tobion · commit 9e0ebda837c1 · 2013-10-11T13:57:47.000+02:00
it also fixes the test since f2b60e9c687 and improves phpdoc
diff --git a/Application.php b/Application.php
@@ -56,13 +56,13 @@
  */
 class Application
 {
-    private $commands;
+    private $commands = array();
     private $wantHelps = false;
     private $runningCommand;
     private $name;
     private $version;
-    private $catchExceptions;
-    private $autoExit;
+    private $catchExceptions = true;
+    private $autoExit = true;
     private $definition;
     private $helperSet;
     private $dispatcher;
@@ -80,9 +80,6 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
     {
         $this->name = $name;
         $this->version = $version;
-        $this->catchExceptions = true;
-        $this->autoExit = true;
-        $this->commands = array();
         $this->helperSet = $this->getDefaultHelperSet();
         $this->definition = $this->getDefaultInputDefinition();
 
@@ -407,8 +404,8 @@ public function add(Command $command)
             return;
         }
 
-        if (null === $command->getAliases()) {
-            throw new \LogicException(sprintf('You must call the parent constructor in "%s::__construct()"', get_class($command)));
+        if (null === $command->getDefinition()) {
+            throw new \LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', get_class($command)));
         }
 
         $this->commands[$command->getName()] = $command;
diff --git a/Command/Command.php b/Command/Command.php
@@ -33,21 +33,21 @@ class Command
 {
     private $application;
     private $name;
-    private $aliases;
+    private $aliases = array();
     private $definition;
     private $help;
     private $description;
-    private $ignoreValidationErrors;
-    private $applicationDefinitionMerged;
-    private $applicationDefinitionMergedWithArgs;
+    private $ignoreValidationErrors = false;
+    private $applicationDefinitionMerged = false;
+    private $applicationDefinitionMergedWithArgs = false;
     private $code;
     private $synopsis;
     private $helperSet;
 
     /**
      * Constructor.
      *
-     * @param string $name The name of the command
+     * @param string|null $name The name of the command; passing null means it must be set in configure()
      *
      * @throws \LogicException When the command name is empty
      *
@@ -56,10 +56,6 @@ class Command
     public function __construct($name = null)
     {
         $this->definition = new InputDefinition();
-        $this->ignoreValidationErrors = false;
-        $this->applicationDefinitionMerged = false;
-        $this->applicationDefinitionMergedWithArgs = false;
-        $this->aliases = array();
 
         if (null !== $name) {
             $this->setName($name);
@@ -402,7 +398,7 @@ public function addOption($name, $shortcut = null, $mode = null, $description =
      *
      * @return Command The current instance
      *
-     * @throws \InvalidArgumentException When command name given is empty
+     * @throws \InvalidArgumentException When the name is invalid
      *
      * @api
      */
@@ -512,6 +508,8 @@ public function getProcessedHelp()
      *
      * @return Command The current instance
      *
+     * @throws \InvalidArgumentException When an alias is invalid
+     *
      * @api
      */
     public function setAliases($aliases)
@@ -606,6 +604,15 @@ public function asXml($asDom = false)
         return $output->fetch();
     }
 
+    /**
+     * Validates a command name.
+     *
+     * It must be non-empty and parts can optionally be separated by ":".
+     *
+     * @param string $name
+     *
+     * @throws \InvalidArgumentException When the name is invalid
+     */
     private function validateName($name)
     {
         if (!preg_match('/^[^\:]+(\:[^\:]+)*$/', $name)) {
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
@@ -127,13 +127,13 @@ public function testAdd()
     }
 
     /**
-     * @expectedException LogicException
-     * @expectedExceptionMessage You must call the parent constructor in "Foo5Command::__construct()"
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Command class "Foo5Command" is not correctly initialized. You probably forgot to call the parent constructor.
      */
     public function testAddCommandWithEmptyContructor()
     {
         $application = new Application();
-        $application->add($foo = new \Foo5Command());
+        $application->add(new \Foo5Command());
     }
 
     public function testHasGet()

Original file line number	Diff line number	Diff line change
`@@ -127,13 +127,13 @@ public function testAdd()`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`/**`
`130`		`- * @expectedException LogicException`
`131`		`- * @expectedExceptionMessage You must call the parent constructor in "Foo5Command::__construct()"`
	`130`	`+ * @expectedException \LogicException`
	`131`	`+ * @expectedExceptionMessage Command class "Foo5Command" is not correctly initialized. You probably forgot to call the parent constructor.`
`132`	`132`	`*/`
`133`	`133`	`public function testAddCommandWithEmptyContructor()`
`134`	`134`	`{`
`135`	`135`	`$application = new Application();`
`136`		`- $application->add($foo = new \Foo5Command());`
	`136`	`+ $application->add(new \Foo5Command());`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`public function testHasGet()`