config mess again

Author: soyuka

src/Symfony/Bundle/DependencyInjection/Configuration.php

@@ -221,7 +221,9 @@ public function getConfigTreeBuilder(): TreeBuilder
             'json' => ['mime_types' => ['application/json']], // Swagger support
             'html' => ['mime_types' => ['text/html']], // Swagger UI support
         ]);
-        $this->addFormatSection($rootNode, 'patch_formats', []);
+        $this->addFormatSection($rootNode, 'patch_formats', [
+            'json' => ['mime_types' => ['application/merge-patch+json']],
+        ]);
         $this->addFormatSection($rootNode, 'error_formats', [
             'jsonproblem' => ['mime_types' => ['application/problem+json']],
             'jsonld' => ['mime_types' => ['application/ld+json']],

tests/Fixtures/app/AppKernel.php

@@ -111,8 +111,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
 
         $loader->load(__DIR__."/config/config_{$this->getEnvironment()}.yml");
 
-        /* @TODO remove this check in 3.0 */
-        if (\PHP_VERSION_ID >= 70200 && class_exists(Uuid::class) && class_exists(UuidType::class)) {
+        if (class_exists(Uuid::class) && class_exists(UuidType::class)) {
             $loader->load(__DIR__.'/config/config_symfony_uid.yml');
         }
 
@@ -238,7 +237,6 @@ class_exists(NativePasswordHasher::class) ? 'password_hashers' : 'encoders' => [
             $c->prependExtensionConfig('api_platform', ['enable_nelmio_api_doc' => true]);
         }
 
-        $loader->load(__DIR__.'/config/config.yml');
         $c->prependExtensionConfig('api_platform', [
             'mapping' => [
                 'paths' => ['%kernel.project_dir%/../TestBundle/Resources/config/api_resources'],

tests/Fixtures/app/config/config.yml

@@ -336,3 +336,15 @@ services:
         class: 'ApiPlatform\Tests\Fixtures\TestBundle\MessengerHandler\Entity\MessengerWithInputHandler'
         tags:
             -  { name: 'messenger.message_handler' }
+
+    ApiPlatform\Tests\Fixtures\TestBundle\Metadata\ProviderResourceMetadatatCollectionFactory:
+        class: 'ApiPlatform\Tests\Fixtures\TestBundle\Metadata\ProviderResourceMetadatatCollectionFactory'
+        decorates: api_platform.metadata.resource.metadata_collection_factory
+        arguments: ['@ApiPlatform\Tests\Fixtures\TestBundle\Metadata\ProviderResourceMetadatatCollectionFactory.inner']
+
+    app.related_dummy_resource.complex_sub_query_filter:
+        class: ApiPlatform\Tests\Fixtures\TestBundle\Filter\ComplexSubQueryFilter
+        arguments: ['@doctrine']
+        tags: [ { name: 'api_platform.filter', id: 'related_dummy.complex_sub_query' } ]
+
+

tests/Fixtures/app/config/config_common.yml

@@ -1,4 +1,2 @@
 imports:
-    - { resource: config_common.yml }
-    - { resource: config_behat_orm.yml }
     - { resource: config_sqlite.yml }

tests/Fixtures/app/config/config_test.yml

@@ -91,7 +91,9 @@ private function runDefaultConfigTests(array $doctrineIntegrationsToLoad = ['orm
                 'json' => ['mime_types' => ['application/json']],
                 'html' => ['mime_types' => ['text/html']],
             ],
-            'patch_formats' => [],
+            'patch_formats' => [
+                'json' => ['mime_types' => ['application/merge-patch+json']],
+            ],
             'error_formats' => [
                 'jsonproblem' => ['mime_types' => ['application/problem+json']],
                 'jsonld' => ['mime_types' => ['application/ld+json']],