Completed
Pull Request — master (#5938)
by Maximilian
08:52
created
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 
158 158
         if (isset($xmlRoot['inheritance-type'])) {
159 159
             $inheritanceType = (string) $xmlRoot['inheritance-type'];
160
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceType));
160
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceType));
161 161
 
162 162
             if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
163 163
                 // Evaluate <discriminator-column...>
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
                 }
355 355
 
356 356
                 if (isset($oneToOneElement['fetch'])) {
357
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $oneToOneElement['fetch']);
357
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $oneToOneElement['fetch']);
358 358
                 }
359 359
 
360 360
                 if (isset($oneToOneElement['mapped-by'])) {
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
                 );
404 404
 
405 405
                 if (isset($oneToManyElement['fetch'])) {
406
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $oneToManyElement['fetch']);
406
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $oneToManyElement['fetch']);
407 407
                 }
408 408
 
409 409
                 if (isset($oneToManyElement->cascade)) {
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
                 }
451 451
 
452 452
                 if (isset($manyToOneElement['fetch'])) {
453
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $manyToOneElement['fetch']);
453
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $manyToOneElement['fetch']);
454 454
                 }
455 455
 
456 456
                 if (isset($manyToOneElement['inversed-by'])) {
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
                 );
493 493
 
494 494
                 if (isset($manyToManyElement['fetch'])) {
495
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $manyToManyElement['fetch']);
495
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $manyToManyElement['fetch']);
496 496
                 }
497 497
 
498 498
                 if (isset($manyToManyElement['orphan-removal'])) {
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
 
613 613
                 // Check for `fetch`
614 614
                 if (isset($overrideElement['fetch'])) {
615
-                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $overrideElement['fetch']);
615
+                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $overrideElement['fetch']);
616 616
                 }
617 617
 
618 618
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
         // Evaluate <lifecycle-callbacks...>
623 623
         if (isset($xmlRoot->{'lifecycle-callbacks'})) {
624 624
             foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
625
-                $metadata->addLifecycleCallback((string) $lifecycleCallback['method'], constant('Doctrine\ORM\Events::' . (string) $lifecycleCallback['type']));
625
+                $metadata->addLifecycleCallback((string) $lifecycleCallback['method'], constant('Doctrine\ORM\Events::'.(string) $lifecycleCallback['type']));
626 626
             }
627 627
         }
628 628
 
@@ -780,12 +780,12 @@  discard block
 block discarded – undo
780 780
         $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null;
781 781
         $usage  = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null;
782 782
 
783
-        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) {
783
+        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) {
784 784
             throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage));
785 785
         }
786 786
 
787 787
         if ($usage) {
788
-            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage);
788
+            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage);
789 789
         }
790 790
 
791 791
         return array(
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
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
             $cacheAnnot = $classAnnotations['Doctrine\ORM\Mapping\Cache'];
151 151
             $cacheMap   = array(
152 152
                 'region' => $cacheAnnot->region,
153
-                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
153
+                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
154 154
             );
155 155
 
156 156
             $metadata->enableCache($cacheMap);
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
             $inheritanceTypeAnnot = $classAnnotations['Doctrine\ORM\Mapping\InheritanceType'];
233 233
 
234 234
             $metadata->setInheritanceType(
235
-                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value)
235
+                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceTypeAnnot->value)
236 236
             );
237 237
 
238 238
             if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
         // Evaluate DoctrineChangeTrackingPolicy annotation
263 263
         if (isset($classAnnotations['Doctrine\ORM\Mapping\ChangeTrackingPolicy'])) {
264 264
             $changeTrackingAnnot = $classAnnotations['Doctrine\ORM\Mapping\ChangeTrackingPolicy'];
265
-            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_' . $changeTrackingAnnot->value));
265
+            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_'.$changeTrackingAnnot->value));
266 266
         }
267 267
 
268 268
         // Evaluate annotations on properties/fields
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
             // Evaluate @Cache annotation
285 285
             if (($cacheAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Cache')) !== null) {
286 286
                 $mapping['cache'] = $metadata->getAssociationCacheDefaults($mapping['fieldName'], array(
287
-                        'usage'         => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
287
+                        'usage'         => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
288 288
                         'region'        => $cacheAnnot->region,
289 289
                 ));
290 290
             }
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
                 }
314 314
 
315 315
                 if ($generatedValueAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\GeneratedValue')) {
316
-                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $generatedValueAnnot->strategy));
316
+                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'.$generatedValueAnnot->strategy));
317 317
                 }
318 318
 
