doctrine / orm

lib/Doctrine/ORM/Tools/EntityGenerator.php

Spacing +144 added lines, -144 removed lines

@@ -364,14 +364,14 @@ 
      */
     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)) {
             mkdir($dir, 0775, true);
         }
 
-        $this->isNew = !file_exists($path) || (file_exists($path) && $this->regenerateEntityIfExists);
+        $this->isNew = ! file_exists($path) || (file_exists($path) && $this->regenerateEntityIfExists);
 
         if ( ! $this->isNew) {
             $this->parseTokensInEntityFile(file_get_contents($path));
@@ -380,8 +380,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.");
             }
         }
@@ -421,7 +421,7 @@ 
             $this->generateEntityBody($metadata)
         );
 
-        $code = str_replace($placeHolders, $replacements, static::$classTemplate) . "\n";
+        $code = str_replace($placeHolders, $replacements, static::$classTemplate)."\n";
 
         return str_replace('<spaces>', $this->spaces, $code);
     }
@@ -442,7 +442,7 @@ 
         $body = str_replace('<spaces>', $this->spaces, $body);
         $last = strrpos($currentCode, '}');
 
-        return substr($currentCode, 0, $last) . $body . (strlen($body) > 0 ? "\n" : '') . "}\n";
+        return substr($currentCode, 0, $last).$body.(strlen($body) > 0 ? "\n" : '')."}\n";
     }
 
     /**
@@ -506,7 +506,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;
@@ -604,7 +604,7 @@ 
     protected function generateEntityNamespace(ClassMetadataInfo $metadata)
     {
         if ($this->hasNamespace($metadata)) {
-            return 'namespace ' . $this->getNamespace($metadata) .';';
+            return 'namespace '.$this->getNamespace($metadata).';';
         }
     }
 
@@ -624,8 +624,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);
     }
 
     /**
@@ -727,13 +727,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) {
@@ -743,27 +743,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
@@ -771,8 +771,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);
         }
@@ -780,7 +780,7 @@ 
         $replacements = array(
             '<paramTags>' => implode("\n * ", $paramTags),
             '<params>'    => $params,
-            '<fields>'    => implode("\n" . $this->spaces, $fields),
+            '<fields>'    => implode("\n".$this->spaces, $fields),
         );
 
         $constructor = str_replace(
@@ -824,7 +824,7 @@ 
 
             if ($inClass) {
                 $inClass = false;
-                $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1];
+                $lastSeenClass = $lastSeenNamespace.($lastSeenNamespace ? '\\' : '').$token[1];
                 $this->staticReflection[$lastSeenClass]['properties'] = array();
                 $this->staticReflection[$lastSeenClass]['methods'] = array();
             }
@@ -832,16 +832,16 @@ 
             if ($token[0] == T_NAMESPACE) {
                 $lastSeenNamespace = "";
                 $inNamespace = true;
-            } elseif ($token[0] == T_CLASS && $tokens[$i-1][0] != T_DOUBLE_COLON) {
+            } elseif ($token[0] == T_CLASS && $tokens[$i - 1][0] != T_DOUBLE_COLON) {
                 $inClass = true;
             } elseif ($token[0] == T_FUNCTION) {
-                if ($tokens[$i+2][0] == T_STRING) {
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+2][1]);
-                } elseif ($tokens[$i+2] == "&" && $tokens[$i+3][0] == T_STRING) {
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+3][1]);
+                if ($tokens[$i + 2][0] == T_STRING) {
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 2][1]);
+                } elseif ($tokens[$i + 2] == "&" && $tokens[$i + 3][0] == T_STRING) {
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 3][1]);
                 }
-            } elseif (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED)) && $tokens[$i+2][0] != T_FUNCTION) {
-                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i+2][1], 1);
+            } elseif (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED)) && $tokens[$i + 2][0] != T_FUNCTION) {
+                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i + 2][1], 1);
             }
         }
     }
@@ -854,7 +854,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)) {
@@ -883,7 +883,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);
 
@@ -912,7 +912,7 @@ 
      */
     protected function getTraits(ClassMetadataInfo $metadata)
     {
-        if (! ($metadata->reflClass !== null || class_exists($metadata->name))) {
+        if ( ! ($metadata->reflClass !== null || class_exists($metadata->name))) {
             return [];
         }
 
@@ -964,7 +964,7 @@ 
     {
         $refl = new \ReflectionClass($this->getClassToExtend());
 
-        return '\\' . $refl->getName();
+        return '\\'.$refl->getName();
     }
 
     /**
@@ -997,7 +997,7 @@ 
     {
         $lines = array();
         $lines[] = '/**';
-        $lines[] = ' * ' . $this->getClassName($metadata);
+        $lines[] = ' * '.$this->getClassName($metadata);
 
         if ($this->generateAnnotations) {
             $lines[] = ' *';
@@ -1013,12 +1013,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';
             }
         }
 
@@ -1034,17 +1034,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;
     }
 
     /**
@@ -1061,28 +1061,28 @@ 
         $table = array();
 
         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).')';
     }
 
     /**
@@ -1097,9 +1097,9 @@ 
         foreach ($constraints as $name => $constraint) {
             $columns = array();
             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);
@@ -1113,7 +1113,7 @@ 
     protected function generateInheritanceAnnotation($metadata)
     {
         if ($metadata->inheritanceType != ClassMetadataInfo::INHERITANCE_TYPE_NONE) {
-            return '@' . $this->annotationsPrefix . 'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
+            return '@'.$this->annotationsPrefix.'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
         }
     }
 
@@ -1126,11 +1126,11 @@ 
     {
         if ($metadata->inheritanceType != ClassMetadataInfo::INHERITANCE_TYPE_NONE) {
             $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.')';
         }
     }
 
@@ -1145,10 +1145,10 @@ 
             $inheritanceClassMap = array();
 
             foreach ($metadata->discriminatorMap as $type => $class) {
-                $inheritanceClassMap[] .= '"' . $type . '" = "' . $class . '"';
+                $inheritanceClassMap[] .= '"'.$type.'" = "'.$class.'"';
             }
 
-            return '@' . $this->annotationsPrefix . 'DiscriminatorMap({' . implode(', ', $inheritanceClassMap) . '})';
+            return '@'.$this->annotationsPrefix.'DiscriminatorMap({'.implode(', ', $inheritanceClassMap).'})';
         }
     }
 
@@ -1171,7 +1171,7 @@ 
             if (( ! isset($fieldMapping['id']) ||
                     ! $fieldMapping['id'] ||
                     $metadata->generatorType == ClassMetadataInfo::GENERATOR_TYPE_NONE
-                ) && (! $metadata->isEmbeddedClass || ! $this->embeddablesImmutable)
+                ) && ( ! $metadata->isEmbeddedClass || ! $this->embeddablesImmutable)
             ) {
                 if ($code = $this->generateEntityStubMethod($metadata, 'set', $fieldMapping['fieldName'], $fieldMapping['type'])) {
                     $methods[] = $code;
@@ -1243,7 +1243,7 @@ 
         }
 
         foreach ($joinColumns as $joinColumn) {
-            if (isset($joinColumn['nullable']) && !$joinColumn['nullable']) {
+            if (isset($joinColumn['nullable']) && ! $joinColumn['nullable']) {
                 return false;
             }
         }
@@ -1290,8 +1290,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);
@@ -1318,8 +1318,8 @@ 
             }
 
             $lines[] = $this->generateFieldMappingPropertyDocBlock($fieldMapping, $metadata);
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldMapping['fieldName']
-                     . (isset($fieldMapping['options']['default']) ? ' = ' . var_export($fieldMapping['options']['default'], true) : null) . ";\n";
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldMapping['fieldName']
+                     . (isset($fieldMapping['options']['default']) ? ' = '.var_export($fieldMapping['options']['default'], true) : null).";\n";
         }
 
         return implode("\n", $lines);
@@ -1340,7 +1340,7 @@ 
             }
 
             $lines[] = $this->generateEmbeddedPropertyDocBlock($embeddedClass);
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldName . ";\n";
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldName.";\n";
         }
 
         return implode("\n", $lines);
@@ -1355,9 +1355,9 @@ 
      *
      * @return string
      */
-    protected function generateEntityStubMethod(ClassMetadataInfo $metadata, $type, $fieldName, $typeHint = null,  $defaultValue = null)
+    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, array("add", "remove"))) {
             $methodName = Inflector::singularize($methodName);
@@ -1377,18 +1377,18 @@ 
         $variableType   = $typeHint ? $this->getType($typeHint) : null;
 
         if ($typeHint && ! isset($types[$typeHint])) {
-            $variableType   =  '\\' . ltrim($variableType, '\\');
-            $methodTypeHint =  '\\' . $typeHint . ' ';
+            $variableType   = '\\'.ltrim($variableType, '\\');
+            $methodTypeHint = '\\'.$typeHint.' ';
         }
 
         $replacements = array(
-          '<description>'       => ucfirst($type) . ' ' . $variableName,
+          '<description>'       => ucfirst($type).' '.$variableName,
           '<methodTypeHint>'    => $methodTypeHint,
           '<variableType>'      => $variableType,
           '<variableName>'      => $variableName,
           '<methodName>'        => $methodName,
           '<fieldName>'         => $fieldName,
-          '<variableDefault>'   => ($defaultValue !== null ) ? (' = '.$defaultValue) : '',
+          '<variableDefault>'   => ($defaultValue !== null) ? (' = '.$defaultValue) : '',
           '<entity>'            => $this->getClassName($metadata)
         );
 
@@ -1416,7 +1416,7 @@ 
         $this->staticReflection[$metadata->name]['methods'][] = $methodName;
 
         $replacements = array(
-            '<name>'        => $this->annotationsPrefix . ucfirst($name),
+            '<name>'        => $this->annotationsPrefix.ucfirst($name),
             '<methodName>'  => $methodName,
         );
 
@@ -1439,30 +1439,30 @@ 
         $joinColumnAnnot = array();
 
         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).')';
     }
 
     /**
@@ -1474,22 +1474,22 @@ 
     protected function generateAssociationMappingPropertyDocBlock(array $associationMapping, ClassMetadataInfo $metadata)
     {
         $lines = array();
-        $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.'")';
                 }
             }
 
@@ -1511,15 +1511,15 @@ 
             $typeOptions = array();
 
             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']) {
@@ -1535,11 +1535,11 @@ 
                     $cascades = array('"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) {
@@ -1548,71 +1548,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 = array();
 
                 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 = array();
-                $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 = array();
 
                 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 = array();
 
                 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);
     }
@@ -1626,35 +1626,35 @@ 
     protected function generateFieldMappingPropertyDocBlock(array $fieldMapping, ClassMetadataInfo $metadata)
     {
         $lines = array();
-        $lines[] = $this->spaces . '/**';
-        $lines[] = $this->spaces . ' * @var ' . $this->getType($fieldMapping['type']);
+        $lines[] = $this->spaces.'/**';
+        $lines[] = $this->spaces.' * @var '.$this->getType($fieldMapping['type']);
 
         if ($this->generateAnnotations) {
-            $lines[] = $this->spaces . ' *';
+            $lines[] = $this->spaces.' *';
 
             $column = array();
             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 = [];
@@ -1668,47 +1668,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 = array();
 
                     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);
     }
@@ -1721,23 +1721,23 @@ 
     protected function generateEmbeddedPropertyDocBlock(array $embeddedClass)
     {
         $lines = array();
-        $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 = array('class="' . $embeddedClass['class'] . '"');
+            $embedded = array('class="'.$embeddedClass['class'].'"');
 
             if (isset($fieldMapping['columnPrefix'])) {
-                $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);
     }
@@ -1757,13 +1757,13 @@ 
 
         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))
         );
@@ -1781,7 +1781,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];
             }
         }
 
@@ -1849,9 +1849,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.'"';
             }
         }
 

lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
     public function exportClassMetadata(ClassMetadataInfo $metadata)
     {
         $xml = new \SimpleXmlElement("<?xml version=\"1.0\" encoding=\"utf-8\"?><doctrine-mapping ".
-            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" " .
+            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" ".
             "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ".
             "xsi:schemaLocation=\"http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd\" />");
 
@@ -97,7 +97,7 @@ 
 
         $trackingPolicy = $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy);
 
-        if ( $trackingPolicy != 'DEFERRED_IMPLICIT') {
+        if ($trackingPolicy != 'DEFERRED_IMPLICIT') {
             $root->addChild('change-tracking-policy', $trackingPolicy);
         }
 
@@ -295,7 +295,7 @@ 
             }
 
             if (count($cascade) === 5) {
-                $cascade  = array('cascade-all');
+                $cascade = array('cascade-all');
             }
 
             if ($cascade) {
@@ -377,7 +377,7 @@ 
             }
         }
 
-        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks)>0) {
+        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks) > 0) {
             $lifecycleCallbacksXml = $root->addChild('lifecycle-callbacks');
 
             foreach ($metadata->lifecycleCallbacks as $name => $methods) {
@@ -395,7 +395,7 @@ 
 
             foreach ($metadata->entityListeners as $event => $entityListenerConfig) {
                 foreach ($entityListenerConfig as $entityListener) {
-                    if (!isset($entityListenersXmlMap[$entityListener['class']])) {
+                    if ( ! isset($entityListenersXmlMap[$entityListener['class']])) {
                         $entityListenerXml = $entityListenersXml->addChild('entity-listener');
                         $entityListenerXml->addAttribute('class', $entityListener['class']);
                         $entityListenersXmlMap[$entityListener['class']] = $entityListenerXml;
@@ -447,7 +447,7 @@ 
     {
         $sequenceDefinition = $metadata->sequenceGeneratorDefinition;
 
-        if (! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
+        if ( ! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
             return;
         }
 

lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
 
             foreach ($metadata->entityListeners as $event => $entityListenerConfig) {
                 foreach ($entityListenerConfig as $entityListener) {
-                    if (!isset($array['entityListeners'][$entityListener['class']])) {
+                    if ( ! isset($array['entityListeners'][$entityListener['class']])) {
                         $array['entityListeners'][$entityListener['class']] = null;
                     }