doctrine / orm

tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php

Spacing +6 added lines, -6 removed lines

@@ -87,7 +87,7 @@ 
         $article = new CmsArticle();
 
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Entity ' . CmsArticle::class);
+        $this->expectExceptionMessage('Entity '.CmsArticle::class);
 
         $this->_em->lock($article, LockMode::OPTIMISTIC, $article->version + 1);
     }
@@ -136,7 +136,7 @@ 
     {
         $writeLockSql = $this->_em->getConnection()->getDatabasePlatform()->getWriteLockSQL();
 
-        if (! $writeLockSql) {
+        if ( ! $writeLockSql) {
             $this->markTestSkipped('Database Driver has no Write Lock support.');
         }
 
@@ -156,8 +156,8 @@ 
             throw $e;
         }
 
-        $query = array_pop( $this->_sqlLoggerStack->queries );
-        $query = array_pop( $this->_sqlLoggerStack->queries );
+        $query = array_pop($this->_sqlLoggerStack->queries);
+        $query = array_pop($this->_sqlLoggerStack->queries);
         self::assertContains($writeLockSql, $query['sql']);
     }
 
@@ -168,7 +168,7 @@ 
     {
         $readLockSql = $this->_em->getConnection()->getDatabasePlatform()->getReadLockSQL();
 
-        if (! $readLockSql) {
+        if ( ! $readLockSql) {
             $this->markTestSkipped('Database Driver has no Write Lock support.');
         }
 
@@ -200,7 +200,7 @@ 
      */
     public function testLockOptimisticNonVersionedThrowsExceptionInDQL()
     {
-        $dql = "SELECT u FROM " . CmsUser::class . " u WHERE u.username = 'gblanco'";
+        $dql = "SELECT u FROM ".CmsUser::class." u WHERE u.username = 'gblanco'";
 
         $this->expectException(OptimisticLockException::class);
         $this->expectExceptionMessage('The optimistic lock on an entity failed.');

tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
         self::assertEquals('FOO', $this->_em->getConnection()->fetchColumn("select named_lower_case_string from customtype_uppercases where id=".$entity->id.""), 'Database holds uppercase string');
 
 
-        $entity->namedLowerCaseString   = 'bar';
+        $entity->namedLowerCaseString = 'bar';
 
         $this->_em->persist($entity);
         $this->_em->flush();
@@ -128,7 +128,7 @@ 
 
         $this->_em->clear();
 
-        $query = $this->_em->createQuery("SELECT p, p.customInteger, c from Doctrine\Tests\Models\CustomType\CustomTypeParent p JOIN p.child c where p.id = " . $parentId);
+        $query = $this->_em->createQuery("SELECT p, p.customInteger, c from Doctrine\Tests\Models\CustomType\CustomTypeParent p JOIN p.child c where p.id = ".$parentId);
 
         $result = $query->getResult();
 

tests/Doctrine/Tests/ORM/Functional/TypeTest.php

Indentation +6 added lines, -6 removed lines

@@ -126,7 +126,7 @@ 
         self::assertSame('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s'));
 
         $articles = $this->_em->getRepository(DateTimeModel::class)
-                              ->findBy(['datetime' => new \DateTime()]);
+                                ->findBy(['datetime' => new \DateTime()]);
 
         self::assertEmpty($articles);
     }
@@ -162,11 +162,11 @@ 
         $this->_em->clear();
 
         $dateTimeDb = $this->_em->createQueryBuilder()
-                                 ->select('d')
-                                 ->from(DateTimeModel::class, 'd')
-                                 ->where('d.datetime = ?1')
-                                 ->setParameter(1, $date, DBALType::DATETIME)
-                                 ->getQuery()->getSingleResult();
+                                    ->select('d')
+                                    ->from(DateTimeModel::class, 'd')
+                                    ->where('d.datetime = ?1')
+                                    ->setParameter(1, $date, DBALType::DATETIME)
+                                    ->getQuery()->getSingleResult();
 
         self::assertInstanceOf(\DateTime::class, $dateTimeDb->datetime);
         self::assertSame('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s'));

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $dql = 'SELECT d FROM ' . DecimalModel::class . ' d';
+        $dql = 'SELECT d FROM '.DecimalModel::class.' d';
         $decimal = $this->_em->createQuery($dql)->getSingleResult();
 
         self::assertSame('0.15', $decimal->decimal);
