Majkl578 / doctrine-dbal

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

Spacing +6 added lines, -6 removed lines

@@ -37,13 +37,13 @@
             ['BINARY', 'b', 'CREATE TABLE "a" (bbb TEXT COLLATE NOCASE, bb TEXT COLLATE RTRIM, b VARCHAR(42) NOT NULL COLLATE BINARY)'],
             ['BINARY', 'b', 'CREATE TABLE "a" (b VARCHAR(42) NOT NULL COLLATE BINARY, bb TEXT COLLATE RTRIM)'],
             ['utf-8', 'bar#', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar#" VARCHAR(255) COLLATE "utf-8" NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'],
-            [null,    'bar#', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar#" VARCHAR(255) NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'],
-            ['utf-8', 'baz',  'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar#" INTEGER NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'],
-            [null,    'baz',  'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar#" INTEGER NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'],
+            [null, 'bar#', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar#" VARCHAR(255) NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'],
+            ['utf-8', 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar#" INTEGER NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'],
+            [null, 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar#" INTEGER NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'],
             ['utf-8', 'bar/', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar/" VARCHAR(255) COLLATE "utf-8" NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'],
-            [null,    'bar/', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar/" VARCHAR(255) NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'],
-            ['utf-8', 'baz',  'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar/" INTEGER NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'],
-            [null,    'baz',  'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar/" INTEGER NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'],
+            [null, 'bar/', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar/" VARCHAR(255) NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'],
+            ['utf-8', 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar/" INTEGER NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'],
+            [null, 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar/" INTEGER NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'],
         ];
     }
 

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

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 
     public function testGetName()
     {
-        $table =  new Table("foo", array(), array(), array());
+        $table = new Table("foo", array(), array(), array());
         self::assertEquals("foo", $table->getName());
     }
 
@@ -253,7 +253,7 @@ 
         $this->expectException("Doctrine\DBAL\Schema\SchemaException");
 
         $table = new Table("foo");
-        $table->addColumn("bar",'integer');
+        $table->addColumn("bar", 'integer');
         $table->addIndex(array("bar"), "invalid name %&/");
     }
 

tests/Doctrine/Tests/DBAL/Sharding/SQLAzure/SQLAzureFederationsSynchronizerTest.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
         $synchronizer = new SQLAzureFederationsSynchronizer($this->conn, $this->sm);
         $sql = $synchronizer->getCreateSchema($schema);
 
-        self::assertEquals(array (
+        self::assertEquals(array(
             "--Create Federation\nCREATE FEDERATION Orders_Federation (CustID INT  RANGE)",
             "USE FEDERATION Orders_Federation (CustID = 0) WITH RESET, FILTERING = OFF;",
             "CREATE TABLE Products (ProductID INT NOT NULL, SupplierID INT NOT NULL, ProductName NVARCHAR(255) NOT NULL, Price NUMERIC(12, 2) NOT NULL, PRIMARY KEY (ProductID))",

tests/Doctrine/Tests/DBAL/Sharding/SQLAzure/AbstractTestCase.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
     protected function setUp()
     {
-        if (!isset($GLOBALS['db_type']) || strpos($GLOBALS['db_type'], "sqlsrv") === false) {
+        if ( ! isset($GLOBALS['db_type']) || strpos($GLOBALS['db_type'], "sqlsrv") === false) {
             $this->markTestSkipped('No driver or sqlserver driver specified.');
         }
 

tests/Doctrine/Tests/DBAL/Sharding/PoolingShardManagerTest.php

Spacing +9 added lines, -9 removed lines

@@ -77,7 +77,7 @@ 
         $conn = $this->createConnectionMock();
         $conn->expects($this->any())->method('getParams')->will(
             $this->returnValue(
-                array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createPassthroughShardChoser())
+                array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createPassthroughShardChoser())
             )
         );
 
@@ -95,21 +95,21 @@ 
 
         $conn = $this->createConnectionMock();
         $conn->expects($this->at(0))->method('getParams')->will($this->returnValue(
-            array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createPassthroughShardChoser())
+            array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createPassthroughShardChoser())
         ));
         $conn->expects($this->at(1))->method('getParams')->will($this->returnValue(
-            array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createPassthroughShardChoser())
+            array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createPassthroughShardChoser())
         ));
         $conn->expects($this->at(2))->method('connect')->with($this->equalTo(1));
         $conn->expects($this->at(3))
              ->method('fetchAll')
              ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types))
-             ->will($this->returnValue(array( array('id' => 1) ) ));
+             ->will($this->returnValue(array(array('id' => 1))));
         $conn->expects($this->at(4))->method('connect')->with($this->equalTo(2));
         $conn->expects($this->at(5))
              ->method('fetchAll')
              ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types))
-             ->will($this->returnValue(array( array('id' => 2) ) ));
+             ->will($this->returnValue(array(array('id' => 2))));
 
         $shardManager = new PoolingShardManager($conn, $this->createPassthroughShardChoser());
         $result = $shardManager->queryAll($sql, $params, $types);
@@ -125,21 +125,21 @@ 
 
         $conn = $this->createConnectionMock();
         $conn->expects($this->at(0))->method('getParams')->will($this->returnValue(
-            array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createStaticShardChoser())
+            array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createStaticShardChoser())
         ));
         $conn->expects($this->at(1))->method('getParams')->will($this->returnValue(
-            array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createStaticShardChoser())
+            array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createStaticShardChoser())
         ));
         $conn->expects($this->at(2))->method('connect')->with($this->equalTo(1));
         $conn->expects($this->at(3))
             ->method('fetchAll')
             ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types))
