Completed
Pull Request — master (#6168)
by Michał
12:11
created
lib/Doctrine/ORM/Tools/Console/Command/InfoCommand.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,8 @@
 block discarded – undo
58 58
         $entityManager = $this->getHelper('em')->getEntityManager();
59 59
 
60 60
         $entityClassNames = $entityManager->getConfiguration()
61
-                                          ->getMetadataDriverImpl()
62
-                                          ->getAllClassNames();
61
+                                            ->getMetadataDriverImpl()
62
+                                            ->getAllClassNames();
63 63
 
64 64
         if (!$entityClassNames) {
65 65
             throw new \Exception(
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
                                           ->getMetadataDriverImpl()
62 62
                                           ->getAllClassNames();
63 63
 
64
-        if (!$entityClassNames) {
64
+        if ( ! $entityClassNames) {
65 65
             throw new \Exception(
66 66
                 'You do not have any mapped Doctrine ORM entities according to the current configuration. '.
67 67
                 'If you have entities or mapping files you should check your mapping configuration for errors.'
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 
111 111
             if ($numRepositories) {
112 112
                 // Outputting information message
113
-                $output->writeln(PHP_EOL . sprintf('Repository classes generated to "<info>%s</INFO>"', $destPath));
113
+                $output->writeln(PHP_EOL.sprintf('Repository classes generated to "<info>%s</INFO>"', $destPath));
114 114
             } else {
115 115
                 $output->writeln('No Repository classes were found to be processed.');
116 116
             }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/DropCommand.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
             } else {
87 87
                 $sqls = $schemaTool->getDropSchemaSQL($metadatas);
88 88
             }
89
-            $output->writeln(implode(';' . PHP_EOL, $sqls));
89
+            $output->writeln(implode(';'.PHP_EOL, $sqls));
90 90
 
91 91
             return 0;
92 92
         }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
             return 0;
106 106
         }
107 107
 
108
-        $output->writeln('<comment>ATTENTION</comment>: This operation should not be executed in a production environment.' . PHP_EOL);
108
+        $output->writeln('<comment>ATTENTION</comment>: This operation should not be executed in a production environment.'.PHP_EOL);
109 109
 
110 110
         if ($isFullDatabaseDrop) {
111 111
             $sqls = $schemaTool->getDropDatabaseSQL();
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,9 +71,9 @@
 block discarded – undo
71 71
     {
72 72
         if ($input->getOption('dump-sql')) {
73 73
             $sqls = $schemaTool->getCreateSchemaSql($metadatas);
74
-            $output->writeln(implode(';' . PHP_EOL, $sqls) . ';');
74
+            $output->writeln(implode(';'.PHP_EOL, $sqls).';');
75 75
         } else {
76
-            $output->writeln('ATTENTION: This operation should not be executed in a production environment.' . PHP_EOL);
76
+            $output->writeln('ATTENTION: This operation should not be executed in a production environment.'.PHP_EOL);
77 77
 
78 78
             $output->writeln('Creating database schema...');
79 79
             $schemaTool->createSchema($metadatas);
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
         $force   = true === $input->getOption('force');
123 123
 
124 124
         if ($dumpSql) {
125
-            $output->writeln(implode(';' . PHP_EOL, $sqls) . ';');
125
+            $output->writeln(implode(';'.PHP_EOL, $sqls).';');
126 126
         }
127 127
 
128 128
         if ($force) {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -220,7 +220,7 @@
 block discarded – undo
220 220
             $exporter->setMetadata($metadata);
221 221
             $exporter->export();
222 222
 
223
-            $output->writeln(PHP_EOL . sprintf(
223
+            $output->writeln(PHP_EOL.sprintf(
224 224
                 'Converting Doctrine 1.X schema to "<info>%s</info>" mapping type in "<info>%s</info>"', $toType, $destPath
225 225
             ));
226 226
         } else {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
                 $em->getConnection()->connect();
72 72
             }
73 73
         } catch (\Exception $e) {
74
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
74
+            $output->writeln('<error>'.$e->getMessage().'</error>');
75 75
 
76 76
             return 1;
77 77
         }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/EntityGenerator.php 3 patches
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1524,11 +1524,21 @@
 block discarded – undo
1524 1524
             if ($associationMapping['cascade']) {
1525 1525
                 $cascades = array();
1526 1526
 
1527
-                if ($associationMapping['isCascadePersist']) $cascades[] = '"persist"';
1528
-                if ($associationMapping['isCascadeRemove']) $cascades[] = '"remove"';
1529
-                if ($associationMapping['isCascadeDetach']) $cascades[] = '"detach"';
1530
-                if ($associationMapping['isCascadeMerge']) $cascades[] = '"merge"';
1531
-                if ($associationMapping['isCascadeRefresh']) $cascades[] = '"refresh"';
1527
+                if ($associationMapping['isCascadePersist']) {
1528
+                    $cascades[] = '"persist"';
1529
+                }
1530
+                if ($associationMapping['isCascadeRemove']) {
1531
+                    $cascades[] = '"remove"';
1532
+                }
1533
+                if ($associationMapping['isCascadeDetach']) {
1534
+                    $cascades[] = '"detach"';
1535
+                }
1536
+                if ($associationMapping['isCascadeMerge']) {
1537
+                    $cascades[] = '"merge"';
1538
+                }
1539
+                if ($associationMapping['isCascadeRefresh']) {
1540
+                    $cascades[] = '"refresh"';
1541
+                }
1532 1542
 
1533 1543
                 if (count($cascades) === 5) {
1534 1544
                     $cascades = array('"all"');
Please login to merge, or discard this patch.
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1292,7 +1292,7 @@  discard block
 block discarded – undo
1292 1292
 
1293 1293
             $lines[] = $this->generateAssociationMappingPropertyDocBlock($associationMapping, $metadata);
1294 1294
             $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $associationMapping['fieldName']
1295
-                     . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null) . ";\n";
1295
+                        . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null) . ";\n";
1296 1296
         }
1297 1297
 
1298 1298
         return implode("\n", $lines);
@@ -1320,7 +1320,7 @@  discard block
 block discarded – undo
1320 1320
 
1321 1321
             $lines[] = $this->generateFieldMappingPropertyDocBlock($fieldMapping, $metadata);
1322 1322
             $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldMapping['fieldName']
1323
-                     . (isset($fieldMapping['options']['default']) ? ' = ' . var_export($fieldMapping['options']['default'], true) : null) . ";\n";
1323
+                        . (isset($fieldMapping['options']['default']) ? ' = ' . var_export($fieldMapping['options']['default'], true) : null) . ";\n";
1324 1324
         }
1325 1325
 
1326 1326
         return implode("\n", $lines);
@@ -1383,14 +1383,14 @@  discard block
 block discarded – undo
1383 1383
         }
1384 1384
 
1385 1385
         $replacements = array(
1386
-          '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
1387
-          '<methodTypeHint>'    => $methodTypeHint,
1388
-          '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
1389
-          '<variableName>'      => $variableName,
1390
-          '<methodName>'        => $methodName,
1391
-          '<fieldName>'         => $fieldName,
1392
-          '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
1393
-          '<entity>'            => $this->getClassName($metadata)
1386
+            '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
1387
+            '<methodTypeHint>'    => $methodTypeHint,
1388
+            '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
1389
+            '<variableName>'      => $variableName,
1390
+            '<methodName>'        => $methodName,
1391
+            '<fieldName>'         => $fieldName,
1392
+            '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
1393
+            '<entity>'            => $this->getClassName($metadata)
1394 1394
         );
1395 1395
 
1396 1396
         $method = str_replace(
Please login to merge, or discard this patch.
Spacing   +141 added lines, -141 removed lines patch added patch discarded remove patch
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
      */
365 365
     public function writeEntityClass(ClassMetadataInfo $metadata, $outputDirectory)
366 366
     {
367
-        $path = $outputDirectory . '/' . str_replace('\\', DIRECTORY_SEPARATOR, $metadata->name) . $this->extension;
367
+        $path = $outputDirectory.'/'.str_replace('\\', DIRECTORY_SEPARATOR, $metadata->name).$this->extension;
368 368
         $dir = dirname($path);
369 369
 
370 370
         if ( ! is_dir($dir)) {
@@ -380,8 +380,8 @@  discard block
 block discarded – undo
380 380
         }
381 381
 
382 382
         if ($this->backupExisting && file_exists($path)) {
383
-            $backupPath = dirname($path) . DIRECTORY_SEPARATOR . basename($path) . "~";
384
-            if (!copy($path, $backupPath)) {
383
+            $backupPath = dirname($path).DIRECTORY_SEPARATOR.basename($path)."~";
384
+            if ( ! copy($path, $backupPath)) {
385 385
                 throw new \RuntimeException("Attempt to backup overwritten entity file but copy operation failed.");
386 386
             }
387 387
         }
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
             $this->generateEntityBody($metadata)
422 422
         );
423 423
 
424
-        $code = str_replace($placeHolders, $replacements, static::$classTemplate) . "\n";
424
+        $code = str_replace($placeHolders, $replacements, static::$classTemplate)."\n";
425 425
 
426 426
         return str_replace('<spaces>', $this->spaces, $code);
427 427
     }
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
         $body = str_replace('<spaces>', $this->spaces, $body);
443 443
         $last = strrpos($currentCode, '}');
444 444
 
445
-        return substr($currentCode, 0, $last) . $body . ($body ? "\n" : '') . "}\n";
445
+        return substr($currentCode, 0, $last).$body.($body ? "\n" : '')."}\n";
446 446
     }
447 447
 
448 448
     /**
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
     public function setFieldVisibility($visibility)
507 507
     {
508 508
         if ($visibility !== static::FIELD_VISIBLE_PRIVATE && $visibility !== static::FIELD_VISIBLE_PROTECTED) {
509
-            throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): ' . $visibility);
509
+            throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): '.$visibility);
510 510
         }
511 511
 
512 512
         $this->fieldVisibility = $visibility;
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
     protected function generateEntityNamespace(ClassMetadataInfo $metadata)
605 605
     {
606 606
         if ($this->hasNamespace($metadata)) {
607
-            return 'namespace ' . $this->getNamespace($metadata) .';';
607
+            return 'namespace '.$this->getNamespace($metadata).';';
608 608
         }
609 609
     }
610 610
 
@@ -624,8 +624,8 @@  discard block
 block discarded – undo
624 624
      */
625 625
     protected function generateEntityClassName(ClassMetadataInfo $metadata)
626 626
     {
627
-        return 'class ' . $this->getClassName($metadata) .
628
-            ($this->extendsClass() ? ' extends ' . $this->getClassToExtendName() : null);
627
+        return 'class '.$this->getClassName($metadata).
628
+            ($this->extendsClass() ? ' extends '.$this->getClassToExtendName() : null);
629 629
     }
630 630
 
631 631
     /**
@@ -727,13 +727,13 @@  discard block
 block discarded – undo
727 727
         $fieldMappings = array_merge($requiredFields, $optionalFields);
728 728
 
729 729
         foreach ($metadata->embeddedClasses as $fieldName => $embeddedClass) {
730
-            $paramType = '\\' . ltrim($embeddedClass['class'], '\\');
731
-            $paramVariable = '$' . $fieldName;
730
+            $paramType = '\\'.ltrim($embeddedClass['class'], '\\');
731
+            $paramVariable = '$'.$fieldName;
732 732
 
733 733
             $paramTypes[] = $paramType;
734 734
             $paramVariables[] = $paramVariable;
735
-            $params[] = $paramType . ' ' . $paramVariable;
736
-            $fields[] = '$this->' . $fieldName . ' = ' . $paramVariable . ';';
735
+            $params[] = $paramType.' '.$paramVariable;
736
+            $fields[] = '$this->'.$fieldName.' = '.$paramVariable.';';
737 737
         }
738 738
 
739 739
         foreach ($fieldMappings as $fieldMapping) {
@@ -743,27 +743,27 @@  discard block
 block discarded – undo
743 743
                 continue;
744 744
             }
745 745
 
746
-            $paramTypes[] = $this->getType($fieldMapping['type']) . (!empty($fieldMapping['nullable']) ? '|null' : '');
747
-            $param = '$' . $fieldMapping['fieldName'];
746
+            $paramTypes[] = $this->getType($fieldMapping['type']).( ! empty($fieldMapping['nullable']) ? '|null' : '');
747
+            $param = '$'.$fieldMapping['fieldName'];
748 748
             $paramVariables[] = $param;
749 749
 
750 750
             if ($fieldMapping['type'] === 'datetime') {
751
-                $param = $this->getType($fieldMapping['type']) . ' ' . $param;
751
+                $param = $this->getType($fieldMapping['type']).' '.$param;
752 752
             }
753 753
 
754
-            if (!empty($fieldMapping['nullable'])) {
754
+            if ( ! empty($fieldMapping['nullable'])) {
755 755
                 $param .= ' = null';
756 756
             }
757 757
 
758 758
             $params[] = $param;
759 759
 
760
-            $fields[] = '$this->' . $fieldMapping['fieldName'] . ' = $' . $fieldMapping['fieldName'] . ';';
760
+            $fields[] = '$this->'.$fieldMapping['fieldName'].' = $'.$fieldMapping['fieldName'].';';
761 761
         }
762 762
 
763 763
         $maxParamTypeLength = max(array_map('strlen', $paramTypes));
764 764
         $paramTags = array_map(
765
-            function ($type, $variable) use ($maxParamTypeLength) {
766
-                return '@param ' . $type . str_repeat(' ', $maxParamTypeLength - strlen($type) + 1) . $variable;
765
+            function($type, $variable) use ($maxParamTypeLength) {
766
+                return '@param '.$type.str_repeat(' ', $maxParamTypeLength - strlen($type) + 1).$variable;
767 767
             },
768 768
             $paramTypes,
769 769
             $paramVariables
@@ -771,8 +771,8 @@  discard block
 block discarded – undo
771 771
 
772 772
         // Generate multi line constructor if the signature exceeds 120 characters.
773 773
         if (array_sum(array_map('strlen', $params)) + count($params) * 2 + 29 > 120) {
774
-            $delimiter = "\n" . $this->spaces;
775
-            $params = $delimiter . implode(',' . $delimiter, $params) . "\n";
774
+            $delimiter = "\n".$this->spaces;
775
+            $params = $delimiter.implode(','.$delimiter, $params)."\n";
776 776
         } else {
777 777
             $params = implode(', ', $params);
778 778
         }
@@ -780,7 +780,7 @@  discard block
 block discarded – undo
780 780
         $replacements = array(
781 781
             '<paramTags>' => implode("\n * ", $paramTags),
782 782
             '<params>'    => $params,
783
-            '<fields>'    => implode("\n" . $this->spaces, $fields),
783
+            '<fields>'    => implode("\n".$this->spaces, $fields),
784 784
         );
785 785
 
786 786
         $constructor = str_replace(
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 
826 826
             if ($inClass) {
827 827
                 $inClass = false;
828
-                $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1];
828
+                $lastSeenClass = $lastSeenNamespace.($lastSeenNamespace ? '\\' : '').$token[1];
829 829
                 $this->staticReflection[$lastSeenClass]['properties'] = array();
830 830
                 $this->staticReflection[$lastSeenClass]['methods'] = array();
831 831
             }
@@ -833,16 +833,16 @@  discard block
 block discarded – undo
833 833
             if (T_NAMESPACE === $token[0]) {
834 834
                 $lastSeenNamespace = '';
835 835
                 $inNamespace = true;
836
-            } elseif (T_CLASS === $token[0] && T_DOUBLE_COLON !== $tokens[$i-1][0]) {
836
+            } elseif (T_CLASS === $token[0] && T_DOUBLE_COLON !== $tokens[$i - 1][0]) {
837 837
                 $inClass = true;
838 838
             } elseif (T_FUNCTION === $token[0]) {
839
-                if (T_STRING === $tokens[$i+2][0]) {
840
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+2][1]);
841
-                } elseif ($tokens[$i+2] == '&' && T_STRING === $tokens[$i+3][0]) {
842
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+3][1]);
839
+                if (T_STRING === $tokens[$i + 2][0]) {
840
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 2][1]);
841
+                } elseif ($tokens[$i + 2] == '&' && T_STRING === $tokens[$i + 3][0]) {
842
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 3][1]);
843 843
                 }
844
-            } elseif (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED), true) && T_FUNCTION !== $tokens[$i+2][0]) {
845
-                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i+2][1], 1);
844
+            } elseif (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED), true) && T_FUNCTION !== $tokens[$i + 2][0]) {
845
+                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i + 2][1], 1);
846 846
             }
847 847
         }
848 848
     }
@@ -855,7 +855,7 @@  discard block
 block discarded – undo
855 855
      */
856 856
     protected function hasProperty($property, ClassMetadataInfo $metadata)
857 857
     {
858
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->name))) {
858
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->name))) {
859 859
             // don't generate property if its already on the base class.
860 860
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->name);
861 861
             if ($reflClass->hasProperty($property)) {
@@ -884,7 +884,7 @@  discard block
 block discarded – undo
884 884
      */
885 885
     protected function hasMethod($method, ClassMetadataInfo $metadata)
886 886
     {
887
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->name))) {
887
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->name))) {
888 888
             // don't generate method if its already on the base class.
889 889
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->name);
890 890
 
