doctrine / orm

lib/Doctrine/ORM/ORMInvalidArgumentException.php

Spacing +17 added lines, -17 removed lines

@@ -29,7 +29,7 @@ 
      */
     public static function scheduleInsertForManagedEntity($entity)
     {
-        return new self('A managed+dirty entity ' . self::objToStr($entity) . ' can not be scheduled for insertion.');
+        return new self('A managed+dirty entity '.self::objToStr($entity).' can not be scheduled for insertion.');
     }
 
     /**
@@ -39,7 +39,7 @@ 
      */
     public static function scheduleInsertForRemovedEntity($entity)
     {
-        return new self('Removed entity ' . self::objToStr($entity) . ' can not be scheduled for insertion.');
+        return new self('Removed entity '.self::objToStr($entity).' can not be scheduled for insertion.');
     }
 
     /**
@@ -49,7 +49,7 @@ 
      */
     public static function scheduleInsertTwice($entity)
     {
-        return new self('Entity ' . self::objToStr($entity) . ' can not be scheduled for insertion twice.');
+        return new self('Entity '.self::objToStr($entity).' can not be scheduled for insertion twice.');
     }
 
     /**
@@ -61,7 +61,7 @@ 
     public static function entityWithoutIdentity($className, $entity)
     {
         return new self(
-            "The given entity of type '" . $className . "' (" . self::objToStr($entity) . ') has no identity/no ' .
+            "The given entity of type '".$className."' (".self::objToStr($entity).') has no identity/no '.
             'id values set. It cannot be added to the identity map.'
         );
     }
@@ -73,7 +73,7 @@ 
      */
     public static function readOnlyRequiresManagedEntity($entity)
     {
-        return new self('Only managed entities can be marked or checked as read only. But ' . self::objToStr($entity) . ' is not');
+        return new self('Only managed entities can be marked or checked as read only. But '.self::objToStr($entity).' is not');
     }
 
     /**
@@ -84,7 +84,7 @@ 
     public static function newEntitiesFoundThroughRelationships($newEntitiesWithAssociations)
     {
         $errorMessages = array_map(
-            function (array $newEntityWithAssociation) : string {
+            function(array $newEntityWithAssociation) : string {
                 [$associationMetadata, $entity] = $newEntityWithAssociation;
 
                 return self::newEntityFoundThroughRelationshipMessage($associationMetadata, $entity);
@@ -154,7 +154,7 @@ 
      */
     public static function entityNotManaged($entity)
     {
-        return new self('Entity ' . self::objToStr($entity) . ' is not managed. An entity is managed if its fetched ' .
+        return new self('Entity '.self::objToStr($entity).' is not managed. An entity is managed if its fetched '.
             'from the database or registered as new through EntityManager#persist');
     }
 
@@ -166,7 +166,7 @@ 
      */
     public static function entityHasNoIdentity($entity, $operation)
     {
-        return new self('Entity has no identity, therefore ' . $operation . ' cannot be performed. ' . self::objToStr($entity));
+        return new self('Entity has no identity, therefore '.$operation.' cannot be performed. '.self::objToStr($entity));
     }
 
     /**
@@ -177,7 +177,7 @@ 
      */
     public static function entityIsRemoved($entity, $operation)
     {
-        return new self('Entity is removed, therefore ' . $operation . ' cannot be performed. ' . self::objToStr($entity));
+        return new self('Entity is removed, therefore '.$operation.' cannot be performed. '.self::objToStr($entity));
     }
 
     /**
@@ -188,7 +188,7 @@ 
      */
     public static function detachedEntityCannot($entity, $operation)
     {
-        return new self('Detached entity ' . self::objToStr($entity) . ' cannot be ' . $operation);
+        return new self('Detached entity '.self::objToStr($entity).' cannot be '.$operation);
     }
 
     /**
@@ -200,8 +200,8 @@ 
      */
     public static function invalidObject($context, $given, $parameterIndex = 1)
     {
-        return new self($context . ' expects parameter ' . $parameterIndex .
-            ' to be an entity object, ' . gettype($given) . ' given.');
+        return new self($context.' expects parameter '.$parameterIndex.
+            ' to be an entity object, '.gettype($given).' given.');
     }
 
     /**
@@ -209,7 +209,7 @@ 
      */
     public static function invalidCompositeIdentifier()
     {
-        return new self('Binding an entity with a composite primary key to a query is not supported. ' .
+        return new self('Binding an entity with a composite primary key to a query is not supported. '.
             'You should split the parameter into the explicit fields and bind them separately.');
     }
 
@@ -246,7 +246,7 @@ 
      */
     private static function objToStr($obj) : string
     {
-        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj) . '@' . spl_object_id($obj);
+        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj).'@'.spl_object_id($obj);
     }
 
     /**
@@ -255,15 +255,15 @@ 
     private static function newEntityFoundThroughRelationshipMessage(AssociationMetadata $association, $entity) : string
     {
         return 'A new entity was found through the relationship \''
-            . $association->getSourceEntity() . '#' . $association->getName() . '\' that was not'
-            . ' configured to cascade persist operations for entity: ' . self::objToStr($entity) . '.'
+            . $association->getSourceEntity().'#'.$association->getName().'\' that was not'
+            . ' configured to cascade persist operations for entity: '.self::objToStr($entity).'.'
             . ' To solve this issue: Either explicitly call EntityManager#persist()'
             . ' on this unknown entity or configure cascade persist'
             . ' this association in the mapping for example @ManyToOne(..,cascade={"persist"}).'
             . (method_exists($entity, '__toString')
                 ? ''
                 : ' If you cannot find out which entity causes the problem implement \''
-                . $association->getTargetEntity() . '#__toString()\' to get a clue.'
+                . $association->getTargetEntity().'#__toString()\' to get a clue.'
             );
     }
 }

lib/Doctrine/ORM/Query.php

Spacing +9 added lines, -9 removed lines

@@ -254,7 +254,7 @@ 
 
         // Check query cache.
         $queryCache = $this->getQueryCacheDriver();
-        if (! ($this->useQueryCache && $queryCache)) {
+        if ( ! ($this->useQueryCache && $queryCache)) {
             $parser = new Parser($this);
 
             $this->parserResult = $parser->parse();
@@ -391,7 +391,7 @@ 
             $value = $parameter->getValue();
             $rsm   = $this->getResultSetMapping();
 
-            if (! isset($paramMappings[$key])) {
+            if ( ! isset($paramMappings[$key])) {
                 throw QueryException::unknownParameter($key);
             }
 
@@ -699,7 +699,7 @@ 
     public function setLockMode($lockMode)
     {
         if (in_array($lockMode, [LockMode::NONE, LockMode::PESSIMISTIC_READ, LockMode::PESSIMISTIC_WRITE], true)) {
-            if (! $this->em->getConnection()->isTransactionActive()) {
+            if ( ! $this->em->getConnection()->isTransactionActive()) {
                 throw TransactionRequiredException::transactionRequired();
             }
         }
@@ -740,11 +740,11 @@ 
             ->getName();
 
         return md5(
-            $this->getDQL() . serialize($this->hints) .
-            '&platform=' . $platform .
-            ($this->em->hasFilters() ? $this->em->getFilters()->getHash() : '') .
-            '&firstResult=' . $this->firstResult . '&maxResult=' . $this->maxResults .
-            '&hydrationMode=' . $this->hydrationMode . '&types=' . serialize($this->parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT'
+            $this->getDQL().serialize($this->hints).
+            '&platform='.$platform.
+            ($this->em->hasFilters() ? $this->em->getFilters()->getHash() : '').
+            '&firstResult='.$this->firstResult.'&maxResult='.$this->maxResults.
+            '&hydrationMode='.$this->hydrationMode.'&types='.serialize($this->parsedTypes).'DOCTRINE_QUERY_CACHE_SALT'
         );
     }
 
@@ -753,7 +753,7 @@ 
      */
     protected function getHash()
     {
-        return sha1(parent::getHash() . '-' . $this->firstResult . '-' . $this->maxResults);
+        return sha1(parent::getHash().'-'.$this->firstResult.'-'.$this->maxResults);
     }
 
     /**

lib/Doctrine/ORM/AbstractQuery.php

Spacing +10 added lines, -10 removed lines

@@ -300,7 +300,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function (Query\Parameter $parameter) use ($key) : bool {
+            function(Query\Parameter $parameter) use ($key) : bool {
                 $parameterName = $parameter->getName();
 
                 return $key === $parameterName || (string) $key === (string) $parameterName;
@@ -716,7 +716,7 @@ 
             return null;
         }
 
-        if (! is_array($result)) {
+        if ( ! is_array($result)) {
             return $result;
         }
 
@@ -750,7 +750,7 @@ 
             throw new NoResultException();
         }
 
-        if (! is_array($result)) {
+        if ( ! is_array($result)) {
             return $result;
         }
 
@@ -840,7 +840,7 @@ 
             $this->setHydrationMode($hydrationMode);
         }
 
-        if (! empty($parameters)) {
+        if ( ! empty($parameters)) {
             $this->setParameters($parameters);
         }
 
@@ -879,11 +879,11 @@ 
             $this->setHydrationMode($hydrationMode);
         }
 
-        if (! empty($parameters)) {
+        if ( ! empty($parameters)) {
             $this->setParameters($parameters);
         }
 
-        $setCacheEntry = function () {
+        $setCacheEntry = function() {
         };
 
         if ($this->hydrationCacheProfile !== null) {
@@ -897,11 +897,11 @@ 
                 return $result[$realCacheKey];
             }
 
-            if (! $result) {
+            if ( ! $result) {
                 $result = [];
             }
 
-            $setCacheEntry = function ($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) {
+            $setCacheEntry = function($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) {
                 $result[$realCacheKey] = $data;
 
                 $cache->save($cacheKey, $result, $queryCacheProfile->getLifetime());
@@ -1063,7 +1063,7 @@ 
     {
         $query  = $this->getSQL();
         $hints  = $this->getHints();
-        $params = array_map(function (Parameter $parameter) {
+        $params = array_map(function(Parameter $parameter) {
             $value = $parameter->getValue();
 
             // Small optimization
@@ -1077,6 +1077,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

lib/Doctrine/ORM/Annotation/DoctrineAnnotations.php

Spacing +41 added lines, -41 removed lines

@@ -2,44 +2,44 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . '/Annotation.php';
-require_once __DIR__ . '/AssociationOverride.php';
-require_once __DIR__ . '/AssociationOverrides.php';
-require_once __DIR__ . '/AttributeOverride.php';
-require_once __DIR__ . '/AttributeOverrides.php';
-require_once __DIR__ . '/Cache.php';
-require_once __DIR__ . '/ChangeTrackingPolicy.php';
-require_once __DIR__ . '/Column.php';
-require_once __DIR__ . '/CustomIdGenerator.php';
-require_once __DIR__ . '/DiscriminatorColumn.php';
-require_once __DIR__ . '/DiscriminatorMap.php';
-require_once __DIR__ . '/Embeddable.php';
-require_once __DIR__ . '/Embedded.php';
-require_once __DIR__ . '/Entity.php';
-require_once __DIR__ . '/EntityListeners.php';
-require_once __DIR__ . '/GeneratedValue.php';
-require_once __DIR__ . '/HasLifecycleCallbacks.php';
-require_once __DIR__ . '/Id.php';
-require_once __DIR__ . '/Index.php';
-require_once __DIR__ . '/InheritanceType.php';
-require_once __DIR__ . '/JoinColumn.php';
-require_once __DIR__ . '/JoinColumns.php';
-require_once __DIR__ . '/JoinTable.php';
-require_once __DIR__ . '/ManyToMany.php';
-require_once __DIR__ . '/ManyToOne.php';
-require_once __DIR__ . '/MappedSuperclass.php';
-require_once __DIR__ . '/OneToMany.php';
-require_once __DIR__ . '/OneToOne.php';
-require_once __DIR__ . '/OrderBy.php';
-require_once __DIR__ . '/PrePersist.php';
-require_once __DIR__ . '/PostLoad.php';
-require_once __DIR__ . '/PostPersist.php';
-require_once __DIR__ . '/PostRemove.php';
-require_once __DIR__ . '/PostUpdate.php';
-require_once __DIR__ . '/PreFlush.php';
-require_once __DIR__ . '/PreRemove.php';
-require_once __DIR__ . '/PreUpdate.php';
-require_once __DIR__ . '/SequenceGenerator.php';
-require_once __DIR__ . '/Table.php';
-require_once __DIR__ . '/UniqueConstraint.php';
-require_once __DIR__ . '/Version.php';
+require_once __DIR__.'/Annotation.php';
+require_once __DIR__.'/AssociationOverride.php';
+require_once __DIR__.'/AssociationOverrides.php';
+require_once __DIR__.'/AttributeOverride.php';
+require_once __DIR__.'/AttributeOverrides.php';
+require_once __DIR__.'/Cache.php';
+require_once __DIR__.'/ChangeTrackingPolicy.php';
+require_once __DIR__.'/Column.php';
+require_once __DIR__.'/CustomIdGenerator.php';
+require_once __DIR__.'/DiscriminatorColumn.php';
+require_once __DIR__.'/DiscriminatorMap.php';
+require_once __DIR__.'/Embeddable.php';
+require_once __DIR__.'/Embedded.php';
+require_once __DIR__.'/Entity.php';
+require_once __DIR__.'/EntityListeners.php';
+require_once __DIR__.'/GeneratedValue.php';
+require_once __DIR__.'/HasLifecycleCallbacks.php';
+require_once __DIR__.'/Id.php';
+require_once __DIR__.'/Index.php';
+require_once __DIR__.'/InheritanceType.php';
+require_once __DIR__.'/JoinColumn.php';
+require_once __DIR__.'/JoinColumns.php';
+require_once __DIR__.'/JoinTable.php';
+require_once __DIR__.'/ManyToMany.php';
+require_once __DIR__.'/ManyToOne.php';
+require_once __DIR__.'/MappedSuperclass.php';
+require_once __DIR__.'/OneToMany.php';
+require_once __DIR__.'/OneToOne.php';
+require_once __DIR__.'/OrderBy.php';
+require_once __DIR__.'/PrePersist.php';
+require_once __DIR__.'/PostLoad.php';
+require_once __DIR__.'/PostPersist.php';
+require_once __DIR__.'/PostRemove.php';
+require_once __DIR__.'/PostUpdate.php';
+require_once __DIR__.'/PreFlush.php';
+require_once __DIR__.'/PreRemove.php';
+require_once __DIR__.'/PreUpdate.php';
+require_once __DIR__.'/SequenceGenerator.php';
+require_once __DIR__.'/Table.php';
+require_once __DIR__.'/UniqueConstraint.php';
+require_once __DIR__.'/Version.php';

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

Spacing +17 added lines, -17 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])) {
@@ -144,12 +144,12 @@ 
                         ( ! 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;
             }
 
@@ -260,22 +260,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) {
                         $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/Internal/Hydration/IterableResult.php

Spacing +1 added lines, -1 removed lines

@@ -77,6 +77,6 @@
      */
     public function valid()
     {
-        return $this->current!==false;
+        return $this->current !== false;
     }
 }

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

