diff --git a/src/Pattern/CaptureCache.php b/src/Pattern/CaptureCache.php
index 2f41c11c9..7d5cec698 100644
--- a/src/Pattern/CaptureCache.php
+++ b/src/Pattern/CaptureCache.php
@@ -318,7 +318,6 @@ protected function createDirectoryStructure($pathname)
                 $err = ErrorHandler::stop();
                 throw new Exception\RuntimeException("chmod('{$pathname}', 0{$oct}) failed", 0, $err);
             }
-
         } else {
             // build-in mkdir function sets permission together with current umask
             // which doesn't work well on multo threaded webservers
diff --git a/src/Storage/Adapter/AdapterOptions.php b/src/Storage/Adapter/AdapterOptions.php
index 8a6ebd7dc..b3669ffa4 100644
--- a/src/Storage/Adapter/AdapterOptions.php
+++ b/src/Storage/Adapter/AdapterOptions.php
@@ -22,7 +22,6 @@
  */
 class AdapterOptions extends AbstractOptions
 {
-
     /**
      * The adapter using these options
      *
@@ -259,7 +258,7 @@ protected function normalizeTtl(&$ttl)
         }
 
         if ($ttl < 0) {
-             throw new Exception\InvalidArgumentException("TTL can't be negative");
+            throw new Exception\InvalidArgumentException("TTL can't be negative");
         }
     }
 }
diff --git a/src/Storage/Adapter/ApcIterator.php b/src/Storage/Adapter/ApcIterator.php
index 2454d7439..3cdcbf1c5 100644
--- a/src/Storage/Adapter/ApcIterator.php
+++ b/src/Storage/Adapter/ApcIterator.php
@@ -14,7 +14,6 @@
 
 class ApcIterator implements IteratorInterface
 {
-
     /**
      * The apc storage instance
      *
diff --git a/src/Storage/Adapter/Dba.php b/src/Storage/Adapter/Dba.php
index 4ce1b52a6..bb2860d7c 100644
--- a/src/Storage/Adapter/Dba.php
+++ b/src/Storage/Adapter/Dba.php
@@ -189,7 +189,6 @@ public function flush()
         }
 
         if (file_exists($pathname)) {
-
             // close the dba file before delete
             // and reopen (create) on next use
             $this->_close();
diff --git a/src/Storage/Adapter/Filesystem.php b/src/Storage/Adapter/Filesystem.php
index d09f3c857..b46f5a2df 100644
--- a/src/Storage/Adapter/Filesystem.php
+++ b/src/Storage/Adapter/Filesystem.php
@@ -38,7 +38,6 @@ class Filesystem extends AbstractAdapter implements
     TaggableInterface,
     TotalSpaceCapableInterface
 {
-
     /**
      * Buffered total space in bytes
      *
@@ -529,7 +528,6 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
             }
             $success  = true;
             return $data;
-
         } catch (BaseException $e) {
             $success = false;
             throw $e;
@@ -548,7 +546,6 @@ protected function internalGetItems(array & $normalizedKeys)
         $keys    = $normalizedKeys; // Don't change argument passed by reference
         $result  = array();
         while ($keys) {
-
             // LOCK_NB if more than one items have to read
             $nonBlocking = count($keys) > 1;
             $wouldblock  = null;
@@ -1426,7 +1423,6 @@ protected function prepareDirectoryStructure($file)
                 $err = ErrorHandler::stop();
                 throw new Exception\RuntimeException("chmod('{$pathname}', 0{$oct}) failed", 0, $err);
             }
-
         } else {
             // build-in mkdir function sets permission together with current umask
             // which doesn't work well on multo threaded webservers
@@ -1503,7 +1499,6 @@ protected function putFileContent($file, $data, $nonBlocking = false, & $wouldbl
 
         // if locking and non blocking is enabled -> file_put_contents can't used
         if ($locking && $nonBlocking) {
-
             $umask = ($umask !== false) ? umask($umask) : false;
 
             $fp = fopen($file, 'cb');
diff --git a/src/Storage/Adapter/FilesystemIterator.php b/src/Storage/Adapter/FilesystemIterator.php
index 4ab0f93f3..447cfb3db 100644
--- a/src/Storage/Adapter/FilesystemIterator.php
+++ b/src/Storage/Adapter/FilesystemIterator.php
@@ -14,7 +14,6 @@
 
 class FilesystemIterator implements IteratorInterface
 {
-
     /**
      * The Filesystem storage instance
      *
diff --git a/src/Storage/Adapter/FilesystemOptions.php b/src/Storage/Adapter/FilesystemOptions.php
index bfafb1a5d..5eabbdf3f 100644
--- a/src/Storage/Adapter/FilesystemOptions.php
+++ b/src/Storage/Adapter/FilesystemOptions.php
@@ -17,7 +17,6 @@
  */
 class FilesystemOptions extends AdapterOptions
 {
-
     /**
      * Directory to store cache files
      *
diff --git a/src/Storage/Adapter/KeyListIterator.php b/src/Storage/Adapter/KeyListIterator.php
index b16a32ae0..86bcbe160 100644
--- a/src/Storage/Adapter/KeyListIterator.php
+++ b/src/Storage/Adapter/KeyListIterator.php
@@ -15,7 +15,6 @@
 
 class KeyListIterator implements IteratorInterface, Countable
 {
-
     /**
      * The storage instance
      *
diff --git a/src/Storage/Adapter/MemcachedResourceManager.php b/src/Storage/Adapter/MemcachedResourceManager.php
index 39d8f53f4..10edb99ae 100644
--- a/src/Storage/Adapter/MemcachedResourceManager.php
+++ b/src/Storage/Adapter/MemcachedResourceManager.php
@@ -20,7 +20,6 @@
  */
 class MemcachedResourceManager
 {
-
     /**
      * Registered resources
      *
@@ -80,7 +79,6 @@ protected function normalizeServer(&$server)
                 $port   = isset($server['port'])   ? (int) $server['port']   : $port;
                 $weight = isset($server['weight']) ? (int) $server['weight'] : $weight;
             }
-
         } else {
             // parse server from URI host{:?port}{?weight}
             $server = trim($server);
diff --git a/src/Storage/Adapter/Redis.php b/src/Storage/Adapter/Redis.php
index bd6f9fe12..761b59792 100644
--- a/src/Storage/Adapter/Redis.php
+++ b/src/Storage/Adapter/Redis.php
@@ -22,7 +22,6 @@ class Redis extends AbstractAdapter implements
     FlushableInterface,
     TotalSpaceCapableInterface
 {
-
     /**
      * Has this instance be initialized
      *
@@ -271,7 +270,6 @@ protected function internalSetItems(array & $normalizedKeyValuePairs)
             } else {
                 $success = $redis->mSet($namespacedKeyValuePairs);
             }
-
         } catch (RedisResourceException $e) {
             throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
         }
@@ -387,7 +385,6 @@ public function getTotalSpace()
         }
 
         return $info['used_memory'];
-
     }
 
     /* status */
diff --git a/src/Storage/Adapter/RedisResourceManager.php b/src/Storage/Adapter/RedisResourceManager.php
index 45955b702..ed8ee2147 100644
--- a/src/Storage/Adapter/RedisResourceManager.php
+++ b/src/Storage/Adapter/RedisResourceManager.php
@@ -189,7 +189,6 @@ protected function normalizeServer(&$server)
                 $port    = isset($server['port'])    ? (int) $server['port']    : $port;
                 $timeout = isset($server['timeout']) ? (int) $server['timeout'] : $timeout;
             }
-
         } else {
             // parse server from URI host{:?port}
             $server = trim($server);
diff --git a/src/Storage/Adapter/Session.php b/src/Storage/Adapter/Session.php
index 1fdd2bdae..4603c2314 100644
--- a/src/Storage/Adapter/Session.php
+++ b/src/Storage/Adapter/Session.php
@@ -22,7 +22,6 @@ class Session extends AbstractAdapter implements
     FlushableInterface,
     IterableInterface
 {
-
     /**
      * Set options.
      *
diff --git a/src/Storage/Adapter/WinCache.php b/src/Storage/Adapter/WinCache.php
index 85ea5bda3..b911e0400 100644
--- a/src/Storage/Adapter/WinCache.php
+++ b/src/Storage/Adapter/WinCache.php
@@ -22,7 +22,6 @@ class WinCache extends AbstractAdapter implements
     FlushableInterface,
     TotalSpaceCapableInterface
 {
-
     /**
      * Constructor
      *
diff --git a/src/Storage/Adapter/XCache.php b/src/Storage/Adapter/XCache.php
index 5f5b93900..18073e9fe 100644
--- a/src/Storage/Adapter/XCache.php
+++ b/src/Storage/Adapter/XCache.php
@@ -28,7 +28,6 @@ class XCache extends AbstractAdapter implements
     IterableInterface,
     TotalSpaceCapableInterface
 {
-
     /**
      * Backup HTTP authentication properties of $_SERVER array
      *
@@ -221,7 +220,6 @@ public function flush()
      */
     public function getIterator()
     {
-
         $options   = $this->getOptions();
         $namespace = $options->getNamespace();
         $keys      = array();
@@ -237,7 +235,6 @@ public function getIterator()
                 }
             }
         } else {
-
             $prefix  = $namespace . $options->getNamespaceSeparator();
             $prefixL = strlen($prefix);
 
@@ -313,7 +310,6 @@ protected function internalGetMetadata(& $normalizedKey)
         $internalKey = $prefix . $normalizedKey;
 
         if (xcache_isset($internalKey)) {
-
             $this->initAdminAuth();
             $cnt = xcache_count(XC_TYPE_VAR);
             for ($i=0; $i < $cnt; $i++) {
diff --git a/src/Storage/Adapter/ZendServerDisk.php b/src/Storage/Adapter/ZendServerDisk.php
index 7ee8a32c9..c48992a59 100644
--- a/src/Storage/Adapter/ZendServerDisk.php
+++ b/src/Storage/Adapter/ZendServerDisk.php
@@ -22,7 +22,6 @@ class ZendServerDisk extends AbstractZendServer implements
     FlushableInterface,
     TotalSpaceCapableInterface
 {
-
     /**
      * Buffered total space in bytes
      *
diff --git a/src/Storage/Adapter/ZendServerShm.php b/src/Storage/Adapter/ZendServerShm.php
index 591147d03..6b226d7c0 100644
--- a/src/Storage/Adapter/ZendServerShm.php
+++ b/src/Storage/Adapter/ZendServerShm.php
@@ -19,7 +19,6 @@ class ZendServerShm extends AbstractZendServer implements
     FlushableInterface,
     TotalSpaceCapableInterface
 {
-
     /**
      * Constructor
      *
diff --git a/src/Storage/IteratorInterface.php b/src/Storage/IteratorInterface.php
index c08381e7a..ec76261d1 100644
--- a/src/Storage/IteratorInterface.php
+++ b/src/Storage/IteratorInterface.php
@@ -13,7 +13,6 @@
 
 interface IteratorInterface extends Iterator
 {
-
     const CURRENT_AS_SELF     = 0;
     const CURRENT_AS_KEY      = 1;
     const CURRENT_AS_VALUE    = 2;
diff --git a/test/Pattern/CallbackCacheTest.php b/test/Pattern/CallbackCacheTest.php
index 249e5ebfe..9a2c8b785 100644
--- a/test/Pattern/CallbackCacheTest.php
+++ b/test/Pattern/CallbackCacheTest.php
@@ -30,8 +30,9 @@ public static function bar()
         return 'foobar_return('.implode(', ', $args) . ') : ' . static::$fooCounter;
     }
 
-    public static function emptyMethod() {}
-
+    public static function emptyMethod()
+    {
+    }
 }
 
 class FailableCallback
@@ -56,7 +57,6 @@ function bar()
  */
 class CallbackCacheTest extends CommonPatternTest
 {
-
     /**
      * @var \Zend\Cache\Storage\StorageInterface
      */
diff --git a/test/Pattern/CaptureCacheTest.php b/test/Pattern/CaptureCacheTest.php
index 8f94f934f..cf6902a7c 100644
--- a/test/Pattern/CaptureCacheTest.php
+++ b/test/Pattern/CaptureCacheTest.php
@@ -16,7 +16,6 @@
  */
 class CaptureCacheTest extends CommonPatternTest
 {
-
     protected $_tmpCacheDir;
     protected $_umask;
     protected $_bufferedServerSuperGlobal;
diff --git a/test/Pattern/ClassCacheTest.php b/test/Pattern/ClassCacheTest.php
index 23def218f..08a0b19e9 100644
--- a/test/Pattern/ClassCacheTest.php
+++ b/test/Pattern/ClassCacheTest.php
@@ -30,8 +30,9 @@ public static function bar()
         return 'foobar_return('.implode(', ', $args) . ') : ' . static::$fooCounter;
     }
 
-    public static function emptyMethod() {}
-
+    public static function emptyMethod()
+    {
+    }
 }
 
 /**
@@ -39,7 +40,6 @@ public static function emptyMethod() {}
  */
 class ClassCacheTest extends CommonPatternTest
 {
-
     /**
      * @var \Zend\Cache\Storage\StorageInterface
      */
diff --git a/test/Pattern/CommonPatternTest.php b/test/Pattern/CommonPatternTest.php
index 481b9cdcd..477735abd 100644
--- a/test/Pattern/CommonPatternTest.php
+++ b/test/Pattern/CommonPatternTest.php
@@ -16,7 +16,6 @@
  */
 class CommonPatternTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @var \Zend\Cache\Pattern\PatternInterface
      */
diff --git a/test/Pattern/ObjectCacheTest.php b/test/Pattern/ObjectCacheTest.php
index 062a1f4c8..e4088f58e 100644
--- a/test/Pattern/ObjectCacheTest.php
+++ b/test/Pattern/ObjectCacheTest.php
@@ -37,8 +37,9 @@ public function __invoke()
         return call_user_func_array(array($this, 'bar'), func_get_args());
     }
 
-    public function emptyMethod() {}
-
+    public function emptyMethod()
+    {
+    }
 }
 
 /**
@@ -46,7 +47,6 @@ public function emptyMethod() {}
  */
 class ObjectCacheTest extends CommonPatternTest
 {
-
     /**
      * @var \Zend\Cache\Storage\StorageInterface
      */
diff --git a/test/Pattern/OutputCacheTest.php b/test/Pattern/OutputCacheTest.php
index 4fe9c094b..8d3855bc5 100644
--- a/test/Pattern/OutputCacheTest.php
+++ b/test/Pattern/OutputCacheTest.php
@@ -16,7 +16,6 @@
  */
 class OutputCacheTest extends CommonPatternTest
 {
-
     /**
      * @var \Zend\Cache\Storage\StorageInterface
      */
diff --git a/test/PatternFactoryTest.php b/test/PatternFactoryTest.php
index 777361940..7a499a05b 100644
--- a/test/PatternFactoryTest.php
+++ b/test/PatternFactoryTest.php
@@ -16,7 +16,6 @@
  */
 class PatternFactoryTest extends \PHPUnit_Framework_TestCase
 {
-
     public function setUp()
     {
         Cache\PatternFactory::resetPluginManager();
diff --git a/test/Storage/Adapter/AbstractAdapterTest.php b/test/Storage/Adapter/AbstractAdapterTest.php
index f986faf01..0dbf0702b 100644
--- a/test/Storage/Adapter/AbstractAdapterTest.php
+++ b/test/Storage/Adapter/AbstractAdapterTest.php
@@ -17,7 +17,6 @@
  */
 class AbstractAdapterTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Mock of the abstract storage adapter
      *
diff --git a/test/Storage/Adapter/AbstractDbaTest.php b/test/Storage/Adapter/AbstractDbaTest.php
index c6d2a4f05..10acdd40f 100644
--- a/test/Storage/Adapter/AbstractDbaTest.php
+++ b/test/Storage/Adapter/AbstractDbaTest.php
@@ -16,7 +16,6 @@
  */
 abstract class AbstractDbaTest extends CommonAdapterTest
 {
-
     protected $handler;
     protected $temporaryDbaFile;
 
diff --git a/test/Storage/Adapter/AbstractZendServerTest.php b/test/Storage/Adapter/AbstractZendServerTest.php
index 860cb7842..1d695cf45 100644
--- a/test/Storage/Adapter/AbstractZendServerTest.php
+++ b/test/Storage/Adapter/AbstractZendServerTest.php
@@ -17,7 +17,6 @@
  */
 class AbstractZendServerTest extends \PHPUnit_Framework_TestCase
 {
-
     public function setUp()
     {
         $this->_options = new AdapterOptions();
diff --git a/test/Storage/Adapter/ApcTest.php b/test/Storage/Adapter/ApcTest.php
index 6356be795..62e8c11e3 100644
--- a/test/Storage/Adapter/ApcTest.php
+++ b/test/Storage/Adapter/ApcTest.php
@@ -16,7 +16,6 @@
  */
 class ApcTest extends CommonAdapterTest
 {
-
     /**
      * Restore 'apc.use_request_time'
      *
diff --git a/test/Storage/Adapter/BlackHoleTest.php b/test/Storage/Adapter/BlackHoleTest.php
index 8b1226422..e0eb5c1fc 100644
--- a/test/Storage/Adapter/BlackHoleTest.php
+++ b/test/Storage/Adapter/BlackHoleTest.php
@@ -34,7 +34,6 @@
  */
 class BlackHoleTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * The storage adapter
      *
diff --git a/test/Storage/Adapter/CommonAdapterTest.php b/test/Storage/Adapter/CommonAdapterTest.php
index 6e98d8058..df03e7a6a 100644
--- a/test/Storage/Adapter/CommonAdapterTest.php
+++ b/test/Storage/Adapter/CommonAdapterTest.php
@@ -31,7 +31,6 @@
  */
 abstract class CommonAdapterTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * The storage adapter
      *
@@ -751,9 +750,9 @@ public function testCheckAndSetItem()
 
     public function testIncrementItem()
     {
-       $this->assertTrue($this->_storage->setItem('counter', 10));
-       $this->assertEquals(15, $this->_storage->incrementItem('counter', 5));
-       $this->assertEquals(15, $this->_storage->getItem('counter'));
+        $this->assertTrue($this->_storage->setItem('counter', 10));
+        $this->assertEquals(15, $this->_storage->incrementItem('counter', 5));
+        $this->assertEquals(15, $this->_storage->getItem('counter'));
     }
 
     public function testIncrementItemInitialValue()
@@ -798,9 +797,9 @@ public function testIncrementItemsReturnsEmptyArrayIfNonWritable()
 
     public function testDecrementItem()
     {
-       $this->assertTrue($this->_storage->setItem('counter', 30));
-       $this->assertEquals(25, $this->_storage->decrementItem('counter', 5));
-       $this->assertEquals(25, $this->_storage->getItem('counter'));
+        $this->assertTrue($this->_storage->setItem('counter', 30));
+        $this->assertEquals(25, $this->_storage->decrementItem('counter', 5));
+        $this->assertEquals(25, $this->_storage->getItem('counter'));
     }
 
     public function testDecrementItemInitialValue()
diff --git a/test/Storage/Adapter/DbaDb2Test.php b/test/Storage/Adapter/DbaDb2Test.php
index bf7033be4..62c67bd8e 100644
--- a/test/Storage/Adapter/DbaDb2Test.php
+++ b/test/Storage/Adapter/DbaDb2Test.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache
diff --git a/test/Storage/Adapter/DbaDb3Test.php b/test/Storage/Adapter/DbaDb3Test.php
index e9c13189d..c859f5399 100644
--- a/test/Storage/Adapter/DbaDb3Test.php
+++ b/test/Storage/Adapter/DbaDb3Test.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache
diff --git a/test/Storage/Adapter/DbaDb4Test.php b/test/Storage/Adapter/DbaDb4Test.php
index e5011bb44..5e7a2f7fb 100644
--- a/test/Storage/Adapter/DbaDb4Test.php
+++ b/test/Storage/Adapter/DbaDb4Test.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache
diff --git a/test/Storage/Adapter/DbaFlatfileTest.php b/test/Storage/Adapter/DbaFlatfileTest.php
index 52b4964cd..ef1cc9729 100644
--- a/test/Storage/Adapter/DbaFlatfileTest.php
+++ b/test/Storage/Adapter/DbaFlatfileTest.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache
diff --git a/test/Storage/Adapter/DbaGdbmTest.php b/test/Storage/Adapter/DbaGdbmTest.php
index 097f30975..7d91a3b94 100644
--- a/test/Storage/Adapter/DbaGdbmTest.php
+++ b/test/Storage/Adapter/DbaGdbmTest.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache
diff --git a/test/Storage/Adapter/DbaInifileTest.php b/test/Storage/Adapter/DbaInifileTest.php
index 30726ccfe..aafc1edcd 100644
--- a/test/Storage/Adapter/DbaInifileTest.php
+++ b/test/Storage/Adapter/DbaInifileTest.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache
diff --git a/test/Storage/Adapter/DbaQdbmTest.php b/test/Storage/Adapter/DbaQdbmTest.php
index 483bd1302..bbbba8d79 100644
--- a/test/Storage/Adapter/DbaQdbmTest.php
+++ b/test/Storage/Adapter/DbaQdbmTest.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache
diff --git a/test/Storage/Adapter/FilesystemTest.php b/test/Storage/Adapter/FilesystemTest.php
index 70c945cbf..6e6035892 100644
--- a/test/Storage/Adapter/FilesystemTest.php
+++ b/test/Storage/Adapter/FilesystemTest.php
@@ -18,7 +18,6 @@
  */
 class FilesystemTest extends CommonAdapterTest
 {
-
     protected $_tmpCacheDir;
     protected $_umask;
 
@@ -130,7 +129,9 @@ public function testSetCacheDirNotWritableException()
 
         // create a not writable temporaty directory
         $testDir = tempnam(sys_get_temp_dir(), 'ZendTest');
-        unlink($testDir); mkdir($testDir); chmod($testDir, 0557);
+        unlink($testDir);
+        mkdir($testDir);
+        chmod($testDir, 0557);
 
         try {
             $this->_options->setCacheDir($testDir);
@@ -157,7 +158,9 @@ public function testSetCacheDirNotReadableException()
 
         // create a not readable temporaty directory
         $testDir = tempnam(sys_get_temp_dir(), 'ZendTest');
-        unlink($testDir); mkdir($testDir); chmod($testDir, 0337);
+        unlink($testDir);
+        mkdir($testDir);
+        chmod($testDir, 0337);
 
         try {
             $this->_options->setCacheDir($testDir);
diff --git a/test/Storage/Adapter/KeyListIteratorTest.php b/test/Storage/Adapter/KeyListIteratorTest.php
index 932829131..f462751d9 100644
--- a/test/Storage/Adapter/KeyListIteratorTest.php
+++ b/test/Storage/Adapter/KeyListIteratorTest.php
@@ -17,7 +17,6 @@
  */
 class KeyListIteratorTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testCount()
     {
         $keys = array('key1', 'key2', 'key3');
diff --git a/test/Storage/Adapter/MemcacheResourceManagerTest.php b/test/Storage/Adapter/MemcacheResourceManagerTest.php
index f788c1b23..ed0a8ee66 100644
--- a/test/Storage/Adapter/MemcacheResourceManagerTest.php
+++ b/test/Storage/Adapter/MemcacheResourceManagerTest.php
@@ -20,7 +20,6 @@
  */
 class MemcacheResourceManagerTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * The resource manager
      *
diff --git a/test/Storage/Adapter/MemcacheTest.php b/test/Storage/Adapter/MemcacheTest.php
index 005518786..2d7a48c46 100644
--- a/test/Storage/Adapter/MemcacheTest.php
+++ b/test/Storage/Adapter/MemcacheTest.php
@@ -16,7 +16,6 @@
  */
 class MemcacheTest extends CommonAdapterTest
 {
-
     public function setUp()
     {
         if (!defined('TESTS_ZEND_CACHE_MEMCACHE_ENABLED') || !TESTS_ZEND_CACHE_MEMCACHE_ENABLED) {
diff --git a/test/Storage/Adapter/MemcachedResourceManagerTest.php b/test/Storage/Adapter/MemcachedResourceManagerTest.php
index 9c068e592..fa6cc7856 100644
--- a/test/Storage/Adapter/MemcachedResourceManagerTest.php
+++ b/test/Storage/Adapter/MemcachedResourceManagerTest.php
@@ -20,7 +20,6 @@
  */
 class MemcachedResourceManagerTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * The resource manager
      *
diff --git a/test/Storage/Adapter/MemcachedTest.php b/test/Storage/Adapter/MemcachedTest.php
index d1dcc34ca..54e0289e0 100644
--- a/test/Storage/Adapter/MemcachedTest.php
+++ b/test/Storage/Adapter/MemcachedTest.php
@@ -16,7 +16,6 @@
  */
 class MemcachedTest extends CommonAdapterTest
 {
-
     public function setUp()
     {
         if (!defined('TESTS_ZEND_CACHE_MEMCACHED_ENABLED') || !TESTS_ZEND_CACHE_MEMCACHED_ENABLED) {
diff --git a/test/Storage/Adapter/MemoryTest.php b/test/Storage/Adapter/MemoryTest.php
index 96fcb1adc..cf0645973 100644
--- a/test/Storage/Adapter/MemoryTest.php
+++ b/test/Storage/Adapter/MemoryTest.php
@@ -16,7 +16,6 @@
  */
 class MemoryTest extends CommonAdapterTest
 {
-
     public function setUp()
     {
         // instantiate memory adapter
diff --git a/test/Storage/Adapter/RedisTest.php b/test/Storage/Adapter/RedisTest.php
index c5bc5dee0..89dc8f9ac 100644
--- a/test/Storage/Adapter/RedisTest.php
+++ b/test/Storage/Adapter/RedisTest.php
@@ -14,7 +14,6 @@
 
 class RedisTest extends CommonAdapterTest
 {
-
     /**
      *
      * @var Cache\Storage\Adapter\RedisOptions
@@ -313,5 +312,4 @@ public function testOptionsGetSetPassword()
         $this->_options->setPassword($password);
         $this->assertEquals($password, $this->_options->getPassword(), 'Password was set incorrectly using RedisOptions');
     }
-
 }
diff --git a/test/Storage/Adapter/SessionTest.php b/test/Storage/Adapter/SessionTest.php
index c2a6b5874..4079f87d7 100644
--- a/test/Storage/Adapter/SessionTest.php
+++ b/test/Storage/Adapter/SessionTest.php
@@ -19,7 +19,6 @@
  */
 class SessionTest extends CommonAdapterTest
 {
-
     public function setUp()
     {
         $_SESSION = array();
diff --git a/test/Storage/Adapter/WinCacheTest.php b/test/Storage/Adapter/WinCacheTest.php
index db0118189..24cc51a7e 100644
--- a/test/Storage/Adapter/WinCacheTest.php
+++ b/test/Storage/Adapter/WinCacheTest.php
@@ -17,7 +17,6 @@
  */
 class WinCacheTest extends CommonAdapterTest
 {
-
     public function setUp()
     {
         if (!defined('TESTS_ZEND_CACHE_WINCACHE_ENABLED') || !TESTS_ZEND_CACHE_WINCACHE_ENABLED) {
diff --git a/test/Storage/Adapter/XCacheTest.php b/test/Storage/Adapter/XCacheTest.php
index fc2eac774..c7abf3444 100644
--- a/test/Storage/Adapter/XCacheTest.php
+++ b/test/Storage/Adapter/XCacheTest.php
@@ -16,7 +16,6 @@
  */
 class XCacheTest extends CommonAdapterTest
 {
-
     protected $backupServerArray;
 
     public function setUp()
diff --git a/test/Storage/Adapter/ZendServerDiskTest.php b/test/Storage/Adapter/ZendServerDiskTest.php
index c51b9d99f..d429f9e28 100644
--- a/test/Storage/Adapter/ZendServerDiskTest.php
+++ b/test/Storage/Adapter/ZendServerDiskTest.php
@@ -17,7 +17,6 @@
  */
 class ZendServerDiskTest extends CommonAdapterTest
 {
-
     public function setUp()
     {
         if (!defined('TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED') || !TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED) {
diff --git a/test/Storage/Adapter/ZendServerShmTest.php b/test/Storage/Adapter/ZendServerShmTest.php
index 4316b2164..3261b2f1f 100644
--- a/test/Storage/Adapter/ZendServerShmTest.php
+++ b/test/Storage/Adapter/ZendServerShmTest.php
@@ -17,7 +17,6 @@
  */
 class ZendServerShmTest extends CommonAdapterTest
 {
-
     public function setUp()
     {
         if (!defined('TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED') || !TESTS_ZEND_CACHE_ZEND_SERVER_ENABLED) {
diff --git a/test/Storage/CapabilitiesTest.php b/test/Storage/CapabilitiesTest.php
index 4fe0d973e..317de1866 100644
--- a/test/Storage/CapabilitiesTest.php
+++ b/test/Storage/CapabilitiesTest.php
@@ -17,7 +17,6 @@
  */
 class CapabilitiesTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Capabilities instance
      *
diff --git a/test/Storage/Plugin/ClearExpiredByFactorTest.php b/test/Storage/Plugin/ClearExpiredByFactorTest.php
index 42491789f..b643e4f90 100644
--- a/test/Storage/Plugin/ClearExpiredByFactorTest.php
+++ b/test/Storage/Plugin/ClearExpiredByFactorTest.php
@@ -16,7 +16,6 @@
 
 class ClearExpiredByFactorTest extends CommonPluginTest
 {
-
     /**
      * The storage adapter
      *
diff --git a/test/Storage/Plugin/CommonPluginTest.php b/test/Storage/Plugin/CommonPluginTest.php
index d5ffc92d4..12bbcb900 100644
--- a/test/Storage/Plugin/CommonPluginTest.php
+++ b/test/Storage/Plugin/CommonPluginTest.php
@@ -18,7 +18,6 @@
  */
 abstract class CommonPluginTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * The storage plugin
      *
diff --git a/test/Storage/Plugin/ExceptionHandlerTest.php b/test/Storage/Plugin/ExceptionHandlerTest.php
index 7f1d878b6..05bc09481 100644
--- a/test/Storage/Plugin/ExceptionHandlerTest.php
+++ b/test/Storage/Plugin/ExceptionHandlerTest.php
@@ -16,7 +16,6 @@
 
 class ExceptionHandlerTest extends CommonPluginTest
 {
-
     /**
      * The storage adapter
      *
diff --git a/test/Storage/Plugin/IgnoreUserAbortTest.php b/test/Storage/Plugin/IgnoreUserAbortTest.php
index 5701debd6..db7776b0d 100644
--- a/test/Storage/Plugin/IgnoreUserAbortTest.php
+++ b/test/Storage/Plugin/IgnoreUserAbortTest.php
@@ -17,7 +17,6 @@
  */
 class IgnoreUserAbortTest extends CommonPluginTest
 {
-
     /**
      * The storage adapter
      *
diff --git a/test/Storage/Plugin/OptimizeByFactorTest.php b/test/Storage/Plugin/OptimizeByFactorTest.php
index 05d9c2269..ae79fff3d 100644
--- a/test/Storage/Plugin/OptimizeByFactorTest.php
+++ b/test/Storage/Plugin/OptimizeByFactorTest.php
@@ -16,7 +16,6 @@
 
 class OptimizeByFactorTest extends CommonPluginTest
 {
-
     /**
      * The storage adapter
      *
diff --git a/test/Storage/Plugin/SerializerTest.php b/test/Storage/Plugin/SerializerTest.php
index b3b2facf8..44dd6fcc1 100644
--- a/test/Storage/Plugin/SerializerTest.php
+++ b/test/Storage/Plugin/SerializerTest.php
@@ -20,7 +20,6 @@
  */
 class SerializerTest extends CommonPluginTest
 {
-
     /**
      * The storage adapter
      *
diff --git a/test/StorageFactoryTest.php b/test/StorageFactoryTest.php
index 46c65d081..72d55d7cf 100644
--- a/test/StorageFactoryTest.php
+++ b/test/StorageFactoryTest.php
@@ -16,7 +16,6 @@
  */
 class StorageFactoryTest extends \PHPUnit_Framework_TestCase
 {
-
     public function setUp()
     {
         Cache\StorageFactory::resetAdapterPluginManager();
@@ -182,7 +181,6 @@ public function testFactoryWithPluginsAndOptionsArray()
 
         // test plugin structure
         foreach ($storage->getPluginRegistry() as $plugin) {
-
             // test plugin options
             $pluginClass = get_class($plugin);
             switch ($pluginClass) {
@@ -203,7 +201,6 @@ public function testFactoryWithPluginsAndOptionsArray()
                 default:
                     $this->fail("Unexpected plugin class '{$pluginClass}'");
             }
-
         }
     }
 }