@@ -913,7 +913,7 @@  discard block
 block discarded – undo
913 913
      */
914 914
     protected function getTraits(ClassMetadataInfo $metadata)
915 915
     {
916
-        if (! ($metadata->reflClass !== null || class_exists($metadata->name))) {
916
+        if ( ! ($metadata->reflClass !== null || class_exists($metadata->name))) {
917 917
             return [];
918 918
         }
919 919
 
@@ -965,7 +965,7 @@  discard block
 block discarded – undo
965 965
     {
966 966
         $refl = new \ReflectionClass($this->getClassToExtend());
967 967
 
968
-        return '\\' . $refl->getName();
968
+        return '\\'.$refl->getName();
969 969
     }
970 970
 
971 971
     /**
@@ -998,7 +998,7 @@  discard block
 block discarded – undo
998 998
     {
999 999
         $lines = array();
1000 1000
         $lines[] = '/**';
1001
-        $lines[] = ' * ' . $this->getClassName($metadata);
1001
+        $lines[] = ' * '.$this->getClassName($metadata);
1002 1002
 
1003 1003
         if ($this->generateAnnotations) {
1004 1004
             $lines[] = ' *';
@@ -1013,12 +1013,12 @@  discard block
 block discarded – undo
1013 1013
 
1014 1014
             foreach ($methods as $method) {
1015 1015
                 if ($code = $this->$method($metadata)) {
1016
-                    $lines[] = ' * ' . $code;
1016
+                    $lines[] = ' * '.$code;
1017 1017
                 }
1018 1018
             }
1019 1019
 
1020 1020
             if (isset($metadata->lifecycleCallbacks) && $metadata->lifecycleCallbacks) {
1021
-                $lines[] = ' * @' . $this->annotationsPrefix . 'HasLifecycleCallbacks';
1021
+                $lines[] = ' * @'.$this->annotationsPrefix.'HasLifecycleCallbacks';
1022 1022
             }
1023 1023
         }
1024 1024
 
@@ -1034,17 +1034,17 @@  discard block
 block discarded – undo
1034 1034
      */
1035 1035
     protected function generateEntityAnnotation(ClassMetadataInfo $metadata)
1036 1036
     {
1037
-        $prefix = '@' . $this->annotationsPrefix;
1037
+        $prefix = '@'.$this->annotationsPrefix;
1038 1038
 
1039 1039
         if ($metadata->isEmbeddedClass) {
1040
-            return $prefix . 'Embeddable';
1040
+            return $prefix.'Embeddable';
1041 1041
         }
1042 1042
 
1043 1043
         $customRepository = $metadata->customRepositoryClassName
1044
-            ? '(repositoryClass="' . $metadata->customRepositoryClassName . '")'
1044
+            ? '(repositoryClass="'.$metadata->customRepositoryClassName.'")'
1045 1045
             : '';
1046 1046
 
1047
-        return $prefix . ($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity') . $customRepository;
1047
+        return $prefix.($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity').$customRepository;
1048 1048
     }
1049 1049
 
1050 1050
     /**
@@ -1061,28 +1061,28 @@  discard block
 block discarded – undo
1061 1061
         $table = array();
1062 1062
 
1063 1063
         if (isset($metadata->table['schema'])) {
1064
-            $table[] = 'schema="' . $metadata->table['schema'] . '"';
1064
+            $table[] = 'schema="'.$metadata->table['schema'].'"';
1065 1065
         }
1066 1066
 
1067 1067
         if (isset($metadata->table['name'])) {
1068
-            $table[] = 'name="' . $metadata->table['name'] . '"';
1068
+            $table[] = 'name="'.$metadata->table['name'].'"';
1069 1069
         }
1070 1070
 
1071 1071
         if (isset($metadata->table['options']) && $metadata->table['options']) {
1072
-            $table[] = 'options={' . $this->exportTableOptions((array) $metadata->table['options']) . '}';
1072
+            $table[] = 'options={'.$this->exportTableOptions((array) $metadata->table['options']).'}';
1073 1073
         }
1074 1074
 
1075 1075
         if (isset($metadata->table['uniqueConstraints']) && $metadata->table['uniqueConstraints']) {
1076 1076
             $constraints = $this->generateTableConstraints('UniqueConstraint', $metadata->table['uniqueConstraints']);
1077
-            $table[] = 'uniqueConstraints={' . $constraints . '}';
1077
+            $table[] = 'uniqueConstraints={'.$constraints.'}';
1078 1078
         }
1079 1079
 
1080 1080
         if (isset($metadata->table['indexes']) && $metadata->table['indexes']) {
1081 1081
             $constraints = $this->generateTableConstraints('Index', $metadata->table['indexes']);
1082
-            $table[] = 'indexes={' . $constraints . '}';
1082
+            $table[] = 'indexes={'.$constraints.'}';
1083 1083
         }
1084 1084
 
1085
-        return '@' . $this->annotationsPrefix . 'Table(' . implode(', ', $table) . ')';
1085
+        return '@'.$this->annotationsPrefix.'Table('.implode(', ', $table).')';
1086 1086
     }
1087 1087
 
1088 1088
     /**
@@ -1097,9 +1097,9 @@  discard block
 block discarded – undo
1097 1097
         foreach ($constraints as $name => $constraint) {
1098 1098
             $columns = array();
1099 1099
             foreach ($constraint['columns'] as $column) {
1100
-                $columns[] = '"' . $column . '"';
1100
+                $columns[] = '"'.$column.'"';
1101 1101
             }
1102
-            $annotations[] = '@' . $this->annotationsPrefix . $constraintName . '(name="' . $name . '", columns={' . implode(', ', $columns) . '})';
1102
+            $annotations[] = '@'.$this->annotationsPrefix.$constraintName.'(name="'.$name.'", columns={'.implode(', ', $columns).'})';
1103 1103
         }
1104 1104
 
1105 1105
         return implode(', ', $annotations);
@@ -1113,7 +1113,7 @@  discard block
 block discarded – undo
1113 1113
     protected function generateInheritanceAnnotation(ClassMetadataInfo $metadata)
1114 1114
     {
1115 1115
         if ($metadata->inheritanceType != ClassMetadataInfo::INHERITANCE_TYPE_NONE) {
1116
-            return '@' . $this->annotationsPrefix . 'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
1116
+            return '@'.$this->annotationsPrefix.'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
1117 1117
         }
1118 1118
     }
1119 1119
 
@@ -1126,11 +1126,11 @@  discard block
 block discarded – undo
1126 1126
     {
1127 1127
         if ($metadata->inheritanceType != ClassMetadataInfo::INHERITANCE_TYPE_NONE) {
1128 1128
             $discrColumn = $metadata->discriminatorColumn;
1129
-            $columnDefinition = 'name="' . $discrColumn['name']
1130
-                . '", type="' . $discrColumn['type']
1131
-                . '", length=' . $discrColumn['length'];
1129
+            $columnDefinition = 'name="'.$discrColumn['name']
1130
+                . '", type="'.$discrColumn['type']
1131
+                . '", length='.$discrColumn['length'];
1132 1132
 
1133
-            return '@' . $this->annotationsPrefix . 'DiscriminatorColumn(' . $columnDefinition . ')';
1133
+            return '@'.$this->annotationsPrefix.'DiscriminatorColumn('.$columnDefinition.')';
1134 1134
         }
1135 1135
     }
1136 1136
 
@@ -1145,10 +1145,10 @@  discard block
 block discarded – undo
1145 1145
             $inheritanceClassMap = array();
1146 1146
 
1147 1147
             foreach ($metadata->discriminatorMap as $type => $class) {
1148
-                $inheritanceClassMap[] .= '"' . $type . '" = "' . $class . '"';
1148
+                $inheritanceClassMap[] .= '"'.$type.'" = "'.$class.'"';
1149 1149
             }
1150 1150
 
1151
-            return '@' . $this->annotationsPrefix . 'DiscriminatorMap({' . implode(', ', $inheritanceClassMap) . '})';
1151
+            return '@'.$this->annotationsPrefix.'DiscriminatorMap({'.implode(', ', $inheritanceClassMap).'})';
1152 1152
         }
1153 1153
     }
1154 1154
 
@@ -1173,7 +1173,7 @@  discard block
 block discarded – undo
1173 1173
             if (( ! isset($fieldMapping['id']) ||
1174 1174
                     ! $fieldMapping['id'] ||
1175 1175
                     $metadata->generatorType == ClassMetadataInfo::GENERATOR_TYPE_NONE
1176
-                ) && (! $metadata->isEmbeddedClass || ! $this->embeddablesImmutable)
1176
+                ) && ( ! $metadata->isEmbeddedClass || ! $this->embeddablesImmutable)
1177 1177
                 && $code = $this->generateEntityStubMethod($metadata, 'set', $fieldMapping['fieldName'], $fieldMapping['type'], $nullableField)
1178 1178
             ) {
1179 1179
                 $methods[] = $code;
@@ -1244,7 +1244,7 @@  discard block
 block discarded – undo
1244 1244
         }
1245 1245
 
1246 1246
         foreach ($joinColumns as $joinColumn) {
1247
-            if (isset($joinColumn['nullable']) && !$joinColumn['nullable']) {
1247
+            if (isset($joinColumn['nullable']) && ! $joinColumn['nullable']) {
1248 1248
                 return false;
1249 1249
             }
1250 1250
         }
@@ -1291,8 +1291,8 @@  discard block
 block discarded – undo
1291 1291
             }
1292 1292
 
1293 1293
             $lines[] = $this->generateAssociationMappingPropertyDocBlock($associationMapping, $metadata);
1294
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $associationMapping['fieldName']
1295
-                     . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null) . ";\n";
1294
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$associationMapping['fieldName']
1295
+                     . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null).";\n";
1296 1296
         }
1297 1297
 
1298 1298
         return implode("\n", $lines);
@@ -1319,8 +1319,8 @@  discard block
 block discarded – undo
1319 1319
             }
1320 1320
 
1321 1321
             $lines[] = $this->generateFieldMappingPropertyDocBlock($fieldMapping, $metadata);
1322
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldMapping['fieldName']
1323
-                     . (isset($fieldMapping['options']['default']) ? ' = ' . var_export($fieldMapping['options']['default'], true) : null) . ";\n";
1322
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldMapping['fieldName']
1323
+                     . (isset($fieldMapping['options']['default']) ? ' = '.var_export($fieldMapping['options']['default'], true) : null).";\n";
1324 1324
         }
1325 1325
 
1326 1326
         return implode("\n", $lines);
@@ -1341,7 +1341,7 @@  discard block
 block discarded – undo
1341 1341
             }
1342 1342
 
1343 1343
             $lines[] = $this->generateEmbeddedPropertyDocBlock($embeddedClass);
1344
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldName . ";\n";
1344
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldName.";\n";
1345 1345
         }
1346 1346
 
1347 1347
         return implode("\n", $lines);
@@ -1358,7 +1358,7 @@  discard block
 block discarded – undo
1358 1358
      */
1359 1359
     protected function generateEntityStubMethod(ClassMetadataInfo $metadata, $type, $fieldName, $typeHint = null, $defaultValue = null)
1360 1360
     {
1361
-        $methodName = $type . Inflector::classify($fieldName);
1361
+        $methodName = $type.Inflector::classify($fieldName);
1362 1362
         $variableName = Inflector::camelize($fieldName);
1363 1363
         if (in_array($type, array("add", "remove"))) {
1364 1364
             $methodName = Inflector::singularize($methodName);
@@ -1378,18 +1378,18 @@  discard block
 block discarded – undo
1378 1378
         $variableType   = $typeHint ? $this->getType($typeHint) : null;
1379 1379
 
1380 1380
         if ($typeHint && ! isset($types[$typeHint])) {
1381
-            $variableType   =  '\\' . ltrim($variableType, '\\');
1382
-            $methodTypeHint =  '\\' . $typeHint . ' ';
1381
+            $variableType   = '\\'.ltrim($variableType, '\\');
1382
+            $methodTypeHint = '\\'.$typeHint.' ';
1383 1383
         }
1384 1384
 
1385 1385
         $replacements = array(
1386
-          '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
1386
+          '<description>'       => ucfirst($type).' '.$variableName.'.',
1387 1387
           '<methodTypeHint>'    => $methodTypeHint,
1388
-          '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
1388
+          '<variableType>'      => $variableType.(null !== $defaultValue ? ('|'.$defaultValue) : ''),
1389 1389
           '<variableName>'      => $variableName,
1390 1390
           '<methodName>'        => $methodName,
1391 1391
           '<fieldName>'         => $fieldName,
1392
-          '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
1392
+          '<variableDefault>'   => ($defaultValue !== null) ? (' = '.$defaultValue) : '',
1393 1393
           '<entity>'            => $this->getClassName($metadata)
1394 1394
         );
1395 1395
 
@@ -1417,7 +1417,7 @@  discard block
 block discarded – undo
1417 1417
         $this->staticReflection[$metadata->name]['methods'][] = $methodName;
1418 1418
 
1419 1419
         $replacements = array(
1420
-            '<name>'        => $this->annotationsPrefix . ucfirst($name),
1420
+            '<name>'        => $this->annotationsPrefix.ucfirst($name),
1421 1421
             '<methodName>'  => $methodName,
1422 1422
         );
1423 1423
 
@@ -1440,30 +1440,30 @@  discard block
 block discarded – undo
1440 1440
         $joinColumnAnnot = array();
1441 1441
 
1442 1442
         if (isset($joinColumn['name'])) {
1443
-            $joinColumnAnnot[] = 'name="' . $joinColumn['name'] . '"';
1443
+            $joinColumnAnnot[] = 'name="'.$joinColumn['name'].'"';
1444 1444
         }
1445 1445
 
1446 1446
         if (isset($joinColumn['referencedColumnName'])) {
1447
-            $joinColumnAnnot[] = 'referencedColumnName="' . $joinColumn['referencedColumnName'] . '"';
1447
+            $joinColumnAnnot[] = 'referencedColumnName="'.$joinColumn['referencedColumnName'].'"';
1448 1448
         }
1449 1449
 
1450 1450
         if (isset($joinColumn['unique']) && $joinColumn['unique']) {
1451
-            $joinColumnAnnot[] = 'unique=' . ($joinColumn['unique'] ? 'true' : 'false');
1451
+            $joinColumnAnnot[] = 'unique='.($joinColumn['unique'] ? 'true' : 'false');
1452 1452
         }
1453 1453
 
1454 1454
         if (isset($joinColumn['nullable'])) {
1455
-            $joinColumnAnnot[] = 'nullable=' . ($joinColumn['nullable'] ? 'true' : 'false');
1455
+            $joinColumnAnnot[] = 'nullable='.($joinColumn['nullable'] ? 'true' : 'false');
1456 1456
         }
1457 1457
 
1458 1458
         if (isset($joinColumn['onDelete'])) {
1459
-            $joinColumnAnnot[] = 'onDelete="' . ($joinColumn['onDelete'] . '"');
1459
+            $joinColumnAnnot[] = 'onDelete="'.($joinColumn['onDelete'].'"');
1460 1460
         }
1461 1461
 
1462 1462
         if (isset($joinColumn['columnDefinition'])) {
1463
-            $joinColumnAnnot[] = 'columnDefinition="' . $joinColumn['columnDefinition'] . '"';
1463
+            $joinColumnAnnot[] = 'columnDefinition="'.$joinColumn['columnDefinition'].'"';
1464 1464
         }
1465 1465
 
1466
-        return '@' . $this->annotationsPrefix . 'JoinColumn(' . implode(', ', $joinColumnAnnot) . ')';
1466
+        return '@'.$this->annotationsPrefix.'JoinColumn('.implode(', ', $joinColumnAnnot).')';
1467 1467
     }
1468 1468
 
1469 1469
     /**
@@ -1475,22 +1475,22 @@  discard block
 block discarded – undo
1475 1475
     protected function generateAssociationMappingPropertyDocBlock(array $associationMapping, ClassMetadataInfo $metadata)
1476 1476
     {
1477 1477
         $lines = array();
1478
-        $lines[] = $this->spaces . '/**';
1478
+        $lines[] = $this->spaces.'/**';
1479 1479
 
1480 1480
         if ($associationMapping['type'] & ClassMetadataInfo::TO_MANY) {
1481
-            $lines[] = $this->spaces . ' * @var \Doctrine\Common\Collections\Collection';
1481
+            $lines[] = $this->spaces.' * @var \Doctrine\Common\Collections\Collection';
1482 1482
         } else {
1483
-            $lines[] = $this->spaces . ' * @var \\' . ltrim($associationMapping['targetEntity'], '\\');
1483
+            $lines[] = $this->spaces.' * @var \\'.ltrim($associationMapping['targetEntity'], '\\');
1484 1484
         }
1485 1485
 
1486 1486
         if ($this->generateAnnotations) {
1487
-            $lines[] = $this->spaces . ' *';
1487
+            $lines[] = $this->spaces.' *';
1488 1488
 
1489 1489
             if (isset($associationMapping['id']) && $associationMapping['id']) {
1490
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Id';
1490
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Id';
1491 1491
 
1492 1492
                 if ($generatorType = $this->getIdGeneratorTypeString($metadata->generatorType)) {
1493
-                    $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")';
1493
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'GeneratedValue(strategy="'.$generatorType.'")';
1494 1494
                 }
1495 1495
             }
1496 1496
 
@@ -1512,15 +1512,15 @@  discard block
 block discarded – undo
1512 1512
             $typeOptions = array();
1513 1513
 
1514 1514
             if (isset($associationMapping['targetEntity'])) {
1515
-                $typeOptions[] = 'targetEntity="' . $associationMapping['targetEntity'] . '"';
1515
+                $typeOptions[] = 'targetEntity="'.$associationMapping['targetEntity'].'"';
1516 1516
             }
1517 1517
 
1518 1518
             if (isset($associationMapping['inversedBy'])) {
1519
-                $typeOptions[] = 'inversedBy="' . $associationMapping['inversedBy'] . '"';
1519
+                $typeOptions[] = 'inversedBy="'.$associationMapping['inversedBy'].'"';
1520 1520
             }
1521 1521
 
1522 1522
             if (isset($associationMapping['mappedBy'])) {
1523
-                $typeOptions[] = 'mappedBy="' . $associationMapping['mappedBy'] . '"';
1523
+                $typeOptions[] = 'mappedBy="'.$associationMapping['mappedBy'].'"';
1524 1524
             }
1525 1525
 
1526 1526
             if ($associationMapping['cascade']) {
@@ -1536,11 +1536,11 @@  discard block
 block discarded – undo
1536 1536
                     $cascades = array('"all"');
1537 1537
                 }
1538 1538
 
1539
-                $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}';
1539
+                $typeOptions[] = 'cascade={'.implode(',', $cascades).'}';
1540 1540
             }
1541 1541
 
1542 1542
             if (isset($associationMapping['orphanRemoval']) && $associationMapping['orphanRemoval']) {
1543
-                $typeOptions[] = 'orphanRemoval=' . ($associationMapping['orphanRemoval'] ? 'true' : 'false');
1543
+                $typeOptions[] = 'orphanRemoval='.($associationMapping['orphanRemoval'] ? 'true' : 'false');
1544 1544
             }
1545 1545
 
1546 1546
             if (isset($associationMapping['fetch']) && $associationMapping['fetch'] !== ClassMetadataInfo::FETCH_LAZY) {
@@ -1549,71 +1549,71 @@  discard block
 block discarded – undo
1549 1549
                     ClassMetadataInfo::FETCH_EAGER      => 'EAGER',
1550 1550
                 );
1551 1551
 
1552
-                $typeOptions[] = 'fetch="' . $fetchMap[$associationMapping['fetch']] . '"';
1552
+                $typeOptions[] = 'fetch="'.$fetchMap[$associationMapping['fetch']].'"';
1553 1553
             }
1554 1554
 
1555
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . '' . $type . '(' . implode(', ', $typeOptions) . ')';
1555
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.''.$type.'('.implode(', ', $typeOptions).')';
1556 1556
 
1557 1557
             if (isset($associationMapping['joinColumns']) && $associationMapping['joinColumns']) {
1558
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinColumns({';
1558
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinColumns({';
1559 1559
 
1560 1560
                 $joinColumnsLines = array();
1561 1561
 
1562 1562
                 foreach ($associationMapping['joinColumns'] as $joinColumn) {
1563 1563
                     if ($joinColumnAnnot = $this->generateJoinColumnAnnotation($joinColumn)) {
1564
-                        $joinColumnsLines[] = $this->spaces . ' *   ' . $joinColumnAnnot;
1564
+                        $joinColumnsLines[] = $this->spaces.' *   '.$joinColumnAnnot;
1565 1565
                     }
1566 1566
                 }
1567 1567
 
1568 1568
                 $lines[] = implode(",\n", $joinColumnsLines);
1569
-                $lines[] = $this->spaces . ' * })';
1569
+                $lines[] = $this->spaces.' * })';
1570 1570
             }
1571 1571
 
1572 1572
             if (isset($associationMapping['joinTable']) && $associationMapping['joinTable']) {
1573 1573
                 $joinTable = array();
1574
-                $joinTable[] = 'name="' . $associationMapping['joinTable']['name'] . '"';
1574
+                $joinTable[] = 'name="'.$associationMapping['joinTable']['name'].'"';
1575 1575
 
1576 1576
                 if (isset($associationMapping['joinTable']['schema'])) {
1577
-                    $joinTable[] = 'schema="' . $associationMapping['joinTable']['schema'] . '"';
1577
+                    $joinTable[] = 'schema="'.$associationMapping['joinTable']['schema'].'"';
1578 1578
                 }
1579 1579
 
1580
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinTable(' . implode(', ', $joinTable) . ',';
1581
-                $lines[] = $this->spaces . ' *   joinColumns={';
1580
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinTable('.implode(', ', $joinTable).',';
1581
+                $lines[] = $this->spaces.' *   joinColumns={';
1582 1582
 
1583 1583
                 $joinColumnsLines = array();
1584 1584
 
1585 1585
                 foreach ($associationMapping['joinTable']['joinColumns'] as $joinColumn) {
1586
-                    $joinColumnsLines[] = $this->spaces . ' *     ' . $this->generateJoinColumnAnnotation($joinColumn);
1586
+                    $joinColumnsLines[] = $this->spaces.' *     '.$this->generateJoinColumnAnnotation($joinColumn);
1587 1587
                 }
1588 1588
 
1589
-                $lines[] = implode(",". PHP_EOL, $joinColumnsLines);
1590
-                $lines[] = $this->spaces . ' *   },';
1591
-                $lines[] = $this->spaces . ' *   inverseJoinColumns={';
1589
+                $lines[] = implode(",".PHP_EOL, $joinColumnsLines);
1590
+                $lines[] = $this->spaces.' *   },';
1591
+                $lines[] = $this->spaces.' *   inverseJoinColumns={';
1592 1592
 
1593 1593
                 $inverseJoinColumnsLines = array();
1594 1594
 
1595 1595
                 foreach ($associationMapping['joinTable']['inverseJoinColumns'] as $joinColumn) {
1596
-                    $inverseJoinColumnsLines[] = $this->spaces . ' *     ' . $this->generateJoinColumnAnnotation($joinColumn);
1596
+                    $inverseJoinColumnsLines[] = $this->spaces.' *     '.$this->generateJoinColumnAnnotation($joinColumn);
1597 1597
                 }
1598 1598
 
1599
-                $lines[] = implode(",". PHP_EOL, $inverseJoinColumnsLines);
1600
-                $lines[] = $this->spaces . ' *   }';
1601
-                $lines[] = $this->spaces . ' * )';
1599
+                $lines[] = implode(",".PHP_EOL, $inverseJoinColumnsLines);
1600
+                $lines[] = $this->spaces.' *   }';
1601
+                $lines[] = $this->spaces.' * )';
1602 1602
             }
1603 1603
 
1604 1604
             if (isset($associationMapping['orderBy'])) {
1605
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'OrderBy({';
1605
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'OrderBy({';
1606 1606
 
1607 1607
                 foreach ($associationMapping['orderBy'] as $name => $direction) {
1608
-                    $lines[] = $this->spaces . ' *     "' . $name . '"="' . $direction . '",';
1608
+                    $lines[] = $this->spaces.' *     "'.$name.'"="'.$direction.'",';
1609 1609
                 }
1610 1610
 
1611 1611
                 $lines[count($lines) - 1] = substr($lines[count($lines) - 1], 0, strlen($lines[count($lines) - 1]) - 1);
1612
-                $lines[] = $this->spaces . ' * })';
1612
+                $lines[] = $this->spaces.' * })';
1613 1613
             }
1614 1614
         }
1615 1615
 
1616
-        $lines[] = $this->spaces . ' */';
1616
+        $lines[] = $this->spaces.' */';
1617 1617
 
1618 1618
         return implode("\n", $lines);
1619 1619
     }
@@ -1627,37 +1627,37 @@  discard block
 block discarded – undo
1627 1627
     protected function generateFieldMappingPropertyDocBlock(array $fieldMapping, ClassMetadataInfo $metadata)
1628 1628
     {
1629 1629
         $lines = array();
1630
-        $lines[] = $this->spaces . '/**';
1631
-        $lines[] = $this->spaces . ' * @var '
1630
+        $lines[] = $this->spaces.'/**';
1631
+        $lines[] = $this->spaces.' * @var '
1632 1632
             . $this->getType($fieldMapping['type'])
1633 1633
             . ($this->nullableFieldExpression($fieldMapping) ? '|null' : '');
1634 1634
 
1635 1635
         if ($this->generateAnnotations) {
1636
-            $lines[] = $this->spaces . ' *';
1636
+            $lines[] = $this->spaces.' *';
1637 1637
 
1638 1638
             $column = array();
1639 1639
             if (isset($fieldMapping['columnName'])) {
1640
-                $column[] = 'name="' . $fieldMapping['columnName'] . '"';
1640
+                $column[] = 'name="'.$fieldMapping['columnName'].'"';
1641 1641
             }
1642 1642
 
1643 1643
             if (isset($fieldMapping['type'])) {
1644
-                $column[] = 'type="' . $fieldMapping['type'] . '"';
1644
+                $column[] = 'type="'.$fieldMapping['type'].'"';
1645 1645
             }
1646 1646
 
1647 1647
             if (isset($fieldMapping['length'])) {
1648
-                $column[] = 'length=' . $fieldMapping['length'];
1648
+                $column[] = 'length='.$fieldMapping['length'];
1649 1649
             }
1650 1650
 
1651 1651
             if (isset($fieldMapping['precision'])) {
1652
-                $column[] = 'precision=' .  $fieldMapping['precision'];
1652
+                $column[] = 'precision='.$fieldMapping['precision'];
1653 1653
             }
1654 1654
 
1655 1655
             if (isset($fieldMapping['scale'])) {
1656
-                $column[] = 'scale=' . $fieldMapping['scale'];
1656
+                $column[] = 'scale='.$fieldMapping['scale'];
1657 1657
             }
1658 1658
 
1659 1659
             if (isset($fieldMapping['nullable'])) {
1660
-                $column[] = 'nullable=' .  var_export($fieldMapping['nullable'], true);
1660
+                $column[] = 'nullable='.var_export($fieldMapping['nullable'], true);
1661 1661
             }
1662 1662
 
1663 1663
             $options = [];
@@ -1671,47 +1671,47 @@  discard block
 block discarded – undo
1671 1671
             }
1672 1672
 
1673 1673
             if (isset($fieldMapping['columnDefinition'])) {
1674
-                $column[] = 'columnDefinition="' . $fieldMapping['columnDefinition'] . '"';
1674
+                $column[] = 'columnDefinition="'.$fieldMapping['columnDefinition'].'"';
1675 1675
             }
1676 1676
 
1677 1677
             if (isset($fieldMapping['unique'])) {
1678
-                $column[] = 'unique=' . var_export($fieldMapping['unique'], true);
1678
+                $column[] = 'unique='.var_export($fieldMapping['unique'], true);
1679 1679
             }
1680 1680
 
1681
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Column(' . implode(', ', $column) . ')';
1681
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Column('.implode(', ', $column).')';
1682 1682
 
1683 1683
             if (isset($fieldMapping['id']) && $fieldMapping['id']) {
1684
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Id';
1684
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Id';
1685 1685
 
1686 1686
                 if ($generatorType = $this->getIdGeneratorTypeString($metadata->generatorType)) {
1687
-                    $lines[] = $this->spaces.' * @' . $this->annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")';
1687
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'GeneratedValue(strategy="'.$generatorType.'")';
1688 1688
                 }
1689 1689
 
1690 1690
                 if ($metadata->sequenceGeneratorDefinition) {
1691 1691
                     $sequenceGenerator = array();
1692 1692
 
1693 1693
                     if (isset($metadata->sequenceGeneratorDefinition['sequenceName'])) {
1694
-                        $sequenceGenerator[] = 'sequenceName="' . $metadata->sequenceGeneratorDefinition['sequenceName'] . '"';
1694
+                        $sequenceGenerator[] = 'sequenceName="'.$metadata->sequenceGeneratorDefinition['sequenceName'].'"';
1695 1695
                     }
1696 1696
 
1697 1697
                     if (isset($metadata->sequenceGeneratorDefinition['allocationSize'])) {
1698
-                        $sequenceGenerator[] = 'allocationSize=' . $metadata->sequenceGeneratorDefinition['allocationSize'];
1698
+                        $sequenceGenerator[] = 'allocationSize='.$metadata->sequenceGeneratorDefinition['allocationSize'];
1699 1699
                     }
1700 1700
 
1701 1701
                     if (isset($metadata->sequenceGeneratorDefinition['initialValue'])) {
1702
-                        $sequenceGenerator[] = 'initialValue=' . $metadata->sequenceGeneratorDefinition['initialValue'];
1702
+                        $sequenceGenerator[] = 'initialValue='.$metadata->sequenceGeneratorDefinition['initialValue'];
1703 1703
                     }
1704 1704
 
1705
-                    $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'SequenceGenerator(' . implode(', ', $sequenceGenerator) . ')';
1705
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'SequenceGenerator('.implode(', ', $sequenceGenerator).')';
1706 1706
                 }
1707 1707
             }
1708 1708
 
1709 1709
             if (isset($fieldMapping['version']) && $fieldMapping['version']) {
1710
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Version';
1710
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Version';
1711 1711
             }
1712 1712
         }
1713 1713
 
1714
-        $lines[] = $this->spaces . ' */';
1714
+        $lines[] = $this->spaces.' */';
1715 1715
 
1716 1716
         return implode("\n", $lines);
1717 1717
     }
@@ -1724,23 +1724,23 @@  discard block
 block discarded – undo
1724 1724
     protected function generateEmbeddedPropertyDocBlock(array $embeddedClass)
1725 1725
     {
1726 1726
         $lines = array();
1727
-        $lines[] = $this->spaces . '/**';
1728
-        $lines[] = $this->spaces . ' * @var \\' . ltrim($embeddedClass['class'], '\\');
1727
+        $lines[] = $this->spaces.'/**';
1728
+        $lines[] = $this->spaces.' * @var \\'.ltrim($embeddedClass['class'], '\\');
1729 1729
 
1730 1730
         if ($this->generateAnnotations) {
1731
-            $lines[] = $this->spaces . ' *';
1731
+            $lines[] = $this->spaces.' *';
1732 1732
 
1733
-            $embedded = array('class="' . $embeddedClass['class'] . '"');
1733
+            $embedded = array('class="'.$embeddedClass['class'].'"');
1734 1734
 
1735 1735
             if (isset($fieldMapping['columnPrefix'])) {
1736
-                $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true);
1736
+                $embedded[] = 'columnPrefix='.var_export($embeddedClass['columnPrefix'], true);
1737 1737
             }
1738 1738
 
1739
-            $lines[] = $this->spaces . ' * @' .
1740
-                $this->annotationsPrefix . 'Embedded(' . implode(', ', $embedded) . ')';
1739
+            $lines[] = $this->spaces.' * @'.
1740
+                $this->annotationsPrefix.'Embedded('.implode(', ', $embedded).')';
1741 1741
         }
1742 1742
 
1743
-        $lines[] = $this->spaces . ' */';
1743
+        $lines[] = $this->spaces.' */';
1744 1744
 
1745 1745
         return implode("\n", $lines);
1746 1746
     }
@@ -1757,7 +1757,7 @@  discard block
 block discarded – undo
1757 1757
 
1758 1758
         foreach ($lines as $key => $value) {
1759 1759
             if ( ! empty($value)) {
1760
-                $lines[$key] = str_repeat($this->spaces, $num) . $lines[$key];
1760
+                $lines[$key] = str_repeat($this->spaces, $num).$lines[$key];
1761 1761
             }
1762 1762
         }
1763 1763
 
@@ -1839,9 +1839,9 @@  discard block
 block discarded – undo
1839 1839
 
1840 1840
         foreach ($options as $name => $option) {
1841 1841
             if (is_array($option)) {
1842
-                $optionsStr[] = '"' . $name . '"={' . $this->exportTableOptions($option) . '}';
1842
+                $optionsStr[] = '"'.$name.'"={'.$this->exportTableOptions($option).'}';
1843 1843
             } else {
1844
-                $optionsStr[] = '"' . $name . '"="' . (string) $option . '"';
1844
+                $optionsStr[] = '"'.$name.'"="'.(string) $option.'"';
1845 1845
             }
1846 1846
         }
1847 1847
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/SchemaTool.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
                             $inheritedKeyColumns[] = $columnName;
224 224
                         }
225 225
                     }
