Completed
Push — 2.6 ( a912fc...30a063 )
by Luís
13s
created
lib/Doctrine/ORM/UnitOfWork.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
         $state = $this->getEntityState($entity);
500 500
 
501 501
         if ($state !== self::STATE_MANAGED && $state !== self::STATE_REMOVED) {
502
-            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation " . self::objToStr($entity));
502
+            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation ".self::objToStr($entity));
503 503
         }
504 504
 
505 505
         $class = $this->em->getClassMetadata(get_class($entity));
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
         $oid  = spl_object_hash($entity);
556 556
         $data = [];
557 557
 
558
-        if (!isset($this->entityChangeSets[$oid])) {
558
+        if ( ! isset($this->entityChangeSets[$oid])) {
559 559
             return $data;
560 560
         }
561 561
 
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
                     if ($owner === null) { // cloned
719 719
                         $actualValue->setOwner($entity, $assoc);
720 720
                     } else if ($owner !== $entity) { // no clone, we have to fix
721
-                        if (!$actualValue->isInitialized()) {
721
+                        if ( ! $actualValue->isInitialized()) {
722 722
                             $actualValue->initialize(); // we have to do this otherwise the cols share state
723 723
                         }
724 724
                         $newValue = clone $actualValue;
@@ -864,7 +864,7 @@  discard block
 block discarded – undo
864 864
         $targetClass    = $this->em->getClassMetadata($assoc['targetEntity']);
865 865
 
866 866
         foreach ($unwrappedValue as $key => $entry) {
867
-            if (! ($entry instanceof $targetClass->name)) {
867
+            if ( ! ($entry instanceof $targetClass->name)) {
868 868
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $assoc, $entry);
869 869
             }
870 870
 
@@ -942,7 +942,7 @@  discard block
 block discarded – undo
942 942
 
943 943
             // Some identifiers may be foreign keys to new entities.
944 944
             // In this case, we don't have the value yet and should treat it as if we have a post-insert generator
945
-            if (! $this->hasMissingIdsWhichAreForeignKeys($class, $idValue)) {
945
+            if ( ! $this->hasMissingIdsWhichAreForeignKeys($class, $idValue)) {
946 946
                 $this->entityIdentifiers[$oid] = $idValue;
947 947
             }
948 948
         }
@@ -1091,7 +1091,7 @@  discard block
 block discarded – undo
1091 1091
             }
1092 1092
         } else {
1093 1093
             foreach ($insertionsForClass as $oid => $entity) {
1094
-                if (! isset($this->entityIdentifiers[$oid])) {
1094
+                if ( ! isset($this->entityIdentifiers[$oid])) {
1095 1095
                     //entity was not added to identity map because some identifiers are foreign keys to new entities.
1096 1096
                     //add it now
1097 1097
                     $this->addToEntityIdentifiersAndEntityMap($class, $oid, $entity);
@@ -1256,7 +1256,7 @@  discard block
 block discarded – undo
1256 1256
 
1257 1257
                 $joinColumns = reset($assoc['joinColumns']);
1258 1258
 
1259
-                $calc->addDependency($targetClass->name, $class->name, (int)empty($joinColumns['nullable']));
1259
+                $calc->addDependency($targetClass->name, $class->name, (int) empty($joinColumns['nullable']));
1260 1260
 
1261 1261
                 // If the target class has mapped subclasses, these share the same dependency.
1262 1262
                 if ( ! $targetClass->subClasses) {
@@ -1779,7 +1779,7 @@  discard block
 block discarded – undo
1779 1779
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted");
1780 1780
 
1781 1781
             default:
1782
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
1782
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
1783 1783
         }
1784 1784
 
1785 1785
         $this->cascadePersist($entity, $visited);
@@ -1849,7 +1849,7 @@  discard block
 block discarded – undo
1849 1849
             case self::STATE_DETACHED:
1850 1850
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed");
1851 1851
             default:
1852
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
1852
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
1853 1853
         }
1854 1854
 
1855 1855
     }
@@ -1988,7 +1988,7 @@  discard block
 block discarded – undo
1988 1988
      */
1989 1989
     private function ensureVersionMatch(ClassMetadata $class, $entity, $managedCopy)
1990 1990
     {
1991
-        if (! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
1991
+        if ( ! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
1992 1992
             return;
1993 1993
         }
1994 1994
 
@@ -2013,7 +2013,7 @@  discard block
 block discarded – undo
2013 2013
      */
2014 2014
     private function isLoaded($entity)
2015 2015
     {
2016
-        return !($entity instanceof Proxy) || $entity->__isInitialized();
2016
+        return ! ($entity instanceof Proxy) || $entity->__isInitialized();
2017 2017
     }
2018 2018
 
2019 2019
     /**
@@ -2171,7 +2171,7 @@  discard block
 block discarded – undo
2171 2171
 
2172 2172
         $associationMappings = array_filter(
2173 2173
             $class->associationMappings,
2174
-            function ($assoc) { return $assoc['isCascadeRefresh']; }
2174
+            function($assoc) { return $assoc['isCascadeRefresh']; }
2175 2175
         );
2176 2176
 
2177 2177
         foreach ($associationMappings as $assoc) {
@@ -2214,7 +2214,7 @@  discard block
 block discarded – undo
2214 2214
 
2215 2215
         $associationMappings = array_filter(
2216 2216
             $class->associationMappings,
2217
-            function ($assoc) { return $assoc['isCascadeDetach']; }
2217
+            function($assoc) { return $assoc['isCascadeDetach']; }
2218 2218
         );
2219 2219
 
2220 2220
         foreach ($associationMappings as $assoc) {
@@ -2258,7 +2258,7 @@  discard block
 block discarded – undo
2258 2258
 
2259 2259
         $associationMappings = array_filter(
2260 2260
             $class->associationMappings,
2261
-            function ($assoc) { return $assoc['isCascadeMerge']; }
2261
+            function($assoc) { return $assoc['isCascadeMerge']; }
2262 2262
         );
2263 2263
 
2264 2264
         foreach ($associationMappings as $assoc) {
@@ -2297,7 +2297,7 @@  discard block
 block discarded – undo
2297 2297
 
2298 2298
         $associationMappings = array_filter(
2299 2299
             $class->associationMappings,
2300
-            function ($assoc) { return $assoc['isCascadePersist']; }
2300
+            function($assoc) { return $assoc['isCascadePersist']; }
2301 2301
         );
2302 2302
 
2303 2303
         foreach ($associationMappings as $assoc) {
@@ -2326,7 +2326,7 @@  discard block
 block discarded – undo
2326 2326
                     break;
2327 2327
 
2328 2328
                 case ($relatedEntities !== null):
2329
-                    if (! $relatedEntities instanceof $assoc['targetEntity']) {
2329
+                    if ( ! $relatedEntities instanceof $assoc['targetEntity']) {
2330 2330
                         throw ORMInvalidArgumentException::invalidAssociation(
2331 2331
                             $this->em->getClassMetadata($assoc['targetEntity']),
2332 2332
                             $assoc,
@@ -2357,13 +2357,13 @@  discard block
 block discarded – undo
2357 2357
 
2358 2358
         $associationMappings = array_filter(
2359 2359
             $class->associationMappings,
2360
-            function ($assoc) { return $assoc['isCascadeRemove']; }
2360
+            function($assoc) { return $assoc['isCascadeRemove']; }
2361 2361
         );
2362 2362
 
2363 2363
         $entitiesToCascade = [];
2364 2364
 
2365 2365
         foreach ($associationMappings as $assoc) {
2366
-            if ($entity instanceof Proxy && !$entity->__isInitialized__) {
2366
+            if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
2367 2367
                 $entity->__load();
2368 2368
             }
2369 2369
 
@@ -2427,7 +2427,7 @@  discard block
 block discarded – undo
2427 2427
                     return;
2428 2428
                 }
2429 2429
 
2430
-                if ($entity instanceof Proxy && !$entity->__isInitialized__) {
2430
+                if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
2431 2431
                     $entity->__load();
2432 2432
                 }
2433 2433
 
@@ -2442,7 +2442,7 @@  discard block
 block discarded – undo
2442 2442
             case LockMode::NONE === $lockMode:
2443 2443
             case LockMode::PESSIMISTIC_READ === $lockMode:
2444 2444
             case LockMode::PESSIMISTIC_WRITE === $lockMode:
2445
-                if (!$this->em->getConnection()->isTransactionActive()) {
2445
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
2446 2446
                     throw TransactionRequiredException::transactionRequired();
2447 2447
                 }
2448 2448
 
@@ -2766,7 +2766,7 @@  discard block
 block discarded – undo
2766 2766
                             // then we can append this entity for eager loading!
2767 2767
                             if ($hints['fetchMode'][$class->name][$field] == ClassMetadata::FETCH_EAGER &&
2768 2768
                                 isset($hints[self::HINT_DEFEREAGERLOAD]) &&
2769
-                                !$targetClass->isIdentifierComposite &&
2769
+                                ! $targetClass->isIdentifierComposite &&
2770 2770
                                 $newValue instanceof Proxy &&
2771 2771
                                 $newValue->__isInitialized__ === false) {
2772 2772
 
@@ -3131,7 +3131,7 @@  discard block
 block discarded – undo
3131 3131
     public function getCollectionPersister(array $association)
3132 3132
     {
3133 3133
         $role = isset($association['cache'])
3134
-            ? $association['sourceEntity'] . '::' . $association['fieldName']
3134
+            ? $association['sourceEntity'].'::'.$association['fieldName']
3135 3135
             : $association['type'];
3136 3136
 
3137 3137
         if (isset($this->collectionPersisters[$role])) {
@@ -3349,7 +3349,7 @@  discard block
 block discarded – undo
3349 3349
      */
3350 3350
     private function afterTransactionComplete()
3351 3351
     {
3352
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
3352
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
3353 3353
             $persister->afterTransactionComplete();
3354 3354
         });
3355 3355
     }
@@ -3359,7 +3359,7 @@  discard block
 block discarded – undo
3359 3359
      */
3360 3360
     private function afterTransactionRolledBack()
3361 3361
     {
3362
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
3362
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
3363 3363
             $persister->afterTransactionRolledBack();
3364 3364
         });
3365 3365
     }
@@ -3455,11 +3455,11 @@  discard block
 block discarded – undo
3455 3455
      */
3456 3456
     private function mergeEntityStateIntoManagedCopy($entity, $managedCopy)
3457 3457
     {
3458
-        if (! $this->isLoaded($entity)) {
3458
+        if ( ! $this->isLoaded($entity)) {
3459 3459
             return;
3460 3460
         }
3461 3461
 
3462
-        if (! $this->isLoaded($managedCopy)) {
3462
+        if ( ! $this->isLoaded($managedCopy)) {
3463 3463
             $managedCopy->__load();
3464 3464
         }
3465 3465
 
@@ -3482,7 +3482,7 @@  discard block
 block discarded – undo
3482 3482
                     if ($other === null) {
3483 3483
                         $prop->setValue($managedCopy, null);
3484 3484
                     } else {
3485
-                        if ($other instanceof Proxy && !$other->__isInitialized()) {
3485
+                        if ($other instanceof Proxy && ! $other->__isInitialized()) {
3486 3486
                             // do not merge fields marked lazy that have not been fetched.
3487 3487
                             continue;
3488 3488
                         }
@@ -3569,7 +3569,7 @@  discard block
 block discarded – undo
3569 3569
      */
3570 3570
     private function clearIdentityMapForEntityName($entityName)
3571 3571
     {
3572
-        if (! isset($this->identityMap[$entityName])) {
3572
+        if ( ! isset($this->identityMap[$entityName])) {
3573 3573
             return;
3574 3574
         }
3575 3575
 
Please login to merge, or discard this patch.