Majkl578 / doctrine-dbal

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

Indentation +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
         $paramStr = 'foo';
 
         $sql = "SELECT test_int, test_string FROM " . $this->_conn->quoteIdentifier($table) . " ".
-               "WHERE test_int = " . $this->_conn->quote($paramInt) . " AND test_string = " . $this->_conn->quote($paramStr);
+                "WHERE test_int = " . $this->_conn->quote($paramInt) . " AND test_string = " . $this->_conn->quote($paramStr);
         $stmt = $this->_conn->prepare($sql);
         self::assertInstanceOf('Doctrine\DBAL\Statement', $stmt);
     }

Spacing +33 added lines, -33 removed lines

@@ -165,7 +165,7 @@ 
         $paramInt = 1;
         $paramStr = 'foo';
 
-        $sql = "SELECT test_int, test_string FROM " . $this->_conn->quoteIdentifier($table) . " ".
+        $sql = "SELECT test_int, test_string FROM " . $this->_conn->quoteIdentifier($table) . " " .
                "WHERE test_int = " . $this->_conn->quote($paramInt) . " AND test_string = " . $this->_conn->quote($paramStr);
         $stmt = $this->_conn->prepare($sql);
         self::assertInstanceOf('Doctrine\DBAL\Statement', $stmt);
