Make 'temp' argument to the binary backend driver optional

horde · Apr 9, 2015 · 8602688 · 8602688
1 parent 8768968
commit 8602688
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/framework/Crypt/lib/Horde/Crypt/Pgp.php b/framework/Crypt/lib/Horde/Crypt/Pgp.php
@@ -853,7 +853,7 @@ protected function _initDrivers()
                 if (Horde_Crypt_Pgp_Backend_Binary::supported()) {
                     $this->_backends[] = new Horde_Crypt_Pgp_Backend_Binary(
                         $this->_params['program'],
-                        $this->_params['temp']
+                        isset($this->_params['temp']) ? $this->_params['temp'] : null
                     );
                 }
             }

diff --git a/framework/Crypt/lib/Horde/Crypt/Pgp/Backend/Binary.php b/framework/Crypt/lib/Horde/Crypt/Pgp/Backend/Binary.php
@@ -62,9 +62,12 @@ class Horde_Crypt_Pgp_Backend_Binary
      * @param string $gnupg  The path to the GnuPG binary.
      * @param string $temp   Location of temporary directory.
      */
-    public function __construct($gnupg, $temp)
+    public function __construct($gnupg, $temp = null)
     {
-        $this->_tempdir = Horde_Util::createTempDir(true, $temp);
+        $this->_tempdir = Horde_Util::createTempDir(
+            true,
+            is_null($temp) ? sys_get_temp_dir() : $temp
+        );
 
         /* Store the location of GnuPG and set common options. */
         $this->_gnupg = array(

diff --git a/framework/Crypt/test/Horde/Crypt/Pgp/BinaryTest.php b/framework/Crypt/test/Horde/Crypt/Pgp/BinaryTest.php
@@ -27,9 +27,7 @@ protected function _setUp()
             ));
         }
 
-        return array(
-            new Horde_Crypt_Pgp_Backend_Binary($gnupg, sys_get_temp_dir())
-        );
+        return array(new Horde_Crypt_Pgp_Backend_Binary($gnupg));
     }
 
 }
diff --git a/framework/Crypt/test/Horde/Crypt/PgpKeyserverTest.php b/framework/Crypt/test/Horde/Crypt/PgpKeyserverTest.php
@@ -21,8 +21,7 @@ protected function setUp()
 
         $this->_ks = new Horde_Crypt_Pgp_Keyserver(
             Horde_Crypt::factory('Pgp', array(
-                'program' => '/usr/bin/gpg',
-                'temp' => sys_get_temp_dir()
+                'program' => '/usr/bin/gpg'
             ))
         );
     }