Completed
Pull Request — master (#5938)
by Maximilian
62:25
created
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 
164 164
         if (isset($xmlRoot['inheritance-type'])) {
165 165
             $inheritanceType = (string) $xmlRoot['inheritance-type'];
166
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceType));
166
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceType));
167 167
 
168 168
             if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
169 169
                 // Evaluate <discriminator-column...>
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
                 }
366 366
 
367 367
                 if (isset($oneToOneElement['fetch'])) {
368
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $oneToOneElement['fetch']);
368
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $oneToOneElement['fetch']);
369 369
                 }
370 370
 
371 371
                 if (isset($oneToOneElement['mapped-by'])) {
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
                 ];
415 415
 
416 416
                 if (isset($oneToManyElement['fetch'])) {
417
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $oneToManyElement['fetch']);
417
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $oneToManyElement['fetch']);
418 418
                 }
419 419
 
420 420
                 if (isset($oneToManyElement->cascade)) {
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
                 }
462 462
 
463 463
                 if (isset($manyToOneElement['fetch'])) {
464
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $manyToOneElement['fetch']);
464
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $manyToOneElement['fetch']);
465 465
                 }
466 466
 
467 467
                 if (isset($manyToOneElement['inversed-by'])) {
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
                 ];
504 504
 
505 505
                 if (isset($manyToManyElement['fetch'])) {
506
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $manyToManyElement['fetch']);
506
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $manyToManyElement['fetch']);
507 507
                 }
508 508
 
509 509
                 if (isset($manyToManyElement['orphan-removal'])) {
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 
624 624
                 // Check for `fetch`
625 625
                 if (isset($overrideElement['fetch'])) {
626
-                    $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . (string) $overrideElement['fetch']);
626
+                    $override['fetch'] = constant(ClassMetadata::class.'::FETCH_'.(string) $overrideElement['fetch']);
627 627
                 }
628 628
 
629 629
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
         // Evaluate <lifecycle-callbacks...>
634 634
         if (isset($xmlRoot->{'lifecycle-callbacks'})) {
635 635
             foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
636
-                $metadata->addLifecycleCallback((string) $lifecycleCallback['method'], constant('Doctrine\ORM\Events::' . (string) $lifecycleCallback['type']));
636
+                $metadata->addLifecycleCallback((string) $lifecycleCallback['method'], constant('Doctrine\ORM\Events::'.(string) $lifecycleCallback['type']));
637 637
             }
638 638
         }
639 639
 
@@ -794,12 +794,12 @@  discard block
 block discarded – undo
794 794
         $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null;
795 795
         $usage  = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null;
796 796
 
797
-        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) {
797
+        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) {
798 798
             throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage));
799 799
         }
800 800
 
801 801
         if ($usage) {
802
-            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage);
802
+            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage);
803 803
         }
804 804
 
805 805
         return [
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         // Evaluate named native queries
109 109
         if (isset($element['namedNativeQueries'])) {
110 110
             foreach ($element['namedNativeQueries'] as $name => $mappingElement) {
111
-                if (!isset($mappingElement['name'])) {
111
+                if ( ! isset($mappingElement['name'])) {
112 112
                     $mappingElement['name'] = $name;
113 113
                 }
114 114
                 $metadata->addNamedNativeQuery(
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
         // Evaluate sql result set mappings
126 126
         if (isset($element['sqlResultSetMappings'])) {
127 127
             foreach ($element['sqlResultSetMappings'] as $name => $resultSetMapping) {
128
-                if (!isset($resultSetMapping['name'])) {
128
+                if ( ! isset($resultSetMapping['name'])) {
129 129
                     $resultSetMapping['name'] = $name;
130 130
                 }
131 131
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
         }
173 173
 
174 174
         if (isset($element['inheritanceType'])) {
175
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));
175
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.strtoupper($element['inheritanceType'])));
176 176
 
177 177
             if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
178 178
                 // Evaluate discriminatorColumn
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
                 }
362 362
 
363 363
                 if (isset($oneToOneElement['fetch'])) {
364
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToOneElement['fetch']);
364
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToOneElement['fetch']);
365 365
                 }
366 366
 
367 367
                 if (isset($oneToOneElement['mappedBy'])) {
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
                 ];
416 416
 
417 417
                 if (isset($oneToManyElement['fetch'])) {
418
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyElement['fetch']);
418
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToManyElement['fetch']);
419 419
                 }
