Merge pull request #1722 from Nek-/fix/bc-break-sf-flex

Fix wrong automatic configuration for Sf flex

Author: dunglas

features/main/configurable.feature

@@ -44,6 +44,7 @@ Feature: Configurable resource CRUD
     }
     """
 
+  @dropSchema
   Scenario: Retrieve the ConfigDummy resource
     When I send a "GET" request to "/fileconfigdummies/1"
     Then the response status code should be 200
@@ -60,20 +61,3 @@ Feature: Configurable resource CRUD
       "foo": "Foo"
     }
     """
-
-  @dropSchema
-  Scenario: Entities can be configured using a Flex-like directory structure
-    When I send a "GET" request to "/flex_configs"
-    Then the response status code should be 200
-    And the response should be in JSON
-    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
-    And the JSON should be equal to:
-    """
-    {
-         "@context": "/contexts/FlexConfig",
-         "@id": "/flex_configs",
-         "@type": "hydra:Collection",
-         "hydra:member": [],
-         "hydra:totalItems": 0
-    }
-    """

src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -246,13 +246,14 @@ private function getBundlesResourcesPaths(ContainerBuilder $container): array
 
     private function getResourcesToWatch(ContainerBuilder $container, array $resourcesPaths): array
     {
-        // Flex structure
+        $paths = array_unique(array_merge($resourcesPaths, $this->getBundlesResourcesPaths($container)));
+
+        // Flex structure (only if nothing specified)
         $projectDir = $container->getParameter('kernel.project_dir');
-        if (is_dir($dir = "$projectDir/config/api_platform")) {
-            $resourcesPaths[] = $dir;
+        if (!$paths && is_dir($dir = "$projectDir/config/api_platform")) {
+            $paths = [$dir];
         }
 
-        $paths = array_unique(array_merge($resourcesPaths, $this->getBundlesResourcesPaths($container)));
         $resources = ['yml' => [], 'xml' => [], 'dir' => []];
 
         foreach ($paths as $path) {