doctrine / orm

lib/Doctrine/ORM/Tools/EntityGenerator.php

Indentation +9 added lines, -9 removed lines

@@ -1299,7 +1299,7 @@ 
 
             $lines[] = $this->generateAssociationMappingPropertyDocBlock($associationMapping, $metadata);
             $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $associationMapping['fieldName']
-                     . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null) . ";\n";
+                        . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null) . ";\n";
         }
 
         return implode("\n", $lines);
@@ -1395,14 +1395,14 @@ 
         }
 
         $replacements = [
-          '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
-          '<methodTypeHint>'    => $methodTypeHint,
-          '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
-          '<variableName>'      => $variableName,
-          '<methodName>'        => $methodName,
-          '<fieldName>'         => $fieldName,
-          '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
-          '<entity>'            => $this->getClassName($metadata)
+            '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
+            '<methodTypeHint>'    => $methodTypeHint,
+            '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
+            '<variableName>'      => $variableName,
+            '<methodName>'        => $methodName,
+            '<fieldName>'         => $fieldName,
+            '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
+            '<entity>'            => $this->getClassName($metadata)
         ];
 
         $method = str_replace(

Spacing +151 added lines, -151 removed lines

@@ -340,7 +340,7 @@ 
      */
     public function __construct()
     {
-        @trigger_error(self::class . ' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
+        @trigger_error(self::class.' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
 
         if (version_compare(\Doctrine\Common\Version::VERSION, '2.2.0-DEV', '>=')) {
             $this->annotationsPrefix = 'ORM\\';
@@ -374,7 +374,7 @@ 
      */
     public function writeEntityClass(ClassMetadataInfo $metadata, $outputDirectory)
     {
-        $path = $outputDirectory . '/' . str_replace('\\', DIRECTORY_SEPARATOR, $metadata->name) . $this->extension;
+        $path = $outputDirectory.'/'.str_replace('\\', DIRECTORY_SEPARATOR, $metadata->name).$this->extension;
         $dir = dirname($path);
 
         if ( ! is_dir($dir)) {
@@ -390,8 +390,8 @@ 
         }
 
         if ($this->backupExisting && file_exists($path)) {
-            $backupPath = dirname($path) . DIRECTORY_SEPARATOR . basename($path) . "~";
-            if (!copy($path, $backupPath)) {
+            $backupPath = dirname($path).DIRECTORY_SEPARATOR.basename($path)."~";
+            if ( ! copy($path, $backupPath)) {
                 throw new \RuntimeException("Attempt to backup overwritten entity file but copy operation failed.");
             }
         }
@@ -452,7 +452,7 @@ 
         $body = str_replace('<spaces>', $this->spaces, $body);
         $last = strrpos($currentCode, '}');
 
-        return substr($currentCode, 0, $last) . $body . ($body ? "\n" : '') . "}\n";
+        return substr($currentCode, 0, $last).$body.($body ? "\n" : '')."}\n";
     }
 
     /**
@@ -516,7 +516,7 @@ 
     public function setFieldVisibility($visibility)
     {
         if ($visibility !== static::FIELD_VISIBLE_PRIVATE && $visibility !== static::FIELD_VISIBLE_PROTECTED) {
-            throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): ' . $visibility);
+            throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): '.$visibility);
         }
 
         $this->fieldVisibility = $visibility;
@@ -613,11 +613,11 @@ 
      */
     protected function generateEntityNamespace(ClassMetadataInfo $metadata)
     {
-        if (! $this->hasNamespace($metadata)) {
+        if ( ! $this->hasNamespace($metadata)) {
             return '';
         }
 
-        return 'namespace ' . $this->getNamespace($metadata) .';';
+        return 'namespace '.$this->getNamespace($metadata).';';
     }
 
     /**
@@ -625,7 +625,7 @@ 
      */
     protected function generateEntityUse()
     {
-        if (! $this->generateAnnotations) {
+        if ( ! $this->generateAnnotations) {
             return '';
         }
 
@@ -639,8 +639,8 @@ 
      */
     protected function generateEntityClassName(ClassMetadataInfo $metadata)
     {
-        return 'class ' . $this->getClassName($metadata) .
-            ($this->extendsClass() ? ' extends ' . $this->getClassToExtendName() : null);
+        return 'class '.$this->getClassName($metadata).
+            ($this->extendsClass() ? ' extends '.$this->getClassToExtendName() : null);
     }
 
     /**
@@ -742,13 +742,13 @@ 
         $fieldMappings = array_merge($requiredFields, $optionalFields);
 
         foreach ($metadata->embeddedClasses as $fieldName => $embeddedClass) {
-            $paramType = '\\' . ltrim($embeddedClass['class'], '\\');
-            $paramVariable = '$' . $fieldName;
+            $paramType = '\\'.ltrim($embeddedClass['class'], '\\');
+            $paramVariable = '$'.$fieldName;
 
             $paramTypes[] = $paramType;
             $paramVariables[] = $paramVariable;
-            $params[] = $paramType . ' ' . $paramVariable;
-            $fields[] = '$this->' . $fieldName . ' = ' . $paramVariable . ';';
+            $params[] = $paramType.' '.$paramVariable;
+            $fields[] = '$this->'.$fieldName.' = '.$paramVariable.';';
         }
 
         foreach ($fieldMappings as $fieldMapping) {
@@ -756,27 +756,27 @@ 
                 continue;
             }
 
-            $paramTypes[] = $this->getType($fieldMapping['type']) . (!empty($fieldMapping['nullable']) ? '|null' : '');
-            $param = '$' . $fieldMapping['fieldName'];
+            $paramTypes[] = $this->getType($fieldMapping['type']).( ! empty($fieldMapping['nullable']) ? '|null' : '');
+            $param = '$'.$fieldMapping['fieldName'];
             $paramVariables[] = $param;
 
             if ($fieldMapping['type'] === 'datetime') {
-                $param = $this->getType($fieldMapping['type']) . ' ' . $param;
+                $param = $this->getType($fieldMapping['type']).' '.$param;
             }
 
-            if (!empty($fieldMapping['nullable'])) {
+            if ( ! empty($fieldMapping['nullable'])) {
                 $param .= ' = null';
             }
 
             $params[] = $param;
 
-            $fields[] = '$this->' . $fieldMapping['fieldName'] . ' = $' . $fieldMapping['fieldName'] . ';';
+            $fields[] = '$this->'.$fieldMapping['fieldName'].' = $'.$fieldMapping['fieldName'].';';
         }
 
         $maxParamTypeLength = max(array_map('strlen', $paramTypes));
         $paramTags = array_map(
-            function ($type, $variable) use ($maxParamTypeLength) {
-                return '@param ' . $type . str_repeat(' ', $maxParamTypeLength - strlen($type) + 1) . $variable;
+            function($type, $variable) use ($maxParamTypeLength) {
+                return '@param '.$type.str_repeat(' ', $maxParamTypeLength - strlen($type) + 1).$variable;
             },
             $paramTypes,
             $paramVariables
@@ -784,8 +784,8 @@ 
 
         // Generate multi line constructor if the signature exceeds 120 characters.
         if (array_sum(array_map('strlen', $params)) + count($params) * 2 + 29 > 120) {
-            $delimiter = "\n" . $this->spaces;
-            $params = $delimiter . implode(',' . $delimiter, $params) . "\n";
+            $delimiter = "\n".$this->spaces;
+            $params = $delimiter.implode(','.$delimiter, $params)."\n";
         } else {
             $params = implode(', ', $params);
         }
@@ -793,7 +793,7 @@ 
         $replacements = [
             '<paramTags>' => implode("\n * ", $paramTags),
             '<params>'    => $params,
-            '<fields>'    => implode("\n" . $this->spaces, $fields),
+            '<fields>'    => implode("\n".$this->spaces, $fields),
         ];
 
         $constructor = str_replace(
@@ -838,7 +838,7 @@ 
 
             if ($inClass) {
                 $inClass = false;
-                $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1];
+                $lastSeenClass = $lastSeenNamespace.($lastSeenNamespace ? '\\' : '').$token[1];
                 $this->staticReflection[$lastSeenClass]['properties'] = [];
                 $this->staticReflection[$lastSeenClass]['methods'] = [];
             }
@@ -846,16 +846,16 @@ 
             if (T_NAMESPACE === $token[0]) {
                 $lastSeenNamespace = '';
                 $inNamespace = true;
-            } elseif (T_CLASS === $token[0] && T_DOUBLE_COLON !== $tokens[$i-1][0]) {
+            } elseif (T_CLASS === $token[0] && T_DOUBLE_COLON !== $tokens[$i - 1][0]) {
                 $inClass = true;
             } elseif (T_FUNCTION === $token[0]) {
-                if (T_STRING === $tokens[$i+2][0]) {
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+2][1]);
-                } elseif ($tokens[$i+2] == '&' && T_STRING === $tokens[$i+3][0]) {
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+3][1]);
+                if (T_STRING === $tokens[$i + 2][0]) {
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 2][1]);
+                } elseif ($tokens[$i + 2] == '&' && T_STRING === $tokens[$i + 3][0]) {
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 3][1]);
                 }
-            } elseif (in_array($token[0], [T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED], true) && T_FUNCTION !== $tokens[$i+2][0]) {
-                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i+2][1], 1);
+            } elseif (in_array($token[0], [T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED], true) && T_FUNCTION !== $tokens[$i + 2][0]) {
+                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i + 2][1], 1);
             }
         }
     }
@@ -868,7 +868,7 @@ 
      */
     protected function hasProperty($property, ClassMetadataInfo $metadata)
     {
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->name))) {
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->name))) {
             // don't generate property if its already on the base class.
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->name);
             if ($reflClass->hasProperty($property)) {
@@ -897,7 +897,7 @@ 
      */
     protected function hasMethod($method, ClassMetadataInfo $metadata)
     {
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->name))) {
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->name))) {
             // don't generate method if its already on the base class.
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->name);
 
@@ -928,7 +928,7 @@ 
      */
     protected function getTraits(ClassMetadataInfo $metadata)
     {
-        if (! ($metadata->reflClass !== null || class_exists($metadata->name))) {
+        if ( ! ($metadata->reflClass !== null || class_exists($metadata->name))) {
             return [];
         }
 
@@ -978,7 +978,7 @@ 
     {
         $refl = new \ReflectionClass($this->getClassToExtend());
 
-        return '\\' . $refl->getName();
+        return '\\'.$refl->getName();
     }
 
     /**
@@ -1011,7 +1011,7 @@ 
     {
         $lines = [];
         $lines[] = '/**';
-        $lines[] = ' * ' . $this->getClassName($metadata);
+        $lines[] = ' * '.$this->getClassName($metadata);
 
         if ($this->generateAnnotations) {
             $lines[] = ' *';
@@ -1027,12 +1027,12 @@ 
 
             foreach ($methods as $method) {
                 if ($code = $this->$method($metadata)) {
-                    $lines[] = ' * ' . $code;
+                    $lines[] = ' * '.$code;
                 }
             }
 
             if (isset($metadata->lifecycleCallbacks) && $metadata->lifecycleCallbacks) {
-                $lines[] = ' * @' . $this->annotationsPrefix . 'HasLifecycleCallbacks';
+                $lines[] = ' * @'.$this->annotationsPrefix.'HasLifecycleCallbacks';
             }
         }
 
@@ -1048,17 +1048,17 @@ 
      */
     protected function generateEntityAnnotation(ClassMetadataInfo $metadata)
     {
-        $prefix = '@' . $this->annotationsPrefix;
+        $prefix = '@'.$this->annotationsPrefix;
 
         if ($metadata->isEmbeddedClass) {
-            return $prefix . 'Embeddable';
+            return $prefix.'Embeddable';
         }
 
         $customRepository = $metadata->customRepositoryClassName
-            ? '(repositoryClass="' . $metadata->customRepositoryClassName . '")'
+            ? '(repositoryClass="'.$metadata->customRepositoryClassName.'")'
             : '';
 
-        return $prefix . ($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity') . $customRepository;
+        return $prefix.($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity').$customRepository;
     }
 
     /**
@@ -1075,28 +1075,28 @@ 
         $table = [];
 
         if (isset($metadata->table['schema'])) {
-            $table[] = 'schema="' . $metadata->table['schema'] . '"';
+            $table[] = 'schema="'.$metadata->table['schema'].'"';
         }
 
         if (isset($metadata->table['name'])) {
-            $table[] = 'name="' . $metadata->table['name'] . '"';
+            $table[] = 'name="'.$metadata->table['name'].'"';
         }
 
         if (isset($metadata->table['options']) && $metadata->table['options']) {
-            $table[] = 'options={' . $this->exportTableOptions((array) $metadata->table['options']) . '}';
+            $table[] = 'options={'.$this->exportTableOptions((array) $metadata->table['options']).'}';
         }
 
         if (isset($metadata->table['uniqueConstraints']) && $metadata->table['uniqueConstraints']) {
             $constraints = $this->generateTableConstraints('UniqueConstraint', $metadata->table['uniqueConstraints']);
-            $table[] = 'uniqueConstraints={' . $constraints . '}';
+            $table[] = 'uniqueConstraints={'.$constraints.'}';
         }
 
         if (isset($metadata->table['indexes']) && $metadata->table['indexes']) {
             $constraints = $this->generateTableConstraints('Index', $metadata->table['indexes']);
-            $table[] = 'indexes={' . $constraints . '}';
+            $table[] = 'indexes={'.$constraints.'}';
         }
 
-        return '@' . $this->annotationsPrefix . 'Table(' . implode(', ', $table) . ')';
+        return '@'.$this->annotationsPrefix.'Table('.implode(', ', $table).')';
     }
 
     /**
@@ -1111,9 +1111,9 @@ 
         foreach ($constraints as $name => $constraint) {
             $columns = [];
             foreach ($constraint['columns'] as $column) {
-                $columns[] = '"' . $column . '"';
+                $columns[] = '"'.$column.'"';
             }
-            $annotations[] = '@' . $this->annotationsPrefix . $constraintName . '(name="' . $name . '", columns={' . implode(', ', $columns) . '})';
+            $annotations[] = '@'.$this->annotationsPrefix.$constraintName.'(name="'.$name.'", columns={'.implode(', ', $columns).'})';
         }
 
         return implode(', ', $annotations);
@@ -1130,7 +1130,7 @@ 
             return '';
         }
 
-        return '@' . $this->annotationsPrefix . 'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
+        return '@'.$this->annotationsPrefix.'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
     }
 
     /**
@@ -1145,11 +1145,11 @@ 
         }
 
         $discrColumn = $metadata->discriminatorColumn;
-        $columnDefinition = 'name="' . $discrColumn['name']
-            . '", type="' . $discrColumn['type']
-            . '", length=' . $discrColumn['length'];
+        $columnDefinition = 'name="'.$discrColumn['name']
+            . '", type="'.$discrColumn['type']
+            . '", length='.$discrColumn['length'];
 
-        return '@' . $this->annotationsPrefix . 'DiscriminatorColumn(' . $columnDefinition . ')';
+        return '@'.$this->annotationsPrefix.'DiscriminatorColumn('.$columnDefinition.')';
     }
 
     /**
@@ -1166,10 +1166,10 @@ 
         $inheritanceClassMap = [];
 
         foreach ($metadata->discriminatorMap as $type => $class) {
-            $inheritanceClassMap[] .= '"' . $type . '" = "' . $class . '"';
+            $inheritanceClassMap[] .= '"'.$type.'" = "'.$class.'"';
         }
 
-        return '@' . $this->annotationsPrefix . 'DiscriminatorMap({' . implode(', ', $inheritanceClassMap) . '})';
+        return '@'.$this->annotationsPrefix.'DiscriminatorMap({'.implode(', ', $inheritanceClassMap).'})';
     }
 
     /**
@@ -1188,8 +1188,8 @@ 
 
             $nullableField = $this->nullableFieldExpression($fieldMapping);
 
-            if ((!$metadata->isEmbeddedClass || !$this->embeddablesImmutable)
-                && (!isset($fieldMapping['id']) || ! $fieldMapping['id'] || $metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_NONE)
+            if (( ! $metadata->isEmbeddedClass || ! $this->embeddablesImmutable)
+                && ( ! isset($fieldMapping['id']) || ! $fieldMapping['id'] || $metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_NONE)
                 && $code = $this->generateEntityStubMethod($metadata, 'set', $fieldMapping['fieldName'], $fieldMapping['type'], $nullableField)
             ) {
                 $methods[] = $code;
@@ -1260,7 +1260,7 @@ 
         }
 
         foreach ($joinColumns as $joinColumn) {
-            if (isset($joinColumn['nullable']) && !$joinColumn['nullable']) {
+            if (isset($joinColumn['nullable']) && ! $joinColumn['nullable']) {
                 return false;
             }
         }
@@ -1305,8 +1305,8 @@ 
             }
 
             $lines[] = $this->generateAssociationMappingPropertyDocBlock($associationMapping, $metadata);
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $associationMapping['fieldName']
-                     . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null) . ";\n";
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$associationMapping['fieldName']
+                     . ($associationMapping['type'] == 'manyToMany' ? ' = array()' : null).";\n";
         }
 
         return implode("\n", $lines);
@@ -1334,12 +1334,12 @@ 
                 if ($fieldMapping['type'] === 'boolean' && $fieldMapping['options']['default'] === '1') {
                     $defaultValue = ' = true';
                 } else {
-                    $defaultValue = ' = ' . var_export($fieldMapping['options']['default'], true);
+                    $defaultValue = ' = '.var_export($fieldMapping['options']['default'], true);
                 }
             }
 
             $lines[] = $this->generateFieldMappingPropertyDocBlock($fieldMapping, $metadata);
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldMapping['fieldName'] . $defaultValue . ";\n";
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldMapping['fieldName'].$defaultValue.";\n";
         }
 
         return implode("\n", $lines);
@@ -1360,7 +1360,7 @@ 
             }
 
             $lines[] = $this->generateEmbeddedPropertyDocBlock($embeddedClass);
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldName . ";\n";
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldName.";\n";
         }
 
         return implode("\n", $lines);
@@ -1377,7 +1377,7 @@ 
      */
     protected function generateEntityStubMethod(ClassMetadataInfo $metadata, $type, $fieldName, $typeHint = null, $defaultValue = null)
     {
-        $methodName = $type . Inflector::classify($fieldName);
+        $methodName = $type.Inflector::classify($fieldName);
         $variableName = Inflector::camelize($fieldName);
         if (in_array($type, ["add", "remove"])) {
             $methodName = Inflector::singularize($methodName);
@@ -1397,18 +1397,18 @@ 
         $variableType   = $typeHint ? $this->getType($typeHint) : null;
 
         if ($typeHint && ! isset($types[$typeHint])) {
-            $variableType   =  '\\' . ltrim($variableType, '\\');
-            $methodTypeHint =  '\\' . $typeHint . ' ';
+            $variableType   = '\\'.ltrim($variableType, '\\');
+            $methodTypeHint = '\\'.$typeHint.' ';
         }
 
         $replacements = [
-          '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
+          '<description>'       => ucfirst($type).' '.$variableName.'.',
           '<methodTypeHint>'    => $methodTypeHint,
-          '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
+          '<variableType>'      => $variableType.(null !== $defaultValue ? ('|'.$defaultValue) : ''),
           '<variableName>'      => $variableName,
           '<methodName>'        => $methodName,
           '<fieldName>'         => $fieldName,
-          '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
+          '<variableDefault>'   => ($defaultValue !== null) ? (' = '.$defaultValue) : '',
           '<entity>'            => $this->getClassName($metadata)
         ];
 
@@ -1437,7 +1437,7 @@ 
         $this->staticReflection[$metadata->name]['methods'][] = $methodName;
 
         $replacements = [
-            '<name>'        => $this->annotationsPrefix . ucfirst($name),
+            '<name>'        => $this->annotationsPrefix.ucfirst($name),
             '<methodName>'  => $methodName,
         ];
 
@@ -1460,30 +1460,30 @@ 
         $joinColumnAnnot = [];
 
         if (isset($joinColumn['name'])) {
-            $joinColumnAnnot[] = 'name="' . $joinColumn['name'] . '"';
+            $joinColumnAnnot[] = 'name="'.$joinColumn['name'].'"';
         }
 
         if (isset($joinColumn['referencedColumnName'])) {
-            $joinColumnAnnot[] = 'referencedColumnName="' . $joinColumn['referencedColumnName'] . '"';
+            $joinColumnAnnot[] = 'referencedColumnName="'.$joinColumn['referencedColumnName'].'"';
         }
 
         if (isset($joinColumn['unique']) && $joinColumn['unique']) {
-            $joinColumnAnnot[] = 'unique=' . ($joinColumn['unique'] ? 'true' : 'false');
+            $joinColumnAnnot[] = 'unique='.($joinColumn['unique'] ? 'true' : 'false');
         }
 
         if (isset($joinColumn['nullable'])) {
-            $joinColumnAnnot[] = 'nullable=' . ($joinColumn['nullable'] ? 'true' : 'false');
+            $joinColumnAnnot[] = 'nullable='.($joinColumn['nullable'] ? 'true' : 'false');
         }
 
         if (isset($joinColumn['onDelete'])) {
-            $joinColumnAnnot[] = 'onDelete="' . ($joinColumn['onDelete'] . '"');
+            $joinColumnAnnot[] = 'onDelete="'.($joinColumn['onDelete'].'"');
         }
 
         if (isset($joinColumn['columnDefinition'])) {
-            $joinColumnAnnot[] = 'columnDefinition="' . $joinColumn['columnDefinition'] . '"';
+            $joinColumnAnnot[] = 'columnDefinition="'.$joinColumn['columnDefinition'].'"';
         }
 
-        return '@' . $this->annotationsPrefix . 'JoinColumn(' . implode(', ', $joinColumnAnnot) . ')';
+        return '@'.$this->annotationsPrefix.'JoinColumn('.implode(', ', $joinColumnAnnot).')';
     }
 
     /**
@@ -1495,22 +1495,22 @@ 
     protected function generateAssociationMappingPropertyDocBlock(array $associationMapping, ClassMetadataInfo $metadata)
     {
         $lines = [];
-        $lines[] = $this->spaces . '/**';
+        $lines[] = $this->spaces.'/**';
 
         if ($associationMapping['type'] & ClassMetadataInfo::TO_MANY) {
-            $lines[] = $this->spaces . ' * @var \Doctrine\Common\Collections\Collection';
+            $lines[] = $this->spaces.' * @var \Doctrine\Common\Collections\Collection';
         } else {
-            $lines[] = $this->spaces . ' * @var \\' . ltrim($associationMapping['targetEntity'], '\\');
+            $lines[] = $this->spaces.' * @var \\'.ltrim($associationMapping['targetEntity'], '\\');
         }
 
         if ($this->generateAnnotations) {
-            $lines[] = $this->spaces . ' *';
+            $lines[] = $this->spaces.' *';
 
             if (isset($associationMapping['id']) && $associationMapping['id']) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Id';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Id';
 
                 if ($generatorType = $this->getIdGeneratorTypeString($metadata->generatorType)) {
-                    $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")';
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'GeneratedValue(strategy="'.$generatorType.'")';
                 }
             }
 
@@ -1532,15 +1532,15 @@ 
             $typeOptions = [];
 
             if (isset($associationMapping['targetEntity'])) {
-                $typeOptions[] = 'targetEntity="' . $associationMapping['targetEntity'] . '"';
+                $typeOptions[] = 'targetEntity="'.$associationMapping['targetEntity'].'"';
             }
 
             if (isset($associationMapping['inversedBy'])) {
-                $typeOptions[] = 'inversedBy="' . $associationMapping['inversedBy'] . '"';
+                $typeOptions[] = 'inversedBy="'.$associationMapping['inversedBy'].'"';
             }
 
             if (isset($associationMapping['mappedBy'])) {
-                $typeOptions[] = 'mappedBy="' . $associationMapping['mappedBy'] . '"';
+                $typeOptions[] = 'mappedBy="'.$associationMapping['mappedBy'].'"';
             }
 
             if ($associationMapping['cascade']) {
@@ -1556,11 +1556,11 @@ 
                     $cascades = ['"all"'];
                 }
 
-                $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}';
+                $typeOptions[] = 'cascade={'.implode(',', $cascades).'}';
             }
 
             if (isset($associationMapping['orphanRemoval']) && $associationMapping['orphanRemoval']) {
-                $typeOptions[] = 'orphanRemoval=' . ($associationMapping['orphanRemoval'] ? 'true' : 'false');
+                $typeOptions[] = 'orphanRemoval='.($associationMapping['orphanRemoval'] ? 'true' : 'false');
             }
 
             if (isset($associationMapping['fetch']) && $associationMapping['fetch'] !== ClassMetadataInfo::FETCH_LAZY) {
@@ -1569,71 +1569,71 @@ 
                     ClassMetadataInfo::FETCH_EAGER      => 'EAGER',
                 ];
 
-                $typeOptions[] = 'fetch="' . $fetchMap[$associationMapping['fetch']] . '"';
+                $typeOptions[] = 'fetch="'.$fetchMap[$associationMapping['fetch']].'"';
             }
 
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . '' . $type . '(' . implode(', ', $typeOptions) . ')';
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.''.$type.'('.implode(', ', $typeOptions).')';
 
             if (isset($associationMapping['joinColumns']) && $associationMapping['joinColumns']) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinColumns({';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinColumns({';
 
                 $joinColumnsLines = [];
 
                 foreach ($associationMapping['joinColumns'] as $joinColumn) {
                     if ($joinColumnAnnot = $this->generateJoinColumnAnnotation($joinColumn)) {
-                        $joinColumnsLines[] = $this->spaces . ' *   ' . $joinColumnAnnot;
+                        $joinColumnsLines[] = $this->spaces.' *   '.$joinColumnAnnot;
                     }
                 }
 
                 $lines[] = implode(",\n", $joinColumnsLines);
-                $lines[] = $this->spaces . ' * })';
+                $lines[] = $this->spaces.' * })';
             }
 
             if (isset($associationMapping['joinTable']) && $associationMapping['joinTable']) {
                 $joinTable = [];
-                $joinTable[] = 'name="' . $associationMapping['joinTable']['name'] . '"';
+                $joinTable[] = 'name="'.$associationMapping['joinTable']['name'].'"';
 
                 if (isset($associationMapping['joinTable']['schema'])) {
-                    $joinTable[] = 'schema="' . $associationMapping['joinTable']['schema'] . '"';
+                    $joinTable[] = 'schema="'.$associationMapping['joinTable']['schema'].'"';
                 }
 
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinTable(' . implode(', ', $joinTable) . ',';
-                $lines[] = $this->spaces . ' *   joinColumns={';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinTable('.implode(', ', $joinTable).',';
+                $lines[] = $this->spaces.' *   joinColumns={';
 
                 $joinColumnsLines = [];
 
                 foreach ($associationMapping['joinTable']['joinColumns'] as $joinColumn) {
-                    $joinColumnsLines[] = $this->spaces . ' *     ' . $this->generateJoinColumnAnnotation($joinColumn);
+                    $joinColumnsLines[] = $this->spaces.' *     '.$this->generateJoinColumnAnnotation($joinColumn);
                 }
 
-                $lines[] = implode(",". PHP_EOL, $joinColumnsLines);
-                $lines[] = $this->spaces . ' *   },';
-                $lines[] = $this->spaces . ' *   inverseJoinColumns={';
+                $lines[] = implode(",".PHP_EOL, $joinColumnsLines);
+                $lines[] = $this->spaces.' *   },';
+                $lines[] = $this->spaces.' *   inverseJoinColumns={';
 
                 $inverseJoinColumnsLines = [];
 
                 foreach ($associationMapping['joinTable']['inverseJoinColumns'] as $joinColumn) {
-                    $inverseJoinColumnsLines[] = $this->spaces . ' *     ' . $this->generateJoinColumnAnnotation($joinColumn);
+                    $inverseJoinColumnsLines[] = $this->spaces.' *     '.$this->generateJoinColumnAnnotation($joinColumn);
                 }
 
-                $lines[] = implode(",". PHP_EOL, $inverseJoinColumnsLines);
-                $lines[] = $this->spaces . ' *   }';
-                $lines[] = $this->spaces . ' * )';
+                $lines[] = implode(",".PHP_EOL, $inverseJoinColumnsLines);
+                $lines[] = $this->spaces.' *   }';
+                $lines[] = $this->spaces.' * )';
             }
 
             if (isset($associationMapping['orderBy'])) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'OrderBy({';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'OrderBy({';
 
                 foreach ($associationMapping['orderBy'] as $name => $direction) {
-                    $lines[] = $this->spaces . ' *     "' . $name . '"="' . $direction . '",';
+                    $lines[] = $this->spaces.' *     "'.$name.'"="'.$direction.'",';
                 }
 
                 $lines[count($lines) - 1] = substr($lines[count($lines) - 1], 0, strlen($lines[count($lines) - 1]) - 1);
-                $lines[] = $this->spaces . ' * })';
+                $lines[] = $this->spaces.' * })';
             }
         }
 
-        $lines[] = $this->spaces . ' */';
+        $lines[] = $this->spaces.' */';
 
         return implode("\n", $lines);
     }
@@ -1647,43 +1647,43 @@ 
     protected function generateFieldMappingPropertyDocBlock(array $fieldMapping, ClassMetadataInfo $metadata)
     {
         $lines = [];
-        $lines[] = $this->spaces . '/**';
-        $lines[] = $this->spaces . ' * @var '
+        $lines[] = $this->spaces.'/**';
+        $lines[] = $this->spaces.' * @var '
             . $this->getType($fieldMapping['type'])
             . ($this->nullableFieldExpression($fieldMapping) ? '|null' : '');
 
         if ($this->generateAnnotations) {
-            $lines[] = $this->spaces . ' *';
+            $lines[] = $this->spaces.' *';
 
             $column = [];
             if (isset($fieldMapping['columnName'])) {
-                $column[] = 'name="' . $fieldMapping['columnName'] . '"';
+                $column[] = 'name="'.$fieldMapping['columnName'].'"';
             }
 
             if (isset($fieldMapping['type'])) {
-                $column[] = 'type="' . $fieldMapping['type'] . '"';
+                $column[] = 'type="'.$fieldMapping['type'].'"';
             }
 
             if (isset($fieldMapping['length'])) {
-                $column[] = 'length=' . $fieldMapping['length'];
+                $column[] = 'length='.$fieldMapping['length'];
             }
 
             if (isset($fieldMapping['precision'])) {
-                $column[] = 'precision=' .  $fieldMapping['precision'];
+                $column[] = 'precision='.$fieldMapping['precision'];
             }
 
             if (isset($fieldMapping['scale'])) {
-                $column[] = 'scale=' . $fieldMapping['scale'];
+                $column[] = 'scale='.$fieldMapping['scale'];
             }
 
             if (isset($fieldMapping['nullable'])) {
-                $column[] = 'nullable=' .  var_export($fieldMapping['nullable'], true);
+                $column[] = 'nullable='.var_export($fieldMapping['nullable'], true);
             }
 
             $options = [];
 
             if (isset($fieldMapping['options']['default']) && $fieldMapping['options']['default']) {
-                $options[] = '"default"="' . $fieldMapping['options']['default'] .'"';
+                $options[] = '"default"="'.$fieldMapping['options']['default'].'"';
             }
 
             if (isset($fieldMapping['options']['unsigned']) && $fieldMapping['options']['unsigned']) {
@@ -1695,15 +1695,15 @@ 
             }
 
             if (isset($fieldMapping['options']['comment']) && $fieldMapping['options']['comment']) {
-                $options[] = '"comment"="' . str_replace('"', '""', $fieldMapping['options']['comment']) . '"';
+                $options[] = '"comment"="'.str_replace('"', '""', $fieldMapping['options']['comment']).'"';
             }
 
             if (isset($fieldMapping['options']['collation']) && $fieldMapping['options']['collation']) {
-                $options[] = '"collation"="' . $fieldMapping['options']['collation'] .'"';
+                $options[] = '"collation"="'.$fieldMapping['options']['collation'].'"';
             }
 
             if (isset($fieldMapping['options']['check']) && $fieldMapping['options']['check']) {
-                $options[] = '"check"="' . $fieldMapping['options']['check'] .'"';
+                $options[] = '"check"="'.$fieldMapping['options']['check'].'"';
             }
 
             if ($options) {
@@ -1711,47 +1711,47 @@ 
             }
 
             if (isset($fieldMapping['columnDefinition'])) {
-                $column[] = 'columnDefinition="' . $fieldMapping['columnDefinition'] . '"';
+                $column[] = 'columnDefinition="'.$fieldMapping['columnDefinition'].'"';
             }
 
             if (isset($fieldMapping['unique'])) {
-                $column[] = 'unique=' . var_export($fieldMapping['unique'], true);
+                $column[] = 'unique='.var_export($fieldMapping['unique'], true);
             }
 
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Column(' . implode(', ', $column) . ')';
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Column('.implode(', ', $column).')';
 
             if (isset($fieldMapping['id']) && $fieldMapping['id']) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Id';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Id';
 
                 if ($generatorType = $this->getIdGeneratorTypeString($metadata->generatorType)) {
-                    $lines[] = $this->spaces.' * @' . $this->annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")';
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'GeneratedValue(strategy="'.$generatorType.'")';
                 }
 
                 if ($metadata->sequenceGeneratorDefinition) {
                     $sequenceGenerator = [];
 
                     if (isset($metadata->sequenceGeneratorDefinition['sequenceName'])) {
-                        $sequenceGenerator[] = 'sequenceName="' . $metadata->sequenceGeneratorDefinition['sequenceName'] . '"';
+                        $sequenceGenerator[] = 'sequenceName="'.$metadata->sequenceGeneratorDefinition['sequenceName'].'"';
                     }
 
                     if (isset($metadata->sequenceGeneratorDefinition['allocationSize'])) {
-                        $sequenceGenerator[] = 'allocationSize=' . $metadata->sequenceGeneratorDefinition['allocationSize'];
+                        $sequenceGenerator[] = 'allocationSize='.$metadata->sequenceGeneratorDefinition['allocationSize'];
                     }
 
                     if (isset($metadata->sequenceGeneratorDefinition['initialValue'])) {
-                        $sequenceGenerator[] = 'initialValue=' . $metadata->sequenceGeneratorDefinition['initialValue'];
+                        $sequenceGenerator[] = 'initialValue='.$metadata->sequenceGeneratorDefinition['initialValue'];
                     }
 
-                    $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'SequenceGenerator(' . implode(', ', $sequenceGenerator) . ')';
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'SequenceGenerator('.implode(', ', $sequenceGenerator).')';
                 }
             }
 
             if (isset($fieldMapping['version']) && $fieldMapping['version']) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Version';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Version';
             }
         }
 
-        $lines[] = $this->spaces . ' */';
+        $lines[] = $this->spaces.' */';
 
         return implode("\n", $lines);
     }
@@ -1764,27 +1764,27 @@ 
     protected function generateEmbeddedPropertyDocBlock(array $embeddedClass)
     {
         $lines = [];
-        $lines[] = $this->spaces . '/**';
-        $lines[] = $this->spaces . ' * @var \\' . ltrim($embeddedClass['class'], '\\');
+        $lines[] = $this->spaces.'/**';
+        $lines[] = $this->spaces.' * @var \\'.ltrim($embeddedClass['class'], '\\');
 
         if ($this->generateAnnotations) {
-            $lines[] = $this->spaces . ' *';
+            $lines[] = $this->spaces.' *';
 
-            $embedded = ['class="' . $embeddedClass['class'] . '"'];
+            $embedded = ['class="'.$embeddedClass['class'].'"'];
 
             if (isset($embeddedClass['columnPrefix'])) {
                 if (is_string($embeddedClass['columnPrefix'])) {
-                    $embedded[] = 'columnPrefix="' . $embeddedClass['columnPrefix'] . '"';
+                    $embedded[] = 'columnPrefix="'.$embeddedClass['columnPrefix'].'"';
                 } else {
-                    $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true);
+                    $embedded[] = 'columnPrefix='.var_export($embeddedClass['columnPrefix'], true);
                 }
             }
 
-            $lines[] = $this->spaces . ' * @' .
-                $this->annotationsPrefix . 'Embedded(' . implode(', ', $embedded) . ')';
+            $lines[] = $this->spaces.' * @'.
+                $this->annotationsPrefix.'Embedded('.implode(', ', $embedded).')';
         }
 
-        $lines[] = $this->spaces . ' */';
+        $lines[] = $this->spaces.' */';
 
         return implode("\n", $lines);
     }
@@ -1798,13 +1798,13 @@ 
         $processedClasses = [];
         foreach ($metadata->entityListeners as $event => $eventListeners) {
             foreach ($eventListeners as $eventListener) {
-                $processedClasses[] = '"' . $eventListener['class'] . '"';
+                $processedClasses[] = '"'.$eventListener['class'].'"';
             }
         }
 
         return \sprintf(
             '%s%s({%s})',
-            '@' . $this->annotationsPrefix,
+            '@'.$this->annotationsPrefix,
             'EntityListeners',
             \implode(',', \array_unique($processedClasses))
         );
@@ -1822,7 +1822,7 @@ 
 
         foreach ($lines as $key => $value) {
             if ( ! empty($value)) {
-                $lines[$key] = str_repeat($this->spaces, $num) . $lines[$key];
+                $lines[$key] = str_repeat($this->spaces, $num).$lines[$key];
             }
         }
 
@@ -1904,9 +1904,9 @@ 
 
         foreach ($options as $name => $option) {
             if (is_array($option)) {
-                $optionsStr[] = '"' . $name . '"={' . $this->exportTableOptions($option) . '}';
+                $optionsStr[] = '"'.$name.'"={'.$this->exportTableOptions($option).'}';
             } else {
-                $optionsStr[] = '"' . $name . '"="' . (string) $option . '"';
+                $optionsStr[] = '"'.$name.'"="'.(string) $option.'"';
             }
         }
 

tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php

Spacing +62 added lines, -62 removed lines

@@ -30,7 +30,7 @@ 
     {
         $this->_namespace = uniqid("doctrine_");
         $this->_tmpDir = \sys_get_temp_dir();
-        \mkdir($this->_tmpDir . \DIRECTORY_SEPARATOR . $this->_namespace);
+        \mkdir($this->_tmpDir.\DIRECTORY_SEPARATOR.$this->_namespace);
         $this->_generator = new EntityGenerator();
         $this->_generator->setAnnotationPrefix("");
         $this->_generator->setGenerateAnnotations(true);
@@ -42,14 +42,14 @@ 
 
     public function tearDown()
     {
-        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir . '/' . $this->_namespace));
+        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir.'/'.$this->_namespace));
         foreach ($ri AS $file) {
             /* @var $file \SplFileInfo */
             if ($file->isFile()) {
                 \unlink($file->getPathname());
             }
         }
-        rmdir($this->_tmpDir . '/' . $this->_namespace);
+        rmdir($this->_tmpDir.'/'.$this->_namespace);
     }
 
     /** @after */
