Merge branch '7.3' into 7.4

* 7.3:
  [ObjectMapper] handle non existing property errors
  Fix AsCronTask not passing arguments to command
  [HttpFoundation] Fix deprecation in tests on PHP 8.5
  Fix typo
  [VarExporter] Dump implicit-nullable types as explicit to prevent the corresponding deprecation
  [DependencyInjection] CS fix
  Allow mixed root on CompoundConstraintTestCase validator
  [Serializer] Fix readonly property initialization from incorrect scope
  Update BrevoRequestParser.php
  [JsonPath] Improve escape sequence validation in name selector

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyCommand.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Scheduler\Attribute\AsCronTask;
+
+#[AsCronTask(expression: '* * * * *', schedule: 'dummy_command')]
+#[AsCronTask(expression: '0 * * * *', arguments: 'test', schedule: 'dummy_command')]
+#[AsCommand(name: 'test:dummy-command')]
+class DummyCommand extends Command
+{
+    public static array $calls = [];
+
+    public function configure(): void
+    {
+        $this->addArgument('dummy-argument', InputArgument::OPTIONAL);
+    }
+
+    public function execute(InputInterface $input, ?OutputInterface $output = null): int
+    {
+        self::$calls[__FUNCTION__][] = $input->getArgument('dummy-argument');
+
+        return Command::SUCCESS;
+    }
+}

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyCommand;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummySchedule;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyTask;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
@@ -88,6 +89,29 @@ public function testAutoconfiguredScheduler()
         $this->assertSame([['5', 6], ['7', 8]], $calls['attributesOnMethod']);
     }
 
+    public function testAutoconfiguredSchedulerCommand()
+    {
+        $container = self::getContainer();
+        $container->set('clock', $clock = new MockClock('2023-10-26T08:59:59Z'));
+
+        $this->assertTrue($container->get('receivers')->has('scheduler_dummy_command'));
+        $this->assertInstanceOf(SchedulerTransport::class, $cron = $container->get('receivers')->get('scheduler_dummy_command'));
+        $bus = $container->get(MessageBusInterface::class);
+
+        $getCalls = static function (float $sleep) use ($clock, $cron, $bus) {
+            DummyCommand::$calls = [];
+            $clock->sleep($sleep);
+            foreach ($cron->get() as $message) {
+                $bus->dispatch($message->with(new ReceivedStamp('scheduler_dummy_command')));
+            }
+
+            return DummyCommand::$calls;
+        };
+
+        $this->assertSame([], $getCalls(0));
+        $this->assertSame(['execute' => [0 => null, 1 => 'test']], $getCalls(1));
+    }
+
     public function testSchedulerWithCustomTransport()
     {
         $container = self::getContainer();

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml

@@ -16,6 +16,9 @@ services:
     Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyTaskWithCustomReceiver:
         autoconfigure: true
 
+    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyCommand:
+        autoconfigure: true
+
     clock:
         synthetic: true
 

src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php

@@ -112,8 +112,8 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
                 $definition = substr_replace($definition, '53', 2, 2);
                 $definition = substr_replace($definition, 'Child', 44, 0);
             }
+            /** @var ChildDefinition $definition */
             $definition = unserialize($definition);
-            /* @var ChildDefinition $definition */
             $definition->setParent($parent);
 
             if (null !== $shared && !isset($definition->getChanges()['shared'])) {

src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php

@@ -32,7 +32,7 @@ public function testConstructorWithChunks()
 
         $buffer = '';
         ob_start(function (string $chunk) use (&$buffer) {
-            $buffer .= $chunk;
+            return $buffer .= $chunk;
         });
         $callback();
 

src/Symfony/Component/JsonPath/JsonPathUtils.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\JsonPath;
 
 use Symfony\Component\JsonPath\Exception\InvalidArgumentException;
+use Symfony\Component\JsonPath\Exception\JsonCrawlerException;
 use Symfony\Component\JsonPath\Tokenizer\JsonPathToken;
 use Symfony\Component\JsonPath\Tokenizer\TokenType;
 use Symfony\Component\JsonStreamer\Read\Splitter;
@@ -86,6 +87,9 @@ public static function findSmallestDeserializableStringAndPath(array $tokens, mi
         ];
     }
 
