Failed Conditions
Pull Request — master (#6927)
by Alessandro
09:08
created
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
             $class->reflFields[$fieldName]->setValue($entity, $value);
200 200
             $this->_uow->setOriginalEntityProperty($oid, $fieldName, $value);
201 201
 
202
-            $this->initializedCollections[$oid . $fieldName] = $value;
202
+            $this->initializedCollections[$oid.$fieldName] = $value;
203 203
         } else if (
204 204
             isset($this->_hints[Query::HINT_REFRESH]) ||
205 205
             isset($this->_hints['fetched'][$parentDqlAlias][$fieldName]) &&
@@ -210,10 +210,10 @@  discard block
 block discarded – undo
210 210
             $value->setInitialized(true);
211 211
             $value->unwrap()->clear();
212 212
 
213
-            $this->initializedCollections[$oid . $fieldName] = $value;
213
+            $this->initializedCollections[$oid.$fieldName] = $value;
214 214
         } else {
215 215
             // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN!
216
-            $this->existingCollections[$oid . $fieldName] = $value;
216
+            $this->existingCollections[$oid.$fieldName] = $value;
217 217
         }
218 218
 
219 219
         return $value;
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
             $idHash = '';
288 288
 
289 289
             foreach ($class->identifier as $fieldName) {
290
-                $idHash .= ' ' . (isset($class->associationMappings[$fieldName])
290
+                $idHash .= ' '.(isset($class->associationMappings[$fieldName])
291 291
                     ? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]
292 292
                     : $data[$fieldName]);
293 293
             }
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
                 $parentAlias = $this->_rsm->parentAliasMap[$dqlAlias];
346 346
                 // we need the $path to save into the identifier map which entities were already
347 347
                 // seen for this parent-child relationship
348
-                $path = $parentAlias . '.' . $dqlAlias;
348
+                $path = $parentAlias.'.'.$dqlAlias;
349 349
 
350 350
                 // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
351 351
                 if ( ! isset($nonemptyComponents[$parentAlias])) {
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
                     $reflFieldValue = $reflField->getValue($parentObject);
386 386
 
387 387
                     if (isset($nonemptyComponents[$dqlAlias])) {
388
-                        $collKey = $oid . $relationField;
388
+                        $collKey = $oid.$relationField;
389 389
                         if (isset($this->initializedCollections[$collKey])) {
390 390
                             $reflFieldValue = $this->initializedCollections[$collKey];
391 391
                         } else if ( ! isset($this->existingCollections[$collKey])) {
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
                     // PATH B: Single-valued association
433 433
                     $reflFieldValue = $reflField->getValue($parentObject);
434 434
 
435
-                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && !$reflFieldValue->__isInitialized__)) {
435
+                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && ! $reflFieldValue->__isInitialized__)) {
436 436
                         // we only need to take action if this value is null,
437 437
                         // we refresh the entity or its an uninitialized proxy.
438 438
                         if (isset($nonemptyComponents[$dqlAlias])) {
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
                 $entityKey = $this->_rsm->entityMappings[$dqlAlias] ?: 0;
478 478
 
479 479
                 // if this row has a NULL value for the root result id then make it a null result.
480
-                if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
480
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
481 481
                     if ($this->_rsm->isMixed) {
482 482
                         $result[] = [$entityKey => null];
483 483
                     } else {
@@ -533,13 +533,13 @@  discard block
 block discarded – undo
533 533
             }
534 534
         }
535 535
 
536
-        if ( ! isset($resultKey) ) {
536
+        if ( ! isset($resultKey)) {
537 537
             $this->resultCounter++;
538 538
         }
539 539
 
540 540
         // Append scalar values to mixed result sets
541 541
         if (isset($rowData['scalars'])) {
542
-            if ( ! isset($resultKey) ) {
542
+            if ( ! isset($resultKey)) {
543 543
                 $resultKey = isset($this->_rsm->indexByMap['scalars'])
544 544
                     ? $row[$this->_rsm->indexByMap['scalars']]
545 545
                     : $this->resultCounter - 1;
@@ -552,18 +552,18 @@  discard block
 block discarded – undo
552 552
 
553 553
         // Append new object to mixed result sets
554 554
         if (isset($rowData['newObjects'])) {
555
-            if ( ! isset($resultKey) ) {
555
+            if ( ! isset($resultKey)) {
556 556
                 $resultKey = $this->resultCounter - 1;
557 557
             }
558 558
 
559
-            $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0);
559
+            $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0);
560 560
 
561 561
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
562 562
                 $class  = $newObject['class'];
563 563
                 $args   = $newObject['args'];
564 564
                 $obj    = $class->newInstanceArgs($args);
565 565
 
566
-                if ($scalarCount == 0 && count($rowData['newObjects']) == 1 ) {
566
+                if ($scalarCount == 0 && count($rowData['newObjects']) == 1) {
567 567
                     $result[$resultKey] = $obj;
568 568
 
569 569
                     continue;
Please login to merge, or discard this patch.