420 420
 
421 421
                 if (isset($oneToManyElement['cascade'])) {
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
                 }
458 458
 
459 459
                 if (isset($manyToOneElement['fetch'])) {
460
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToOneElement['fetch']);
460
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToOneElement['fetch']);
461 461
                 }
462 462
 
463 463
                 if (isset($manyToOneElement['inversedBy'])) {
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
                 ];
503 503
 
504 504
                 if (isset($manyToManyElement['fetch'])) {
505
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToManyElement['fetch']);
505
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToManyElement['fetch']);
506 506
                 }
507 507
 
508 508
                 if (isset($manyToManyElement['mappedBy'])) {
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
         if (isset($element['associationOverride']) && is_array($element['associationOverride'])) {
573 573
 
574 574
             foreach ($element['associationOverride'] as $fieldName => $associationOverrideElement) {
575
-                $override   = [];
575
+                $override = [];
576 576
 
577 577
                 // Check for joinColumn
578 578
                 if (isset($associationOverrideElement['joinColumn'])) {
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
                 if (isset($associationOverrideElement['joinTable'])) {
591 591
 
592 592
                     $joinTableElement   = $associationOverrideElement['joinTable'];
593
-                    $joinTable          =  [
593
+                    $joinTable          = [
594 594
                         'name' => $joinTableElement['name']
595 595
                     ];
596 596
 
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
 
625 625
                 // Check for `fetch`
626 626
                 if (isset($associationOverrideElement['fetch'])) {
627
-                    $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . $associationOverrideElement['fetch']);
627
+                    $override['fetch'] = constant(ClassMetadata::class.'::FETCH_'.$associationOverrideElement['fetch']);
628 628
                 }
629 629
 
630 630
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
         if (isset($element['lifecycleCallbacks'])) {
645 645
             foreach ($element['lifecycleCallbacks'] as $type => $methods) {
646 646
                 foreach ($methods as $method) {
647
-                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::' . $type));
647
+                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::'.$type));
648 648
                 }
649 649
             }
650 650
         }
@@ -786,12 +786,12 @@  discard block
 block discarded – undo
786 786
         $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null;
787 787
         $usage  = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null;
788 788
 
789
-        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) {
789
+        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) {
790 790
             throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage));
791 791
         }
792 792
 
793 793
         if ($usage) {
794
-            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage);
794
+            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage);
795 795
         }
796 796
 
797 797
         return [
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
805 805
      */
806 806
     protected function loadMappingFile($file)
807 807
     {
808
-        if (defined(Yaml::class . '::PARSE_KEYS_AS_STRINGS')) {
808
+        if (defined(Yaml::class.'::PARSE_KEYS_AS_STRINGS')) {
809 809
             return Yaml::parse(file_get_contents($file), Yaml::PARSE_KEYS_AS_STRINGS);
810 810
         }
811 811
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php 1 patch
Spacing   +9 added lines, -9 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)) {
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
 
473 473
                 // Check for `fetch`
474 474
                 if ($associationOverride->fetch) {
475
-                    $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . $associationOverride->fetch);
475
+                    $override['fetch'] = constant(ClassMetadata::class.'::FETCH_'.$associationOverride->fetch);
476 476
                 }
477 477
 
478 478
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
                 }
517 517
 
518 518
                 // Evaluate the listener using naming convention.
519
-                if ( ! $hasMapping ) {
519
+                if ( ! $hasMapping) {
520 520
                     EntityListenerBuilder::bindEntityListener($metadata, $listenerClassName);
521 521
                 }
522 522
             }
@@ -545,11 +545,11 @@  discard block
 block discarded – undo
545 545
      */
546 546
     private function getFetchMode($className, $fetchMode)
547 547
     {
548
-        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) {
548
+        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode)) {
549 549
             throw MappingException::invalidFetchMode($className, $fetchMode);
550 550
         }
551 551
 
552
-        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode);
552
+        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode);
553 553
     }
554 554
 
555 555
     /**
Please login to merge, or discard this patch.