simplified the Prng code

symfony · Oct 28, 2012 · c0c8972 · c0c8972
1 parent e5dc7af
commit c0c8972
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 319 deletions.
diff --git a/src/Symfony/Bridge/Doctrine/Security/DoctrineSeedProvider.php b/src/Symfony/Bridge/Doctrine/Security/DoctrineSeedProvider.php
diff --git a/src/Symfony/Bridge/Doctrine/Security/EventListener/PrngSchemaListener.php b/src/Symfony/Bridge/Doctrine/Security/EventListener/PrngSchemaListener.php
diff --git a/src/Symfony/Bridge/Doctrine/Security/PrngSchema.php b/src/Symfony/Bridge/Doctrine/Security/PrngSchema.php
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Security/DoctrineSeedProviderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Security/DoctrineSeedProviderTest.php
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitPrngCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitPrngCommand.php
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -87,7 +87,6 @@ private function addAclSection(ArrayNodeDefinition $rootNode)
     {
         $rootNode
             ->children()
-                ->scalarNode('prng_seed_provider')->defaultNull()->end()
                 ->arrayNode('acl')
                     ->children()
                         ->scalarNode('connection')

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -88,10 +88,6 @@ public function load(array $configs, ContainerBuilder $container)
             $this->aclLoad($config['acl'], $container);
         }
 
-        if (null !== $config['prng_seed_provider']) {
-            $container->setAlias('security.prng_seed_provider', $config['prng_seed_provider']);
-        }
-
         // add some required classes for compilation
         $this->addClassesToCompile(array(
             'Symfony\\Component\\Security\\Http\\Firewall',

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -142,7 +142,7 @@
         <!-- Pseudorandom Number Generator -->
         <service id="security.prng" class="Symfony\Component\Security\Core\Util\Prng">
             <tag name="monolog.logger" channel="security" />
-            <argument type="service" id="security.prng_seed_provider" on-invalid="ignore" />
+            <argument>%kernel.cache_dir%/prng.seed</argument>
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
     </services>

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
@@ -2,7 +2,6 @@
 
 $container->loadFromExtension('security', array(
     'acl' => array(),
-    'prng_seed_provider' => 'custom_seed_provider',
     'encoders' => array(
         'JMS\FooBundle\Entity\User1' => 'plaintext',
         'JMS\FooBundle\Entity\User2' => array(

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -5,7 +5,7 @@
     xmlns:srv="http://symfony.com/schema/dic/services"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-    <config prng-seed-provider="custom_seed_provider">
+    <config>
         <acl />
 
         <encoder class="JMS\FooBundle\Entity\User1" algorithm="plaintext" />

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
@@ -1,6 +1,5 @@
 security:
     acl: ~
-    prng_seed_provider: custom_seed_provider
     encoders:
         JMS\FooBundle\Entity\User1: plaintext
         JMS\FooBundle\Entity\User2:

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -168,13 +168,6 @@ public function testCustomAclProvider()
         $this->assertEquals('foo', (string) $container->getAlias('security.acl.provider'));
     }
 
-    public function testSeedProvider()
-    {
-        $container = $this->getContainer('container1');
-
-        $this->assertEquals('custom_seed_provider', (string) $container->getAlias('security.prng_seed_provider'));
-    }
-
     protected function getContainer($file)
     {
         $container = new ContainerBuilder();