Skip to content

Commit 56ae544

Browse files
nicolas-grekasnicolas-grekas
committed
[Framework+SecurityBundle] remove recently introduced *.class parameters
1 parent 966c586 commit 56ae544

File tree

6 files changed

+12
-29
lines changed

6 files changed

+12
-29
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<parameter key="data_collector.router.class">Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector</parameter>
1616
<parameter key="data_collector.form.class">Symfony\Component\Form\Extension\DataCollector\FormDataCollector</parameter>
1717
<parameter key="data_collector.form.extractor.class">Symfony\Component\Form\Extension\DataCollector\FormDataExtractor</parameter>
18-
<parameter key="data_collector.ajax.class">Symfony\Bundle\FrameworkBundle\DataCollector\AjaxDataCollector</parameter>
1918
</parameters>
2019

2120
<services>
@@ -29,7 +28,7 @@
2928
<tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="255" />
3029
</service>
3130

32-
<service id="data_collector.ajax" class="%data_collector.ajax.class%" public="false">
31+
<service id="data_collector.ajax" class="Symfony\Bundle\FrameworkBundle\DataCollector\AjaxDataCollector" public="false">
3332
<tag name="data_collector" template="@WebProfiler/Collector/ajax.html.twig" id="ajax" priority="255" />
3433
</service>
3534

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<parameter key="fragment.renderer.hinclude.class">Symfony\Bundle\FrameworkBundle\Fragment\ContainerAwareHIncludeFragmentRenderer</parameter>
1111
<parameter key="fragment.renderer.hinclude.global_template"></parameter>
1212
<parameter key="fragment.renderer.esi.class">Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer</parameter>
13-
<parameter key="fragment.renderer.ssi.class">Symfony\Component\HttpKernel\Fragment\SsiFragmentRenderer</parameter>
1413
<parameter key="fragment.path">/_fragment</parameter>
1514
</parameters>
1615

@@ -44,7 +43,7 @@
4443
<call method="setFragmentPath"><argument>%fragment.path%</argument></call>
4544
</service>
4645

47-
<service id="fragment.renderer.ssi" class="%fragment.renderer.ssi.class%">
46+
<service id="fragment.renderer.ssi" class="Symfony\Component\HttpKernel\Fragment\SsiFragmentRenderer">
4847
<tag name="kernel.fragment_renderer" />
4948
<argument type="service" id="ssi" on-invalid="null" />
5049
<argument type="service" id="fragment.renderer.inline" />

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/ssi.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,10 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7-
<parameters>
8-
<parameter key="ssi.class">Symfony\Component\HttpKernel\HttpCache\Ssi</parameter>
9-
<parameter key="ssi_listener.class">Symfony\Component\HttpKernel\EventListener\SurrogateListener</parameter>
10-
</parameters>
11-
127
<services>
13-
<service id="ssi" class="%ssi.class%" />
8+
<service id="ssi" class="Symfony\Component\HttpKernel\HttpCache\Ssi" />
149

15-
<service id="ssi_listener" class="%ssi_listener.class%">
10+
<service id="ssi_listener" class="Symfony\Component\HttpKernel\EventListener\SurrogateListener">
1611
<tag name="kernel.event_subscriber" />
1712
<argument type="service" id="ssi" on-invalid="ignore" />
1813
</service>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<parameters>
88
<parameter key="translator.class">Symfony\Bundle\FrameworkBundle\Translation\Translator</parameter>
9-
<parameter key="translator.logging.class">Symfony\Component\Translation\LoggingTranslator</parameter>
109
<parameter key="translator.identity.class">Symfony\Component\Translation\IdentityTranslator</parameter>
1110
<parameter key="translator.selector.class">Symfony\Component\Translation\MessageSelector</parameter>
1211
<parameter key="translation.loader.php.class">Symfony\Component\Translation\Loader\PhpFileLoader</parameter>
@@ -47,7 +46,7 @@
4746
</argument>
4847
</service>
4948

50-
<service id="translator.logging" class="%translator.logging.class%" public="false">
49+
<service id="translator.logging" class="Symfony\Component\Translation\LoggingTranslator" public="false">
5150
<argument type="service" id="translator.logging.inner" />
5251
<argument type="service" id="logger" />
5352
<tag name="monolog.logger" channel="translation" />

‎src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66

77
<parameters>
88
<parameter key="security.context.class">Symfony\Component\Security\Core\SecurityContext</parameter>
9-
<parameter key="security.authorization_checker.class">Symfony\Component\Security\Core\Authorization\AuthorizationChecker</parameter>
10-
<parameter key="security.token_storage.class">Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage</parameter>
119

1210
<parameter key="security.user_checker.class">Symfony\Component\Security\Core\User\UserChecker</parameter>
1311

1412
<parameter key="security.encoder_factory.generic.class">Symfony\Component\Security\Core\Encoder\EncoderFactory</parameter>
15-
<parameter key="security.user_password_encoder.generic.class">Symfony\Component\Security\Core\Encoder\UserPasswordEncoder</parameter>
1613
<parameter key="security.encoder.digest.class">Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder</parameter>
1714
<parameter key="security.encoder.plain.class">Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder</parameter>
1815
<parameter key="security.encoder.pbkdf2.class">Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder</parameter>
@@ -50,8 +47,6 @@
5047
<parameter key="security.validator.user_password.class">Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator</parameter>
5148

