Skip to content

Commit 9f50383

Browse files
authored
refactor #895 Move some routing factories into 2 sub-directories (loic425)
This PR was merged into the 1.11 branch. Discussion ---------- | Q | A | --------------- | ----- | Bug fix? | no | New feature? | no | BC breaks? | no (it has been added to 1.11 only) | Deprecations? | no | Related tickets | | License | MIT To improve quality and future maintenance, I split the routing factories into 2 sub-directories. Commits ------- 65abcb6 Move some routing namespaces
2 parents 0b1fb39 + 65abcb6 commit 9f50383

27 files changed

+50
-49
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,56 +39,56 @@
3939
</service>
4040
<service id="Sylius\Bundle\ResourceBundle\Routing\RoutesAttributesLoader" alias="sylius.routing.loader.routes_attributes" public="false" />
4141

42-
<service id="sylius.routing.factory.operation_route_name_factory" class="Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactory" public="false" />
43-
<service id="Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactoryInterface" alias="sylius.routing.factory.operation_route_name_factory" />
42+
<service id="sylius.routing.factory.operation_route_name_factory" class="Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactory" public="false" />
43+
<service id="Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactoryInterface" alias="sylius.routing.factory.operation_route_name_factory" />
4444

45-
<service id="sylius.routing.factory.operation_route_path_factory.default" class="Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactory" public="false" />
45+
<service id="sylius.routing.factory.operation_route_path_factory.default" class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactory" public="false" />
4646

4747
<service id="sylius.routing.factory.operation_route_path_factory" alias="sylius.routing.factory.operation_route_path_factory.default" />
48-
<service id="Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactoryInterface" alias="sylius.routing.factory.operation_route_path_factory" />
48+
<service id="Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactoryInterface" alias="sylius.routing.factory.operation_route_path_factory" />
4949

5050
<service id="sylius.routing.factory.operation_route_path_factory.collection"
51-
class="Sylius\Resource\Symfony\Routing\Factory\CollectionOperationRoutePathFactory"
51+
class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\CollectionOperationRoutePathFactory"
5252
decorates="sylius.routing.factory.operation_route_path_factory.default"
5353
decoration-priority="60"
5454
>
5555
<argument type="service" id=".inner" />
5656
</service>
5757

5858
<service id="sylius.routing.factory.operation_route_path_factory.create"
59-
class="Sylius\Resource\Symfony\Routing\Factory\CreateOperationRoutePathFactory"
59+
class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\CreateOperationRoutePathFactory"
6060
decorates="sylius.routing.factory.operation_route_path_factory.default"
6161
decoration-priority="-50"
6262
>
6363
<argument type="service" id=".inner" />
6464
</service>
6565

6666
<service id="sylius.routing.factory.operation_route_path_factory.bulk_operation"
67-
class="Sylius\Resource\Symfony\Routing\Factory\BulkOperationRoutePathFactory"
67+
class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\BulkOperationRoutePathFactory"
6868
decorates="sylius.routing.factory.operation_route_path_factory.default"
6969
decoration-priority="-40"
7070
>
7171
<argument type="service" id=".inner" />
7272
</service>
7373

7474
<service id="sylius.routing.factory.operation_route_path_factory.update"
75-
class="Sylius\Resource\Symfony\Routing\Factory\UpdateOperationRoutePathFactory"
75+
class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\UpdateOperationRoutePathFactory"
7676
decorates="sylius.routing.factory.operation_route_path_factory.default"
7777
decoration-priority="-30"
7878
>
7979
<argument type="service" id=".inner" />
8080
</service>
8181

8282
<service id="sylius.routing.factory.operation_route_path_factory.delete"
83-
class="Sylius\Resource\Symfony\Routing\Factory\DeleteOperationRoutePathFactory"
83+
class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\DeleteOperationRoutePathFactory"
8484
decorates="sylius.routing.factory.operation_route_path_factory.default"
8585
decoration-priority="-20"
8686
>
8787
<argument type="service" id=".inner" />
8888
</service>
8989

9090
<service id="sylius.routing.factory.operation_route_path_factory.show"
91-
class="Sylius\Resource\Symfony\Routing\Factory\ShowOperationRoutePathFactory"
91+
class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\ShowOperationRoutePathFactory"
9292
decorates="sylius.routing.factory.operation_route_path_factory.default"
9393
decoration-priority="-10"
9494
>

src/Bundle/spec/Routing/AttributesOperationRouteFactorySpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
use Sylius\Resource\Metadata\Show;
2626
use Sylius\Resource\Metadata\Update;
2727
use Sylius\Resource\Symfony\Routing\Factory\OperationRouteFactory;
28-
use Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactory;
29-
use Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactoryInterface;
28+
use Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactory;
29+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactoryInterface;
3030
use Symfony\Component\Routing\RouteCollection;
3131
use Webmozart\Assert\Assert;
3232

src/Component/spec/Metadata/Resource/Factory/AttributesResourceMetadataCollectionFactorySpec.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
use Sylius\Resource\Metadata\Show;
4242
use Sylius\Resource\Metadata\Update;
4343
use Sylius\Resource\Symfony\Request\State\Responder;
44-
use Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactory;
44+
use Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactory;
4545

