PoC Console operations

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" />
@@ -107,6 +116,12 @@
                 <file name="src/Bundle/Grid/Parser/OptionsParser.php" />
             </errorLevel>
         </InvalidReturnStatement>
+
+        <InvalidNullableReturnType>
+            <errorLevel type="suppress">
+                <file name="src/Component/src/Metadata/Extractor/PhpFileMetadataExtractor.php" />
+            </errorLevel>
+        </InvalidNullableReturnType>
 
         <InvalidReturnType>
             <errorLevel type="suppress">
@@ -170,6 +185,12 @@
             </errorLevel>
         </NullArgument>
 
+        <NullableReturnStatement>
+            <errorLevel type="suppress">
+                <file name="src/Component/src/Metadata/Extractor/PhpFileMetadataExtractor.php" />
+            </errorLevel>
+        </NullableReturnStatement>
+
         <PossiblyFalseOperand>
             <errorLevel type="suppress">
                 <file name="src/Component/src/Reflection/ClassInfoTrait.php" />
@@ -311,6 +332,12 @@
                 <directory name="src/Component/legacy/src/Translation" />
             </errorLevel>
         </UnrecognizedStatement>
+
+        <UnresolvableInclude>
+            <errorLevel type="suppress">
+                <file name="src/Component/src/Metadata/Extractor/PhpFileMetadataExtractor.php" />
+            </errorLevel>
+        </UnresolvableInclude>
 
         <UnsupportedReferenceUsage>
             <errorLevel type="suppress">

src/Bundle/DependencyInjection/Configuration.php

@@ -39,6 +39,9 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->arrayNode('mapping')
                     ->addDefaultsIfNotSet()
                     ->children()
+                        ->arrayNode('imports')
+                            ->prototype('scalar')->end()
+                        ->end()
                         ->arrayNode('paths')
                             ->prototype('scalar')->end()
                         ->end()

src/Bundle/Resources/config/services/console.xml

@@ -21,5 +21,20 @@
             <tag name="console.command" />
         </service>
         <service id="Sylius\Bundle\ResourceBundle\Command\DebugResourceCommand" alias="sylius.console.command.resource_debug" />
+
+        <service id="sylius.console.command.resource"  class="Sylius\Resource\Symfony\Console\ResourceCommand">
+            <argument type="service" id="sylius.resource_metadata_collection.factory" />
+            <argument type="service" id="sylius.resource_registry" />
+            <argument type="service" id="sylius.state_provider.main" />
+            <argument type="service" id="sylius.state_processor.main" />
+            <tag name="console.command" />
+        </service>
+        <service id="Sylius\Resource\Symfony\Console\ResourceCommand" alias="sylius.console.command.resource" />
+
+        <service id="Sylius\Resource\Symfony\Console\State\ConsoleGridProvider">
+            <argument type="service" id="sylius.grid.view_factory.resource" on-invalid="null" />
+            <argument type="service" id="sylius.grid.provider" on-invalid="null" />
+            <tag name="sylius.state_provider" />
+        </service>
     </services>
 </container>

src/Bundle/Resources/config/services/integrations/doctrine/orm.xml

@@ -20,6 +20,24 @@
     <services>
         <defaults public="true" />
 
+        <service id="sylius.doctrine_orm.metadata.resource.metadata_collection_factory"
+                 class="Sylius\Resource\Doctrine\ORM\Metadata\Resource\Factory\DoctrineORMResourceMetadataCollectionFactory"
+                 decorates="sylius.resource_metadata_collection.factory"
+                 decoration-priority="200"
+        >
+            <argument type="service" id="doctrine" />
+            <argument type="service" id=".inner" />
+        </service>
+
+        <service id="sylius.state_provider.doctrine.orm.state.provider" class="Sylius\Resource\Doctrine\ORM\State\Provider">
+            <argument type="service" id="doctrine" />
+            <argument type="service" id="sylius.repository_argument_resolver.request" />
+            <argument type="service" id="sylius.expression_language.argument_parser.repository" />
+            <argument type="tagged_locator" tag="sylius.state_provider" />
+            <tag name="sylius.state_provider" />
+        </service>
+        <service id="Sylius\Resource\Doctrine\ORM\State\Provider" alias="sylius.state_provider.doctrine.orm.state.provider" />
+
         <service id="sylius.event_subscriber.orm_mapped_super_class" class="Sylius\Bundle\ResourceBundle\EventListener\ORMMappedSuperClassSubscriber">
             <argument type="service" id="sylius.resource_registry" />
             <tag name="doctrine.event_listener" event="loadClassMetadata" priority="8192" />