-            ->will($this->returnValue(array( array('id' => 1) ) ));
+            ->will($this->returnValue(array(array('id' => 1))));
         $conn->expects($this->at(4))->method('connect')->with($this->equalTo(2));
         $conn->expects($this->at(5))
             ->method('fetchAll')
             ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types))
-            ->will($this->returnValue(array( array('id' => 2) ) ));
+            ->will($this->returnValue(array(array('id' => 2))));
 
         $shardManager = new PoolingShardManager($conn, $this->createStaticShardChoser());
         $result = $shardManager->queryAll($sql, $params, $types);

tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php

Spacing +9 added lines, -9 removed lines

@@ -224,10 +224,10 @@ 
              //  Named parameters : Very simple with param int and string
             array(
                 "SELECT * FROM Foo WHERE foo = :foo AND bar = :bar",
-                array('bar'=>'Some String','foo'=>1),
+                array('bar'=>'Some String', 'foo'=>1),
                 array('foo' => ParameterType::INTEGER, 'bar' => ParameterType::STRING),
                 'SELECT * FROM Foo WHERE foo = ? AND bar = ?',
-                array(1,'Some String'),
+                array(1, 'Some String'),
                 array(ParameterType::INTEGER, ParameterType::STRING)
             ),
             //  Named parameters : Very simple with one needle