4646
final class AttributesResourceMetadataCollectionFactorySpec extends ObjectBehavior
4747
{

src/Component/spec/Metadata/Resource/Factory/RedirectResourceMetadataCollectionFactorySpec.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Sylius\Resource\Metadata\ResourceMetadata;
2525
use Sylius\Resource\Metadata\Show;
2626
use Sylius\Resource\Metadata\Update;
27-
use Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactory;
27+
use Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactory;
2828

2929
final class RedirectResourceMetadataCollectionFactorySpec extends ObjectBehavior
3030
{

src/Component/spec/Symfony/Routing/Factory/OperationRouteFactorySpec.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
use Sylius\Resource\Metadata\Show;
2727
use Sylius\Resource\Metadata\Update;
2828
use Sylius\Resource\Symfony\Routing\Factory\OperationRouteFactory;
29-
use Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactoryInterface;
29+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactoryInterface;
3030

3131
final class OperationRouteFactorySpec extends ObjectBehavior
3232
{

src/Component/spec/Symfony/Routing/Factory/OperationRouteNameFactorySpec.php renamed to src/Component/spec/Symfony/Routing/Factory/RouteName/OperationRouteNameFactorySpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace spec\Sylius\Resource\Symfony\Routing\Factory;
14+
namespace spec\Sylius\Resource\Symfony\Routing\Factory\RouteName;
1515

1616
use PhpSpec\ObjectBehavior;
1717
use Sylius\Resource\Metadata\Create;
1818
use Sylius\Resource\Metadata\ResourceMetadata;
19-
use Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactory;
19+
use Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactory;
2020

2121
final class OperationRouteNameFactorySpec extends ObjectBehavior
2222
{

src/Component/spec/Symfony/Routing/Factory/BulkOperationRoutePathFactorySpec.php renamed to src/Component/spec/Symfony/Routing/Factory/RoutePath/BulkOperationRoutePathFactorySpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace spec\Sylius\Resource\Symfony\Routing\Factory;
14+
namespace spec\Sylius\Resource\Symfony\Routing\Factory\RoutePath;
1515

1616
use PhpSpec\ObjectBehavior;
1717
use Sylius\Resource\Metadata\BulkDelete;
1818
use Sylius\Resource\Metadata\BulkUpdate;
19-
use Sylius\Resource\Symfony\Routing\Factory\BulkOperationRoutePathFactory;
20-
use Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactoryInterface;
19+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\BulkOperationRoutePathFactory;
20+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactoryInterface;
2121

2222
final class BulkOperationRoutePathFactorySpec extends ObjectBehavior
2323
{

src/Component/spec/Symfony/Routing/Factory/CollectionOperationRoutePathFactorySpec.php renamed to src/Component/spec/Symfony/Routing/Factory/RoutePath/CollectionOperationRoutePathFactorySpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace spec\Sylius\Resource\Symfony\Routing\Factory;
14+
namespace spec\Sylius\Resource\Symfony\Routing\Factory\RoutePath;
1515

1616
use PhpSpec\ObjectBehavior;
1717
use Sylius\Resource\Metadata\Api;
1818
use Sylius\Resource\Metadata\Index;
19-
use Sylius\Resource\Symfony\Routing\Factory\CollectionOperationRoutePathFactory;
20-
use Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactoryInterface;
19+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\CollectionOperationRoutePathFactory;
20+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactoryInterface;
2121

2222
final class CollectionOperationRoutePathFactorySpec extends ObjectBehavior
2323
{

src/Component/spec/Symfony/Routing/Factory/CreateOperationRoutePathFactorySpec.php renamed to src/Component/spec/Symfony/Routing/Factory/RoutePath/CreateOperationRoutePathFactorySpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace spec\Sylius\Resource\Symfony\Routing\Factory;
14+
namespace spec\Sylius\Resource\Symfony\Routing\Factory\RoutePath;
1515

1616
use PhpSpec\ObjectBehavior;
1717
use Sylius\Resource\Metadata\Api;
1818
use Sylius\Resource\Metadata\Create;
19-
use Sylius\Resource\Symfony\Routing\Factory\CreateOperationRoutePathFactory;
20-
use Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactoryInterface;
19+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\CreateOperationRoutePathFactory;
20+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactoryInterface;
2121

2222
final class CreateOperationRoutePathFactorySpec extends ObjectBehavior
2323
{

src/Component/spec/Symfony/Routing/Factory/DeleteOperationRoutePathFactorySpec.php renamed to src/Component/spec/Symfony/Routing/Factory/RoutePath/DeleteOperationRoutePathFactorySpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace spec\Sylius\Resource\Symfony\Routing\Factory;
14+
namespace spec\Sylius\Resource\Symfony\Routing\Factory\RoutePath;
1515

1616
use PhpSpec\ObjectBehavior;
1717
use Sylius\Resource\Metadata\Api;
1818
use Sylius\Resource\Metadata\Delete;
1919
use Sylius\Resource\Metadata\ResourceMetadata;
20-
use Sylius\Resource\Symfony\Routing\Factory\DeleteOperationRoutePathFactory;
21-
use Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactoryInterface;
20+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\DeleteOperationRoutePathFactory;
21+
use Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactoryInterface;
2222

2323
final class DeleteOperationRoutePathFactorySpec extends ObjectBehavior
2424
{

0 commit comments

Comments
 (0)