Add Resource Route Collection Factory

loic425 · loic425 · commit 3bf24e46272d · 2025-03-03T11:19:08.000+01:00
diff --git a/psalm.xml b/psalm.xml
@@ -46,11 +46,20 @@
         <DeprecatedClass>
             <errorLevel type="info">
                 <referencedClass name="Doctrine\ORM\Event\LifecycleEventArgs" /> <!-- deprecated in doctrine/orm 2.14 -->
+            </errorLevel>
+            <errorLevel type="suppress">
                 <referencedClass name="Sylius\Component\Resource\Exception\VariantWithNoOptionsValuesException" />
                 <referencedClass name="Sylius\Resource\Exception\VariantWithNoOptionsValuesException" />
+                <referencedClass name="Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactory" />
             </errorLevel>
         </DeprecatedClass>
 
+        <DeprecatedInterface>
+            <errorLevel type="suppress">
+                <referencedClass name="Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactoryInterface" />
+            </errorLevel>
+        </DeprecatedInterface>
+
         <DeprecatedMethod>
             <errorLevel type="suppress">
                 <referencedMethod name="Symfony\Component\EventDispatcher\Event::isPropagationStopped" />
diff --git a/src/Bundle/Resources/config/services/routing.xml b/src/Bundle/Resources/config/services/routing.xml
@@ -12,6 +12,10 @@
 -->
 
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <imports>
+        <import resource="routing/**/**.xml" />
+    </imports>
+
     <services>
         <defaults public="true" />
 
@@ -22,6 +26,7 @@
             </argument>
             <argument>%kernel.environment%</argument>
             <tag name="routing.loader" />
+            <deprecated package="sylius/resource" version="1.13">The "%service_id%" service is deprecated since sylius/resource-bundle 1.13 and will be removed in sylius/resource-bundle 2.0. Use "sylius_resource.symfony.routing.loader.resource" instead.</deprecated>
         </service>
         <service id="Sylius\Bundle\ResourceBundle\Routing\ResourceLoader" alias="sylius.routing.loader.resource" public="false" />
 
@@ -37,6 +42,7 @@
             <argument type="service" id="sylius.routing.factory.route_attributes" />
             <argument type="service" id="sylius.routing.factory.attributes_operation_route" />
             <tag name="routing.route_loader" />
+            <deprecated package="sylius/resource" version="1.13">The "%service_id%" service is deprecated since sylius/resource-bundle 1.13 and will be removed in sylius/resource-bundle 2.0. Use "sylius_resource.symfony.routing.loader.resource" instead.</deprecated>
         </service>
         <service id="Sylius\Bundle\ResourceBundle\Routing\RoutesAttributesLoader" alias="sylius.routing.loader.routes_attributes" public="false" />
 
@@ -99,12 +105,19 @@
         <service id="sylius.routing.factory.route_attributes" class="Sylius\Bundle\ResourceBundle\Routing\RouteAttributesFactory" public="false" />
         <service id="Sylius\Bundle\ResourceBundle\Routing\RouteAttributesFactoryInterface" alias="sylius.routing.factory.route_attributes" />
 
-        <service id="sylius.routing.factory.attributes_operation_route" class="Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactory" public="false">
+        <service id="sylius.routing.factory.attributes_operation_route"
+                 class="Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactory"
+                 public="false"
+        >
             <argument type="service" id="sylius.resource_registry" />
             <argument type="service" id="sylius.routing.factory.operation_route" />
             <argument type="service" id="sylius.resource_metadata_collection.factory.attributes" />
+            <deprecated package="sylius/resource-bundle" version="1.13">The "%service_id%" service is deprecated since sylius/resource-bundle 1.13 and will be removed in sylius/resource-bundle 2.0. Use "sylius.routing.resource.route_collection_factory" instead.</deprecated>
+        </service>
+        <service id="Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactoryInterface"
+                 alias="sylius.routing.factory.attributes_operation_route">
+            <deprecated package="sylius/resource-bundle" version="1.13">The "%alias_id%" service is deprecated since sylius/resource-bundle 1.13 and will be removed in sylius/resource-bundle 2.0. Use "sylius.routing.resource.route_collection_factory" instead.</deprecated>
         </service>
-        <service id="Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactoryInterface" alias="sylius.routing.factory.attributes_operation_route" />
 
         <service id="sylius.routing.factory.operation_route" class="Sylius\Resource\Symfony\Routing\Factory\OperationRouteFactory" public="false">
             <argument type="service" id="sylius.routing.factory.operation_route_path_factory" />