+    /**
+     * @throws JsonCrawlerException When an invalid Unicode escape sequence occurs
+     */
     public static function unescapeString(string $str, string $quoteChar): string
     {
         if ('"' === $quoteChar) {
@@ -104,17 +108,16 @@ public static function unescapeString(string $str, string $quoteChar): string
         while (null !== $char = $str[++$i] ?? null) {
             if ('\\' === $char && isset($str[$i + 1])) {
                 $result .= match ($str[$i + 1]) {
-                    '"' => '"',
-                    "'" => "'",
                     '\\' => '\\',
                     '/' => '/',
-                    'b' => "\b",
+                    'b' => "\x08",
                     'f' => "\f",
                     'n' => "\n",
                     'r' => "\r",
                     't' => "\t",
                     'u' => self::unescapeUnicodeSequence($str, $i),
-                    default => $char.$str[$i + 1], // keep the backslash
+                    $quoteChar => $quoteChar,
+                    default => throw new JsonCrawlerException('', \sprintf('Invalid escape sequence "\\%s" in %s-quoted string', $str[$i + 1], "'" === $quoteChar ? 'single' : 'double')),
                 };
 
                 ++$i;
@@ -128,16 +131,11 @@ public static function unescapeString(string $str, string $quoteChar): string
 
     private static function unescapeUnicodeSequence(string $str, int &$i): string
     {
-        if (!isset($str[$i + 5])) {
-            // not enough characters for Unicode escape, treat as literal
-            return $str[$i];
+        if (!isset($str[$i + 5]) || !ctype_xdigit(substr($str, $i + 2, 4))) {
+            throw new JsonCrawlerException('', 'Invalid unicode escape sequence');
         }
 
         $hex = substr($str, $i + 2, 4);
-        if (!ctype_xdigit($hex)) {
-            // invalid hex, treat as literal
-            return $str[$i];
-        }
 
         $codepoint = hexdec($hex);
         // looks like a valid Unicode codepoint, string length is sufficient and it starts with \u

src/Symfony/Component/JsonPath/Tests/JsonCrawlerTest.php

@@ -86,7 +86,7 @@ public function testEscapedDoubleQuotesInFieldName()
 {"a": {"b\\"c": 42}}
 JSON);
 
-        $result = $crawler->find("$['a']['b\\\"c']");
+        $result = $crawler->find('$["a"]["b\"c"]');
 
         $this->assertSame(42, $result[0]);
     }
@@ -641,10 +641,6 @@ public static function provideSingleQuotedStringProvider(): array
                 "$['\\u65e5\\u672c']",
                 ['Japan'],
             ],
-            [
-                "$['quote\"here']",
-                ['with quote'],
-            ],
             [
                 "$['M\\u00fcller']",
                 [],
@@ -658,7 +654,7 @@ public static function provideSingleQuotedStringProvider(): array
                 ['with tab'],
             ],
             [
-                "$['quote\\\"here']",
+                "$['quote\"here']",
                 ['with quote'],
             ],
             [
@@ -725,29 +721,6 @@ public static function provideFilterWithUnicodeProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider provideInvalidUnicodeSequenceProvider
-     */
-    public function testInvalidUnicodeSequencesAreProcessedAsLiterals(string $jsonPath)
-    {
-        $this->assertIsArray(self::getUnicodeDocumentCrawler()->find($jsonPath), 'invalid unicode sequence should be treated as literal and not throw');
-    }
-
-    public static function provideInvalidUnicodeSequenceProvider(): array
-    {
-        return [
-            [
-                '$["test\uZZZZ"]',
-            ],
-            [
-                '$["test\u123"]',
-            ],
-            [
-                '$["test\u"]',
-            ],
-        ];
-    }
-
     /**
      * @dataProvider provideComplexUnicodePath
      */

src/Symfony/Component/JsonPath/Tests/JsonPathComplianceTestSuiteTest.php

@@ -148,30 +148,6 @@ final class JsonPathComplianceTestSuiteTest extends TestCase
         'index selector, leading 0',
         'index selector, -0',
         'index selector, leading -0',
-        'name selector, double quotes, escaped line feed',
-        'name selector, double quotes, invalid escaped single quote',
-        'name selector, double quotes, question mark escape',
-        'name selector, double quotes, bell escape',
-        'name selector, double quotes, vertical tab escape',
-        'name selector, double quotes, 0 escape',
-        'name selector, double quotes, x escape',
-        'name selector, double quotes, n escape',
-        'name selector, double quotes, unicode escape no hex',
-        'name selector, double quotes, unicode escape too few hex',
-        'name selector, double quotes, unicode escape upper u',
-        'name selector, double quotes, unicode escape upper u long',
-        'name selector, double quotes, unicode escape plus',
-        'name selector, double quotes, unicode escape brackets',
-        'name selector, double quotes, unicode escape brackets long',
-        'name selector, double quotes, single high surrogate',
-        'name selector, double quotes, single low surrogate',
-        'name selector, double quotes, high high surrogate',
-        'name selector, double quotes, low low surrogate',
-        'name selector, double quotes, supplementary surrogate',
-        'name selector, double quotes, surrogate incomplete low',
-        'name selector, single quotes, escaped backspace',
-        'name selector, single quotes, escaped line feed',
-        'name selector, single quotes, invalid escaped double quote',
         'slice selector, excessively large from value with negative step',
         'slice selector, step, min exact - 1',
         'slice selector, step, max exact + 1',

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

@@ -37,7 +37,7 @@ protected function getRequestMatcher(): RequestMatcherInterface
             new IsJsonRequestMatcher(),
             // https://developers.brevo.com/docs/how-to-use-webhooks#securing-your-webhooks
             // localhost is added for testing
-            new IpsRequestMatcher(['185.107.232.1/24', '1.179.112.1/20', '127.0.0.1']),
+            new IpsRequestMatcher(['185.107.232.1/24', '1.179.112.1/20', '172.246.240.1/20', '127.0.0.1']),
         ]);
     }
 

src/Symfony/Component/ObjectMapper/Exception/NoSuchPropertyException.php

@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ObjectMapper\Exception;
+
+/**
+ * Thrown when a property cannot be found.
+ *
+ * @author Antoine Bluchet <[email protected]>
+ */
+class NoSuchPropertyException extends MappingException
+{
+}