Skip to content

Commit 7064c8d

Browse files
loic425loic425
committed
Use ::class
1 parent 15e72fd commit 7064c8d

32 files changed

+441
-218
lines changed

‎src/Bundle/Resources/config/services.php‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,19 @@
1313

1414
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
1515

16+
use Sylius\Bundle\ResourceBundle\ExpressionLanguage\ExpressionLanguage as BundleExpressionLanguage;
17+
use Sylius\Bundle\ResourceBundle\ExpressionLanguage\ExpressionLanguage as BundleExpressionLanguageInterface;
18+
use Sylius\Bundle\ResourceBundle\Form\Extension\CollectionTypeExtension;
19+
use Sylius\Bundle\ResourceBundle\Form\Extension\CollectionTypeExtension as CollectionTypeExtensionInterface;
20+
use Sylius\Bundle\ResourceBundle\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
21+
use Sylius\Bundle\ResourceBundle\Form\Type\DefaultResourceType;
22+
use Sylius\Bundle\ResourceBundle\Form\Type\DefaultResourceType as DefaultResourceTypeInterface;
23+
use Sylius\Component\Registry\ServiceRegistry;
24+
use Sylius\Resource\Generator\RandomnessGenerator;
25+
use Sylius\Resource\Generator\RandomnessGeneratorInterface;
26+
use Sylius\Resource\Metadata\Registry;
27+
use Sylius\Resource\Metadata\RegistryInterface;
28+
1629
return static function (ContainerConfigurator $container) {
1730
$services = $container->services();
1831
$parameters = $container->parameters();
@@ -37,55 +50,55 @@
3750
$services->defaults()
3851
->public();
3952

40-
$services->set('sylius.random_generator', 'Sylius\Resource\Generator\RandomnessGenerator');
53+
$services->set('sylius.random_generator', RandomnessGenerator::class);
4154

42-
$services->alias('Sylius\Resource\Generator\RandomnessGeneratorInterface', 'sylius.random_generator');
55+
$services->alias(RandomnessGeneratorInterface::class, 'sylius.random_generator');
4356

44-
$services->alias('Sylius\Component\Resource\Generator\RandomnessGeneratorInterface', 'sylius.random_generator')
57+
$services->alias(\Sylius\Component\Resource\Generator\RandomnessGeneratorInterface::class, 'sylius.random_generator')
4558
->deprecate('sylius/resource-bundle', '1.11', 'The "%alias_id%" service alias is deprecated since sylius/resource-bundle 1.11 and will be removed in sylius/resource-bundle 2.0. Use Sylius\Resource\Generator\RandomnessGeneratorInterface instead.');
4659

47-
$services->set('sylius.form.type_extension.form.request_handler', 'Sylius\Bundle\ResourceBundle\Form\Extension\HttpFoundation\HttpFoundationRequestHandler')
60+
$services->set('sylius.form.type_extension.form.request_handler', HttpFoundationRequestHandler::class)
4861
->private()
4962
->decorate('form.type_extension.form.request_handler', null, 256);
5063

51-
$services->set('sylius.resource_registry', 'Sylius\Resource\Metadata\Registry')
64+
$services->set('sylius.resource_registry', Registry::class)
5265
->private();
5366

54-
$services->alias('Sylius\Resource\Metadata\RegistryInterface', 'sylius.resource_registry')
67+
$services->alias(RegistryInterface::class, 'sylius.resource_registry')
5568
->private();
5669

57-
$services->alias('Sylius\Component\Resource\Metadata\RegistryInterface', 'sylius.resource_registry')
70+
$services->alias(\Sylius\Component\Resource\Metadata\RegistryInterface::class, 'sylius.resource_registry')
5871
->private()
5972
->deprecate('sylius/resource-bundle', '1.11', 'The "%alias_id%" service alias is deprecated since sylius/resource-bundle 1.11 and will be removed in sylius/resource-bundle 2.0. Use Sylius\Resource\Metadata\RegistryInterface instead.');
6073

61-
$services->set('sylius.expression_language', 'Sylius\Bundle\ResourceBundle\ExpressionLanguage\ExpressionLanguage')
74+
$services->set('sylius.expression_language', BundleExpressionLanguage::class)
6275
->private();
6376

64-
$services->alias('Sylius\Bundle\ResourceBundle\ExpressionLanguage\ExpressionLanguage', 'sylius.expression_language')
77+
$services->alias(BundleExpressionLanguageInterface::class, 'sylius.expression_language')
6578
->private();
6679

67-
$services->set('sylius.form.extension.type.collection', 'Sylius\Bundle\ResourceBundle\Form\Extension\CollectionTypeExtension')
80+
$services->set('sylius.form.extension.type.collection', CollectionTypeExtension::class)
6881
->tag('form.type_extension', ['extended_type' => 'Symfony\Component\Form\Extension\Core\Type\CollectionType']);
6982

70-
$services->alias('Sylius\Bundle\ResourceBundle\Form\Extension\CollectionTypeExtension', 'sylius.form.extension.type.collection');
83+
$services->alias(CollectionTypeExtensionInterface::class, 'sylius.form.extension.type.collection');
7184

72-
$services->set('sylius.form.type.default', 'Sylius\Bundle\ResourceBundle\Form\Type\DefaultResourceType')
85+
$services->set('sylius.form.type.default', DefaultResourceType::class)
7386
->args([
7487
service('sylius.resource_registry'),
7588
service('sylius.registry.form_builder'),
7689
])
7790
->tag('form.type');
7891

79-
$services->alias('Sylius\Bundle\ResourceBundle\Form\Type\DefaultResourceType', 'sylius.form.type.default');
92+
$services->alias(DefaultResourceTypeInterface::class, 'sylius.form.type.default');
8093

81-
$services->set('sylius.registry.resource_repository', 'Sylius\Component\Registry\ServiceRegistry')
94+
$services->set('sylius.registry.resource_repository', ServiceRegistry::class)
8295
->private()
8396
->args([
8497
'Doctrine\Persistence\ObjectRepository',
8598
'resource repository',
8699
]);
87100

88-
$services->set('sylius.registry.form_builder', 'Sylius\Component\Registry\ServiceRegistry')
101+
$services->set('sylius.registry.form_builder', ServiceRegistry::class)
89102
->private()
90103
->args([
91104
'Sylius\Bundle\ResourceBundle\Form\Builder\DefaultFormBuilderInterface',

‎src/Bundle/Resources/config/services/console.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,21 @@
1313

1414
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
1515

16+
use Sylius\Bundle\ResourceBundle\Command\DebugResourceCommand;
17+
1618
return static function (ContainerConfigurator $container) {
1719
$services = $container->services();
1820
$parameters = $container->parameters();
1921

2022
$services->defaults()
2123
->public();
2224

23-
$services->set('sylius.console.command.resource_debug', 'Sylius\Bundle\ResourceBundle\Command\DebugResourceCommand')
25+
$services->set('sylius.console.command.resource_debug', DebugResourceCommand::class)
2426
->args([
2527
service('sylius.resource_registry'),
2628
service('sylius.resource_metadata_collection.factory'),
2729
])
2830
->tag('console.command');
2931

30-
$services->alias('Sylius\Bundle\ResourceBundle\Command\DebugResourceCommand', 'sylius.console.command.resource_debug');
32+
$services->alias(DebugResourceCommand::class, 'sylius.console.command.resource_debug');
3133
};

‎src/Bundle/Resources/config/services/context.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,19 @@
1313

1414
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
1515

16+
use Sylius\Bundle\ResourceBundle\Context\Initiator\LegacyRequestContextInitiator;
17+
use Sylius\Resource\Context\Initiator\RequestContextInitiator;
18+
use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface;
19+
1620
return static function (ContainerConfigurator $container) {
1721
$services = $container->services();
1822
$parameters = $container->parameters();
1923

20-
$services->set('sylius.context.initiator.request_context', 'Sylius\Resource\Context\Initiator\RequestContextInitiator');
24+
$services->set('sylius.context.initiator.request_context', RequestContextInitiator::class);
2125

22-
$services->alias('Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface', 'sylius.context.initiator.request_context');
26+
$services->alias(RequestContextInitiatorInterface::class, 'sylius.context.initiator.request_context');
2327

24-
$services->set('sylius.context.initiator.legacy_request_context', 'Sylius\Bundle\ResourceBundle\Context\Initiator\LegacyRequestContextInitiator')
28+
$services->set('sylius.context.initiator.legacy_request_context', LegacyRequestContextInitiator::class)
2529
->decorate('sylius.context.initiator.request_context')
2630
->args([
2731
service('sylius.resource_registry'),

‎src/Bundle/Resources/config/services/controller.php‎

Lines changed: 63 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,45 @@
1313

1414
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
1515

16+
use Hateoas\Representation\Factory\PagerfantaFactory;
17+
use Sylius\Bundle\ResourceBundle\Controller\DisabledAuthorizationChecker;
18+
use Sylius\Bundle\ResourceBundle\Controller\EventDispatcher;
19+
use Sylius\Bundle\ResourceBundle\Controller\EventDispatcherInterface;
20+
use Sylius\Bundle\ResourceBundle\Controller\FlashHelper;
21+
use Sylius\Bundle\ResourceBundle\Controller\FlashHelperInterface;
22+
use Sylius\Bundle\ResourceBundle\Controller\NewResourceFactory;
23+
use Sylius\Bundle\ResourceBundle\Controller\NewResourceFactoryInterface;
24+
use Sylius\Bundle\ResourceBundle\Controller\ParametersParser;
25+
use Sylius\Bundle\ResourceBundle\Controller\ParametersParserInterface;
26+
use Sylius\Bundle\ResourceBundle\Controller\RedirectHandler;
27+
use Sylius\Bundle\ResourceBundle\Controller\RedirectHandlerInterface;
28+
use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
29+
use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactory;
30+
use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactoryInterface;
31+
use Sylius\Bundle\ResourceBundle\Controller\ResourceDeleteHandler;
32+
use Sylius\Bundle\ResourceBundle\Controller\ResourceDeleteHandlerInterface;
33+
use Sylius\Bundle\ResourceBundle\Controller\ResourceFormFactory;
34+
use Sylius\Bundle\ResourceBundle\Controller\ResourceFormFactoryInterface;
35+
use Sylius\Bundle\ResourceBundle\Controller\ResourcesCollectionProvider;
36+
use Sylius\Bundle\ResourceBundle\Controller\ResourcesCollectionProviderInterface;
37+
use Sylius\Bundle\ResourceBundle\Controller\ResourcesResolver;
38+
use Sylius\Bundle\ResourceBundle\Controller\ResourcesResolverInterface;
39+
use Sylius\Bundle\ResourceBundle\Controller\ResourceUpdateHandler;
40+
use Sylius\Bundle\ResourceBundle\Controller\ResourceUpdateHandlerInterface;
41+
use Sylius\Bundle\ResourceBundle\Controller\SingleResourceProvider;
42+
use Sylius\Bundle\ResourceBundle\Controller\SingleResourceProviderInterface;
43+
use Sylius\Bundle\ResourceBundle\Controller\ViewHandler;
44+
use Sylius\Bundle\ResourceBundle\Controller\ViewHandlerInterface;
45+
use Sylius\Resource\Symfony\Controller\MainController;
46+
1647
return static function (ContainerConfigurator $container) {
1748
$services = $container->services();
1849
$parameters = $container->parameters();
1950

2051
$services->defaults()
2152
->public();
2253

23-
$services->set('sylius.main_controller', 'Sylius\Resource\Symfony\Controller\MainController')
54+
$services->set('sylius.main_controller', MainController::class)
2455
->private()
2556
->args([
2657
service('sylius.resource_metadata_operation.initiator.http_operation'),
@@ -30,116 +61,116 @@
3061
])
3162
->tag('controller.service_arguments');
3263

33-
$services->set('sylius.resource_controller.parameters_parser', 'Sylius\Bundle\ResourceBundle\Controller\ParametersParser')
64+
$services->set('sylius.resource_controller.parameters_parser', ParametersParser::class)
3465
->private()
3566
->args([
3667
service('service_container'),
3768
service('sylius.expression_language'),
3869
]);
3970

40-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\ParametersParserInterface', 'sylius.resource_controller.parameters_parser')
71+
$services->alias(ParametersParserInterface::class, 'sylius.resource_controller.parameters_parser')
4172
->private();
4273

43-
$services->set('sylius.resource_controller.request_configuration_factory', 'Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactory')
74+
$services->set('sylius.resource_controller.request_configuration_factory', RequestConfigurationFactory::class)
4475
->private()
4576
->args([
4677
service('sylius.resource_controller.parameters_parser'),
47-
'Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration',
78+
RequestConfiguration::class,
4879
'%sylius.resource.settings%',
4980
]);
5081

51-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactoryInterface', 'sylius.resource_controller.request_configuration_factory')
82+
$services->alias(RequestConfigurationFactoryInterface::class, 'sylius.resource_controller.request_configuration_factory')
5283
->private();
5384

54-
$services->set('sylius.resource_controller.new_resource_factory', 'Sylius\Bundle\ResourceBundle\Controller\NewResourceFactory')
85+
$services->set('sylius.resource_controller.new_resource_factory', NewResourceFactory::class)
5586
->private();
5687

57-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\NewResourceFactoryInterface', 'sylius.resource_controller.new_resource_factory')
88+
$services->alias(NewResourceFactoryInterface::class, 'sylius.resource_controller.new_resource_factory')
5889
->private();
5990

60-
$services->set('sylius.resource_controller.single_resource_provider', 'Sylius\Bundle\ResourceBundle\Controller\SingleResourceProvider')
91+
$services->set('sylius.resource_controller.single_resource_provider', SingleResourceProvider::class)
6192
->private();
6293

63-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\SingleResourceProviderInterface', 'sylius.resource_controller.single_resource_provider')
94+
$services->alias(SingleResourceProviderInterface::class, 'sylius.resource_controller.single_resource_provider')
6495
->private();
6596

66-
$services->set('sylius.resource_controller.pagerfanta_representation_factory', 'Hateoas\Representation\Factory\PagerfantaFactory')
97+
$services->set('sylius.resource_controller.pagerfanta_representation_factory', PagerfantaFactory::class)
6798
->private();
6899

69-
$services->alias('Hateoas\Representation\Factory\PagerfantaFactory', 'sylius.resource_controller.pagerfanta_representation_factory')
100+
$services->alias(PagerfantaFactory::class, 'sylius.resource_controller.pagerfanta_representation_factory')
70101
->private();
71102

72-
$services->set('sylius.resource_controller.resources_resolver', 'Sylius\Bundle\ResourceBundle\Controller\ResourcesResolver')
103+
$services->set('sylius.resource_controller.resources_resolver', ResourcesResolver::class)
73104
->private();
74105

75-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\ResourcesResolverInterface', 'sylius.resource_controller.resources_resolver')
106+
$services->alias(ResourcesResolverInterface::class, 'sylius.resource_controller.resources_resolver')
76107
->private();
77108

78-
$services->set('sylius.resource_controller.resources_collection_provider', 'Sylius\Bundle\ResourceBundle\Controller\ResourcesCollectionProvider')
109+
$services->set('sylius.resource_controller.resources_collection_provider', ResourcesCollectionProvider::class)
79110
->private()
80111
->args([
81112
service('sylius.resource_controller.resources_resolver'),
82113
service('sylius.resource_controller.pagerfanta_representation_factory')->nullOnInvalid(),
83114
]);
84115

85-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\ResourcesCollectionProviderInterface', 'sylius.resource_controller.resources_collection_provider')
116+
$services->alias(ResourcesCollectionProviderInterface::class, 'sylius.resource_controller.resources_collection_provider')
86117
->private();
87118

88-
$services->set('sylius.resource_controller.form_factory', 'Sylius\Bundle\ResourceBundle\Controller\ResourceFormFactory')
119+
$services->set('sylius.resource_controller.form_factory', ResourceFormFactory::class)
89120
->private()
90121
->args([service('form.factory')]);
91122

92-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\ResourceFormFactoryInterface', 'sylius.resource_controller.form_factory')
123+
$services->alias(ResourceFormFactoryInterface::class, 'sylius.resource_controller.form_factory')
93124
->private();
94125

95-
$services->set('sylius.resource_controller.redirect_handler', 'Sylius\Bundle\ResourceBundle\Controller\RedirectHandler')
126+
$services->set('sylius.resource_controller.redirect_handler', RedirectHandler::class)
96127
->private()
97128
->args([service('router')]);
98129

99-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\RedirectHandlerInterface', 'sylius.resource_controller.redirect_handler')
130+
$services->alias(RedirectHandlerInterface::class, 'sylius.resource_controller.redirect_handler')
100131
->private();
101132

102-
$services->set('sylius.resource_controller.authorization_checker.disabled', 'Sylius\Bundle\ResourceBundle\Controller\DisabledAuthorizationChecker')
133+
$services->set('sylius.resource_controller.authorization_checker.disabled', DisabledAuthorizationChecker::class)
103134
->private();
104135

105-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\DisabledAuthorizationChecker', 'sylius.resource_controller.authorization_checker.disabled')
136+
$services->alias(DisabledAuthorizationChecker::class, 'sylius.resource_controller.authorization_checker.disabled')
106137
->private();
107138

108-
$services->set('sylius.resource_controller.flash_helper', 'Sylius\Bundle\ResourceBundle\Controller\FlashHelper')
139+
$services->set('sylius.resource_controller.flash_helper', FlashHelper::class)
109140
->private()
110141
->args([
111142
service('request_stack'),
112143
service('translator'),
113144
'%locale%',
114145
]);
115146

116-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\FlashHelperInterface', 'sylius.resource_controller.flash_helper')
147+
$services->alias(FlashHelperInterface::class, 'sylius.resource_controller.flash_helper')
117148
->private();
118149

119-
$services->set('sylius.resource_controller.event_dispatcher', 'Sylius\Bundle\ResourceBundle\Controller\EventDispatcher')
150+
$services->set('sylius.resource_controller.event_dispatcher', EventDispatcher::class)
120151
->private()
121152
->args([service('event_dispatcher')]);
122153

123-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\EventDispatcherInterface', 'sylius.resource_controller.event_dispatcher')
154+
$services->alias(EventDispatcherInterface::class, 'sylius.resource_controller.event_dispatcher')
124155
->private();
125156

126-
$services->set('sylius.resource_controller.view_handler', 'Sylius\Bundle\ResourceBundle\Controller\ViewHandler')
157+
$services->set('sylius.resource_controller.view_handler', ViewHandler::class)
127158
->private()
128159
->args([service('fos_rest.view_handler')]);
129160

130-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\ViewHandlerInterface', 'sylius.resource_controller.view_handler')
161+
$services->alias(ViewHandlerInterface::class, 'sylius.resource_controller.view_handler')
131162
->private();
132163

133-
$services->set('sylius.resource_controller.resource_update_handler', 'Sylius\Bundle\ResourceBundle\Controller\ResourceUpdateHandler')
164+
$services->set('sylius.resource_controller.resource_update_handler', ResourceUpdateHandler::class)
134165
->private()
135166
->args([service('sylius.resource_controller.state_machine')->nullOnInvalid()]);
136167

137-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\ResourceUpdateHandlerInterface', 'sylius.resource_controller.resource_update_handler')
168+
$services->alias(ResourceUpdateHandlerInterface::class, 'sylius.resource_controller.resource_update_handler')
138169
->private();
139170

140-
$services->set('sylius.resource_controller.resource_delete_handler', 'Sylius\Bundle\ResourceBundle\Controller\ResourceDeleteHandler')
171+
$services->set('sylius.resource_controller.resource_delete_handler', ResourceDeleteHandler::class)
141172
->private();
142173

143-
$services->alias('Sylius\Bundle\ResourceBundle\Controller\ResourceDeleteHandlerInterface', 'sylius.resource_controller.resource_delete_handler')
174+
$services->alias(ResourceDeleteHandlerInterface::class, 'sylius.resource_controller.resource_delete_handler')
144175
->private();
145176
};

0 commit comments

Comments
 (0)