diff --git a/src/Bundle/Resources/config/services/routing/loader.xml b/src/Bundle/Resources/config/services/routing/loader.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ This file is part of the Sylius package.
+
+ (c) Sylius Sp. z o.o.
+
+ For the full copyright and license information, please view the LICENSE
+ file that was distributed with this source code.
+
+-->
+
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="sylius.symfony.routing.loader.resource" class="Sylius\Resource\Symfony\Routing\Loader\ResourceLoader">
+            <argument type="service" id="sylius.metadata.resource_class_list.factory" />
+            <argument type="service" id="sylius.routing.resource.route_collection_factory" />
+            <tag name="routing.route_loader" />
+        </service>
+        <service id="Sylius\Resource\Symfony\Routing\Loader\ResourceLoader" alias="sylius.symfony.routing.loader.resource" />
+    </services>
+</container>
diff --git a/src/Bundle/Resources/config/services/routing/resource.xml b/src/Bundle/Resources/config/services/routing/resource.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ This file is part of the Sylius package.
+
+ (c) Sylius Sp. z o.o.
+
+ For the full copyright and license information, please view the LICENSE
+ file that was distributed with this source code.
+
+-->
+
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="sylius.routing.resource.route_collection_factory" class="Sylius\Resource\Symfony\Routing\Factory\Resource\ResourceRouteCollectionFactory">
+            <argument type="service" id="sylius.routing.factory.operation_route" />
+            <argument type="service" id="sylius.resource_metadata_collection.factory.attributes" />
+            <argument type="service" id="sylius.resource_registry" />
+        </service>
+        <service id="Sylius\Resource\Symfony\Routing\Factory\Resource\ResourceRouteCollectionFactoryInterface" alias="sylius.routing.resource.route_collection_factory" />
+    </services>
+</container>
diff --git a/src/Bundle/Routing/ResourceLoader.php b/src/Bundle/Routing/ResourceLoader.php
@@ -22,6 +22,9 @@
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Yaml\Yaml;
 
