[Console] Fix JSON description for negatable input flags

nicolas-grekas · nicolas-grekas · commit 68eafcac06a7 · 2025-07-22T14:33:39.000+02:00
diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -108,7 +108,7 @@ private function getInputOptionData(InputOption $option, bool $negated = false):
             'is_value_required' => false,
             'is_multiple' => false,
             'description' => 'Negate the "--'.$option->getName().'" option',
-            'default' => false,
+            'default' => null === $option->getDefault() ? null : !$option->getDefault(),
         ] : [
             'name' => '--'.$option->getName(),
             'shortcut' => $option->getShortcut() ? '-'.str_replace('|', '|-', $option->getShortcut()) : '',
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
@@ -36,10 +36,9 @@ private function normalizeOutputRecursively($output)
             return array_map($this->normalizeOutputRecursively(...), $output);
         }
 
-        if (null === $output) {
-            return null;
-        }
-
-        return parent::normalizeOutput($output);
+        return match ($output) {
+            null, true, false => $output,
+            default => parent::normalizeOutput($output),
+        };
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -85,7 +85,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     },
                     "shell": {
                         "name": "--shell",
@@ -206,7 +206,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     },
                     "debug": {
                         "name": "--debug",
@@ -318,7 +318,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     }
                 }
             }
@@ -421,7 +421,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     },
                     "short": {
                         "name": "--short",
@@ -509,7 +509,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     }
                 }
             }
@@ -605,7 +605,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     }
                 }
             }
@@ -682,7 +682,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     }
                 }
             }
@@ -761,7 +761,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,9 @@ private function normalizeOutputRecursively($output)`
`36`	`36`	`return array_map($this->normalizeOutputRecursively(...), $output);`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (null === $output) {`
`40`		`- return null;`
`41`		`- }`
`42`		`-`
`43`		`- return parent::normalizeOutput($output);`
	`39`	`+ return match ($output) {`
	`40`	`+ null, true, false => $output,`
	`41`	`+ default => parent::normalizeOutput($output),`
	`42`	`+ };`
`44`	`43`	`}`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@`
`85`	`85`	`"is_value_required": false,`
`86`	`86`	`"is_multiple": false,`
`87`	`87`	`"description": "Do not ask any interactive question",`
`88`		`- "default": false`
	`88`	`+ "default": null`
`89`	`89`	`},`
`90`	`90`	`"shell": {`
`91`	`91`	`"name": "--shell",`
`@@ -206,7 +206,7 @@`
`206`	`206`	`"is_value_required": false,`
`207`	`207`	`"is_multiple": false,`
`208`	`208`	`"description": "Do not ask any interactive question",`
`209`		`- "default": false`
	`209`	`+ "default": null`
`210`	`210`	`},`
`211`	`211`	`"debug": {`
`212`	`212`	`"name": "--debug",`
`@@ -318,7 +318,7 @@`
`318`	`318`	`"is_value_required": false,`
`319`	`319`	`"is_multiple": false,`
`320`	`320`	`"description": "Do not ask any interactive question",`
`321`		`- "default": false`
	`321`	`+ "default": null`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`	`}`
`@@ -421,7 +421,7 @@`
`421`	`421`	`"is_value_required": false,`
`422`	`422`	`"is_multiple": false,`
`423`	`423`	`"description": "Do not ask any interactive question",`
`424`		`- "default": false`
	`424`	`+ "default": null`
`425`	`425`	`},`
`426`	`426`	`"short": {`
`427`	`427`	`"name": "--short",`
`@@ -509,7 +509,7 @@`
`509`	`509`	`"is_value_required": false,`
`510`	`510`	`"is_multiple": false,`
`511`	`511`	`"description": "Do not ask any interactive question",`
`512`		`- "default": false`
	`512`	`+ "default": null`
`513`	`513`	`}`
`514`	`514`	`}`
`515`	`515`	`}`
`@@ -605,7 +605,7 @@`
`605`	`605`	`"is_value_required": false,`
`606`	`606`	`"is_multiple": false,`
`607`	`607`	`"description": "Do not ask any interactive question",`
`608`		`- "default": false`
	`608`	`+ "default": null`
`609`	`609`	`}`
`610`	`610`	`}`
`611`	`611`	`}`
`@@ -682,7 +682,7 @@`
`682`	`682`	`"is_value_required": false,`
`683`	`683`	`"is_multiple": false,`
`684`	`684`	`"description": "Do not ask any interactive question",`
`685`		`- "default": false`
	`685`	`+ "default": null`
`686`	`686`	`}`
`687`	`687`	`}`
`688`	`688`	`}`
`@@ -761,7 +761,7 @@`
`761`	`761`	`"is_value_required": false,`
`762`	`762`	`"is_multiple": false,`
`763`	`763`	`"description": "Do not ask any interactive question",`
`764`		`- "default": false`
	`764`	`+ "default": null`
`765`	`765`	`}`
`766`	`766`	`}`
`767`	`767`	`}`