Skip to content

Commit 08dbcfb

Browse files
morozovmorozov
authored
Merge pull request #4050 from morozov/coding-standard-8
Update doctrine/coding-standard to 8.0
2 parents acf84c3 + dbc623d commit 08dbcfb

File tree

328 files changed

+2745
-2430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+2745
-2430
lines changed

‎composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@
3838
"doctrine/event-manager": "^1.0"
3939
},
4040
"require-dev": {
41-
"doctrine/coding-standard": "^7.0",
41+
"doctrine/coding-standard": "^8.0",
4242
"jetbrains/phpstorm-stubs": "^2019.1",
4343
"nikic/php-parser": "^4.4",
4444
"phpstan/phpstan": "^0.12",
4545
"phpunit/phpunit": "^8.5.5",
4646
"psalm/plugin-phpunit": "^0.10.0",
47-
"slevomat/coding-standard": "^6.3.6",
4847
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
4948
"vimeo/psalm": "^3.11.4"
5049
},

‎composer.lock

Lines changed: 36 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/Doctrine/DBAL/Cache/ArrayStatement.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use InvalidArgumentException;
1111
use IteratorAggregate;
1212
use PDO;
13+
1314
use function array_merge;
1415
use function array_values;
1516
use function count;
@@ -188,23 +189,23 @@ public function fetchOne()
188189
/**
189190
* {@inheritdoc}
190191
*/
191-
public function fetchAllNumeric() : array
192+
public function fetchAllNumeric(): array
192193
{
193194
return FetchUtils::fetchAllNumeric($this);
194195
}
195196

196197
/**
197198
* {@inheritdoc}
198199
*/
199-
public function fetchAllAssociative() : array
200+
public function fetchAllAssociative(): array
200201
{
201202
return FetchUtils::fetchAllAssociative($this);
202203
}
203204

204205
/**
205206
* {@inheritdoc}
206207
*/
207-
public function fetchFirstColumn() : array
208+
public function fetchFirstColumn(): array
208209
{
209210
return FetchUtils::fetchFirstColumn($this);
210211
}

‎lib/Doctrine/DBAL/Cache/QueryCacheProfile.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Doctrine\DBAL\Cache;
44

55
use Doctrine\Common\Cache\Cache;
6+
67
use function hash;
78
use function serialize;
89
use function sha1;

