Completed
Pull Request — master (#6055)
by Martin
71:23 queued 62:58
created
lib/Doctrine/ORM/UnitOfWork.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -337,12 +337,12 @@  discard block
 block discarded – undo
337 337
             }
338 338
         }
339 339
 
340
-        if (!$this->entityInsertions &&
341
-            !$this->entityDeletions &&
342
-            !$this->entityUpdates &&
343
-            !$this->collectionUpdates &&
344
-            !$this->collectionDeletions &&
345
-            !$this->orphanRemovals) {
340
+        if ( ! $this->entityInsertions &&
341
+            ! $this->entityDeletions &&
342
+            ! $this->entityUpdates &&
343
+            ! $this->collectionUpdates &&
344
+            ! $this->collectionDeletions &&
345
+            ! $this->orphanRemovals) {
346 346
 
347 347
             $this->dispatchOnFlushEvent();
348 348
             $this->dispatchPostFlushEvent();
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
         $state = $this->getEntityState($entity);
465 465
 
466 466
         if ($state !== self::STATE_MANAGED && $state !== self::STATE_REMOVED) {
467
-            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation " . self::objToStr($entity));
467
+            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation ".self::objToStr($entity));
468 468
         }
469 469
 
470 470
         $class = $this->em->getClassMetadata(get_class($entity));
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
         $oid  = spl_object_hash($entity);
521 521
         $data = array();
522 522
 
523
-        if (!isset($this->entityChangeSets[$oid])) {
523
+        if ( ! isset($this->entityChangeSets[$oid])) {
524 524
             return $data;
525 525
         }
526 526
 
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
                     if ($owner === null) { // cloned
684 684
                         $actualValue->setOwner($entity, $assoc);
685 685
                     } else if ($owner !== $entity) { // no clone, we have to fix
686
-                        if (!$actualValue->isInitialized()) {
686
+                        if ( ! $actualValue->isInitialized()) {
687 687
                             $actualValue->initialize(); // we have to do this otherwise the cols share state
688 688
                         }
689 689
                         $newValue = clone $actualValue;
@@ -829,7 +829,7 @@  discard block
 block discarded – undo
829 829
         $targetClass    = $this->em->getClassMetadata($assoc['targetEntity']);
830 830
 
831 831
         foreach ($unwrappedValue as $key => $entry) {
832
-            if (! ($entry instanceof $targetClass->name)) {
832
+            if ( ! ($entry instanceof $targetClass->name)) {
833 833
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $assoc, $entry);
834 834
             }
835 835
 
@@ -1157,7 +1157,7 @@  discard block
 block discarded – undo
1157 1157
 
1158 1158
                 $joinColumns = reset($assoc['joinColumns']);
1159 1159
 
1160
-                $calc->addDependency($targetClass->name, $class->name, (int)empty($joinColumns['nullable']));
1160
+                $calc->addDependency($targetClass->name, $class->name, (int) empty($joinColumns['nullable']));
1161 1161
 
1162 1162
                 // If the target class has mapped subclasses, these share the same dependency.
1163 1163
                 if ( ! $targetClass->subClasses) {
@@ -1684,7 +1684,7 @@  discard block
 block discarded – undo
1684 1684
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted");
1685 1685
 
1686 1686
             default:
1687
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
1687
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
1688 1688
         }
1689 1689
 
1690 1690
         $this->cascadePersist($entity, $visited);
@@ -1754,7 +1754,7 @@  discard block
 block discarded – undo
1754 1754
             case self::STATE_DETACHED:
1755 1755
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed");
1756 1756
             default:
1757
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
1757
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
1758 1758
         }
1759 1759
 
1760 1760
     }
@@ -1905,7 +1905,7 @@  discard block
 block discarded – undo
1905 1905
      */
1906 1906
     private function isLoaded($entity)
1907 1907
     {
1908
-        return !($entity instanceof Proxy) || $entity->__isInitialized();
1908
+        return ! ($entity instanceof Proxy) || $entity->__isInitialized();
1909 1909
     }
1910 1910
 
1911 1911
     /**
@@ -2063,7 +2063,7 @@  discard block
 block discarded – undo
2063 2063
 
2064 2064
         $associationMappings = array_filter(
2065 2065
             $class->associationMappings,
2066
-            function ($assoc) { return $assoc['isCascadeRefresh']; }
2066
+            function($assoc) { return $assoc['isCascadeRefresh']; }
2067 2067
         );
2068 2068
 
2069 2069
         foreach ($associationMappings as $assoc) {
@@ -2106,7 +2106,7 @@  discard block
 block discarded – undo
2106 2106
 
2107 2107
         $associationMappings = array_filter(
2108 2108
             $class->associationMappings,
2109
-            function ($assoc) { return $assoc['isCascadeDetach']; }
2109
+            function($assoc) { return $assoc['isCascadeDetach']; }
2110 2110
         );
2111 2111
 
2112 2112
         foreach ($associationMappings as $assoc) {
@@ -2150,7 +2150,7 @@  discard block
 block discarded – undo
2150 2150
 
2151 2151
         $associationMappings = array_filter(
2152 2152
             $class->associationMappings,
2153
-            function ($assoc) { return $assoc['isCascadeMerge']; }
2153
+            function($assoc) { return $assoc['isCascadeMerge']; }
2154 2154
         );
2155 2155
 
2156 2156
         foreach ($associationMappings as $assoc) {
@@ -2189,7 +2189,7 @@  discard block
 block discarded – undo
2189 2189
 
2190 2190
         $associationMappings = array_filter(
2191 2191
             $class->associationMappings,
2192
-            function ($assoc) { return $assoc['isCascadePersist']; }
2192
+            function($assoc) { return $assoc['isCascadePersist']; }
2193 2193
         );
2194 2194
 
2195 2195
         foreach ($associationMappings as $assoc) {
@@ -2218,7 +2218,7 @@  discard block
 block discarded – undo
2218 2218
                     break;
2219 2219
 
2220 2220
                 case ($relatedEntities !== null):
2221
-                    if (! $relatedEntities instanceof $assoc['targetEntity']) {
2221
+                    if ( ! $relatedEntities instanceof $assoc['targetEntity']) {
2222 2222
                         throw ORMInvalidArgumentException::invalidAssociation(
2223 2223
                             $this->em->getClassMetadata($assoc['targetEntity']),
2224 2224
                             $assoc,
@@ -2249,13 +2249,13 @@  discard block
 block discarded – undo
2249 2249
 
2250 2250
         $associationMappings = array_filter(
2251 2251
             $class->associationMappings,
2252
-            function ($assoc) { return $assoc['isCascadeRemove']; }
2252
+            function($assoc) { return $assoc['isCascadeRemove']; }
2253 2253
         );
2254 2254
 
2255 2255
         $entitiesToCascade = array();
2256 2256
 
2257 2257
         foreach ($associationMappings as $assoc) {
2258
-            if ($entity instanceof Proxy && !$entity->__isInitialized__) {
2258
+            if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
2259 2259
                 $entity->__load();
2260 2260
             }
2261 2261
 
@@ -2319,7 +2319,7 @@  discard block
 block discarded – undo
2319 2319
                     return;
2320 2320
                 }
2321 2321
 
2322
-                if ($entity instanceof Proxy && !$entity->__isInitialized__) {
2322
+                if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
2323 2323
                     $entity->__load();
2324 2324
                 }
2325 2325
 
@@ -2334,7 +2334,7 @@  discard block
 block discarded – undo
2334 2334
             case LockMode::NONE === $lockMode:
2335 2335
             case LockMode::PESSIMISTIC_READ === $lockMode:
2336 2336
             case LockMode::PESSIMISTIC_WRITE === $lockMode:
2337
-                if (!$this->em->getConnection()->isTransactionActive()) {
2337
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
2338 2338
                     throw TransactionRequiredException::transactionRequired();
2339 2339
                 }
2340 2340
 
@@ -2668,7 +2668,7 @@  discard block
 block discarded – undo
2668 2668
                             // then we can append this entity for eager loading!
2669 2669
                             if ($hints['fetchMode'][$class->name][$field] == ClassMetadata::FETCH_EAGER &&
2670 2670
                                 isset($hints[self::HINT_DEFEREAGERLOAD]) &&
2671
-                                !$targetClass->isIdentifierComposite &&
2671
+                                ! $targetClass->isIdentifierComposite &&
2672 2672
                                 $newValue instanceof Proxy &&
2673 2673
                                 $newValue->__isInitialized__ === false) {
2674 2674
 
@@ -3035,7 +3035,7 @@  discard block
 block discarded – undo
3035 3035
     public function getCollectionPersister(array $association)
3036 3036
     {
3037 3037
         $role = isset($association['cache'])
3038
-            ? $association['sourceEntity'] . '::' . $association['fieldName']
3038
+            ? $association['sourceEntity'].'::'.$association['fieldName']
3039 3039
             : $association['type'];
3040 3040
 
3041 3041
         if (isset($this->collectionPersisters[$role])) {
@@ -3253,7 +3253,7 @@  discard block
 block discarded – undo
3253 3253
      */
3254 3254
     private function afterTransactionComplete()
3255 3255
     {
3256
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
3256
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
3257 3257
             $persister->afterTransactionComplete();
3258 3258
         });
3259 3259
     }
@@ -3263,7 +3263,7 @@  discard block
 block discarded – undo
3263 3263
      */
3264 3264
     private function afterTransactionRolledBack()
3265 3265
     {
3266
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
3266
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
3267 3267
             $persister->afterTransactionRolledBack();
3268 3268
         });
3269 3269
     }
@@ -3362,7 +3362,7 @@  discard block
 block discarded – undo
3362 3362
                     if ($other === null) {
3363 3363
                         $prop->setValue($managedCopy, null);
3364 3364
                     } else {
3365
-                        if ($other instanceof Proxy && !$other->__isInitialized()) {
3365
+                        if ($other instanceof Proxy && ! $other->__isInitialized()) {
3366 3366
                             // do not merge fields marked lazy that have not been fetched.
3367 3367
                             continue;
3368 3368
                         }
@@ -3449,7 +3449,7 @@  discard block
 block discarded – undo
3449 3449
      */
3450 3450
     private function clearIdentityMapForEntityName($entityName)
3451 3451
     {
3452
-        if (! isset($this->identityMap[$entityName])) {
3452
+        if ( ! isset($this->identityMap[$entityName])) {
3453 3453
             return;
3454 3454
         }
3455 3455
 
Please login to merge, or discard this patch.