refactor #778 Move some namespaces on Symfony expression language (lo…

…ic425) This PR was merged into the 1.11 branch. Discussion ---------- | Q | A | --------------- | ----- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | | License | MIT Once again, it has been introduced in 1.11 Commits ------- 7704ed5 Move some namespaces on Symfony expression language
Sylius · Nov 10, 2023 · 4faf1ad · 4faf1ad
2 parents e1dc2df + 7704ed5
commit 4faf1ad
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 32 deletions.
diff --git a/src/Bundle/Resources/config/services/expression_language.xml b/src/Bundle/Resources/config/services/expression_language.xml
@@ -17,42 +17,42 @@
         <service id="sylius.repository.expression_language" class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" />
         <service id="sylius.routing.expression_language" class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" />
 
-        <service id="sylius.expression_language.variables.token" class="Sylius\Component\Resource\Symfony\ExpressionLanguage\TokenVariables">
+        <service id="sylius.expression_language.variables.token" class="Sylius\Resource\Symfony\ExpressionLanguage\TokenVariables">
             <argument type="service" id="security.token_storage" on-invalid="null" />
             <tag name="sylius.resource_factory_variables" />
             <tag name="sylius.repository_variables" />
         </service>
 
-        <service id="sylius.expression_language.variables.request" class="Sylius\Component\Resource\Symfony\ExpressionLanguage\RequestVariables">
+        <service id="sylius.expression_language.variables.request" class="Sylius\Resource\Symfony\ExpressionLanguage\RequestVariables">
             <argument type="service" id="request_stack" />
             <tag name="sylius.resource_factory_variables" />
             <tag name="sylius.repository_variables" />
             <tag name="sylius.routing_variables" />
         </service>
 
-        <service id="sylius.expression_language.variables_collection.factory" class="Sylius\Component\Resource\Symfony\ExpressionLanguage\VariablesCollection">
+        <service id="sylius.expression_language.variables_collection.factory" class="Sylius\Resource\Symfony\ExpressionLanguage\VariablesCollection">
             <argument type="tagged_iterator" tag="sylius.resource_factory_variables" />
         </service>
 
-        <service id="sylius.expression_language.variables_collection.repository" class="Sylius\Component\Resource\Symfony\ExpressionLanguage\VariablesCollection">
+        <service id="sylius.expression_language.variables_collection.repository" class="Sylius\Resource\Symfony\ExpressionLanguage\VariablesCollection">
             <argument type="tagged_iterator" tag="sylius.repository_variables" />
         </service>
 
-        <service id="sylius.expression_language.variables_collection.routing" class="Sylius\Component\Resource\Symfony\ExpressionLanguage\VariablesCollection">
+        <service id="sylius.expression_language.variables_collection.routing" class="Sylius\Resource\Symfony\ExpressionLanguage\VariablesCollection">
             <argument type="tagged_iterator" tag="sylius.routing_variables" />
         </service>
 
-        <service id="sylius.expression_language.argument_parser.factory" class="Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParser">
+        <service id="sylius.expression_language.argument_parser.factory" class="Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParser">
             <argument type="service" id="sylius.resource_factory.expression_language" />
             <argument type="service" id="sylius.expression_language.variables_collection.factory"  />
         </service>
 
-        <service id="sylius.expression_language.argument_parser.repository" class="Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParser">
+        <service id="sylius.expression_language.argument_parser.repository" class="Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParser">
             <argument type="service" id="sylius.repository.expression_language" />
             <argument type="service" id="sylius.expression_language.variables_collection.repository"  />
         </service>
 
-        <service id="sylius.expression_language.argument_parser.routing" class="Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParser">
+        <service id="sylius.expression_language.argument_parser.routing" class="Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParser">
             <argument type="service" id="sylius.routing.expression_language" />
             <argument type="service" id="sylius.expression_language.variables_collection.routing"  />
         </service>

diff --git a/src/Component/Symfony/Request/State/Provider.php b/src/Component/Symfony/Request/State/Provider.php
@@ -16,14 +16,14 @@
 use Pagerfanta\Pagerfanta;
 use Psr\Container\ContainerInterface;
 use Sylius\Component\Resource\Reflection\CallableReflection;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Sylius\Component\Resource\Symfony\Request\RepositoryArgumentResolver;
 use Sylius\Resource\Context\Context;
 use Sylius\Resource\Context\Option\RequestOption;
 use Sylius\Resource\Metadata\BulkOperationInterface;
 use Sylius\Resource\Metadata\CollectionOperationInterface;
 use Sylius\Resource\Metadata\Operation;
 use Sylius\Resource\State\ProviderInterface;
