Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -107,6 +116,13 @@
<file name="src/Bundle/Grid/Parser/OptionsParser.php" />
</errorLevel>
</InvalidReturnStatement>

<InvalidNullableReturnType>
<errorLevel type="suppress">
<file name="src/Component/src/Metadata/Extractor/PhpFileMetadataExtractor.php" />
<file name="src/Component/src/Metadata/Operation/CustomPhpFileOperationUpdater.php" />
</errorLevel>
</InvalidNullableReturnType>

<InvalidReturnType>
<errorLevel type="suppress">
Expand Down Expand Up @@ -170,6 +186,13 @@
</errorLevel>
</NullArgument>

<NullableReturnStatement>
<errorLevel type="suppress">
<file name="src/Component/src/Metadata/Extractor/PhpFileMetadataExtractor.php" />
<file name="src/Component/src/Metadata/Operation/CustomPhpFileOperationUpdater.php" />
</errorLevel>
</NullableReturnStatement>

<PossiblyFalseOperand>
<errorLevel type="suppress">
<file name="src/Component/src/Reflection/ClassInfoTrait.php" />
Expand Down Expand Up @@ -311,6 +334,13 @@
<directory name="src/Component/legacy/src/Translation" />
</errorLevel>
</UnrecognizedStatement>

<UnresolvableInclude>
<errorLevel type="suppress">
<file name="src/Component/src/Metadata/Extractor/PhpFileMetadataExtractor.php" />
<file name="src/Component/src/Metadata/Operation/CustomPhpFileOperationUpdater.php" />
</errorLevel>
</UnresolvableInclude>

<UnsupportedReferenceUsage>
<errorLevel type="suppress">
Expand Down
3 changes: 3 additions & 0 deletions src/Bundle/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ public function getConfigTreeBuilder(): TreeBuilder
->arrayNode('mapping')
->addDefaultsIfNotSet()
->children()
->arrayNode('imports')
Copy link
Copy Markdown
Member Author

@loic425 loic425 Feb 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new path ensures we do not load any files that are on Autoloader which cannot be include serveral times.
So here, we'll import config files (PHP ones).

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting discussions there
api-platform/core#6943

->prototype('scalar')->end()
->end()
->arrayNode('paths')
->prototype('scalar')->end()
->end()
Expand Down
18 changes: 18 additions & 0 deletions src/Bundle/Resources/config/services/integrations/doctrine/orm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
56 changes: 41 additions & 15 deletions src/Bundle/Resources/config/services/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,61 @@
-->

<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.operation.metadata_updater.custom_php_file" class="Sylius\Resource\Metadata\Operation\CustomPhpFileOperationUpdater">
<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.custom"
class="Sylius\Resource\Metadata\Resource\Factory\CustomResourceMetadataCollectionFactory"
decorates="sylius.resource_metadata_collection.factory"
decoration-priority="350"
>
<argument type="service" id="sylius.operation.metadata_updater.custom_php_file" />
<argument type="service" id=".inner" />
</service>

<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"
Expand Down Expand Up @@ -83,16 +109,16 @@

<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"
decoration-priority="-10"
decorates="sylius.resource_metadata_collection.factory"
decoration-priority="-20"
>
<argument type="service" id="sylius.cache.metadata.resource_collection" />
<argument type="service" id=".inner" />
Expand Down
36 changes: 36 additions & 0 deletions src/Bundle/Resources/config/services/metadata/resource_name.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 5 additions & 1 deletion src/Bundle/Resources/config/services/routing.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down Expand Up @@ -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" />

Expand Down
23 changes: 23 additions & 0 deletions src/Bundle/Resources/config/services/routing/loader.xml
Original file line number Diff line number Diff line change
@@ -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>
23 changes: 23 additions & 0 deletions src/Bundle/Resources/config/services/routing/resource.xml
Original file line number Diff line number Diff line change
@@ -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" />
<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>
9 changes: 1 addition & 8 deletions src/Bundle/Resources/config/services/state.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/Component/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading