minor #14031 [2.3] [SecurityBundle] removed a duplicated service definition and simplified others. (hhamon)

This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [SecurityBundle] removed a duplicated service definition and simplified others.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Commits
-------

f24c8ab [SecurityBundle] removed a duplicated service definition and simplified others.

Author: fabpot

Resources/config/security.xml

@@ -71,17 +71,17 @@
         </service>
 
         <service id="security.encoder_factory.generic" class="%security.encoder_factory.generic.class%" public="false">
-            <argument type="collection"></argument>
+            <argument type="collection" />
         </service>
 
-        <service id="security.encoder_factory" alias="security.encoder_factory.generic"></service>
+        <service id="security.encoder_factory" alias="security.encoder_factory.generic" />
 
         <service id="security.user_checker" class="%security.user_checker.class%" public="false" />
 
 
         <!-- Authorization related services -->
         <service id="security.access.decision_manager" class="%security.access.decision_manager.class%" public="false">
-            <argument type="collection"></argument>
+            <argument type="collection" />
         </service>
 
         <service id="security.role_hierarchy" class="%security.role_hierarchy.class%" public="false">

Resources/config/security_acl.xml

@@ -13,13 +13,13 @@
         <parameter key="security.acl.object_identity_retrieval_strategy.class">Symfony\Component\Security\Acl\Domain\ObjectIdentityRetrievalStrategy</parameter>
         <parameter key="security.acl.security_identity_retrieval_strategy.class">Symfony\Component\Security\Acl\Domain\SecurityIdentityRetrievalStrategy</parameter>
 
-        <parameter key="security.acl.cache.doctrine.class">Symfony\Component\Security\Acl\Domain\DoctrineAclCache</parameter>
-
+        <!-- never used? -->
         <parameter key="security.acl.collection_cache.class">Symfony\Component\Security\Acl\Domain\AclCollectionCache</parameter>
+        <parameter key="security.acl.cache.doctrine.class">Symfony\Component\Security\Acl\Domain\DoctrineAclCache</parameter>
     </parameters>
 
     <services>
-        <service id="security.acl.object_identity_retrieval_strategy" class="%security.acl.object_identity_retrieval_strategy.class%" public="false"></service>
+        <service id="security.acl.object_identity_retrieval_strategy" class="%security.acl.object_identity_retrieval_strategy.class%" public="false" />
 
         <service id="security.acl.security_identity_retrieval_strategy" class="%security.acl.security_identity_retrieval_strategy.class%" public="false">
             <argument type="service" id="security.role_hierarchy" />
@@ -32,7 +32,7 @@
             </call>
         </service>
 
-        <service id="security.acl.permission.map" class="%security.acl.permission.map.class%" public="false"></service>
+        <service id="security.acl.permission.map" class="%security.acl.permission.map.class%" public="false" />
 
         <service id="security.acl.voter.basic_permissions" class="%security.acl.voter.class%" public="false">
             <tag name="monolog.logger" channel="security" />

Resources/config/security_acl_dbal.xml

@@ -48,7 +48,5 @@
         </service>
 
         <service id="security.acl.cache.doctrine.cache_impl" alias="doctrine.orm.default_result_cache" public="false" />
-
-        <service id="security.acl.permission.map" class="%security.acl.permission.map.class%" public="false"></service>
     </services>
 </container>

Resources/config/security_listeners.xml

@@ -76,7 +76,7 @@
         <service id="security.context_listener" class="%security.context_listener.class%" public="false">
             <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
-            <argument type="collection"></argument>
+            <argument type="collection" />
             <argument /> <!-- Provider Key -->
             <argument type="service" id="logger" on-invalid="null" />
             <argument type="service" id="event_dispatcher" on-invalid="null"/>
@@ -88,7 +88,9 @@
             <argument type="service" id="security.logout.success_handler" />
             <argument /> <!-- Options -->
         </service>
+
         <service id="security.logout.handler.session" class="%security.logout.handler.session.class%" public="false" />
+
         <service id="security.logout.handler.cookie_clearing" class="%security.logout.handler.cookie_clearing.class%" public="false" abstract="true" />
 
         <service id="security.logout.success_handler" class="%security.logout.success_handler.class%" public="false" abstract="true">
@@ -109,7 +111,7 @@
             <argument />
             <argument type="service" id="security.authentication.success_handler" />
             <argument type="service" id="security.authentication.failure_handler" />
-            <argument type="collection"></argument>
+            <argument type="collection" />
             <argument type="service" id="logger" on-invalid="null" />
             <argument type="service" id="event_dispatcher" on-invalid="null" />
         </service>
@@ -130,8 +132,7 @@
         <service id="security.authentication.listener.form"
                  class="%security.authentication.listener.form.class%"
                  parent="security.authentication.listener.abstract"
-                 abstract="true">
-        </service>
+                 abstract="true" />
 
         <service id="security.authentication.listener.x509" class="%security.authentication.listener.x509.class%" public="false" abstract="true">
             <tag name="monolog.logger" channel="security" />

Resources/config/security_rememberme.xml

@@ -30,7 +30,7 @@
             <argument type="service" id="security.user_checker" />
         </service>
 
-        <service id="security.rememberme.token.provider.in_memory" class="%security.rememberme.token.provider.in_memory.class%" public="false"></service>
+        <service id="security.rememberme.token.provider.in_memory" class="%security.rememberme.token.provider.in_memory.class%" public="false" />
 
         <service id="security.authentication.rememberme.services.abstract" abstract="true" public="false">
             <tag name="monolog.logger" channel="security" />
@@ -51,8 +51,7 @@
         <service id="security.authentication.rememberme.services.simplehash"
                  class="%security.authentication.rememberme.services.simplehash.class%"
                  parent="security.authentication.rememberme.services.abstract"
-                 abstract="true">
-        </service>
+                 abstract="true" />
 
         <service id="security.rememberme.response_listener" class="%security.rememberme.response_listener.class%">
             <tag name="kernel.event_subscriber" />