@@ -49,7 +49,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $dql = 'SELECT b FROM ' . BooleanModel::class . ' b WHERE b.booleanField = true';
+        $dql = 'SELECT b FROM '.BooleanModel::class.' b WHERE b.booleanField = true';
         $bool = $this->_em->createQuery($dql)->getSingleResult();
 
         self::assertTrue($bool->booleanField);
@@ -59,7 +59,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $dql = 'SELECT b FROM ' . BooleanModel::class . ' b WHERE b.booleanField = false';
+        $dql = 'SELECT b FROM '.BooleanModel::class.' b WHERE b.booleanField = false';
         $bool = $this->_em->createQuery($dql)->getSingleResult();
 
         self::assertFalse($bool->booleanField);
@@ -75,7 +75,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $dql = 'SELECT s FROM ' . SerializationModel::class . ' s';
+        $dql = 'SELECT s FROM '.SerializationModel::class.' s';
         $serialize = $this->_em->createQuery($dql)->getSingleResult();
 
         self::assertSame(["foo" => "bar", "bar" => "baz"], $serialize->array);
@@ -90,7 +90,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $dql = 'SELECT s FROM ' . SerializationModel::class . ' s';
+        $dql = 'SELECT s FROM '.SerializationModel::class.' s';
         $serialize = $this->_em->createQuery($dql)->getSingleResult();
 
         self::assertInstanceOf('stdClass', $serialize->object);

tests/Doctrine/Tests/ORM/Functional/HydrationCacheTest.php

Indentation +12 added lines, -12 removed lines

@@ -34,37 +34,37 @@
         $dql = "SELECT u FROM Doctrine\Tests\Models\Cms\CmsUser u";
 
         $users = $this->_em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
-                      ->getResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
+                        ->getResult();
 
         $c = $this->getCurrentQueryCount();
         $users = $this->_em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
-                      ->getResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
+                        ->getResult();
 
         self::assertEquals($c, $this->getCurrentQueryCount(), "Should not execute query. Its cached!");
 
         $users = $this->_em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
-                      ->getArrayResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
+                        ->getArrayResult();
 
         self::assertEquals($c + 1, $this->getCurrentQueryCount(), "Hydration is part of cache key.");
 
         $users = $this->_em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
-                      ->getArrayResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
+                        ->getArrayResult();
 
         self::assertEquals($c + 1, $this->getCurrentQueryCount(), "Hydration now cached");
 
         $users = $this->_em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
-                      ->getArrayResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
+                        ->getArrayResult();
 
         self::assertTrue($cache->contains('cachekey'), 'Explicit cache key');
 
         $users = $this->_em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
-                      ->getArrayResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
+                        ->getArrayResult();
         self::assertEquals($c + 2, $this->getCurrentQueryCount(), "Hydration now cached");
     }
 

tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php

Spacing +27 added lines, -27 removed lines

@@ -742,9 +742,9 @@ 
         self::assertEquals($this->fixtures[1]->address->country, $result[1][1]->country);
         self::assertEquals($this->fixtures[2]->address->country, $result[2][1]->country);
 
-        self::assertEquals($this->fixtures[0]->status,$result[0]['status']);
-        self::assertEquals($this->fixtures[1]->status,$result[1]['status']);
-        self::assertEquals($this->fixtures[2]->status,$result[2]['status']);
+        self::assertEquals($this->fixtures[0]->status, $result[0]['status']);
+        self::assertEquals($this->fixtures[1]->status, $result[1]['status']);
+        self::assertEquals($this->fixtures[2]->status, $result[2]['status']);
     }
 
     public function testShouldSupportMultipleNewOperatorsAndSingleScalarWithAliases()
@@ -799,9 +799,9 @@ 
         self::assertEquals($this->fixtures[1]->address->country, $result[1]['cmsAddress']->country);
         self::assertEquals($this->fixtures[2]->address->country, $result[2]['cmsAddress']->country);
 
-        self::assertEquals($this->fixtures[0]->status,$result[0]['cmsUserStatus']);
-        self::assertEquals($this->fixtures[1]->status,$result[1]['cmsUserStatus']);
-        self::assertEquals($this->fixtures[2]->status,$result[2]['cmsUserStatus']);
+        self::assertEquals($this->fixtures[0]->status, $result[0]['cmsUserStatus']);
+        self::assertEquals($this->fixtures[1]->status, $result[1]['cmsUserStatus']);
+        self::assertEquals($this->fixtures[2]->status, $result[2]['cmsUserStatus']);
     }
 
     public function testShouldSupportMultipleNewOperatorsAndSingleScalarWithAndWithoutAliases()
