[project @ Remove platform-specific temporary directory code to tests since the library was not using it]

3 files changed, 22 insertions, 21 deletions

diff --git a/Auth/OpenID/FileStore.php b/Auth/OpenID/FileStore.php
index edd956c..0cc682d 100644
--- a/Auth/OpenID/FileStore.php
+++ b/Auth/OpenID/FileStore.php
@@ -592,22 +592,8 @@ class Auth_OpenID_FileStore extends Auth_OpenID_OpenIDStore {
     /**
      * @access private
      */
-    function _mkdtemp($dir=null)
+    function _mkdtemp($dir)
     {
-        if (!isset($dir)) {
-            if (strpos(PHP_OS, 'WIN') === 0) {
-                $dir = $_ENV['TMP'];
-                if (!isset($dir)) {
-                    $dir = 'C:\Windows\Temp';
-                }
-            } else {
-                $dir = @$_ENV['TMPDIR'];
-                if (!isset($dir)) {
-                    $dir = '/tmp';
-                }
-            }
-        }
-
         foreach (range(0, 4) as $i) {
             $name = $dir . strval(DIRECTORY_SEPARATOR) . strval(getmypid()) .
                 "-" . strval(rand(1, time()));
diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php
index 8424f6c..f9e2772 100644
--- a/Tests/Auth/OpenID/Consumer.php
+++ b/Tests/Auth/OpenID/Consumer.php
@@ -227,8 +227,7 @@ class Tests_Auth_OpenID_Consumer extends PHPUnit_TestCase {
             $_Auth_OpenID_user_page_pat,
             $_Auth_OpenID_assocs;
 
-        $store = new Auth_OpenID_FileStore(
-           $temp_dir = Auth_OpenID_FileStore::_mkdtemp());
+        $store = new Tests_Auth_OpenID_MemStore();
 
         if ($immediate) {
             $mode = 'checkid_immediate';
@@ -279,8 +278,6 @@ class Tests_Auth_OpenID_Consumer extends PHPUnit_TestCase {
                     $fetcher, $store, $immediate);
 
         $this->assertEquals($expected_num_assocs, $fetcher->num_assocs);
-
-        $store->destroy();
     }
 
     function test_success()
diff --git a/Tests/Auth/OpenID/StoreTest.php b/Tests/Auth/OpenID/StoreTest.php
index 15fae93..288263d 100644
--- a/Tests/Auth/OpenID/StoreTest.php
+++ b/Tests/Auth/OpenID/StoreTest.php
@@ -21,6 +21,24 @@ require_once 'Auth/OpenID/CryptUtil.php';
 require_once 'Auth/OpenID.php';
 require_once 'PHPUnit.php';
 
+function _Auth_OpenID_mkdtemp()
+{
+    if (strpos(PHP_OS, 'WIN') === 0) {
+        $dir = $_ENV['TMP'];
+        if (!isset($dir)) {
+            $dir = 'C:\Windows\Temp';
+        }
+    } else {
+        $dir = @$_ENV['TMPDIR'];
+        if (!isset($dir)) {
+            $dir = '/tmp';
+        }
+    }
+
+    return Auth_OpenID_FileStore::_mkdtemp($dir);
+}
+
+
 /**
  * This is the host where the SQL stores' databases should be created
  * and destroyed.
@@ -309,7 +327,7 @@ explicitly');
     {
         require_once 'Auth/OpenID/FileStore.php';
 
-        $temp_dir = Auth_OpenID_FileStore::_mkdtemp();
+        $temp_dir = _Auth_OpenID_mkdtemp();
 
         if (!$temp_dir) {
             trigger_error('Could not create temporary directory ' .
@@ -444,7 +462,7 @@ explicitly');
         require_once 'Auth/OpenID/SQLiteStore.php';
         require_once 'DB.php';
 
-        $temp_dir = Auth_OpenID_FileStore::_mkdtemp();
+        $temp_dir = _Auth_OpenID_mkdtemp();
 
         if (!$temp_dir) {
             trigger_error('Could not create temporary directory ' .