Doctrine requirement is now optional

composer.json

@@ -29,7 +29,6 @@
         "babdev/pagerfanta-bundle": "^3.7 || ^4.0",
         "doctrine/annotations": "^2.0",
         "doctrine/collections": "^1.8 || ^2.0",
-        "doctrine/doctrine-bundle": "^2.0",
         "doctrine/event-manager": "^1.1 || ^2.0",
         "doctrine/inflector": "^1.4 || ^2.0",
         "doctrine/persistence": "^2.0 || ^3.0",
@@ -57,6 +56,7 @@
         "sylius/resource": "self.version"
     },
     "require-dev": {
+        "doctrine/doctrine-bundle": "^2.0",
         "doctrine/orm": "^2.5",
         "friendsofsymfony/rest-bundle": "^3.0",
         "jms/serializer-bundle": "^3.5 || ^4.0 || ^5.0",
@@ -89,6 +89,7 @@
         "willdurand/hateoas-bundle": "^2.0"
     },
     "conflict": {
+        "doctrine/doctrine-bundle": "<2.0 || ^3.0",
         "friendsofsymfony/rest-bundle": "<3.0",
         "jms/serializer-bundle": "<3.5",
         "willdurand/hateoas-bundle": "<2.0 || ^2.6",
@@ -102,7 +103,8 @@
         "allow-plugins": {
             "symfony/flex": true,
             "dealerdirect/phpcodesniffer-composer-installer": false
-        }
+        },
+        "sort-packages": true
     },
     "extra": {
         "symfony": {

src/Bundle/DependencyInjection/Configuration.php

@@ -146,7 +146,7 @@ private function addDriversSection(ArrayNodeDefinition $node): void
         $node
             ->children()
                 ->arrayNode('drivers')
-                    ->defaultValue([SyliusResourceBundle::DRIVER_DOCTRINE_ORM])
+                    ->defaultValue([])
                     ->enumPrototype()->values(SyliusResourceBundle::getAvailableDrivers())->end()
                 ->end()
             ->end()

src/Bundle/DependencyInjection/SyliusResourceExtension.php

@@ -50,7 +50,7 @@
 
         $loader->load('services.xml');
 
-        /** @var array $bundles */
+        /** @var array<string, string> $bundles */
         $bundles = $container->getParameter('kernel.bundles');
         if (array_key_exists('SyliusGridBundle', $bundles)) {
             $loader->load('services/integrations/grid.xml');
@@ -68,7 +68,7 @@
 
         $this->autoRegisterResources($config, $container);
 
-        $this->loadPersistence($config['drivers'], $config['resources'], $loader);
+        $this->loadPersistence($config['drivers'], $config['resources'], $loader, $container);
         $this->loadResources($config['resources'], $container);
 
         $container->registerForAutoconfiguration(ProviderInterface::class)
@@ -175,8 +175,20 @@
         return 'app.' . u($shortName)->snake()->toString();
     }
 
-    private function loadPersistence(array $drivers, array $resources, LoaderInterface $loader): void
+    /**
+     * @param array<string, array{driver: string|false}> $resources
+     */
+    private function loadPersistence(array $drivers, array $resources, LoaderInterface $loader, ContainerBuilder $container): void
     {
+        $availableDrivers = $this->getAvailableDrivers($container);
+
+        // Enable all available drivers if there is no configured drivers
+        $drivers = [] !== $drivers ? $drivers : $availableDrivers;
+
+        $resourceDrivers = $this->getResourceDrivers($resources);
+
+        $this->checkConfiguredDrivers($drivers, $availableDrivers, $resourceDrivers);
+
         $integrateDoctrine = array_reduce($drivers, function (bool $result, string $driver): bool {
             return $result || in_array($driver, [SyliusResourceBundle::DRIVER_DOCTRINE_ORM, SyliusResourceBundle::DRIVER_DOCTRINE_PHPCR_ODM, SyliusResourceBundle::DRIVER_DOCTRINE_MONGODB_ODM], true);
         }, false);
@@ -185,20 +197,6 @@
             $loader->load('services/integrations/doctrine.xml');
         }
 
-        foreach ($resources as $alias => $resource) {
-            if (false === $resource['driver']) {
-                break;
-            }
-
-            if (!in_array($resource['driver'], $drivers, true)) {
-                throw new InvalidArgumentException(sprintf(
-                    'Resource "%s" uses driver "%s", but this driver has not been enabled.',
-                    $alias,
-                    $resource['driver'],
-                ));
-            }
-        }
-
         foreach ($drivers as $driver) {
             if (in_array($driver, [SyliusResourceBundle::DRIVER_DOCTRINE_PHPCR_ODM, SyliusResourceBundle::DRIVER_DOCTRINE_MONGODB_ODM], true)) {
                 trigger_deprecation(
@@ -209,10 +207,89 @@
                 );
             }
 
+            // Only Doctrine drivers need service integration file
+            if (!str_starts_with($driver, 'doctrine')) {
+                continue;
+            }
+
             $loader->load(sprintf('services/integrations/%s.xml', $driver));
         }
     }
 
+    /**
+     * @param array<string, array{driver: string|false}> $resources
+     *
+     * @return array<string, string>
+     */
+    private function getResourceDrivers(array $resources): array
+    {
+        $resourceDrivers = array_map(function (array $resource): string|false {
+            return $resource['driver'] ?? false;
+        }, $resources);
+
+        // Remove resources with disabled driver
+        return array_filter($resourceDrivers, function (string|false $driver): bool {
+            return false !== $driver;
+        });
+    }
+
+    private function getAvailableDrivers(ContainerBuilder $container): array
+    {
+        $availableDrivers = [];
+
+        if ($container::willBeAvailable(SyliusResourceBundle::DRIVER_DOCTRINE_ORM, \Doctrine\ORM\EntityManagerInterface::class, ['doctrine/doctrine-bundle'])) {
+            $availableDrivers[] = SyliusResourceBundle::DRIVER_DOCTRINE_ORM;
+        }
+
+        if ($container::willBeAvailable(SyliusResourceBundle::DRIVER_DOCTRINE_PHPCR_ODM, \Doctrine\ODM\PHPCR\Document\Resource::class, ['doctrine/doctrine-bundle'])) {
+            $availableDrivers[] = SyliusResourceBundle::DRIVER_DOCTRINE_PHPCR_ODM;
+        }
+
+        if ($container::willBeAvailable(SyliusResourceBundle::DRIVER_DOCTRINE_MONGODB_ODM, \Doctrine\ODM\MongoDB\DocumentManager::class, ['doctrine/doctrine-bundle'])) {
+            $availableDrivers[] = SyliusResourceBundle::DRIVER_DOCTRINE_MONGODB_ODM;
+        }
+
+        return $availableDrivers;
+    }
+
+    /**
+     * @param string[] $configuredDrivers
+     * @param string[] $availableDrivers
+     * @param array<string, string> $resourceDrivers
+     */
+    private function checkConfiguredDrivers(array $configuredDrivers, array $availableDrivers, array $resourceDrivers): void
+    {
+        foreach ($configuredDrivers as $driver) {
+            if (!in_array($driver, $availableDrivers, true)) {
+                throw new InvalidArgumentException(sprintf(
+                    'Driver "%s" is configured, but this driver is not available. Try running "composer require %s"',
+                    $driver,
+                    $driver,
+                ));
+            }
+        }
+
+        foreach ($resourceDrivers as $resource => $driver) {
+            if (!in_array($driver, $availableDrivers, true)) {
+                throw new InvalidArgumentException(sprintf(
+                    'Resource "%s" uses drivers "%s", but this driver is not available. Try running "composer require %s"',
+                    $resource,
+                    $driver,
+                    $driver,
+                ));
+            }
+
+            if (!in_array($driver, $configuredDrivers, true)) {
+                throw new InvalidArgumentException(sprintf(
+                    'Resource "%s" uses drivers "%s", but this driver is not enabled. Try adding "%s" in sylius_resource.drivers option',
+                    $resource,
+                    $driver,
+                    $driver,
+                ));
+            }
+        }
+    }
+
     private function loadResources(array $loadedResources, ContainerBuilder $container): void
     {
         /** @var array<string, array> $resources */

tests/Bundle/Configuration/ConfigurationTest.php

@@ -16,15 +16,14 @@
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
 use PHPUnit\Framework\TestCase;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Configuration;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 class ConfigurationTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 
-    /**
-     * @test
-     */
-    public function it_does_not_break_if_not_customized()
+    /** @test */
+    public function it_does_not_break_if_not_customized(): void
     {
         $this->assertConfigurationIsValid(
             [
@@ -33,10 +32,38 @@ public function it_does_not_break_if_not_customized()
         );
     }
 
-    /**
-     * @test
-     */
-    public function it_has_no_default_mapping_paths()
+    /** @test */
+    public function it_has_no_default_drivers(): void
+    {
+        $this->assertProcessedConfigurationEquals(
+            [],
+            [
+                'drivers' => [],
+            ],
+            'drivers',
+        );
+    }
+
+    /** @test */
+    public function its_drivers_can_be_customized(): void
+    {
+        $this->assertProcessedConfigurationEquals(
+            [
+                ['drivers' => [
+                    'doctrine/orm',
+                ]],
+            ],
+            [
+                'drivers' => [
+                    'doctrine/orm',
+                ],
+            ],
+            'drivers',
+        );
+    }
+
+    /** @test */
+    public function it_has_no_default_mapping_paths(): void
     {
         $this->assertProcessedConfigurationEquals(
             [
@@ -51,10 +78,8 @@ public function it_has_no_default_mapping_paths()
         );
     }
 
-    /**
-     * @test
-     */
-    public function its_mapping_paths_can_be_customized()
+    /** @test */
+    public function its_mapping_paths_can_be_customized(): void
     {
         $this->assertProcessedConfigurationEquals(
             [
@@ -73,10 +98,8 @@ public function its_mapping_paths_can_be_customized()
         );
     }
 
-    /**
-     * @test
-     */
-    public function its_default_templates_dir_can_be_customized()
+    /** @test */
+    public function its_default_templates_dir_can_be_customized(): void
     {
         $this->assertProcessedConfigurationEquals(
             [
@@ -93,10 +116,8 @@ public function its_default_templates_dir_can_be_customized()
         );
     }
 
-    /**
-     * @test
-     */
-    public function it_has_default_authorization_checker()
+    /** @test */
+    public function it_has_default_authorization_checker(): void
     {
         $this->assertProcessedConfigurationEquals(
             [
@@ -107,10 +128,8 @@ public function it_has_default_authorization_checker()
         );
     }
 
-    /**
-     * @test
-     */
-    public function its_authorization_checker_can_be_customized()
+    /** @test */
+    public function its_authorization_checker_can_be_customized(): void
     {
         $this->assertProcessedConfigurationEquals(
             [
@@ -121,10 +140,8 @@ public function its_authorization_checker_can_be_customized()
         );
     }
 
-    /**
-     * @test
-     */
-    public function its_authorization_checker_cannot_be_empty()
+    /** @test */
+    public function its_authorization_checker_cannot_be_empty(): void
     {
         $this->assertPartialConfigurationIsInvalid(
             [
@@ -134,7 +151,7 @@ public function its_authorization_checker_cannot_be_empty()
         );
     }
 
-    protected function getConfiguration()
+    protected function getConfiguration(): ConfigurationInterface
     {
         return new Configuration();
     }