@@ -856,9 +856,9 @@ 
         self::assertEquals($this->fixtures[1]->address->country, $result[1][0]->country);
         self::assertEquals($this->fixtures[2]->address->country, $result[2][0]->country);
 
-        self::assertEquals($this->fixtures[0]->status,$result[0]['status']);
-        self::assertEquals($this->fixtures[1]->status,$result[1]['status']);
-        self::assertEquals($this->fixtures[2]->status,$result[2]['status']);
+        self::assertEquals($this->fixtures[0]->status, $result[0]['status']);
+        self::assertEquals($this->fixtures[1]->status, $result[1]['status']);
+        self::assertEquals($this->fixtures[2]->status, $result[2]['status']);
     }
 
     public function testShouldSupportMultipleNewOperatorsAndMultipleScalars()
@@ -914,13 +914,13 @@ 
         self::assertEquals($this->fixtures[1]->address->country, $result[1][1]->country);
         self::assertEquals($this->fixtures[2]->address->country, $result[2][1]->country);
 
-        self::assertEquals($this->fixtures[0]->status,$result[0]['status']);
-        self::assertEquals($this->fixtures[1]->status,$result[1]['status']);
-        self::assertEquals($this->fixtures[2]->status,$result[2]['status']);
+        self::assertEquals($this->fixtures[0]->status, $result[0]['status']);
+        self::assertEquals($this->fixtures[1]->status, $result[1]['status']);
+        self::assertEquals($this->fixtures[2]->status, $result[2]['status']);
 
-        self::assertEquals($this->fixtures[0]->username,$result[0]['username']);
-        self::assertEquals($this->fixtures[1]->username,$result[1]['username']);
-        self::assertEquals($this->fixtures[2]->username,$result[2]['username']);
+        self::assertEquals($this->fixtures[0]->username, $result[0]['username']);
+        self::assertEquals($this->fixtures[1]->username, $result[1]['username']);
+        self::assertEquals($this->fixtures[2]->username, $result[2]['username']);
     }
 
     public function testShouldSupportMultipleNewOperatorsAndMultipleScalarsWithAliases()
@@ -976,13 +976,13 @@ 
         self::assertEquals($this->fixtures[1]->address->country, $result[1]['cmsAddress']->country);
         self::assertEquals($this->fixtures[2]->address->country, $result[2]['cmsAddress']->country);
 
-        self::assertEquals($this->fixtures[0]->status,$result[0]['cmsUserStatus']);
-        self::assertEquals($this->fixtures[1]->status,$result[1]['cmsUserStatus']);
-        self::assertEquals($this->fixtures[2]->status,$result[2]['cmsUserStatus']);
+        self::assertEquals($this->fixtures[0]->status, $result[0]['cmsUserStatus']);
+        self::assertEquals($this->fixtures[1]->status, $result[1]['cmsUserStatus']);
+        self::assertEquals($this->fixtures[2]->status, $result[2]['cmsUserStatus']);
 
-        self::assertEquals($this->fixtures[0]->username,$result[0]['cmsUserUsername']);
-        self::assertEquals($this->fixtures[1]->username,$result[1]['cmsUserUsername']);
-        self::assertEquals($this->fixtures[2]->username,$result[2]['cmsUserUsername']);
+        self::assertEquals($this->fixtures[0]->username, $result[0]['cmsUserUsername']);
+        self::assertEquals($this->fixtures[1]->username, $result[1]['cmsUserUsername']);
+        self::assertEquals($this->fixtures[2]->username, $result[2]['cmsUserUsername']);
     }
 
     public function testShouldSupportMultipleNewOperatorsAndMultipleScalarsWithAndWithoutAliases()
@@ -1038,13 +1038,13 @@ 
         self::assertEquals($this->fixtures[1]->address->country, $result[1][0]->country);
         self::assertEquals($this->fixtures[2]->address->country, $result[2][0]->country);
 
