Merge branch 'cs/zendframework/zendframework#6872-php-cs-fixer-automa…

…ted-fixes' Close zendframework/zendframework#6872 Forward port zendframework/zendframework#6872
zendframework · Nov 14, 2014 · 5bbfdcb · 5bbfdcb
2 parents 9ae6165 + 10f31cd
commit 5bbfdcb
Show file tree

Hide file tree

Showing 58 changed files with 22 additions and 85 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,7 +24,6 @@ class Redis extends AbstractAdapter implements
     FlushableInterface,
     TotalSpaceCapableInterface
 {
-
     /**
      * Has this instance be initialized
      *
@@ -273,7 +272,6 @@ protected function internalSetItems(array & $normalizedKeyValuePairs)
             } else {
                 $success = $redis->mSet($namespacedKeyValuePairs);
             }
-
         } catch (RedisResourceException $e) {
             throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
         }
@@ -415,7 +413,6 @@ public function getTotalSpace()
         }
 
         return $info['used_memory'];
-
     }
 
     /* status */

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,7 +19,6 @@ class ZendServerShm extends AbstractZendServer implements
     FlushableInterface,
     TotalSpaceCapableInterface
 {
-
     /**
      * Constructor
      *

diff --git 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
@@ -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
@@ -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
@@ -30,16 +30,16 @@ public static function bar()
         return 'foobar_return('.implode(', ', $args) . ') : ' . static::$fooCounter;
     }
 
-    public static function emptyMethod() {}
-
+    public static function emptyMethod()
+    {
+    }
 }
 
 /**
  * @group      Zend_Cache
  */
 class ClassCacheTest extends CommonPatternTest
 {
-
     /**
      * @var \Zend\Cache\Storage\StorageInterface
      */

diff --git 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
@@ -37,16 +37,16 @@ public function __invoke()
         return call_user_func_array(array($this, 'bar'), func_get_args());
     }
 
-    public function emptyMethod() {}
-
+    public function emptyMethod()
+    {
+    }
 }
 
 /**
  * @group      Zend_Cache
  */
 class ObjectCacheTest extends CommonPatternTest
 {
-
     /**
      * @var \Zend\Cache\Storage\StorageInterface
      */

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -755,9 +755,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()
@@ -802,9 +802,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
@@ -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
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
     class ApcIterator implements IteratorInterface
     {
         /**
          * The apc storage instance
          *
@@ Expand Down @@