bug #17326 [Console] Display console application name even when no version set (polc)

fabpot · fabpot · commit 5781bbce0185 · 2016-01-14T08:51:59.000+01:00
This PR was squashed before being merged into the 2.3 branch (closes #17326). Discussion ---------- [Console] Display console application name even when no version set | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT When displaying help of an Application with a name but no version, it show "Console Tool" instead of the application name. Commits ------- 61e810e [Console] Display console application name even when no version set
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -322,8 +322,12 @@ public function setVersion($version)
      */
     public function getLongVersion()
     {
-        if ('UNKNOWN' !== $this->getName() && 'UNKNOWN' !== $this->getVersion()) {
-            return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
+        if ('UNKNOWN' !== $this->getName()) {
+            if ('UNKNOWN' !== $this->getVersion()) {
+                return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
+            }
+
+            return sprintf('<info>%s</info>', $this->getName());
         }
 
         return '<info>Console Tool</info>';

Original file line number	Diff line number	Diff line change
`@@ -322,8 +322,12 @@ public function setVersion($version)`
`322`	`322`	`*/`
`323`	`323`	`public function getLongVersion()`
`324`	`324`	`{`
`325`		`- if ('UNKNOWN' !== $this->getName() && 'UNKNOWN' !== $this->getVersion()) {`
`326`		`- return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());`
	`325`	`+ if ('UNKNOWN' !== $this->getName()) {`
	`326`	`+ if ('UNKNOWN' !== $this->getVersion()) {`
	`327`	`+ return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());`
	`328`	`+ }`
	`329`	`+`
	`330`	`+ return sprintf('<info>%s</info>', $this->getName());`
`327`	`331`	`}`
`328`	`332`
`329`	`333`	`return '<info>Console Tool</info>';`