Failed Conditions
Pull Request — 2.7 (#8065)
by
unknown
07:44
created
lib/Doctrine/ORM/UnitOfWork.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
         try {
383 383
             // Collection deletions (deletions of complete collections)
384 384
             foreach ($this->collectionDeletions as $collectionToDelete) {
385
-                if (! $collectionToDelete instanceof PersistentCollection) {
385
+                if ( ! $collectionToDelete instanceof PersistentCollection) {
386 386
                     $this->getCollectionPersister($collectionToDelete->getMapping())->delete($collectionToDelete);
387 387
 
388 388
                     continue;
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
         $state = $this->getEntityState($entity);
515 515
 
516 516
         if ($state !== self::STATE_MANAGED && $state !== self::STATE_REMOVED) {
517
-            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation " . self::objToStr($entity));
517
+            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation ".self::objToStr($entity));
518 518
         }
519 519
 
520 520
         $class = $this->em->getClassMetadata(get_class($entity));
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
         $oid  = spl_object_hash($entity);
571 571
         $data = [];
572 572
 
573
-        if (!isset($this->entityChangeSets[$oid])) {
573
+        if ( ! isset($this->entityChangeSets[$oid])) {
574 574
             return $data;
575 575
         }
576 576
 
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
                     if ($owner === null) { // cloned
734 734
                         $actualValue->setOwner($entity, $assoc);
735 735
                     } else if ($owner !== $entity) { // no clone, we have to fix
736
-                        if (!$actualValue->isInitialized()) {
736
+                        if ( ! $actualValue->isInitialized()) {
737 737
                             $actualValue->initialize(); // we have to do this otherwise the cols share state
738 738
                         }
739 739
                         $newValue = clone $actualValue;
@@ -879,7 +879,7 @@  discard block
 block discarded – undo
879 879
         $targetClass    = $this->em->getClassMetadata($assoc['targetEntity']);
880 880
 
881 881
         foreach ($unwrappedValue as $key => $entry) {
882
-            if (! ($entry instanceof $targetClass->name)) {
882
+            if ( ! ($entry instanceof $targetClass->name)) {
883 883
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $assoc, $entry);
884 884
             }
885 885
 
@@ -957,7 +957,7 @@  discard block
 block discarded – undo
957 957
 
958 958
             // Some identifiers may be foreign keys to new entities.
959 959
             // In this case, we don't have the value yet and should treat it as if we have a post-insert generator
960
-            if (! $this->hasMissingIdsWhichAreForeignKeys($class, $idValue)) {
960
+            if ( ! $this->hasMissingIdsWhichAreForeignKeys($class, $idValue)) {
961 961
                 $this->entityIdentifiers[$oid] = $idValue;
962 962
             }
963 963
         }
@@ -1106,7 +1106,7 @@  discard block
 block discarded – undo
1106 1106
             }
1107 1107
         } else {
1108 1108
             foreach ($insertionsForClass as $oid => $entity) {
1109
-                if (! isset($this->entityIdentifiers[$oid])) {
1109
+                if ( ! isset($this->entityIdentifiers[$oid])) {
1110 1110
                     //entity was not added to identity map because some identifiers are foreign keys to new entities.
1111 1111
                     //add it now
1112 1112
                     $this->addToEntityIdentifiersAndEntityMap($class, $oid, $entity);
@@ -1210,7 +1210,7 @@  discard block
 block discarded – undo
1210 1210
             // Entity with this $oid after deletion treated as NEW, even if the $oid
1211 1211
             // is obtained by a new entity because the old one went out of scope.
1212 1212
             //$this->entityStates[$oid] = self::STATE_NEW;
1213
-            if (!$class->isIdentifierNatural() &&
1213
+            if ( ! $class->isIdentifierNatural() &&
1214 1214
                 method_exists($class->reflFields[$class->identifier[0]], 'getType') &&
1215 1215
                 $class->reflFields[$class->identifier[0]]->getType()->allowsNull()) {
1216 1216
                 $class->reflFields[$class->identifier[0]]->setValue($entity, null);
@@ -1273,7 +1273,7 @@  discard block
 block discarded – undo
1273 1273
 
1274 1274
                 $joinColumns = reset($assoc['joinColumns']);
1275 1275
 
1276
-                $calc->addDependency($targetClass->name, $class->name, (int)empty($joinColumns['nullable']));
1276
+                $calc->addDependency($targetClass->name, $class->name, (int) empty($joinColumns['nullable']));
1277 1277
 
1278 1278
                 // If the target class has mapped subclasses, these share the same dependency.
1279 1279
                 if ( ! $targetClass->subClasses) {
@@ -1796,7 +1796,7 @@  discard block
 block discarded – undo
1796 1796
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted");
1797 1797
 
1798 1798
             default:
1799
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
1799
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
1800 1800
         }
1801 1801
 
1802 1802
         $this->cascadePersist($entity, $visited);
@@ -1866,7 +1866,7 @@  discard block
 block discarded – undo
1866 1866
             case self::STATE_DETACHED:
1867 1867
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed");
1868 1868
             default:
1869
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
1869
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
1870 1870
         }
1871 1871
 
1872 1872
     }
@@ -2005,7 +2005,7 @@  discard block
 block discarded – undo
2005 2005
      */
2006 2006
     private function ensureVersionMatch(ClassMetadata $class, $entity, $managedCopy)
2007 2007
     {
2008
-        if (! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
2008
+        if ( ! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
2009 2009
             return;
2010 2010
         }
2011 2011
 
@@ -2030,7 +2030,7 @@  discard block
 block discarded – undo
2030 2030
      */
2031 2031
     private function isLoaded($entity)
2032 2032
     {
2033
-        return !($entity instanceof Proxy) || $entity->__isInitialized();
2033
+        return ! ($entity instanceof Proxy) || $entity->__isInitialized();
2034 2034
     }
2035 2035
 
2036 2036
     /**
@@ -2190,7 +2190,7 @@  discard block
 block discarded – undo
2190 2190
 
2191 2191
         $associationMappings = array_filter(
2192 2192
             $class->associationMappings,
2193
-            function ($assoc) { return $assoc['isCascadeRefresh']; }
2193
+            function($assoc) { return $assoc['isCascadeRefresh']; }
2194 2194
         );
2195 2195
 
2196 2196
         foreach ($associationMappings as $assoc) {
@@ -2233,7 +2233,7 @@  discard block
 block discarded – undo
2233 2233
 
2234 2234
         $associationMappings = array_filter(
2235 2235
             $class->associationMappings,
2236
-            function ($assoc) { return $assoc['isCascadeDetach']; }
2236
+            function($assoc) { return $assoc['isCascadeDetach']; }
2237 2237
         );
2238 2238
 
2239 2239
         foreach ($associationMappings as $assoc) {
@@ -2277,7 +2277,7 @@  discard block
 block discarded – undo
2277 2277
 
2278 2278
         $associationMappings = array_filter(
2279 2279
             $class->associationMappings,
2280
-            function ($assoc) { return $assoc['isCascadeMerge']; }
2280
+            function($assoc) { return $assoc['isCascadeMerge']; }
2281 2281
         );
2282 2282
 
2283 2283
         foreach ($associationMappings as $assoc) {
@@ -2316,7 +2316,7 @@  discard block
 block discarded – undo
2316 2316
 
2317 2317
         $associationMappings = array_filter(
2318 2318
             $class->associationMappings,
2319
-            function ($assoc) { return $assoc['isCascadePersist']; }
2319
+            function($assoc) { return $assoc['isCascadePersist']; }
2320 2320
         );
2321 2321
 
2322 2322
         foreach ($associationMappings as $assoc) {
@@ -2345,7 +2345,7 @@  discard block
 block discarded – undo
2345 2345
                     break;
2346 2346
 
2347 2347
                 case ($relatedEntities !== null):
2348
-                    if (! $relatedEntities instanceof $assoc['targetEntity']) {
2348
+                    if ( ! $relatedEntities instanceof $assoc['targetEntity']) {
2349 2349
                         throw ORMInvalidArgumentException::invalidAssociation(
2350 2350
                             $this->em->getClassMetadata($assoc['targetEntity']),
2351 2351
                             $assoc,
@@ -2376,13 +2376,13 @@  discard block
 block discarded – undo
2376 2376
 
2377 2377
         $associationMappings = array_filter(
2378 2378
             $class->associationMappings,
2379
-            function ($assoc) { return $assoc['isCascadeRemove']; }
2379
+            function($assoc) { return $assoc['isCascadeRemove']; }
2380 2380
         );
2381 2381
 
2382 2382
         $entitiesToCascade = [];
2383 2383
 
2384 2384
         foreach ($associationMappings as $assoc) {
2385
-            if ($entity instanceof Proxy && !$entity->__isInitialized__) {
2385
+            if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
2386 2386
                 $entity->__load();
2387 2387
             }
2388 2388
 
@@ -2446,7 +2446,7 @@  discard block
 block discarded – undo
2446 2446
                     return;
2447 2447
                 }
2448 2448
 
2449
-                if ($entity instanceof Proxy && !$entity->__isInitialized__) {
2449
+                if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
2450 2450
                     $entity->__load();
2451 2451
                 }
2452 2452
 
@@ -2461,7 +2461,7 @@  discard block
 block discarded – undo
2461 2461
             case LockMode::NONE === $lockMode:
2462 2462
             case LockMode::PESSIMISTIC_READ === $lockMode:
2463 2463
             case LockMode::PESSIMISTIC_WRITE === $lockMode:
2464
-                if (!$this->em->getConnection()->isTransactionActive()) {
2464
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
2465 2465
                     throw TransactionRequiredException::transactionRequired();
2466 2466
                 }
2467 2467
 
@@ -2786,7 +2786,7 @@  discard block
 block discarded – undo
2786 2786
                             // then we can append this entity for eager loading!
2787 2787
                             if ($hints['fetchMode'][$class->name][$field] == ClassMetadata::FETCH_EAGER &&
2788 2788
                                 isset($hints[self::HINT_DEFEREAGERLOAD]) &&
2789
-                                !$targetClass->isIdentifierComposite &&
2789
+                                ! $targetClass->isIdentifierComposite &&
2790 2790
                                 $newValue instanceof Proxy &&
2791 2791
                                 $newValue->__isInitialized__ === false) {
2792 2792
 
@@ -3151,7 +3151,7 @@  discard block
 block discarded – undo
3151 3151
     public function getCollectionPersister(array $association)
3152 3152
     {
3153 3153
         $role = isset($association['cache'])
3154
-            ? $association['sourceEntity'] . '::' . $association['fieldName']
3154
+            ? $association['sourceEntity'].'::'.$association['fieldName']
3155 3155
             : $association['type'];
3156 3156
 
3157 3157
         if (isset($this->collectionPersisters[$role])) {
@@ -3369,7 +3369,7 @@  discard block
 block discarded – undo
3369 3369
      */
3370 3370
     private function afterTransactionComplete()
3371 3371
     {
3372
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
3372
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
3373 3373
             $persister->afterTransactionComplete();
3374 3374
         });
3375 3375
     }
@@ -3379,7 +3379,7 @@  discard block
 block discarded – undo
3379 3379
      */
3380 3380
     private function afterTransactionRolledBack()
3381 3381
     {
3382
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
3382
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
3383 3383
             $persister->afterTransactionRolledBack();
3384 3384
         });
3385 3385
     }
@@ -3475,11 +3475,11 @@  discard block
 block discarded – undo
3475 3475
      */
3476 3476
     private function mergeEntityStateIntoManagedCopy($entity, $managedCopy)
3477 3477
     {
3478
-        if (! $this->isLoaded($entity)) {
3478
+        if ( ! $this->isLoaded($entity)) {
3479 3479
             return;
3480 3480
         }
3481 3481
 
3482
-        if (! $this->isLoaded($managedCopy)) {
3482
+        if ( ! $this->isLoaded($managedCopy)) {
3483 3483
             $managedCopy->__load();
3484 3484
         }
3485 3485
 
@@ -3502,7 +3502,7 @@  discard block
 block discarded – undo
3502 3502
                     if ($other === null) {
3503 3503
                         $prop->setValue($managedCopy, null);
3504 3504
                     } else {
3505
-                        if ($other instanceof Proxy && !$other->__isInitialized()) {
3505
+                        if ($other instanceof Proxy && ! $other->__isInitialized()) {
3506 3506
                             // do not merge fields marked lazy that have not been fetched.
3507 3507
                             continue;
3508 3508
                         }
@@ -3589,7 +3589,7 @@  discard block
 block discarded – undo
3589 3589
      */
3590 3590
     private function clearIdentityMapForEntityName($entityName)
3591 3591
     {
3592
-        if (! isset($this->identityMap[$entityName])) {
3592
+        if ( ! isset($this->identityMap[$entityName])) {
3593 3593
             return;
3594 3594
         }
3595 3595
 
Please login to merge, or discard this patch.