Completed
Pull Request — master (#6397)
by Vytautas
09:41
created
lib/Doctrine/ORM/Mapping/AnsiQuoteStrategy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,6 +91,6 @@
 block discarded – undo
91 91
      */
92 92
     public function getColumnAlias($columnName, $counter, AbstractPlatform $platform, ClassMetadata $class = null)
93 93
     {
94
-        return $platform->getSQLResultCasing($columnName . '_' . $counter);
94
+        return $platform->getSQLResultCasing($columnName.'_'.$counter);
95 95
     }
96 96
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
         $this->reverseEngineerMappingFromDatabase();
176 176
 
177 177
         if ( ! isset($this->classToTableNames[$className])) {
178
-            throw new \InvalidArgumentException("Unknown class " . $className);
178
+            throw new \InvalidArgumentException("Unknown class ".$className);
179 179
         }
180 180
 
181 181
         $tableName = $this->classToTableNames[$className];
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 
287 287
             if ( ! $table->hasPrimaryKey()) {
288 288
                 throw new MappingException(
289
-                    "Table " . $table->getName() . " has no primary key. Doctrine does not ".
289
+                    "Table ".$table->getName()." has no primary key. Doctrine does not ".
290 290
                     "support reverse engineering from tables that don't have a primary key."
291 291
                 );
292 292
             }
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
             case Type::STRING:
408 408
             case Type::TEXT:
409 409
                 $fieldMapping['length'] = $column->getLength();
410
-                $fieldMapping['options']['fixed']  = $column->getFixed();
410
+                $fieldMapping['options']['fixed'] = $column->getFixed();
411 411
                 break;
412 412
 
413 413
             case Type::DECIMAL:
@@ -523,10 +523,10 @@  discard block
 block discarded – undo
523 523
     private function getClassNameForTable($tableName)
524 524
     {
525 525
         if (isset($this->classNamesForTables[$tableName])) {
526
-            return $this->namespace . $this->classNamesForTables[$tableName];
526
+            return $this->namespace.$this->classNamesForTables[$tableName];
527 527
         }
528 528
 
529
-        return $this->namespace . Inflector::classify(strtolower($tableName));
529
+        return $this->namespace.Inflector::classify(strtolower($tableName));
530 530
     }
531 531
 
532 532
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/MappingException.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
         $message = "The mapping of field '{$field}' is invalid: The option '{$expectedOption}' is required.";
285 285
 
286 286
         if ( ! empty($hint)) {
287
-            $message .= ' (Hint: ' . $hint . ')';
287
+            $message .= ' (Hint: '.$hint.')';
288 288
         }
289 289
 
290 290
         return new self($message);
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
      */
315 315
     public static function reflectionFailure($entity, \ReflectionException $previousException)
316 316
     {
317
-        return new self('An error occurred in ' . $entity, 0, $previousException);
317
+        return new self('An error occurred in '.$entity, 0, $previousException);
318 318
     }
319 319
 
320 320
     /**
@@ -325,8 +325,8 @@  discard block
 block discarded – undo
325 325
      */
326 326
     public static function joinColumnMustPointToMappedField($className, $joinColumn)
327 327
     {
328
-        return new self('The column ' . $joinColumn . ' must be mapped to a field in class '
329
-            . $className . ' since it is referenced by a join column of another class.');
328
+        return new self('The column '.$joinColumn.' must be mapped to a field in class '
329
+            . $className.' since it is referenced by a join column of another class.');
330 330
     }
331 331
 
332 332
     /**
@@ -446,12 +446,12 @@  discard block
 block discarded – undo
446 446
     public static function fileMappingDriversRequireConfiguredDirectoryPath($path = null)
447 447
     {
448 448
         if ( ! empty($path)) {
449
-            $path = '[' . $path . ']';
449
+            $path = '['.$path.']';
450 450
         }
451 451
 
452 452
         return new self(
453
-            'File mapping drivers must have a valid directory path, ' .
454
-            'however the given path ' . $path . ' seems to be incorrect!'
453
+            'File mapping drivers must have a valid directory path, '.
454
+            'however the given path '.$path.' seems to be incorrect!'
455 455
         );
456 456
     }
457 457
 
@@ -482,11 +482,11 @@  discard block
 block discarded – undo
482 482
     public static function duplicateDiscriminatorEntry($className, array $entries, array $map)
483 483
     {
484 484
         return new self(
485
-            "The entries " . implode(', ', $entries) . " in discriminator map of class '" . $className . "' is duplicated. " .
486
-            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. " .
487
-            "The entries of the current map are: @DiscriminatorMap({" . implode(', ', array_map(
485
+            "The entries ".implode(', ', $entries)." in discriminator map of class '".$className."' is duplicated. ".
486
+            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. ".
487
+            "The entries of the current map are: @DiscriminatorMap({".implode(', ', array_map(
488 488
                 function($a, $b) { return "'$a': '$b'"; }, array_keys($map), array_values($map)
489
-            )) . "})"
489
+            ))."})"
490 490
         );
491 491
     }
492 492
 
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
     public static function illegalOrphanRemoval($className, $field)
634 634
     {
635 635
         return new self("Orphan removal is only allowed on one-to-one and one-to-many ".
636
-            "associations, but " . $className."#" .$field . " is not.");
636
+            "associations, but ".$className."#".$field." is not.");
637 637
     }
638 638
 
639 639
     /**
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
      */
666 666
     public static function noInheritanceOnMappedSuperClass($className)
667 667
     {
668
-        return new self("It is not supported to define inheritance information on a mapped superclass '" . $className . "'.");
668
+        return new self("It is not supported to define inheritance information on a mapped superclass '".$className."'.");
669 669
     }
670 670
 
671 671
     /**
@@ -677,8 +677,8 @@  discard block
 block discarded – undo
677 677
     public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName)
678 678
     {
679 679
         return new self(
680
-            "Entity '" . $className . "' has to be part of the discriminator map of '" . $rootClassName . "' " .
681
-            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class " .
680
+            "Entity '".$className."' has to be part of the discriminator map of '".$rootClassName."' ".
681
+            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class ".
682 682
             "to avoid this exception from occurring."
683 683
         );
684 684
     }
@@ -691,7 +691,7 @@  discard block
 block discarded – undo
691 691
      */
692 692
     public static function lifecycleCallbackMethodNotFound($className, $methodName)
693 693
     {
694
-        return new self("Entity '" . $className . "' has no method '" . $methodName . "' to be registered as lifecycle callback.");
694
+        return new self("Entity '".$className."' has no method '".$methodName."' to be registered as lifecycle callback.");
695 695
     }
696 696
 
697 697
     /**
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
      */
738 738
     public static function invalidFetchMode($className, $annotation)
739 739
     {
740
-        return new self("Entity '" . $className . "' has a mapping with invalid fetch mode '" . $annotation . "'");
740
+        return new self("Entity '".$className."' has a mapping with invalid fetch mode '".$annotation."'");
741 741
     }
742 742
 
743 743
     /**
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
747 747
      */
748 748
     public static function compositeKeyAssignedIdGeneratorRequired($className)
749 749
     {
750
-        return new self("Entity '". $className . "' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
750
+        return new self("Entity '".$className."' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
751 751
     }
752 752
 
753 753
     /**
@@ -759,7 +759,7 @@  discard block
 block discarded – undo
759 759
      */
760 760
     public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $associationName)
761 761
     {
762
-        return new self("The target-entity " . $targetEntity . " cannot be found in '" . $sourceEntity."#".$associationName."'.");
762
+        return new self("The target-entity ".$targetEntity." cannot be found in '".$sourceEntity."#".$associationName."'.");
763 763
     }
764 764
 
765 765
     /**
@@ -771,7 +771,7 @@  discard block
 block discarded – undo
771 771
      */
772 772
     public static function invalidCascadeOption(array $cascades, $className, $propertyName)
773 773
     {
774
-        $cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades));
774
+        $cascades = implode(", ", array_map(function($e) { return "'".$e."'"; }, $cascades));
775 775
 
776 776
         return new self(sprintf(
777 777
             "You have specified invalid cascade options for %s::$%s: %s; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'",
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
     {
804 804
         return new self(
805 805
             sprintf(
806
-                'Infinite nesting detected for embedded property %s::%s. ' .
806
+                'Infinite nesting detected for embedded property %s::%s. '.
807 807
                 'You cannot embed an embeddable from the same type inside an embeddable.',
808 808
                 $className,
809 809
                 $propertyName
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
      */
72 72
     public function joinColumnName($propertyName, $className = null)
73 73
     {
74
-        return $propertyName . '_' . $this->referenceColumnName();
74
+        return $propertyName.'_'.$this->referenceColumnName();
75 75
     }
76 76
 
77 77
     /**
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
      */
80 80
     public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
81 81
     {
82
-        return strtolower($this->classToTableName($sourceEntity) . '_' .
82
+        return strtolower($this->classToTableName($sourceEntity).'_'.
83 83
             $this->classToTableName($targetEntity));
84 84
     }
85 85
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
      */
89 89
     public function joinKeyColumnName($entityName, $referencedColumnName = null)
90 90
     {
91
-        return strtolower($this->classToTableName($entityName) . '_' .
91
+        return strtolower($this->classToTableName($entityName).'_'.
92 92
             ($referencedColumnName ?: $this->referenceColumnName()));
93 93
     }
94 94
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -49,10 +49,10 @@  discard block
 block discarded – undo
49 49
         $tableName = $class->table['name'];
50 50
 
51 51
         if ( ! empty($class->table['schema'])) {
52
-            $tableName = $class->table['schema'] . '.' . $class->table['name'];
52
+            $tableName = $class->table['schema'].'.'.$class->table['name'];
53 53
 
54 54
             if ( ! $platform->supportsSchemas() && $platform->canEmulateSchemas()) {
55
-                $tableName = $class->table['schema'] . '__' . $class->table['name'];
55
+                $tableName = $class->table['schema'].'__'.$class->table['name'];
56 56
             }
57 57
         }
58 58
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         $schema = '';
100 100
 
101 101
         if (isset($association['joinTable']['schema'])) {
102
-            $schema = $association['joinTable']['schema'] . '.';
102
+            $schema = $association['joinTable']['schema'].'.';
103 103
         }
104 104
 
105 105
         $tableName = $association['joinTable']['name'];
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
             $tableName = $platform->quoteIdentifier($tableName);
109 109
         }
110 110
 
111
-        return $schema . $tableName;
111
+        return $schema.$tableName;
112 112
     }
113 113
 
114 114
     /**
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
             // Association defined as Id field
129 129
             $joinColumns            = $class->associationMappings[$fieldName]['joinColumns'];
130 130
             $assocQuotedColumnNames = array_map(
131
-                function ($joinColumn) use ($platform)
131
+                function($joinColumn) use ($platform)
132 132
                 {
133 133
                     return isset($joinColumn['quoted'])
134 134
                         ? $platform->quoteIdentifier($joinColumn['name'])
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
         //     If the alias is to long, characters are cut off from the beginning.
154 154
         // 3 ) Strip non alphanumeric characters
155 155
         // 4 ) Prefix with "_" if the result its numeric
156
-        $columnName = $columnName . '_' . $counter;
156
+        $columnName = $columnName.'_'.$counter;
157 157
         $columnName = substr($columnName, -$platform->getMaxIdentifierLength());
158 158
         $columnName = preg_replace('/[^A-Za-z0-9_]/', '', $columnName);
159
-        $columnName = is_numeric($columnName) ? '_' . $columnName : $columnName;
159
+        $columnName = is_numeric($columnName) ? '_'.$columnName : $columnName;
160 160
 
161 161
         return $platform->getSQLResultCasing($columnName);
162 162
     }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Reflection/ReflectionPropertiesGetter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -155,9 +155,9 @@
 block discarded – undo
155 155
         }
156 156
 
157 157
         if ($property->isProtected()) {
158
-            return "\0*\0" . $propertyName;
158
+            return "\0*\0".$propertyName;
159 159
         }
160 160
 
161
-        return "\0" . $property->getDeclaringClass()->getName() . "\0" . $propertyName;
161
+        return "\0".$property->getDeclaringClass()->getName()."\0".$propertyName;
162 162
     }
163 163
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Builder/FieldBuilder.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -275,7 +275,7 @@
 block discarded – undo
275 275
     {
276 276
         $cm = $this->builder->getClassMetadata();
277 277
         if ($this->generatedValue) {
278
-            $cm->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $this->generatedValue));
278
+            $cm->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'.$this->generatedValue));
279 279
         }
280 280
 
281 281
         if ($this->version) {
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -180,7 +180,7 @@
 block discarded – undo
180 180
      * Sets an option.
181 181
      *
182 182
      * @param string $name
183
-     * @param mixed  $value
183
+     * @param boolean  $value
184 184
      *
185 185
      * @return FieldBuilder
186 186
      */
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
     public function resolve($className)
68 68
     {
69 69
         if (isset($this->instances[$className = trim($className, '\\')])) {
70
-           return $this->instances[$className];
70
+            return $this->instances[$className];
71 71
         }
72 72
 
73 73
         return $this->instances[$className] = new $className();
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Configuration.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -918,7 +918,7 @@
 block discarded – undo
918 918
      * @since 2.5
919 919
      *
920 920
      * @param string $name  The name of the hint.
921
-     * @param mixed  $value The value of the hint.
921
+     * @param string  $value The value of the hint.
922 922
      */
923 923
     public function setDefaultQueryHint($name, $value)
924 924
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@
 block discarded – undo
153 153
      */
154 154
     public function newDefaultAnnotationDriver($paths = [], $useSimpleAnnotationReader = true)
155 155
     {
156
-        AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
156
+        AnnotationRegistry::registerFile(__DIR__.'/Mapping/Driver/DoctrineAnnotations.php');
157 157
 
158 158
         if ($useSimpleAnnotationReader) {
159 159
             // Register the ORM Annotations in the AnnotationRegistry
Please login to merge, or discard this patch.