Merge pull request #10285 from cleptric/cleanup

Remove multiple empty lines

src/Cache/CacheEngine.php

@@ -166,7 +166,6 @@ abstract class CacheEngine
      */
     abstract public function delete($key);
 
-
     /**
      * Delete all keys from the cache
      *

src/Controller/Component/SecurityComponent.php

@@ -455,7 +455,6 @@ class SecurityComponent extends Component
         return $fieldList;
     }
 
-
     /**
      * Get the unlocked string
      *

src/Database/Schema/CachedCollection.php

@@ -108,7 +108,6 @@ class CachedCollection extends Collection
         return $this->_cache;
     }
 
-
     /**
      * Sets the cache config name to use for caching table metadata, or
      * disables it if false is passed.

src/Database/TypeMap.php

@@ -85,7 +85,6 @@ class TypeMap
         return $this->_defaults;
     }
 
-
     /**
      * Configures a map of default fields and their associated types to be
      * used as the default list of types for every function in this class

src/Http/Client/Response.php

@@ -560,7 +560,6 @@ class Response extends Message implements ResponseInterface
         return $this->stream->getContents();
     }
 
-
     /**
      * Read values as properties.
      *

src/Mailer/Email.php

@@ -581,7 +581,6 @@ class Email implements JsonSerializable, Serializable
         return $this->setReturnPath($email, $name);
     }
 
-
     /**
      * Sets "to" address.
      *
@@ -1447,7 +1446,6 @@ class Email implements JsonSerializable, Serializable
         return $this->setEmailFormat($format);
     }
 
-
     /**
      * Sets the transport.
      *
@@ -1648,7 +1646,6 @@ class Email implements JsonSerializable, Serializable
         return $this->setDomain($domain);
     }
 
-
     /**
      * Add attachments to the email message
      *

src/ORM/Association/Loader/SelectLoader.php

@@ -111,7 +111,6 @@ class SelectLoader
         $this->sort = isset($options['sort']) ? $options['sort'] : null;
     }
 
-
     /**
      * Returns a callable that can be used for injecting association results into a given
      * iterator. The options accepted by this method are the same as `Association::eagerLoader()`

src/ORM/Table.php

@@ -405,7 +405,6 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc
         return $this->_alias;
     }
 
-
     /**
      * {@inheritDoc}
      * @deprecated 3.4.0 Use setAlias()/getAlias() instead.
@@ -449,7 +448,6 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc
         return $this;
     }
 
-
     /**
      * Returns the table registry key used to create this table instance.
      *

src/Routing/Router.php

@@ -446,7 +446,6 @@ class Router
         throw new InvalidArgumentException('Unknown request type received.');
     }
 
-
     /**
      * Pops a request off of the request stack. Used when doing requestAction
      *

tests/TestCase/Collection/CollectionTest.php

@@ -26,7 +26,6 @@ class TestCollection extends \IteratorIterator implements CollectionInterface
 {
     use CollectionTrait;
 
-
     public function __construct($items)
     {
         if (is_array($items)) {

tests/TestCase/Controller/Component/PaginatorComponentTest.php

@@ -344,7 +344,6 @@ class PaginatorComponentTest extends TestCase
         ];
         $this->assertEquals($expected, $result);
 
-
         $settings = [
             'page' => 1,
             'limit' => 20,

tests/TestCase/Controller/Component/SecurityComponentTest.php

@@ -1349,7 +1349,6 @@ class SecurityComponentTest extends TestCase
             []
         ]));
 
-
         $this->Controller->request->data = [
             'Model' => ['username' => '', 'password' => ''],
             '_Token' => compact('fields', 'unlocked', 'debug')

tests/TestCase/Database/ExpressionTypeCastingIntegrationTest.php

@@ -139,7 +139,6 @@ class ExpressionTypeCastingIntegrationTest extends TestCase
         $this->assertEquals('4c2681c048298a29a7fb413140cf8569', $result[0]['id']);
     }
 
-
     /**
      * Tests Select using value object in conditions
      *

tests/TestCase/Database/QueryTest.php

@@ -4077,7 +4077,6 @@ class QueryTest extends TestCase
         $this->assertInstanceOf('DateTime', $result[0]['the_date']);
     }
 
-
     /**
      * Tests that the json type can save and get data symmetrically
      *

tests/TestCase/Database/Type/BoolTypeTest.php

@@ -72,7 +72,6 @@ class BoolTypeTest extends TestCase
         $this->type->toDatabase([1, 2], $this->driver);
     }
 
-
     /**
      * Tests that passing an invalid value will throw an exception
      *

tests/TestCase/Filesystem/FolderTest.php

@@ -102,7 +102,6 @@ class FolderTest extends TestCase
         $result = $Base->pwd();
         $this->assertEquals($basePath, $result);
 
-
         // is "/" in "/tests/test_app/"
         $result = $Base->inPath(realpath(DS), true);
         $this->assertFalse($result, true);
@@ -127,7 +126,6 @@ class FolderTest extends TestCase
         $result = $Base->inPath(TMP . 'tests' . DS . 'other' . DS . $basePath, true);
         $this->assertFalse($result);
 
-
         // is "/tests/test_app/" in "/"
         $result = $Base->inPath(realpath(DS));
         $this->assertTrue($result);

tests/TestCase/Http/ServerTest.php

@@ -26,7 +26,6 @@ use Zend\Diactoros\ServerRequestFactory;
 
 require_once __DIR__ . '/server_mocks.php';
 
-
 /**
  * Server test case
  */

tests/TestCase/I18n/Formatter/IcuFormatterTest.php