+/**
+ * @deprecated use Sylius\Resource\Symfony\Routing\Loader\ResourceLoader instead
+ */
 final class ResourceLoader extends Loader
 {
     private RegistryInterface $resourceRegistry;
diff --git a/src/Bundle/Routing/RoutesAttributesLoader.php b/src/Bundle/Routing/RoutesAttributesLoader.php
@@ -18,6 +18,9 @@
 use Symfony\Bundle\FrameworkBundle\Routing\RouteLoaderInterface;
 use Symfony\Component\Routing\RouteCollection;
 
+/**
+ * @deprecated use Sylius\Resource\Symfony\Routing\Loader\ResourceLoader instead
+ */
 final class RoutesAttributesLoader implements RouteLoaderInterface
 {
     public function __construct(
diff --git a/src/Component/composer.json b/src/Component/composer.json
@@ -34,6 +34,7 @@
         "pagerfanta/core": "^3.7 || ^4.0",
         "symfony/event-dispatcher": "^6.4 || ^7.1",
         "symfony/form": "^6.4 || ^7.1",
+        "symfony/framework-bundle": "^6.4 || ^7.1",
         "symfony/http-foundation": "^6.4 || ^7.1",
         "symfony/http-kernel": "^6.4 || ^7.1",
         "symfony/property-access": "^6.4 || ^7.1",
diff --git a/src/Component/src/Metadata/Resource/Factory/AttributesResourceClassListFactory.php b/src/Component/src/Metadata/Resource/Factory/AttributesResourceClassListFactory.php
@@ -38,7 +38,6 @@ public function __construct(
      */
     public function create(): ResourceClassList
     {
-        /** @var class-string[] $classes */
         $classes = [];
 
         if ($this->decorated) {
diff --git a/src/Component/src/Symfony/Routing/Factory/AttributesOperationRouteFactory.php b/src/Component/src/Symfony/Routing/Factory/AttributesOperationRouteFactory.php
@@ -19,10 +19,14 @@
 use Sylius\Resource\Metadata\RegistryInterface;
 use Sylius\Resource\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use Sylius\Resource\Metadata\ResourceMetadata;
+use Sylius\Resource\Symfony\Routing\Factory\Resource\ResourceRouteCollectionFactory;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Webmozart\Assert\Assert;
 
+/**
+ * @deprecated use ResourceRouteCollectionFactory instead
+ */
 final class AttributesOperationRouteFactory implements AttributesOperationRouteFactoryInterface
 {
     public function __construct(
diff --git a/src/Component/src/Symfony/Routing/Factory/AttributesOperationRouteFactoryInterface.php b/src/Component/src/Symfony/Routing/Factory/AttributesOperationRouteFactoryInterface.php
@@ -15,6 +15,9 @@
 
 use Symfony\Component\Routing\RouteCollection;
 
+/**
+ * @deprecated use Sylius\Resource\Symfony\Routing\Factory\Resource\ResourceRouteCollectionFactoryInterface instead
+ */
 interface AttributesOperationRouteFactoryInterface
 {
     /** @psalm-param class-string $className */
diff --git a/src/Component/src/Symfony/Routing/Factory/Resource/ResourceRouteCollectionFactory.php b/src/Component/src/Symfony/Routing/Factory/Resource/ResourceRouteCollectionFactory.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Resource\Symfony\Routing\Factory\Resource;
+
+use Sylius\Resource\Metadata\HttpOperation;
+use Sylius\Resource\Metadata\MetadataInterface;
+use Sylius\Resource\Metadata\Operations;
+use Sylius\Resource\Metadata\RegistryInterface;
+use Sylius\Resource\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use Sylius\Resource\Metadata\ResourceMetadata;
+use Sylius\Resource\Symfony\Routing\Factory\OperationRouteFactoryInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+use Webmozart\Assert\Assert;
+
+/**
+ * @experimental
+ */
+final class ResourceRouteCollectionFactory implements ResourceRouteCollectionFactoryInterface
+{
+    public function __construct(
+        private OperationRouteFactoryInterface $operationRouteFactory,
+        private ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory,
+        private RegistryInterface $resourceRegistry,
+    ) {
+    }
+
+    public function createRouteCollectionForClass(string $className): RouteCollection
+    {
+        $routeCollection = new RouteCollection();
+        $resourceMetadata = $this->resourceMetadataFactory->create($className);
+
+        /** @var ResourceMetadata $resource */
+        foreach ($resourceMetadata->getIterator() as $resource) {
+            $this->createRoutesForResource($routeCollection, $resource);
+        }
+
+        return $routeCollection;
+    }
+
+    private function createRoutesForResource(RouteCollection $routeCollection, ResourceMetadata $resource): void
+    {
+        foreach ($resource->getOperations() ?? new Operations() as $operation) {
+            if (!$operation instanceof HttpOperation) {
+                continue;
+            }
+
+            $this->addRouteForOperation($routeCollection, $resource, $operation);
+        }
+    }
+
+    private function addRouteForOperation(RouteCollection $routeCollection, ResourceMetadata $resource, HttpOperation $operation): void
+    {
+        $metadata = $this->resourceRegistry->get($resource->getAlias() ?? '');
+        $routeName = $operation->getRouteName();
+
+        Assert::notNull($routeName, sprintf('Operation %s has no route name. Please define one.', $operation::class));
+
+        $route = $this->createRoute($metadata, $resource, $operation);
+        $routeCollection->add($routeName, $route);
+    }
+
+    private function createRoute(MetadataInterface $metadata, ResourceMetadata $resource, HttpOperation $operation): Route
+    {
+        return $this->operationRouteFactory->create($metadata, $resource, $operation);
+    }
+}
diff --git a/src/Component/src/Symfony/Routing/Factory/Resource/ResourceRouteCollectionFactoryInterface.php b/src/Component/src/Symfony/Routing/Factory/Resource/ResourceRouteCollectionFactoryInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Resource\Symfony\Routing\Factory\Resource;
+
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * @experimental
+ */
+interface ResourceRouteCollectionFactoryInterface
+{
+    /** @psalm-param class-string $className */
+    public function createRouteCollectionForClass(string $className): RouteCollection;
+}
diff --git a/src/Component/src/Symfony/Routing/Loader/ResourceLoader.php b/src/Component/src/Symfony/Routing/Loader/ResourceLoader.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Resource\Symfony\Routing\Loader;
+
+use Sylius\Resource\Metadata\Resource\Factory\ResourceClassListFactoryInterface;
+use Sylius\Resource\Symfony\Routing\Factory\Resource\ResourceRouteCollectionFactoryInterface;
+use Symfony\Bundle\FrameworkBundle\Routing\RouteLoaderInterface;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * @experimental
+ */
+final class ResourceLoader implements RouteLoaderInterface
+{
+    public function __construct(
+        private readonly ResourceClassListFactoryInterface $resourceClassListCollectionFactory,
+        private readonly ResourceRouteCollectionFactoryInterface $resourceRouteCollectionFactory,
+    ) {
+    }
+
+    public function __invoke(): RouteCollection
+    {
+        $routeCollection = new RouteCollection();
+
+        $resourceClasses = $this->resourceClassListCollectionFactory->create();
+
+        /**
+         * @var class-string $classes
+         */
+        foreach ($resourceClasses as $classes) {
+            $routeCollection->addCollection($this->resourceRouteCollectionFactory->createRouteCollectionForClass($classes));
+        }
+
+        return $routeCollection;
+    }
+}
diff --git a/src/Component/tests/Metadata/Resource/Factory/AttributesResourceClassListFactoryTest.php b/src/Component/tests/Metadata/Resource/Factory/AttributesResourceClassListFactoryTest.php
@@ -20,15 +20,15 @@
 
 final class AttributesResourceClassListFactoryTest extends TestCase
 {
-    public function testCreateAResourceClassListForResourcesWithAsResourceAttribute(): void
+    public function testCreateWithInstanceOfApiResource(): void
     {
-        $attributesResourceClassListFactory = new AttributesResourceClassListFactory(
+        $attributesResourceNameCollectionFactory = new AttributesResourceClassListFactory(
             mapping: ['paths' => [dirname(__DIR__, 3) . '/Dummy']],
         );
 
-        $list = $attributesResourceClassListFactory->create();
+        $collection = $attributesResourceNameCollectionFactory->create();
 
-        $this->assertContains(DummyResource::class, $list->getIterator());
-        $this->assertNotContains(PullRequest::class, $list->getIterator());
+        $this->assertContains(DummyResource::class, $collection->getIterator());
+        $this->assertNotContains(PullRequest::class, $collection->getIterator());
     }
 }
diff --git a/src/Component/tests/Symfony/Routing/Factory/Resource/ResourceRouteCollectionFactoryTest.php b/src/Component/tests/Symfony/Routing/Factory/Resource/ResourceRouteCollectionFactoryTest.php
diff --git a/src/Component/tests/Symfony/Routing/Loader/ResourceLoaderTest.php b/src/Component/tests/Symfony/Routing/Loader/ResourceLoaderTest.php
diff --git a/tests/Application/config/routes/sylius_resource.yaml b/tests/Application/config/routes/sylius_resource.yaml

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@`
`22`	`22`	`use Symfony\Component\Routing\RouteCollection;`
`23`	`23`	`use Symfony\Component\Yaml\Yaml;`
`24`	`24`
	`25`	`+/**`
	`26`	`+ * @deprecated use Sylius\Resource\Symfony\Routing\Loader\ResourceLoader instead`
	`27`	`+ */`
`25`	`28`	`final class ResourceLoader extends Loader`
`26`	`29`	`{`
`27`	`30`	`private RegistryInterface $resourceRegistry;`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`use Symfony\Bundle\FrameworkBundle\Routing\RouteLoaderInterface;`
`19`	`19`	`use Symfony\Component\Routing\RouteCollection;`
`20`	`20`
	`21`	`+/**`
	`22`	`+ * @deprecated use Sylius\Resource\Symfony\Routing\Loader\ResourceLoader instead`
	`23`	`+ */`
`21`	`24`	`final class RoutesAttributesLoader implements RouteLoaderInterface`
`22`	`25`	`{`
`23`	`26`	`public function __construct(`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ public function __construct(`
`38`	`38`	`*/`
`39`	`39`	`public function create(): ResourceClassList`
`40`	`40`	`{`
`41`		`- /** @var class-string[] $classes */`
`42`	`41`	`$classes = [];`
`43`	`42`
`44`	`43`	`if ($this->decorated) {`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`
`16`	`16`	`use Symfony\Component\Routing\RouteCollection;`
`17`	`17`
	`18`	`+/**`
	`19`	`+ * @deprecated use Sylius\Resource\Symfony\Routing\Factory\Resource\ResourceRouteCollectionFactoryInterface instead`
	`20`	`+ */`
`18`	`21`	`interface AttributesOperationRouteFactoryInterface`
`19`	`22`	`{`
`20`	`23`	`/** @psalm-param class-string $className */`