@@ -65,9 +65,9 @@ 
      */
     public function generateBookEntityFixture(array $embeddedClasses = [])
     {
-        $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook');
+        $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorBook');
         $metadata->namespace = $this->_namespace;
-        $metadata->customRepositoryClassName = $this->_namespace  . '\EntityGeneratorBookRepository';
+        $metadata->customRepositoryClassName = $this->_namespace.'\EntityGeneratorBookRepository';
 
         $metadata->table['name'] = 'book';
         $metadata->table['uniqueConstraints']['name_uniq'] = ['columns' => ['name']];
@@ -109,7 +109,7 @@ 
 
     private function generateEntityTypeFixture(array $field)
     {
-        $metadata = new ClassMetadataInfo($this->_namespace . '\EntityType');
+        $metadata = new ClassMetadataInfo($this->_namespace.'\EntityType');
         $metadata->namespace = $this->_namespace;
 
         $metadata->table['name'] = 'entity_type';
@@ -130,7 +130,7 @@ 
      */
     private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null)
     {
-        $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorIsbn');
+        $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorIsbn');
         $metadata->namespace = $this->_namespace;
         $metadata->isEmbeddedClass = true;
         $metadata->mapField(['fieldName' => 'prefix', 'type' => 'integer']);
@@ -153,7 +153,7 @@ 
      */
     private function generateTestEmbeddableFixture()
     {
-        $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorTestEmbeddable');
+        $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorTestEmbeddable');
         $metadata->namespace = $this->_namespace;
         $metadata->isEmbeddedClass = true;
         $metadata->mapField(['fieldName' => 'field1', 'type' => 'integer']);
@@ -196,11 +196,11 @@ 
         foreach ($embeddableMetadata->embeddedClasses as $property => $embeddableClass) {
             $classMetadata->mapEmbedded(
                 [
-                'fieldName' => $fieldName . '.' . $property,
+                'fieldName' => $fieldName.'.'.$property,
                 'class' => $embeddableClass['class'],
                 'columnPrefix' => $embeddableClass['columnPrefix'],
                 'declaredField' => $embeddableClass['declaredField']
-                        ? $fieldName . '.' . $embeddableClass['declaredField']
+                        ? $fieldName.'.'.$embeddableClass['declaredField']
                         : $fieldName,
                 'originalField' => $embeddableClass['originalField'] ?: $property,
                 ]
@@ -214,7 +214,7 @@ 
     private function loadEntityClass(ClassMetadataInfo $metadata)
     {
         $className = basename(str_replace('\\', '/', $metadata->name));
-        $path = $this->_tmpDir . '/' . $this->_namespace . '/' . $className . '.php';
+        $path = $this->_tmpDir.'/'.$this->_namespace.'/'.$className.'.php';
 
         $this->assertFileExists($path);
 
@@ -274,19 +274,19 @@ 
 
         $book = $this->newInstance($metadata);
         $this->assertTrue(class_exists($metadata->name), "Class does not exist.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', '__construct'), "EntityGeneratorBook::__construct() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getId'), "EntityGeneratorBook::getId() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setName'), "EntityGeneratorBook::setName() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getName'), "EntityGeneratorBook::getName() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setStatus'), "EntityGeneratorBook::setStatus() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getStatus'), "EntityGeneratorBook::getStatus() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setAuthor'), "EntityGeneratorBook::setAuthor() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getAuthor'), "EntityGeneratorBook::getAuthor() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getComments'), "EntityGeneratorBook::getComments() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'addComment'), "EntityGeneratorBook::addComment() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'removeComment'), "EntityGeneratorBook::removeComment() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setIsbn'), "EntityGeneratorBook::setIsbn() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getIsbn'), "EntityGeneratorBook::getIsbn() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', '__construct'), "EntityGeneratorBook::__construct() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getId'), "EntityGeneratorBook::getId() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setName'), "EntityGeneratorBook::setName() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getName'), "EntityGeneratorBook::getName() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setStatus'), "EntityGeneratorBook::setStatus() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getStatus'), "EntityGeneratorBook::getStatus() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setAuthor'), "EntityGeneratorBook::setAuthor() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getAuthor'), "EntityGeneratorBook::getAuthor() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getComments'), "EntityGeneratorBook::getComments() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'addComment'), "EntityGeneratorBook::addComment() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'removeComment'), "EntityGeneratorBook::removeComment() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setIsbn'), "EntityGeneratorBook::setIsbn() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getIsbn'), "EntityGeneratorBook::getIsbn() missing.");
 
         $reflClass = new \ReflectionClass($metadata->name);
 
