From 93bb4bf60c33e54dd12823a06952d6fec865dc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= Date: Thu, 2 Nov 2023 14:52:57 +0100 Subject: [PATCH 1/2] Move some namespaces on Grid --- src/Bundle/Grid/View/LegacyGridViewFactory.php | 2 +- src/Bundle/Resources/config/services/integrations/grid.xml | 4 ++-- src/Bundle/Resources/config/services/state.xml | 2 +- src/Bundle/spec/Grid/View/LegacyGridViewFactorySpec.php | 2 +- .../Factory/ProviderResourceMetadataCollectionFactory.php | 2 +- src/Component/spec/Grid/State/RequestGridProviderSpec.php | 4 ++-- .../Factory/ProviderResourceMetadataCollectionFactorySpec.php | 2 +- src/Component/{ => src}/Grid/State/RequestGridProvider.php | 4 ++-- src/Component/{ => src}/Grid/View/Factory/GridViewFactory.php | 2 +- .../{ => src}/Grid/View/Factory/GridViewFactoryInterface.php | 2 +- .../State/Http/Provider/BoardGameCollectionProvider.php | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) rename src/Component/{ => src}/Grid/State/RequestGridProvider.php (95%) rename src/Component/{ => src}/Grid/View/Factory/GridViewFactory.php (93%) rename src/Component/{ => src}/Grid/View/Factory/GridViewFactoryInterface.php (91%) diff --git a/src/Bundle/Grid/View/LegacyGridViewFactory.php b/src/Bundle/Grid/View/LegacyGridViewFactory.php index 8e6df1f2f..668d47e65 100644 --- a/src/Bundle/Grid/View/LegacyGridViewFactory.php +++ b/src/Bundle/Grid/View/LegacyGridViewFactory.php @@ -17,9 +17,9 @@ use Sylius\Component\Grid\Definition\Grid; use Sylius\Component\Grid\Parameters; use Sylius\Component\Grid\View\GridView; -use Sylius\Component\Resource\Grid\View\Factory\GridViewFactoryInterface; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\MetadataOption; +use Sylius\Resource\Grid\View\Factory\GridViewFactoryInterface; final class LegacyGridViewFactory implements GridViewFactoryInterface { diff --git a/src/Bundle/Resources/config/services/integrations/grid.xml b/src/Bundle/Resources/config/services/integrations/grid.xml index 27e471fca..647009c50 100644 --- a/src/Bundle/Resources/config/services/integrations/grid.xml +++ b/src/Bundle/Resources/config/services/integrations/grid.xml @@ -61,9 +61,9 @@ - + - + diff --git a/src/Bundle/Resources/config/services/state.xml b/src/Bundle/Resources/config/services/state.xml index aed49d4e8..b3cfd33e5 100644 --- a/src/Bundle/Resources/config/services/state.xml +++ b/src/Bundle/Resources/config/services/state.xml @@ -130,7 +130,7 @@ - + diff --git a/src/Bundle/spec/Grid/View/LegacyGridViewFactorySpec.php b/src/Bundle/spec/Grid/View/LegacyGridViewFactorySpec.php index e4d47eee6..fae1167b8 100644 --- a/src/Bundle/spec/Grid/View/LegacyGridViewFactorySpec.php +++ b/src/Bundle/spec/Grid/View/LegacyGridViewFactorySpec.php @@ -22,10 +22,10 @@ use Sylius\Component\Grid\Definition\Grid; use Sylius\Component\Grid\Parameters; use Sylius\Component\Grid\View\GridView; -use Sylius\Component\Resource\Grid\View\Factory\GridViewFactoryInterface; use Sylius\Component\Resource\Metadata\MetadataInterface; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\MetadataOption; +use Sylius\Resource\Grid\View\Factory\GridViewFactoryInterface; final class LegacyGridViewFactorySpec extends ObjectBehavior { diff --git a/src/Component/Metadata/Resource/Factory/ProviderResourceMetadataCollectionFactory.php b/src/Component/Metadata/Resource/Factory/ProviderResourceMetadataCollectionFactory.php index 7830a8105..80fce9ce8 100644 --- a/src/Component/Metadata/Resource/Factory/ProviderResourceMetadataCollectionFactory.php +++ b/src/Component/Metadata/Resource/Factory/ProviderResourceMetadataCollectionFactory.php @@ -13,13 +13,13 @@ namespace Sylius\Component\Resource\Metadata\Resource\Factory; -use Sylius\Component\Resource\Grid\State\RequestGridProvider; use Sylius\Component\Resource\Metadata\GridAwareOperationInterface; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Component\Resource\Metadata\Operations; use Sylius\Component\Resource\Metadata\Resource\ResourceMetadataCollection; use Sylius\Component\Resource\Metadata\ResourceMetadata; use Sylius\Component\Resource\Symfony\Request\State\Provider; +use Sylius\Resource\Grid\State\RequestGridProvider; final class ProviderResourceMetadataCollectionFactory implements ResourceMetadataCollectionFactoryInterface { diff --git a/src/Component/spec/Grid/State/RequestGridProviderSpec.php b/src/Component/spec/Grid/State/RequestGridProviderSpec.php index 922e06380..4c1339e99 100644 --- a/src/Component/spec/Grid/State/RequestGridProviderSpec.php +++ b/src/Component/spec/Grid/State/RequestGridProviderSpec.php @@ -19,12 +19,12 @@ use Sylius\Component\Grid\Parameters; use Sylius\Component\Grid\Provider\GridProviderInterface; use Sylius\Component\Grid\View\GridView; -use Sylius\Component\Resource\Grid\State\RequestGridProvider; -use Sylius\Component\Resource\Grid\View\Factory\GridViewFactoryInterface; use Sylius\Component\Resource\Metadata\Create; use Sylius\Component\Resource\Metadata\Index; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\RequestOption; +use Sylius\Resource\Grid\State\RequestGridProvider; +use Sylius\Resource\Grid\View\Factory\GridViewFactoryInterface; use Symfony\Component\HttpFoundation\InputBag; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Component/spec/Metadata/Resource/Factory/ProviderResourceMetadataCollectionFactorySpec.php b/src/Component/spec/Metadata/Resource/Factory/ProviderResourceMetadataCollectionFactorySpec.php index 7f48cc605..1992376a2 100644 --- a/src/Component/spec/Metadata/Resource/Factory/ProviderResourceMetadataCollectionFactorySpec.php +++ b/src/Component/spec/Metadata/Resource/Factory/ProviderResourceMetadataCollectionFactorySpec.php @@ -14,7 +14,6 @@ namespace spec\Sylius\Component\Resource\Metadata\Resource\Factory; use PhpSpec\ObjectBehavior; -use Sylius\Component\Resource\Grid\State\RequestGridProvider; use Sylius\Component\Resource\Metadata\Index; use Sylius\Component\Resource\Metadata\Operations; use Sylius\Component\Resource\Metadata\Resource\Factory\ProviderResourceMetadataCollectionFactory; @@ -22,6 +21,7 @@ use Sylius\Component\Resource\Metadata\Resource\ResourceMetadataCollection; use Sylius\Component\Resource\Metadata\ResourceMetadata; use Sylius\Component\Resource\Symfony\Request\State\Provider; +use Sylius\Resource\Grid\State\RequestGridProvider; final class ProviderResourceMetadataCollectionFactorySpec extends ObjectBehavior { diff --git a/src/Component/Grid/State/RequestGridProvider.php b/src/Component/src/Grid/State/RequestGridProvider.php similarity index 95% rename from src/Component/Grid/State/RequestGridProvider.php rename to src/Component/src/Grid/State/RequestGridProvider.php index 8c0d1502e..5b439c8eb 100644 --- a/src/Component/Grid/State/RequestGridProvider.php +++ b/src/Component/src/Grid/State/RequestGridProvider.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\Grid\State; +namespace Sylius\Resource\Grid\State; use Pagerfanta\Pagerfanta; use Sylius\Component\Grid\Parameters; use Sylius\Component\Grid\Provider\GridProviderInterface; -use Sylius\Component\Resource\Grid\View\Factory\GridViewFactoryInterface; use Sylius\Component\Resource\Metadata\GridAwareOperationInterface; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\RequestOption; +use Sylius\Resource\Grid\View\Factory\GridViewFactoryInterface; use Sylius\Resource\State\ProviderInterface; final class RequestGridProvider implements ProviderInterface diff --git a/src/Component/Grid/View/Factory/GridViewFactory.php b/src/Component/src/Grid/View/Factory/GridViewFactory.php similarity index 93% rename from src/Component/Grid/View/Factory/GridViewFactory.php rename to src/Component/src/Grid/View/Factory/GridViewFactory.php index fe41f56cf..400871867 100644 --- a/src/Component/Grid/View/Factory/GridViewFactory.php +++ b/src/Component/src/Grid/View/Factory/GridViewFactory.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\Grid\View\Factory; +namespace Sylius\Resource\Grid\View\Factory; use Sylius\Component\Grid\Data\DataProviderInterface; use Sylius\Component\Grid\Definition\Grid; diff --git a/src/Component/Grid/View/Factory/GridViewFactoryInterface.php b/src/Component/src/Grid/View/Factory/GridViewFactoryInterface.php similarity index 91% rename from src/Component/Grid/View/Factory/GridViewFactoryInterface.php rename to src/Component/src/Grid/View/Factory/GridViewFactoryInterface.php index ad58afeda..95bb00353 100644 --- a/src/Component/Grid/View/Factory/GridViewFactoryInterface.php +++ b/src/Component/src/Grid/View/Factory/GridViewFactoryInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\Grid\View\Factory; +namespace Sylius\Resource\Grid\View\Factory; use Sylius\Component\Grid\Definition\Grid; use Sylius\Component\Grid\Parameters; diff --git a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameCollectionProvider.php b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameCollectionProvider.php index 020d7b3fb..1a47eedcc 100644 --- a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameCollectionProvider.php +++ b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameCollectionProvider.php @@ -13,9 +13,9 @@ namespace App\BoardGameBlog\Infrastructure\Sylius\State\Http\Provider; -use Sylius\Component\Resource\Grid\State\RequestGridProvider; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Resource\Context\Context; +use Sylius\Resource\Grid\State\RequestGridProvider; use Sylius\Resource\State\ProviderInterface; final class BoardGameCollectionProvider implements ProviderInterface From f6caa4b7c5b1f6630c1a8b824b253e88b3ef5ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= Date: Thu, 2 Nov 2023 14:57:59 +0100 Subject: [PATCH 2/2] Fix Phpspec tests --- .../{ => tests}/spec/Grid/State/RequestGridProviderSpec.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/Component/{ => tests}/spec/Grid/State/RequestGridProviderSpec.php (98%) diff --git a/src/Component/spec/Grid/State/RequestGridProviderSpec.php b/src/Component/tests/spec/Grid/State/RequestGridProviderSpec.php similarity index 98% rename from src/Component/spec/Grid/State/RequestGridProviderSpec.php rename to src/Component/tests/spec/Grid/State/RequestGridProviderSpec.php index 4c1339e99..5ac519c39 100644 --- a/src/Component/spec/Grid/State/RequestGridProviderSpec.php +++ b/src/Component/tests/spec/Grid/State/RequestGridProviderSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Resource\Grid\State; +namespace spec\Sylius\Resource\Grid\State; use Pagerfanta\Pagerfanta; use PhpSpec\ObjectBehavior;