Merge branch '6.4' into 7.2

xabbuh · xabbuh · commit fc5fd0df43cb · 2025-07-24T13:52:02.000+02:00
* 6.4:
  add back setAccessible() for PHP 7 compatibility
  Update BrevoRequestParser.php
  [Form][PhpUnitBridge] Remove usage of noop `ReflectionProperty::setAccessible()`
  fix compatibility with different Relay versions
  [Console] Fix JSON description for negatable input flags
diff --git a/Descriptor/JsonDescriptor.php b/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/Tests/Descriptor/JsonDescriptorTest.php b/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/Tests/Fixtures/application_2.json b/Tests/Fixtures/application_2.json
@@ -94,7 +94,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     },
                     "shell": {
                         "name": "--shell",
@@ -224,7 +224,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     },
                     "debug": {
                         "name": "--debug",
@@ -345,7 +345,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     }
                 }
             }
@@ -457,7 +457,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     },
                     "short": {
                         "name": "--short",
@@ -554,7 +554,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     }
                 }
             }
@@ -659,7 +659,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     }
                 }
             }
@@ -745,7 +745,7 @@
                         "is_value_required": false,
                         "is_multiple": false,
                         "description": "Do not ask any interactive question",
-                        "default": false
+                        "default": null
                     }
                 }
             }
@@ -833,7 +833,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
`@@ -94,7 +94,7 @@`
`94`	`94`	`"is_value_required": false,`
`95`	`95`	`"is_multiple": false,`
`96`	`96`	`"description": "Do not ask any interactive question",`
`97`		`- "default": false`
	`97`	`+ "default": null`
`98`	`98`	`},`
`99`	`99`	`"shell": {`
`100`	`100`	`"name": "--shell",`
`@@ -224,7 +224,7 @@`
`224`	`224`	`"is_value_required": false,`
`225`	`225`	`"is_multiple": false,`
`226`	`226`	`"description": "Do not ask any interactive question",`
`227`		`- "default": false`
	`227`	`+ "default": null`
`228`	`228`	`},`
`229`	`229`	`"debug": {`
`230`	`230`	`"name": "--debug",`
`@@ -345,7 +345,7 @@`
`345`	`345`	`"is_value_required": false,`
`346`	`346`	`"is_multiple": false,`
`347`	`347`	`"description": "Do not ask any interactive question",`
`348`		`- "default": false`
	`348`	`+ "default": null`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`	`}`
`@@ -457,7 +457,7 @@`
`457`	`457`	`"is_value_required": false,`
`458`	`458`	`"is_multiple": false,`
`459`	`459`	`"description": "Do not ask any interactive question",`
`460`		`- "default": false`
	`460`	`+ "default": null`
`461`	`461`	`},`
`462`	`462`	`"short": {`
`463`	`463`	`"name": "--short",`
`@@ -554,7 +554,7 @@`
`554`	`554`	`"is_value_required": false,`
`555`	`555`	`"is_multiple": false,`
`556`	`556`	`"description": "Do not ask any interactive question",`
`557`		`- "default": false`
	`557`	`+ "default": null`
`558`	`558`	`}`
`559`	`559`	`}`
`560`	`560`	`}`
`@@ -659,7 +659,7 @@`
`659`	`659`	`"is_value_required": false,`
`660`	`660`	`"is_multiple": false,`
`661`	`661`	`"description": "Do not ask any interactive question",`
`662`		`- "default": false`
	`662`	`+ "default": null`
`663`	`663`	`}`
`664`	`664`	`}`
`665`	`665`	`}`
`@@ -745,7 +745,7 @@`
`745`	`745`	`"is_value_required": false,`
`746`	`746`	`"is_multiple": false,`
`747`	`747`	`"description": "Do not ask any interactive question",`
`748`		`- "default": false`
	`748`	`+ "default": null`
`749`	`749`	`}`
`750`	`750`	`}`
`751`	`751`	`}`
`@@ -833,7 +833,7 @@`
`833`	`833`	`"is_value_required": false,`
`834`	`834`	`"is_multiple": false,`
`835`	`835`	`"description": "Do not ask any interactive question",`
`836`		`- "default": false`
	`836`	`+ "default": null`
`837`	`837`	`}`
`838`	`838`	`}`
`839`	`839`	`}`