Spacing +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@
      */
     public static function emptyDiscriminatorValue($dqlAlias)
     {
-        return new self("The DQL alias '" . $dqlAlias . "' contains an entity " .
-            'of an inheritance hierarchy with an empty discriminator value. This means ' .
-            'that the database contains inconsistent data with an empty ' .
+        return new self("The DQL alias '".$dqlAlias."' contains an entity ".
+            'of an inheritance hierarchy with an empty discriminator value. This means '.
+            'that the database contains inconsistent data with an empty '.
             'discriminator value in a table row.');
     }
 

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

Spacing +4 added lines, -4 removed lines

@@ -83,7 +83,7 @@ 
                 $discrColumnName = $metaMappingDiscrColumnName;
             }
 
-            if (! isset($sqlResult[$discrColumnName])) {
+            if ( ! isset($sqlResult[$discrColumnName])) {
                 throw HydrationException::missingDiscriminatorColumn($entityName, $discrColumnName, key($this->rsm->aliasMap));
             }
 
@@ -93,7 +93,7 @@ 
 
             $discrMap = $this->class->discriminatorMap;
 
-            if (! isset($discrMap[$sqlResult[$discrColumnName]])) {
+            if ( ! isset($discrMap[$sqlResult[$discrColumnName]])) {
                 throw HydrationException::invalidDiscriminatorValue($sqlResult[$discrColumnName], array_keys($discrMap));
             }
 
@@ -110,7 +110,7 @@ 
 
             $cacheKeyInfo = $this->hydrateColumnInfo($column);
 
-            if (! $cacheKeyInfo) {
+            if ( ! $cacheKeyInfo) {
                 continue;
             }
 
@@ -126,7 +126,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;
             }
         }