minor #19275 [Console][FrameworkBundle] Revised console header formatting (ro0NL)

fabpot · fabpot · commit ad85c79d3d87 · 2016-07-29T05:54:40.000-04:00
This PR was squashed before being merged into the 3.2-dev branch (closes #19275). Discussion ---------- [Console][FrameworkBundle] Revised console header formatting | Q | A | ------------- | --- | Branch? | "master" | Bug fix? | no | New feature? | yes (ui change) | BC breaks? | no | Deprecations? | no | Tests pass? | not yet | Fixed tickets | #19095 | License | MIT | Doc PR | reference to the documentation PR, if any Before/After ![image](https://cloud.githubusercontent.com/assets/1047696/16983804/e36c95e0-4e76-11e6-854d-dfa22c634b39.png) Commits ------- fcddb3a [Console][FrameworkBundle] Revised console header formatting
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -39,10 +39,10 @@ public function __construct(KernelInterface $kernel)
     {
         $this->kernel = $kernel;
 
-        parent::__construct('Symfony', Kernel::VERSION.' - '.$kernel->getName().'/'.$kernel->getEnvironment().($kernel->isDebug() ? '/debug' : ''));
+        parent::__construct('Symfony', Kernel::VERSION);
 
-        $this->getDefinition()->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'The Environment name.', $kernel->getEnvironment()));
-        $this->getDefinition()->addOption(new InputOption('--no-debug', null, InputOption::VALUE_NONE, 'Switches off debug mode.'));
+        $this->getDefinition()->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'The environment name', $kernel->getEnvironment()));
+        $this->getDefinition()->addOption(new InputOption('--no-debug', null, InputOption::VALUE_NONE, 'Switches off debug mode'));
     }
 
     /**
@@ -100,6 +100,14 @@ public function all($namespace = null)
         return parent::all($namespace);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getLongVersion()
+    {
+        return parent::getLongVersion().sprintf(' (kernel: <comment>%s</>, env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getName(), $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
+    }
+
     protected function registerCommands()
     {
         if ($this->commandsRegistered) {
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -336,13 +336,13 @@ public function getLongVersion()
     {
         if ('UNKNOWN' !== $this->getName()) {
             if ('UNKNOWN' !== $this->getVersion()) {
-                return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
+                return sprintf('%s <info>%s</info>', $this->getName(), $this->getVersion());
             }
 
-            return sprintf('<info>%s</info>', $this->getName());
+            return $this->getName();
         }
 
-        return '<info>Console Tool</info>';
+        return 'Console Tool';
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -91,7 +91,7 @@ public function testSetGetVersion()
     public function testGetLongVersion()
     {
         $application = new Application('foo', 'bar');
-        $this->assertEquals('<info>foo</info> version <comment>bar</comment>', $application->getLongVersion(), '->getLongVersion() returns the long version of the application');
+        $this->assertEquals('foo <info>bar</info>', $application->getLongVersion(), '->getLongVersion() returns the long version of the application');
     }
 
     public function testHelp()
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
@@ -1,4 +1,4 @@
-<info>Console Tool</info>
+Console Tool
 
 <comment>Usage:</comment>
   command [options] [arguments]
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
@@ -1,4 +1,4 @@
-<info>My Symfony application</info> version <comment>v1.0</comment>
+My Symfony application <info>v1.0</info>
 
 <comment>Usage:</comment>
   command [options] [arguments]
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt
@@ -1 +1 @@
-<info>Console Tool</info>
+Console Tool

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,10 @@ public function __construct(KernelInterface $kernel)`
`39`	`39`	`{`
`40`	`40`	`$this->kernel = $kernel;`
`41`	`41`
`42`		`- parent::__construct('Symfony', Kernel::VERSION.' - '.$kernel->getName().'/'.$kernel->getEnvironment().($kernel->isDebug() ? '/debug' : ''));`
	`42`	`+ parent::__construct('Symfony', Kernel::VERSION);`
`43`	`43`
`44`		`- $this->getDefinition()->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'The Environment name.', $kernel->getEnvironment()));`
`45`		`- $this->getDefinition()->addOption(new InputOption('--no-debug', null, InputOption::VALUE_NONE, 'Switches off debug mode.'));`
	`44`	`+ $this->getDefinition()->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'The environment name', $kernel->getEnvironment()));`
	`45`	`+ $this->getDefinition()->addOption(new InputOption('--no-debug', null, InputOption::VALUE_NONE, 'Switches off debug mode'));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
`@@ -100,6 +100,14 @@ public function all($namespace = null)`
`100`	`100`	`return parent::all($namespace);`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ /**`
	`104`	`+ * {@inheritdoc}`
	`105`	`+ */`
	`106`	`+ public function getLongVersion()`
	`107`	`+ {`
	`108`	`+ return parent::getLongVersion().sprintf(' (kernel: <comment>%s</>, env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getName(), $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');`
	`109`	`+ }`
	`110`	`+`
`103`	`111`	`protected function registerCommands()`
`104`	`112`	`{`
`105`	`113`	`if ($this->commandsRegistered) {`
Original file line number	Diff line number	Diff line change
`@@ -336,13 +336,13 @@ public function getLongVersion()`
`336`	`336`	`{`
`337`	`337`	`if ('UNKNOWN' !== $this->getName()) {`
`338`	`338`	`if ('UNKNOWN' !== $this->getVersion()) {`
`339`		`- return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());`
	`339`	`+ return sprintf('%s <info>%s</info>', $this->getName(), $this->getVersion());`
`340`	`340`	`}`
`341`	`341`
`342`		`- return sprintf('<info>%s</info>', $this->getName());`
	`342`	`+ return $this->getName();`
`343`	`343`	`}`
`344`	`344`
`345`		`- return '<info>Console Tool</info>';`
	`345`	`+ return 'Console Tool';`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function testSetGetVersion()`
`91`	`91`	`public function testGetLongVersion()`
`92`	`92`	`{`
`93`	`93`	`$application = new Application('foo', 'bar');`
`94`		`- $this->assertEquals('<info>foo</info> version <comment>bar</comment>', $application->getLongVersion(), '->getLongVersion() returns the long version of the application');`
	`94`	`+ $this->assertEquals('foo <info>bar</info>', $application->getLongVersion(), '->getLongVersion() returns the long version of the application');`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`public function testHelp()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<info>Console Tool</info>`
	`1`	`+Console Tool`
`2`	`2`
`3`	`3`	`<comment>Usage:</comment>`
`4`	`4`	`command [options] [arguments]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<info>My Symfony application</info> version <comment>v1.0</comment>`
	`1`	`+My Symfony application <info>v1.0</info>`
`2`	`2`
`3`	`3`	`<comment>Usage:</comment>`
`4`	`4`	`command [options] [arguments]`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<info>Console Tool</info>`
	`1`	`+Console Tool`