doctrine / orm

lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

Spacing +24 added lines, -24 removed lines

@@ -53,7 +53,7 @@ 
      */
     protected function prepare()
     {
-        if (! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
+        if ( ! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
             $this->hints[UnitOfWork::HINT_DEFEREAGERLOAD] = true;
         }
 
@@ -63,13 +63,13 @@ 
 
             // Remember which associations are "fetch joined", so that we know where to inject
             // collection stubs or proxies and where not.
-            if (! isset($this->rsm->relationMap[$dqlAlias])) {
+            if ( ! isset($this->rsm->relationMap[$dqlAlias])) {
                 continue;
             }
 
             $parent = $this->rsm->parentAliasMap[$dqlAlias];
 
-            if (! isset($this->rsm->aliasMap[$parent])) {
+            if ( ! isset($this->rsm->aliasMap[$parent])) {
                 throw HydrationException::parentObjectOfRelationNotFound($dqlAlias, $parent);
             }
 
@@ -95,7 +95,7 @@ 
                 $class        = $this->getClassMetadata($className);
                 $inverseAssoc = $class->getProperty($association->getInversedBy());
 
-                if (! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
+                if ( ! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
                     continue;
                 }
 
@@ -161,14 +161,14 @@ 
         $value       = $association->getValue($entity);
         $oid         = spl_object_id($entity);
 
-        if (! $value instanceof PersistentCollection) {
+        if ( ! $value instanceof PersistentCollection) {
             $value = $association->wrap($entity, $value, $this->em);
 
             $association->setValue($entity, $value);
 
             $this->uow->setOriginalEntityProperty($oid, $fieldName, $value);
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } elseif (isset($this->hints[Query::HINT_REFRESH]) ||
             (isset($this->hints['fetched'][$parentDqlAlias][$fieldName]) && ! $value->isInitialized())
         ) {
@@ -177,10 +177,10 @@ 
             $value->setInitialized(true);
             $value->unwrap()->clear();
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else {
             // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN!
-            $this->existingCollections[$oid . $fieldName] = $value;
+            $this->existingCollections[$oid.$fieldName] = $value;
         }
 
         return $value;
@@ -203,13 +203,13 @@ 
         if (isset($this->rsm->discriminatorColumns[$dqlAlias])) {
             $fieldName = $this->rsm->discriminatorColumns[$dqlAlias];
 
-            if (! isset($this->rsm->metaMappings[$fieldName])) {
+            if ( ! isset($this->rsm->metaMappings[$fieldName])) {
                 throw HydrationException::missingDiscriminatorMetaMappingColumn($className, $fieldName, $dqlAlias);
             }
 
             $discrColumn = $this->rsm->metaMappings[$fieldName];
 
-            if (! isset($data[$discrColumn])) {
+            if ( ! isset($data[$discrColumn])) {
                 throw HydrationException::missingDiscriminatorColumn($className, $discrColumn, $dqlAlias);
             }
 
@@ -220,7 +220,7 @@ 
             $discrMap           = $this->metadataCache[$className]->discriminatorMap;
             $discriminatorValue = (string) $data[$discrColumn];
 
-            if (! isset($discrMap[$discriminatorValue])) {
+            if ( ! isset($discrMap[$discriminatorValue])) {
                 throw HydrationException::invalidDiscriminatorValue($discriminatorValue, array_keys($discrMap));
             }
 
@@ -296,10 +296,10 @@ 
                 $parentAlias = $this->rsm->parentAliasMap[$dqlAlias];
                 // we need the $path to save into the identifier map which entities were already
                 // seen for this parent-child relationship
-                $path = $parentAlias . '.' . $dqlAlias;
+                $path = $parentAlias.'.'.$dqlAlias;
 
                 // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
-                if (! isset($nonemptyComponents[$parentAlias])) {
+                if ( ! isset($nonemptyComponents[$parentAlias])) {
                     // TODO: Add special case code where we hydrate the right join objects into identity map at least
                     continue;
                 }
@@ -330,15 +330,15 @@ 
                 $oid = spl_object_id($parentObject);
 
                 // Check the type of the relation (many or single-valued)
-                if (! ($association instanceof ToOneAssociationMetadata)) {
+                if ( ! ($association instanceof ToOneAssociationMetadata)) {
                     // PATH A: Collection-valued association
                     $reflFieldValue = $association->getValue($parentObject);
 
                     if (isset($nonemptyComponents[$dqlAlias])) {
-                        $collKey = $oid . $relationField;
+                        $collKey = $oid.$relationField;
                         if (isset($this->initializedCollections[$collKey])) {
                             $reflFieldValue = $this->initializedCollections[$collKey];
-                        } elseif (! isset($this->existingCollections[$collKey])) {
+                        } elseif ( ! isset($this->existingCollections[$collKey])) {
                             $reflFieldValue = $this->initRelatedCollection($parentObject, $parentClass, $relationField, $parentAlias);
                         }
 
@@ -346,7 +346,7 @@ 
                         $index        = $indexExists ? $this->identifierMap[$path][$id[$parentAlias]][$id[$dqlAlias]] : false;
                         $indexIsValid = $index !== false ? isset($reflFieldValue[$index]) : false;
 
-                        if (! $indexExists || ! $indexIsValid) {
+                        if ( ! $indexExists || ! $indexIsValid) {
                             if (isset($this->existingCollections[$collKey])) {
                                 $element = $this->getEntityFromIdentityMap($entityName, $data);
 
@@ -375,7 +375,7 @@ 
                             // Update result pointer
                             $this->resultPointers[$dqlAlias] = $reflFieldValue[$index];
                         }
-                    } elseif (! $reflFieldValue) {
+                    } elseif ( ! $reflFieldValue) {
                         $this->initRelatedCollection($parentObject, $parentClass, $relationField, $parentAlias);
                     } elseif ($reflFieldValue instanceof PersistentCollection && $reflFieldValue->isInitialized() === false) {
                         $reflFieldValue->setInitialized(true);
@@ -384,7 +384,7 @@ 
                     // PATH B: Single-valued association
                     $reflFieldValue = $association->getValue($parentObject);
 
-                    if (! $reflFieldValue || isset($this->hints[Query::HINT_REFRESH]) ||
+                    if ( ! $reflFieldValue || isset($this->hints[Query::HINT_REFRESH]) ||
                         ($reflFieldValue instanceof GhostObjectInterface && ! $reflFieldValue->isProxyInitialized())) {
                         // we only need to take action if this value is null,
                         // we refresh the entity or its an uninitialized proxy.
@@ -445,7 +445,7 @@ 
                 $entityKey                    = $this->rsm->entityMappings[$dqlAlias] ?: 0;
 
                 // if this row has a NULL value for the root result id then make it a null result.
-                if (! isset($nonemptyComponents[$dqlAlias])) {
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
                     if ($this->rsm->isMixed) {
                         $result[] = [$entityKey => null];
                     } else {
@@ -457,7 +457,7 @@ 
                 }
 
                 // check for existing result from the iterations before
-                if (! isset($this->identifierMap[$dqlAlias][$id[$dqlAlias]])) {
+                if ( ! isset($this->identifierMap[$dqlAlias][$id[$dqlAlias]])) {
                     $element = $this->getEntity($data, $dqlAlias);
 
                     if ($this->rsm->isMixed) {
@@ -500,13 +500,13 @@ 
             }
         }
 
-        if (! isset($resultKey)) {
+        if ( ! isset($resultKey)) {
             $this->resultCounter++;
         }
 
         // Append scalar values to mixed result sets
         if (isset($rowData['scalars'])) {
-            if (! isset($resultKey)) {
+            if ( ! isset($resultKey)) {
                 $resultKey = isset($this->rsm->indexByMap['scalars'])
                     ? $row[$this->rsm->indexByMap['scalars']]
                     : $this->resultCounter - 1;
@@ -519,7 +519,7 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if (! isset($resultKey)) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 

lib/Doctrine/ORM/AbstractQuery.php

Spacing +12 added lines, -12 removed lines

@@ -302,7 +302,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            static function (Query\Parameter $parameter) use ($key) : bool {
+            static function(Query\Parameter $parameter) use ($key) : bool {
                 $parameterName = $parameter->getName();
 
                 return $key === $parameterName || (string) $key === (string) $parameterName;
@@ -395,7 +395,7 @@ 
             return $value;
         }
 
-        if (! is_object($value)) {
+        if ( ! is_object($value)) {
             return $value;
         }
 
@@ -726,7 +726,7 @@ 
             return null;
         }
 
-        if (! is_array($result)) {
+        if ( ! is_array($result)) {
             return $result;
         }
 
@@ -760,7 +760,7 @@ 
             throw new NoResultException();
         }
 
-        if (! is_array($result)) {
+        if ( ! is_array($result)) {
             return $result;
         }
 
@@ -850,7 +850,7 @@ 
             $this->setHydrationMode($hydrationMode);
         }
 
-        if (! empty($parameters)) {
+        if ( ! empty($parameters)) {
             $this->setParameters($parameters);
         }
 
@@ -873,7 +873,7 @@ 
             $this->setHydrationMode($hydrationMode);
         }
 
-        if (! empty($parameters)) {
+        if ( ! empty($parameters)) {
             $this->setParameters($parameters);
         }
 
@@ -912,11 +912,11 @@ 
             $this->setHydrationMode($hydrationMode);
         }
 
-        if (! empty($parameters)) {
+        if ( ! empty($parameters)) {
             $this->setParameters($parameters);
         }
 
-        $setCacheEntry = static function () {
+        $setCacheEntry = static function() {
         };
 
         if ($this->hydrationCacheProfile !== null) {
@@ -930,11 +930,11 @@ 
                 return $result[$realCacheKey];
             }
 
-            if (! $result) {
+            if ( ! $result) {
                 $result = [];
             }
 
-            $setCacheEntry = static function ($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) {
+            $setCacheEntry = static function($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) {
                 $result[$realCacheKey] = $data;
 
                 $cache->save($cacheKey, $result, $queryCacheProfile->getLifetime());
@@ -1096,7 +1096,7 @@ 
     {
         $query  = $this->getSQL();
         $hints  = $this->getHints();
-        $params = array_map(function (Parameter $parameter) {
+        $params = array_map(function(Parameter $parameter) {
             $value = $parameter->getValue();
 
             // Small optimization
@@ -1110,6 +1110,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

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

Indentation +6 added lines, -6 removed lines

@@ -119,9 +119,9 @@ 
         $this->putTripAroundEurope();
 
         $dql = 'SELECT t, p, c '
-             . 'FROM Doctrine\Tests\Models\Navigation\NavTour t '
-             . 'INNER JOIN t.pois p '
-             . 'INNER JOIN p.country c';
+                . 'FROM Doctrine\Tests\Models\Navigation\NavTour t '
+                . 'INNER JOIN t.pois p '
+                . 'INNER JOIN p.country c';
 
         $query = $this->em->createQuery($dql);
         $tours = $query->getResult();
@@ -141,9 +141,9 @@ 
         $this->putTripAroundEurope();
 
         $dql = 'SELECT t '
-             . 'FROM Doctrine\Tests\Models\Navigation\NavTour t '
-             . ', Doctrine\Tests\Models\Navigation\NavPointOfInterest p '
-             . 'WHERE p MEMBER OF t.pois';
+                . 'FROM Doctrine\Tests\Models\Navigation\NavTour t '
+                . ', Doctrine\Tests\Models\Navigation\NavPointOfInterest p '
+                . 'WHERE p MEMBER OF t.pois';
 
         $query = $this->em->createQuery($dql);
         $tours = $query->getResult();

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

Indentation +4 added lines, -4 removed lines

@@ -326,7 +326,7 @@ 
     public function testBulkUpdateIssueDDC368() : void
     {
         $this->em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.salary = 1')
-                  ->execute();
+                    ->execute();
 
         $query  = $this->em->createQuery('SELECT count(p.id) FROM ' . CompanyEmployee::class . ' p WHERE p.salary = 1');
         $result = $query->getResult();
@@ -344,9 +344,9 @@ 
     public function testBulkUpdateNonScalarParameterDDC1341() : void
     {
         $this->em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.startDate = ?0 WHERE p.department = ?1')
-                  ->setParameter(0, new DateTime())
-                  ->setParameter(1, 'IT')
-                  ->execute();
+                    ->setParameter(0, new DateTime())
+                    ->setParameter(1, 'IT')
+                    ->execute();
 
         self::addToAssertionCount(1);
     }

Spacing +12 added lines, -12 removed lines

@@ -51,7 +51,7 @@ 
 
         $this->em->clear();
 
-        $query = $this->em->createQuery('select p from ' . CompanyPerson::class . ' p order by p.name desc');
+        $query = $this->em->createQuery('select p from '.CompanyPerson::class.' p order by p.name desc');
 
         $entities = $query->getResult();
 
@@ -70,7 +70,7 @@ 
 
         $this->em->clear();
 
-        $query = $this->em->createQuery('select p from ' . CompanyEmployee::class . ' p');
+        $query = $this->em->createQuery('select p from '.CompanyEmployee::class.' p');
 
         $entities = $query->getResult();
 
@@ -93,7 +93,7 @@ 
 
         $this->em->clear();
 
-        $query = $this->em->createQuery('update ' . CompanyEmployee::class . " p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3");
+        $query = $this->em->createQuery('update '.CompanyEmployee::class." p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3");
 
         $query->setParameter(1, 'NewName', 'string');
         $query->setParameter(2, 'NewDepartment');
@@ -104,7 +104,7 @@ 
 
         self::assertEquals(1, $numUpdated);
 
-        $query = $this->em->createQuery('delete from ' . CompanyPerson::class . ' p');
+        $query = $this->em->createQuery('delete from '.CompanyPerson::class.' p');
 
         $numDeleted = $query->execute();
 
@@ -179,7 +179,7 @@ 
         $this->em->flush();
         $this->em->clear();
 
-        $query = $this->em->createQuery('select p, s from ' . CompanyPerson::class . ' p join p.spouse s where p.name=\'Mary Smith\'');
+        $query = $this->em->createQuery('select p, s from '.CompanyPerson::class.' p join p.spouse s where p.name=\'Mary Smith\'');
 
         $result = $query->getResult();
 
@@ -215,7 +215,7 @@ 
 
         $this->em->clear();
 
-        $query = $this->em->createQuery('select p, f from ' . CompanyPerson::class . ' p join p.friends f where p.name=?1');
+        $query = $this->em->createQuery('select p, f from '.CompanyPerson::class.' p join p.friends f where p.name=?1');
 
         $query->setParameter(1, 'Roman');
 
@@ -285,7 +285,7 @@ 
         $this->em->flush();
         $this->em->clear();
 
-        $q = $this->em->createQuery('select a from ' . CompanyEvent::class . ' a where a.id = ?1');
+        $q = $this->em->createQuery('select a from '.CompanyEvent::class.' a where a.id = ?1');
 
         $q->setParameter(1, $event1->getId());
 
@@ -300,7 +300,7 @@ 
 
         $this->em->clear();
 
-        $q = $this->em->createQuery('select a from ' . CompanyOrganization::class . ' a where a.id = ?1');
+        $q = $this->em->createQuery('select a from '.CompanyOrganization::class.' a where a.id = ?1');
 
         $q->setParameter(1, $org->getId());
 
@@ -325,10 +325,10 @@ 
      */
     public function testBulkUpdateIssueDDC368() : void
     {
-        $this->em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.salary = 1')
+        $this->em->createQuery('UPDATE '.CompanyEmployee::class.' AS p SET p.salary = 1')
                   ->execute();
 
-        $query  = $this->em->createQuery('SELECT count(p.id) FROM ' . CompanyEmployee::class . ' p WHERE p.salary = 1');
+        $query  = $this->em->createQuery('SELECT count(p.id) FROM '.CompanyEmployee::class.' p WHERE p.salary = 1');
         $result = $query->getResult();
 
         self::assertGreaterThan(0, $result);
@@ -343,7 +343,7 @@ 
      */
     public function testBulkUpdateNonScalarParameterDDC1341() : void
     {
-        $this->em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.startDate = ?0 WHERE p.department = ?1')
+        $this->em->createQuery('UPDATE '.CompanyEmployee::class.' AS p SET p.startDate = ?0 WHERE p.department = ?1')
                   ->setParameter(0, new DateTime())
                   ->setParameter(1, 'IT')
                   ->execute();
@@ -401,7 +401,7 @@ 
         $this->em->flush();
         $this->em->clear();
 
-        $dqlManager = $this->em->createQuery('SELECT m FROM ' . CompanyManager::class . ' m WHERE m.spouse = ?1')
+        $dqlManager = $this->em->createQuery('SELECT m FROM '.CompanyManager::class.' m WHERE m.spouse = ?1')
                                 ->setParameter(1, $person->getId())
                                 ->getSingleResult();
 

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

Indentation +11 added lines, -11 removed lines

@@ -27,8 +27,8 @@ 
     public function testAggregateWithHavingClause() : void
     {
         $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();
 
@@ -42,8 +42,8 @@ 
     public function testUnnamedScalarResultsAreOneBased() : void
     {
         $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();
 
@@ -55,9 +55,9 @@ 
     public function testOrderByResultVariableCollectionSize() : void
     {
         $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();
 
@@ -79,7 +79,7 @@ 
     public function testIsNullAssociation() : void
     {
         $dql    = 'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
-               'WHERE p.spouse IS NULL';
+                'WHERE p.spouse IS NULL';
         $query  = $this->em->createQuery($dql);
         $result = $query->getResult();
 
@@ -98,7 +98,7 @@ 
     public function testSelectSubselect() : void
     {
         $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';
         $query  = $this->em->createQuery($dql);
         $result = $query->getArrayResult();
 
@@ -113,7 +113,7 @@ 
     public function testInSubselect() : void
     {
         $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.')";
         $query  = $this->em->createQuery($dql);
         $result = $query->getScalarResult();
 
@@ -128,7 +128,7 @@ 
     public function testGroupByMultipleFields() : void
     {
         $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';
         $query  = $this->em->createQuery($dql);
         $result = $query->getResult();
 

Spacing +11 added lines, -11 removed lines

@@ -26,8 +26,8 @@ 
 
     public function testAggregateWithHavingClause() : void
     {
-        $dql = 'SELECT p.department, AVG(p.salary) AS avgSalary ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
+        $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';
 
         $result = $this->em->createQuery($dql)->getScalarResult();
@@ -41,8 +41,8 @@ 
 
     public function testUnnamedScalarResultsAreOneBased() : void
     {
-        $dql = 'SELECT p.department, AVG(p.salary) ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
+        $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';
 
         $result = $this->em->createQuery($dql)->getScalarResult();
@@ -54,9 +54,9 @@ 
 
     public function testOrderByResultVariableCollectionSize() : void
     {
-        $dql = 'SELECT p.name, size(p.friends) AS friends ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
-               'WHERE p.friends IS NOT EMPTY ' .
+        $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';
 
         $result = $this->em->createQuery($dql)->getScalarResult();
@@ -78,7 +78,7 @@ 
 
     public function testIsNullAssociation() : void
     {
-        $dql    = 'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
+        $dql    = 'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p '.
                'WHERE p.spouse IS NULL';
         $query  = $this->em->createQuery($dql);
         $result = $query->getResult();
@@ -97,7 +97,7 @@ 
 
     public function testSelectSubselect() : void
     {
-        $dql    = 'SELECT p, (SELECT c.brand FROM Doctrine\Tests\Models\Company\CompanyCar c WHERE p.car = c) brandName ' .
+        $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';
         $query  = $this->em->createQuery($dql);
         $result = $query->getArrayResult();
@@ -112,7 +112,7 @@ 
 
     public function testInSubselect() : void
     {
-        $dql    = 'SELECT p.name FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
+        $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.')";
         $query  = $this->em->createQuery($dql);
         $result = $query->getScalarResult();
@@ -127,7 +127,7 @@ 
 
     public function testGroupByMultipleFields() : void
     {
-        $dql    = 'SELECT p.department, p.name, count(p.id) FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
+        $dql    = 'SELECT p.department, p.name, count(p.id) FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
                'GROUP BY p.department, p.name';
         $query  = $this->em->createQuery($dql);
         $result = $query->getResult();

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

Spacing +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
         $this->em->flush();
         $this->em->clear();
 
-        $query  = $this->em->createQuery(
+        $query = $this->em->createQuery(
             'SELECT e FROM Doctrine\Tests\ORM\Functional\LifecycleCallbackTestEntity AS e'
         );