Use abstract loader from Symfony

Sylius · May 29, 2024 · 9ea6acd · 9ea6acd
1 parent 8d2e528
commit 9ea6acd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/src/Bundle/Resources/config/services/routing.xml b/src/Bundle/Resources/config/services/routing.xml
@@ -20,6 +20,7 @@
             <argument type="service">
                 <service class="Sylius\Bundle\ResourceBundle\Routing\RouteFactory" />
             </argument>
+            <argument>%kernel.environment%</argument>
             <tag name="routing.loader" />
         </service>
         <service id="Sylius\Bundle\ResourceBundle\Routing\ResourceLoader" alias="sylius.routing.loader.resource" public="false" />

diff --git a/src/Bundle/Routing/ResourceLoader.php b/src/Bundle/Routing/ResourceLoader.php
@@ -17,22 +17,26 @@
 use Sylius\Resource\Metadata\MetadataInterface;
 use Sylius\Resource\Metadata\RegistryInterface;
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\Config\Loader\Loader;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Loader\LoaderResolverInterface;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Yaml\Yaml;
 
-final class ResourceLoader implements LoaderInterface
+final class ResourceLoader extends Loader
 {
     private RegistryInterface $resourceRegistry;
 
     private RouteFactoryInterface $routeFactory;
 
-    private LoaderResolverInterface $resolver;
+    public function __construct(
+        RegistryInterface $resourceRegistry,
+        RouteFactoryInterface $routeFactory,
+        ?string $env,
+    ) {
+        parent::__construct($env);
 
-    public function __construct(RegistryInterface $resourceRegistry, RouteFactoryInterface $routeFactory)
-    {
         $this->resourceRegistry = $resourceRegistry;
         $this->routeFactory = $routeFactory;
     }
@@ -105,19 +109,6 @@ public function supports($resource, $type = null): bool
         return 'sylius.resource' === $type || 'sylius.resource_api' === $type;
     }
 
-    /**
-     * @psalm-suppress InvalidReturnType Symfony docblocks are messing with us
-     */
-    public function getResolver(): LoaderResolverInterface
-    {
-        return $this->resolver;
-    }
-
-    public function setResolver(LoaderResolverInterface $resolver): void
-    {
-        $this->resolver = $resolver;
-    }
-
     private function createRoute(
         MetadataInterface $metadata,
         array $configuration,