@@ -339,7 +339,7 @@ 
 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $this->assertFileExists($this->_tmpDir . '/' . $this->_namespace . '/EntityGeneratorBook.php~');
+        $this->assertFileExists($this->_tmpDir.'/'.$this->_namespace.'/EntityGeneratorBook.php~');
 
         $book      = $this->newInstance($metadata);
         $reflClass = new ReflectionClass($metadata->name);
@@ -358,7 +358,7 @@ 
 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/EntityGeneratorBook.php~");
+        $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/EntityGeneratorBook.php~");
 
         $book = $this->newInstance($metadata);
         $reflClass = new \ReflectionClass($metadata->name);
@@ -403,7 +403,7 @@ 
         // Should not throw a PHP fatal error
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/EntityGeneratorBook.php~");
+        $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/EntityGeneratorBook.php~");
 
         $this->newInstance($metadata);
         $reflClass = new \ReflectionClass($metadata->name);
@@ -438,7 +438,7 @@ 
         $this->assertPhpDocReturnType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'getAuthor'));
         $this->assertPhpDocParamType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'setAuthor'));
 
-        $expectedClassName = '\\' . $embeddedMetadata->name;
+        $expectedClassName = '\\'.$embeddedMetadata->name;
         $this->assertPhpDocVarType($expectedClassName, new \ReflectionProperty($book, 'isbn'));
         $this->assertPhpDocReturnType($expectedClassName, new \ReflectionMethod($book, 'getIsbn'));
         $this->assertPhpDocParamType($expectedClassName, new \ReflectionMethod($book, 'setIsbn'));
