Updated integration-tests dep to 0.8.0, added check for useRequestTime = true and disabled XCache as a result

kynx · kynx · commit 9561605a2051 · 2016-02-13T01:01:33.000Z
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "zendframework/zend-serializer": "^2.6",
         "zendframework/zend-session": "^2.5",
-        "cache/integration-tests": "^0.7.0",
+        "cache/integration-tests": "^0.8.0",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },
diff --git a/doc/book/psr6.md b/doc/book/psr6.md
@@ -51,7 +51,9 @@ found.
 ## Supported adapters
 
 The PSR-6 specification requires that the underlying storage support time-to-live (TTL), which is set when the
-item is saved. For this reason the following adapters cannot be used: `Dba`, `Filesystem`, `Memory` and `Session`.
+item is saved. For this reason the following adapters cannot be used: `Dba`, `Filesystem`, `Memory` and `Session`. The 
+`XCache` adapter calculates TTLs based on the request time, not the time the item is actually persisted, which means 
+that it also cannot be used.
 
 In addition adapters must support the `Zend\Cache\FlushableInterface`. All the current `Zend\Cache\Storage\Adapter`s 
 fulfil this requirement.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -13,6 +13,7 @@ pages:
         - ObjectCache: pattern/object-cache.md
         - OutputCache: pattern/output-cache.md
         - CaptureCache: pattern/capture-cache.md
+    - PSR-6: psr6.md
 site_name: zend-cache
 site_description: Zend\Cache
 repo_url: 'https://github.com/zendframework/zend-cache'
diff --git a/src/Psr/CacheException.php b/src/Psr/CacheException.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace Zend\Cache\Psr;
 
 use Psr\Cache\CacheException as CacheExceptionInterface;
diff --git a/src/Psr/CacheItem.php b/src/Psr/CacheItem.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace Zend\Cache\Psr;
 
 use DateInterval;
diff --git a/src/Psr/CacheItemPoolAdapter.php b/src/Psr/CacheItemPoolAdapter.php
@@ -11,7 +11,6 @@
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
 use Zend\Cache\Exception;
-use Zend\Cache\Storage\Adapter\Apc;
 use Zend\Cache\Storage\ClearByNamespaceInterface;
 use Zend\Cache\Storage\FlushableInterface;
 use Zend\Cache\Storage\StorageInterface;
@@ -321,18 +320,18 @@ private function validateStorage(StorageInterface $storage)
             ));
         }
 