@@ -127,7 +127,6 @@ class IcuFormatterTest extends TestCase
     {
         $this->skipIf(version_compare(PHP_VERSION, '7', '<'));
 
-
         $formatter = new IcuFormatter();
         $formatter->format('en_US', '{crazy format', ['some', 'vars']);
     }

tests/TestCase/ORM/EagerLoaderTest.php

@@ -276,7 +276,6 @@ class EagerLoaderTest extends TestCase
         $this->assertEquals($expected, $loader->contain());
     }
 
-
     /**
      * Tests setting containments using direct key value pairs works just as with key array.
      *

tests/TestCase/ORM/Locator/TableLocatorTest.php

@@ -36,7 +36,6 @@ class MyUsersTable extends Table
     protected $_table = 'users';
 }
 
-
 /**
  * Test case for TableLocator
  */
@@ -50,7 +49,6 @@ class TableLocatorTest extends TestCase
      */
     protected $_locator;
 
-
     /**
      * setup
      *

tests/TestCase/ORM/QueryRegressionTest.php

@@ -1239,7 +1239,6 @@ class QueryRegressionTest extends TestCase
         $this->assertNotEmpty($result);
         $this->assertInstanceOf('Cake\I18n\Time', $result->_matchingData['Comments']->updated);
 
-
         $query = $table->find()
             ->matching('Comments.Articles.Authors')
             ->where([

tests/TestCase/ORM/TableTest.php

@@ -1826,7 +1826,6 @@ class TableTest extends TestCase
         $this->assertTrue($authors->Articles->exists(['id' => $articleId]));
     }
 
-
     /**
      * Test that save works with replace saveStrategy, replacing the already persisted entities even if no new entities are passed
      *
@@ -2674,7 +2673,6 @@ class TableTest extends TestCase
         $table->save($data);
     }
 
-
     /**
      * Tests that only the properties marked as dirty are actually saved
      * to the database
@@ -4330,7 +4328,6 @@ class TableTest extends TestCase
 
         $this->assertTrue($authors->Articles->link($author, $newArticles));
 
-
         $this->assertCount($sizeArticles, $authors->Articles->findAllByAuthorId($author->id));
         $this->assertCount($sizeArticles, $author->articles);
         $this->assertFalse($author->dirty('articles'));
@@ -4557,7 +4554,6 @@ class TableTest extends TestCase
         $authors->Articles->unlink($author, [$article]);
     }
 
-
     /**
      * Integration test for replacing entities which depend on their source entity with HasMany and failing transaction. False should be returned when
      * unlinking fails while replacing even when cascadeCallbacks is enabled
@@ -4646,7 +4642,6 @@ class TableTest extends TestCase
         $this->assertCount($sizeArticles, $authors->Articles->findAllByAuthorId($author->id));
     }
 
-
     /**
      * Integration test for replacing entities with HasMany and an empty target list. The transaction must be successfull
      *
@@ -4790,7 +4785,6 @@ class TableTest extends TestCase
         $this->assertEquals((new Collection($newArticles))->extract('title'), (new Collection($author->articles))->extract('title'));
     }
 
-
     /**
      * Integration test to show how to unlink a single record from a belongsToMany
      *

tests/TestCase/TestSuite/AssertHtmlTest.php

@@ -137,7 +137,6 @@ HTML;
         $this->assertHtml($pattern, $input);
     }
 
-
     /**
      * test that assertHtml knows how to handle correct quoting.
      *

tests/TestCase/TestSuite/TestFixtureTest.php

@@ -97,7 +97,6 @@ class StringsTestsFixture extends TestFixture
     ];
 }
 
-
 /**
  * ImportsFixture class
  */

tests/TestCase/Utility/HashTest.php

@@ -1816,7 +1816,6 @@ class HashTest extends TestCase
         $this->assertEquals($expected, $result);
     }
 
-
     /**
      * test sorting with string ignoring case.
      *

tests/TestCase/Validation/ValidationTest.php

@@ -1621,7 +1621,6 @@ class ValidationTest extends TestCase
         I18N::locale($locale);
     }
 
-
     /**
      * testBoolean method
      *

tests/TestCase/Validation/ValidatorTest.php

@@ -1431,7 +1431,6 @@ class ValidatorTest extends TestCase
         $this->assertNotEmpty($validator->errors(['username' => 'not a date']));
     }
 
-
     /**
      * Tests the dateTime proxy method
      *
@@ -1503,7 +1502,6 @@ class ValidatorTest extends TestCase
         $this->assertProxyMethod($validator, 'ip');
         $this->assertNotEmpty($validator->errors(['username' => 'not ip']));
 
-
         $this->assertProxyMethod($validator, 'ipv4', null, ['ipv4'], 'ip');
         $this->assertNotEmpty($validator->errors(['username' => 'not ip']));
 

tests/TestCase/View/Helper/BreadcrumbsHelperTest.php

@@ -72,7 +72,6 @@ class BreadcrumbsHelperTest extends TestCase
         $this->assertEquals($expected, $result);
     }
 
-
     /**
      * Test adding multiple crumbs at once to the trail using add()
      *

tests/TestCase/View/Helper/FormHelperTest.php

@@ -2498,7 +2498,6 @@ class FormHelperTest extends TestCase
         ];
         $this->assertHtml($expected, $result);
 
-
         $result = $this->Form->control('Article.content');
         $expected = [
             'div' => ['class' => 'input text error'],
@@ -8495,7 +8494,6 @@ class FormHelperTest extends TestCase
         $result = $this->Form->getValueSources();
         $this->assertEquals($expected, $result);
 
-
         $this->Form->request->data['id'] = '1';
         $this->Form->request->query['id'] = '2';