@@ -260,7 +260,7 @@ 
             // Named parameters: One non-list before and one after list-needle
             array(
                 "SELECT * FROM Foo WHERE foo = :foo AND bar IN (:bar) AND baz = :baz",
-                array('bar'=>array(1, 2, 3),'foo'=>1, 'baz'=>4),
+                array('bar'=>array(1, 2, 3), 'foo'=>1, 'baz'=>4),
                 array('bar'=>Connection::PARAM_INT_ARRAY, 'foo'=>ParameterType::INTEGER, 'baz'=>ParameterType::INTEGER),
                 'SELECT * FROM Foo WHERE foo = ? AND bar IN (?, ?, ?) AND baz = ?',
                 array(1, 1, 2, 3, 4),
@@ -269,7 +269,7 @@ 
             // Named parameters: Two lists
             array(
                 "SELECT * FROM Foo WHERE foo IN (:a, :b)",
-                array('b'=>array(4, 5),'a'=>array(1, 2, 3)),
+                array('b'=>array(4, 5), 'a'=>array(1, 2, 3)),
                 array('a'=>Connection::PARAM_INT_ARRAY, 'b'=>Connection::PARAM_INT_ARRAY),
                 'SELECT * FROM Foo WHERE foo IN (?, ?, ?, ?, ?)',
                 array(1, 2, 3, 4, 5),
@@ -281,8 +281,8 @@ 
                 array('arg'=>"Some String"),
                 array('arg'=>ParameterType::STRING),
                 'SELECT * FROM Foo WHERE foo <> ? AND bar = ?',
-                array("Some String","Some String"),
-                array(ParameterType::STRING,ParameterType::STRING,)
+                array("Some String", "Some String"),
+                array(ParameterType::STRING, ParameterType::STRING,)
             ),
              //  Named parameters : With the same name arg
             array(
@@ -291,14 +291,14 @@ 
                 array('arg'=>Connection::PARAM_INT_ARRAY),
                 'SELECT * FROM Foo WHERE foo IN (?, ?, ?) AND NOT bar IN (?, ?, ?)',
                 array(1, 2, 3, 1, 2, 3),
-                array(ParameterType::INTEGER,ParameterType::INTEGER, ParameterType::INTEGER,ParameterType::INTEGER,ParameterType::INTEGER, ParameterType::INTEGER)
+                array(ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER)
             ),
 
              //  Named parameters : Same name, other name in between DBAL-299
             array(
                 "SELECT * FROM Foo WHERE (:foo = 2) AND (:bar = 3) AND (:foo = 2)",
-                array('foo'=>2,'bar'=>3),
-                array('foo'=>ParameterType::INTEGER,'bar'=>ParameterType::INTEGER),
+                array('foo'=>2, 'bar'=>3),
+                array('foo'=>ParameterType::INTEGER, 'bar'=>ParameterType::INTEGER),
                 'SELECT * FROM Foo WHERE (? = 2) AND (? = 3) AND (? = 2)',
                 array(2, 3, 2),
                 array(ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER)

tests/Doctrine/Tests/DBAL/ConnectionTest.php

Spacing +1 added lines, -1 removed lines

@@ -831,7 +831,7 @@
             ->method('getResultCacheDriver')
             ->will($this->returnValue($resultCacheDriverMock));
 
-        $query  = 'SELECT 1';
+        $query = 'SELECT 1';
 
         $connectionParams = $this->params;
 

tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php

Spacing +19 added lines, -19 removed lines

@@ -348,7 +348,7 @@ 
 
     public function testEmptySelect()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb2 = $qb->select();
 
         self::assertSame($qb, $qb2);
@@ -369,7 +369,7 @@ 
 
     public function testEmptyAddSelect()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb2 = $qb->addSelect();
 
         self::assertSame($qb, $qb2);
@@ -391,7 +391,7 @@ 
 
     public function testUpdate()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb->update('users', 'u')
            ->set('u.foo', '?')
            ->set('u.bar', '?');
@@ -402,7 +402,7 @@ 
 
     public function testUpdateWithoutAlias()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb->update('users')
            ->set('foo', '?')
            ->set('bar', '?');
@@ -412,7 +412,7 @@ 
 
     public function testUpdateWhere()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb->update('users', 'u')
            ->set('u.foo', '?')
            ->where('u.foo = ?');
@@ -422,7 +422,7 @@ 
 
     public function testEmptyUpdate()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb2 = $qb->update();
 
         self::assertEquals(QueryBuilder::UPDATE, $qb->getType());
@@ -431,7 +431,7 @@ 
 
     public function testDelete()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb->delete('users', 'u');
 
         self::assertEquals(QueryBuilder::DELETE, $qb->getType());
@@ -440,7 +440,7 @@ 
 
     public function testDeleteWithoutAlias()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb->delete('users');
 
         self::assertEquals(QueryBuilder::DELETE, $qb->getType());
@@ -449,7 +449,7 @@ 
 
     public function testDeleteWhere()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb->delete('users', 'u')
            ->where('u.foo = ?');
 
@@ -458,7 +458,7 @@ 
 
     public function testEmptyDelete()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb2 = $qb->delete();
 
         self::assertEquals(QueryBuilder::DELETE, $qb->getType());
@@ -539,13 +539,13 @@ 
 
     public function testGetConnection()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         self::assertSame($this->conn, $qb->getConnection());
     }
 
     public function testGetState()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
 
         self::assertEquals(QueryBuilder::STATE_CLEAN, $qb->getState());
 
@@ -561,7 +561,7 @@ 
 
     public function testSetMaxResults()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb->setMaxResults(10);
 
         self::assertEquals(QueryBuilder::STATE_DIRTY, $qb->getState());
@@ -570,7 +570,7 @@ 
 
     public function testSetFirstResult()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
         $qb->setFirstResult(10);
 
         self::assertEquals(QueryBuilder::STATE_DIRTY, $qb->getState());
@@ -579,7 +579,7 @@ 
 
     public function testResetQueryPart()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
 
         $qb->select('u.*')->from('users', 'u')->where('u.name = ?');
 
@@ -590,7 +590,7 @@ 
 
     public function testResetQueryParts()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
 
         $qb->select('u.*')->from('users', 'u')->where('u.name = ?')->orderBy('u.name');
 
@@ -601,7 +601,7 @@ 
 
     public function testCreateNamedParameter()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
 
         $qb->select('u.*')->from('users', 'u')->where(
             $qb->expr()->eq('u.name', $qb->createNamedParameter(10, ParameterType::INTEGER))
@@ -614,7 +614,7 @@ 
 
     public function testCreateNamedParameterCustomPlaceholder()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
 
         $qb->select('u.*')->from('users', 'u')->where(
             $qb->expr()->eq('u.name', $qb->createNamedParameter(10, ParameterType::INTEGER, ':test'))
@@ -627,7 +627,7 @@ 
 
     public function testCreatePositionalParameter()
     {
-        $qb   = new QueryBuilder($this->conn);
+        $qb = new QueryBuilder($this->conn);
 
         $qb->select('u.*')->from('users', 'u')->where(
             $qb->expr()->eq('u.name', $qb->createPositionalParameter(10, ParameterType::INTEGER))

tests/Doctrine/Tests/DBAL/Query/Expression/ExpressionBuilderTest.php

Spacing +2 added lines, -2 removed lines

@@ -202,7 +202,7 @@ 
 
     public function testIn()
     {
-        self::assertEquals('u.groups IN (1, 3, 4, 7)', $this->expr->in('u.groups', array(1,3,4,7)));
+        self::assertEquals('u.groups IN (1, 3, 4, 7)', $this->expr->in('u.groups', array(1, 3, 4, 7)));
     }
 
     public function testInWithPlaceholder()
@@ -212,7 +212,7 @@ 
 
     public function testNotIn()
     {
-        self::assertEquals('u.groups NOT IN (1, 3, 4, 7)', $this->expr->notIn('u.groups', array(1,3,4,7)));
+        self::assertEquals('u.groups NOT IN (1, 3, 4, 7)', $this->expr->notIn('u.groups', array(1, 3, 4, 7)));
     }
 
     public function testNotInWithPlaceholder()