-        if ($storage instanceof Apc && ini_get('apc.use_request_time')) {
+        // we've got to be able to set per-item TTL on write
+        $capabilities = $storage->getCapabilities();
+        if (!($capabilities->getStaticTtl() && $capabilities->getMinTtl())) {
             throw new CacheException(sprintf(
-                'Cannot use %s with apc.use_request_time = 1',
+                'Storage %s does not support static TTL',
                 get_class($storage)
             ));
         }
 
-        // we've got to be able to set per-item TTL on write
-        $capabilities = $storage->getCapabilities();
-        if (!($capabilities->getStaticTtl() && $capabilities->getMinTtl())) {
+        if ($capabilities->getUseRequestTime()) {
             throw new CacheException(sprintf(
-                'Storage %s does not support static TTL',
+                'Cannot use %s with useRequestTime = true',
                 get_class($storage)
             ));
         }
diff --git a/src/Psr/InvalidArgumentException.php b/src/Psr/InvalidArgumentException.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace Zend\Cache\Psr;
 
 use Psr\Cache\InvalidArgumentException as InvalidArgumentExceptionInterface;
diff --git a/test/Psr/ApcIntegrationTest.php b/test/Psr/ApcIntegrationTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use Cache\IntegrationTests\CachePoolTest;
diff --git a/test/Psr/BlackHoleIntegrationTest.php b/test/Psr/BlackHoleIntegrationTest.php
@@ -1,8 +1,10 @@
 <?php
 /**
- * @author matt
- * @copyright 2015 Claritum Limited
- * @license Commercial
+ * Zend Framework (http://framework.zend.com/).
+ *
+ * @link      http://github.com/zendframework/zend-cache for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace ZendTest\Cache\Psr;
diff --git a/test/Psr/CacheItemPoolAdapterTest.php b/test/Psr/CacheItemPoolAdapterTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache;
 
 use PHPUnit_Framework_TestCase as TestCase;
diff --git a/test/Psr/CacheItemTest.php b/test/Psr/CacheItemTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use DateInterval;
diff --git a/test/Psr/DbaIntegrationTest.php b/test/Psr/DbaIntegrationTest.php
@@ -1,8 +1,10 @@
 <?php
 /**
- * @author matt
- * @copyright 2015 Claritum Limited
- * @license Commercial
+ * Zend Framework (http://framework.zend.com/).
+ *
+ * @link      http://github.com/zendframework/zend-cache for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace ZendTest\Cache\Psr;
diff --git a/test/Psr/FilesystemIntegrationTest.php b/test/Psr/FilesystemIntegrationTest.php
@@ -1,8 +1,10 @@
 <?php
 /**
- * @author matt
- * @copyright 2015 Claritum Limited
- * @license Commercial
+ * Zend Framework (http://framework.zend.com/).
+ *
+ * @link      http://github.com/zendframework/zend-cache for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace ZendTest\Cache\Psr;
diff --git a/test/Psr/MemcacheIntegrationTest.php b/test/Psr/MemcacheIntegrationTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use Cache\IntegrationTests\CachePoolTest;
diff --git a/test/Psr/MemcachedIntegrationTest.php b/test/Psr/MemcachedIntegrationTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use Cache\IntegrationTests\CachePoolTest;
diff --git a/test/Psr/MemoryIntegrationTest.php b/test/Psr/MemoryIntegrationTest.php
@@ -1,8 +1,10 @@
 <?php
 /**
- * @author matt
- * @copyright 2015 Claritum Limited
- * @license Commercial
+ * Zend Framework (http://framework.zend.com/).
+ *
+ * @link      http://github.com/zendframework/zend-cache for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace ZendTest\Cache\Psr;
diff --git a/test/Psr/MockStorageTrait.php b/test/Psr/MockStorageTrait.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use DateInterval;
diff --git a/test/Psr/MongoDbIntegrationTest.php b/test/Psr/MongoDbIntegrationTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use Cache\IntegrationTests\CachePoolTest;
diff --git a/test/Psr/RedisIntegrationTest.php b/test/Psr/RedisIntegrationTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use Cache\IntegrationTests\CachePoolTest;
diff --git a/test/Psr/SessionIntegrationTest.php b/test/Psr/SessionIntegrationTest.php
@@ -1,8 +1,10 @@
 <?php
 /**
- * @author matt
- * @copyright 2015 Claritum Limited
- * @license Commercial
+ * Zend Framework (http://framework.zend.com/).
+ *
+ * @link      http://github.com/zendframework/zend-cache for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace ZendTest\Cache\Psr;
diff --git a/test/Psr/WinCacheIntegrationTest.php b/test/Psr/WinCacheIntegrationTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use Cache\IntegrationTests\CachePoolTest;
diff --git a/test/Psr/XCacheIntegrationTest.php b/test/Psr/XCacheIntegrationTest.php
@@ -6,77 +6,31 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
-use Cache\IntegrationTests\CachePoolTest;
-use Zend\Cache\Exception\ExtensionNotLoadedException;
+use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Cache\Psr\CacheItemPoolAdapter;
-use Zend\Cache\Storage\Adapter\XCache;
 use Zend\Cache\StorageFactory;
 
 /**
  * @requires extension xcache
  */
-class XCacheIntegrationTest extends CachePoolTest
+class XCacheIntegrationTest extends TestCase
 {
-    private $tz;
-
     /**
-     * @var XCache
+     * XCache has useRequestTime = true
+     * @expectedException \Zend\Cache\Psr\CacheException
      */
-    private $storage;
-
-    protected function setUp()
+    public function testAdapterNotSupported()
     {
-        if (!getenv('TESTS_ZEND_CACHE_XCACHE_ENABLED')) {
-            $this->markTestSkipped('Enable TESTS_ZEND_CACHE_XCACHE_ENABLED to run this test');
-        }
-
-        if ((int)ini_get('xcache.var_size') <= 0) {
-            $this->markTestSkipped("ext/xcache is disabled - see 'xcache.var_size'");
-        }
-
-        if (PHP_SAPI == 'cli') {
-            // this will throw exception for xcache < 3.1.0
-            try {
-                new XCache();
-            } catch (ExtensionNotLoadedException $e) {
-                $this->markTestSkipped($e->getMessage());
-            }
-        }
-
-        // set non-UTC timezone
-        $this->tz = date_default_timezone_get();
-        date_default_timezone_set('America/Vancouver');
-
-        parent::setUp();
-    }
-
-    protected function tearDown()
-    {
-        date_default_timezone_set($this->tz);
-
-        if ($this->storage) {
-            $this->storage->flush();
-        }
-
-        parent::tearDown();
-    }
-
-    public function createCachePool()
-    {
-        $options = [
-            'admin_auth' => getenv('TESTS_ZEND_CACHE_XCACHE_ADMIN_AUTH') ? : false,
-            'admin_user' => getenv('TESTS_ZEND_CACHE_XCACHE_ADMIN_USER') ? : '',
-            'admin_pass' => getenv('TESTS_ZEND_CACHE_XCACHE_ADMIN_PASS') ? : '',
-        ];
-
-        $this->storage = StorageFactory::factory([
+        $storage = StorageFactory::factory([
             'adapter' => [
                 'name'    => 'xcache',
-                'options' => $options,
+                'options' => [],
             ],
         ]);
-        return new CacheItemPoolAdapter($this->storage);
+
+        new CacheItemPoolAdapter($storage);
     }
 }
diff --git a/test/Psr/ZendServerDiskIntegrationTest.php b/test/Psr/ZendServerDiskIntegrationTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use Cache\IntegrationTests\CachePoolTest;
diff --git a/test/Psr/ZendServerShmIntegrationTest.php b/test/Psr/ZendServerShmIntegrationTest.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
+
 namespace ZendTest\Cache\Psr;
 
 use Cache\IntegrationTests\CachePoolTest;
