Merge pull request #3983 from greg0ire/bump-cs-libs

Bump cs libs
doctrine · May 4, 2020 · 4c03ed8 · 4c03ed8
2 parents fa8b6af + d5b4521
commit 4c03ed8
Show file tree

Hide file tree

Showing 156 changed files with 570 additions and 535 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "doctrine/event-manager": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^6.0",
+        "doctrine/coding-standard": "^7.0",
         "jetbrains/phpstorm-stubs": "^2019.1",
         "nikic/php-parser": "^4.4",
         "phpstan/phpstan": "^0.12",

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Doctrine/DBAL/Cache/CacheException.php b/lib/Doctrine/DBAL/Cache/CacheException.php
@@ -10,15 +10,15 @@
 class CacheException extends DBALException
 {
     /**
-     * @return \Doctrine\DBAL\Cache\CacheException
+     * @return CacheException
      */
     public static function noCacheKey()
     {
         return new self('No cache key was set.');
     }
 
     /**
-     * @return \Doctrine\DBAL\Cache\CacheException
+     * @return CacheException
      */
     public static function noResultDriverConfigured()
     {

diff --git a/lib/Doctrine/DBAL/Cache/QueryCacheProfile.php b/lib/Doctrine/DBAL/Cache/QueryCacheProfile.php
@@ -92,7 +92,7 @@ public function generateCacheKeys($query, $params, $types, array $connectionPara
     }
 
     /**
-     * @return \Doctrine\DBAL\Cache\QueryCacheProfile
+     * @return QueryCacheProfile
      */
     public function setResultCacheDriver(Cache $cache)
     {
@@ -102,7 +102,7 @@ public function setResultCacheDriver(Cache $cache)
     /**
      * @param string|null $cacheKey
      *
-     * @return \Doctrine\DBAL\Cache\QueryCacheProfile
+     * @return QueryCacheProfile
      */
     public function setCacheKey($cacheKey)
     {
@@ -112,7 +112,7 @@ public function setCacheKey($cacheKey)
     /**
      * @param int $lifetime
      *
-     * @return \Doctrine\DBAL\Cache\QueryCacheProfile
+     * @return QueryCacheProfile
      */
     public function setLifetime($lifetime)
     {

diff --git a/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php b/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php
@@ -86,6 +86,7 @@ public function closeCursor()
         if (! $data) {
             $data = [];
         }
+
         $data[$this->realKey] = $this->data;
 
         $this->resultCache->save($this->cacheKey, $data, $this->lifetime);

diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -1063,6 +1063,7 @@ public function executeUpdate($query, array $params = [], array $types = [])
                 } else {
                     $stmt->execute($params);
                 }
+
                 $result = $stmt->rowCount();
             } else {
                 $result = $connection->exec($query);
@@ -1179,9 +1180,11 @@ public function transactional(Closure $func)
             return $res;
         } catch (Exception $e) {
             $this->rollBack();
+
             throw $e;
         } catch (Throwable $e) {
             $this->rollBack();
+
             throw $e;
         }
     }
@@ -1254,6 +1257,7 @@ public function beginTransaction()
             if ($logger) {
                 $logger->startQuery('"SAVEPOINT"');
             }
+
             $this->createSavepoint($this->_getNestedTransactionSavePointName());
             if ($logger) {
                 $logger->stopQuery();
@@ -1274,6 +1278,7 @@ public function commit()
         if ($this->transactionNestingLevel === 0) {
             throw ConnectionException::noActiveTransaction();
         }
+
         if ($this->isRollbackOnly) {
             throw ConnectionException::commitFailedRollbackOnly();
         }
@@ -1298,6 +1303,7 @@ public function commit()
             if ($logger) {
                 $logger->startQuery('"RELEASE SAVEPOINT"');
             }
+
             $this->releaseSavepoint($this->_getNestedTransactionSavePointName());
             if ($logger) {
                 $logger->stopQuery();
@@ -1354,6 +1360,7 @@ public function rollBack()
             if ($logger) {
                 $logger->startQuery('"ROLLBACK"');
             }
+
             $this->transactionNestingLevel = 0;
             $connection->rollBack();
             $this->isRollbackOnly = false;
@@ -1368,6 +1375,7 @@ public function rollBack()
             if ($logger) {
                 $logger->startQuery('"ROLLBACK TO SAVEPOINT"');
             }
+
             $this->rollbackSavepoint($this->_getNestedTransactionSavePointName());
             --$this->transactionNestingLevel;
             if ($logger) {
@@ -1479,6 +1487,7 @@ public function setRollbackOnly()
         if ($this->transactionNestingLevel === 0) {
             throw ConnectionException::noActiveTransaction();
         }
+
         $this->isRollbackOnly = true;
     }
 
@@ -1555,6 +1564,7 @@ private function _bindTypedValues($stmt, array $params, array $types)
                 } else {
                     $stmt->bindValue($bindIndex, $value);
                 }
+
                 ++$bindIndex;
             }
         } else {
@@ -1584,6 +1594,7 @@ private function getBindingInfo($value, $type)
         if (is_string($type)) {
             $type = Type::getType($type);
         }
+
         if ($type instanceof Type) {
             $value       = $type->convertToDatabaseValue($value, $this->getDatabasePlatform());
             $bindingType = $type->getBindingType();
@@ -1623,6 +1634,7 @@ public function resolveParams(array $params, array $types)
                 } else {
                     $resolvedParams[$bindIndex] = $value;
                 }
+
                 ++$bindIndex;
             }
         } else {