Selaa lähdekoodia

merged origin/master

Fabien Potencier 14 vuotta sitten
vanhempi
commit
c8f9904ac8

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml

@@ -26,7 +26,7 @@
 
         <service id="test.session.listener" class="%test.session.listener.class%">
             <argument type="service" id="service_container" />
-            <tag name="kernel.listener" event="core.request" method="onCoreRequest" priority="128" />
+            <tag name="kernel.listener" event="core.request" method="onCoreRequest" priority="192" />
             <tag name="kernel.listener" event="core.response" method="onCoreResponse" priority="-128" />
         </service>
     </services>

+ 2 - 2
src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml

@@ -35,9 +35,9 @@
             <argument>%request_listener.https_port%</argument>
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
-        
+
         <service id="session_listener" class="%session_listener.class%">
-            <tag name="kernel.listener" event="core.request" method="onCoreRequest" priority="255" />
+            <tag name="kernel.listener" event="core.request" method="onCoreRequest" priority="128" />
             <argument type="service" id="service_container" />
         </service>
 

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

@@ -98,7 +98,7 @@
 
         <!-- Firewall related services -->
         <service id="security.firewall" class="%security.firewall.class%">
-            <tag name="kernel.listener" event="core.request" method="onCoreRequest" priority="254" />
+            <tag name="kernel.listener" event="core.request" method="onCoreRequest" priority="64" />
             <argument type="service" id="security.firewall.map" />
             <argument type="service" id="event_dispatcher" />
         </service>

+ 7 - 0
src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php

@@ -64,4 +64,11 @@ class FormLoginTest extends WebTestCase
 
         $this->deleteTmpDir('StandardFormLogin');
     }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        $this->deleteTmpDir('StandardFormLogin');
+    }
 }

+ 14 - 0
src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php

@@ -33,4 +33,18 @@ class SecurityRoutingIntegrationTest extends WebTestCase
 
         $this->assertNotEquals(404, $client->getResponse()->getStatusCode());
     }
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->deleteTmpDir('StandardFormLogin');
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        $this->deleteTmpDir('StandardFormLogin');
+    }
 }

+ 4 - 4
src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php

@@ -55,10 +55,6 @@ class FilesystemSessionStorage extends NativeSessionStorage
             session_id(hash('md5', uniqid(mt_rand(), true)));
         }
 
-        if (!is_dir($this->path)) {
-            mkdir($this->path, 0777, true);
-        }
-
         $file = $this->path.'/'.session_id().'.session';
 
         $this->data = file_exists($file) ? unserialize(file_get_contents($file)) : array();
@@ -92,6 +88,10 @@ class FilesystemSessionStorage extends NativeSessionStorage
     {
         $this->data[$key] = $data;
 
+        if (!is_dir($this->path)) {
+            mkdir($this->path, 0777, true);
+        }
+
         file_put_contents($this->path.'/'.session_id().'.session', serialize($this->data));
     }