src/Bundle/Resources/config/services/metadata.xml

@@ -12,35 +12,47 @@
 -->
 
 <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="metadata/**/**.xml" />
+    </imports>
+
     <services>
         <service id="sylius.cache.metadata.resource_collection" parent="cache.system" public="false">
             <tag name="cache.pool" />
         </service>
 
-        <service id="sylius.resource_metadata_collection.factory.attributes" class="Sylius\Resource\Metadata\Resource\Factory\AttributesResourceMetadataCollectionFactory">
+        <service id="sylius_resource.metadata.extractor.php_file" class="Sylius\Resource\Metadata\Extractor\PhpFileMetadataExtractor">
+            <argument>%sylius.resource.mapping%</argument>
+            <argument type="service" id="service_container" />
+        </service>
+
+        <service id="sylius.resource_metadata_collection.factory" alias="sylius.resource_metadata_collection.factory.php_file" />
+        <service id="Sylius\Resource\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface" alias="sylius.resource_metadata_collection.factory.php_file" />
+
+        <service id="sylius.resource_metadata_collection.factory.php_file" class="Sylius\Resource\Metadata\Resource\Factory\PhpFileResourceMetadataCollectionFactory">
             <argument type="service" id="sylius.resource_registry" />
             <argument type="service" id="sylius.routing.factory.operation_route_name_factory" />
+            <argument type="service" id="sylius_resource.metadata.extractor.php_file" />
         </service>
-        <service id="Sylius\Resource\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface" alias="sylius.resource_metadata_collection.factory.attributes" />
-        <service id="sylius.resource_metadata_collection.factory" alias="sylius.resource_metadata_collection.factory.attributes" />
 
-        <service id="sylius.resource_metadata_collection.factory.state_machine"
-                 class="Sylius\Resource\Metadata\Resource\Factory\StateMachineResourceMetadataCollectionFactory"
-                 decorates="sylius.resource_metadata_collection.factory.attributes"
-                 decoration-priority="300"
+        <service id="sylius.resource_metadata_collection.factory.attributes"
+                 class="Sylius\Resource\Metadata\Resource\Factory\AttributesResourceMetadataCollectionFactory"
+                 decorates="sylius.resource_metadata_collection.factory"
+                 decoration-priority="400"
         >
             <argument type="service" id="sylius.resource_registry" />
+            <argument type="service" id="sylius.routing.factory.operation_route_name_factory" />
             <argument type="service" id=".inner" />
-            <argument>%sylius.state_machine_component.default%</argument>
         </service>
 
-        <service id="sylius.resource_metadata_collection.factory.doctrine"
-            class="Sylius\Resource\Doctrine\Common\Metadata\Resource\Factory\DoctrineResourceMetadataCollectionFactory"
-            decorates="sylius.resource_metadata_collection.factory"
-            decoration-priority="200"
+        <service id="sylius.resource_metadata_collection.factory.state_machine"
+                 class="Sylius\Resource\Metadata\Resource\Factory\StateMachineResourceMetadataCollectionFactory"
+                 decorates="sylius.resource_metadata_collection.factory"
+                 decoration-priority="300"
         >
             <argument type="service" id="sylius.resource_registry" />
             <argument type="service" id=".inner" />
+            <argument>%sylius.state_machine_component.default%</argument>
         </service>
 
         <service id="sylius.resource_metadata_collection.factory.redirect"
@@ -83,15 +95,15 @@
 
         <service id="sylius.resource_metadata_collection.factory.templates_dir"
                  class="Sylius\Resource\Metadata\Resource\Factory\TemplatesDirResourceMetadataCollectionFactory"
-                 decorates="sylius.resource_metadata_collection.factory.attributes"
+                 decorates="sylius.resource_metadata_collection.factory"
         >
             <argument type="service" id=".inner" />
             <argument>%sylius.resource.settings%</argument>
         </service>
 
         <service id="sylius.resource_metadata_collection.factory.cached"
                  class="Sylius\Resource\Metadata\Resource\Factory\CachedResourceMetadataCollectionFactory"
-                 decorates="sylius.resource_metadata_collection.factory.attributes"
+                 decorates="sylius.resource_metadata_collection.factory"
                  decoration-priority="-10"
         >
             <argument type="service" id="sylius.cache.metadata.resource_collection" />

src/Bundle/Resources/config/services/metadata/resource_name.xml