@@ -531,30 +531,30 @@ 
     {
         $p = $this->_conn->getDatabasePlatform();
         $sql = 'SELECT ';
-        $sql .= $p->getDateDiffExpression('test_datetime', $p->getCurrentTimestampSQL()) .' AS diff, ';
-        $sql .= $p->getDateAddSecondsExpression('test_datetime', 1) .' AS add_seconds, ';
-        $sql .= $p->getDateSubSecondsExpression('test_datetime', 1) .' AS sub_seconds, ';
-        $sql .= $p->getDateAddMinutesExpression('test_datetime', 5) .' AS add_minutes, ';
-        $sql .= $p->getDateSubMinutesExpression('test_datetime', 5) .' AS sub_minutes, ';
-        $sql .= $p->getDateAddHourExpression('test_datetime', 3) .' AS add_hour, ';
-        $sql .= $p->getDateSubHourExpression('test_datetime', 3) .' AS sub_hour, ';
-        $sql .= $p->getDateAddDaysExpression('test_datetime', 10) .' AS add_days, ';
-        $sql .= $p->getDateSubDaysExpression('test_datetime', 10) .' AS sub_days, ';
-        $sql .= $p->getDateAddWeeksExpression('test_datetime', 1) .' AS add_weeks, ';
-        $sql .= $p->getDateSubWeeksExpression('test_datetime', 1) .' AS sub_weeks, ';
-        $sql .= $p->getDateAddMonthExpression('test_datetime', 2) .' AS add_month, ';
-        $sql .= $p->getDateSubMonthExpression('test_datetime', 2) .' AS sub_month, ';
-        $sql .= $p->getDateAddQuartersExpression('test_datetime', 3) .' AS add_quarters, ';
-        $sql .= $p->getDateSubQuartersExpression('test_datetime', 3) .' AS sub_quarters, ';
-        $sql .= $p->getDateAddYearsExpression('test_datetime', 6) .' AS add_years, ';
-        $sql .= $p->getDateSubYearsExpression('test_datetime', 6) .' AS sub_years ';
+        $sql .= $p->getDateDiffExpression('test_datetime', $p->getCurrentTimestampSQL()) . ' AS diff, ';
+        $sql .= $p->getDateAddSecondsExpression('test_datetime', 1) . ' AS add_seconds, ';
+        $sql .= $p->getDateSubSecondsExpression('test_datetime', 1) . ' AS sub_seconds, ';
+        $sql .= $p->getDateAddMinutesExpression('test_datetime', 5) . ' AS add_minutes, ';
+        $sql .= $p->getDateSubMinutesExpression('test_datetime', 5) . ' AS sub_minutes, ';
+        $sql .= $p->getDateAddHourExpression('test_datetime', 3) . ' AS add_hour, ';
+        $sql .= $p->getDateSubHourExpression('test_datetime', 3) . ' AS sub_hour, ';
+        $sql .= $p->getDateAddDaysExpression('test_datetime', 10) . ' AS add_days, ';
+        $sql .= $p->getDateSubDaysExpression('test_datetime', 10) . ' AS sub_days, ';
+        $sql .= $p->getDateAddWeeksExpression('test_datetime', 1) . ' AS add_weeks, ';
+        $sql .= $p->getDateSubWeeksExpression('test_datetime', 1) . ' AS sub_weeks, ';
+        $sql .= $p->getDateAddMonthExpression('test_datetime', 2) . ' AS add_month, ';
+        $sql .= $p->getDateSubMonthExpression('test_datetime', 2) . ' AS sub_month, ';
+        $sql .= $p->getDateAddQuartersExpression('test_datetime', 3) . ' AS add_quarters, ';
+        $sql .= $p->getDateSubQuartersExpression('test_datetime', 3) . ' AS sub_quarters, ';
+        $sql .= $p->getDateAddYearsExpression('test_datetime', 6) . ' AS add_years, ';
+        $sql .= $p->getDateSubYearsExpression('test_datetime', 6) . ' AS sub_years ';
         $sql .= 'FROM fetch_table';
 
         $row = $this->_conn->fetchAssoc($sql);
         $row = array_change_key_case($row, CASE_LOWER);
 
         $diff = (strtotime('2010-01-01') - strtotime(date('Y-m-d'))) / 3600 / 24;
-        self::assertEquals($diff, $row['diff'], "Date difference should be approx. ".$diff." days.", 1);
+        self::assertEquals($diff, $row['diff'], "Date difference should be approx. " . $diff . " days.", 1);
         self::assertEquals('2010-01-01 10:10:11', date('Y-m-d H:i:s', strtotime($row['add_seconds'])), "Adding second should end up on 2010-01-01 10:10:11");
         self::assertEquals('2010-01-01 10:10:09', date('Y-m-d H:i:s', strtotime($row['sub_seconds'])), "Subtracting second should end up on 2010-01-01 10:10:09");
         self::assertEquals('2010-01-01 10:15:10', date('Y-m-d H:i:s', strtotime($row['add_minutes'])), "Adding minutes should end up on 2010-01-01 10:15:10");
@@ -578,15 +578,15 @@ 
         $platform = $this->_conn->getDatabasePlatform();
 
         $sql = 'SELECT ';
-        $sql .= $platform->getLocateExpression('test_string', "'oo'") .' AS locate1, ';
-        $sql .= $platform->getLocateExpression('test_string', "'foo'") .' AS locate2, ';
-        $sql .= $platform->getLocateExpression('test_string', "'bar'") .' AS locate3, ';
-        $sql .= $platform->getLocateExpression('test_string', 'test_string') .' AS locate4, ';
-        $sql .= $platform->getLocateExpression("'foo'", 'test_string') .' AS locate5, ';
-        $sql .= $platform->getLocateExpression("'barfoobaz'", 'test_string') .' AS locate6, ';
-        $sql .= $platform->getLocateExpression("'bar'", 'test_string') .' AS locate7, ';
-        $sql .= $platform->getLocateExpression('test_string', "'oo'", 2) .' AS locate8, ';
-        $sql .= $platform->getLocateExpression('test_string', "'oo'", 3) .' AS locate9 ';
+        $sql .= $platform->getLocateExpression('test_string', "'oo'") . ' AS locate1, ';
+        $sql .= $platform->getLocateExpression('test_string', "'foo'") . ' AS locate2, ';
+        $sql .= $platform->getLocateExpression('test_string', "'bar'") . ' AS locate3, ';
+        $sql .= $platform->getLocateExpression('test_string', 'test_string') . ' AS locate4, ';
+        $sql .= $platform->getLocateExpression("'foo'", 'test_string') . ' AS locate5, ';
+        $sql .= $platform->getLocateExpression("'barfoobaz'", 'test_string') . ' AS locate6, ';
+        $sql .= $platform->getLocateExpression("'bar'", 'test_string') . ' AS locate7, ';
+        $sql .= $platform->getLocateExpression('test_string', "'oo'", 2) . ' AS locate8, ';
+        $sql .= $platform->getLocateExpression('test_string', "'oo'", 3) . ' AS locate9 ';
         $sql .= 'FROM fetch_table';
 
         $row = $this->_conn->fetchAssoc($sql);
@@ -717,11 +717,11 @@ 
 
         $results = $stmt->fetchAll(
             FetchMode::CUSTOM_OBJECT,
-            __NAMESPACE__.'\\MyFetchClass'
+            __NAMESPACE__ . '\\MyFetchClass'
         );
 
         self::assertCount(1, $results);
-        self::assertInstanceOf(__NAMESPACE__.'\\MyFetchClass', $results[0]);
+        self::assertInstanceOf(__NAMESPACE__ . '\\MyFetchClass', $results[0]);
 
         self::assertEquals(1, $results[0]->test_int);
         self::assertEquals('foo', $results[0]->test_string);
@@ -760,7 +760,7 @@ 
         $results = $stmt->fetchAll();
 
         self::assertCount(1, $results);
-        self::assertInstanceOf(__NAMESPACE__.'\\MyFetchClass', $results[0]);
+        self::assertInstanceOf(__NAMESPACE__ . '\\MyFetchClass', $results[0]);
 
         self::assertEquals(1, $results[0]->test_int);
         self::assertEquals('foo', $results[0]->test_string);
@@ -785,7 +785,7 @@ 
         }
 
         self::assertCount(1, $results);
