Merge pull request #4739 from morozov/code-cleanup

Code cleanup

src/Cache/QueryCacheProfile.php

@@ -20,7 +20,7 @@ class QueryCacheProfile
  private $resultCacheDriver;
 
  /** @var int */
- private $lifetime = 0;
+ private $lifetime;
 
  /** @var string|null */
  private $cacheKey;

src/Connection.php

@@ -760,7 +760,7 @@ private function extractTypeValues(array $columnList, array $types)
  {
  $typeValues = [];
 
- foreach ($columnList as $columnIndex => $columnName) {
+ foreach ($columnList as $columnName) {
  $typeValues[] = $types[$columnName] ?? ParameterType::STRING;
  }
 

src/Driver/IBMDB2/Statement.php

@@ -125,7 +125,7 @@ public function execute($params = null): ResultInterface
 
  $params = [];
 
- foreach ($this->bindParam as $column => $value) {
+ foreach ($this->bindParam as $value) {
  $params[] = $value;
  }
  }

src/Logging/LoggerChain.php

@@ -8,7 +8,7 @@
 class LoggerChain implements SQLLogger
 {
  /** @var iterable<SQLLogger> */
- private $loggers = [];
+ private $loggers;
 
  /**
  * @param iterable<SQLLogger> $loggers

src/Platforms/Keywords/ReservedKeywordsValidator.php

@@ -17,7 +17,7 @@
 class ReservedKeywordsValidator implements Visitor
 {
  /** @var KeywordList[] */
- private $keywordLists = [];
+ private $keywordLists;
 
  /** @var string[] */
  private $violations = [];

src/Schema/Index.php

@@ -43,7 +43,7 @@ class Index extends AbstractAsset implements Constraint
  * @todo $_flags should eventually be refactored into options
  * @var mixed[]
  */
- private $options = [];
+ private $options;
 
  /**
  * @param string $name

src/Schema/PostgreSQLSchemaManager.php

@@ -133,11 +133,8 @@ public function determineExistingSchemaSearchPaths()
  */
  protected function _getPortableTableForeignKeyDefinition($tableForeignKey)
  {
- $onUpdate = null;
- $onDelete = null;
- $localColumns = [];
- $foreignColumns = [];
- $foreignTable = null;
+ $onUpdate = null;
+ $onDelete = null;
 
  if (
  preg_match(

src/Schema/UniqueConstraint.php

@@ -34,7 +34,7 @@ class UniqueConstraint extends AbstractAsset implements Constraint
  *
  * @var mixed[]
  */
- private $options = [];
+ private $options;
 
  /**
  * @param string[] $columns

src/Tools/Dumper.php

@@ -86,8 +86,7 @@ public static function dump($var, int $maxDepth = 2): string
  */
  public static function export($var, int $maxDepth)
  {
- $return = null;
- $isObj = is_object($var);
+ $isObj = is_object($var);
 
  if ($var instanceof Collection) {
  $var = $var->toArray();

tests/Cache/QueryCacheProfileTest.php

@@ -98,7 +98,7 @@ public function testConnectionParamsShouldBeHashed(): void
  {
  $this->queryCacheProfile = $this->queryCacheProfile->setCacheKey(null);
 
- [$cacheKey, $queryString] = $this->queryCacheProfile->generateCacheKeys(
+ [, $queryString] = $this->queryCacheProfile->generateCacheKeys(
  $this->query,
  $this->params,
  $this->types,

tests/Functional/PrimaryReadReplicaConnectionTest.php

@@ -140,7 +140,7 @@ public function testPrimaryOnWriteOperation(): void
 
  public function testKeepReplicaBeginTransactionStaysOnPrimary(): void
  {
- $conn = $this->createPrimaryReadReplicaConnection($keepReplica = true);
+ $conn = $this->createPrimaryReadReplicaConnection(true);
  $conn->ensureConnectedToReplica();
 
  $conn->beginTransaction();
@@ -158,7 +158,7 @@ public function testKeepReplicaBeginTransactionStaysOnPrimary(): void
 
  public function testKeepReplicaInsertStaysOnPrimary(): void
  {
- $conn = $this->createPrimaryReadReplicaConnection($keepReplica = true);
+ $conn = $this->createPrimaryReadReplicaConnection(true);
  $conn->ensureConnectedToReplica();
 
  $conn->insert('primary_replica_table', ['test_int' => 30]);

tests/Functional/ResultCacheTest.php

@@ -171,8 +171,7 @@ public function testFetchAndFinishSavesCache(): void
  new QueryCacheProfile(0, 'testcachekey')
  );
 
- while (($row = $result->fetchAssociative()) !== false) {
- }
+ $result->fetchAllAssociative();
 
  $result = $this->connection->executeQuery(
  'SELECT * FROM caching ORDER BY test_int ASC',
@@ -181,8 +180,7 @@ public function testFetchAndFinishSavesCache(): void
  new QueryCacheProfile(0, 'testcachekey')
  );
 
- while (($row = $result->fetchNumeric()) !== false) {
- }
+ $result->fetchAllNumeric();
 
  self::assertCount(1, $this->sqlLogger->queries);
  }

tests/Functional/Schema/MySQLSchemaManagerTest.php

@@ -280,7 +280,7 @@ public function testColumnCharsetChange(): void
  public function testColumnCollation(): void
  {
  $table = new Table('test_collation');
- $table->addOption('collate', $collation = 'latin1_swedish_ci');
+ $table->addOption('collate', 'latin1_swedish_ci');
  $table->addOption('charset', 'latin1');
  $table->addColumn('id', 'integer');
  $table->addColumn('text', 'text');

tests/Functional/Schema/PostgreSQLSchemaManagerTest.php

@@ -84,7 +84,7 @@ public function testDetectsAutoIncrement(): void
  public function testAlterTableAutoIncrementAdd(): void
  {
  $tableFrom = new Table('autoinc_table_add');
- $column = $tableFrom->addColumn('id', 'integer');
+ $tableFrom->addColumn('id', 'integer');
  $this->schemaManager->createTable($tableFrom);
  $tableFrom = $this->schemaManager->listTableDetails('autoinc_table_add');
  self::assertFalse($tableFrom->getColumn('id')->getAutoincrement());
@@ -192,10 +192,10 @@ public function testReturnQuotedAssets(): void
  public function testFilterSchemaExpression(): void
  {
  $testTable = new Table('dbal204_test_prefix');
- $column = $testTable->addColumn('id', 'integer');
+ $testTable->addColumn('id', 'integer');
  $this->schemaManager->createTable($testTable);
  $testTable = new Table('dbal204_without_prefix');
- $column = $testTable->addColumn('id', 'integer');
+ $testTable->addColumn('id', 'integer');
  $this->schemaManager->createTable($testTable);
 
  $this->connection->getConfiguration()->setSchemaAssetsFilter(static function (string $name): bool {

tests/Platforms/AbstractPlatformTestCase.php

@@ -156,7 +156,7 @@ public function testCreateWithNoColumns(): void
  $table = new Table('test');
 
  $this->expectException(Exception::class);
- $sql = $this->platform->getCreateTableSQL($table);
+ $this->platform->getCreateTableSQL($table);
  }
 
  public function testGeneratesTableCreationSql(): void
@@ -218,22 +218,22 @@ public function testGeneratesPartialIndexesSqlOnlyWhenSupportingPartialIndexes()
 
  $expected = ' WHERE ' . $where;
 
- $actuals = [];
+ $indexes = [];
 
  if ($this->supportsInlineIndexDeclaration()) {
- $actuals[] = $this->platform->getIndexDeclarationSQL('name', $indexDef);
+ $indexes[] = $this->platform->getIndexDeclarationSQL('name', $indexDef);
  }
 
  $uniqueConstraintSQL = $this->platform->getUniqueConstraintDeclarationSQL('name', $uniqueConstraint);
- $indexSQL = $this->platform->getCreateIndexSQL($indexDef, 'table');
-
  $this->assertStringEndsNotWith($expected, $uniqueConstraintSQL, 'WHERE clause should NOT be present');
 
- foreach ($actuals as $actual) {
+ $indexes[] = $this->platform->getCreateIndexSQL($indexDef, 'table');
+
+ foreach ($indexes as $index) {
  if ($this->platform->supportsPartialIndexes()) {
- self::assertStringEndsWith($expected, $indexSQL, 'WHERE clause should be present');
+ self::assertStringEndsWith($expected, $index, 'WHERE clause should be present');
  } else {
- self::assertStringEndsNotWith($expected, $indexSQL, 'WHERE clause should NOT be present');
+ self::assertStringEndsNotWith($expected, $index, 'WHERE clause should NOT be present');
  }
  }
  }

tests/Platforms/AbstractPostgreSQLPlatformTestCase.php

@@ -442,9 +442,7 @@ protected function getQuotedColumnInForeignKeySQL(): array
  */
  public function testConvertBooleanAsLiteralStrings(
  $databaseValue,
- string $preparedStatementValue,
- ?int $integerValue,
- ?bool $booleanValue
+ string $preparedStatementValue
  ): void {
  $platform = $this->createPlatform();
 

tests/Platforms/OraclePlatformTest.php

@@ -574,8 +574,6 @@ public function testDoesNotPropagateUnnecessaryTableAlterationOnBinaryType(): vo
  $table2->addColumn('column_varbinary', 'binary', ['fixed' => true]);
  $table2->addColumn('column_binary', 'binary');
 
- $comparator = new Comparator();
-
  // VARBINARY -> BINARY
  // BINARY -> VARBINARY
  $diff = (new Comparator())->diffTable($table1, $table2);