319 319
                 if ($this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Version')) {
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
 
459 459
                 // Check for `fetch`
460 460
                 if ($associationOverride->fetch) {
461
-                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverride->fetch);
461
+                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$associationOverride->fetch);
462 462
                 }
463 463
 
464 464
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
                 }
503 503
 
504 504
                 // Evaluate the listener using naming convention.
505
-                if ( ! $hasMapping ) {
505
+                if ( ! $hasMapping) {
506 506
                     EntityListenerBuilder::bindEntityListener($metadata, $listenerClassName);
507 507
                 }
508 508
             }
@@ -531,11 +531,11 @@  discard block
 block discarded – undo
531 531
      */
532 532
     private function getFetchMode($className, $fetchMode)
533 533
     {
534
-        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) {
534
+        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode)) {
535 535
             throw MappingException::invalidFetchMode($className, $fetchMode);
536 536
         }
537 537
 
538
-        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode);
538
+        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode);
539 539
     }
540 540
 
541 541
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php 1 patch
Spacing   +13 added lines, -13 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(array(
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         // Evaluate sql result set mappings
124 124
         if (isset($element['sqlResultSetMappings'])) {
125 125
             foreach ($element['sqlResultSetMappings'] as $name => $resultSetMapping) {
126
-                if (!isset($resultSetMapping['name'])) {
126
+                if ( ! isset($resultSetMapping['name'])) {
127 127
                     $resultSetMapping['name'] = $name;
128 128
                 }
129 129
 
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         }
169 169
 
170 170
         if (isset($element['inheritanceType'])) {
171
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));
171
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.strtoupper($element['inheritanceType'])));
172 172
 
173 173
             if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
174 174
                 // Evaluate discriminatorColumn
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
                 }
354 354
 
355 355
                 if (isset($oneToOneElement['fetch'])) {
356
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToOneElement['fetch']);
356
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToOneElement['fetch']);
357 357
                 }
358 358
 
359 359
                 if (isset($oneToOneElement['mappedBy'])) {
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
                 );
408 408
 
409 409
                 if (isset($oneToManyElement['fetch'])) {
410
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyElement['fetch']);
410
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToManyElement['fetch']);
411 411
                 }
412 412
 
413 413
                 if (isset($oneToManyElement['cascade'])) {
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
                 }
450 450
 
451 451
                 if (isset($manyToOneElement['fetch'])) {
452
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToOneElement['fetch']);
452
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToOneElement['fetch']);
453 453
                 }
454 454
 
455 455
                 if (isset($manyToOneElement['inversedBy'])) {
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
                 );
495 495
 
496 496
                 if (isset($manyToManyElement['fetch'])) {
497
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToManyElement['fetch']);
497
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToManyElement['fetch']);
498 498
                 }
499 499
 
500 500
                 if (isset($manyToManyElement['mappedBy'])) {
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
         if (isset($element['associationOverride']) && is_array($element['associationOverride'])) {
565 565
 
566 566
             foreach ($element['associationOverride'] as $fieldName => $associationOverrideElement) {
567
-                $override   = array();
567
+                $override = array();
568 568
 
569 569
                 // Check for joinColumn
570 570
                 if (isset($associationOverrideElement['joinColumn'])) {
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
                 if (isset($associationOverrideElement['joinTable'])) {
583 583
 
584 584
                     $joinTableElement   = $associationOverrideElement['joinTable'];
585
-                    $joinTable          =  array(
585
+                    $joinTable          = array(
586 586
                         'name' => $joinTableElement['name']
587 587
                     );
588 588
 
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
 
617 617
                 // Check for `fetch`
618 618
                 if (isset($associationOverrideElement['fetch'])) {
619
-                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverrideElement['fetch']);
619
+                    $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$associationOverrideElement['fetch']);
620 620
                 }
621 621
 
622 622
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
         if (isset($element['lifecycleCallbacks'])) {
637 637
             foreach ($element['lifecycleCallbacks'] as $type => $methods) {
638 638
                 foreach ($methods as $method) {
639
-                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::' . $type));
639
+                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::'.$type));
640 640
                 }
641 641
             }
642 642
         }
@@ -778,12 +778,12 @@  discard block
 block discarded – undo
778 778
         $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null;
779 779
         $usage  = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null;
780 780
 
781
-        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) {
781
+        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) {
782 782
             throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage));
783 783
         }
784 784
 
785 785
         if ($usage) {
786
-            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage);
786
+            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage);
787 787
         }
788 788
 
789 789
         return array(
Please login to merge, or discard this patch.