-        self::assertInstanceOf(__NAMESPACE__.'\\MyFetchClass', $results[0]);
+        self::assertInstanceOf(__NAMESPACE__ . '\\MyFetchClass', $results[0]);
 
         self::assertEquals(1, $results[0]->test_int);
         self::assertEquals('foo', $results[0]->test_string);
@@ -885,7 +885,7 @@ 
 
     private function skipOci8AndMysqli()
     {
-        if (isset($GLOBALS['db_type']) && $GLOBALS['db_type'] == "oci8")  {
+        if (isset($GLOBALS['db_type']) && $GLOBALS['db_type'] == "oci8") {
             $this->markTestSkipped("Not supported by OCI8");
         }
         if ('mysqli' == $this->_conn->getDriver()->getName()) {

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

Indentation +3 added lines, -3 removed lines

@@ -95,9 +95,9 @@
         $this->_conn->insert('modify_limit_table2', array('test_int' => 2));
 
         $sql = "SELECT modify_limit_table.test_int FROM modify_limit_table " .
-               "INNER JOIN modify_limit_table2 ON modify_limit_table.test_int = modify_limit_table2.test_int ".
-               "GROUP BY modify_limit_table.test_int " .
-               "ORDER BY modify_limit_table.test_int ASC";
+                "INNER JOIN modify_limit_table2 ON modify_limit_table.test_int = modify_limit_table2.test_int ".
+                "GROUP BY modify_limit_table.test_int " .
+                "ORDER BY modify_limit_table.test_int ASC";
         $this->assertLimitResult(array(1, 2), $sql, 10, 0);
         $this->assertLimitResult(array(1), $sql, 1, 0);
         $this->assertLimitResult(array(2), $sql, 1, 1);

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     {
         parent::setUp();
 
-        if (!self::$tableCreated) {
+        if ( ! self::$tableCreated) {
             /* @var $sm \Doctrine\DBAL\Schema\AbstractSchemaManager */
             $table = new \Doctrine\DBAL\Schema\Table("modify_limit_table");
             $table->addColumn('test_int', 'integer');
@@ -95,7 +95,7 @@ 
         $this->_conn->insert('modify_limit_table2', array('test_int' => 2));
 
         $sql = "SELECT modify_limit_table.test_int FROM modify_limit_table " .
-               "INNER JOIN modify_limit_table2 ON modify_limit_table.test_int = modify_limit_table2.test_int ".
+               "INNER JOIN modify_limit_table2 ON modify_limit_table.test_int = modify_limit_table2.test_int " .
                "GROUP BY modify_limit_table.test_int " .
                "ORDER BY modify_limit_table.test_int ASC";
         $this->assertLimitResult(array(1, 2), $sql, 10, 0);

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

Spacing +3 added lines, -3 removed lines

@@ -265,19 +265,19 @@
     {
         return array(
             'fetch' => array(
-                function (Statement $stmt) {
+                function(Statement $stmt) {
                     return $stmt->fetch();
                 },
                 false,
             ),
             'fetch-column' => array(
-                function (Statement $stmt) {
+                function(Statement $stmt) {
                     return $stmt->fetchColumn();
                 },
                 false,
             ),
             'fetch-all' => array(
-                function (Statement $stmt) {
+                function(Statement $stmt) {
                     return $stmt->fetchAll();
                 },
                 array(),

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

Indentation +5 added lines, -5 removed lines

@@ -103,18 +103,18 @@ 
 
         $stmt = $conn->query('SELECT * FROM portability_table');
         foreach ($stmt as $row) {
-          $this->assertFetchResultRow($row);
+            $this->assertFetchResultRow($row);
         }
 
         $stmt = $conn->query('SELECT * FROM portability_table');
         while (($row = $stmt->fetch())) {
-          $this->assertFetchResultRow($row);
+            $this->assertFetchResultRow($row);
         }
 
         $stmt = $conn->prepare('SELECT * FROM portability_table');
         $stmt->execute();
         while (($row = $stmt->fetch())) {
-          $this->assertFetchResultRow($row);
+            $this->assertFetchResultRow($row);
         }
     }
 
@@ -150,8 +150,8 @@ 
             ->getMock();
 
         $driverMock->expects($this->once())
-                   ->method('connect')
-                   ->will($this->returnValue(null));
+                    ->method('connect')
+                    ->will($this->returnValue(null));
 
         $connection = new ConnectionPortability($params, $driverMock);
 

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
         $portabilityMode = ConnectionPortability::PORTABILITY_ALL,
         $case = ColumnCase::LOWER
     ) {
-        if (!$this->portableConnection) {
+        if ( ! $this->portableConnection) {
             $params = $this->_conn->getParams();
 
             $params['wrapperClass'] = ConnectionPortability::class;
@@ -59,7 +59,7 @@ 
 
                 $this->portableConnection->insert('portability_table', array('Test_Int' => 1, 'Test_String' => 'foo', 'Test_Null' => ''));
                 $this->portableConnection->insert('portability_table', array('Test_Int' => 2, 'Test_String' => 'foo  ', 'Test_Null' => null));
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
 
             }
         }

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

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 
     public function testTransactionNestingBehaviorWithSavepoints()
     {
-        if (!$this->_conn->getDatabasePlatform()->supportsSavepoints()) {
+        if ( ! $this->_conn->getDatabasePlatform()->supportsSavepoints()) {
             $this->markTestSkipped('This test requires the platform to support savepoints.');
         }
 
@@ -105,7 +105,7 @@ 
 
     public function testTransactionNestingBehaviorCantBeChangedInActiveTransaction()
     {
-        if (!$this->_conn->getDatabasePlatform()->supportsSavepoints()) {
+        if ( ! $this->_conn->getDatabasePlatform()->supportsSavepoints()) {
             $this->markTestSkipped('This test requires the platform to support savepoints.');
         }
 

tests/Doctrine/Tests/DBAL/DriverManagerTest.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
         $options = is_array($url) ? $url : ['url' => $url];
 
         if (isset($options['pdo'])) {
-            if (! extension_loaded('pdo')) {
+            if ( ! extension_loaded('pdo')) {
                 $this->markTestSkipped('PDO is not installed');
             }
 

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

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\DBAL\Schema;
 

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

Spacing +104 added lines, -104 removed lines

@@ -46,76 +46,76 @@ 
 {
     public function testCompareSame1()
     {
-        $schema1 = new Schema( array(
+        $schema1 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
-                    'integerfield1' => new Column('integerfield1', Type::getType('integer' ) ),
+                array(
+                    'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                 )
             ),
-        ) );
-        $schema2 = new Schema( array(
+        ));
+        $schema2 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
-                    'integerfield1' => new Column('integerfield1', Type::getType('integer') ),
+                array(
+                    'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                 )
             ),
-        ) );
+        ));
 
         $expected = new SchemaDiff();
         $expected->fromSchema = $schema1;
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ) );
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareSame2()
     {
-        $schema1 = new Schema( array(
+        $schema1 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 )
             ),
-        ) );
-        $schema2 = new Schema( array(
+        ));
+        $schema2 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                 )
             ),
-        ) );
+        ));
 
         $expected = new SchemaDiff();
         $expected->fromSchema = $schema1;
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ) );
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareMissingTable()
     {
         $schemaConfig = new \Doctrine\DBAL\Schema\SchemaConfig;
-        $table = new Table('bugdb', array ('integerfield1' => new Column('integerfield1', Type::getType('integer'))));
+        $table = new Table('bugdb', array('integerfield1' => new Column('integerfield1', Type::getType('integer'))));
         $table->setSchemaConfig($schemaConfig);
 
-        $schema1 = new Schema( array($table), array(), $schemaConfig );
-        $schema2 = new Schema( array(),       array(), $schemaConfig );
+        $schema1 = new Schema(array($table), array(), $schemaConfig);
+        $schema2 = new Schema(array(), array(), $schemaConfig);
 
-        $expected = new SchemaDiff( array(), array(), array('bugdb' => $table), $schema1 );
+        $expected = new SchemaDiff(array(), array(), array('bugdb' => $table), $schema1);
 
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ) );
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareNewTable()
     {
         $schemaConfig = new \Doctrine\DBAL\Schema\SchemaConfig;
-        $table = new Table('bugdb', array ('integerfield1' => new Column('integerfield1', Type::getType('integer'))));
+        $table = new Table('bugdb', array('integerfield1' => new Column('integerfield1', Type::getType('integer'))));
         $table->setSchemaConfig($schemaConfig);
 
-        $schema1 = new Schema( array(),       array(), $schemaConfig );
-        $schema2 = new Schema( array($table), array(), $schemaConfig );
+        $schema1 = new Schema(array(), array(), $schemaConfig);
+        $schema2 = new Schema(array($table), array(), $schemaConfig);
 
-        $expected = new SchemaDiff( array('bugdb' => $table), array(), array(), $schema1 );
+        $expected = new SchemaDiff(array('bugdb' => $table), array(), array(), $schema1);
 
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ) );
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareOnlyAutoincrementChanged()
@@ -132,26 +132,26 @@ 
     public function testCompareMissingField()
     {
         $missingColumn = new Column('integerfield1', Type::getType('integer'));
-        $schema1 = new Schema( array(
+        $schema1 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => $missingColumn,
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 )
             ),
-        ) );
-        $schema2 = new Schema( array(
+        ));
+        $schema2 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 )
             ),