@@ -548,7 +548,7 @@ 
      */
     public function testMappedSuperclassAnnotationGeneration()
     {
-        $metadata                     = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook');
+        $metadata                     = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorBook');
         $metadata->namespace          = $this->_namespace;
         $metadata->isMappedSuperclass = true;
 
@@ -586,7 +586,7 @@ 
      */
     public function testGenerateEntityWithSequenceGenerator()
     {
-        $metadata               = new ClassMetadataInfo($this->_namespace . '\DDC1784Entity');
+        $metadata               = new ClassMetadataInfo($this->_namespace.'\DDC1784Entity');
         $metadata->namespace    = $this->_namespace;
         $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
@@ -599,8 +599,8 @@ 
         );
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $filename = $this->_tmpDir . DIRECTORY_SEPARATOR
-                  . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php';
+        $filename = $this->_tmpDir.DIRECTORY_SEPARATOR
+                  . $this->_namespace.DIRECTORY_SEPARATOR.'DDC1784Entity.php';
 
         $this->assertFileExists($filename);
         require_once $filename;
@@ -620,7 +620,7 @@ 
      */
     public function testGenerateEntityWithMultipleInverseJoinColumns()
     {
-        $metadata               = new ClassMetadataInfo($this->_namespace . '\DDC2079Entity');
+        $metadata               = new ClassMetadataInfo($this->_namespace.'\DDC2079Entity');
         $metadata->namespace    = $this->_namespace;
         $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
@@ -631,20 +631,20 @@ 
             'joinTable'     => [
                 'name'                  => 'unidade_centro_custo',
                 'joinColumns'           => [
-                    ['name' => 'idorcamento',      'referencedColumnName' => 'idorcamento'],
-                    ['name' => 'idunidade',        'referencedColumnName' => 'idunidade']
+                    ['name' => 'idorcamento', 'referencedColumnName' => 'idorcamento'],
+                    ['name' => 'idunidade', 'referencedColumnName' => 'idunidade']
                 ],
                 'inverseJoinColumns'    => [
-                    ['name' => 'idcentrocusto',    'referencedColumnName' => 'idcentrocusto'],
-                    ['name' => 'idpais',           'referencedColumnName' => 'idpais'],
+                    ['name' => 'idcentrocusto', 'referencedColumnName' => 'idcentrocusto'],
+                    ['name' => 'idpais', 'referencedColumnName' => 'idpais'],
                 ],
             ],
             ]
         );
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $filename = $this->_tmpDir . DIRECTORY_SEPARATOR
-            . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC2079Entity.php';
+        $filename = $this->_tmpDir.DIRECTORY_SEPARATOR
+            . $this->_namespace.DIRECTORY_SEPARATOR.'DDC2079Entity.php';
 
         $this->assertFileExists($filename);
         require_once $filename;