‎lib/Doctrine/DBAL/Cache/ResultCacheStatement.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use InvalidArgumentException;
1414
use IteratorAggregate;
1515
use PDO;
16+
1617
use function array_map;
1718
use function array_merge;
1819
use function array_values;
@@ -248,7 +249,7 @@ public function fetchOne()
248249
/**
249250
* {@inheritdoc}
250251
*/
251-
public function fetchAllNumeric() : array
252+
public function fetchAllNumeric(): array
252253
{
253254
if ($this->statement instanceof ForwardCompatibleResultStatement) {
254255
$data = $this->statement->fetchAllAssociative();
@@ -264,7 +265,7 @@ public function fetchAllNumeric() : array
264265
/**
265266
* {@inheritdoc}
266267
*/
267-
public function fetchAllAssociative() : array
268+
public function fetchAllAssociative(): array
268269
{
269270
if ($this->statement instanceof ForwardCompatibleResultStatement) {
270271
$data = $this->statement->fetchAllAssociative();
@@ -280,7 +281,7 @@ public function fetchAllAssociative() : array
280281
/**
281282
* {@inheritdoc}
282283
*/
283-
public function fetchFirstColumn() : array
284+
public function fetchFirstColumn(): array
284285
{
285286
return FetchUtils::fetchFirstColumn($this);
286287
}
@@ -334,7 +335,7 @@ private function doFetch()
334335
/**
335336
* @param array<int,array<string,mixed>> $data
336337
*/
337-
private function store(array $data) : void
338+
private function store(array $data): void
338339
{
339340
$this->data = $data;
340341
$this->emptied = true;

‎lib/Doctrine/DBAL/Configuration.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Doctrine\Common\Cache\Cache;
66
use Doctrine\DBAL\Logging\SQLLogger;
77
use Doctrine\DBAL\Schema\AbstractAsset;
8+
89
use function preg_match;
910

1011
/**
@@ -101,7 +102,7 @@ public function getFilterSchemaAssetsExpression()
101102
/**
102103
* @param string $filterExpression
103104
*/
104-
private function buildSchemaAssetsFilterFromExpression($filterExpression) : callable
105+
private function buildSchemaAssetsFilterFromExpression($filterExpression): callable
105106
{
106107
return static function ($assetName) use ($filterExpression) {
107108
if ($assetName instanceof AbstractAsset) {
@@ -115,7 +116,7 @@ private function buildSchemaAssetsFilterFromExpression($filterExpression) : call
115116
/**
116117
* Sets the callable to use to filter schema assets.
117118
*/
118-
public function setSchemaAssetsFilter(?callable $callable = null) : ?callable
119+
public function setSchemaAssetsFilter(?callable $callable = null): ?callable
119120
{
120121
$this->_attributes['filterSchemaAssetsExpression'] = null;
121122

@@ -125,7 +126,7 @@ public function setSchemaAssetsFilter(?callable $callable = null) : ?callable
125126
/**
126127
* Returns the callable to use to filter schema assets.
127128
*/
128-
public function getSchemaAssetsFilter() : ?callable
129+
public function getSchemaAssetsFilter(): ?callable
129130
{
130131
return $this->_attributes['filterSchemaAssetsExpressionCallable'] ?? null;
131132
}

‎lib/Doctrine/DBAL/Connection.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use Exception;
2424
use Throwable;
2525
use Traversable;
26+
2627
use function array_key_exists;
2728
use function assert;
2829
use function func_get_args;
@@ -385,7 +386,7 @@ public function connect()
385386
*
386387
* @throws DBALException If an invalid platform was specified for this connection.
387388
*/
388-
private function detectDatabasePlatform() : void
389+
private function detectDatabasePlatform(): void
389390
{
390391
$version = $this->getDatabasePlatformVersion();
391392

@@ -714,7 +715,7 @@ private function addIdentifierCondition(
714715
array &$columns,
715716
array &$values,
716717
array &$conditions
717-
) : void {
718+
): void {
718719
$platform = $this->getDatabasePlatform();
719720

720721
foreach ($identifier as $columnName => $value) {
@@ -950,7 +951,7 @@ public function fetchAll($sql, array $params = [], $types = [])
950951
*
951952
* @throws DBALException
952953
*/
953-
public function fetchAllNumeric(string $query, array $params = [], array $types = []) : array
954+
public function fetchAllNumeric(string $query, array $params = [], array $types = []): array
954955
{
955956
try {
956957
$stmt = $this->executeQuery($query, $params, $types);
@@ -976,7 +977,7 @@ public function fetchAllNumeric(string $query, array $params = [], array $types
976977
*
977978
* @throws DBALException
978979
*/
979-
public function fetchAllAssociative(string $query, array $params = [], array $types = []) : array
980+
public function fetchAllAssociative(string $query, array $params = [], array $types = []): array
980981
{
981982
try {
982983
$stmt = $this->executeQuery($query, $params, $types);
@@ -1002,7 +1003,7 @@ public function fetchAllAssociative(string $query, array $params = [], array $ty
10021003
*
10031004
* @throws DBALException
10041005
*/
1005-
public function fetchFirstColumn(string $query, array $params = [], array $types = []) : array
1006+
public function fetchFirstColumn(string $query, array $params = [], array $types = []): array
10061007
{
10071008
try {
10081009
$stmt = $this->executeQuery($query, $params, $types);
@@ -1028,7 +1029,7 @@ public function fetchFirstColumn(string $query, array $params = [], array $types
10281029
*
10291030
* @throws DBALException
10301031
*/
1031-
public function iterateNumeric(string $query, array $params = [], array $types = []) : Traversable
1032+
public function iterateNumeric(string $query, array $params = [], array $types = []): Traversable
10321033
{
10331034
try {
10341035
$stmt = $this->executeQuery($query, $params, $types);
@@ -1056,7 +1057,7 @@ public function iterateNumeric(string $query, array $params = [], array $types =
10561057
*
10571058
* @throws DBALException
10581059
*/
1059-
public function iterateAssociative(string $query, array $params = [], array $types = []) : Traversable
1060+
public function iterateAssociative(string $query, array $params = [], array $types = []): Traversable
10601061
{
10611062
try {
10621063
$stmt = $this->executeQuery($query, $params, $types);
@@ -1084,7 +1085,7 @@ public function iterateAssociative(string $query, array $params = [], array $typ
10841085
*
10851086
* @throws DBALException
10861087
*/
1087-
public function iterateColumn(string $query, array $params = [], array $types = []) : Traversable
1088+
public function iterateColumn(string $query, array $params = [], array $types = []): Traversable
10881089
{
10891090
try {
10901091
$stmt = $this->executeQuery($query, $params, $types);
@@ -1585,7 +1586,7 @@ public function commit()
15851586
/**
15861587
* Commits all current nesting transactions.
15871588
*/
1588-
private function commitAll() : void
1589+
private function commitAll(): void
15891590
{
15901591
while ($this->transactionNestingLevel !== 0) {
15911592
if ($this->autoCommit === false && $this->transactionNestingLevel === 1) {

‎lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\DBAL\Event\ConnectionEventArgs;
1111
use Doctrine\DBAL\Events;
1212
use InvalidArgumentException;
13+
1314
use function array_rand;
1415
use function assert;
1516
use function count;

0 commit comments

Comments
 (0)