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) {
                         $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;
             }
         }

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

Spacing +17 added lines, -17 removed lines

@@ -92,10 +92,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;
                 }
 
@@ -104,9 +104,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
 
@@ -118,10 +118,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] = [];
                     }
 
@@ -130,7 +130,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])) {
@@ -151,12 +151,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);
@@ -168,7 +168,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;
@@ -205,13 +205,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']]
@@ -225,7 +225,7 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if (! isset($resultKey)) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 
@@ -267,23 +267,23 @@ 
         }
 
         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)];
 
         return;
     }

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

Spacing +5 added lines, -5 removed lines

@@ -143,7 +143,7 @@ 
     {
         $row = $this->stmt->fetch(PDO::FETCH_ASSOC);
 
-        if (! $row) {
+        if ( ! $row) {
             $this->cleanup();
 
             return false;
@@ -286,7 +286,7 @@ 
                         : $value;
 
                     if ($cacheKeyInfo['isIdentifier'] && $value !== null) {
-                        $id[$dqlAlias]                .= '|' . $value;
+                        $id[$dqlAlias]                .= '|'.$value;
                         $nonemptyComponents[$dqlAlias] = true;
                     }
                     break;
@@ -322,10 +322,10 @@ 
 
             // WARNING: BC break! We know this is the desired behavior to type convert values, but this
             // erroneous behavior exists since 2.0 and we're forced to keep compatibility.
-            if (! isset($cacheKeyInfo['isScalar'])) {
+            if ( ! isset($cacheKeyInfo['isScalar'])) {
                 $dqlAlias  = $cacheKeyInfo['dqlAlias'];
                 $type      = $cacheKeyInfo['type'];
-                $fieldName = $dqlAlias . '_' . $fieldName;
+                $fieldName = $dqlAlias.'_'.$fieldName;
                 $value     = $type
                     ? $type->convertToPHPValue($value, $this->platform)
                     : $value;
@@ -431,7 +431,7 @@ 
      */
     protected function getClassMetadata($className)
     {
-        if (! isset($this->metadataCache[$className])) {
+        if ( ! isset($this->metadataCache[$className])) {
             $this->metadataCache[$className] = $this->em->getClassMetadata($className);
         }