5249
<parameter key="security.expression_language.class">Symfony\Component\Security\Core\Authorization\ExpressionLanguage</parameter>
53-
54-
<parameter key="security.authentication_utils.class">Symfony\Component\Security\Http\Authentication\AuthenticationUtils</parameter>
5550
</parameters>
5651

5752
<services>
@@ -60,14 +55,14 @@
6055
<argument type="service" id="security.authorization_checker" />
6156
</service>
6257

63-
<service id="security.authorization_checker" class="%security.authorization_checker.class%">
58+
<service id="security.authorization_checker" class="Symfony\Component\Security\Core\Authorization\AuthorizationChecker">
6459
<argument type="service" id="security.token_storage" />
6560
<argument type="service" id="security.authentication.manager" />
6661
<argument type="service" id="security.access.decision_manager" />
6762
<argument>%security.access.always_authenticate_before_granting%</argument>
6863
</service>
6964

70-
<service id="security.token_storage" class="%security.token_storage.class%" />
65+
<service id="security.token_storage" class="Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage" />
7166

7267
<!-- Authentication related services -->
7368
<service id="security.authentication.manager" class="%security.authentication.manager.class%" public="false">
@@ -93,7 +88,7 @@
9388

9489
<service id="security.encoder_factory" alias="security.encoder_factory.generic"></service>
9590

96-
<service id="security.user_password_encoder.generic" class="%security.user_password_encoder.generic.class%" public="false">
91+
<service id="security.user_password_encoder.generic" class="Symfony\Component\Security\Core\Encoder\UserPasswordEncoder" public="false">
9792
<argument type="service" id="security.encoder_factory"></argument>
9893
</service>
9994

@@ -103,7 +98,7 @@
10398

10499
<service id="security.expression_language" class="%security.expression_language.class%" public="false" />
105100

106-
<service id="security.authentication_utils" class="%security.authentication_utils.class%">
101+
<service id="security.authentication_utils" class="Symfony\Component\Security\Http\Authentication\AuthenticationUtils">
107102
<argument type="service" id="request_stack" />
108103
</service>
109104

‎src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
<parameter key="security.authentication.listener.x509.class">Symfony\Component\Security\Http\Firewall\X509AuthenticationListener</parameter>
2626

27-
<parameter key="security.authentication.listener.remote_user.class">Symfony\Component\Security\Http\Firewall\RemoteUserAuthenticationListener</parameter>
28-
2927
<parameter key="security.authentication.listener.anonymous.class">Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener</parameter>
3028

3129
<parameter key="security.authentication.switchuser_listener.class">Symfony\Component\Security\Http\Firewall\SwitchUserListener</parameter>
@@ -48,8 +46,6 @@
4846

4947
<parameter key="security.authentication.success_handler.class">Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler</parameter>
5048
<parameter key="security.authentication.failure_handler.class">Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler</parameter>
51-
<parameter key="security.authentication.custom_success_handler.class">Symfony\Component\Security\Http\Authentication\CustomAuthenticationSuccessHandler</parameter>
52-
<parameter key="security.authentication.custom_failure_handler.class">Symfony\Component\Security\Http\Authentication\CustomAuthenticationFailureHandler</parameter>
5349
<parameter key="security.authentication.simple_success_failure_handler.class">Symfony\Component\Security\Http\Authentication\SimpleAuthenticationHandler</parameter>
5450
</parameters>
5551

@@ -125,7 +121,7 @@
125121
<argument type="service" id="event_dispatcher" on-invalid="null" />
126122
</service>
127123

128-
<service id="security.authentication.custom_success_handler" class="%security.authentication.custom_success_handler.class%" abstract="true" public="false">
124+
<service id="security.authentication.custom_success_handler" class="Symfony\Component\Security\Http\Authentication\CustomAuthenticationSuccessHandler" abstract="true" public="false">
129125
<argument /> <!-- The custom success handler service id -->
130126
<argument type="collection" /> <!-- Options -->
131127
<argument /> <!-- Provider-shared Key -->
@@ -136,7 +132,7 @@
136132
<argument type="collection" /> <!-- Options -->
137133
</service>
138134

139-
<service id="security.authentication.custom_failure_handler" class="%security.authentication.custom_failure_handler.class%" abstract="true" public="false">
135+
<service id="security.authentication.custom_failure_handler" class="Symfony\Component\Security\Http\Authentication\CustomAuthenticationFailureHandler" abstract="true" public="false">
140136
<argument /> <!-- The custom failure handler service id -->
141137
<argument type="collection" /> <!-- Options -->
142138
</service>
@@ -189,7 +185,7 @@
189185
<argument type="service" id="event_dispatcher" on-invalid="null"/>
190186
</service>
191187

192-
<service id="security.authentication.listener.remote_user" class="%security.authentication.listener.remote_user.class%" public="false" abstract="true">
188+
<service id="security.authentication.listener.remote_user" class="Symfony\Component\Security\Http\Firewall\RemoteUserAuthenticationListener" public="false" abstract="true">
193189
<tag name="monolog.logger" channel="security" />
194190
<argument type="service" id="security.context" />
195191
<argument type="service" id="security.authentication.manager" />

0 commit comments

Comments
 (0)