[WIP] v1.0.0 / v0.14.0

.travis.yml

@@ -28,5 +28,3 @@ services:
 
 matrix:
     fast_finish: true
-    allow_failures:
-      - php: 7.0

CHANGELOG.md

@@ -1,3 +1,37 @@
+## Stash v1.0.0 Changelog
+
+### v1.0.0
+
+* Removed deprecated DriverList::getDrivers function.
+
+* Removed deprecated invalidation constants in the Item class.
+
+* Removed SQLite Extension support (SQLite3 is still available).
+
+* The `set` function no longer persists data.
+
+* Removed expiration time for `set` function
+
+* Added `expiresAt` and `expiresAfter` functions to the Item class.
+
+* `getExpiration` to return current datetime when no record exists.
+
+* Added `save` function to PoolInterface.
+
+* Changed `getItemIterator` to `getItems`
+
+* RuntimeException now extends from \RuntimeException
+
+* Added `isHit` function to ItemInterface.
+
+* Added the `hasItem` function to the Pool, which should mostly be avoided.
+
+* Renamed `Pool::purge` to `Pool::clear`.
+
+* Added `Pool::deleteItem` and `Pool::deleteItems`.
+
+
+
 ## Stash v0.13 Changelog
 
 

composer.json

@@ -7,7 +7,9 @@
     "sessions",
     "memcached",
     "redis",
-    "apc"
+    "apc",
+    "psr-6",
+    "psr6"
   ],
   "homepage": "http://github.com/tedious/Stash",
   "type": "library",
@@ -27,7 +29,7 @@
   },
   "require-dev": {
     "fabpot/php-cs-fixer": "^1.9",
-    "phpunit/phpunit": "4.7.*",
+    "phpunit/phpunit": "4.8.*",
     "satooshi/php-coveralls": "dev-master"
   },
   "autoload": {

src/Stash/Driver/AbstractDriver.php

@@ -36,7 +36,9 @@ public function __construct(array $options = array())
             throw new RuntimeException(get_class($this) . ' is not available.');
         }
 
