Completed
Push — master ( 243771...6e6be3 )
by Marco
10:49
created
lib/Doctrine/ORM/Tools/EntityGenerator.php 1 patch
Spacing   +140 added lines, -140 removed lines patch added patch discarded remove patch
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
      */
366 366
     public function writeEntityClass(ClassMetadataInfo $metadata, $outputDirectory)
367 367
     {
368
-        $path = $outputDirectory . '/' . str_replace('\\', DIRECTORY_SEPARATOR, $metadata->name) . $this->extension;
368
+        $path = $outputDirectory.'/'.str_replace('\\', DIRECTORY_SEPARATOR, $metadata->name).$this->extension;
369 369
         $dir = dirname($path);
370 370
 
371 371
         if ( ! is_dir($dir)) {
@@ -381,8 +381,8 @@  discard block
 block discarded – undo
381 381
         }
382 382
 
383 383
         if ($this->backupExisting && file_exists($path)) {
384
-            $backupPath = dirname($path) . DIRECTORY_SEPARATOR . basename($path) . "~";
385
-            if (!copy($path, $backupPath)) {
384
+            $backupPath = dirname($path).DIRECTORY_SEPARATOR.basename($path)."~";
385
+            if ( ! copy($path, $backupPath)) {
386 386
                 throw new \RuntimeException("Attempt to backup overwritten entity file but copy operation failed.");
387 387
             }
388 388
         }
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
         $body = str_replace('<spaces>', $this->spaces, $body);
444 444
         $last = strrpos($currentCode, '}');
445 445
 
446
-        return substr($currentCode, 0, $last) . $body . ($body ? "\n" : '') . "}\n";
446
+        return substr($currentCode, 0, $last).$body.($body ? "\n" : '')."}\n";
447 447
     }
448 448
 
449 449
     /**
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
     public function setFieldVisibility($visibility)
508 508
     {
509 509
         if ($visibility !== static::FIELD_VISIBLE_PRIVATE && $visibility !== static::FIELD_VISIBLE_PROTECTED) {
510
-            throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): ' . $visibility);
510
+            throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): '.$visibility);
511 511
         }
512 512
 
513 513
         $this->fieldVisibility = $visibility;
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
     protected function generateEntityNamespace(ClassMetadataInfo $metadata)
606 606
     {
607 607
         if ($this->hasNamespace($metadata)) {
608
-            return 'namespace ' . $this->getNamespace($metadata) .';';
608
+            return 'namespace '.$this->getNamespace($metadata).';';
609 609
         }
610 610
     }
611 611
 
@@ -625,8 +625,8 @@  discard block
 block discarded – undo
625 625
      */
626 626
     protected function generateEntityClassName(ClassMetadataInfo $metadata)
627 627
     {
628
-        return 'class ' . $this->getClassName($metadata) .
629
-            ($this->extendsClass() ? ' extends ' . $this->getClassToExtendName() : null);
628
+        return 'class '.$this->getClassName($metadata).
629
+            ($this->extendsClass() ? ' extends '.$this->getClassToExtendName() : null);
630 630
     }
631 631
 
632 632
     /**
@@ -728,13 +728,13 @@  discard block
 block discarded – undo
728 728
         $fieldMappings = array_merge($requiredFields, $optionalFields);
729 729
 
730 730
         foreach ($metadata->embeddedClasses as $fieldName => $embeddedClass) {
731
-            $paramType = '\\' . ltrim($embeddedClass['class'], '\\');
732
-            $paramVariable = '$' . $fieldName;
731
+            $paramType = '\\'.ltrim($embeddedClass['class'], '\\');
732
+            $paramVariable = '$'.$fieldName;
733 733
 
734 734
             $paramTypes[] = $paramType;
735 735
             $paramVariables[] = $paramVariable;
736
-            $params[] = $paramType . ' ' . $paramVariable;
737
-            $fields[] = '$this->' . $fieldName . ' = ' . $paramVariable . ';';
736
+            $params[] = $paramType.' '.$paramVariable;
737
+            $fields[] = '$this->'.$fieldName.' = '.$paramVariable.';';
738 738
         }
739 739
 
740 740
         foreach ($fieldMappings as $fieldMapping) {
@@ -744,27 +744,27 @@  discard block
 block discarded – undo
744 744
                 continue;
745 745
             }
746 746
 
747
-            $paramTypes[] = $this->getType($fieldMapping['type']) . (!empty($fieldMapping['nullable']) ? '|null' : '');
748
-            $param = '$' . $fieldMapping['fieldName'];
747
+            $paramTypes[] = $this->getType($fieldMapping['type']).( ! empty($fieldMapping['nullable']) ? '|null' : '');
748
+            $param = '$'.$fieldMapping['fieldName'];
749 749
             $paramVariables[] = $param;
750 750
 
751 751
             if ($fieldMapping['type'] === 'datetime') {
752
-                $param = $this->getType($fieldMapping['type']) . ' ' . $param;
752
+                $param = $this->getType($fieldMapping['type']).' '.$param;
753 753
             }
754 754
 
755
-            if (!empty($fieldMapping['nullable'])) {
755
+            if ( ! empty($fieldMapping['nullable'])) {
756 756
                 $param .= ' = null';
757 757
             }
758 758
 
759 759
             $params[] = $param;
760 760
 
761
-            $fields[] = '$this->' . $fieldMapping['fieldName'] . ' = $' . $fieldMapping['fieldName'] . ';';
761
+            $fields[] = '$this->'.$fieldMapping['fieldName'].' = $'.$fieldMapping['fieldName'].';';
762 762
         }
763 763
 
764 764
         $maxParamTypeLength = max(array_map('strlen', $paramTypes));
765 765
         $paramTags = array_map(
766
-            function ($type, $variable) use ($maxParamTypeLength) {
767
-                return '@param ' . $type . str_repeat(' ', $maxParamTypeLength - strlen($type) + 1) . $variable;
766
+            function($type, $variable) use ($maxParamTypeLength) {
767
+                return '@param '.$type.str_repeat(' ', $maxParamTypeLength - strlen($type) + 1).$variable;
768 768
             },
769 769
             $paramTypes,
770 770
             $paramVariables
@@ -772,8 +772,8 @@  discard block
 block discarded – undo
772 772
 
773 773
         // Generate multi line constructor if the signature exceeds 120 characters.
774 774
         if (array_sum(array_map('strlen', $params)) + count($params) * 2 + 29 > 120) {
775
-            $delimiter = "\n" . $this->spaces;
776
-            $params = $delimiter . implode(',' . $delimiter, $params) . "\n";
775
+            $delimiter = "\n".$this->spaces;
776
+            $params = $delimiter.implode(','.$delimiter, $params)."\n";
777 777
         } else {
778 778
             $params = implode(', ', $params);
779 779
         }
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
         $replacements = [
782 782
             '<paramTags>' => implode("\n * ", $paramTags),
783 783
             '<params>'    => $params,
784
-            '<fields>'    => implode("\n" . $this->spaces, $fields),
784
+            '<fields>'    => implode("\n".$this->spaces, $fields),
785 785
         ];
786 786
 
787 787
         $constructor = str_replace(
@@ -826,7 +826,7 @@  discard block
 block discarded – undo
826 826
 
827 827
             if ($inClass) {
828 828
                 $inClass = false;
829
-                $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1];
829
+                $lastSeenClass = $lastSeenNamespace.($lastSeenNamespace ? '\\' : '').$token[1];
830 830
                 $this->staticReflection[$lastSeenClass]['properties'] = [];
831 831
                 $this->staticReflection[$lastSeenClass]['methods'] = [];
832 832
             }
@@ -834,16 +834,16 @@  discard block
 block discarded – undo
834 834
             if (T_NAMESPACE === $token[0]) {
835 835
                 $lastSeenNamespace = '';
836 836
                 $inNamespace = true;
837
-            } elseif (T_CLASS === $token[0] && T_DOUBLE_COLON !== $tokens[$i-1][0]) {
837
+            } elseif (T_CLASS === $token[0] && T_DOUBLE_COLON !== $tokens[$i - 1][0]) {
838 838
                 $inClass = true;
839 839
             } elseif (T_FUNCTION === $token[0]) {
840
-                if (T_STRING === $tokens[$i+2][0]) {
841
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+2][1]);
842
-                } elseif ($tokens[$i+2] == '&' && T_STRING === $tokens[$i+3][0]) {
843
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+3][1]);
840
+                if (T_STRING === $tokens[$i + 2][0]) {
841
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 2][1]);
842
+                } elseif ($tokens[$i + 2] == '&' && T_STRING === $tokens[$i + 3][0]) {
843
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 3][1]);
844 844
                 }
845
-            } elseif (in_array($token[0], [T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED], true) && T_FUNCTION !== $tokens[$i+2][0]) {
846
-                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i+2][1], 1);
845
+            } elseif (in_array($token[0], [T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED], true) && T_FUNCTION !== $tokens[$i + 2][0]) {
846
+                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i + 2][1], 1);
847 847
             }
848 848
         }
849 849
     }
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
856 856
      */
857 857
     protected function hasProperty($property, ClassMetadataInfo $metadata)
858 858
     {
859
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->name))) {
859
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->name))) {
860 860
             // don't generate property if its already on the base class.
861 861
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->name);
862 862
             if ($reflClass->hasProperty($property)) {
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
      */
886 886
     protected function hasMethod($method, ClassMetadataInfo $metadata)
887 887
     {
888
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->name))) {
888
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->name))) {
889 889
             // don't generate method if its already on the base class.
890 890
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->name);
891 891
 
