doctrine / orm

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

Spacing +2 added lines, -2 removed lines

@@ -152,10 +152,10 @@
      */
     private $ownerO;
 
-    public function __construct(CascadeRemoveOrderEntityO $eO, $position=1)
+    public function __construct(CascadeRemoveOrderEntityO $eO, $position = 1)
     {
         $this->position = $position;
-        $this->ownerO= $eO;
+        $this->ownerO = $eO;
         $this->ownerO->addOneToManyG($this);
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
         $this->assertNull($this->cache->getEntityCacheRegion(ComplexAction::class));
         $this->assertInstanceOf(Region::class, $this->cache->getEntityCacheRegion(Token::class));
 
-        $token  = new Token('token-hash');
+        $token = new Token('token-hash');
 
         $action1 = new Action('login');
         $action2 = new Action('logout');

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

Spacing +14 added lines, -14 removed lines

@@ -129,7 +129,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(9, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "0", $result[0]->$checkField);
+        $this->assertEquals($checkField."0", $result[0]->$checkField);
     }
 
     private function iterateWithOrderAscWithLimit($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -145,7 +145,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(3, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "0", $result[0]->$checkField);
+        $this->assertEquals($checkField."0", $result[0]->$checkField);
     }
 
     private function iterateWithOrderAscWithLimitAndOffset($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -161,7 +161,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(3, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "3", $result[0]->$checkField);
+        $this->assertEquals($checkField."3", $result[0]->$checkField);
     }
 
     private function iterateWithOrderDesc($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -174,7 +174,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(9, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "8", $result[0]->$checkField);
+        $this->assertEquals($checkField."8", $result[0]->$checkField);
     }
 
     private function iterateWithOrderDescWithLimit($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -189,7 +189,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(3, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "8", $result[0]->$checkField);
+        $this->assertEquals($checkField."8", $result[0]->$checkField);
     }
 
     private function iterateWithOrderDescWithLimitAndOffset($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -204,7 +204,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(3, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "5", $result[0]->$checkField);
+        $this->assertEquals($checkField."5", $result[0]->$checkField);
     }
 
     /**
@@ -477,8 +477,8 @@ 
     public function testIterateWithFetchJoinOneToManyWithOrderByColumnFromBoth($useOutputWalkers)
     {
         $dql = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name';
-        $dqlAsc = $dql . " ASC, d.name";
-        $dqlDesc = $dql . " DESC, d.name";
+        $dqlAsc = $dql." ASC, d.name";
+        $dqlDesc = $dql." DESC, d.name";
         $this->iterateWithOrderAsc($useOutputWalkers, true, $dqlAsc, "name");
         $this->iterateWithOrderDesc($useOutputWalkers, true, $dqlDesc, "name");
     }
@@ -486,8 +486,8 @@ 
     public function testIterateWithFetchJoinOneToManyWithOrderByColumnFromBothWithLimitWithOutputWalker()
     {
         $dql = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name';
-        $dqlAsc = $dql . " ASC, d.name";
-        $dqlDesc = $dql . " DESC, d.name";
+        $dqlAsc = $dql." ASC, d.name";
+        $dqlDesc = $dql." DESC, d.name";
         $this->iterateWithOrderAscWithLimit(true, true, $dqlAsc, "name");
         $this->iterateWithOrderDescWithLimit(true, true, $dqlDesc, "name");
     }
@@ -498,8 +498,8 @@ 
         $this->expectExceptionMessage('Cannot select distinct identifiers from query with LIMIT and ORDER BY on a column from a fetch joined to-many association. Use output walkers.');
 
         $dql = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name';
-        $dqlAsc = $dql . " ASC, d.name";
-        $dqlDesc = $dql . " DESC, d.name";
+        $dqlAsc = $dql." ASC, d.name";
+        $dqlDesc = $dql." DESC, d.name";
         $this->iterateWithOrderAscWithLimit(false, true, $dqlAsc, "name");
         $this->iterateWithOrderDescWithLimit(false, true, $dqlDesc, "name");
     }
@@ -583,7 +583,7 @@ 
         $users = iterator_to_array($paginator->getIterator());
         $this->assertCount(9, $users);
         foreach ($users as $i => $user) {
-            $this->assertEquals("username" . (8 - $i), $user->username);
+            $this->assertEquals("username".(8 - $i), $user->username);
         }
     }
 
@@ -733,7 +733,7 @@ 
             $company->logo->image_width = 100 + $i;
             $company->logo->image_height = 100 + $i;
             $company->logo->company = $company;
-            for($j=0;$j<3;$j++) {
+            for ($j = 0; $j < 3; $j++) {
                 $department = new Department();
                 $department->name = "name$i$j";
                 $department->company = $company;

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

Indentation +3 added lines, -3 removed lines

@@ -411,9 +411,9 @@
 
         $dql = 'SELECT f FROM Doctrine\Tests\Models\Company\CompanyFixContract f WHERE f.id = ?1';
         $contract = $this->_em->createQuery($dql)
-                              ->setFetchMode(CompanyFixContract::class, 'salesPerson', ClassMetadata::FETCH_EAGER)
-                              ->setParameter(1, $this->fix->getId())
-                              ->getSingleResult();
+                                ->setFetchMode(CompanyFixContract::class, 'salesPerson', ClassMetadata::FETCH_EAGER)
+                                ->setParameter(1, $this->fix->getId())
+                                ->getSingleResult();
 
         $this->assertNotInstanceOf(Proxy::class, $contract->getSalesPerson());
     }

Spacing +4 added lines, -4 removed lines

@@ -330,19 +330,19 @@
 
         $repos = $this->_em->getRepository(CompanyContract::class);
         $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]);
-        $this->assertEquals(3, count($contracts), "There should be 3 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyContract'");
+        $this->assertEquals(3, count($contracts), "There should be 3 entities related to ".$this->salesPerson->getId()." for 'Doctrine\Tests\Models\Company\CompanyContract'");
 
         $repos = $this->_em->getRepository(CompanyFixContract::class);
         $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]);
-        $this->assertEquals(1, count($contracts), "There should be 1 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFixContract'");
+        $this->assertEquals(1, count($contracts), "There should be 1 entities related to ".$this->salesPerson->getId()." for 'Doctrine\Tests\Models\Company\CompanyFixContract'");
 
         $repos = $this->_em->getRepository(CompanyFlexContract::class);
         $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]);
-        $this->assertEquals(2, count($contracts), "There should be 2 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFlexContract'");
+        $this->assertEquals(2, count($contracts), "There should be 2 entities related to ".$this->salesPerson->getId()." for 'Doctrine\Tests\Models\Company\CompanyFlexContract'");
 
         $repos = $this->_em->getRepository(CompanyFlexUltraContract::class);
         $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]);
-        $this->assertEquals(1, count($contracts), "There should be 1 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFlexUltraContract'");
+        $this->assertEquals(1, count($contracts), "There should be 1 entities related to ".$this->salesPerson->getId()." for 'Doctrine\Tests\Models\Company\CompanyFlexUltraContract'");
     }
 
     /**

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

Indentation +24 added lines, -24 removed lines

@@ -148,7 +148,7 @@ 
         $this->expectExceptionMessage('Too few parameters: the query defines 1 parameters but you only bound 0');
 
         $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1')
-                  ->getSingleResult();
+                    ->getSingleResult();
     }
 
     public function testInvalidInputParameterThrowsException()
@@ -156,8 +156,8 @@ 
         $this->expectException(QueryException::class);
 
         $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?')
-                  ->setParameter(1, 'jwage')
-                  ->getSingleResult();
+                    ->setParameter(1, 'jwage')
+                    ->getSingleResult();
     }
 
     public function testSetParameters()
@@ -167,8 +167,8 @@ 
         $parameters->add(new Parameter(2, 'active'));
 
         $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2')
-                  ->setParameters($parameters)
-                  ->getResult();
+                    ->setParameters($parameters)
+                    ->getResult();
 
         $extractValue = function (Parameter $parameter) {
             return $parameter->getValue();
@@ -185,8 +185,8 @@ 
         $parameters = [1 => 'jwage', 2 => 'active'];
 
         $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2')
-                  ->setParameters($parameters)
-                  ->getResult();
+                    ->setParameters($parameters)
+                    ->getResult();
 
         self::assertSame(
             array_values($parameters),
@@ -330,7 +330,7 @@ 
     public function testGetSingleResultThrowsExceptionOnNoResult()
     {
         $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a")
-             ->getSingleResult();
+                ->getSingleResult();
     }
 
     /**
@@ -339,7 +339,7 @@ 
     public function testGetSingleScalarResultThrowsExceptionOnNoResult()
     {
         $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a")
-             ->getSingleScalarResult();
+                ->getSingleScalarResult();
     }
 
     /**
@@ -370,7 +370,7 @@ 
         $this->_em->clear();
 
         $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a")
-             ->getSingleScalarResult();
+                ->getSingleScalarResult();
     }
 
     public function testModifiedLimitQuery()
@@ -387,27 +387,27 @@ 
         $this->_em->clear();
 
         $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
-                  ->setFirstResult(1)
-                  ->setMaxResults(2)
-                  ->getResult();
+                    ->setFirstResult(1)
+                    ->setMaxResults(2)
+                    ->getResult();
 
         $this->assertEquals(2, count($data));
         $this->assertEquals('gblanco1', $data[0]->username);
         $this->assertEquals('gblanco2', $data[1]->username);
 
         $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
-                  ->setFirstResult(3)
-                  ->setMaxResults(2)
-                  ->getResult();
+                    ->setFirstResult(3)
+                    ->setMaxResults(2)
+                    ->getResult();
 
         $this->assertEquals(2, count($data));
         $this->assertEquals('gblanco3', $data[0]->username);
         $this->assertEquals('gblanco4', $data[1]->username);
 
         $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
-                  ->setFirstResult(3)
-                  ->setMaxResults(2)
-                  ->getScalarResult();
+                    ->setFirstResult(3)
+                    ->setMaxResults(2)
+                    ->getScalarResult();
     }
 
     public function testSupportsQueriesWithEntityNamespaces()
@@ -476,8 +476,8 @@ 
         $this->_em->clear();
 
         $articles = $this->_em->createQuery('select a from Doctrine\Tests\Models\CMS\CmsArticle a')
-                         ->setFetchMode(CmsArticle::class, 'user', ClassMetadata::FETCH_EAGER)
-                         ->getResult();
+                            ->setFetchMode(CmsArticle::class, 'user', ClassMetadata::FETCH_EAGER)
+                            ->getResult();
 
         $this->assertEquals(10, count($articles));
         foreach ($articles AS $article) {
@@ -619,9 +619,9 @@ 
     {
         $qb = $this->_em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->innerJoin('u.articles', 'a')
-           ->where('(u.id = 0) OR (u.id IS NULL)');
+            ->from(CmsUser::class, 'u')
+            ->innerJoin('u.articles', 'a')
+            ->where('(u.id = 0) OR (u.id IS NULL)');
 
         $query = $qb->getQuery();
         $users = $query->execute();

Spacing +21 added lines, -21 removed lines

@@ -94,7 +94,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $query = $this->_em->createQuery('select u, a from ' . CmsUser::class . ' u join u.articles a ORDER BY a.topic');
+        $query = $this->_em->createQuery('select u, a from '.CmsUser::class.' u join u.articles a ORDER BY a.topic');
         $users = $query->getResult();
         $this->assertEquals(1, count($users));
         $this->assertInstanceOf(CmsUser::class, $users[0]);
@@ -113,7 +113,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $q = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.username = ?0');
+        $q = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.username = ?0');
         $q->setParameter(0, 'jwage');
         $user = $q->getSingleResult();
 
@@ -125,7 +125,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('Invalid parameter: token 2 is not defined in the query.');
 
-        $q = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1');
+        $q = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1');
         $q->setParameter(2, 'jwage');
         $user = $q->getSingleResult();
     }
@@ -135,7 +135,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('Too many parameters: the query defines 1 parameters and you bound 2');
 
-        $q = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1');
+        $q = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1');
         $q->setParameter(1, 'jwage');
         $q->setParameter(2, 'jwage');
 
@@ -147,7 +147,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('Too few parameters: the query defines 1 parameters but you only bound 0');
 
-        $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1')
+        $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1')
                   ->getSingleResult();
     }
 
@@ -155,7 +155,7 @@ 
     {
         $this->expectException(QueryException::class);
 
-        $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?')
+        $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?')
                   ->setParameter(1, 'jwage')
                   ->getSingleResult();
     }
@@ -166,11 +166,11 @@ 
         $parameters->add(new Parameter(1, 'jwage'));
         $parameters->add(new Parameter(2, 'active'));
 
-        $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2')
+        $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1 AND u.status = ?2')
                   ->setParameters($parameters)
                   ->getResult();
 
-        $extractValue = function (Parameter $parameter) {
+        $extractValue = function(Parameter $parameter) {
             return $parameter->getValue();
         };
 
@@ -184,7 +184,7 @@ 
     {
         $parameters = [1 => 'jwage', 2 => 'active'];
 
-        $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2')
+        $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1 AND u.status = ?2')
                   ->setParameters($parameters)
                   ->getResult();
 
@@ -214,7 +214,7 @@ 
         $this->_em->clear();
         $articleId = $article1->id;
 
-        $query = $this->_em->createQuery('select a from ' . CmsArticle::class . ' a WHERE a.topic = ?1');
+        $query = $this->_em->createQuery('select a from '.CmsArticle::class.' a WHERE a.topic = ?1');
         $articles = $query->iterate(new ArrayCollection([new Parameter(1, 'Doctrine 2')]), Query::HYDRATE_ARRAY);
 
         $found = [];
@@ -255,19 +255,19 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $query = $this->_em->createQuery('select a from ' . CmsArticle::class . ' a');
+        $query = $this->_em->createQuery('select a from '.CmsArticle::class.' a');
         $articles = $query->iterate();
 
         $iteratedCount = 0;
         $topics = [];
 
-        foreach($articles AS $row) {
+        foreach ($articles AS $row) {
             $article = $row[0];
             $topics[] = $article->topic;
 
             $identityMap = $this->_em->getUnitOfWork()->getIdentityMap();
             $identityMapCount = count($identityMap[CmsArticle::class]);
-            $this->assertTrue($identityMapCount>$iteratedCount);
+            $this->assertTrue($identityMapCount > $iteratedCount);
 
             $iteratedCount++;
         }
@@ -300,7 +300,7 @@ 
 
         $iteratedCount = 0;
         $topics = [];
-        foreach($articles AS $row) {
+        foreach ($articles AS $row) {
             $article  = $row[0];
             $topics[] = $article->topic;
 
@@ -377,8 +377,8 @@ 
     {
         for ($i = 0; $i < 5; $i++) {
             $user = new CmsUser;
-            $user->name = 'Guilherme' . $i;
-            $user->username = 'gblanco' . $i;
+            $user->name = 'Guilherme'.$i;
+            $user->username = 'gblanco'.$i;
             $user->status = 'developer';
             $this->_em->persist($user);
         }
@@ -386,7 +386,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
+        $data = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u')
                   ->setFirstResult(1)
                   ->setMaxResults(2)
                   ->getResult();
@@ -395,7 +395,7 @@ 
         $this->assertEquals('gblanco1', $data[0]->username);
         $this->assertEquals('gblanco2', $data[1]->username);
 
-        $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
+        $data = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u')
                   ->setFirstResult(3)
                   ->setMaxResults(2)
                   ->getResult();
@@ -404,7 +404,7 @@ 
         $this->assertEquals('gblanco3', $data[0]->username);
         $this->assertEquals('gblanco4', $data[1]->username);
 
-        $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
+        $data = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u')
                   ->setFirstResult(3)
                   ->setMaxResults(2)
                   ->getScalarResult();
@@ -498,13 +498,13 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $query = $this->_em->createQuery("select u from " . CmsUser::class . " u where u.username = 'gblanco'");
+        $query = $this->_em->createQuery("select u from ".CmsUser::class." u where u.username = 'gblanco'");
 
         $fetchedUser = $query->getOneOrNullResult();
         $this->assertInstanceOf(CmsUser::class, $fetchedUser);
         $this->assertEquals('gblanco', $fetchedUser->username);
 
-        $query = $this->_em->createQuery("select u.username from " . CmsUser::class . " u where u.username = 'gblanco'");
+        $query = $this->_em->createQuery("select u.username from ".CmsUser::class." u where u.username = 'gblanco'");
         $fetchedUsername = $query->getOneOrNullResult(Query::HYDRATE_SINGLE_SCALAR);
         $this->assertEquals('gblanco', $fetchedUsername);
     }

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

Spacing +2 added lines, -2 removed lines

@@ -110,7 +110,7 @@ 
      */
     public $address;
 