@@ -0,0 +1,36 @@
+<?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_resource.metadata.resource.name_collection.factory" alias="sylius_resource.metadata.resource.name_collection.factory.attributes" />
+        <service id="Sylius\Resource\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface" alias="sylius_resource.metadata.resource.name_collection.factory" />
+
+        <service id="sylius_resource.metadata.resource.name_collection.factory.attributes"
+                 class="Sylius\Resource\Metadata\Resource\Factory\AttributesResourceNameCollectionFactory"
+        >
+            <argument>%sylius.resource.mapping%</argument>
+        </service>
+        <service id="Sylius\Resource\Metadata\Resource\Factory\AttributesResourceNameCollectionFactory" alias="sylius_resource.metadata.resource.name_collection.factory.attributes" />
+
+        <service id="sylius_resource.metadata.resource.name_collection.factory.php_file"
+                 class="Sylius\Resource\Metadata\Resource\Factory\PhpFileResourceNameCollectionFactory"
+                 decorates="sylius_resource.metadata.resource.name_collection.factory"
+                 decoration-priority="100"
+        >
+            <argument type="service" id="sylius_resource.metadata.extractor.php_file"  />
+            <argument type="service" id=".inner" />
+        </service>
+        <service id="Sylius\Resource\Metadata\Resource\Factory\PhpFileResourceMetadataCollectionFactory" alias="sylius_resource.metadata.resource.name_collection.factory.php_file" />
+    </services>
+</container>

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" />
 
@@ -102,7 +106,7 @@
         <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" />
+            <argument type="service" id="sylius.resource_metadata_collection.factory" />
         </service>
         <service id="Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactoryInterface" alias="sylius.routing.factory.attributes_operation_route" />
 

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_resource.symfony.routing.loader.resource" class="Sylius\Resource\Symfony\Routing\Loader\ResourceLoader">
+            <argument type="service" id="sylius_resource.metadata.resource.name_collection.factory" />
+            <argument type="service" id="sylius_resource.routing.resource.route_collection_factory" />
+            <tag name="routing.route_loader" />
+        </service>
+        <service id="Sylius\Resource\Symfony\Routing\Loader\ResourceLoader" alias="sylius_resource.symfony.routing.loader.resource" />
+    </services>
+</container>

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_resource.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_resource.routing.resource.route_collection_factory" />
+    </services>
+</container>

src/Bundle/Resources/config/services/state.xml

@@ -37,13 +37,6 @@
         </service>
         <service id="Sylius\Resource\State\ResponderInterface" alias="sylius.state_responder" />
 
-        <service id="Sylius\Resource\Symfony\Request\State\Provider">
-            <argument type="tagged_locator" tag="sylius.repository" />
-            <argument type="service" id="sylius.repository_argument_resolver.request" />
-            <argument type="service" id="sylius.expression_language.argument_parser.repository" />
-            <tag name="sylius.state_provider" />
-        </service>
-
         <service id="Sylius\Resource\StateMachine\State\ApplyStateMachineTransitionProcessor">
             <argument type="service" id="sylius.state_machine.operation" />
             <argument type="service" id="Sylius\Resource\Doctrine\Common\State\PersistProcessor" on-invalid="null" />
@@ -71,7 +64,7 @@
 
         <service id="Sylius\Resource\Grid\State\RequestGridProvider">
             <argument type="service" id="sylius.grid.view_factory.resource" on-invalid="null" />
-            <argument type="service" id="sylius.grid.service_grid_provider" on-invalid="null" />
+            <argument type="service" id="sylius.grid.provider" on-invalid="null" />
             <tag name="sylius.state_provider" />
         </service>
     </services>

src/Bundle/SyliusResourceBundle.php

@@ -30,6 +30,7 @@
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Compiler\WinzouStateMachinePass;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\PagerfantaExtension;
 use Sylius\Resource\Symfony\DependencyInjection\Compiler\DisableMetadataCachePass;
+use Sylius\Resource\Symfony\DependencyInjection\Compiler\RegisterResourceCommandsPass;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -50,6 +51,7 @@ public function build(ContainerBuilder $container): void
 
         $container->addCompilerPass(new CsrfTokenManagerPass());
         $container->addCompilerPass(new DisableMetadataCachePass());
+        $container->addCompilerPass(new RegisterResourceCommandsPass());
         $container->addCompilerPass(new DoctrineContainerRepositoryFactoryPass());
         $container->addCompilerPass(new DoctrineTargetEntitiesResolverPass(new TargetEntitiesResolver()), PassConfig::TYPE_BEFORE_OPTIMIZATION, 1);
         $container->addCompilerPass(new RegisterFormBuilderPass());

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",