-        self::assertEquals($this->fixtures[0]->status,$result[0]['status']);
-        self::assertEquals($this->fixtures[1]->status,$result[1]['status']);
-        self::assertEquals($this->fixtures[2]->status,$result[2]['status']);
+        self::assertEquals($this->fixtures[0]->status, $result[0]['status']);
+        self::assertEquals($this->fixtures[1]->status, $result[1]['status']);
+        self::assertEquals($this->fixtures[2]->status, $result[2]['status']);
 
-        self::assertEquals($this->fixtures[0]->username,$result[0]['cmsUserUsername']);
-        self::assertEquals($this->fixtures[1]->username,$result[1]['cmsUserUsername']);
-        self::assertEquals($this->fixtures[2]->username,$result[2]['cmsUserUsername']);
+        self::assertEquals($this->fixtures[0]->username, $result[0]['cmsUserUsername']);
+        self::assertEquals($this->fixtures[1]->username, $result[1]['cmsUserUsername']);
+        self::assertEquals($this->fixtures[2]->username, $result[2]['cmsUserUsername']);
     }
 
     /**

tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php

Spacing +4 added lines, -4 removed lines

@@ -197,7 +197,7 @@ 
     {
         $listener = new ListenerSecondLevelCacheTest(
             [
-                Events::postFlush => function(){
+                Events::postFlush => function() {
             throw new \RuntimeException('post flush failure');
         }
             ]
@@ -231,7 +231,7 @@ 
 
         $listener = new ListenerSecondLevelCacheTest(
             [
-                Events::postUpdate => function(){
+                Events::postUpdate => function() {
             throw new \RuntimeException('post update failure');
         }
             ]
@@ -250,7 +250,7 @@ 
         self::assertInstanceOf(State::class, $state);
         self::assertEquals($stateName, $state->getName());
 
-        $state->setName($stateName . uniqid());
+        $state->setName($stateName.uniqid());
 
         $this->_em->persist($state);
 
@@ -279,7 +279,7 @@ 
 
         $listener = new ListenerSecondLevelCacheTest(
             [
-                Events::postRemove => function(){
+                Events::postRemove => function() {
             throw new \RuntimeException('post remove failure');
         }
             ]

tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php

Indentation +11 added lines, -11 removed lines

@@ -25,8 +25,8 @@ 
     public function testAggregateWithHavingClause()
     {
         $dql = 'SELECT p.department, AVG(p.salary) AS avgSalary '.
-               'FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
-               'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
+                'FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
+                'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
 
         $result = $this->_em->createQuery($dql)->getScalarResult();
 
@@ -40,8 +40,8 @@ 
     public function testUnnamedScalarResultsAreOneBased()
     {
         $dql = 'SELECT p.department, AVG(p.salary) '.
-               'FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
-               'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
+                'FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
+                'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
 
         $result = $this->_em->createQuery($dql)->getScalarResult();
 
@@ -53,9 +53,9 @@ 
     public function testOrderByResultVariableCollectionSize()
     {
         $dql = 'SELECT p.name, size(p.friends) AS friends ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
-               'WHERE p.friends IS NOT EMPTY ' .
-               'ORDER BY friends DESC, p.name DESC';
+                'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
+                'WHERE p.friends IS NOT EMPTY ' .
+                'ORDER BY friends DESC, p.name DESC';
 
         $result = $this->_em->createQuery($dql)->getScalarResult();
 
@@ -77,7 +77,7 @@ 
     public function testIsNullAssociation()
     {
         $dql = 'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p '.
-               'WHERE p.spouse IS NULL';
+                'WHERE p.spouse IS NULL';
         $result = $this->_em->createQuery($dql)->getResult();
 
         self::assertEquals(2, count($result));
@@ -91,7 +91,7 @@ 
     public function testSelectSubselect()
     {
         $dql = 'SELECT p, (SELECT c.brand FROM Doctrine\Tests\Models\Company\CompanyCar c WHERE p.car = c) brandName '.
-               'FROM Doctrine\Tests\Models\Company\CompanyManager p';
+                'FROM Doctrine\Tests\Models\Company\CompanyManager p';
         $result = $this->_em->createQuery($dql)->getArrayResult();
 
         self::assertEquals(1, count($result));
@@ -101,7 +101,7 @@ 
     public function testInSubselect()
     {
         $dql = "SELECT p.name FROM Doctrine\Tests\Models\Company\CompanyPerson p ".
-               "WHERE p.name IN (SELECT n.name FROM Doctrine\Tests\Models\Company\CompanyPerson n WHERE n.name = 'Roman B.')";
+                "WHERE p.name IN (SELECT n.name FROM Doctrine\Tests\Models\Company\CompanyPerson n WHERE n.name = 'Roman B.')";
         $result = $this->_em->createQuery($dql)->getScalarResult();
 
         self::assertEquals(1, count($result));
@@ -111,7 +111,7 @@ 
     public function testGroupByMultipleFields()
     {
         $dql = 'SELECT p.department, p.name, count(p.id) FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
-               'GROUP BY p.department, p.name';
+                'GROUP BY p.department, p.name';
         $result = $this->_em->createQuery($dql)->getResult();
 
         self::assertEquals(4, count($result));

tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php

Indentation +8 added lines, -8 removed lines

@@ -360,9 +360,9 @@ 
         self::assertEquals(2, count($user->phonenumbers));
         $dql = "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1";
         $user = $this->_em->createQuery($dql)
-                          ->setParameter(1, $user->id)
-                          ->setHint(Query::HINT_REFRESH, true)
-                          ->getSingleResult();
+                            ->setParameter(1, $user->id)
+                            ->setHint(Query::HINT_REFRESH, true)
+                            ->getSingleResult();
 
         self::assertEquals(1, count($user->phonenumbers));
     }
@@ -397,8 +397,8 @@ 
 
         $dql = "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1";
         $user = $this->_em->createQuery($dql)
-                          ->setParameter(1, $userId)
-                          ->getSingleResult();
+                            ->setParameter(1, $userId)
+                            ->getSingleResult();
 
         self::assertEquals(1, count($user->phonenumbers));
     }
@@ -987,9 +987,9 @@ 
         $qc = $this->getCurrentQueryCount();
         $dql = "SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.id = ?1";
         $article = $this->_em->createQuery($dql)
-                             ->setParameter(1, $article->id)
-                             ->setFetchMode(CmsArticle::class, 'user', ClassMetadata::FETCH_EAGER)
-                             ->getSingleResult();
+                                ->setParameter(1, $article->id)
+                                ->setFetchMode(CmsArticle::class, 'user', ClassMetadata::FETCH_EAGER)
+                                ->getSingleResult();
         self::assertInstanceOf(Proxy::class, $article->user, "It IS a proxy, ...");
         self::assertTrue($article->user->__isInitialized__, "...but its initialized!");
         self::assertEquals($qc+2, $this->getCurrentQueryCount());

Spacing +6 added lines, -6 removed lines

@@ -182,7 +182,7 @@ 
         $user->username = 'gblanco';
         $user->status = 'developer';
 
-        for ($i=0; $i<3; ++$i) {
+        for ($i = 0; $i < 3; ++$i) {
             $phone = new CmsPhonenumber;
             $phone->phonenumber = 100 + $i;
             $user->addPhonenumber($phone);
@@ -410,7 +410,7 @@ 
         $user->username = 'gblanco';
         $user->status = 'developer';
 
-        for ($i=0; $i<3; ++$i) {
+        for ($i = 0; $i < 3; ++$i) {
             $phone = new CmsPhonenumber;
             $phone->phonenumber = 100 + $i;
             $user->addPhonenumber($phone);
@@ -450,7 +450,7 @@ 
         $user->username = 'gblanco';
         $user->status = 'developer';
 
-        for ($i=0; $i<3; ++$i) {
+        for ($i = 0; $i < 3; ++$i) {
             $phone = new CmsPhonenumber;
             $phone->phonenumber = 100 + $i;
             $user->addPhonenumber($phone);
@@ -530,7 +530,7 @@ 
         $user->username = 'gblanco';
         $user->status = 'developer';
 
-        for ($i=0; $i<3; ++$i) {
+        for ($i = 0; $i < 3; ++$i) {
             $phone = new CmsPhonenumber;
             $phone->phonenumber = 100 + $i;
             $user->addPhonenumber($phone);
@@ -992,7 +992,7 @@ 
                              ->getSingleResult();
         self::assertInstanceOf(Proxy::class, $article->user, "It IS a proxy, ...");
         self::assertTrue($article->user->__isInitialized__, "...but its initialized!");
-        self::assertEquals($qc+2, $this->getCurrentQueryCount());
+        self::assertEquals($qc + 2, $this->getCurrentQueryCount());
     }
 
     /**
@@ -1285,7 +1285,7 @@ 
 
         $this->expectException(ORMInvalidArgumentException::class);
         $this->expectExceptionMessage(
-            'Expected value of type "Doctrine\Tests\Models\CMS\CmsAddress" for association field ' .
+            'Expected value of type "Doctrine\Tests\Models\CMS\CmsAddress" for association field '.
             '"Doctrine\Tests\Models\CMS\CmsUser#$address", got "Doctrine\Tests\Models\CMS\CmsUser" instead.'
         );
 

tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php

Spacing +17 added lines, -17 removed lines

@@ -49,7 +49,7 @@ 
 
         $this->_em->clear();
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
@@ -252,7 +252,7 @@ 
 
         $this->_em->clear();
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
@@ -344,7 +344,7 @@ 
 
         $this->_em->clear();
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
@@ -392,7 +392,7 @@ 
 
         $this->_em->clear();
 
-        $result2  = $this->_em->createQuery($dql)->setCacheable(true)
+        $result2 = $this->_em->createQuery($dql)->setCacheable(true)
                 ->setParameter('name', $name)
                 ->getResult();
 
@@ -420,7 +420,7 @@ 
         $result1    = $this->_em->createQuery($dql)->setCacheable(true)->getResult();
 
         self::assertCount(2, $result1);
-        self::assertEquals($queryCount + 1 , $this->getCurrentQueryCount());
+        self::assertEquals($queryCount + 1, $this->getCurrentQueryCount());
         self::assertEquals($this->countries[0]->getId(), $result1[0]->getId());
         self::assertEquals($this->countries[1]->getId(), $result1[1]->getId());
         self::assertEquals($this->countries[0]->getName(), $result1[0]->getName());
@@ -436,11 +436,11 @@ 
 
         $this->_em->clear();
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
-        self::assertEquals($queryCount + 2 , $this->getCurrentQueryCount());
+        self::assertEquals($queryCount + 2, $this->getCurrentQueryCount());
         self::assertCount(2, $result2);
 
         self::assertEquals(5, $this->secondLevelCacheLogger->getPutCount());
@@ -457,7 +457,7 @@ 
         self::assertEquals($result1[0]->getName(), $result2[0]->getName());
         self::assertEquals($result1[1]->getName(), $result2[1]->getName());
 
-        self::assertEquals($queryCount + 2 , $this->getCurrentQueryCount());
+        self::assertEquals($queryCount + 2, $this->getCurrentQueryCount());
     }
 
     public function testBasicQueryFetchJoinsOneToMany()
@@ -498,7 +498,7 @@ 
 
         $this->_em->clear();
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
                 ->setCacheable(true)
                 ->getResult();
 
@@ -564,7 +564,7 @@ 
         $this->_em->clear();
         $this->secondLevelCacheLogger->clearStats();
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
                 ->setCacheable(true)
                 ->getResult();
 
@@ -624,7 +624,7 @@ 
 
         $this->cache->evictEntityRegion(State::class);
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
                 ->setCacheable(true)
                 ->getResult();
 
@@ -667,7 +667,7 @@ 
 
         $this->cache->evictEntityRegion(City::class);
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
                 ->setCacheable(true)
                 ->getResult();
 
@@ -718,7 +718,7 @@ 
 
         $this->_em->clear();
 
-        $result2  = $this->_em->createNativeQuery($sql, $rsm)
+        $result2 = $this->_em->createNativeQuery($sql, $rsm)
             ->setCacheable(true)
             ->getResult();
 
@@ -773,7 +773,7 @@ 
 
         $this->_em->clear();
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
             ->setCacheable(true)
             ->setFirstResult(2)
             ->setMaxResults(1)
@@ -785,7 +785,7 @@ 
 
         $this->_em->clear();
 
-        $result3  = $this->_em->createQuery($dql)
+        $result3 = $this->_em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
@@ -802,7 +802,7 @@ 
         $this->secondLevelCacheLogger->clearStats();
         $this->_em->clear();
 
-        $getHash = function(AbstractQuery $query){
+        $getHash = function(AbstractQuery $query) {
             $method = new \ReflectionMethod($query, 'getHash');
             $method->setAccessible(true);
 
@@ -835,7 +835,7 @@ 
             ->getRegion()
             ->put($key, $entry);
 
-        $result2  = $this->_em->createQuery($dql)
+        $result2 = $this->_em->createQuery($dql)
             ->setCacheable(true)
             ->setLifetime(3600)
             ->getResult();