Merge pull request #5616 from derrabus/bump/cs

composer.json

@@ -40,7 +40,7 @@
         "psr/log": "^1|^2|^3"
     },
     "require-dev": {
-        "doctrine/coding-standard": "9.0.0",
+        "doctrine/coding-standard": "9.0.1",
         "jetbrains/phpstorm-stubs": "2022.2",
         "phpstan/phpstan": "1.8.2",
         "phpstan/phpstan-strict-rules": "^1.3",

src/ArrayParameters/Exception.php

@@ -4,9 +4,7 @@
 
 use Throwable;
 
-/**
- * @internal
- */
+/** @internal */
 interface Exception extends Throwable
 {
 }

src/ArrayParameters/Exception/MissingNamedParameter.php

@@ -7,9 +7,7 @@
 
 use function sprintf;
 
-/**
- * @psalm-immutable
- */
+/** @psalm-immutable */
 class MissingNamedParameter extends LogicException implements Exception
 {
     public static function new(string $name): self

src/Cache/ArrayResult.php

@@ -9,9 +9,7 @@
 use function count;
 use function reset;
 
-/**
- * @internal The class is internal to the caching layer implementation.
- */
+/** @internal The class is internal to the caching layer implementation. */
 final class ArrayResult implements Result
 {
     /** @var list<array<string, mixed>> */
@@ -20,9 +18,7 @@ final class ArrayResult implements Result
     private int $columnCount = 0;
     private int $num         = 0;
 
-    /**
-     * @param list<array<string, mixed>> $data
-     */
+    /** @param list<array<string, mixed>> $data */
     public function __construct(array $data)
     {
         $this->data = $data;
@@ -108,9 +104,7 @@ public function free(): void
         $this->data = [];
     }
 
-    /**
-     * @return array<string, mixed>|false
-     */
+    /** @return array<string, mixed>|false */
     private function fetch()
     {
         if (! isset($this->data[$this->num])) {

src/Cache/CacheException.php

@@ -4,22 +4,16 @@
 
 use Doctrine\DBAL\Exception;
 
-/**
- * @psalm-immutable
- */
+/** @psalm-immutable */
 class CacheException extends Exception
 {
-    /**
-     * @return CacheException
-     */
+    /** @return CacheException */
     public static function noCacheKey()
     {
         return new self('No cache key was set.');
     }
 
-    /**
-     * @return CacheException
-     */
+    /** @return CacheException */
     public static function noResultDriverConfigured()
     {
         return new self('Trying to cache a query but no result driver is configured.');

src/Cache/QueryCacheProfile.php

@@ -85,9 +85,7 @@ public function getResultCacheDriver()
         return $this->resultCache !== null ? DoctrineProvider::wrap($this->resultCache) : null;
     }
 
-    /**
-     * @return int
-     */
+    /** @return int */
     public function getLifetime()
     {
         return $this->lifetime;

src/Configuration.php

@@ -220,9 +220,7 @@ public function setMiddlewares(array $middlewares): self
         return $this;
     }
 
-    /**
-     * @return Middleware[]
-     */
+    /** @return Middleware[] */
     public function getMiddlewares(): array
     {
         return $this->middlewares;

src/Connection.php

@@ -1533,9 +1533,7 @@ public function getWrappedConnection()
         return $this->_conn;
     }
 
-    /**
-     * @return resource|object
-     */
+    /** @return resource|object */
     public function getNativeConnection()
     {
         $this->connect();
@@ -1763,9 +1761,7 @@ final public function convertExceptionDuringQuery(
         return $this->handleDriverException($e, new Query($sql, $params, $types));
     }
 
-    /**
-     * @internal
-     */
+    /** @internal */
     final public function convertException(Driver\Exception $e): DriverException
     {
         return $this->handleDriverException($e, null);

src/ConnectionException.php

@@ -2,38 +2,28 @@
 
 namespace Doctrine\DBAL;
 
-/**
- * @psalm-immutable
- */
+/** @psalm-immutable */
 class ConnectionException extends Exception
 {
-    /**
-     * @return ConnectionException
-     */
+    /** @return ConnectionException */
     public static function commitFailedRollbackOnly()
     {
         return new self('Transaction commit failed because the transaction has been marked for rollback only.');
     }
 
-    /**
-     * @return ConnectionException
-     */
+    /** @return ConnectionException */
     public static function noActiveTransaction()
     {
         return new self('There is no active transaction.');
     }
 
-    /**
-     * @return ConnectionException
-     */
+    /** @return ConnectionException */
     public static function savepointsNotSupported()
     {
         return new self('Savepoints are not supported by this driver.');
     }
 
-    /**
-     * @return ConnectionException
-     */
+    /** @return ConnectionException */
     public static function mayNotAlterNestedTransactionWithSavepointsInTransaction()
     {
         return new self('May not alter the nested transaction with savepoints behavior while a transaction is open.');

src/Driver/API/MySQL/ExceptionConverter.php

@@ -22,9 +22,7 @@
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Query;
 
-/**
- * @internal
- */
+/** @internal */
 final class ExceptionConverter implements ExceptionConverterInterface
 {
     /**

src/Driver/API/OCI/ExceptionConverter.php

@@ -20,14 +20,10 @@
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Query;
 
-/**
- * @internal
- */
+/** @internal */
 final class ExceptionConverter implements ExceptionConverterInterface
 {
-    /**
-     * @link http://www.dba-oracle.com/t_error_code_list.htm
-     */
+    /** @link http://www.dba-oracle.com/t_error_code_list.htm */
     public function convert(Exception $exception, ?Query $query): DriverException
     {
         switch ($exception->getCode()) {

src/Driver/API/PostgreSQL/ExceptionConverter.php

@@ -23,14 +23,10 @@
 
 use function strpos;
 
-/**
- * @internal
- */
+/** @internal */
 final class ExceptionConverter implements ExceptionConverterInterface
 {
-    /**
-     * @link http://www.postgresql.org/docs/9.4/static/errcodes-appendix.html
-     */
+    /** @link http://www.postgresql.org/docs/9.4/static/errcodes-appendix.html */
     public function convert(Exception $exception, ?Query $query): DriverException
     {
         switch ($exception->getSQLState()) {

src/Driver/API/SQLite/ExceptionConverter.php

@@ -22,14 +22,10 @@
 
 use function strpos;
 
-/**
- * @internal
- */
+/** @internal */
 final class ExceptionConverter implements ExceptionConverterInterface
 {
-    /**
-     * @link http://www.sqlite.org/c3ref/c_abort.html
-     */
+    /** @link http://www.sqlite.org/c3ref/c_abort.html */
     public function convert(Exception $exception, ?Query $query): DriverException
     {
         if (strpos($exception->getMessage(), 'database is locked') !== false) {

src/Driver/AbstractOracleDriver/EasyConnectString.php

@@ -86,9 +86,7 @@ public static function fromConnectionParameters(array $params): self
         ]);
     }
 
-    /**
-     * @param mixed[] $params
-     */
+    /** @param mixed[] $params */
     private static function renderParams(array $params): string
     {
         $chunks = [];
@@ -106,9 +104,7 @@ private static function renderParams(array $params): string
         return implode('', $chunks);
     }
 
-    /**
-     * @param mixed $value
-     */
+    /** @param mixed $value */
     private static function renderValue($value): string
     {
         if (is_array($value)) {

src/Driver/Exception.php

@@ -6,9 +6,7 @@
 
 use Throwable;
 
-/**
- * @psalm-immutable
- */
+/** @psalm-immutable */
 interface Exception extends Throwable
 {
     /**

src/Driver/Exception/UnknownParameterType.php

@@ -15,9 +15,7 @@
  */
 final class UnknownParameterType extends AbstractException
 {
-    /**
-     * @param mixed $type
-     */
+    /** @param mixed $type */
     public static function new($type): self
     {
         return new self(sprintf('Unknown parameter type, %d given.', $type));

src/Driver/FetchUtils.php

@@ -4,9 +4,7 @@
 
 namespace Doctrine\DBAL\Driver;
 
-/**
- * @internal
- */
+/** @internal */
 final class FetchUtils
 {
     /**

src/Driver/IBMDB2/Connection.php

@@ -143,9 +143,7 @@ public function rollBack(): bool
         return $result;
     }
 
-    /**
-     * @return resource
-     */
+    /** @return resource */
     public function getNativeConnection()
     {
         return $this->connection;

src/Driver/IBMDB2/Exception/CannotCopyStreamToStream.php

@@ -13,9 +13,7 @@
  */
 final class CannotCopyStreamToStream extends AbstractException
 {
-    /**
-     * @psalm-param array{message: string}|null $error
-     */
+    /** @psalm-param array{message: string}|null $error */
     public static function new(?array $error): self
     {
         $message = 'Could not copy source stream to temporary file';

src/Driver/IBMDB2/Exception/CannotCreateTemporaryFile.php

@@ -13,9 +13,7 @@
  */
 final class CannotCreateTemporaryFile extends AbstractException
 {
-    /**
-     * @psalm-param array{message: string}|null $error
-     */
+    /** @psalm-param array{message: string}|null $error */
     public static function new(?array $error): self
     {
         $message = 'Could not create temporary file';

src/Driver/IBMDB2/Exception/ConnectionError.php

@@ -16,9 +16,7 @@
  */
 final class ConnectionError extends AbstractException
 {
-    /**
-     * @param resource $connection
-     */
+    /** @param resource $connection */
     public static function new($connection): self
     {
         $message  = db2_conn_errormsg($connection);

src/Driver/IBMDB2/Exception/PrepareFailed.php

@@ -13,9 +13,7 @@
  */
 final class PrepareFailed extends AbstractException
 {
-    /**
-     * @psalm-param array{message: string}|null $error
-     */
+    /** @psalm-param array{message: string}|null $error */
     public static function new(?array $error): self
     {
         if ($error === null) {

src/Driver/IBMDB2/Exception/StatementError.php

@@ -16,9 +16,7 @@
  */
 final class StatementError extends AbstractException
 {
-    /**
-     * @param resource|null $statement
-     */
+    /** @param resource|null $statement */
     public static function new($statement = null): self
     {
         if ($statement !== null) {

src/Driver/Middleware/AbstractConnectionMiddleware.php

@@ -98,9 +98,7 @@ public function getServerVersion()
         return $this->wrappedConnection->getServerVersion();
     }
 
-    /**
-     * @return resource|object
-     */
+    /** @return resource|object */
     public function getNativeConnection()
     {
         if (! method_exists($this->wrappedConnection, 'getNativeConnection')) {

src/Driver/Mysqli/Connection.php

@@ -20,9 +20,7 @@ final class Connection implements ServerInfoAwareConnection
 
     private mysqli $connection;
 
-    /**
-     * @internal The connection can be only instantiated by its driver.
-     */
+    /** @internal The connection can be only instantiated by its driver. */
     public function __construct(mysqli $connection)
     {
         $this->connection = $connection;

src/Driver/Mysqli/Exception/InvalidOption.php

@@ -15,9 +15,7 @@
  */
 final class InvalidOption extends AbstractException
 {
-    /**
-     * @param mixed $value
-     */
+    /** @param mixed $value */
     public static function fromOption(int $option, $value): self
     {
         return new self(