Completed
Pull Request — master (#6243)
by Jáchym
15:16
created
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
             $cacheAnnot = $classAnnotations[Mapping\Cache::class];
150 150
             $cacheMap   = [
151 151
                 'region' => $cacheAnnot->region,
152
-                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
152
+                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
153 153
             ];
154 154
 
155 155
             $metadata->enableCache($cacheMap);
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
             $inheritanceTypeAnnot = $classAnnotations[Mapping\InheritanceType::class];
238 238
 
239 239
             $metadata->setInheritanceType(
240
-                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value)
240
+                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceTypeAnnot->value)
241 241
             );
242 242
 
243 243
             if ($metadata->inheritanceType != Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
         // Evaluate DoctrineChangeTrackingPolicy annotation
270 270
         if (isset($classAnnotations[Mapping\ChangeTrackingPolicy::class])) {
271 271
             $changeTrackingAnnot = $classAnnotations[Mapping\ChangeTrackingPolicy::class];
272
-            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_' . $changeTrackingAnnot->value));
272
+            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_'.$changeTrackingAnnot->value));
273 273
         }
274 274
 
275 275
         // Evaluate annotations on properties/fields
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
                 $mapping['cache'] = $metadata->getAssociationCacheDefaults(
294 294
                     $mapping['fieldName'],
295 295
                     [
296
-                        'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
296
+                        'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
297 297
                         'region' => $cacheAnnot->region,
298 298
                     ]
299 299
                 );
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
                 }
324 324
 
325 325
                 if ($generatedValueAnnot = $this->reader->getPropertyAnnotation($property, Mapping\GeneratedValue::class)) {
326
-                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $generatedValueAnnot->strategy));
326
+                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'.$generatedValueAnnot->strategy));
327 327
                 }
328 328
 
329 329
                 if ($this->reader->getPropertyAnnotation($property, Mapping\Version::class)) {
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
                 }
512 512
 
513 513
                 // Evaluate the listener using naming convention.
514
-                if ( ! $hasMapping ) {
514
+                if ( ! $hasMapping) {
515 515
                     EntityListenerBuilder::bindEntityListener($metadata, $listenerClassName);
516 516
                 }
517 517
             }
@@ -540,11 +540,11 @@  discard block
 block discarded – undo
540 540
      */
541 541
     private function getFetchMode($className, $fetchMode)
542 542
     {
543
-        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) {
543
+        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode)) {
544 544
             throw MappingException::invalidFetchMode($className, $fetchMode);
545 545
         }
546 546
 
547
-        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode);
547
+        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode);
548 548
     }
549 549
 
550 550
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     public function exportClassMetadata(ClassMetadataInfo $metadata)
42 42
     {
43 43
         $xml = new \SimpleXmlElement("<?xml version=\"1.0\" encoding=\"utf-8\"?><doctrine-mapping ".
44
-            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" " .
44
+            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" ".
45 45
             "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ".
46 46
             "xsi:schemaLocation=\"http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd\" />");
47 47
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
         $trackingPolicy = $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy);
99 99
 
100
-        if ( $trackingPolicy != 'DEFERRED_IMPLICIT') {
100
+        if ($trackingPolicy != 'DEFERRED_IMPLICIT') {
101 101
             $root->addChild('change-tracking-policy', $trackingPolicy);
102 102
         }
103 103
 
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
             }
296 296
 
297 297
             if (count($cascade) === 5) {
298
-                $cascade  = ['cascade-all'];
298
+                $cascade = ['cascade-all'];
299 299
             }
300 300
 
301 301
             if ($cascade) {
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
             }
378 378
         }
379 379
 
