Merge branch 'hotfix/7476'

Close zendframework/zendframework#7476
zendframework · May 4, 2015 · 784c8fb · 784c8fb
2 parents 8a5de4c + ff73321
commit 784c8fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/test/Pattern/CaptureCacheTest.php b/test/Pattern/CaptureCacheTest.php
@@ -92,7 +92,7 @@ public function testSetThrowsLogicExceptionOnMissingPublicDir()
     public function testSetWithNormalPageId()
     {
         $this->_pattern->set('content', '/dir1/dir2/file');
-        $this->assertTrue(file_exists($this->_tmpCacheDir . '/dir1/dir2/file'));
+        $this->assertFileExists($this->_tmpCacheDir . '/dir1/dir2/file');
         $this->assertSame(file_get_contents($this->_tmpCacheDir . '/dir1/dir2/file'), 'content');
     }
 
@@ -101,7 +101,7 @@ public function testSetWithIndexFilename()
         $this->_options->setIndexFilename('test.html');
 
         $this->_pattern->set('content', '/dir1/dir2/');
-        $this->assertTrue(file_exists($this->_tmpCacheDir . '/dir1/dir2/test.html'));
+        $this->assertFileExists($this->_tmpCacheDir . '/dir1/dir2/test.html');
         $this->assertSame(file_get_contents($this->_tmpCacheDir . '/dir1/dir2/test.html'), 'content');
     }
 

diff --git a/test/Storage/Adapter/RedisTest.php b/test/Storage/Adapter/RedisTest.php
@@ -213,7 +213,7 @@ public function testGetSetLibOptionsOnExistingRedisResourceInstance()
         $this->_options->setLibOptions($options);
         $this->_storage->setItem($key, $value);
         //should not serialize array correctly
-        $this->assertFalse(is_array($this->_storage->getItem($key)), 'Redis should not serialize automatically anymore, lib options were not set correctly');
+        $this->assertNotInternalType('array', $this->_storage->getItem($key), 'Redis should not serialize automatically anymore, lib options were not set correctly');
     }
 
     public function testGetSetLibOptionsWithCleanRedisResourceInstance()
@@ -233,7 +233,7 @@ public function testGetSetLibOptionsWithCleanRedisResourceInstance()
         $this->_options->setLibOptions($options);
         $redis->setItem($key, $value);
         //should not serialize array correctly
-        $this->assertFalse(is_array($redis->getItem($key)), 'Redis should not serialize automatically anymore, lib options were not set correctly');
+        $this->assertNotInternalType('array', $redis->getItem($key), 'Redis should not serialize automatically anymore, lib options were not set correctly');
     }
 
     /* RedisOptions */