@@ -674,7 +674,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -703,7 +703,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -732,7 +732,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -756,7 +756,7 @@ 
     public function testEntityTypeAlias(array $field)
     {
         $metadata   = $this->generateEntityTypeFixture($field);
-        $path       = $this->_tmpDir . '/'. $this->_namespace . '/EntityType.php';
+        $path       = $this->_tmpDir.'/'.$this->_namespace.'/EntityType.php';
 
         $this->assertFileExists($path);
         require_once $path;
@@ -767,8 +767,8 @@ 
         $type   = $field['phpType'];
         $name   = $field['fieldName'];
         $value  = $field['value'];
-        $getter = "get" . ucfirst($name);
-        $setter = "set" . ucfirst($name);
+        $getter = "get".ucfirst($name);
+        $setter = "set".ucfirst($name);
 
         $this->assertPhpDocVarType($type, $reflClass->getProperty($name));
         $this->assertPhpDocParamType($type, $reflClass->getMethod($setter));
@@ -789,13 +789,13 @@ 
 
         $user = new DDC2372User();
         $metadata = $cmf->getMetadataFor(get_class($user));
-        $metadata->name = $this->_namespace . "\DDC2372User";
+        $metadata->name = $this->_namespace."\DDC2372User";
         $metadata->namespace = $this->_namespace;
 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/DDC2372User.php");
-        require $this->_tmpDir . "/" . $this->_namespace . "/DDC2372User.php";
+        $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/DDC2372User.php");
+        require $this->_tmpDir."/".$this->_namespace."/DDC2372User.php";
 
         $reflClass = new \ReflectionClass($metadata->name);
 
@@ -815,13 +815,13 @@ 
 
         $user = new DDC2372Admin();
         $metadata = $cmf->getMetadataFor(get_class($user));
-        $metadata->name = $this->_namespace . "\DDC2372Admin";
+        $metadata->name = $this->_namespace."\DDC2372Admin";
         $metadata->namespace = $this->_namespace;
 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/DDC2372Admin.php");
-        require $this->_tmpDir . "/" . $this->_namespace . "/DDC2372Admin.php";
+        $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/DDC2372Admin.php");
+        require $this->_tmpDir."/".$this->_namespace."/DDC2372Admin.php";
 
         $reflClass = new \ReflectionClass($metadata->name);
 
@@ -841,20 +841,20 @@ 
         $cmf->setEntityManager($em);
 
         $ns     = $this->_namespace;
-        $nsdir  = $this->_tmpDir . '/' . $ns;
+        $nsdir  = $this->_tmpDir.'/'.$ns;
 
         $content = str_replace(
             'namespace Doctrine\Tests\Models\DDC1590',
-            'namespace ' . $ns,
-            file_get_contents(__DIR__ . '/../../Models/DDC1590/DDC1590User.php')
+            'namespace '.$ns,
+            file_get_contents(__DIR__.'/../../Models/DDC1590/DDC1590User.php')
         );
 
-        $fname = $nsdir . "/DDC1590User.php";
+        $fname = $nsdir."/DDC1590User.php";
         file_put_contents($fname, $content);
         require $fname;
 
 
-        $metadata = $cmf->getMetadataFor($ns . '\DDC1590User');
+        $metadata = $cmf->getMetadataFor($ns.'\DDC1590User');
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
         // class DDC1590User extends DDC1590Entity { ... }
@@ -862,13 +862,13 @@ 
 
         // class _DDC1590User extends DDC1590Entity { ... }
         $source2    = str_replace('class DDC1590User', 'class _DDC1590User', $source);
-        $fname2     = $nsdir . "/_DDC1590User.php";
+        $fname2     = $nsdir."/_DDC1590User.php";
         file_put_contents($fname2, $source2);
         require $fname2;
 
         // class __DDC1590User { ... }
         $source3    = str_replace('class DDC1590User extends DDC1590Entity', 'class __DDC1590User', $source);
-        $fname3     = $nsdir . "/__DDC1590User.php";
+        $fname3     = $nsdir."/__DDC1590User.php";
         file_put_contents($fname3, $source3);
         require $fname3;
 
@@ -1022,7 +1022,7 @@ 
         $this->loadEntityClass($metadata);
 
         $className = basename(str_replace('\\', '/', $metadata->name));
-        $path = $this->_tmpDir . '/' . $this->_namespace . '/' . $className . '.php';
+        $path = $this->_tmpDir.'/'.$this->_namespace.'/'.$className.'.php';
         $classTest = file_get_contents($path);
 
         $this->_generator->setRegenerateEntityIfExists(true);
@@ -1031,7 +1031,7 @@ 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
         $classNew = file_get_contents($path);
 
-        $this->assertSame($classTest,$classNew);
+        $this->assertSame($classTest, $classNew);
     }
 
     /**
@@ -1218,14 +1218,14 @@ 
      */
     public function testOptionsAreGeneratedProperly(string $expectedAnnotation, array $fieldConfiguration) : void
     {
-        $metadata               = new ClassMetadataInfo($this->_namespace . '\GH6703Options');
+        $metadata               = new ClassMetadataInfo($this->_namespace.'\GH6703Options');
         $metadata->namespace    = $this->_namespace;
         $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
         $metadata->mapField(['fieldName' => 'test'] + $fieldConfiguration);
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $filename = $this->_tmpDir . DIRECTORY_SEPARATOR . $this->_namespace . DIRECTORY_SEPARATOR . 'GH6703Options.php';
+        $filename = $this->_tmpDir.DIRECTORY_SEPARATOR.$this->_namespace.DIRECTORY_SEPARATOR.'GH6703Options.php';
 
         self::assertFileExists($filename);
         require_once $filename;

tests/Doctrine/Tests/VerifyDeprecations.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         $this->ignoredDeprecations  = [];
 
         $this->originalHandler = set_error_handler(
-            function (int $errorNumber, string $errorMessage) : void {
+            function(int $errorNumber, string $errorMessage) : void {
                 if (in_array($errorMessage, $this->ignoredDeprecations, true)) {
                     return;
                 }

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +6 added lines, -6 removed lines

@@ -226,7 +226,7 @@ 
                             $targetEntity = current(
                                 array_filter(
                                     $classes,
-                                    function (ClassMetadata $class) use ($idMapping) : bool {
+                                    function(ClassMetadata $class) use ($idMapping) : bool {
                                         return $class->name === $idMapping['targetEntity'];
                                     }
                                 )
@@ -646,8 +646,8 @@ 
 
             if ( ! $definingClass) {
                 throw new \Doctrine\ORM\ORMException(
-                    'Column name `' . $joinColumn['referencedColumnName'] . '` referenced for relation from '
-                    . $mapping['sourceEntity'] . ' towards ' . $mapping['targetEntity'] . ' does not exist.'
+                    'Column name `'.$joinColumn['referencedColumnName'].'` referenced for relation from '
+                    . $mapping['sourceEntity'].' towards '.$mapping['targetEntity'].' does not exist.'
                 );
             }
 
@@ -742,7 +742,7 @@ 
      */
     private function gatherColumnOptions(array $mapping) : array
     {
-        if (! isset($mapping['options'])) {
+        if ( ! isset($mapping['options'])) {
             return [];
         }
 
@@ -848,7 +848,7 @@ 
                 if ($table->hasPrimaryKey()) {
                     $columns = $table->getPrimaryKey()->getColumns();
                     if (count($columns) == 1) {
-                        $checkSequence = $table->getName() . '_' . $columns[0] . '_seq';
+                        $checkSequence = $table->getName().'_'.$columns[0].'_seq';
                         if ($fullSchema->hasSequence($checkSequence)) {
                             $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
                         }
@@ -922,7 +922,7 @@ 
         }
 
         // whitelist assets we already know about in $toSchema, use the existing filter otherwise
-        $config->setSchemaAssetsFilter(static function ($asset) use ($previousFilter, $toSchema) : bool {
+        $config->setSchemaAssetsFilter(static function($asset) use ($previousFilter, $toSchema) : bool {
             $assetName = $asset instanceof AbstractAsset ? $asset->getName() : $asset;
 
             return $toSchema->hasTable($assetName) || $toSchema->hasSequence($assetName) || $previousFilter($asset);

tests/Doctrine/Tests/ORM/Functional/Ticket/GH7875Test.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
      */
     private function filterCreateTable(array $sqls, string $tableName) : array
     {
-        return array_filter($sqls, static function (string $sql) use ($tableName) : bool {
+        return array_filter($sqls, static function(string $sql) use ($tableName) : bool {
             return strpos($sql, sprintf('CREATE TABLE %s (', $tableName)) === 0;
         });
     }
@@ -54,7 +54,7 @@ 
 
         $this->_em->getConnection()->exec(current($sqls));
 
-        $sqls = array_filter($tool->getUpdateSchemaSql($classes), static function (string $sql) : bool {
+        $sqls = array_filter($tool->getUpdateSchemaSql($classes), static function(string $sql) : bool {
             return strpos($sql, ' gh7875_my_entity ') !== false;
         });
 
@@ -77,7 +77,7 @@ 
             ['/^(?!my_enti)/', null],
             [
                 null,
-                static function ($assetName) : bool {
+                static function($assetName) : bool {
                     return $assetName !== 'gh7875_my_entity';
                 },
             ],
@@ -106,7 +106,7 @@ 
         $previousFilter = $config->getSchemaAssetsFilter();
 
         $sqls = $tool->getUpdateSchemaSql($classes);
-        $sqls = array_filter($sqls, static function (string $sql) : bool {
+        $sqls = array_filter($sqls, static function(string $sql) : bool {
             return strpos($sql, ' gh7875_my_entity ') !== false;
         });