Var type adjustements

PHPSocialNetwork · Jun 26, 2016 · 20f09cd · 20f09cd
1 parent 5773ed0
commit 20f09cd
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/src/phpFastCache/CacheManager.php b/src/phpFastCache/CacheManager.php
@@ -17,7 +17,6 @@
 use phpFastCache\Cache\ExtendedCacheItemPoolInterface;
 use phpFastCache\Core\DriverAbstract;
 use phpFastCache\Exceptions\phpFastCacheDriverCheckException;
-use CouchbaseCluster;
 
 /**
  * Class CacheManager
@@ -57,8 +56,8 @@ class CacheManager
       'default_chmod' => 0777, // 0777 recommended
       'path' => '',// if not set will be the value of sys_get_temp_dir()
       'fallback' => false, //Fall back when old driver is not support
-      "limited_memory_each_object" => 4096, // maximum size (bytes) of object store in memory
-      "compress_data" => false, // compress stored data, if the backend supports it
+      'limited_memory_each_object' => 4096, // maximum size (bytes) of object store in memory
+      'compress_data' => false, // compress stored data, if the backend supports it
     ];
 
     /**
@@ -181,6 +180,7 @@ public static function setNamespacePath($path)
      * @param $name
      * @param string $value
      * @deprecated Method "setup" is deprecated and will be removed in 5.1. Use method "setDefaultConfig" instead.
+     * @throws \InvalidArgumentException
      */
     public static function setup($name, $value = '')
     {
@@ -191,6 +191,7 @@ public static function setup($name, $value = '')
     /**
      * @param $name string|array
      * @param mixed $value
+     * @throws \InvalidArgumentException
      */
     public static function setDefaultConfig($name, $value = null)
     {

diff --git a/src/phpFastCache/Core/PathSeekerTrait.php b/src/phpFastCache/Core/PathSeekerTrait.php
@@ -67,7 +67,7 @@ public function getPath($getBasePath = false)
             $securityKey .= '/';
         }
 
-        $securityKey = $this->cleanFileName($securityKey);
+        $securityKey = static::cleanFileName($securityKey);
 
         $full_path = rtrim($path, '/') . '/' . $securityKey;
         $full_pathx = md5($full_path);
@@ -201,18 +201,18 @@ protected static function cleanFileName($filename)
      */
     protected function htaccessGen($path, $create = true)
     {
-        if ($create == true) {
+        if ($create === true) {
             if (!is_writable($path)) {
                 try {
-                    chmod($path, 0777);
+                    if(!chmod($path, 0777)){
+                        throw new phpFastCacheDriverException('Chmod failed on : ' . $path);
+                    }
                 } catch (phpFastCacheDriverException $e) {
-                    throw new phpFastCacheDriverException('PLEASE CHMOD ' . $path . ' - 0777 OR ANY WRITABLE PERMISSION!',
-                      92);
+                    throw new phpFastCacheDriverException('PLEASE CHMOD ' . $path . ' - 0777 OR ANY WRITABLE PERMISSION!', 0, $e);
                 }
             }
 
             if (!file_exists($path . "/.htaccess")) {
-                //   echo "write me";
                 $html = "order deny, allow \r\n
 deny from all \r\n
 allow from 127.0.0.1";

diff --git a/src/phpFastCache/Entities/driverStatistic.php b/src/phpFastCache/Entities/driverStatistic.php
@@ -31,7 +31,7 @@ class driverStatistic implements ArrayAccess
     /**
      * @var string
      */
-    protected $size = '';
+    protected $size = 0;
 
     /**
      * @var string
@@ -73,7 +73,7 @@ public function getData()
      */
     public function setInfo($info)
     {
-        $this->info = ($info ?: false);
+        $this->info = ($info ?: '');
 
         return $this;
     }
@@ -85,7 +85,7 @@ public function setInfo($info)
      */
     public function setSize($size)
     {
-        $this->size = ($size ?: false);
+        $this->size = ($size ?: 0);
 
         return $this;
     }
@@ -96,7 +96,7 @@ public function setSize($size)
      */
     public function setData($data)
     {
-        $this->data = ($data ?: false);
+        $this->data = ($data ?: '');
 
         return $this;
     }

diff --git a/src/phpFastCache/Exceptions/phpFastCacheDriverCheckException.php b/src/phpFastCache/Exceptions/phpFastCacheDriverCheckException.php
@@ -15,7 +15,7 @@
 namespace phpFastCache\Exceptions;
 
 /**
- * Class phpFastCacheDriverException
+ * Class phpFastCacheDriverCheckException
  * @package phpFastCache\Exceptions
  */
 class phpFastCacheDriverCheckException extends phpFastCacheDriverException

diff --git a/src/phpFastCache/Proxy/phpFastCacheAbstractProxy.php b/src/phpFastCache/Proxy/phpFastCacheAbstractProxy.php
@@ -61,7 +61,7 @@ abstract class phpFastCacheAbstractProxy
      * @param string $driver
      * @param array $config
      */
-    public function __construct($driver = '', array $config = [])
+    public function __construct($driver = 'auto', array $config = [])
     {
         $this->instance = CacheManager::getInstance($driver, $config);
     }