-        ) );
+        ));
 
-        $expected = new SchemaDiff ( array(),
-            array (
-                'bugdb' => new TableDiff( 'bugdb', array(), array(),
-                    array (
+        $expected = new SchemaDiff(array(),
+            array(
+                'bugdb' => new TableDiff('bugdb', array(), array(),
+                    array(
                         'integerfield1' => $missingColumn,
                     )
                 )
@@ -160,31 +160,31 @@ 
         $expected->fromSchema = $schema1;
         $expected->changedTables['bugdb']->fromTable = $schema1->getTable('bugdb');
 
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ) );
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareNewField()
     {
-        $schema1 = new Schema( array(
+        $schema1 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                 )
             ),
-        ) );
-        $schema2 = new Schema( array(
+        ));
+        $schema2 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 )
             ),
-        ) );
+        ));
 
-        $expected = new SchemaDiff ( array(),
-            array (
-                'bugdb' => new TableDiff ('bugdb',
-                    array (
+        $expected = new SchemaDiff(array(),
+            array(
+                'bugdb' => new TableDiff('bugdb',
+                    array(
                         'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                     )
                 ),
@@ -193,7 +193,7 @@ 
         $expected->fromSchema = $schema1;
         $expected->changedTables['bugdb']->fromTable = $schema1->getTable('bugdb');
 
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ) );
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareChangedColumns_ChangeType()
@@ -244,13 +244,13 @@ 
 
     public function testCompareRemovedIndex()
     {
-        $schema1 = new Schema( array(
+        $schema1 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 ),
-                array (
+                array(
                     'primary' => new Index('primary',
                         array(
                             'integerfield1'
@@ -259,20 +259,20 @@ 
                     )
                 )
             ),
-        ) );
-        $schema2 = new Schema( array(
+        ));
+        $schema2 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 )
             ),
-        ) );
+        ));
 
