Merge branch '7.3' into 7.4

* 7.3:
  fix merge
  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

Author: xabbuh

src/Symfony/Bridge/PhpUnit/CoverageListener.php

@@ -86,7 +86,6 @@ public function startTest(Test $test): void
     private function addCoversForClassToAnnotationCache(Test $test, array $covers): void
     {
         $r = new \ReflectionProperty(TestUtil::class, 'annotationCache');
-        $r->setAccessible(true);
 
         $cache = $r->getValue();
         $cache = array_replace_recursive($cache, [
@@ -103,7 +102,6 @@ private function addCoversForDocBlockInsideRegistry(Test $test, array $covers):
         $docBlock = Registry::getInstance()->forClassName($test::class);
 
         $symbolAnnotations = new \ReflectionProperty($docBlock, 'symbolAnnotations');
-        $symbolAnnotations->setAccessible(true);
 
         // Exclude internal classes; PHPUnit 9.1+ is picky about tests covering, say, a \RuntimeException
         $covers = array_filter($covers, function (string $class) {

src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php

@@ -389,7 +389,6 @@ public function toString(): string
     {
         $exception = new \Exception($this->message);
         $reflection = new \ReflectionProperty($exception, 'trace');
-        $reflection->setAccessible(true);
         $reflection->setValue($exception, $this->trace);
 
         return ($this->originatesFromAnObject() ? 'deprecation triggered by '.$this->originatingClass().'::'.$this->originatingMethod().":\n" : '')

src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php

@@ -357,7 +357,6 @@ private function willBeIsolated(TestCase $test): bool
         }
 
         $r = new \ReflectionProperty($test, 'runTestInSeparateProcess');
-        $r->setAccessible(true);
 
         return $r->getValue($test) ?? false;
     }

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php

@@ -275,7 +275,6 @@ public static function setUpBeforeClass(): void
                     $loader = require $v.'/autoload.php';
                     $reflection = new \ReflectionClass($loader);
                     $prop = $reflection->getProperty('prefixDirsPsr4');
-                    $prop->setAccessible(true);
                     $currentValue = $prop->getValue($loader);
                     self::$prefixDirsPsr4[] = [$prop, $loader, $currentValue];
                     $currentValue['Symfony\\Bridge\\PhpUnit\\'] = [realpath(__DIR__.'/../..')];

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()) : '',

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),
+        };
     }
 }

src/Symfony/Component/Console/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
                     }
                 }
             }

src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

@@ -754,7 +754,6 @@ public function testRoundMethodKeepsIntegersAsIntegers()
         // Use reflection to test the private round() method directly
         $reflection = new \ReflectionClass($transformer);
         $roundMethod = $reflection->getMethod('round');
-        $roundMethod->setAccessible(true);
 
         $int = \PHP_INT_MAX - 1;
         $result = $roundMethod->invoke($transformer, $int);

src/Symfony/Component/Mailer/Bridge/Brevo/Webhook/BrevoRequestParser.php

@@ -35,9 +35,9 @@ protected function getRequestMatcher(): RequestMatcherInterface
         return new ChainRequestMatcher([
             new MethodRequestMatcher('POST'),
             new IsJsonRequestMatcher(),
-            // https://developers.brevo.com/docs/how-to-use-webhooks#securing-your-webhooks
+            // https://help.brevo.com/hc/en-us/articles/15127404548498-Brevo-IP-ranges-List-of-publicly-exposed-services
             // localhost is added for testing
-            new IpsRequestMatcher(['185.107.232.1/24', '1.179.112.1/20', '172.246.240.1/20', '127.0.0.1']),
+            new IpsRequestMatcher(['1.179.112.0/20', '172.246.240.0/20', '127.0.0.1']),
         ]);
     }