Merge remote-tracking branch 'refs/remotes/origin/4.0-dev' into final

Author: khoaofgod

.gitignore

@@ -230,4 +230,8 @@ pip-log.txt
 #################
 ## NetBeans
 #################
-nbproject/
+nbproject/
+
+#Composer
+vendor/
+composer.lock

composer.json

@@ -14,9 +14,14 @@
             }
         ],
     "require": {
-        "php": ">=5.1.0"
+        "php": ">=5.3.0"
     },
     "autoload": {
-        "files": ["phpfastcache.php"]
+        "psr-0": {
+            "Phpfastcache": "src/"
+        },
+        "files": [
+            "src/Phpfastcache/legacy/aliases.php"
+        ]
     }
 }

example.php renamed to examples/1.example.php

@@ -1,33 +1,38 @@
 <?php
-
 /**
  * Welcome to Learn Lesson
  * This is very Simple PHP Code of Caching
  * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
  */
 
-// Require Library
-require_once("phpfastcache.php");
+use Phpfastcache\core\InstanceManager;
+
+// Include composer autoloader
+require '../vendor/autoload.php';
 
-// simple Caching with:
-$cache = phpFastCache();
+$cache = InstanceManager::getInstance();
 
-// Try to get $products from Caching First
-// product_page is "identity keyword";
-$products = $cache->get("product_page");
+/**
+ * Try to get $products from Caching First
+ * product_page is "identity keyword";
+ */
+$key = "product_page";
+$products = $cache->get($key);
 
-if ($products == null) {
+if (is_null($products)) {
     $products = "DB QUERIES | FUNCTION_GET_PRODUCTS | ARRAY | STRING | OBJECTS";
     // Write products to Cache in 10 minutes with same keyword
-    $cache->set("product_page", $products, 600);
+    $cache->set($key, $products, 600);
 
     echo " --> NO CACHE ---> DB | Func | API RUN FIRST TIME ---> ";
 
 } else {
     echo " --> USE CACHE --> SERV 10,000+ Visitors FROM CACHE ---> ";
 }
 
-// use your products here or return it;
+/**
+ * use your products here or return it;
+ */
 echo $products;
 
 

examples/1.learn.php

@@ -7,26 +7,32 @@
  */
 
 // Require Library
-require_once("phpfastcache.php");
+use Phpfastcache\core\InstanceManager;
+use Phpfastcache\core\Phpfastcache;
+
+// Include composer autoloader
+require '../vendor/autoload.php';
 
 // simple Caching with:
-$cache = phpFastCache("redis");
+$cache = InstanceManager::getInstance("redis");
 
 if ($cache->fallback === true) {
-    echo " USE BACK UP DRIVER = " . phpFastCache::$config[ 'fallback' ] . " <br>";
+    echo " USE BACK UP DRIVER = " . Phpfastcache::$config[ 'fallback' ] . " <br>";
 } else {
     echo ' DRIVER IS GOOD <br>';
 }
 
+/**
+ * Try to get $products from Caching First
+ * product_page is "identity keyword";
+ */
+$key = "product_page2";
+$products = $cache->get($key);
 
-// Try to get $products from Caching First
-// product_page is "identity keyword";
-$products = $cache->get("product_page2");
-
-if ($products == null) {
+if (is_null($products)) {
     $products = "DB QUERIES | FUNCTION_GET_PRODUCTS | ARRAY | STRING | OBJECTS";
     // Write products to Cache in 10 minutes with same keyword
-    $cache->set("product_page2", $products, 2);
+    $cache->set($key, $products, 600);
 
     echo " --> NO CACHE ---> DB | Func | API RUN FIRST TIME ---> ";