-        $expected = new SchemaDiff ( array(),
-            array (
-                'bugdb' => new TableDiff( 'bugdb', array(), array(), array(), array(), array(),
-                    array (
+        $expected = new SchemaDiff(array(),
+            array(
+                'bugdb' => new TableDiff('bugdb', array(), array(), array(), array(), array(),
+                    array(
                         'primary' => new Index('primary',
                         array(
                             'integerfield1'
@@ -286,26 +286,26 @@ 
         $expected->fromSchema = $schema1;
         $expected->changedTables['bugdb']->fromTable = $schema1->getTable('bugdb');
 
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ) );
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareNewIndex()
     {
-        $schema1 = new Schema( array(
+        $schema1 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 )
             ),
-        ) );
-        $schema2 = new Schema( array(
+        ));
+        $schema2 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 ),
-                array (
+                array(
                     'primary' => new Index('primary',
                         array(
                             'integerfield1'
@@ -314,12 +314,12 @@ 
                     )
                 )
             ),
-        ) );
+        ));
 
-        $expected = new SchemaDiff ( array(),
-            array (
-                'bugdb' => new TableDiff( 'bugdb', array(), array(), array(),
-                    array (
+        $expected = new SchemaDiff(array(),
+            array(
+                'bugdb' => new TableDiff('bugdb', array(), array(), array(),
+                    array(
                         'primary' => new Index('primary',
                             array(
                                 'integerfield1'
@@ -333,18 +333,18 @@ 
         $expected->fromSchema = $schema1;
         $expected->changedTables['bugdb']->fromTable = $schema1->getTable('bugdb');
 
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ) );
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareChangedIndex()
     {
-        $schema1 = new Schema( array(
+        $schema1 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 ),
-                array (
+                array(
                     'primary' => new Index('primary',
                         array(
                             'integerfield1'
@@ -353,26 +353,26 @@ 
                     )
                 )
             ),
-        ) );
-        $schema2 = new Schema( array(
+        ));
+        $schema2 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 ),
-                array (
+                array(
                     'primary' => new Index('primary',
                         array('integerfield1', 'integerfield2'),
                         true
                     )
                 )
             ),
-        ) );
+        ));
 
-        $expected = new SchemaDiff ( array(),
-            array (
-                'bugdb' => new TableDiff( 'bugdb', array(), array(), array(), array(),
-                    array (
+        $expected = new SchemaDiff(array(),
+            array(
+                'bugdb' => new TableDiff('bugdb', array(), array(), array(), array(),
+                    array(
                         'primary' => new Index('primary',
                             array(
                                 'integerfield1',
@@ -387,38 +387,38 @@ 
         $expected->fromSchema = $schema1;
         $expected->changedTables['bugdb']->fromTable = $schema1->getTable('bugdb');
 
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ));
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareChangedIndexFieldPositions()
     {
-        $schema1 = new Schema( array(
+        $schema1 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 ),
-                array (
+                array(
                     'primary' => new Index('primary', array('integerfield1', 'integerfield2'), true)
                 )
             ),
-        ) );
-        $schema2 = new Schema( array(
+        ));
+        $schema2 = new Schema(array(
             'bugdb' => new Table('bugdb',
-                array (
+                array(
                     'integerfield1' => new Column('integerfield1', Type::getType('integer')),
                     'integerfield2' => new Column('integerfield2', Type::getType('integer')),
                 ),
-                array (
+                array(
                     'primary' => new Index('primary', array('integerfield2', 'integerfield1'), true)
                 )
             ),
-        ) );
+        ));
 
-        $expected = new SchemaDiff ( array(),
-            array (
+        $expected = new SchemaDiff(array(),
+            array(
                 'bugdb' => new TableDiff('bugdb', array(), array(), array(), array(),
-                    array (
+                    array(
                         'primary' => new Index('primary', array('integerfield2', 'integerfield1'), true)
                     )
                 ),
@@ -427,7 +427,7 @@ 
         $expected->fromSchema = $schema1;
         $expected->changedTables['bugdb']->fromTable = $schema1->getTable('bugdb');
 
-        self::assertEquals($expected, Comparator::compareSchemas( $schema1, $schema2 ));
+        self::assertEquals($expected, Comparator::compareSchemas($schema1, $schema2));
     }
 
     public function testCompareSequences()
@@ -821,7 +821,7 @@ 
         $c = new \Doctrine\DBAL\Schema\Comparator;
         $diff = $c->compare($schema, $schemaNew);
 
-        self::assertSame($diff->changedSequences[0] , $schemaNew->getSequence('baz'));
+        self::assertSame($diff->changedSequences[0], $schemaNew->getSequence('baz'));
     }
 
     /**
@@ -849,7 +849,7 @@ 
         $oldSchema = new Schema(array(), array(), $config);
         $oldSchema->createTable('bar');
 
-        $newSchema= new Schema(array(), array(), $config);
+        $newSchema = new Schema(array(), array(), $config);
         $newSchema->createTable('foo.bar');
 
         $expected = new SchemaDiff();
@@ -870,7 +870,7 @@ 
         $oldSchema->createTable('taz');
         $oldSchema->createTable('war.tab');
 
-        $newSchema= new Schema(array(), array(), $config);
+        $newSchema = new Schema(array(), array(), $config);
         $newSchema->createTable('bar.tab');
         $newSchema->createTable('baz.tab');
         $newSchema->createTable('war.tab');
@@ -1072,7 +1072,7 @@ 
      * @param int        $changeTableCount
      * @param int        $removeTableCount
      */
-    public function assertSchemaTableChangeCount($diff, $newTableCount=0, $changeTableCount=0, $removeTableCount=0)
+    public function assertSchemaTableChangeCount($diff, $newTableCount = 0, $changeTableCount = 0, $removeTableCount = 0)
     {
         self::assertCount($newTableCount, $diff->newTables);
         self::assertCount($changeTableCount, $diff->changedTables);
@@ -1085,7 +1085,7 @@ 
      * @param int        $changeSequenceCount
      * @param int        $changeSequenceCount
      */
-    public function assertSchemaSequenceChangeCount($diff, $newSequenceCount=0, $changeSequenceCount=0, $removeSequenceCount=0)
+    public function assertSchemaSequenceChangeCount($diff, $newSequenceCount = 0, $changeSequenceCount = 0, $removeSequenceCount = 0)
     {
         self::assertCount($newSequenceCount, $diff->newSequences, "Expected number of new sequences is wrong.");
         self::assertCount($changeSequenceCount, $diff->changedSequences, "Expected number of changed sequences is wrong.");
@@ -1240,7 +1240,7 @@ 
 
     public function testForeignKeyRemovalWithRenamedLocalColumn()
     {
-        $fromSchema = new Schema( array(
+        $fromSchema = new Schema(array(
             'table1' => new Table('table1',
                 array(
                     'id' => new Column('id', Type::getType('integer')),
@@ -1255,7 +1255,7 @@ 
                     new ForeignKeyConstraint(array('id_table1'), 'table1', array('id'), 'fk_table2_table1')
                 ))
         ));
-        $toSchema = new Schema( array(
+        $toSchema = new Schema(array(
             'table2' => new Table('table2',
                 array(
                     'id' => new Column('id', Type::getType('integer')),

tests/Doctrine/Tests/DBAL/Schema/Visitor/SchemaSqlCollectorTest.php

Indentation +12 added lines, -12 removed lines

@@ -12,14 +12,14 @@ 
             ->setMethods(array('getCreateTableSql', 'getCreateSequenceSql', 'getCreateForeignKeySql'))
             ->getMock();
         $platformMock->expects($this->exactly(2))
-                     ->method('getCreateTableSql')
-                     ->will($this->returnValue(array("foo")));
+                        ->method('getCreateTableSql')
+                        ->will($this->returnValue(array("foo")));
         $platformMock->expects($this->exactly(1))
-                     ->method('getCreateSequenceSql')
-                     ->will($this->returnValue("bar"));
+                        ->method('getCreateSequenceSql')
+                        ->will($this->returnValue("bar"));
         $platformMock->expects($this->exactly(1))
-                     ->method('getCreateForeignKeySql')
-                     ->will($this->returnValue("baz"));
+                        ->method('getCreateForeignKeySql')
+                        ->will($this->returnValue("baz"));
 
         $schema = $this->createFixtureSchema();
 
@@ -34,14 +34,14 @@ 
             ->setMethods(array('getDropTableSql', 'getDropSequenceSql', 'getDropForeignKeySql'))
             ->getMock();
         $platformMock->expects($this->exactly(2))
-                     ->method('getDropTableSql')
-                     ->will($this->returnValue("tbl"));
+                        ->method('getDropTableSql')
+                        ->will($this->returnValue("tbl"));
         $platformMock->expects($this->exactly(1))
-                     ->method('getDropSequenceSql')
-                     ->will($this->returnValue("seq"));
+                        ->method('getDropSequenceSql')
+                        ->will($this->returnValue("seq"));
         $platformMock->expects($this->exactly(1))
-                     ->method('getDropForeignKeySql')
-                     ->will($this->returnValue("fk"));
+                        ->method('getDropForeignKeySql')
+                        ->will($this->returnValue("fk"));
 
         $schema = $this->createFixtureSchema();