Merge pull request #259 from khoaofgod/final

FIx Bugs March 24

Author: khoaofgod

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "phpFastCache/phpFastCache",
+    "name": "phpfastcache/phpfastcache",
     "type" : "library",
     "description": "PHP Cache Class - Supported Redis, Cookie, Predis, APC, MemCached, WinCache, Files, PDO, Reduce mySQL Call by Caching",
     "keywords": ["cache","caching","php cache","mysql cache","apc cache","apc","memcache","memcached","wincache","files cache","pdo cache","cache class","redis","predis","cookie"],
@@ -33,7 +33,7 @@
     },
     "autoload": {
         "files": [
-            "src/autoload.php"
+            "src/phpFastCache/phpFastCache.php"
         ]
     }
 }

examples/files.php

@@ -19,14 +19,14 @@
  */
 
 // Include composer autoloader
-require '../vendor/autoload.php';
+require '../src/autoload.php';
 // OR require_once("../src/autoload.php");
 
 use phpFastCache\CacheManager;
 
 // Setup File Path on your config files
 CacheManager::setup(array(
-    "path" => sys_get_temp_dir(), // or in windows "C:/tmp/"
+   // "path" => sys_get_temp_dir(), // or in windows "C:/tmp/"
 ));
 // our unique method of caching, faster than traditional caching which shared everywhere on internet like 7-10 times
 // reduce high load CPU, reduce I/O from files open

examples/sqlite.php

@@ -21,9 +21,11 @@
 use phpFastCache\CacheManager;
 
 // Include composer autoloader
-require '../vendor/autoload.php';
+require '../src/autoload.php';
 
-$InstanceCache = CacheManager::getInstance('sqlite');
+CacheManager::setup("storage","sqlite");
+
+$InstanceCache = CacheManager::getInstance();
 
 /**
  * Try to get $products from Caching First
@@ -45,4 +47,29 @@
     echo $CachedString;
 }
 
+echo '<br /><br /><a href="/">Back to index</a>&nbsp;--&nbsp;<a href="/' . basename(__FILE__) . '">Reload</a><br>';
+
+$InstanceCache = CacheManager::sqlite();
+
+/**
+ * Try to get $products from Caching First
+ * product_page is "identity keyword";
+ */
+$key = "product_page2";
+$CachedString = $InstanceCache->get($key);
+
+if (is_null($CachedString)) {
+    $CachedString = "SQLite Cache --> Cache Enabled --> Well done !";
+    // Write products to Cache in 10 minutes with same keyword
+    $InstanceCache->set($key, $CachedString, 600);
+
+    echo "FIRST LOAD // WROTE OBJECT TO CACHE // RELOAD THE PAGE AND SEE // ";
+    echo $CachedString;
+
+} else {
+    echo "READ FROM CACHE // ";
+    echo $CachedString;
+}
+
 echo '<br /><br /><a href="/">Back to index</a>&nbsp;--&nbsp;<a href="/' . basename(__FILE__) . '">Reload</a>';
+

src/phpFastCache/CacheManager.php

@@ -160,12 +160,14 @@ public static function cleanCachingMethod($instance = null)
      */
     protected static function __CleanCachingMethod($instance)
     {
-        $old = self::$instances[ $instance ]->config[ 'cache_method' ];
-        self::$instances[ $instance ]->config[ 'cache_method' ] = 1;
-        foreach (self::$memory[ $instance ] as $keyword => $object) {
-            self::$instances[ $instance ]->set($keyword, $object[ 'value' ], $object[ 'expired_in' ]);
+        if(is_array(self::$memory[ $instance ]) && !empty(self::$memory[ $instance ])) {
+            $old = self::$instances[$instance]->config['cache_method'];
+            self::$instances[$instance]->config['cache_method'] = 1;
+            foreach (self::$memory[$instance] as $keyword => $object) {
+                self::$instances[$instance]->set($keyword, $object['value'], $object['expired_in']);
+            }
+            self::$instances[$instance]->config['cache_method'] = $old;
+            self::$memory[$instance] = array();
         }
-        self::$instances[ $instance ]->config[ 'cache_method' ] = $old;
-        self::$memory[ $instance ] = array();
     }
 }

src/phpFastCache/Core/phpFastCache.php

@@ -155,13 +155,16 @@ public static function getAutoClass($config)
      */
     public static function getPath($skip_create_path = false, $config)
     {
-        if (!isset($config[ 'path' ]) || $config[ 'path' ] == '') {
+        $tmp_dir = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir();
 
+        if (!isset($config[ 'path' ]) || $config[ 'path' ] == '') {
             if (self::isPHPModule()) {
-                $tmp_dir = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir();
                 $path = $tmp_dir;
             } else {
-                $path = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? rtrim($_SERVER[ 'DOCUMENT_ROOT' ], '/') . '/../' : rtrim(__DIR__, '/') . '/';
+                $document_root_path = rtrim($_SERVER[ 'DOCUMENT_ROOT' ], '/') . '/../';
+                $path = isset($_SERVER[ 'DOCUMENT_ROOT' ]) && is_writable($document_root_path)
+                    ? $document_root_path
+                    : rtrim(__DIR__, '/') . '/';
             }
 
             if (self::$config[ 'path' ] != '') {
@@ -187,7 +190,7 @@ public static function getPath($skip_create_path = false, $config)
 
         $securityKey = self::cleanFileName($securityKey);
 
-        $full_path = $path . '/' . $securityKey;
+        $full_path = rtrim($path,'/') . '/' . $securityKey;
         $full_pathx = md5($full_path);
 
 
@@ -200,6 +203,16 @@ public static function getPath($skip_create_path = false, $config)
                 if (!@is_writable($full_path)) {
                     @chmod($full_path, self::__setChmodAuto($config));
                 }
+                if(!@is_writable($full_path)) {
+                    // switch back to tmp dir again if the path is not writeable
+                    $full_path = rtrim($tmp_dir,'/') . '/' . $securityKey;
+                    if (!@file_exists($full_path)) {
+                        @mkdir($full_path, self::__setChmodAuto($config));
+                    }
+                    if (!@is_writable($full_path)) {
+                        @chmod($full_path, self::__setChmodAuto($config));
+                    }
+                }
                 if (!@file_exists($full_path) || !@is_writable($full_path)) {
                     throw new phpFastCacheCoreException('PLEASE CREATE OR CHMOD ' . $full_path . ' - 0777 OR ANY WRITABLE PERMISSION!', 92);
                 }