Merge remote-tracking branch 'upstream/4.4' into 5.0

Author: soyuka

composer.json

@@ -38,7 +38,7 @@
         "doctrine/orm": "<2.14.0 || 3.0.0",
         "doctrine/mongodb-odm": "<2.4",
         "doctrine/persistence": "<1.3",
-        "symfony/framework-bundle": "6.4.6 || 7.0.6",
+        "symfony/framework-bundle": "<7.4",
         "symfony/object-mapper": "<7.3.4",
         "symfony/var-exporter": "<6.1.1",
         "phpunit/phpunit": "<9.5",

src/OpenApi/Serializer/LegacyOpenApiNormalizer.php

@@ -41,6 +41,7 @@ public function normalize(mixed $data, ?string $format = null, array $context =
         }
 
         $openapi['openapi'] = '3.0.0';
+        unset($openapi['jsonSchemaDialect'], $openapi['webhooks']);
 
         foreach ($openapi['components']['schemas'] ?? [] as $name => $component) {
             $openapi['components']['schemas'][$name] = $this->downgradeSchema($component);

src/OpenApi/Tests/Serializer/LegacyOpenApiNormalizerTest.php

@@ -346,6 +346,21 @@ public function testWalksPathOperationSchemas(): void
         $this->assertSame(['type' => 'string', 'nullable' => true], $schema['properties']['name']);
     }
 
+    public function testRemovesKeysNotDefinedIn30(): void
+    {
+        $document = [
+            'openapi' => '3.1.0',
+            'jsonSchemaDialect' => 'https://spec.openapis.org/oas/3.1/dialect/base',
+            'components' => ['schemas' => []],
+            'webhooks' => new \ArrayObject(),
+        ];
+
+        $normalizer = $this->buildNormalizer($document);
+        $result = $normalizer->normalize(new \stdClass(), null, ['spec_version' => '3.0.0']);
+
+        $this->assertSame(['openapi' => '3.0.0', 'components' => ['schemas' => []]], $result);
+    }
+
     private function buildNormalizer(array $document): LegacyOpenApiNormalizer
     {
         $decorated = $this->prophesize(NormalizerInterface::class);

src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -70,7 +70,6 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use Ramsey\Uuid\Uuid;
 use Symfony\AI\McpBundle\McpBundle;
-use Symfony\Bundle\FrameworkBundle\Command\TranslationExtractCommand as FrameworkTranslationExtractCommand;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerHelper;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\DirectoryResource;
@@ -89,7 +88,6 @@
 use Symfony\Component\ObjectMapper\ObjectMapperInterface;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
 use Symfony\Component\Serializer\Normalizer\NumberNormalizer;
-use Symfony\Component\Translation\Command\TranslationExtractCommand;
 use Symfony\Component\Uid\AbstractUid;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Yaml\Yaml;
@@ -210,10 +208,9 @@ public function load(array $configs, ContainerBuilder $container): void
         $this->registerLinkSecurityConfiguration($loader, $config);
         $this->registerJsonStreamerConfiguration($container, $loader, $formats, $config);
 
-        // TranslationExtractCommand was introduced in framework-bundle/7.3 with the object mapper service.
         // willBeAvailable mirrors FrameworkBundle's own gate: when symfony/object-mapper is in dev-only,
         // FrameworkBundle skips object_mapper.php and the "object_mapper" service we alias to does not exist.
-        if (class_exists(ObjectMapper::class) && (class_exists(TranslationExtractCommand::class) || class_exists(FrameworkTranslationExtractCommand::class)) && ContainerBuilder::willBeAvailable('symfony/object-mapper', ObjectMapperInterface::class, ['symfony/framework-bundle'])) {
+        if (class_exists(ObjectMapper::class) && ContainerBuilder::willBeAvailable('symfony/object-mapper', ObjectMapperInterface::class, ['symfony/framework-bundle'])) {
             $loader->load('state/object_mapper.php');
             $loader->load($config['use_symfony_listeners'] ? 'symfony/object_mapper.php' : 'state/object_mapper_processor.php');
         }

src/Symfony/Tests/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

@@ -40,8 +40,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\ObjectMapper\ObjectMapper;
+use Symfony\Component\ObjectMapper\ObjectMapperInterface;
 use Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter;
-use Symfony\Component\Translation\Command\TranslationExtractCommand;
 
 class ApiPlatformExtensionTest extends TestCase
 {
@@ -190,16 +191,20 @@ private function assertServiceHasTags(string $service, array $tags = []): void
 
     #[RunInSeparateProcess]
     #[PreserveGlobalState(false)]
-    public function testObjectMapperDoesNotLoadDeprecatedTranslationCommand(): void
+    public function testObjectMapperGateDoesNotAutoloadTranslationCommands(): void
     {
-        if (!class_exists(TranslationExtractCommand::class)) {
-            self::markTestSkipped('Requires the Symfony 8.2 translation command.');
-        }
+        spl_autoload_register(static function (string $class): void {
+            if ('Symfony\\Component\\Translation\\Command\\TranslationExtractCommand' === $class || FrameworkTranslationExtractCommand::class === $class) {
+                throw new \Error(\sprintf('Class "%s" must not be autoloaded.', $class));
+            }
+        }, true, true);
 
         (new ApiPlatformExtension())->load(self::DEFAULT_CONFIG, $this->container);
 
-        self::assertTrue($this->container->hasDefinition('api_platform.object_mapper.metadata_factory'));
-        self::assertFalse(class_exists(FrameworkTranslationExtractCommand::class, false));
+        self::assertSame(
+            class_exists(ObjectMapper::class) && ContainerBuilder::willBeAvailable('symfony/object-mapper', ObjectMapperInterface::class, ['symfony/framework-bundle']),
+            $this->container->hasDefinition('api_platform.object_mapper.metadata_factory')
+        );
     }
 
     public function testCommonConfiguration(): void

src/Symfony/composer.json

@@ -69,6 +69,9 @@
         "symfony/validator": "^7.4 || ^8.0",
         "webonyx/graphql-php": "^15.0"
     },
+    "conflict": {
+        "symfony/framework-bundle": "<7.4"
+    },
     "suggest": {
         "ext-deepclone": "To speed up the PHP files metadata cache with symfony/var-exporter 8.1+ (install symfony/deepclone with PIE).",
         "api-platform/doctrine-orm": "To support Doctrine ORM.",