@@ -914,7 +914,7 @@  discard block
 block discarded – undo
914 914
      */
915 915
     protected function getTraits(ClassMetadataInfo $metadata)
916 916
     {
917
-        if (! ($metadata->reflClass !== null || class_exists($metadata->name))) {
917
+        if ( ! ($metadata->reflClass !== null || class_exists($metadata->name))) {
918 918
             return [];
919 919
         }
920 920
 
@@ -966,7 +966,7 @@  discard block
 block discarded – undo
966 966
     {
967 967
         $refl = new \ReflectionClass($this->getClassToExtend());
968 968
 
969
-        return '\\' . $refl->getName();
969
+        return '\\'.$refl->getName();
970 970
     }
971 971
 
972 972
     /**
@@ -999,7 +999,7 @@  discard block
 block discarded – undo
999 999
     {
1000 1000
         $lines = [];
1001 1001
         $lines[] = '/**';
1002
-        $lines[] = ' * ' . $this->getClassName($metadata);
1002
+        $lines[] = ' * '.$this->getClassName($metadata);
1003 1003
 
1004 1004
         if ($this->generateAnnotations) {
1005 1005
             $lines[] = ' *';
@@ -1014,12 +1014,12 @@  discard block
 block discarded – undo
1014 1014
 
1015 1015
             foreach ($methods as $method) {
1016 1016
                 if ($code = $this->$method($metadata)) {
1017
-                    $lines[] = ' * ' . $code;
1017
+                    $lines[] = ' * '.$code;
1018 1018
                 }
1019 1019
             }
1020 1020
 
1021 1021
             if (isset($metadata->lifecycleCallbacks) && $metadata->lifecycleCallbacks) {
1022
-                $lines[] = ' * @' . $this->annotationsPrefix . 'HasLifecycleCallbacks';
1022
+                $lines[] = ' * @'.$this->annotationsPrefix.'HasLifecycleCallbacks';
1023 1023
             }
1024 1024
         }
1025 1025
 
@@ -1035,17 +1035,17 @@  discard block
 block discarded – undo
1035 1035
      */
1036 1036
     protected function generateEntityAnnotation(ClassMetadataInfo $metadata)
1037 1037
     {
1038
-        $prefix = '@' . $this->annotationsPrefix;
1038
+        $prefix = '@'.$this->annotationsPrefix;
1039 1039
 
1040 1040
         if ($metadata->isEmbeddedClass) {
1041
-            return $prefix . 'Embeddable';
1041
+            return $prefix.'Embeddable';
1042 1042
         }
1043 1043
 
1044 1044
         $customRepository = $metadata->customRepositoryClassName
1045
-            ? '(repositoryClass="' . $metadata->customRepositoryClassName . '")'
1045
+            ? '(repositoryClass="'.$metadata->customRepositoryClassName.'")'
1046 1046
             : '';
1047 1047
 
1048
-        return $prefix . ($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity') . $customRepository;
1048
+        return $prefix.($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity').$customRepository;
1049 1049
     }
1050 1050
 
1051 1051
     /**
@@ -1062,28 +1062,28 @@  discard block
 block discarded – undo
1062 1062
         $table = [];
1063 1063
 
1064 1064
         if (isset($metadata->table['schema'])) {
1065
-            $table[] = 'schema="' . $metadata->table['schema'] . '"';
1065
+            $table[] = 'schema="'.$metadata->table['schema'].'"';
1066 1066
         }
1067 1067
 
1068 1068
         if (isset($metadata->table['name'])) {
1069
-            $table[] = 'name="' . $metadata->table['name'] . '"';
1069
+            $table[] = 'name="'.$metadata->table['name'].'"';
1070 1070
         }
1071 1071
 
1072 1072
         if (isset($metadata->table['options']) && $metadata->table['options']) {
1073
-            $table[] = 'options={' . $this->exportTableOptions((array) $metadata->table['options']) . '}';
1073
+            $table[] = 'options={'.$this->exportTableOptions((array) $metadata->table['options']).'}';
1074 1074
         }
1075 1075
 
1076 1076
         if (isset($metadata->table['uniqueConstraints']) && $metadata->table['uniqueConstraints']) {
1077 1077
             $constraints = $this->generateTableConstraints('UniqueConstraint', $metadata->table['uniqueConstraints']);
1078
-            $table[] = 'uniqueConstraints={' . $constraints . '}';
1078
+            $table[] = 'uniqueConstraints={'.$constraints.'}';
1079 1079
         }
1080 1080
 
1081 1081
         if (isset($metadata->table['indexes']) && $metadata->table['indexes']) {
1082 1082
             $constraints = $this->generateTableConstraints('Index', $metadata->table['indexes']);
1083
-            $table[] = 'indexes={' . $constraints . '}';
1083
+            $table[] = 'indexes={'.$constraints.'}';
1084 1084
         }
1085 1085
 
1086
-        return '@' . $this->annotationsPrefix . 'Table(' . implode(', ', $table) . ')';
1086
+        return '@'.$this->annotationsPrefix.'Table('.implode(', ', $table).')';
1087 1087
     }
1088 1088
 
1089 1089
     /**
@@ -1098,9 +1098,9 @@  discard block
 block discarded – undo
1098 1098
         foreach ($constraints as $name => $constraint) {
1099 1099
             $columns = [];
1100 1100
             foreach ($constraint['columns'] as $column) {
1101
-                $columns[] = '"' . $column . '"';
1101
+                $columns[] = '"'.$column.'"';
1102 1102
             }
1103
-            $annotations[] = '@' . $this->annotationsPrefix . $constraintName . '(name="' . $name . '", columns={' . implode(', ', $columns) . '})';
1103
+            $annotations[] = '@'.$this->annotationsPrefix.$constraintName.'(name="'.$name.'", columns={'.implode(', ', $columns).'})';
1104 1104
         }
1105 1105
 
1106 1106
         return implode(', ', $annotations);
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
1114 1114
     protected function generateInheritanceAnnotation(ClassMetadataInfo $metadata)
1115 1115
     {
1116 1116
         if ($metadata->inheritanceType != ClassMetadataInfo::INHERITANCE_TYPE_NONE) {
1117
-            return '@' . $this->annotationsPrefix . 'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
1117
+            return '@'.$this->annotationsPrefix.'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
1118 1118
         }
1119 1119
     }
1120 1120
 
@@ -1127,11 +1127,11 @@  discard block
 block discarded – undo
1127 1127
     {
1128 1128
         if ($metadata->inheritanceType != ClassMetadataInfo::INHERITANCE_TYPE_NONE) {
1129 1129
             $discrColumn = $metadata->discriminatorColumn;
1130
-            $columnDefinition = 'name="' . $discrColumn['name']
1131
-                . '", type="' . $discrColumn['type']
1132
-                . '", length=' . $discrColumn['length'];
1130
+            $columnDefinition = 'name="'.$discrColumn['name']
1131
+                . '", type="'.$discrColumn['type']
1132
+                . '", length='.$discrColumn['length'];
1133 1133
 
1134
-            return '@' . $this->annotationsPrefix . 'DiscriminatorColumn(' . $columnDefinition . ')';
1134
+            return '@'.$this->annotationsPrefix.'DiscriminatorColumn('.$columnDefinition.')';
1135 1135
         }
1136 1136
     }
1137 1137
 
@@ -1146,10 +1146,10 @@  discard block
 block discarded – undo
1146 1146
             $inheritanceClassMap = [];
1147 1147
 
1148 1148
             foreach ($metadata->discriminatorMap as $type => $class) {
1149
-                $inheritanceClassMap[] .= '"' . $type . '" = "' . $class . '"';
1149
+                $inheritanceClassMap[] .= '"'.$type.'" = "'.$class.'"';
1150 1150
             }
1151 1151
 
1152
-            return '@' . $this->annotationsPrefix . 'DiscriminatorMap({' . implode(', ', $inheritanceClassMap) . '})';
1152
+            return '@'.$this->annotationsPrefix.'DiscriminatorMap({'.implode(', ', $inheritanceClassMap).'})';
1153 1153
         }
1154 1154
     }
1155 1155
 
@@ -1174,7 +1174,7 @@  discard block
 block discarded – undo
1174 1174
             if (( ! isset($fieldMapping['id']) ||
1175 1175
                     ! $fieldMapping['id'] ||
1176 1176
                     $metadata->generatorType == ClassMetadataInfo::GENERATOR_TYPE_NONE
1177
-                ) && (! $metadata->isEmbeddedClass || ! $this->embeddablesImmutable)
1177
+                ) && ( ! $metadata->isEmbeddedClass || ! $this->embeddablesImmutable)
1178 1178
                 && $code = $this->generateEntityStubMethod($metadata, 'set', $fieldMapping['fieldName'], $fieldMapping['type'], $nullableField)
1179 1179
             ) {
1180 1180
                 $methods[] = $code;
@@ -1245,7 +1245,7 @@  discard block
 block discarded – undo
1245 1245
         }
1246 1246
 
1247 1247
         foreach ($joinColumns as $joinColumn) {
1248
-            if (isset($joinColumn['nullable']) && !$joinColumn['nullable']) {
1248
+            if (isset($joinColumn['nullable']) && ! $joinColumn['nullable']) {
1249 1249
                 return false;
1250 1250
             }
1251 1251
         }
@@ -1290,8 +1290,8 @@  discard block
 block discarded – undo
1290 1290
             }
1291 1291
 
1292 1292
             $lines[] = $this->generateAssociationMappingPropertyDocBlock($associationMapping, $metadata);
1293
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $associationMapping['fieldName']
1294
-                     . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null) . ";\n";
1293
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$associationMapping['fieldName']
1294
+                     . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null).";\n";
1295 1295
         }
1296 1296
 
1297 1297
         return implode("\n", $lines);
@@ -1318,8 +1318,8 @@  discard block
 block discarded – undo
1318 1318
             }
1319 1319
 
1320 1320
             $lines[] = $this->generateFieldMappingPropertyDocBlock($fieldMapping, $metadata);
1321
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldMapping['fieldName']
1322
-                     . (isset($fieldMapping['options']['default']) ? ' = ' . var_export($fieldMapping['options']['default'], true) : null) . ";\n";
1321
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldMapping['fieldName']
1322
+                     . (isset($fieldMapping['options']['default']) ? ' = '.var_export($fieldMapping['options']['default'], true) : null).";\n";
1323 1323
         }
1324 1324
 
1325 1325
         return implode("\n", $lines);
@@ -1340,7 +1340,7 @@  discard block
 block discarded – undo
1340 1340
             }
1341 1341
 
1342 1342
             $lines[] = $this->generateEmbeddedPropertyDocBlock($embeddedClass);
1343
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldName . ";\n";
1343
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldName.";\n";
1344 1344
         }
1345 1345
 
1346 1346
         return implode("\n", $lines);
@@ -1357,7 +1357,7 @@  discard block
 block discarded – undo
1357 1357
      */
1358 1358
     protected function generateEntityStubMethod(ClassMetadataInfo $metadata, $type, $fieldName, $typeHint = null, $defaultValue = null)
1359 1359
     {
1360
-        $methodName = $type . Inflector::classify($fieldName);
1360
+        $methodName = $type.Inflector::classify($fieldName);
1361 1361
         $variableName = Inflector::camelize($fieldName);
1362 1362
         if (in_array($type, ["add", "remove"])) {
1363 1363
             $methodName = Inflector::singularize($methodName);
@@ -1377,18 +1377,18 @@  discard block
 block discarded – undo
1377 1377
         $variableType   = $typeHint ? $this->getType($typeHint) : null;
1378 1378
 
1379 1379
         if ($typeHint && ! isset($types[$typeHint])) {
1380
-            $variableType   =  '\\' . ltrim($variableType, '\\');
1381
-            $methodTypeHint =  '\\' . $typeHint . ' ';
1380
+            $variableType   = '\\'.ltrim($variableType, '\\');
1381
+            $methodTypeHint = '\\'.$typeHint.' ';
1382 1382
         }
1383 1383
 
1384 1384
         $replacements = [
1385
-          '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
1385
+          '<description>'       => ucfirst($type).' '.$variableName.'.',
1386 1386
           '<methodTypeHint>'    => $methodTypeHint,
1387
-          '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
1387
+          '<variableType>'      => $variableType.(null !== $defaultValue ? ('|'.$defaultValue) : ''),
1388 1388
           '<variableName>'      => $variableName,
1389 1389
           '<methodName>'        => $methodName,
1390 1390
           '<fieldName>'         => $fieldName,
1391
-          '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
1391
+          '<variableDefault>'   => ($defaultValue !== null) ? (' = '.$defaultValue) : '',
1392 1392
           '<entity>'            => $this->getClassName($metadata)
1393 1393
         ];
1394 1394
 
@@ -1416,7 +1416,7 @@  discard block
 block discarded – undo
1416 1416
         $this->staticReflection[$metadata->name]['methods'][] = $methodName;
1417 1417
 
1418 1418
         $replacements = [
1419
-            '<name>'        => $this->annotationsPrefix . ucfirst($name),
1419
+            '<name>'        => $this->annotationsPrefix.ucfirst($name),
1420 1420
             '<methodName>'  => $methodName,
1421 1421
         ];
1422 1422
 
@@ -1439,30 +1439,30 @@  discard block
 block discarded – undo
1439 1439
         $joinColumnAnnot = [];
1440 1440
 
1441 1441
         if (isset($joinColumn['name'])) {
1442
-            $joinColumnAnnot[] = 'name="' . $joinColumn['name'] . '"';
1442
+            $joinColumnAnnot[] = 'name="'.$joinColumn['name'].'"';
1443 1443
         }
1444 1444
 
1445 1445
         if (isset($joinColumn['referencedColumnName'])) {
1446
-            $joinColumnAnnot[] = 'referencedColumnName="' . $joinColumn['referencedColumnName'] . '"';
1446
+            $joinColumnAnnot[] = 'referencedColumnName="'.$joinColumn['referencedColumnName'].'"';
1447 1447
         }
1448 1448
 
1449 1449
         if (isset($joinColumn['unique']) && $joinColumn['unique']) {
1450
-            $joinColumnAnnot[] = 'unique=' . ($joinColumn['unique'] ? 'true' : 'false');
1450
+            $joinColumnAnnot[] = 'unique='.($joinColumn['unique'] ? 'true' : 'false');
1451 1451
         }
1452 1452
 
1453 1453
         if (isset($joinColumn['nullable'])) {
1454
-            $joinColumnAnnot[] = 'nullable=' . ($joinColumn['nullable'] ? 'true' : 'false');
1454
+            $joinColumnAnnot[] = 'nullable='.($joinColumn['nullable'] ? 'true' : 'false');
1455 1455
         }
1456 1456
 
1457 1457
         if (isset($joinColumn['onDelete'])) {
1458
-            $joinColumnAnnot[] = 'onDelete="' . ($joinColumn['onDelete'] . '"');
1458
+            $joinColumnAnnot[] = 'onDelete="'.($joinColumn['onDelete'].'"');
1459 1459
         }
1460 1460
 
1461 1461
         if (isset($joinColumn['columnDefinition'])) {
1462
-            $joinColumnAnnot[] = 'columnDefinition="' . $joinColumn['columnDefinition'] . '"';
1462
+            $joinColumnAnnot[] = 'columnDefinition="'.$joinColumn['columnDefinition'].'"';
1463 1463
         }
1464 1464
 
1465
-        return '@' . $this->annotationsPrefix . 'JoinColumn(' . implode(', ', $joinColumnAnnot) . ')';
1465
+        return '@'.$this->annotationsPrefix.'JoinColumn('.implode(', ', $joinColumnAnnot).')';
1466 1466
     }
1467 1467
 
1468 1468
     /**
@@ -1474,22 +1474,22 @@  discard block
 block discarded – undo
1474 1474
     protected function generateAssociationMappingPropertyDocBlock(array $associationMapping, ClassMetadataInfo $metadata)
1475 1475
     {
1476 1476
         $lines = [];
1477
-        $lines[] = $this->spaces . '/**';
1477
+        $lines[] = $this->spaces.'/**';
1478 1478
 
1479 1479
         if ($associationMapping['type'] & ClassMetadataInfo::TO_MANY) {
1480
-            $lines[] = $this->spaces . ' * @var \Doctrine\Common\Collections\Collection';
1480
+            $lines[] = $this->spaces.' * @var \Doctrine\Common\Collections\Collection';
1481 1481
         } else {
1482
-            $lines[] = $this->spaces . ' * @var \\' . ltrim($associationMapping['targetEntity'], '\\');
1482
+            $lines[] = $this->spaces.' * @var \\'.ltrim($associationMapping['targetEntity'], '\\');
1483 1483
         }
1484 1484
 
1485 1485
         if ($this->generateAnnotations) {
1486
-            $lines[] = $this->spaces . ' *';
1486
+            $lines[] = $this->spaces.' *';
1487 1487
 
1488 1488
             if (isset($associationMapping['id']) && $associationMapping['id']) {
1489
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Id';
1489
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Id';
1490 1490
 
1491 1491
                 if ($generatorType = $this->getIdGeneratorTypeString($metadata->generatorType)) {
1492
-                    $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")';
1492
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'GeneratedValue(strategy="'.$generatorType.'")';
1493 1493
                 }
1494 1494
             }
1495 1495
 
@@ -1511,15 +1511,15 @@  discard block
 block discarded – undo
1511 1511
             $typeOptions = [];
1512 1512
 
1513 1513
             if (isset($associationMapping['targetEntity'])) {
1514
-                $typeOptions[] = 'targetEntity="' . $associationMapping['targetEntity'] . '"';
1514
+                $typeOptions[] = 'targetEntity="'.$associationMapping['targetEntity'].'"';
1515 1515
             }
1516 1516
 
1517 1517
             if (isset($associationMapping['inversedBy'])) {
1518
-                $typeOptions[] = 'inversedBy="' . $associationMapping['inversedBy'] . '"';
1518
+                $typeOptions[] = 'inversedBy="'.$associationMapping['inversedBy'].'"';
1519 1519
             }
1520 1520
 
1521 1521
             if (isset($associationMapping['mappedBy'])) {
1522
-                $typeOptions[] = 'mappedBy="' . $associationMapping['mappedBy'] . '"';
1522
+                $typeOptions[] = 'mappedBy="'.$associationMapping['mappedBy'].'"';
1523 1523
             }
1524 1524
 
1525 1525
             if ($associationMapping['cascade']) {
@@ -1535,11 +1535,11 @@  discard block
 block discarded – undo
1535 1535
                     $cascades = ['"all"'];
1536 1536
                 }
1537 1537
 
1538
-                $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}';
1538
+                $typeOptions[] = 'cascade={'.implode(',', $cascades).'}';
1539 1539
             }
1540 1540
 
1541 1541
             if (isset($associationMapping['orphanRemoval']) && $associationMapping['orphanRemoval']) {
1542
-                $typeOptions[] = 'orphanRemoval=' . ($associationMapping['orphanRemoval'] ? 'true' : 'false');
1542
+                $typeOptions[] = 'orphanRemoval='.($associationMapping['orphanRemoval'] ? 'true' : 'false');
1543 1543
             }
1544 1544
 
1545 1545
             if (isset($associationMapping['fetch']) && $associationMapping['fetch'] !== ClassMetadataInfo::FETCH_LAZY) {
@@ -1548,71 +1548,71 @@  discard block
 block discarded – undo
1548 1548
                     ClassMetadataInfo::FETCH_EAGER      => 'EAGER',
1549 1549
                 ];
1550 1550
 
1551
-                $typeOptions[] = 'fetch="' . $fetchMap[$associationMapping['fetch']] . '"';
1551
+                $typeOptions[] = 'fetch="'.$fetchMap[$associationMapping['fetch']].'"';
1552 1552
             }
1553 1553
 
1554
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . '' . $type . '(' . implode(', ', $typeOptions) . ')';
1554
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.''.$type.'('.implode(', ', $typeOptions).')';
1555 1555
 
1556 1556
             if (isset($associationMapping['joinColumns']) && $associationMapping['joinColumns']) {
1557
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinColumns({';
1557
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinColumns({';
1558 1558
 
1559 1559
                 $joinColumnsLines = [];
1560 1560
 
1561 1561
                 foreach ($associationMapping['joinColumns'] as $joinColumn) {
1562 1562
                     if ($joinColumnAnnot = $this->generateJoinColumnAnnotation($joinColumn)) {
1563
-                        $joinColumnsLines[] = $this->spaces . ' *   ' . $joinColumnAnnot;
1563
+                        $joinColumnsLines[] = $this->spaces.' *   '.$joinColumnAnnot;
1564 1564
                     }
1565 1565
                 }
1566 1566
 
1567 1567
                 $lines[] = implode(",\n", $joinColumnsLines);
1568
-                $lines[] = $this->spaces . ' * })';
1568
+                $lines[] = $this->spaces.' * })';
1569 1569
             }
1570 1570
 
1571 1571
             if (isset($associationMapping['joinTable']) && $associationMapping['joinTable']) {
1572 1572
                 $joinTable = [];
1573
-                $joinTable[] = 'name="' . $associationMapping['joinTable']['name'] . '"';
1573
+                $joinTable[] = 'name="'.$associationMapping['joinTable']['name'].'"';
1574 1574
 
1575 1575
                 if (isset($associationMapping['joinTable']['schema'])) {
1576
-                    $joinTable[] = 'schema="' . $associationMapping['joinTable']['schema'] . '"';
1576
+                    $joinTable[] = 'schema="'.$associationMapping['joinTable']['schema'].'"';
1577 1577
                 }
1578 1578
 
1579
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinTable(' . implode(', ', $joinTable) . ',';
1580
-                $lines[] = $this->spaces . ' *   joinColumns={';
1579
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinTable('.implode(', ', $joinTable).',';
1580
+                $lines[] = $this->spaces.' *   joinColumns={';
1581 1581
 
1582 1582
                 $joinColumnsLines = [];
1583 1583
 
1584 1584
                 foreach ($associationMapping['joinTable']['joinColumns'] as $joinColumn) {
1585
-                    $joinColumnsLines[] = $this->spaces . ' *     ' . $this->generateJoinColumnAnnotation($joinColumn);
1585
+                    $joinColumnsLines[] = $this->spaces.' *     '.$this->generateJoinColumnAnnotation($joinColumn);
1586 1586
                 }
1587 1587
 
1588
-                $lines[] = implode(",". PHP_EOL, $joinColumnsLines);
1589
-                $lines[] = $this->spaces . ' *   },';
1590
-                $lines[] = $this->spaces . ' *   inverseJoinColumns={';
1588
+                $lines[] = implode(",".PHP_EOL, $joinColumnsLines);
1589
+                $lines[] = $this->spaces.' *   },';
1590
+                $lines[] = $this->spaces.' *   inverseJoinColumns={';
1591 1591
 
1592 1592
                 $inverseJoinColumnsLines = [];
1593 1593
 
1594 1594
                 foreach ($associationMapping['joinTable']['inverseJoinColumns'] as $joinColumn) {
1595
-                    $inverseJoinColumnsLines[] = $this->spaces . ' *     ' . $this->generateJoinColumnAnnotation($joinColumn);
1595
+                    $inverseJoinColumnsLines[] = $this->spaces.' *     '.$this->generateJoinColumnAnnotation($joinColumn);
1596 1596
                 }
1597 1597
 
1598
-                $lines[] = implode(",". PHP_EOL, $inverseJoinColumnsLines);
1599
-                $lines[] = $this->spaces . ' *   }';
1600
-                $lines[] = $this->spaces . ' * )';
1598
+                $lines[] = implode(",".PHP_EOL, $inverseJoinColumnsLines);
1599
+                $lines[] = $this->spaces.' *   }';
1600
+                $lines[] = $this->spaces.' * )';
1601 1601
             }
1602 1602
 
1603 1603
             if (isset($associationMapping['orderBy'])) {
1604
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'OrderBy({';
1604
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'OrderBy({';
1605 1605
 
1606 1606
                 foreach ($associationMapping['orderBy'] as $name => $direction) {
1607
-                    $lines[] = $this->spaces . ' *     "' . $name . '"="' . $direction . '",';
1607
+                    $lines[] = $this->spaces.' *     "'.$name.'"="'.$direction.'",';
1608 1608
                 }
1609 1609
 
1610 1610
                 $lines[count($lines) - 1] = substr($lines[count($lines) - 1], 0, strlen($lines[count($lines) - 1]) - 1);
1611
-                $lines[] = $this->spaces . ' * })';
1611
+                $lines[] = $this->spaces.' * })';
1612 1612
             }
1613 1613
         }
1614 1614
 
1615
-        $lines[] = $this->spaces . ' */';
1615
+        $lines[] = $this->spaces.' */';
1616 1616
 
1617 1617
         return implode("\n", $lines);
1618 1618
     }
@@ -1626,37 +1626,37 @@  discard block
 block discarded – undo
1626 1626
     protected function generateFieldMappingPropertyDocBlock(array $fieldMapping, ClassMetadataInfo $metadata)
1627 1627
     {
1628 1628
         $lines = [];
1629
-        $lines[] = $this->spaces . '/**';
1630
-        $lines[] = $this->spaces . ' * @var '
1629
+        $lines[] = $this->spaces.'/**';
1630
+        $lines[] = $this->spaces.' * @var '
1631 1631
             . $this->getType($fieldMapping['type'])
1632 1632
             . ($this->nullableFieldExpression($fieldMapping) ? '|null' : '');
1633 1633
 
1634 1634
         if ($this->generateAnnotations) {
1635
-            $lines[] = $this->spaces . ' *';
1635
+            $lines[] = $this->spaces.' *';
1636 1636
 
1637 1637
             $column = [];
1638 1638
             if (isset($fieldMapping['columnName'])) {
1639
-                $column[] = 'name="' . $fieldMapping['columnName'] . '"';
1639
+                $column[] = 'name="'.$fieldMapping['columnName'].'"';
1640 1640
             }
1641 1641
 
1642 1642
             if (isset($fieldMapping['type'])) {
1643
-                $column[] = 'type="' . $fieldMapping['type'] . '"';
1643
+                $column[] = 'type="'.$fieldMapping['type'].'"';
1644 1644
             }
1645 1645
 
1646 1646
             if (isset($fieldMapping['length'])) {
1647
-                $column[] = 'length=' . $fieldMapping['length'];
1647
+                $column[] = 'length='.$fieldMapping['length'];
1648 1648
             }
1649 1649
 
1650 1650
             if (isset($fieldMapping['precision'])) {
1651
-                $column[] = 'precision=' .  $fieldMapping['precision'];
1651
+                $column[] = 'precision='.$fieldMapping['precision'];
1652 1652
             }
1653 1653
 
1654 1654
             if (isset($fieldMapping['scale'])) {
1655
-                $column[] = 'scale=' . $fieldMapping['scale'];
1655
+                $column[] = 'scale='.$fieldMapping['scale'];
1656 1656
             }
1657 1657
 
1658 1658
             if (isset($fieldMapping['nullable'])) {
1659
-                $column[] = 'nullable=' .  var_export($fieldMapping['nullable'], true);
1659
+                $column[] = 'nullable='.var_export($fieldMapping['nullable'], true);
1660 1660
             }
1661 1661
 
1662 1662
             $options = [];
@@ -1670,47 +1670,47 @@  discard block
 block discarded – undo
1670 1670
             }
1671 1671
 
1672 1672
             if (isset($fieldMapping['columnDefinition'])) {
1673
-                $column[] = 'columnDefinition="' . $fieldMapping['columnDefinition'] . '"';
1673
+                $column[] = 'columnDefinition="'.$fieldMapping['columnDefinition'].'"';
1674 1674
             }
1675 1675
 
1676 1676
             if (isset($fieldMapping['unique'])) {
1677
-                $column[] = 'unique=' . var_export($fieldMapping['unique'], true);
1677
+                $column[] = 'unique='.var_export($fieldMapping['unique'], true);
1678 1678
             }
1679 1679
 
1680
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Column(' . implode(', ', $column) . ')';
1680
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Column('.implode(', ', $column).')';
1681 1681
 
1682 1682
             if (isset($fieldMapping['id']) && $fieldMapping['id']) {
1683
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Id';
1683
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Id';
1684 1684
 
1685 1685
                 if ($generatorType = $this->getIdGeneratorTypeString($metadata->generatorType)) {
1686
-                    $lines[] = $this->spaces.' * @' . $this->annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")';
1686
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'GeneratedValue(strategy="'.$generatorType.'")';
1687 1687
                 }
1688 1688
 
1689 1689
                 if ($metadata->sequenceGeneratorDefinition) {
1690 1690
                     $sequenceGenerator = [];
1691 1691
 
1692 1692
                     if (isset($metadata->sequenceGeneratorDefinition['sequenceName'])) {
1693
-                        $sequenceGenerator[] = 'sequenceName="' . $metadata->sequenceGeneratorDefinition['sequenceName'] . '"';
1693
+                        $sequenceGenerator[] = 'sequenceName="'.$metadata->sequenceGeneratorDefinition['sequenceName'].'"';
1694 1694
                     }
1695 1695
 
1696 1696
                     if (isset($metadata->sequenceGeneratorDefinition['allocationSize'])) {
1697
-                        $sequenceGenerator[] = 'allocationSize=' . $metadata->sequenceGeneratorDefinition['allocationSize'];
1697
+                        $sequenceGenerator[] = 'allocationSize='.$metadata->sequenceGeneratorDefinition['allocationSize'];
1698 1698
                     }
1699 1699
 
1700 1700
                     if (isset($metadata->sequenceGeneratorDefinition['initialValue'])) {
1701
-                        $sequenceGenerator[] = 'initialValue=' . $metadata->sequenceGeneratorDefinition['initialValue'];
1701
+                        $sequenceGenerator[] = 'initialValue='.$metadata->sequenceGeneratorDefinition['initialValue'];
1702 1702
                     }
1703 1703
 
1704
-                    $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'SequenceGenerator(' . implode(', ', $sequenceGenerator) . ')';
1704
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'SequenceGenerator('.implode(', ', $sequenceGenerator).')';
1705 1705
                 }
1706 1706
             }
1707 1707
 
1708 1708
             if (isset($fieldMapping['version']) && $fieldMapping['version']) {
1709
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Version';
1709
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Version';
1710 1710
             }
1711 1711
         }
1712 1712
 
1713
-        $lines[] = $this->spaces . ' */';
1713
+        $lines[] = $this->spaces.' */';
1714 1714
 
1715 1715
         return implode("\n", $lines);
1716 1716
     }
@@ -1723,23 +1723,23 @@  discard block
 block discarded – undo
1723 1723
     protected function generateEmbeddedPropertyDocBlock(array $embeddedClass)
1724 1724
     {
1725 1725
         $lines = [];
1726
-        $lines[] = $this->spaces . '/**';
1727
-        $lines[] = $this->spaces . ' * @var \\' . ltrim($embeddedClass['class'], '\\');
1726
+        $lines[] = $this->spaces.'/**';
1727
+        $lines[] = $this->spaces.' * @var \\'.ltrim($embeddedClass['class'], '\\');
1728 1728
 
1729 1729
         if ($this->generateAnnotations) {
1730
-            $lines[] = $this->spaces . ' *';
1730
+            $lines[] = $this->spaces.' *';
1731 1731
 
1732
-            $embedded = ['class="' . $embeddedClass['class'] . '"'];
1732
+            $embedded = ['class="'.$embeddedClass['class'].'"'];
1733 1733
 
1734 1734
             if (isset($fieldMapping['columnPrefix'])) {
1735
-                $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true);
1735
+                $embedded[] = 'columnPrefix='.var_export($embeddedClass['columnPrefix'], true);
1736 1736
             }
1737 1737
 
1738
-            $lines[] = $this->spaces . ' * @' .
1739
-                $this->annotationsPrefix . 'Embedded(' . implode(', ', $embedded) . ')';
1738
+            $lines[] = $this->spaces.' * @'.
1739
+                $this->annotationsPrefix.'Embedded('.implode(', ', $embedded).')';
1740 1740
         }
1741 1741
 
1742
-        $lines[] = $this->spaces . ' */';
1742
+        $lines[] = $this->spaces.' */';
1743 1743
 
1744 1744
         return implode("\n", $lines);
1745 1745
     }
@@ -1756,7 +1756,7 @@  discard block
 block discarded – undo
1756 1756
 
1757 1757
         foreach ($lines as $key => $value) {
1758 1758
             if ( ! empty($value)) {
1759
-                $lines[$key] = str_repeat($this->spaces, $num) . $lines[$key];
1759
+                $lines[$key] = str_repeat($this->spaces, $num).$lines[$key];
1760 1760
             }
1761 1761
         }
1762 1762
 
@@ -1838,9 +1838,9 @@  discard block
 block discarded – undo
1838 1838
 
1839 1839
         foreach ($options as $name => $option) {
1840 1840
             if (is_array($option)) {
1841
-                $optionsStr[] = '"' . $name . '"={' . $this->exportTableOptions($option) . '}';
1841
+                $optionsStr[] = '"'.$name.'"={'.$this->exportTableOptions($option).'}';
1842 1842
             } else {
1843
-                $optionsStr[] = '"' . $name . '"="' . (string) $option . '"';
1843
+                $optionsStr[] = '"'.$name.'"="'.(string) $option.'"';
1844 1844
             }
1845 1845
         }
1846 1846
 
Please login to merge, or discard this patch.