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

…ted-fixes' Close zendframework/zendframework#6872 Forward port zendframework/zendframework#6872
laminas · Nov 14, 2014 · 5e9fa16 · 5e9fa16
2 parents 8d4ba9f + 2c7ef78
commit 5e9fa16
Show file tree

Hide file tree

Showing 26 changed files with 12 additions and 34 deletions.
diff --git a/AbstractAdapterTest.php b/AbstractAdapterTest.php
@@ -17,7 +17,6 @@
  */
 class AbstractAdapterTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Mock of the abstract storage adapter
      *

diff --git a/AbstractDbaTest.php b/AbstractDbaTest.php
@@ -16,7 +16,6 @@
  */
 abstract class AbstractDbaTest extends CommonAdapterTest
 {
-
     protected $handler;
     protected $temporaryDbaFile;
 

diff --git a/AbstractZendServerTest.php b/AbstractZendServerTest.php
@@ -17,7 +17,6 @@
  */
 class AbstractZendServerTest extends \PHPUnit_Framework_TestCase
 {
-
     public function setUp()
     {
         $this->_options = new AdapterOptions();

diff --git a/ApcTest.php b/ApcTest.php
@@ -16,7 +16,6 @@
  */
 class ApcTest extends CommonAdapterTest
 {
-
     /**
      * Restore 'apc.use_request_time'
      *

diff --git a/BlackHoleTest.php b/BlackHoleTest.php
@@ -34,7 +34,6 @@
  */
 class BlackHoleTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * The storage adapter
      *

diff --git a/CommonAdapterTest.php b/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/DbaDb2Test.php b/DbaDb2Test.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache

diff --git a/DbaDb3Test.php b/DbaDb3Test.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache

diff --git a/DbaDb4Test.php b/DbaDb4Test.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache

diff --git a/DbaFlatfileTest.php b/DbaFlatfileTest.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache

diff --git a/DbaGdbmTest.php b/DbaGdbmTest.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache

diff --git a/DbaInifileTest.php b/DbaInifileTest.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache

diff --git a/DbaQdbmTest.php b/DbaQdbmTest.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Adapter;
 
-use Zend\Cache;
 
 /**
  * @group      Zend_Cache

diff --git a/FilesystemTest.php b/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/KeyListIteratorTest.php b/KeyListIteratorTest.php
@@ -17,7 +17,6 @@
  */
 class KeyListIteratorTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testCount()
     {
         $keys = array('key1', 'key2', 'key3');

diff --git a/MemcacheResourceManagerTest.php b/MemcacheResourceManagerTest.php
@@ -20,7 +20,6 @@
  */
 class MemcacheResourceManagerTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * The resource manager
      *

diff --git a/MemcacheTest.php b/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/MemcachedResourceManagerTest.php b/MemcachedResourceManagerTest.php
@@ -20,7 +20,6 @@
  */
 class MemcachedResourceManagerTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * The resource manager
      *

diff --git a/MemcachedTest.php b/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/MemoryTest.php b/MemoryTest.php
@@ -16,7 +16,6 @@
  */
 class MemoryTest extends CommonAdapterTest
 {
-
     public function setUp()
     {
         // instantiate memory adapter

diff --git a/RedisTest.php b/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/SessionTest.php b/SessionTest.php
@@ -19,7 +19,6 @@
  */
 class SessionTest extends CommonAdapterTest
 {
-
     public function setUp()
     {
         $_SESSION = array();

diff --git a/WinCacheTest.php b/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/XCacheTest.php b/XCacheTest.php
@@ -16,7 +16,6 @@
  */
 class XCacheTest extends CommonAdapterTest
 {
-
     protected $backupServerArray;
 
     public function setUp()

diff --git a/ZendServerDiskTest.php b/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/ZendServerShmTest.php b/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) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
      */
     class AbstractAdapterTest extends \PHPUnit_Framework_TestCase
     {
         /**
          * Mock of the abstract storage adapter
          *
@@ Expand Down @@