doctrine / orm

lib/Doctrine/ORM/Mapping/ClassMetadata.php

Spacing +34 added lines, -34 removed lines

@@ -696,7 +696,7 @@ 
     public function getSingleIdReflectionProperty()
     {
         if ($this->isIdentifierComposite) {
-            throw new BadMethodCallException("Class " . $this->name . " has a composite identifier.");
+            throw new BadMethodCallException("Class ".$this->name." has a composite identifier.");
         }
 
         return $this->reflFields[$this->identifier[0]];
@@ -791,7 +791,7 @@ 
      */
     public function __toString()
     {
-        return __CLASS__ . '@' . spl_object_hash($this);
+        return __CLASS__.'@'.spl_object_hash($this);
     }
 
     /**
@@ -1025,7 +1025,7 @@ 
     public function validateAssociations()
     {
         foreach ($this->associationMappings as $mapping) {
-            if ( ! ClassLoader::classExists($mapping['targetEntity']) ) {
+            if ( ! ClassLoader::classExists($mapping['targetEntity'])) {
                 throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
             }
         }
@@ -1103,7 +1103,7 @@ 
         }
 
         if ( ! isset($cache['region'])) {
-            $cache['region'] = strtolower(str_replace('\\', '_', $this->rootEntityName)) . '__' . $fieldName;
+            $cache['region'] = strtolower(str_replace('\\', '_', $this->rootEntityName)).'__'.$fieldName;
         }
 
         return $cache;
@@ -1383,7 +1383,7 @@ 
     protected function _validateAndCompleteFieldMapping(array &$mapping)
     {
         // Check mandatory fields
-        if ( ! isset($mapping['fieldName']) || !$mapping['fieldName']) {
+        if ( ! isset($mapping['fieldName']) || ! $mapping['fieldName']) {
             throw MappingException::missingFieldName($this->name);
         }
 
@@ -1496,14 +1496,14 @@ 
                 $this->isIdentifierComposite = true;
             }
 
-            if ($this->cache && !isset($mapping['cache'])) {
+            if ($this->cache && ! isset($mapping['cache'])) {
                 throw CacheException::nonCacheableEntityAssociation($this->name, $mapping['fieldName']);
             }
         }
 
         // Mandatory attributes for both sides
         // Mandatory: fieldName, targetEntity
-        if ( ! isset($mapping['fieldName']) || !$mapping['fieldName']) {
+        if ( ! isset($mapping['fieldName']) || ! $mapping['fieldName']) {
             throw MappingException::missingFieldName($this->name);
         }
 
@@ -1625,7 +1625,7 @@ 
                     throw new RuntimeException("ClassMetadata::setTable() has to be called before defining a one to one relationship.");
                 }
 
-                $this->table['uniqueConstraints'][$mapping['fieldName'] . "_uniq"] = [
+                $this->table['uniqueConstraints'][$mapping['fieldName']."_uniq"] = [
                     'columns' => $uniqueConstraintColumns
                 ];
             }
@@ -1640,7 +1640,7 @@ 
             unset($mapping['unique']);
         }
 
-        if (isset($mapping['id']) && $mapping['id'] === true && !$mapping['isOwningSide']) {
+        if (isset($mapping['id']) && $mapping['id'] === true && ! $mapping['isOwningSide']) {
             throw MappingException::illegalInverseIdentifierAssociation($this->name, $mapping['fieldName']);
         }
 
@@ -1694,7 +1694,7 @@ 
             }
 
             $selfReferencingEntityWithoutJoinColumns = $mapping['sourceEntity'] == $mapping['targetEntity']
-                && (! (isset($mapping['joinTable']['joinColumns']) || isset($mapping['joinTable']['inverseJoinColumns'])));
+                && ( ! (isset($mapping['joinTable']['joinColumns']) || isset($mapping['joinTable']['inverseJoinColumns'])));
 
             if ( ! isset($mapping['joinTable']['joinColumns'])) {
                 $mapping['joinTable']['joinColumns'] = [
@@ -1887,7 +1887,7 @@ 
 
             // Association defined as Id field
             $joinColumns      = $this->associationMappings[$idProperty]['joinColumns'];
-            $assocColumnNames = array_map(function ($joinColumn) { return $joinColumn['name']; }, $joinColumns);
+            $assocColumnNames = array_map(function($joinColumn) { return $joinColumn['name']; }, $joinColumns);
 
             $columnNames = array_merge($columnNames, $assocColumnNames);
         }
@@ -2068,7 +2068,7 @@ 
     public function getTemporaryIdTableName()
     {
         // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
-        return str_replace('.', '_', $this->getTableName() . '_id_tmp');
+        return str_replace('.', '_', $this->getTableName().'_id_tmp');
     }
 
     /**
@@ -2405,7 +2405,7 @@ 
      */
     public function addNamedQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2413,7 +2413,7 @@ 
             throw MappingException::duplicateQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['query'])) {
+        if ( ! isset($queryMapping['query'])) {
             throw MappingException::emptyQueryMapping($this->name, $queryMapping['name']);
         }
 
@@ -2440,7 +2440,7 @@ 
      */
     public function addNamedNativeQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2448,11 +2448,11 @@ 
             throw MappingException::duplicateQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['query'])) {
+        if ( ! isset($queryMapping['query'])) {
             throw MappingException::emptyQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['resultClass']) && !isset($queryMapping['resultSetMapping'])) {
+        if ( ! isset($queryMapping['resultClass']) && ! isset($queryMapping['resultSetMapping'])) {
             throw MappingException::missingQueryMapping($this->name, $queryMapping['name']);
         }
 
@@ -2484,7 +2484,7 @@ 
      */
     public function addSqlResultSetMapping(array $resultMapping)
     {
-        if (!isset($resultMapping['name'])) {
+        if ( ! isset($resultMapping['name'])) {
             throw MappingException::nameIsMandatoryForSqlResultSetMapping($this->name);
         }
 
@@ -2494,7 +2494,7 @@ 
 
         if (isset($resultMapping['entities'])) {
             foreach ($resultMapping['entities'] as $key => $entityResult) {
-                if (!isset($entityResult['entityClass'])) {
+                if ( ! isset($entityResult['entityClass'])) {
                     throw MappingException::missingResultSetMappingEntity($this->name, $resultMapping['name']);
                 }
 
@@ -2513,11 +2513,11 @@ 
 
                 if (isset($entityResult['fields'])) {
                     foreach ($entityResult['fields'] as $k => $field) {
-                        if (!isset($field['name'])) {
+                        if ( ! isset($field['name'])) {
                             throw MappingException::missingResultSetMappingFieldName($this->name, $resultMapping['name']);
                         }
 
-                        if (!isset($field['column'])) {
+                        if ( ! isset($field['column'])) {
                             $fieldName = $field['name'];
                             if (strpos($fieldName, '.')) {
                                 list(, $fieldName) = explode('.', $fieldName);
@@ -3008,7 +3008,7 @@ 
         }
 
         if ($definition['sequenceName'][0] == '`') {
-            $definition['sequenceName']   = trim($definition['sequenceName'], '`');
+            $definition['sequenceName'] = trim($definition['sequenceName'], '`');
             $definition['quoted'] = true;
         }
 
@@ -3108,7 +3108,7 @@ 
     public function getAssociationTargetClass($assocName)
     {
         if ( ! isset($this->associationMappings[$assocName])) {
-            throw new InvalidArgumentException("Association name expected, '" . $assocName ."' is not an association.");
+            throw new InvalidArgumentException("Association name expected, '".$assocName."' is not an association.");
         }
 
         return $this->associationMappings[$assocName]['targetEntity'];
@@ -3147,7 +3147,7 @@ 
             // Association defined as Id field
             $joinColumns            = $this->associationMappings[$idProperty]['joinColumns'];
             $assocQuotedColumnNames = array_map(
-                function ($joinColumn) use ($platform) {
+                function($joinColumn) use ($platform) {
                     return isset($joinColumn['quoted'])
                         ? $platform->quoteIdentifier($joinColumn['name'])
                         : $joinColumn['name'];
@@ -3258,7 +3258,7 @@ 
         }
 
         if ($className !== null && strpos($className, '\\') === false && $this->namespace) {
-            return $this->namespace . '\\' . $className;
+            return $this->namespace.'\\'.$className;
         }
 
         return $className;
@@ -3310,13 +3310,13 @@ 
         foreach ($embeddable->fieldMappings as $fieldMapping) {
             $fieldMapping['originalClass'] = $fieldMapping['originalClass'] ?? $embeddable->name;
             $fieldMapping['declaredField'] = isset($fieldMapping['declaredField'])
-                ? $property . '.' . $fieldMapping['declaredField']
+                ? $property.'.'.$fieldMapping['declaredField']
                 : $property;
             $fieldMapping['originalField'] = $fieldMapping['originalField'] ?? $fieldMapping['fieldName'];
-            $fieldMapping['fieldName'] = $property . "." . $fieldMapping['fieldName'];
+            $fieldMapping['fieldName'] = $property.".".$fieldMapping['fieldName'];
 
-            if (! empty($this->embeddedClasses[$property]['columnPrefix'])) {
-                $fieldMapping['columnName'] = $this->embeddedClasses[$property]['columnPrefix'] . $fieldMapping['columnName'];
+            if ( ! empty($this->embeddedClasses[$property]['columnPrefix'])) {
+                $fieldMapping['columnName'] = $this->embeddedClasses[$property]['columnPrefix'].$fieldMapping['columnName'];
             } elseif ($this->embeddedClasses[$property]['columnPrefix'] !== false) {
                 $fieldMapping['columnName'] = $this->namingStrategy
                     ->embeddedFieldToColumnName(
@@ -3357,7 +3357,7 @@ 
     {
         $sequencePrefix = $this->getSequencePrefix($platform);
         $columnName     = $this->getSingleIdentifierColumnName();
-        $sequenceName   = $sequencePrefix . '_' . $columnName . '_seq';
+        $sequenceName   = $sequencePrefix.'_'.$columnName.'_seq';
 
         return $sequenceName;
     }
@@ -3377,10 +3377,10 @@ 
 
         // Prepend the schema name to the table name if there is one
         if ($schemaName = $this->getSchemaName()) {
-            $sequencePrefix = $schemaName . '.' . $tableName;
+            $sequencePrefix = $schemaName.'.'.$tableName;
 
             if ( ! $platform->supportsSchemas() && $platform->canEmulateSchemas()) {
-                $sequencePrefix = $schemaName . '__' . $tableName;
+                $sequencePrefix = $schemaName.'__'.$tableName;
             }
         }
 
@@ -3392,8 +3392,8 @@ 
      */
     private function assertMappingOrderBy(array $mapping)
     {
-        if (isset($mapping['orderBy']) && !is_array($mapping['orderBy'])) {
-            throw new InvalidArgumentException("'orderBy' is expected to be an array, not " . gettype($mapping['orderBy']));
+        if (isset($mapping['orderBy']) && ! is_array($mapping['orderBy'])) {
+            throw new InvalidArgumentException("'orderBy' is expected to be an array, not ".gettype($mapping['orderBy']));
         }
     }
 }

lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
         $schema = [];
         foreach ($this->from as $path) {
             if (is_dir($path)) {
-                $files = glob($path . '/*.yml');
+                $files = glob($path.'/*.yml');
                 foreach ($files as $file) {
                     $schema = array_merge($schema, (array) Yaml::parse(file_get_contents($file)));
                 }
@@ -238,7 +238,7 @@ 
             $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_SEQUENCE);
 
             $definition = [
-                'sequenceName' => is_array($column['sequence']) ? $column['sequence']['name']:$column['sequence']
+                'sequenceName' => is_array($column['sequence']) ? $column['sequence']['name'] : $column['sequence']
             ];
 
             if (isset($column['sequence']['size'])) {

lib/Doctrine/ORM/Tools/EntityGenerator.php

Spacing +150 added lines, -150 removed lines

@@ -366,7 +366,7 @@ 
      */
     public function writeEntityClass(ClassMetadata $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)) {
@@ -382,8 +382,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.");
             }
         }
@@ -444,7 +444,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";
     }
 
     /**
@@ -508,7 +508,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;
@@ -605,11 +605,11 @@ 
      */
     protected function generateEntityNamespace(ClassMetadata $metadata)
     {
-        if (! $this->hasNamespace($metadata)) {
+        if ( ! $this->hasNamespace($metadata)) {
             return '';
         }
 
-        return 'namespace ' . $this->getNamespace($metadata) .';';
+        return 'namespace '.$this->getNamespace($metadata).';';
     }
 
     /**
@@ -617,7 +617,7 @@ 
      */
     protected function generateEntityUse()
     {
-        if (! $this->generateAnnotations) {
+        if ( ! $this->generateAnnotations) {
             return '';
         }
 
@@ -631,8 +631,8 @@ 
      */
     protected function generateEntityClassName(ClassMetadata $metadata)
     {
-        return 'class ' . $this->getClassName($metadata) .
-            ($this->extendsClass() ? ' extends ' . $this->getClassToExtendName() : null);
+        return 'class '.$this->getClassName($metadata).
+            ($this->extendsClass() ? ' extends '.$this->getClassToExtendName() : null);
     }
 
     /**
@@ -734,13 +734,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) {
@@ -748,27 +748,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
@@ -776,8 +776,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);
         }
@@ -785,7 +785,7 @@ 
         $replacements = [
             '<paramTags>' => implode("\n * ", $paramTags),
             '<params>'    => $params,
-            '<fields>'    => implode("\n" . $this->spaces, $fields),
+            '<fields>'    => implode("\n".$this->spaces, $fields),
         ];
 
         $constructor = str_replace(
@@ -830,7 +830,7 @@ 
 
             if ($inClass) {
                 $inClass = false;
-                $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1];
+                $lastSeenClass = $lastSeenNamespace.($lastSeenNamespace ? '\\' : '').$token[1];
                 $this->staticReflection[$lastSeenClass]['properties'] = [];
                 $this->staticReflection[$lastSeenClass]['methods'] = [];
             }
@@ -838,16 +838,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);
             }
         }
     }
@@ -860,7 +860,7 @@ 
      */
     protected function hasProperty($property, ClassMetadata $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)) {
@@ -889,7 +889,7 @@ 
      */
     protected function hasMethod($method, ClassMetadata $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);
 
@@ -920,7 +920,7 @@ 
      */
     protected function getTraits(ClassMetadata $metadata)
     {
-        if (! ($metadata->reflClass !== null || class_exists($metadata->name))) {
+        if ( ! ($metadata->reflClass !== null || class_exists($metadata->name))) {
             return [];
         }
 
@@ -970,7 +970,7 @@ 
     {
         $refl = new \ReflectionClass($this->getClassToExtend());
 
-        return '\\' . $refl->getName();
+        return '\\'.$refl->getName();
     }
 
     /**
@@ -1003,7 +1003,7 @@ 
     {
         $lines = [];
         $lines[] = '/**';
-        $lines[] = ' * ' . $this->getClassName($metadata);
+        $lines[] = ' * '.$this->getClassName($metadata);
 
         if ($this->generateAnnotations) {
             $lines[] = ' *';
@@ -1019,12 +1019,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';
             }
         }
 
@@ -1040,17 +1040,17 @@ 
      */
     protected function generateEntityAnnotation(ClassMetadata $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;
     }
 
     /**
@@ -1067,28 +1067,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).')';
     }
 
     /**
@@ -1103,9 +1103,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);
@@ -1122,7 +1122,7 @@ 
             return '';
         }
 
-        return '@' . $this->annotationsPrefix . 'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
+        return '@'.$this->annotationsPrefix.'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
     }
 
     /**
@@ -1137,11 +1137,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.')';
     }
 
     /**
@@ -1158,10 +1158,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).'})';
     }
 
     /**
@@ -1180,8 +1180,8 @@ 
 
             $nullableField = $this->nullableFieldExpression($fieldMapping);
 
-            if ((!$metadata->isEmbeddedClass || !$this->embeddablesImmutable)
-                && (!isset($fieldMapping['id']) || ! $fieldMapping['id'] || $metadata->generatorType === ClassMetadata::GENERATOR_TYPE_NONE)
+            if (( ! $metadata->isEmbeddedClass || ! $this->embeddablesImmutable)
+                && ( ! isset($fieldMapping['id']) || ! $fieldMapping['id'] || $metadata->generatorType === ClassMetadata::GENERATOR_TYPE_NONE)
                 && $code = $this->generateEntityStubMethod($metadata, 'set', $fieldMapping['fieldName'], $fieldMapping['type'], $nullableField)
             ) {
                 $methods[] = $code;
@@ -1252,7 +1252,7 @@ 
         }
 
         foreach ($joinColumns as $joinColumn) {
-            if (isset($joinColumn['nullable']) && !$joinColumn['nullable']) {
+            if (isset($joinColumn['nullable']) && ! $joinColumn['nullable']) {
                 return false;
             }
         }
@@ -1297,8 +1297,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);
@@ -1322,8 +1322,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);
@@ -1344,7 +1344,7 @@ 
             }
 
             $lines[] = $this->generateEmbeddedPropertyDocBlock($embeddedClass);
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldName . ";\n";
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldName.";\n";
         }
 
         return implode("\n", $lines);
@@ -1361,7 +1361,7 @@ 
      */
     protected function generateEntityStubMethod(ClassMetadata $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);
@@ -1381,18 +1381,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)
         ];
 
@@ -1421,7 +1421,7 @@ 
         $this->staticReflection[$metadata->name]['methods'][] = $methodName;
 
         $replacements = [
-            '<name>'        => $this->annotationsPrefix . ucfirst($name),
+            '<name>'        => $this->annotationsPrefix.ucfirst($name),
             '<methodName>'  => $methodName,
         ];
 
@@ -1444,30 +1444,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).')';
     }
 
     /**
@@ -1479,22 +1479,22 @@ 
     protected function generateAssociationMappingPropertyDocBlock(array $associationMapping, ClassMetadata $metadata)
     {
         $lines = [];
-        $lines[] = $this->spaces . '/**';
+        $lines[] = $this->spaces.'/**';
 
         if ($associationMapping['type'] & ClassMetadata::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.'")';
                 }
             }
 
@@ -1516,15 +1516,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']) {
@@ -1540,11 +1540,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'] !== ClassMetadata::FETCH_LAZY) {
@@ -1553,71 +1553,71 @@ 
                     ClassMetadata::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);
     }
@@ -1631,43 +1631,43 @@ 
     protected function generateFieldMappingPropertyDocBlock(array $fieldMapping, ClassMetadata $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']) {
@@ -1679,15 +1679,15 @@ 
             }
 
             if (isset($fieldMapping['options']['comment']) && $fieldMapping['options']['comment']) {
-                $options[] = '"comment"="' . $fieldMapping['options']['comment'] .'"';
+                $options[] = '"comment"="'.$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) {
@@ -1695,47 +1695,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);
     }
@@ -1748,27 +1748,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);
     }
@@ -1782,13 +1782,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))
         );
@@ -1806,7 +1806,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];
             }
         }
 
@@ -1888,9 +1888,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 +7 added lines, -7 removed lines

@@ -41,9 +41,9 @@ 
      */
     public function exportClassMetadata(ClassMetadata $metadata)
     {
-        $xml = new SimpleXmlElement('<?xml version="1.0" encoding="utf-8"?><doctrine-mapping ' .
-            'xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" ' .
-            'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
+        $xml = new SimpleXmlElement('<?xml version="1.0" encoding="utf-8"?><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" />');
 
         if ($metadata->isMappedSuperclass) {
@@ -98,7 +98,7 @@ 
 
         $trackingPolicy = $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy);
 
-        if ( $trackingPolicy != 'DEFERRED_IMPLICIT') {
+        if ($trackingPolicy != 'DEFERRED_IMPLICIT') {
             $root->addChild('change-tracking-policy', $trackingPolicy);
         }
 
@@ -297,7 +297,7 @@ 
             }
 
             if (count($cascade) === 5) {
-                $cascade  = ['cascade-all'];
+                $cascade = ['cascade-all'];
             }
 
             if ($cascade) {
@@ -379,7 +379,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) {
@@ -430,7 +430,7 @@ 
     {
         $sequenceDefinition = $metadata->sequenceGeneratorDefinition;
 
-        if (! ($metadata->generatorType === ClassMetadata::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
+        if ( ! ($metadata->generatorType === ClassMetadata::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
             return;
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
      */
     protected function _generateOutputPath(ClassMetadata $metadata)
     {
-        return $this->_outputDir . '/' . str_replace('\\', '/', $metadata->name) . $this->_extension;
+        return $this->_outputDir.'/'.str_replace('\\', '/', $metadata->name).$this->_extension;
     }
 
     /**

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

Spacing +10 added lines, -10 removed lines

@@ -51,27 +51,27 @@ 
         }
 
         if ($metadata->inheritanceType) {
-            $lines[] = '$metadata->setInheritanceType(ClassMetadata::INHERITANCE_TYPE_' . $this->_getInheritanceTypeString($metadata->inheritanceType) . ');';
+            $lines[] = '$metadata->setInheritanceType(ClassMetadata::INHERITANCE_TYPE_'.$this->_getInheritanceTypeString($metadata->inheritanceType).');';
         }
 
         if ($metadata->customRepositoryClassName) {
-            $lines[] = "\$metadata->customRepositoryClassName = '" . $metadata->customRepositoryClassName . "';";
+            $lines[] = "\$metadata->customRepositoryClassName = '".$metadata->customRepositoryClassName."';";
         }
 
         if ($metadata->table) {
-            $lines[] = '$metadata->setPrimaryTable(' . $this->_varExport($metadata->table) . ');';
+            $lines[] = '$metadata->setPrimaryTable('.$this->_varExport($metadata->table).');';
         }
 
         if ($metadata->discriminatorColumn) {
-            $lines[] = '$metadata->setDiscriminatorColumn(' . $this->_varExport($metadata->discriminatorColumn) . ');';
+            $lines[] = '$metadata->setDiscriminatorColumn('.$this->_varExport($metadata->discriminatorColumn).');';
         }
 
         if ($metadata->discriminatorMap) {
-            $lines[] = '$metadata->setDiscriminatorMap(' . $this->_varExport($metadata->discriminatorMap) . ');';
+            $lines[] = '$metadata->setDiscriminatorMap('.$this->_varExport($metadata->discriminatorMap).');';
         }
 
         if ($metadata->changeTrackingPolicy) {
-            $lines[] = '$metadata->setChangeTrackingPolicy(ClassMetadata::CHANGETRACKING_' . $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy) . ');';
+            $lines[] = '$metadata->setChangeTrackingPolicy(ClassMetadata::CHANGETRACKING_'.$this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy).');';
         }
 
         if ($metadata->lifecycleCallbacks) {
@@ -85,11 +85,11 @@ 
         $lines = array_merge($lines, $this->processEntityListeners($metadata));
 
         foreach ($metadata->fieldMappings as $fieldMapping) {
-            $lines[] = '$metadata->mapField(' . $this->_varExport($fieldMapping) . ');';
+            $lines[] = '$metadata->mapField('.$this->_varExport($fieldMapping).');';
         }
 
         if ( ! $metadata->isIdentifierComposite && $generatorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
-            $lines[] = '$metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_' . $generatorType . ');';
+            $lines[] = '$metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_'.$generatorType.');';
         }
 
         foreach ($metadata->associationMappings as $associationMapping) {
@@ -155,7 +155,7 @@ 
                 $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray);
             }
 
-            $lines[] = '$metadata->' . $method . '(' . $this->_varExport($associationMappingArray) . ');';
+            $lines[] = '$metadata->'.$method.'('.$this->_varExport($associationMappingArray).');';
         }
 
         return implode("\n", $lines);
@@ -169,7 +169,7 @@ 
     protected function _varExport($var)
     {
         $export = var_export($var, true);
-        $export = str_replace("\n", PHP_EOL . str_repeat(' ', 8), $export);
+        $export = str_replace("\n", PHP_EOL.str_repeat(' ', 8), $export);
         $export = str_replace('  ', ' ', $export);
         $export = str_replace('array (', 'array(', $export);
         $export = str_replace('array( ', 'array(', $export);

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

Spacing +2 added lines, -2 removed lines

@@ -141,7 +141,7 @@ 
                 if ( ! is_dir($dir)) {
                     mkdir($dir, 0775, true);
                 }
-                if (file_exists($path) && !$this->_overwriteExistingFiles) {
+                if (file_exists($path) && ! $this->_overwriteExistingFiles) {
                     throw ExportException::attemptOverwriteExistingFile($path);
                 }
                 file_put_contents($path, $output);
@@ -159,7 +159,7 @@ 
      */
     protected function _generateOutputPath(ClassMetadata $metadata)
     {
-        return $this->_outputDir . '/' . str_replace('\\', '.', $metadata->name) . $this->_extension;
+        return $this->_outputDir.'/'.str_replace('\\', '.', $metadata->name).$this->_extension;
     }
 
     /**

lib/Doctrine/ORM/Tools/SchemaValidator.php

Spacing +57 added lines, -57 removed lines

@@ -89,66 +89,66 @@ 
         $cmf = $this->em->getMetadataFactory();
 
         foreach ($class->fieldMappings as $fieldName => $mapping) {
-            if (!Type::hasType($mapping['type'])) {
-                $ce[] = "The field '" . $class->name . "#" . $fieldName."' uses a non-existent type '" . $mapping['type'] . "'.";
+            if ( ! Type::hasType($mapping['type'])) {
+                $ce[] = "The field '".$class->name."#".$fieldName."' uses a non-existent type '".$mapping['type']."'.";
             }
         }
 
         foreach ($class->associationMappings as $fieldName => $assoc) {
-            if (!class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) {
-                $ce[] = "The target entity '" . $assoc['targetEntity'] . "' specified on " . $class->name . '#' . $fieldName . ' is unknown or not an entity.';
+            if ( ! class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) {
+                $ce[] = "The target entity '".$assoc['targetEntity']."' specified on ".$class->name.'#'.$fieldName.' is unknown or not an entity.';
 
                 return $ce;
             }
 
             if ($assoc['mappedBy'] && $assoc['inversedBy']) {
-                $ce[] = "The association " . $class . "#" . $fieldName . " cannot be defined as both inverse and owning.";
+                $ce[] = "The association ".$class."#".$fieldName." cannot be defined as both inverse and owning.";
             }
 
             $targetMetadata = $cmf->getMetadataFor($assoc['targetEntity']);
 
             if (isset($assoc['id']) && $targetMetadata->containsForeignIdentifier) {
-                $ce[] = "Cannot map association '" . $class->name. "#". $fieldName ." as identifier, because " .
-                        "the target entity '". $targetMetadata->name . "' also maps an association as identifier.";
+                $ce[] = "Cannot map association '".$class->name."#".$fieldName." as identifier, because ".
+                        "the target entity '".$targetMetadata->name."' also maps an association as identifier.";
             }
 
             if ($assoc['mappedBy']) {
                 if ($targetMetadata->hasField($assoc['mappedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which is not defined as association, but as field.";
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which is not defined as association, but as field.";
                 }
-                if (!$targetMetadata->hasAssociation($assoc['mappedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which does not exist.";
+                if ( ! $targetMetadata->hasAssociation($assoc['mappedBy'])) {
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which does not exist.";
                 } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] == null) {
-                    $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the inverse side of a ".
+                    $ce[] = "The field ".$class->name."#".$fieldName." is on the inverse side of a ".
                             "bi-directional relationship, but the specified mappedBy association on the target-entity ".
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ".
-                            "'inversedBy=\"" . $fieldName . "\"' attribute.";
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ".
+                            "'inversedBy=\"".$fieldName."\"' attribute.";
                 } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] != $fieldName) {
-                    $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " .
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " are ".
+                    $ce[] = "The mappings ".$class->name."#".$fieldName." and ".
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." are ".
                             "inconsistent with each other.";
                 }
             }
 
             if ($assoc['inversedBy']) {
                 if ($targetMetadata->hasField($assoc['inversedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which is not defined as association.";
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which is not defined as association.";
                 }
 
-                if (!$targetMetadata->hasAssociation($assoc['inversedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which does not exist.";
+                if ( ! $targetMetadata->hasAssociation($assoc['inversedBy'])) {
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which does not exist.";
                 } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] == null) {
-                    $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the owning side of a ".
+                    $ce[] = "The field ".$class->name."#".$fieldName." is on the owning side of a ".
                             "bi-directional relationship, but the specified mappedBy association on the target-entity ".
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ".
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ".
                             "'inversedBy' attribute.";
                 } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] != $fieldName) {
-                    $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " .
-                            $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " are ".
+                    $ce[] = "The mappings ".$class->name."#".$fieldName." and ".
+                            $assoc['targetEntity']."#".$assoc['inversedBy']." are ".
                             "inconsistent with each other.";
                 }
 
@@ -156,14 +156,14 @@ 
                 if (array_key_exists($assoc['inversedBy'], $targetMetadata->associationMappings)) {
                     $targetAssoc = $targetMetadata->associationMappings[$assoc['inversedBy']];
                     if ($assoc['type'] == ClassMetadata::ONE_TO_ONE && $targetAssoc['type'] !== ClassMetadata::ONE_TO_ONE) {
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is one-to-one, then the inversed " .
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-one as well.";
+                        $ce[] = "If association ".$class->name."#".$fieldName." is one-to-one, then the inversed ".
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-one as well.";
                     } elseif ($assoc['type'] == ClassMetadata::MANY_TO_ONE && $targetAssoc['type'] !== ClassMetadata::ONE_TO_MANY) {
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-one, then the inversed " .
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-many.";
+                        $ce[] = "If association ".$class->name."#".$fieldName." is many-to-one, then the inversed ".
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-many.";
                     } elseif ($assoc['type'] == ClassMetadata::MANY_TO_MANY && $targetAssoc['type'] !== ClassMetadata::MANY_TO_MANY) {
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-many, then the inversed " .
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be many-to-many as well.";
+                        $ce[] = "If association ".$class->name."#".$fieldName." is many-to-many, then the inversed ".
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be many-to-many as well.";
                     }
                 }
             }
@@ -172,8 +172,8 @@ 
                 if ($assoc['type'] == ClassMetadata::MANY_TO_MANY) {
                     $identifierColumns = $class->getIdentifierColumnNames();
                     foreach ($assoc['joinTable']['joinColumns'] as $joinColumn) {
-                        if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
+                        if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
                                 "has to be a primary key column on the target entity class '".$class->name."'.";
                             break;
                         }
@@ -181,32 +181,32 @@ 
 
                     $identifierColumns = $targetMetadata->getIdentifierColumnNames();
                     foreach ($assoc['joinTable']['inverseJoinColumns'] as $inverseJoinColumn) {
-                        if (!in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) {
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
+                        if ( ! in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
                                 "has to be a primary key column on the target entity class '".$targetMetadata->name."'.";
                             break;
                         }
                     }
 
                     if (count($targetMetadata->getIdentifierColumnNames()) != count($assoc['joinTable']['inverseJoinColumns'])) {
-                        $ce[] = "The inverse join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
-                                "have to contain to ALL identifier columns of the target entity '". $targetMetadata->name . "', " .
-                                "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))) .
+                        $ce[] = "The inverse join columns of the many-to-many table '".$assoc['joinTable']['name']."' ".
+                                "have to contain to ALL identifier columns of the target entity '".$targetMetadata->name."', ".
+                                "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))).
                                 "' are missing.";
                     }
 
                     if (count($class->getIdentifierColumnNames()) != count($assoc['joinTable']['joinColumns'])) {
-                        $ce[] = "The join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
-                                "have to contain to ALL identifier columns of the source entity '". $class->name . "', " .
-                                "however '" . implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))) .
+                        $ce[] = "The join columns of the many-to-many table '".$assoc['joinTable']['name']."' ".
+                                "have to contain to ALL identifier columns of the source entity '".$class->name."', ".
+                                "however '".implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))).
                                 "' are missing.";
                     }
 
                 } elseif ($assoc['type'] & ClassMetadata::TO_ONE) {
                     $identifierColumns = $targetMetadata->getIdentifierColumnNames();
                     foreach ($assoc['joinColumns'] as $joinColumn) {
-                        if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
+                        if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
                                     "has to be a primary key column on the target entity class '".$targetMetadata->name."'.";
                         }
                     }
@@ -218,9 +218,9 @@ 
                             $ids[] = $joinColumn['name'];
                         }
 
-                        $ce[] = "The join columns of the association '" . $assoc['fieldName'] . "' " .
-                                "have to match to ALL identifier columns of the target entity '". $targetMetadata->name . "', " .
-                                "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)) .
+                        $ce[] = "The join columns of the association '".$assoc['fieldName']."' ".
+                                "have to match to ALL identifier columns of the target entity '".$targetMetadata->name."', ".
+                                "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)).
                                 "' are missing.";
                     }
                 }
@@ -228,19 +228,19 @@ 
 
             if (isset($assoc['orderBy']) && $assoc['orderBy'] !== null) {
                 foreach ($assoc['orderBy'] as $orderField => $orientation) {
-                    if (!$targetMetadata->hasField($orderField) && !$targetMetadata->hasAssociation($orderField)) {
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a foreign field " .
-                                $orderField . " that is not a field on the target entity " . $targetMetadata->name . ".";
+                    if ( ! $targetMetadata->hasField($orderField) && ! $targetMetadata->hasAssociation($orderField)) {
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a foreign field ".
+                                $orderField." that is not a field on the target entity ".$targetMetadata->name.".";
                         continue;
                     }
                     if ($targetMetadata->isCollectionValuedAssociation($orderField)) {
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " .
-                                $orderField . " on " . $targetMetadata->name . " that is a collection-valued association.";
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ".
+                                $orderField." on ".$targetMetadata->name." that is a collection-valued association.";
                         continue;
                     }
                     if ($targetMetadata->isAssociationInverseSide($orderField)) {
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " .
-                                $orderField . " on " . $targetMetadata->name . " that is the inverse side of an association.";
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ".
+                                $orderField." on ".$targetMetadata->name." that is the inverse side of an association.";
                         continue;
                     }
                 }
@@ -248,9 +248,9 @@ 
         }
 
         foreach ($class->subClasses as $subClass) {
-            if (!in_array($class->name, class_parents($subClass))) {
-                $ce[] = "According to the discriminator map class '" . $subClass . "' has to be a child ".
-                        "of '" . $class->name . "' but these entities are not related through inheritance.";
+            if ( ! in_array($class->name, class_parents($subClass))) {
+                $ce[] = "According to the discriminator map class '".$subClass."' has to be a child ".
+                        "of '".$class->name."' but these entities are not related through inheritance.";
             }
         }
 

tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
         $methods = [];
 
         foreach ($class->getMethods() as $method) {
-            if ($method->isConstructor() || $method->isStatic() || !$method->isPublic() || $method->getName() === 'getHydrator') {
+            if ($method->isConstructor() || $method->isStatic() || ! $method->isPublic() || $method->getName() === 'getHydrator') {
                 continue;
             }
 
@@ -72,7 +72,7 @@ 
      */
     public function testAllMethodCallsAreDelegatedToTheWrappedInstance($method, array $parameters)
     {
-        $return = !in_array($method, self::VOID_METHODS) ? 'INNER VALUE FROM ' . $method : null;
+        $return = ! in_array($method, self::VOID_METHODS) ? 'INNER VALUE FROM '.$method : null;
 
         $this->wrapped->expects($this->once())
             ->method($method)