380
-        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks)>0) {
380
+        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks) > 0) {
381 381
             $lifecycleCallbacksXml = $root->addChild('lifecycle-callbacks');
382 382
 
383 383
             foreach ($metadata->lifecycleCallbacks as $name => $methods) {
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
     {
427 427
         $sequenceDefinition = $metadata->sequenceGeneratorDefinition;
428 428
 
429
-        if (! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
429
+        if ( ! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
430 430
             return;
431 431
         }
432 432
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/UnitOfWork.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
         $state = $this->getEntityState($entity);
461 461
 
462 462
         if ($state !== self::STATE_MANAGED && $state !== self::STATE_REMOVED) {
463
-            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation " . self::objToStr($entity));
463
+            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation ".self::objToStr($entity));
464 464
         }
465 465
 
466 466
         $class = $this->em->getClassMetadata(get_class($entity));
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
         $oid  = spl_object_hash($entity);
517 517
         $data = [];
518 518
 
519
-        if (!isset($this->entityChangeSets[$oid])) {
519
+        if ( ! isset($this->entityChangeSets[$oid])) {
520 520
             return $data;
521 521
         }
522 522
 
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
                     if ($owner === null) { // cloned
680 680
                         $actualValue->setOwner($entity, $assoc);
681 681
                     } else if ($owner !== $entity) { // no clone, we have to fix
682
-                        if (!$actualValue->isInitialized()) {
682
+                        if ( ! $actualValue->isInitialized()) {
683 683
                             $actualValue->initialize(); // we have to do this otherwise the cols share state
684 684
                         }
685 685
                         $newValue = clone $actualValue;
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
         $targetClass    = $this->em->getClassMetadata($assoc['targetEntity']);
826 826
 
827 827
         foreach ($unwrappedValue as $key => $entry) {
828
-            if (! ($entry instanceof $targetClass->name)) {
828
+            if ( ! ($entry instanceof $targetClass->name)) {
829 829
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $assoc, $entry);
830 830
             }
831 831
 
@@ -1154,7 +1154,7 @@  discard block
 block discarded – undo
1154 1154
 
1155 1155
                 $joinColumns = reset($assoc['joinColumns']);
1156 1156
 
1157
-                $calc->addDependency($targetClass->name, $class->name, (int)empty($joinColumns['nullable']));
1157
+                $calc->addDependency($targetClass->name, $class->name, (int) empty($joinColumns['nullable']));
1158 1158
 
1159 1159
                 // If the target class has mapped subclasses, these share the same dependency.
1160 1160
                 if ( ! $targetClass->subClasses) {
@@ -1677,7 +1677,7 @@  discard block
 block discarded – undo
1677 1677
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted");
1678 1678
 
1679 1679
             default:
1680
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
1680
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
1681 1681
         }
1682 1682
 
1683 1683
         $this->cascadePersist($entity, $visited);
@@ -1747,7 +1747,7 @@  discard block
 block discarded – undo
1747 1747
             case self::STATE_DETACHED:
1748 1748
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed");
1749 1749
             default:
1750
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
1750
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
1751 1751
         }
1752 1752
 
1753 1753
     }
@@ -1886,7 +1886,7 @@  discard block
 block discarded – undo
1886 1886
      */
1887 1887
     private function ensureVersionMatch(ClassMetadata $class, $entity, $managedCopy)
1888 1888
     {
1889
-        if (! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
1889
+        if ( ! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
1890 1890
             return;
1891 1891
         }
1892 1892
 
@@ -1911,7 +1911,7 @@  discard block
 block discarded – undo
1911 1911
      */
1912 1912
     private function isLoaded($entity)
1913 1913
     {
1914
-        return !($entity instanceof Proxy) || $entity->__isInitialized();
1914
+        return ! ($entity instanceof Proxy) || $entity->__isInitialized();
1915 1915
     }
1916 1916
 
1917 1917
     /**
@@ -2069,7 +2069,7 @@  discard block
 block discarded – undo
2069 2069
 
2070 2070
         $associationMappings = array_filter(
2071 2071
             $class->associationMappings,
2072
-            function ($assoc) { return $assoc['isCascadeRefresh']; }
2072
+            function($assoc) { return $assoc['isCascadeRefresh']; }
2073 2073
         );
2074 2074
 
2075 2075
         foreach ($associationMappings as $assoc) {
@@ -2112,7 +2112,7 @@  discard block
 block discarded – undo
2112 2112
 
2113 2113
         $associationMappings = array_filter(
2114 2114
             $class->associationMappings,
2115
-            function ($assoc) { return $assoc['isCascadeDetach']; }
2115
+            function($assoc) { return $assoc['isCascadeDetach']; }
2116 2116
         );
2117 2117
 
2118 2118
         foreach ($associationMappings as $assoc) {
@@ -2156,7 +2156,7 @@  discard block
 block discarded – undo
2156 2156
 
2157 2157
         $associationMappings = array_filter(
2158 2158
             $class->associationMappings,
2159
-            function ($assoc) { return $assoc['isCascadeMerge']; }
2159
+            function($assoc) { return $assoc['isCascadeMerge']; }
2160 2160
         );
2161 2161
 
2162 2162
         foreach ($associationMappings as $assoc) {
@@ -2195,7 +2195,7 @@  discard block
 block discarded – undo
2195 2195
 
2196 2196
         $associationMappings = array_filter(
2197 2197
             $class->associationMappings,
2198
-            function ($assoc) { return $assoc['isCascadePersist']; }
2198
+            function($assoc) { return $assoc['isCascadePersist']; }
2199 2199
         );
2200 2200
 
2201 2201
         foreach ($associationMappings as $assoc) {
@@ -2224,7 +2224,7 @@  discard block
 block discarded – undo
2224 2224
                     break;
2225 2225
 
2226 2226
                 case ($relatedEntities !== null):
2227
-                    if (! $relatedEntities instanceof $assoc['targetEntity']) {
2227
+                    if ( ! $relatedEntities instanceof $assoc['targetEntity']) {
2228 2228
                         throw ORMInvalidArgumentException::invalidAssociation(
2229 2229
                             $this->em->getClassMetadata($assoc['targetEntity']),
2230 2230
                             $assoc,
@@ -2255,13 +2255,13 @@  discard block
 block discarded – undo
2255 2255
 
2256 2256
         $associationMappings = array_filter(
2257 2257
             $class->associationMappings,
2258
-            function ($assoc) { return $assoc['isCascadeRemove']; }
2258
+            function($assoc) { return $assoc['isCascadeRemove']; }
2259 2259
         );
2260 2260
 
2261 2261
         $entitiesToCascade = [];
2262 2262
 
2263 2263
         foreach ($associationMappings as $assoc) {
2264
-            if ($entity instanceof Proxy && !$entity->__isInitialized__) {
2264
+            if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
2265 2265
                 $entity->__load();
2266 2266
             }
2267 2267
 
@@ -2325,7 +2325,7 @@  discard block
 block discarded – undo
2325 2325
                     return;
2326 2326
                 }
2327 2327
 
2328
-                if ($entity instanceof Proxy && !$entity->__isInitialized__) {
2328
+                if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
2329 2329
                     $entity->__load();
2330 2330
                 }
2331 2331
 
@@ -2340,7 +2340,7 @@  discard block
 block discarded – undo
2340 2340
             case LockMode::NONE === $lockMode:
2341 2341
             case LockMode::PESSIMISTIC_READ === $lockMode:
2342 2342
             case LockMode::PESSIMISTIC_WRITE === $lockMode:
2343
-                if (!$this->em->getConnection()->isTransactionActive()) {
2343
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
2344 2344
                     throw TransactionRequiredException::transactionRequired();
2345 2345
                 }
2346 2346
 
@@ -2676,7 +2676,7 @@  discard block
 block discarded – undo
2676 2676
                             // then we can append this entity for eager loading!
2677 2677
                             if ($hints['fetchMode'][$class->name][$field] == ClassMetadata::FETCH_EAGER &&
2678 2678
                                 isset($hints[self::HINT_DEFEREAGERLOAD]) &&
2679
-                                !$targetClass->isIdentifierComposite &&
2679
+                                ! $targetClass->isIdentifierComposite &&
2680 2680
                                 $newValue instanceof Proxy &&
2681 2681
                                 $newValue->__isInitialized__ === false) {
2682 2682
 
@@ -3043,7 +3043,7 @@  discard block
 block discarded – undo
3043 3043
     public function getCollectionPersister(array $association)
3044 3044
     {
3045 3045
         $role = isset($association['cache'])
3046
-            ? $association['sourceEntity'] . '::' . $association['fieldName']
3046
+            ? $association['sourceEntity'].'::'.$association['fieldName']
3047 3047
             : $association['type'];
3048 3048
 
3049 3049
         if (isset($this->collectionPersisters[$role])) {
@@ -3261,7 +3261,7 @@  discard block
 block discarded – undo
3261 3261
      */
3262 3262
     private function afterTransactionComplete()
3263 3263
     {
3264
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
3264
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
3265 3265
             $persister->afterTransactionComplete();
3266 3266
         });
3267 3267
     }
@@ -3271,7 +3271,7 @@  discard block
 block discarded – undo
3271 3271
      */
3272 3272
     private function afterTransactionRolledBack()
3273 3273
     {
3274
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
3274
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
3275 3275
             $persister->afterTransactionRolledBack();
3276 3276
         });
3277 3277
     }
@@ -3351,11 +3351,11 @@  discard block
 block discarded – undo
3351 3351
      */
3352 3352
     private function mergeEntityStateIntoManagedCopy($entity, $managedCopy)
3353 3353
     {
3354
-        if (! $this->isLoaded($entity)) {
3354
+        if ( ! $this->isLoaded($entity)) {
3355 3355
             return;
3356 3356
         }
3357 3357
 
3358
-        if (! $this->isLoaded($managedCopy)) {
3358
+        if ( ! $this->isLoaded($managedCopy)) {
3359 3359
             $managedCopy->__load();
3360 3360
         }
3361 3361
 
@@ -3378,7 +3378,7 @@  discard block
 block discarded – undo
3378 3378
                     if ($other === null) {
3379 3379
                         $prop->setValue($managedCopy, null);
3380 3380
                     } else {
3381
-                        if ($other instanceof Proxy && !$other->__isInitialized()) {
3381
+                        if ($other instanceof Proxy && ! $other->__isInitialized()) {
3382 3382
                             // do not merge fields marked lazy that have not been fetched.
3383 3383
                             continue;
3384 3384
                         }
@@ -3465,7 +3465,7 @@  discard block
 block discarded – undo
3465 3465
      */
3466 3466
     private function clearIdentityMapForEntityName($entityName)
3467 3467
     {
3468
-        if (! isset($this->identityMap[$entityName])) {
3468
+        if ( ! isset($this->identityMap[$entityName])) {
3469 3469
             return;
3470 3470
         }
3471 3471
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/DefaultCacheFactory.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -212,12 +212,12 @@  discard block
 block discarded – undo
212 212
 
213 213
             if ( ! $this->fileLockRegionDirectory) {
214 214
                 throw new \LogicException(
215
-                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, ' .
215
+                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, '.
216 216
                     'The default implementation provided by doctrine is "Doctrine\ORM\Cache\Region\FileLockRegion" if you want to use it please provide a valid directory, DefaultCacheFactory#setFileLockRegionDirectory(). '
217 217
                 );
218 218
             }
219 219
 
220
-            $directory = $this->fileLockRegionDirectory . DIRECTORY_SEPARATOR . $cache['region'];
220
+            $directory = $this->fileLockRegionDirectory.DIRECTORY_SEPARATOR.$cache['region'];
221 221
             $region    = new FileLockRegion($region, $directory, $this->regionsConfig->getLockLifetime($cache['region']));
222 222
         }
223 223
 
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
     {
234 234
         $cacheAdapter = clone $this->cache;
235 235
 
236
-        if (!$cacheAdapter instanceof CacheProvider) {
236
+        if ( ! $cacheAdapter instanceof CacheProvider) {
237 237
             return $cacheAdapter;
238 238
         }
239 239
 
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
             $namespace .= ':';
244 244
         }
245 245
 
246
-        $cacheAdapter->setNamespace($namespace . $name);
246
+        $cacheAdapter->setNamespace($namespace.$name);
247 247
 
248 248
         return $cacheAdapter;
249 249
     }
Please login to merge, or discard this patch.