feature #20867 [Console] Include application name/version in JSON descriptions (ro0NL)

fabpot · fabpot · commit 7e657b8b0132 · 2016-12-13T09:27:32.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [Console] Include application name/version in JSON descriptions | Q | A | ------------- | --- | Branch? | "master" | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | comma-separated list of tickets fixed by the PR, if any | License | MIT | Doc PR | reference to the documentation PR, if any To be consistent with other formats. Commits ------- a43e040 [Console] Include application name/version in JSON descriptions
diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -71,9 +71,21 @@ protected function describeApplication(Application $application, array $options
             $commands[] = $this->getCommandData($command);
         }
 
-        $data = $describedNamespace
-            ? array('commands' => $commands, 'namespace' => $describedNamespace)
-            : array('commands' => $commands, 'namespaces' => array_values($description->getNamespaces()));
+        $data = array();
+        if ('UNKNOWN' !== $application->getName()) {
+            $data['application']['name'] = $application->getName();
+            if ('UNKNOWN' !== $application->getVersion()) {
+                $data['application']['version'] = $application->getVersion();
+            }
+        }
+
+        $data['commands'] = $commands;
+
+        if ($describedNamespace) {
+            $data['namespace'] = $describedNamespace;
+        } else {
+            $data['namespaces'] = array_values($description->getNamespaces());
+        }
 
         $this->writeData($data, $options);
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -1,4 +1,8 @@
 {
+    "application": {
+        "name": "My Symfony application",
+        "version": "v1.0"
+    },
     "commands": [
         {
             "name": "help",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`	`1`	`{`
	`2`	`+ "application": {`
	`3`	`+ "name": "My Symfony application",`
	`4`	`+ "version": "v1.0"`
	`5`	`+ },`
`2`	`6`	`"commands": [`
`3`	`7`	`{`
`4`	`8`	`"name": "help",`