Merge branch 'hotfix/74'

Close #74
zendframework · May 12, 2016 · 2c68def · 2c68def
2 parents e22a391 + d78934e
commit 2c68def
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -77,19 +77,28 @@ matrix:
         - EXECUTE_TEST_COVERALLS=true
         - PECL_INSTALL_APCU='apcu'
         - PECL_INSTALL_APCU_BC='apcu_bc-beta'
+
+        # FIXME:
+        # there is no memcached extension available for PHP-7
+        # the version provided by travis is not yet ready and buggy
+        - TESTS_ZEND_CACHE_MEMCACHED_ENABLED=false
     - php: 7
       env:
         - SERVICE_MANAGER_VERSION="^2.7.5"
         - EVENT_MANAGER_VERSION="^2.6.2"
         - PECL_INSTALL_APCU='apcu'
         - PECL_INSTALL_APCU_BC='apcu_bc-beta'
+
+        # FIXME:
+        # there is no memcached extension available for PHP-7
+        # the version provided by travis is not yet ready and buggy
+        - TESTS_ZEND_CACHE_MEMCACHED_ENABLED=false
     - php: hhvm
     - php: hhvm
       env:
         - SERVICE_MANAGER_VERSION="^2.7.5"
         - EVENT_MANAGER_VERSION="^2.6.2"
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:

diff --git a/test/Storage/Adapter/ApcTest.php b/test/Storage/Adapter/ApcTest.php
@@ -26,7 +26,7 @@ class ApcTest extends CommonAdapterTest
 
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_APC_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_APC_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_APC_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/MemcacheTest.php b/test/Storage/Adapter/MemcacheTest.php
@@ -19,7 +19,7 @@ class MemcacheTest extends CommonAdapterTest
 {
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_MEMCACHE_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_MEMCACHE_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_MEMCACHE_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/MemcachedTest.php b/test/Storage/Adapter/MemcachedTest.php
@@ -19,7 +19,7 @@ class MemcachedTest extends CommonAdapterTest
 {
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_MEMCACHED_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_MEMCACHED_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_MEMCACHED_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/MongoDbOptionsTest.php b/test/Storage/Adapter/MongoDbOptionsTest.php
@@ -22,7 +22,7 @@ class MongoDbOptionsTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_MONGODB_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_MONGODB_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_MONGODB_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/MongoDbResourceManagerTest.php b/test/Storage/Adapter/MongoDbResourceManagerTest.php
@@ -21,7 +21,7 @@ class MongoDbResourceManagerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_MONGODB_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_MONGODB_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_MONGODB_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/MongoDbTest.php b/test/Storage/Adapter/MongoDbTest.php
@@ -20,7 +20,7 @@ class MongoDbTest extends CommonAdapterTest
 {
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_MONGODB_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_MONGODB_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_MONGODB_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/RedisResourceManagerTest.php b/test/Storage/Adapter/RedisResourceManagerTest.php
@@ -102,7 +102,7 @@ public function testSetServerWithPasswordInUriShouldNotOverridePreviousResource(
      */
     public function testValidPersistentId()
     {
-        if (!getenv('TESTS_ZEND_CACHE_REDIS_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_REDIS_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_REDIS_ENABLED to run this test');
         }
 
@@ -128,7 +128,7 @@ public function testValidPersistentId()
      */
     public function testNotValidPersistentIdOptionName()
     {
-        if (!getenv('TESTS_ZEND_CACHE_REDIS_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_REDIS_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_REDIS_ENABLED to run this test');
         }
 
@@ -156,7 +156,7 @@ public function testNotValidPersistentIdOptionName()
      */
     public function testGetMajorVersion()
     {
-        if (!getenv('TESTS_ZEND_CACHE_REDIS_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_REDIS_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_REDIS_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/RedisTest.php b/test/Storage/Adapter/RedisTest.php
@@ -31,7 +31,7 @@ class RedisTest extends CommonAdapterTest
 
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_REDIS_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_REDIS_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_REDIS_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/WinCacheTest.php b/test/Storage/Adapter/WinCacheTest.php
@@ -20,7 +20,7 @@ class WinCacheTest extends CommonAdapterTest
 {
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_WINCACHE_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_WINCACHE_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_WINCACHE_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/XCacheTest.php b/test/Storage/Adapter/XCacheTest.php
@@ -21,7 +21,7 @@ class XCacheTest extends CommonAdapterTest
 
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_XCACHE_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_XCACHE_ENABLED') != 'true') {
             $this->markTestSkipped('EnableTESTS_ZEND_CACHE_XCACHE_ENABLED  to run this test');
         }
 

diff --git a/test/Storage/Adapter/ZendServerDiskTest.php b/test/Storage/Adapter/ZendServerDiskTest.php
@@ -20,7 +20,7 @@ class ZendServerDiskTest extends CommonAdapterTest
 {
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED to run this test');
         }
 

diff --git a/test/Storage/Adapter/ZendServerShmTest.php b/test/Storage/Adapter/ZendServerShmTest.php
@@ -20,7 +20,7 @@ class ZendServerShmTest extends CommonAdapterTest
 {
     public function setUp()
     {
-        if (!getenv('TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED')) {
+        if (getenv('TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED') != 'true') {
             $this->markTestSkipped('Enable TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED to run this test');
         }