-        $this->setOptions($options);
+        if (!empty($options)) {
+            $this->setOptions($options);
+        }
     }
 
     /**

src/Stash/Driver/Apc.php

@@ -150,8 +150,7 @@ public static function isAvailable()
             return false;
         }
 
-        return (extension_loaded('apc') && ini_get('apc.enabled'))
-            && ((php_sapi_name() !== 'cli') || ini_get('apc.enable_cli'));
+        return function_exists('apc_fetch');
     }
 
     /**
@@ -187,4 +186,13 @@ protected function getCacheTime($expiration)
 
         return $this->ttl < $life ? $this->ttl : $life;
     }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isPersistent()
+    {
+        return true;
+    }
 }

src/Stash/Driver/Composite.php

@@ -13,6 +13,7 @@
 
 use Stash;
 use Stash\Exception\RuntimeException;
+use Stash\Exception\InvalidArgumentException;
 use Stash\Interfaces\DriverInterface;
 
 /**
@@ -43,22 +44,24 @@ public function setOptions(array $options = array())
     {
         $options += $this->getDefaultOptions();
 
-        if (isset($options['drivers'])) {
-            if (count($options['drivers']) < 1) {
-                throw new RuntimeException('One or more secondary drivers are required.');
-            }
-            $this->drivers = array();
+        if (!isset($options['drivers']) || (count($options['drivers']) < 1)) {
+            throw new RuntimeException('One or more secondary drivers are required.');
+        }
 
-            foreach ($options['drivers'] as $driver) {
-                if (!(is_object($driver) && $driver instanceof DriverInterface)) {
-                    continue;
-                }
-                $this->drivers[] = $driver;
-            }
+        if (!is_array($options['drivers'])) {
+            throw new InvalidArgumentException('Drivers option requires an array.');
+        }
 
-            if (count($this->drivers) < 1) {
-                throw new RuntimeException('None of the secondary drivers can be enabled.');
+        $this->drivers = array();
+        foreach ($options['drivers'] as $driver) {
+            if (!(is_object($driver) && $driver instanceof DriverInterface)) {
+                continue;
             }
+            $this->drivers[] = $driver;
+        }
+
+        if (count($this->drivers) < 1) {
+            throw new RuntimeException('None of the secondary drivers can be enabled.');
         }
     }
 

src/Stash/Driver/FileSystem.php

@@ -156,10 +156,11 @@ public function setOptions(array $options = array())
                 }
                 $this->encoder = new $encoder;
             } else {
+                $encoderInterface = 'Stash\Driver\FileSystem\EncoderInterface';
                 $encoderClass = 'Stash\Driver\FileSystem\\' . $encoder . 'Encoder';
-                if (class_exists($encoder)) {
+                if (class_exists($encoder) && in_array($encoderInterface, class_implements($encoder))) {
                     $this->encoder = new $encoder();
-                } elseif (class_exists($encoderClass)) {
+                } elseif (class_exists($encoderClass) && in_array($encoderInterface, class_implements($encoderClass))) {
                     $this->encoder = new $encoderClass();
                 } else {
                     throw new RuntimeException('Invalid Encoder: ' . $encoder);

src/Stash/Driver/FileSystem/NativeEncoder.php

@@ -21,16 +21,13 @@ public function deserialize($path)
             return false;
         }
 
+        $expiration = null;
         include($path);
 
         if (!isset($loaded)) {
             return false;
         }
 
-        if (!isset($expiration)) {
-            $expiration = null;
-        }
-
         if (!isset($data)) {
             $data = null;
         }
@@ -92,22 +89,18 @@ protected function encode($data)
                 $dataString = (bool) $data ? 'true' : 'false';
                 break;
 
-            case 'serialize':
-                $dataString = 'unserialize(base64_decode(\'' . base64_encode(serialize($data)) . '\'))';
-                break;
-
             case 'string':
                 $dataString = sprintf('"%s"', addcslashes($data, "\t\"\$\\"));
                 break;
 
-            case 'none':
-            default :
-                if (is_numeric($data)) {
-                    $dataString = (string) $data;
-                } else {
-                    $dataString = 'base64_decode(\'' . base64_encode($data) . '\')';
-                }
+            case 'numeric':
+                $dataString = (string) $data;
                 break;
+
+            default :
+                case 'serialize':
+                    $dataString = 'unserialize(base64_decode(\'' . base64_encode(serialize($data)) . '\'))';
+                    break;
         }
 
         return $dataString;

src/Stash/Driver/Sqlite.php

@@ -74,17 +74,12 @@ public function setOptions(array $options = array())
         if (Sub\SqlitePdo::isAvailable()) {
             $subdrivers['pdo'] = '\Stash\Driver\Sub\SqlitePdo';
         }
-        if (Sub\Sqlite::isAvailable()) {
-            $subdrivers['sqlite'] = '\Stash\Driver\Sub\Sqlite';
-        }
         if (Sub\SqlitePdo2::isAvailable()) {
             $subdrivers['pdo2'] = '\Stash\Driver\Sub\SqlitePdo2';
         }
 
         if ($extension == 'pdo' && $version != '2' && isset($subdrivers['pdo'])) {
             $driver = $subdrivers['pdo'];
-        } elseif ($extension == 'sqlite' && isset($subdrivers['sqlite'])) {
-            $driver = $subdrivers['sqlite'];
         } elseif ($extension == 'pdo' && $version != '3' && isset($subdrivers['pdo2'])) {
             $driver = $subdrivers['pdo2'];
         } elseif (count($subdrivers) > 0 && $extension == 'any') {
@@ -281,7 +276,7 @@ protected function checkStatus()
      */
     public static function isAvailable()
     {
-        return (Sub\SqlitePdo::isAvailable()) || (Sub\Sqlite::isAvailable()) || (Sub\SqlitePdo2::isAvailable());
+        return (Sub\SqlitePdo::isAvailable()) || (Sub\SqlitePdo2::isAvailable());
     }
 
     /**