Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move some namespaces on Symfony expression language #778

Merged
merged 1 commit into from
Nov 10, 2023
Merged

Move some namespaces on Symfony expression language #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/Bundle/Resources/config/services/expression_language.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Component/Symfony/Request/State/Provider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/Component/Symfony/Routing/RedirectHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Component/Tests/Symfony/ExpressionLanguage/ArgumentParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Component/spec/Symfony/Request/State/ProviderSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Component/spec/Symfony/Routing/RedirectHandlerSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Component/src/State/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ony/ExpressionLanguage/ArgumentParser.php → ...ony/ExpressionLanguage/ArgumentParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
namespace Sylius\Resource\Symfony\ExpressionLanguage;

use Symfony\Component\ExpressionLanguage\ExpressionLanguage;

Expand Down
2 changes: 1 addition & 1 deletion ...ssionLanguage/ArgumentParserInterface.php → ...ssionLanguage/ArgumentParserInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
namespace Sylius\Resource\Symfony\ExpressionLanguage;

interface ArgumentParserInterface
{
Expand Down
2 changes: 1 addition & 1 deletion ...y/ExpressionLanguage/RequestVariables.php → ...y/ExpressionLanguage/RequestVariables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
namespace Sylius\Resource\Symfony\ExpressionLanguage;

use Symfony\Component\HttpFoundation\RequestStack;

Expand Down
2 changes: 1 addition & 1 deletion ...ony/ExpressionLanguage/TokenVariables.php → ...ony/ExpressionLanguage/TokenVariables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...xpressionLanguage/VariablesCollection.php → ...xpressionLanguage/VariablesCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
namespace Sylius\Resource\Symfony\ExpressionLanguage;

use Webmozart\Assert\Assert;

Expand Down
2 changes: 1 addition & 1 deletion ...Language/VariablesCollectionInterface.php → ...Language/VariablesCollectionInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
namespace Sylius\Resource\Symfony\ExpressionLanguage;

interface VariablesCollectionInterface
{
Expand Down
2 changes: 1 addition & 1 deletion ...ExpressionLanguage/VariablesInterface.php → ...ExpressionLanguage/VariablesInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Sylius\Component\Resource\Symfony\ExpressionLanguage;
namespace Sylius\Resource\Symfony\ExpressionLanguage;

interface VariablesInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/Component/tests/spec/State/FactorySpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions ...ExpressionLanguage/ArgumentParserSpec.php → ...ExpressionLanguage/ArgumentParserSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...pressionLanguage/RequestVariablesSpec.php → ...pressionLanguage/RequestVariablesSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...ExpressionLanguage/TokenVariablesSpec.php → ...ExpressionLanguage/TokenVariablesSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ssionLanguage/VariablesCollectionSpec.php → ...ssionLanguage/VariablesCollectionSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Loading