doctrine / orm

lib/Doctrine/ORM/EntityRepository.php

Spacing +3 added lines, -3 removed lines

@@ -252,8 +252,8 @@ 
      */
     private function resolveMagicCall($method, $by, array $arguments)
     {
-        if (! $arguments) {
-            throw InvalidMagicMethodCall::onMissingParameter($method . $by);
+        if ( ! $arguments) {
+            throw InvalidMagicMethodCall::onMissingParameter($method.$by);
         }
 
         $fieldName = \lcfirst(Inflector::classify($by));
@@ -262,7 +262,7 @@ 
             throw InvalidMagicMethodCall::becauseFieldNotFoundIn(
                 $this->entityName,
                 $fieldName,
-                $method . $by
+                $method.$by
             );
         }
 

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

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
                 $discrColumnName = $metaMappingDiscrColumnName;
             }
 
-            if (! isset($sqlResult[$discrColumnName])) {
+            if ( ! isset($sqlResult[$discrColumnName])) {
                 throw HydrationException::missingDiscriminatorColumn($entityName, $discrColumnName, \key($this->rsm->aliasMap));
             }
 
@@ -95,7 +95,7 @@ 
 
             $discrMap = $this->class->discriminatorMap;
 
-            if (! isset($discrMap[$sqlResult[$discrColumnName]])) {
+            if ( ! isset($discrMap[$sqlResult[$discrColumnName]])) {
                 throw HydrationException::invalidDiscriminatorValue($sqlResult[$discrColumnName], \array_keys($discrMap));
             }
 
@@ -112,7 +112,7 @@ 
 
             $cacheKeyInfo = $this->hydrateColumnInfo($column);
 
-            if (! $cacheKeyInfo) {
+            if ( ! $cacheKeyInfo) {
                 continue;
             }
 
@@ -128,7 +128,7 @@ 
             $fieldName = $cacheKeyInfo['fieldName'];
 
             // Prevent overwrite in case of inherit classes using same property name (See AbstractHydrator)
-            if (! isset($data[$fieldName]) || ! $valueIsNull) {
+            if ( ! isset($data[$fieldName]) || ! $valueIsNull) {
                 $data[$fieldName] = $value;
             }
         }

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

Spacing +18 added lines, -18 removed lines

@@ -85,10 +85,10 @@ 
                 // It's a joined result
 
                 $parent = $this->rsm->parentAliasMap[$dqlAlias];
-                $path   = $parent . '.' . $dqlAlias;
+                $path   = $parent.'.'.$dqlAlias;
 
                 // missing parent data, skipping as RIGHT JOIN hydration is not supported.
-                if (! isset($nonemptyComponents[$parent])) {
+                if ( ! isset($nonemptyComponents[$parent])) {
                     continue;
                 }
 
@@ -97,9 +97,9 @@ 
                 if ($this->rsm->isMixed && isset($this->rootAliases[$parent])) {
                     $first = \reset($this->resultPointers);
                     // TODO: Exception if $key === null ?
-                    $baseElement =& $this->resultPointers[$parent][\key($first)];
+                    $baseElement = & $this->resultPointers[$parent][\key($first)];
                 } elseif (isset($this->resultPointers[$parent])) {
-                    $baseElement =& $this->resultPointers[$parent];
+                    $baseElement = & $this->resultPointers[$parent];
                 } else {
                     unset($this->resultPointers[$dqlAlias]); // Ticket #1228
 
@@ -111,10 +111,10 @@ 
                 $relation      = $parentClass->getProperty($relationAlias);
 
                 // Check the type of the relation (many or single-valued)
-                if (! $relation instanceof ToOneAssociationMetadata) {
+                if ( ! $relation instanceof ToOneAssociationMetadata) {
                     $oneToOne = false;
 
-                    if (! isset($baseElement[$relationAlias])) {
+                    if ( ! isset($baseElement[$relationAlias])) {
                         $baseElement[$relationAlias] = [];
                     }
 
@@ -123,7 +123,7 @@ 
                         $index        = $indexExists ? $this->identifierMap[$path][$id[$parent]][$id[$dqlAlias]] : false;
                         $indexIsValid = $index !== false ? isset($baseElement[$relationAlias][$index]) : false;
 
-                        if (! $indexExists || ! $indexIsValid) {
+                        if ( ! $indexExists || ! $indexIsValid) {
                             $element = $data;
 
                             if (isset($this->rsm->indexByMap[$dqlAlias])) {
@@ -140,16 +140,16 @@ 
                 } else {
                     $oneToOne = true;
 
-                    if (! isset($nonemptyComponents[$dqlAlias]) &&
+                    if ( ! isset($nonemptyComponents[$dqlAlias]) &&
                         ( ! isset($baseElement[$relationAlias]))
                     ) {
                         $baseElement[$relationAlias] = null;
-                    } elseif (! isset($baseElement[$relationAlias])) {
+                    } elseif ( ! isset($baseElement[$relationAlias])) {
                         $baseElement[$relationAlias] = $data;
                     }
                 }
 
-                $coll =& $baseElement[$relationAlias];
+                $coll = & $baseElement[$relationAlias];
 
                 if (\is_array($coll)) {
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
@@ -161,7 +161,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])) {
                     $result[] = $this->rsm->isMixed
                         ? [$entityKey => null]
                         : null;
@@ -198,13 +198,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)) {
                 // this only ever happens when no object is fetched (scalar result only)
                 $resultKey = isset($this->rsm->indexByMap['scalars'])
                     ? $row[$this->rsm->indexByMap['scalars']]
@@ -218,7 +218,7 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if (! isset($resultKey)) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 
@@ -259,22 +259,22 @@ 
         }
 
         if ($oneToOne) {
-            $this->resultPointers[$dqlAlias] =& $coll;
+            $this->resultPointers[$dqlAlias] = & $coll;
 
             return;
         }
 
         if ($index !== false) {
-            $this->resultPointers[$dqlAlias] =& $coll[$index];
+            $this->resultPointers[$dqlAlias] = & $coll[$index];
 
             return;
         }
 
-        if (! $coll) {
+        if ( ! $coll) {
             return;
         }
 
         \end($coll);
-        $this->resultPointers[$dqlAlias] =& $coll[\key($coll)];
+        $this->resultPointers[$dqlAlias] = & $coll[\key($coll)];
     }
 }

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/EntityManager.php

Spacing +16 added lines, -16 removed lines

@@ -293,7 +293,7 @@ 
     {
         $query = new Query($this);
 
-        if (! empty($dql)) {
+        if ( ! empty($dql)) {
             $query->setDQL($dql);
         }
 
@@ -384,7 +384,7 @@ 
             $this->checkLockRequirements($lockMode, $class);
         }
 
-        if (! \is_array($id)) {
+        if ( ! \is_array($id)) {
             if ($class->isIdentifierComposite()) {
                 throw ORMInvalidArgumentException::invalidCompositeIdentifier();
             }
@@ -405,7 +405,7 @@ 
         $sortedId = [];
 
         foreach ($class->identifier as $identifier) {
-            if (! isset($id[$identifier])) {
+            if ( ! isset($id[$identifier])) {
                 throw MissingIdentifierField::fromFieldAndClass($identifier, $className);
             }
 
@@ -422,7 +422,7 @@ 
         // Check identity map first
         $entity = $unitOfWork->tryGetById($sortedId, $class->getRootClassName());
         if ($entity !== false) {
-            if (! ($entity instanceof $className)) {
+            if ( ! ($entity instanceof $className)) {
                 return null;
             }
 
@@ -467,7 +467,7 @@ 
         $class     = $this->metadataFactory->getMetadataFor(\ltrim($entityName, '\\'));
         $className = $class->getClassName();
 
-        if (! \is_array($id)) {
+        if ( ! \is_array($id)) {
             if ($class->isIdentifierComposite()) {
                 throw ORMInvalidArgumentException::invalidCompositeIdentifier();
             }
@@ -492,7 +492,7 @@ 
         $sortedId = [];
 
         foreach ($class->identifier as $identifier) {
-            if (! isset($scalarId[$identifier])) {
+            if ( ! isset($scalarId[$identifier])) {
                 throw MissingIdentifierField::fromFieldAndClass($identifier, $className);
             }
 
@@ -533,7 +533,7 @@ 
         $class     = $this->metadataFactory->getMetadataFor(\ltrim($entityName, '\\'));
         $className = $class->getClassName();
 
-        if (! \is_array($id)) {
+        if ( ! \is_array($id)) {
             if ($class->isIdentifierComposite()) {
                 throw ORMInvalidArgumentException::invalidCompositeIdentifier();
             }
@@ -554,7 +554,7 @@ 
         $sortedId = [];
 
         foreach ($class->identifier as $identifier) {
-            if (! isset($id[$identifier])) {
+            if ( ! isset($id[$identifier])) {
                 throw MissingIdentifierField::fromFieldAndClass($identifier, $className);
             }
 
@@ -626,7 +626,7 @@ 
      */
     public function persist($entity)
     {
-        if (! \is_object($entity)) {
+        if ( ! \is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#persist()', $entity);
         }
 
@@ -648,7 +648,7 @@ 
      */
     public function remove($entity)
     {
-        if (! \is_object($entity)) {
+        if ( ! \is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#remove()', $entity);
         }
 
@@ -668,7 +668,7 @@ 
      */
     public function refresh($entity)
     {
-        if (! \is_object($entity)) {
+        if ( ! \is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#refresh()', $entity);
         }
 
@@ -818,7 +818,7 @@ 
      */
     public static function create($connection, Configuration $config, ?EventManager $eventManager = null)
     {
-        if (! $config->getMetadataDriverImpl()) {
+        if ( ! $config->getMetadataDriverImpl()) {
             throw MissingMappingDriverImplementation::create();
         }
 
@@ -845,12 +845,12 @@ 
             return DriverManager::getConnection($connection, $config, $eventManager ?: new EventManager());
         }
 
-        if (! $connection instanceof Connection) {
+        if ( ! $connection instanceof Connection) {
             throw new InvalidArgumentException(
                 \sprintf(
                     'Invalid $connection argument of type %s given%s.',
                     \is_object($connection) ? \get_class($connection) : \gettype($connection),
-                    \is_object($connection) ? '' : ': "' . $connection . '"'
+                    \is_object($connection) ? '' : ': "'.$connection.'"'
                 )
             );
         }
@@ -898,13 +898,13 @@ 
     {
         switch ($lockMode) {
             case LockMode::OPTIMISTIC:
-                if (! $class->isVersioned()) {
+                if ( ! $class->isVersioned()) {
                     throw OptimisticLockException::notVersioned($class->getClassName());
                 }
                 break;
             case LockMode::PESSIMISTIC_READ:
             case LockMode::PESSIMISTIC_WRITE:
-                if (! $this->getConnection()->isTransactionActive()) {
+                if ( ! $this->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
         }

lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php

Spacing +10 added lines, -10 removed lines

@@ -191,13 +191,13 @@ 
 
         $innerSql           = $this->getInnerSQL($AST);
         $sqlIdentifier      = $this->getSQLIdentifier($AST);
-        $sqlAliasIdentifier = \array_map(static function ($info) {
+        $sqlAliasIdentifier = \array_map(static function($info) {
             return $info['alias'];
         }, $sqlIdentifier);
 
         if ($hasOrderBy) {
-            $orderGroupBy = ' GROUP BY ' . \implode(', ', $sqlAliasIdentifier);
-            $sqlPiece     = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum';
+            $orderGroupBy = ' GROUP BY '.\implode(', ', $sqlAliasIdentifier);
+            $sqlPiece     = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum';
 
             $sqlAliasIdentifier[] = $sqlPiece;
             $sqlIdentifier[]      = [
@@ -210,7 +210,7 @@ 
         $sql = \sprintf('SELECT DISTINCT %s FROM (%s) dctrn_result', \implode(', ', $sqlAliasIdentifier), $innerSql);
 
         if ($hasOrderBy) {
-            $sql .= $orderGroupBy . $outerOrderBy;
+            $sql .= $orderGroupBy.$outerOrderBy;
         }
 
         // Apply the limit and offset.
@@ -254,7 +254,7 @@ 
 
         $innerSql           = $this->getInnerSQL($AST);
         $sqlIdentifier      = $this->getSQLIdentifier($AST);
-        $sqlAliasIdentifier = \array_map(static function ($info) {
+        $sqlAliasIdentifier = \array_map(static function($info) {
             return $info['alias'];
         }, $sqlIdentifier);
 
@@ -311,7 +311,7 @@ 
             $idVar = $pathExpression->identificationVariable;
             $field = $pathExpression->field;
 
-            if (! isset($selects[$idVar])) {
+            if ( ! isset($selects[$idVar])) {
                 $selects[$idVar] = [];
             }
 
@@ -324,7 +324,7 @@ 
             if ($selectExpression instanceof SelectExpression) {
                 $idVar = $selectExpression->expression;
 
-                if (! \is_string($idVar)) {
+                if ( ! \is_string($idVar)) {
                     continue;
                 }
 
@@ -359,7 +359,7 @@ 
         ?OrderByClause $orderByClause
     ) : string {
         // If the sql statement has an order by clause, we need to wrap it in a new select distinct statement
-        if (! $orderByClause) {
+        if ( ! $orderByClause) {
             return $sql;
         }
 
@@ -397,7 +397,7 @@ 
             $orderByItems[] = $orderByItemString;
             $identifier     = \substr($orderByItemString, 0, \strrpos($orderByItemString, ' '));
 
-            if (! \in_array($identifier, $identifiers, true)) {
+            if ( ! \in_array($identifier, $identifiers, true)) {
                 $identifiers[] = $identifier;
             }
         }
@@ -550,7 +550,7 @@ 
      */
     public function walkPathExpression($pathExpr)
     {
-        if (! $this->inSubSelect && ! $this->platformSupportsRowNumber() && ! \in_array($pathExpr, $this->orderByPathExpressions, true)) {
+        if ( ! $this->inSubSelect && ! $this->platformSupportsRowNumber() && ! \in_array($pathExpr, $this->orderByPathExpressions, true)) {
             $this->orderByPathExpressions[] = $pathExpr;
         }
 

lib/Doctrine/ORM/Tools/Pagination/Paginator.php

Spacing +2 added lines, -2 removed lines

@@ -224,7 +224,7 @@ 
         /** @var Query $countQuery */
         $countQuery = $this->cloneQuery($this->query);
 
-        if (! $countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
+        if ( ! $countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
             $countQuery->setHint(CountWalker::HINT_DISTINCT, true);
         }
 
@@ -258,7 +258,7 @@ 
         foreach ($parameters as $key => $parameter) {
             $parameterName = $parameter->getName();
 
-            if (! (isset($parameterMappings[$parameterName]) || \array_key_exists($parameterName, $parameterMappings))) {
+            if ( ! (isset($parameterMappings[$parameterName]) || \array_key_exists($parameterName, $parameterMappings))) {
                 unset($parameters[$key]);
             }
         }

lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php

Spacing +2 added lines, -2 removed lines

@@ -28,9 +28,9 @@
      */
     public function getSql(SqlWalker $sqlWalker)
     {
-        return 'ROW_NUMBER() OVER(' . \trim($sqlWalker->walkOrderByClause(
+        return 'ROW_NUMBER() OVER('.\trim($sqlWalker->walkOrderByClause(
             $this->orderByClause
-        )) . ')';
+        )).')';
     }
 
     /**

lib/Doctrine/ORM/Tools/Setup.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     {
         $cache = self::createCacheInstance($isDevMode, $cache);
 
-        if (! $cache instanceof CacheProvider) {
+        if ( ! $cache instanceof CacheProvider) {
             return $cache;
         }
 
@@ -96,7 +96,7 @@ 
             $namespace .= ':';
         }
 
-        $cache->setNamespace($namespace . 'dc2_' . \md5($proxyDir) . '_'); // to avoid collisions
+        $cache->setNamespace($namespace.'dc2_'.\md5($proxyDir).'_'); // to avoid collisions
 
         return $cache;
     }