-    public function getId() {return $this->id;}
+    public function getId() {return $this->id; }
 }
 
 /**
@@ -152,5 +152,5 @@ 
      */
     public $user;
 
-    public function getUser() {return $this->user;}
+    public function getUser() {return $this->user; }
 }

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

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
         $driver = new DatabaseDriver($sm);
 
         foreach ($driver->getAllClassNames() as $className) {
-            if (!in_array(strtolower($className), $classNames)) {
+            if ( ! in_array(strtolower($className), $classNames)) {
                 continue;
             }
             $class = new ClassMetadataInfo($className);
@@ -49,7 +49,7 @@ 
         }
 
         if (count($metadatas) != count($classNames)) {
-            $this->fail("Have not found all classes matching the names '" . implode(", ", $classNames) . "' only tables " . implode(", ", array_keys($metadatas)));
+            $this->fail("Have not found all classes matching the names '".implode(", ", $classNames)."' only tables ".implode(", ", array_keys($metadatas)));
         }
         return $metadatas;
     }

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

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
      */
     private function registerType(string $className)
     {
-        $type = constant($className . '::NAME');
+        $type = constant($className.'::NAME');
 
         if (DBALType::hasType($type)) {
             DBALType::overrideType($type, $className);
@@ -70,7 +70,7 @@ 
         foreach ($classes as $class) {
             $ce = $validator->validateClass($class);
 
-            $this->assertEmpty($ce, "Invalid Modelset: " . $modelSet . " class " . $class->name . ": ". implode("\n", $ce));
+            $this->assertEmpty($ce, "Invalid Modelset: ".$modelSet." class ".$class->name.": ".implode("\n", $ce));
         }
     }
 }

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

Spacing +3 added lines, -3 removed lines

@@ -232,8 +232,8 @@ 
         $eventManager->addEventListener([Events::postLoad], $listener);
 
         $this->_em->find(CmsUser::class, $this->userId);
-        $this->assertSame(1, $listener->countHandledEvents(CmsUser::class), CmsUser::class . ' should be handled once!');
-        $this->assertSame(1, $listener->countHandledEvents(CmsEmail::class), CmsEmail::class . ' should be handled once!');
+        $this->assertSame(1, $listener->countHandledEvents(CmsUser::class), CmsUser::class.' should be handled once!');
+        $this->assertSame(1, $listener->countHandledEvents(CmsEmail::class), CmsEmail::class.' should be handled once!');
     }
 
     private function loadFixture()
@@ -309,7 +309,7 @@ 
     {
         $object = $event->getObject();
         $class = ClassUtils::getClass($object);
-        if (!isset($this->firedByClasses[$class])) {
+        if ( ! isset($this->firedByClasses[$class])) {
             $this->firedByClasses[$class] = 1;
         } else {
             $this->firedByClasses[$class]++;