Merge pull request #3849 from BenMorel/undefined-var

Clean up unused variables

Author: morozov

lib/Doctrine/DBAL/Connection.php

@@ -1093,8 +1093,6 @@ public function commit() : void
             throw CommitFailedRollbackOnly::new();
         }
 
-        $result = true;
-
         $connection = $this->getWrappedConnection();
 
         $logger = $this->_config->getSQLLogger();

tests/Doctrine/Tests/DBAL/Cache/QueryCacheProfileTest.php

@@ -99,7 +99,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/Doctrine/Tests/DBAL/Driver/Mysqli/MysqliConnectionTest.php

@@ -31,10 +31,10 @@ protected function setUp() : void
 
     public function testRestoresErrorHandlerOnException() : void
     {
-        $handler         = static function () : bool {
+        $handler = static function () : bool {
             self::fail('Never expected this to be called');
         };
-        $default_handler = set_error_handler($handler);
+        set_error_handler($handler);
 
         try {
             new MysqliConnection(['host' => '255.255.255.255'], 'user', 'pass');

tests/Doctrine/Tests/DBAL/Functional/ResultCacheTest.php

@@ -213,22 +213,22 @@ private function assertCacheNonCacheSelectSameFetchModeAreEqual(array $expectedR
     public function testEmptyResultCache() : void
     {
         $stmt = $this->connection->executeQuery('SELECT * FROM caching WHERE test_int > 500', [], [], new QueryCacheProfile(10, 'emptycachekey'));
-        $data = $this->hydrateStmt($stmt);
+        $this->hydrateStmt($stmt);
 
         $stmt = $this->connection->executeQuery('SELECT * FROM caching WHERE test_int > 500', [], [], new QueryCacheProfile(10, 'emptycachekey'));
-        $data = $this->hydrateStmt($stmt);
+        $this->hydrateStmt($stmt);
 
         self::assertCount(1, $this->sqlLogger->queries, 'just one dbal hit');
     }
 
     public function testChangeCacheImpl() : void
     {
         $stmt = $this->connection->executeQuery('SELECT * FROM caching WHERE test_int > 500', [], [], new QueryCacheProfile(10, 'emptycachekey'));
-        $data = $this->hydrateStmt($stmt);
+        $this->hydrateStmt($stmt);
 
         $secondCache = new ArrayCache();
         $stmt        = $this->connection->executeQuery('SELECT * FROM caching WHERE test_int > 500', [], [], new QueryCacheProfile(10, 'emptycachekey', $secondCache));
-        $data        = $this->hydrateStmt($stmt);
+        $this->hydrateStmt($stmt);
 
         self::assertCount(2, $this->sqlLogger->queries, 'two hits');
         self::assertCount(1, $secondCache->fetch('emptycachekey'));

tests/Doctrine/Tests/DBAL/Functional/Schema/PostgreSqlSchemaManagerTest.php

@@ -98,7 +98,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());
@@ -137,7 +137,7 @@ public function testAlterTableAutoIncrementDrop() : void
         self::assertTrue($tableFrom->getColumn('id')->getAutoincrement());
 
         $tableTo = new Table('autoinc_table_drop');
-        $column  = $tableTo->addColumn('id', 'integer');
+        $tableTo->addColumn('id', 'integer');
 
         $c    = new Comparator();
         $diff = $c->diffTable($tableFrom, $tableTo);
@@ -219,10 +219,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/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php

@@ -165,7 +165,7 @@ public function testCreateWithNoColumns() : void
         $table = new Table('test');
 
         $this->expectException(DBALException::class);
-        $sql = $this->platform->getCreateTableSQL($table);
+        $this->platform->getCreateTableSQL($table);
     }
 
     public function testGeneratesTableCreationSql() : void

tests/Doctrine/Tests/DBAL/Schema/ComparatorTest.php

@@ -863,8 +863,8 @@ public function testDiff() : void
      */
     public function testChangedSequence() : void
     {
-        $schema   = new Schema();
-        $sequence = $schema->createSequence('baz');
+        $schema = new Schema();
+        $schema->createSequence('baz');
 
         $schemaNew = clone $schema;
         $schemaNew->getSequence('baz')->setAllocationSize(20);

tests/Doctrine/Tests/DBAL/Schema/MySqlInheritCharsetTest.php

@@ -37,9 +37,7 @@ public function testInheritTableOptionsFromDatabase() : void
 
     public function testTableOptions() : void
     {
-        $eventManager = new EventManager();
-        $driverMock   = $this->createMock(Driver::class);
-        $platform     = new MySqlPlatform();
+        $platform = new MySqlPlatform();
 
         // default, no overrides
         $table = new Table('foobar', [new Column('aa', Type::getType('integer'))]);

tests/Doctrine/Tests/DBAL/Schema/SchemaTest.php

@@ -63,7 +63,7 @@ public function testCreateTableTwiceThrowsException() : void
         $table     = new Table($tableName);
         $tables    = [$table, $table];
 
-        $schema = new Schema($tables);
+        new Schema($tables);
     }
 
     public function testRenameTable() : void
@@ -172,7 +172,7 @@ public function testAddSequenceTwiceThrowsException() : void
 
         $sequence = new Sequence('a_seq', 1, 1);
 
-        $schema = new Schema([], [$sequence, $sequence]);
+        new Schema([], [$sequence, $sequence]);
     }
 
     public function testConfigMaxIdentifierLength() : void

tests/Doctrine/Tests/DBAL/Schema/TableTest.php

@@ -111,7 +111,7 @@ public function testAddColumnTwiceThrowsException() : void
         $columns   = [];
         $columns[] = new Column('foo', $type);
         $columns[] = new Column('foo', $type);
-        $table     = new Table('foo', $columns, [], []);
+        new Table('foo', $columns, [], []);
     }
 
     public function testCreateIndex() : void
@@ -184,7 +184,7 @@ public function testAddTwoPrimaryThrowsException() : void
             new Index('the_primary', ['foo'], true, true),
             new Index('other_primary', ['bar'], true, true),
         ];
-        $table   = new Table('foo', $columns, $indexes, []);
+        new Table('foo', $columns, $indexes, []);
     }
 
     public function testAddTwoIndexesWithSameNameThrowsException() : void
@@ -197,7 +197,7 @@ public function testAddTwoIndexesWithSameNameThrowsException() : void
             new Index('an_idx', ['foo'], false, false),
             new Index('an_idx', ['bar'], false, false),
         ];
-        $table   = new Table('foo', $columns, $indexes, []);
+        new Table('foo', $columns, $indexes, []);
     }
 
     public function testConstraints() : void

tests/Doctrine/Tests/DBAL/Types/Exception/SerializationFailedTest.php

@@ -14,8 +14,8 @@ class SerializationFailedTest extends TestCase
 {
     public function testNew() : void
     {
-        $value   = NAN;
-        $encoded = json_encode($value);
+        $value = NAN;
+        json_encode($value);
 
         $exception = SerializationFailed::new($value, 'json', json_last_error_msg());