Merge pull request #339 from Geolim4/final

Improved code quality

Author: Geolim4

src/phpFastCache/Drivers/Devfalse/Driver.php

@@ -68,13 +68,20 @@ protected function driverWrite(CacheItemInterface $item)
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return array [
+     *      'd' => 'THE ITEM DATA'
+     *      't' => 'THE ITEM DATE EXPIRATION'
+     *      'g' => 'THE ITEM TAGS'
+     * ]
      */
     protected function driverRead(CacheItemInterface $item)
     {
-        return null;
+        return [
+          self::DRIVER_DATA_WRAPPER_INDEX => false,
+          self::DRIVER_TAGS_WRAPPER_INDEX => [],
+          self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(),
+        ];
     }
-
     /**
      * @param \Psr\Cache\CacheItemInterface $item
      * @return bool

src/phpFastCache/Drivers/Devnull/Driver.php

@@ -68,11 +68,19 @@ protected function driverWrite(CacheItemInterface $item)
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return array [
+     *      'd' => 'THE ITEM DATA'
+     *      't' => 'THE ITEM DATE EXPIRATION'
+     *      'g' => 'THE ITEM TAGS'
+     * ]
      */
     protected function driverRead(CacheItemInterface $item)
     {
-        return null;
+        return [
+          self::DRIVER_DATA_WRAPPER_INDEX => null,
+          self::DRIVER_TAGS_WRAPPER_INDEX => [],
+          self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(),
+        ];
     }
 
     /**

src/phpFastCache/Drivers/Devtrue/Driver.php

@@ -68,11 +68,19 @@ protected function driverWrite(CacheItemInterface $item)
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return array [
+     *      'd' => 'THE ITEM DATA'
+     *      't' => 'THE ITEM DATE EXPIRATION'
+     *      'g' => 'THE ITEM TAGS'
+     * ]
      */
     protected function driverRead(CacheItemInterface $item)
     {
-        return false;
+        return [
+          self::DRIVER_DATA_WRAPPER_INDEX => true,
+          self::DRIVER_TAGS_WRAPPER_INDEX => [],
+          self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(),
+        ];
     }
 
     /**

src/phpFastCache/Drivers/Files/Driver.php

@@ -73,10 +73,11 @@ protected function driverWrite(CacheItemInterface $item)
             $data = $this->encode($this->driverPreWrap($item));
 
             $toWrite = true;
-            /*
+
+            /**
              * Skip if Existing Caching in Options
              */
-            if (isset($option[ 'skipExisting' ]) && $option[ 'skipExisting' ] == true && file_exists($file_path)) {
+            if (isset($this->config[ 'skipExisting' ]) && $this->config[ 'skipExisting' ] == true && file_exists($file_path)) {
                 $content = $this->readfile($file_path);
                 $old = $this->decode($content);
                 $toWrite = false;
@@ -85,7 +86,9 @@ protected function driverWrite(CacheItemInterface $item)
                 }
             }
 
-            // Force write
+            /**
+             * Force write
+             */
             try {
                 if ($toWrite == true) {
                     $f = fopen($file_path, 'w+');

src/phpFastCache/Drivers/Mongodb/Driver.php

@@ -145,7 +145,7 @@ protected function driverDelete(CacheItemInterface $item)
      */
     protected function driverClear()
     {
-        return $this->getCollection()->drop();
+        return (bool) $this->getCollection()->drop()['ok'];
     }
 
     /**
@@ -159,8 +159,8 @@ protected function driverConnect()
             throw new LogicException('Already connected to Mongodb server');
         } else {
             $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1';
-            $port = isset($server[ 'port' ]) ? $server[ 'port' ] : '27017';
-            $timeout = isset($server[ 'timeout' ]) ? $server[ 'timeout' ] : 3;
+            $port = isset($this->config[ 'port' ]) ? $this->config[ 'port' ] : '27017';
+            $timeout = isset($this->config[ 'timeout' ]) ? $this->config[ 'timeout' ] : 3;
             $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : '';
             $username = isset($this->config[ 'username' ]) ? $this->config[ 'username' ] : '';
 

src/phpFastCache/Drivers/Sqlite/Driver.php

@@ -59,7 +59,7 @@ class Driver extends DriverAbstract
     protected $SqliteDir = '';
 
     /**
-     * @var null
+     * @var \PDO
      */
     protected $indexing;
 

tests/AttachingDetachingMethods.test.php

@@ -34,7 +34,7 @@
     $driverInstance->detachItem($itemDetached);
     $itemAttached = $driverInstance->getItem($key);
 
-    if(!$driverInstance->isAttached($itemDetached))
+    if($driverInstance->isAttached($itemDetached) !== true)
     {
         echo '[PASS] ExtendedCacheItemPoolInterface::isAttached() identified $itemDetached as being detached.' . "\n";
     }

tests/SyntaxChecker.test.php

@@ -46,7 +46,7 @@ function read_dir($dir, $ext = null)
         continue;
     }
 
-    if ($status != 0) {
+    if ($status !== 0) {
         $exit = $status;
         echo '[FAIL]';
     } else {