+use Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 
 final class Provider implements ProviderInterface
 {

diff --git a/src/Component/Symfony/Routing/RedirectHandler.php b/src/Component/Symfony/Routing/RedirectHandler.php
@@ -13,12 +13,12 @@
 
 namespace Sylius\Component\Resource\Symfony\Routing;
 
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Sylius\Component\Resource\Symfony\Routing\Factory\OperationRouteNameFactoryInterface;
 use Sylius\Resource\Metadata\BulkOperationInterface;
 use Sylius\Resource\Metadata\DeleteOperationInterface;
 use Sylius\Resource\Metadata\HttpOperation;
 use Sylius\Resource\Metadata\ResourceMetadata;
+use Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\PropertyAccess\PropertyAccess;

diff --git a/src/Component/Tests/Symfony/ExpressionLanguage/ArgumentParserTest.php b/src/Component/Tests/Symfony/ExpressionLanguage/ArgumentParserTest.php
@@ -13,7 +13,7 @@
 
 namespace Sylius\Component\Resource\Tests\Symfony\ExpressionLanguage;
 
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
+use Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 final class ArgumentParserTest extends KernelTestCase

diff --git a/src/Component/spec/Symfony/Request/State/ProviderSpec.php b/src/Component/spec/Symfony/Request/State/ProviderSpec.php
@@ -17,14 +17,14 @@
 use PhpSpec\ObjectBehavior;
 use Psr\Container\ContainerInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Sylius\Component\Resource\Symfony\Request\RepositoryArgumentResolver;
 use Sylius\Component\Resource\Symfony\Request\State\Provider;
 use Sylius\Component\Resource\Tests\Dummy\RepositoryWithCallables;
 use Sylius\Resource\Context\Context;
 use Sylius\Resource\Context\Option\RequestOption;
 use Sylius\Resource\Metadata\Index;
 use Sylius\Resource\Metadata\Operation;
+use Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Component/spec/Symfony/Routing/RedirectHandlerSpec.php b/src/Component/spec/Symfony/Routing/RedirectHandlerSpec.php
@@ -15,13 +15,13 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Sylius\Component\Resource\Symfony\Routing\Factory\OperationRouteNameFactoryInterface;
 use Sylius\Component\Resource\Symfony\Routing\RedirectHandler;
 use Sylius\Resource\Metadata\BulkUpdate;
 use Sylius\Resource\Metadata\Create;
 use Sylius\Resource\Metadata\Delete;
 use Sylius\Resource\Metadata\ResourceMetadata;
+use Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouterInterface;
 

diff --git a/src/Component/src/State/Factory.php b/src/Component/src/State/Factory.php
@@ -15,10 +15,10 @@
 
 use Psr\Container\ContainerInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface as ResourceFactoryInterface;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Sylius\Resource\Context\Context;
 use Sylius\Resource\Metadata\FactoryAwareOperationInterface;
 use Sylius\Resource\Metadata\Operation;
+use Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Webmozart\Assert\Assert;
 
 final class Factory implements FactoryInterface

diff --git a/...ony/ExpressionLanguage/ArgumentParser.php → ...ony/ExpressionLanguage/ArgumentParser.php b/...ony/ExpressionLanguage/ArgumentParser.php → ...ony/ExpressionLanguage/ArgumentParser.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace Sylius\Resource\Symfony\ExpressionLanguage;
 
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 

diff --git a/...ssionLanguage/ArgumentParserInterface.php → ...ssionLanguage/ArgumentParserInterface.php b/...ssionLanguage/ArgumentParserInterface.php → ...ssionLanguage/ArgumentParserInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace Sylius\Resource\Symfony\ExpressionLanguage;
 
 interface ArgumentParserInterface
 {

diff --git a/...y/ExpressionLanguage/RequestVariables.php → ...y/ExpressionLanguage/RequestVariables.php b/...y/ExpressionLanguage/RequestVariables.php → ...y/ExpressionLanguage/RequestVariables.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace Sylius\Resource\Symfony\ExpressionLanguage;
 
 use Symfony\Component\HttpFoundation\RequestStack;
 

diff --git a/...ony/ExpressionLanguage/TokenVariables.php → ...ony/ExpressionLanguage/TokenVariables.php b/...ony/ExpressionLanguage/TokenVariables.php → ...ony/ExpressionLanguage/TokenVariables.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace Sylius\Resource\Symfony\ExpressionLanguage;
 
 use Symfony\Component\Security\Core\Authentication\Token\NullToken;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;

diff --git a/...xpressionLanguage/VariablesCollection.php → ...xpressionLanguage/VariablesCollection.php b/...xpressionLanguage/VariablesCollection.php → ...xpressionLanguage/VariablesCollection.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace Sylius\Resource\Symfony\ExpressionLanguage;
 
 use Webmozart\Assert\Assert;
 

diff --git a/...Language/VariablesCollectionInterface.php → ...Language/VariablesCollectionInterface.php b/...Language/VariablesCollectionInterface.php → ...Language/VariablesCollectionInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace Sylius\Resource\Symfony\ExpressionLanguage;
 
 interface VariablesCollectionInterface
 {

diff --git a/...ExpressionLanguage/VariablesInterface.php → ...ExpressionLanguage/VariablesInterface.php b/...ExpressionLanguage/VariablesInterface.php → ...ExpressionLanguage/VariablesInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace Sylius\Resource\Symfony\ExpressionLanguage;
 
 interface VariablesInterface
 {

diff --git a/src/Component/tests/spec/State/FactorySpec.php b/src/Component/tests/spec/State/FactorySpec.php
@@ -16,10 +16,10 @@
 use PhpSpec\ObjectBehavior;
 use Psr\Container\ContainerInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 use Sylius\Resource\Context\Context;
 use Sylius\Resource\Metadata\Create;
 use Sylius\Resource\State\Factory;
+use Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface;
 
 final class FactorySpec extends ObjectBehavior
 {

diff --git a/...ExpressionLanguage/ArgumentParserSpec.php → ...ExpressionLanguage/ArgumentParserSpec.php b/...ExpressionLanguage/ArgumentParserSpec.php → ...ExpressionLanguage/ArgumentParserSpec.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace spec\Sylius\Resource\Symfony\ExpressionLanguage;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParser;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\VariablesCollectionInterface;
+use Sylius\Resource\Symfony\ExpressionLanguage\ArgumentParser;
+use Sylius\Resource\Symfony\ExpressionLanguage\VariablesCollectionInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 
 final class ArgumentParserSpec extends ObjectBehavior

diff --git a/...pressionLanguage/RequestVariablesSpec.php → ...pressionLanguage/RequestVariablesSpec.php b/...pressionLanguage/RequestVariablesSpec.php → ...pressionLanguage/RequestVariablesSpec.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace spec\Sylius\Resource\Symfony\ExpressionLanguage;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\RequestVariables;
+use Sylius\Resource\Symfony\ExpressionLanguage\RequestVariables;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 

diff --git a/...ExpressionLanguage/TokenVariablesSpec.php → ...ExpressionLanguage/TokenVariablesSpec.php b/...ExpressionLanguage/TokenVariablesSpec.php → ...ExpressionLanguage/TokenVariablesSpec.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace spec\Sylius\Resource\Symfony\ExpressionLanguage;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\TokenVariables;
+use Sylius\Resource\Symfony\ExpressionLanguage\TokenVariables;
 use Symfony\Component\Security\Core\Authentication\Token\NullToken;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;

diff --git a/...ssionLanguage/VariablesCollectionSpec.php → ...ssionLanguage/VariablesCollectionSpec.php b/...ssionLanguage/VariablesCollectionSpec.php → ...ssionLanguage/VariablesCollectionSpec.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Component\Resource\Symfony\ExpressionLanguage;
+namespace spec\Sylius\Resource\Symfony\ExpressionLanguage;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\VariablesCollection;
-use Sylius\Component\Resource\Symfony\ExpressionLanguage\VariablesInterface;
+use Sylius\Resource\Symfony\ExpressionLanguage\VariablesCollection;
+use Sylius\Resource\Symfony\ExpressionLanguage\VariablesInterface;
 
 final class VariablesCollectionSpec extends ObjectBehavior
 {