Update doctrine/coding-standard to 8.0

doctrine · Jun 6, 2020 · dbc623d · dbc623d
1 parent acf84c3
commit dbc623d
Show file tree

Hide file tree

Showing 328 changed files with 2,745 additions and 2,430 deletions.
diff --git a/composer.json b/composer.json
@@ -38,13 +38,12 @@
         "doctrine/event-manager": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^7.0",
+        "doctrine/coding-standard": "^8.0",
         "jetbrains/phpstorm-stubs": "^2019.1",
         "nikic/php-parser": "^4.4",
         "phpstan/phpstan": "^0.12",
         "phpunit/phpunit": "^8.5.5",
         "psalm/plugin-phpunit": "^0.10.0",
-        "slevomat/coding-standard": "^6.3.6",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
         "vimeo/psalm": "^3.11.4"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Doctrine/DBAL/Cache/ArrayStatement.php b/lib/Doctrine/DBAL/Cache/ArrayStatement.php
@@ -10,6 +10,7 @@
 use InvalidArgumentException;
 use IteratorAggregate;
 use PDO;
+
 use function array_merge;
 use function array_values;
 use function count;
@@ -188,23 +189,23 @@ public function fetchOne()
     /**
      * {@inheritdoc}
      */
-    public function fetchAllNumeric() : array
+    public function fetchAllNumeric(): array
     {
         return FetchUtils::fetchAllNumeric($this);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function fetchAllAssociative() : array
+    public function fetchAllAssociative(): array
     {
         return FetchUtils::fetchAllAssociative($this);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function fetchFirstColumn() : array
+    public function fetchFirstColumn(): array
     {
         return FetchUtils::fetchFirstColumn($this);
     }

diff --git a/lib/Doctrine/DBAL/Cache/QueryCacheProfile.php b/lib/Doctrine/DBAL/Cache/QueryCacheProfile.php
@@ -3,6 +3,7 @@
 namespace Doctrine\DBAL\Cache;
 
 use Doctrine\Common\Cache\Cache;
+
 use function hash;
 use function serialize;
 use function sha1;

diff --git a/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php b/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php
@@ -13,6 +13,7 @@
 use InvalidArgumentException;
 use IteratorAggregate;
 use PDO;
+
 use function array_map;
 use function array_merge;
 use function array_values;
@@ -248,7 +249,7 @@ public function fetchOne()
     /**
      * {@inheritdoc}
      */
-    public function fetchAllNumeric() : array
+    public function fetchAllNumeric(): array
     {
         if ($this->statement instanceof ForwardCompatibleResultStatement) {
             $data = $this->statement->fetchAllAssociative();
@@ -264,7 +265,7 @@ public function fetchAllNumeric() : array
     /**
      * {@inheritdoc}
      */
-    public function fetchAllAssociative() : array
+    public function fetchAllAssociative(): array
     {
         if ($this->statement instanceof ForwardCompatibleResultStatement) {
             $data = $this->statement->fetchAllAssociative();
@@ -280,7 +281,7 @@ public function fetchAllAssociative() : array
     /**
      * {@inheritdoc}
      */
-    public function fetchFirstColumn() : array
+    public function fetchFirstColumn(): array
     {
         return FetchUtils::fetchFirstColumn($this);
     }
@@ -334,7 +335,7 @@ private function doFetch()
     /**
      * @param array<int,array<string,mixed>> $data
      */
-    private function store(array $data) : void
+    private function store(array $data): void
     {
         $this->data    = $data;
         $this->emptied = true;

diff --git a/lib/Doctrine/DBAL/Configuration.php b/lib/Doctrine/DBAL/Configuration.php
@@ -5,6 +5,7 @@
 use Doctrine\Common\Cache\Cache;
 use Doctrine\DBAL\Logging\SQLLogger;
 use Doctrine\DBAL\Schema\AbstractAsset;
+
 use function preg_match;
 
 /**
@@ -101,7 +102,7 @@ public function getFilterSchemaAssetsExpression()
     /**
      * @param string $filterExpression
      */
-    private function buildSchemaAssetsFilterFromExpression($filterExpression) : callable
+    private function buildSchemaAssetsFilterFromExpression($filterExpression): callable
     {
         return static function ($assetName) use ($filterExpression) {
             if ($assetName instanceof AbstractAsset) {
@@ -115,7 +116,7 @@ private function buildSchemaAssetsFilterFromExpression($filterExpression) : call
     /**
      * Sets the callable to use to filter schema assets.
      */
-    public function setSchemaAssetsFilter(?callable $callable = null) : ?callable
+    public function setSchemaAssetsFilter(?callable $callable = null): ?callable
     {
         $this->_attributes['filterSchemaAssetsExpression'] = null;
 
@@ -125,7 +126,7 @@ public function setSchemaAssetsFilter(?callable $callable = null) : ?callable
     /**
      * Returns the callable to use to filter schema assets.
      */
-    public function getSchemaAssetsFilter() : ?callable
+    public function getSchemaAssetsFilter(): ?callable
     {
         return $this->_attributes['filterSchemaAssetsExpressionCallable'] ?? null;
     }

diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -23,6 +23,7 @@
 use Exception;
 use Throwable;
 use Traversable;
+
 use function array_key_exists;
 use function assert;
 use function func_get_args;
@@ -385,7 +386,7 @@ public function connect()
      *
      * @throws DBALException If an invalid platform was specified for this connection.
      */
-    private function detectDatabasePlatform() : void
+    private function detectDatabasePlatform(): void
     {
         $version = $this->getDatabasePlatformVersion();
 
@@ -714,7 +715,7 @@ private function addIdentifierCondition(
         array &$columns,
         array &$values,
         array &$conditions
-    ) : void {
+    ): void {
         $platform = $this->getDatabasePlatform();
 
         foreach ($identifier as $columnName => $value) {
@@ -950,7 +951,7 @@ public function fetchAll($sql, array $params = [], $types = [])
      *
      * @throws DBALException
      */
-    public function fetchAllNumeric(string $query, array $params = [], array $types = []) : array
+    public function fetchAllNumeric(string $query, array $params = [], array $types = []): array
     {
         try {
             $stmt = $this->executeQuery($query, $params, $types);
@@ -976,7 +977,7 @@ public function fetchAllNumeric(string $query, array $params = [], array $types
      *
      * @throws DBALException
      */
-    public function fetchAllAssociative(string $query, array $params = [], array $types = []) : array
+    public function fetchAllAssociative(string $query, array $params = [], array $types = []): array
     {
         try {
             $stmt = $this->executeQuery($query, $params, $types);
@@ -1002,7 +1003,7 @@ public function fetchAllAssociative(string $query, array $params = [], array $ty
      *
      * @throws DBALException
      */
-    public function fetchFirstColumn(string $query, array $params = [], array $types = []) : array
+    public function fetchFirstColumn(string $query, array $params = [], array $types = []): array
     {
         try {
             $stmt = $this->executeQuery($query, $params, $types);
@@ -1028,7 +1029,7 @@ public function fetchFirstColumn(string $query, array $params = [], array $types
      *
      * @throws DBALException
      */
-    public function iterateNumeric(string $query, array $params = [], array $types = []) : Traversable
+    public function iterateNumeric(string $query, array $params = [], array $types = []): Traversable
     {
         try {
             $stmt = $this->executeQuery($query, $params, $types);
@@ -1056,7 +1057,7 @@ public function iterateNumeric(string $query, array $params = [], array $types =
      *
      * @throws DBALException
      */
-    public function iterateAssociative(string $query, array $params = [], array $types = []) : Traversable
+    public function iterateAssociative(string $query, array $params = [], array $types = []): Traversable
     {
         try {
             $stmt = $this->executeQuery($query, $params, $types);
@@ -1084,7 +1085,7 @@ public function iterateAssociative(string $query, array $params = [], array $typ
      *
      * @throws DBALException
      */
-    public function iterateColumn(string $query, array $params = [], array $types = []) : Traversable
+    public function iterateColumn(string $query, array $params = [], array $types = []): Traversable
     {
         try {
             $stmt = $this->executeQuery($query, $params, $types);
@@ -1585,7 +1586,7 @@ public function commit()
     /**
      * Commits all current nesting transactions.
      */
-    private function commitAll() : void
+    private function commitAll(): void
     {
         while ($this->transactionNestingLevel !== 0) {
             if ($this->autoCommit === false && $this->transactionNestingLevel === 1) {

diff --git a/lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php b/lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php
@@ -10,6 +10,7 @@
 use Doctrine\DBAL\Event\ConnectionEventArgs;
 use Doctrine\DBAL\Events;
 use InvalidArgumentException;
+
 use function array_rand;
 use function assert;
 use function count;