فهرست منبع

[Security] re-added some parameters

Johannes Schmitt 14 سال پیش
والد
کامیت
5a4ffcd8b6

+ 5 - 10
src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

@@ -119,16 +119,11 @@ class SecurityExtension extends Extension
         }
         $container->getDefinition('security.acl.cache.doctrine')->addArgument($config['cache']['prefix']);
 
-        $container
-            ->getDefinition('security.acl.dbal.provider')
-            ->setArgument(2, array(
-                'class_table_name' => $config['tables']['class'],
-                'entry_table_name' => $config['tables']['entry'],
-                'oid_table_name'   => $config['tables']['object_identity'],
-                'oid_ancestors_table_name' => $config['tables']['object_identity_ancestors'],
-                'sid_table_name' => $config['tables']['security_identity'],
-            ))
-        ;
+        $container->setParameter('security.acl.dbal.class_table_name', $config['tables']['class']);
+        $container->setParameter('security.acl.dbal.entry_table_name', $config['tables']['entry']);
+        $container->setParameter('security.acl.dbal.oid_table_name', $config['tables']['object_identity']);
+        $container->setParameter('security.acl.dbal.oid_ancestors_table_name', $config['tables']['object_identity_ancestors']);
+        $container->setParameter('security.acl.dbal.sid_table_name', $config['tables']['security_identity']);
 
         $container->getDefinition('security.acl.voter.basic_permissions')->addArgument($config['voter']['allow_if_object_identity_unavailable']);
     }

+ 7 - 1
src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml

@@ -33,7 +33,13 @@
         <service id="security.acl.dbal.provider" class="%security.acl.dbal.provider.class%" public="false">
             <argument type="service" id="security.acl.dbal.connection" />
             <argument type="service" id="security.acl.permission_granting_strategy" />
-            <argument /> <!-- Table collection -->
+            <argument type="collection">
+                <argument key="class_table_name">%security.acl.dbal.class_table_name%</argument>
+                <argument key="entry_table_name">%security.acl.dbal.entry_table_name%</argument>
+                <argument key="oid_table_name">%security.acl.dbal.oid_table_name%</argument>
+                <argument key="oid_ancestors_table_name">%security.acl.dbal.oid_ancestors_table_name%</argument>
+                <argument key="sid_table_name">%security.acl.dbal.sid_table_name%</argument>
+            </argument>
             <argument type="service" id="security.acl.cache" on-invalid="null" />
         </service>