226
-                    if (!empty($inheritedKeyColumns)) {
226
+                    if ( ! empty($inheritedKeyColumns)) {
227 227
                         // Add a FK constraint on the ID column
228 228
                         $table->addForeignKeyConstraint(
229 229
                             $this->quoteStrategy->getTableName(
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
             }
331 331
         }
332 332
 
333
-        if ( ! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas() ) {
333
+        if ( ! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas()) {
334 334
             $schema->visit(new RemoveNamespacedAssets());
335 335
         }
336 336
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
 
405 405
         // For now, this is a hack required for single table inheritence, since this method is called
406 406
         // twice by single table inheritence relations
407
-        if (!$table->hasIndex('primary')) {
407
+        if ( ! $table->hasIndex('primary')) {
408 408
             //$table->setPrimaryKey($pkColumns);
409 409
         }
410 410
     }
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
641 641
             if ( ! $definingClass) {
642 642
                 throw new \Doctrine\ORM\ORMException(
643 643
                     "Column name `".$joinColumn['referencedColumnName']."` referenced for relation from ".
644
-                    $mapping['sourceEntity'] . " towards ". $mapping['targetEntity'] . " does not exist."
644
+                    $mapping['sourceEntity']." towards ".$mapping['targetEntity']." does not exist."
645 645
                 );
646 646
             }
647 647
 
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
                 $columnOptions = array('notnull' => false, 'columnDefinition' => $columnDef);
674 674
 
675 675
                 if (isset($joinColumn['nullable'])) {
676
-                    $columnOptions['notnull'] = !$joinColumn['nullable'];
676
+                    $columnOptions['notnull'] = ! $joinColumn['nullable'];
677 677
                 }
678 678
 
679 679
                 if (isset($fieldMapping['options'])) {
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
720 720
                 }
721 721
             }
722 722
             $blacklistedFks[$compositeName] = true;
723
-        } elseif (!isset($blacklistedFks[$compositeName])) {
723
+        } elseif ( ! isset($blacklistedFks[$compositeName])) {
724 724
             $addedFks[$compositeName] = array('foreignTableName' => $foreignTableName, 'foreignColumns' => $foreignColumns);
725 725
             $theJoinTable->addUnnamedForeignKeyConstraint(
726 726
                 $foreignTableName,
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
827 827
                 if ($table->hasPrimaryKey()) {
828 828
                     $columns = $table->getPrimaryKey()->getColumns();
829 829
                     if (count($columns) == 1) {
830
-                        $checkSequence = $table->getName() . "_" . $columns[0] . "_seq";
830
+                        $checkSequence = $table->getName()."_".$columns[0]."_seq";
831 831
                         if ($fullSchema->hasSequence($checkSequence)) {
832 832
                             $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
833 833
                         }
Please login to merge, or discard this patch.