From 8cc5caf1f3ca463af4bf23bad303ebfff0a5b112 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 23 Apr 2011 15:09:55 +0200
Subject: [PATCH] changed the default directory for the upload temp dir, made
 the dir mandatory

---
 .../Bundle/FrameworkBundle/Resources/config/form.xml        | 4 +---
 .../HttpFoundation/File/SessionBasedTemporaryStorage.php    | 2 +-
 .../Component/HttpFoundation/File/TemporaryStorage.php      | 6 +-----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index 44155de66bf2..ae99682a8be3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -13,8 +13,6 @@
         <parameter key="form.validation_groups">Default</parameter>
         <parameter key="file.temporary_storage.class">Symfony\Component\HttpFoundation\File\SessionBasedTemporaryStorage</parameter>
         <parameter key="file.temporary_storage.secret">abcdef</parameter>
-        <parameter key="file.temporary_storage.directory"></parameter>
-
     </parameters>
 
     <services>
@@ -66,7 +64,7 @@
         <service id="file.temporary_storage" class="%file.temporary_storage.class%">
             <argument type="service" id="session" />
             <argument>%file.temporary_storage.secret%</argument>
-            <argument>%file.temporary_storage.directory%</argument>
+            <argument>%kernel.cache_dir%/upload</argument>
         </service>
 
         <!-- CoreExtension -->
diff --git a/src/Symfony/Component/HttpFoundation/File/SessionBasedTemporaryStorage.php b/src/Symfony/Component/HttpFoundation/File/SessionBasedTemporaryStorage.php
index cafe43e58c72..e81dfd081e27 100644
--- a/src/Symfony/Component/HttpFoundation/File/SessionBasedTemporaryStorage.php
+++ b/src/Symfony/Component/HttpFoundation/File/SessionBasedTemporaryStorage.php
@@ -18,7 +18,7 @@
  */
 class SessionBasedTemporaryStorage extends TemporaryStorage
 {
-    public function __construct(Session $session, $secret, $directory = null)
+    public function __construct(Session $session, $secret, $directory)
     {
         parent::__construct($secret, $directory);
 
diff --git a/src/Symfony/Component/HttpFoundation/File/TemporaryStorage.php b/src/Symfony/Component/HttpFoundation/File/TemporaryStorage.php
index 7bd235c4634f..22e50e6b447d 100644
--- a/src/Symfony/Component/HttpFoundation/File/TemporaryStorage.php
+++ b/src/Symfony/Component/HttpFoundation/File/TemporaryStorage.php
@@ -22,12 +22,8 @@ class TemporaryStorage
     private $directory;
     private $secret;
 
-    public function __construct($secret, $directory = null)
+    public function __construct($secret, $directory)
     {
-        if (empty($directory)) {
-            $directory = sys_get_temp_dir();
-        }
-
         $this->directory = realpath($directory);
         $this->secret = $secret;
     }