doctrine / orm

lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php

Indentation +6 added lines, -6 removed lines

@@ -42,9 +42,9 @@ 
     protected function configure()
     {
         $this->setName('orm:mapping:describe')
-             ->addArgument('entityName', InputArgument::REQUIRED, 'Full or partial name of entity')
-             ->setDescription('Display information about mapped objects')
-             ->setHelp(<<<EOT
+                ->addArgument('entityName', InputArgument::REQUIRED, 'Full or partial name of entity')
+                ->setDescription('Display information about mapped objects')
+                ->setHelp(<<<EOT
 The %command.full_name% command describes the metadata for the given full or partial entity class name.
 
     <info>%command.full_name%</info> My\Namespace\Entity\MyEntity
@@ -53,7 +53,7 @@ 
 
     <info>%command.full_name%</info> MyEntity
 EOT
-             );
+                );
     }
 
     /**
@@ -134,8 +134,8 @@ 
     private function getMappedEntities(EntityManagerInterface $entityManager)
     {
         $entityClassNames = $entityManager->getConfiguration()
-                                          ->getMetadataDriverImpl()
-                                          ->getAllClassNames();
+                                            ->getMetadataDriverImpl()
+                                            ->getAllClassNames();
 
         if ( ! $entityClassNames) {
             throw new \InvalidArgumentException(

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Console\Command;
 
@@ -163,8 +163,8 @@ 
 
         $matches = array_filter(
             $this->getMappedEntities($entityManager),
-            function ($mappedEntity) use ($entityName) {
-                return preg_match('{' . preg_quote($entityName) . '}', $mappedEntity);
+            function($mappedEntity) use ($entityName) {
+                return preg_match('{'.preg_quote($entityName).'}', $mappedEntity);
             }
         );
 
@@ -221,7 +221,7 @@ 
 
             $output[] = $this->formatField(
                 sprintf('  %s', $parentClass->getParent()),
-                ($parentClass->isRootEntity() ? '(Root) ' : '') . $this->formatValue($attributes)
+                ($parentClass->isRootEntity() ? '(Root) ' : '').$this->formatValue($attributes)
             );
         }
 
@@ -246,7 +246,7 @@ 
         }
 
         if (is_bool($value)) {
-            return '<comment>' . ($value ? 'True' : 'False') . '</comment>';
+            return '<comment>'.($value ? 'True' : 'False').'</comment>';
         }
 
         if (empty($value)) {
@@ -324,7 +324,7 @@ 
 
             if ($property instanceof FieldMetadata) {
                 $output = array_merge($output, $this->formatColumn($property));
-            }  else if ($property instanceof AssociationMetadata) {
+            } else if ($property instanceof AssociationMetadata) {
                 // @todo guilhermeblanco Fix me! We are trying to iterate through an AssociationMetadata instance
                 foreach ($property as $field => $value) {
                     $output[] = $this->formatField(sprintf('    %s', $field), $this->formatValue($value));

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

Indentation +12 added lines, -12 removed lines

@@ -20,11 +20,11 @@ 
     public function testMixedParametersWithZeroNumber() : void
     {
         $query = $this->_em->createQueryBuilder()
-                           ->select('u')
-                           ->from(CmsUser::class, 'u')
-                           ->andWhere('u.username = :username')
-                           ->andWhere('u.id = ?0')
-                           ->getQuery();
+                            ->select('u')
+                            ->from(CmsUser::class, 'u')
+                            ->andWhere('u.username = :username')
+                            ->andWhere('u.id = ?0')
+                            ->getQuery();
 
         $query->setParameter('username', 'bar');
         $query->setParameter(0, 0);
@@ -39,13 +39,13 @@ 
     public function testMixedParametersWithZeroNumberOnQueryBuilder() : void
     {
         $query = $this->_em->createQueryBuilder()
-                           ->select('u')
-                           ->from(CmsUser::class, 'u')
-                           ->andWhere('u.username = :username')
-                           ->andWhere('u.id = ?0')
-                           ->setParameter('username', 'bar')
-                           ->setParameter(0, 0)
-                           ->getQuery();
+                            ->select('u')
+                            ->from(CmsUser::class, 'u')
+                            ->andWhere('u.username = :username')
+                            ->andWhere('u.id = ?0')
+                            ->setParameter('username', 'bar')
+                            ->setParameter(0, 0)
+                            ->getQuery();
 
         $query->execute();
 

lib/Doctrine/ORM/Tools/Setup.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools;
 
@@ -28,14 +28,14 @@ 
      */
     public static function registerAutoloadDirectory($directory)
     {
-        if (!class_exists('Doctrine\Common\ClassLoader', false)) {
-            require_once $directory . "/Doctrine/Common/ClassLoader.php";
+        if ( ! class_exists('Doctrine\Common\ClassLoader', false)) {
+            require_once $directory."/Doctrine/Common/ClassLoader.php";
         }
 
         $loader = new ClassLoader("Doctrine", $directory);
         $loader->register();
 
-        $loader = new ClassLoader('Symfony\Component', $directory . "/Doctrine");
+        $loader = new ClassLoader('Symfony\Component', $directory."/Doctrine");
         $loader->register();
     }
 
@@ -101,7 +101,7 @@ 
         return $config;
     }
 
-    private static function createCacheConfiguration(bool $isDevMode, string $proxyDir, ?Cache $cache) :  Cache
+    private static function createCacheConfiguration(bool $isDevMode, string $proxyDir, ?Cache $cache) : Cache
     {
         $cache = self::createCacheInstance($isDevMode, $cache);
 
@@ -115,7 +115,7 @@ 
             $namespace .= ':';
         }
 
-        $cache->setNamespace($namespace . 'dc2_' . md5($proxyDir) . '_'); // to avoid collisions
+        $cache->setNamespace($namespace.'dc2_'.md5($proxyDir).'_'); // to avoid collisions
 
         return $cache;
     }

lib/Doctrine/ORM/Tools/EntityGenerator.php

Spacing +138 added lines, -138 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools;
 
@@ -329,7 +329,7 @@ 
      */
     public function writeEntityClass(ClassMetadata $metadata, $outputDirectory)
     {
-        $path = $outputDirectory . '/' . str_replace('\\', DIRECTORY_SEPARATOR, $metadata->getClassName()) . $this->extension;
+        $path = $outputDirectory.'/'.str_replace('\\', DIRECTORY_SEPARATOR, $metadata->getClassName()).$this->extension;
         $dir = dirname($path);
 
         if ( ! is_dir($dir)) {
@@ -345,8 +345,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.");
             }
         }
@@ -408,7 +408,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";
     }
 
     /**
@@ -472,7 +472,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;
@@ -569,11 +569,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).';';
     }
 
     /**
@@ -595,8 +595,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);
     }
 
     /**
@@ -681,7 +681,7 @@ 
         $optionalFields = [];
 
         foreach ($metadata->getDeclaredPropertiesIterator() as $property) {
-            if (! $property->isNullable()) {
+            if ( ! $property->isNullable()) {
                 $requiredFields[] = $property;
 
                 continue;
@@ -710,13 +710,13 @@ 
             $fieldName  = $property->getName();
             $fieldType  = $property->getTypeName();
             $mappedType = $this->getType($fieldType);
-            $param      = '$' . $fieldName;
+            $param      = '$'.$fieldName;
 
-            $paramTypes[] = $mappedType . ($property->isNullable() ? '|null' : '');
+            $paramTypes[] = $mappedType.($property->isNullable() ? '|null' : '');
             $paramVariables[] = $param;
 
             if ($fieldType === 'datetime') {
-                $param = $mappedType . ' ' . $param;
+                $param = $mappedType.' '.$param;
             }
 
             if ($property->isNullable()) {
@@ -725,13 +725,13 @@ 
 
             $params[] = $param;
 
-            $fields[] = '$this->' . $fieldName . ' = $' . $fieldName . ';';
+            $fields[] = '$this->'.$fieldName.' = $'.$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
@@ -739,8 +739,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);
         }
@@ -748,7 +748,7 @@ 
         $replacements = [
             '<paramTags>' => implode("\n * ", $paramTags),
             '<params>'    => $params,
-            '<fields>'    => implode("\n" . $this->spaces, $fields),
+            '<fields>'    => implode("\n".$this->spaces, $fields),
         ];
 
         $constructor = str_replace(
@@ -793,7 +793,7 @@ 
 
             if ($inClass) {
                 $inClass = false;
-                $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1];
+                $lastSeenClass = $lastSeenNamespace.($lastSeenNamespace ? '\\' : '').$token[1];
                 $this->staticReflection[$lastSeenClass]['properties'] = [];
                 $this->staticReflection[$lastSeenClass]['methods'] = [];
             }
@@ -801,16 +801,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);
             }
         }
     }
@@ -823,7 +823,7 @@ 
      */
     protected function hasProperty($property, ClassMetadata $metadata)
     {
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->getClassName()))) {
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->getClassName()))) {
             // don't generate property if its already on the base class.
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->getClassName());
 
@@ -853,7 +853,7 @@ 
      */
     protected function hasMethod($method, ClassMetadata $metadata)
     {
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->getClassName()))) {
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->getClassName()))) {
             // don't generate method if its already on the base class.
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->getClassName());
 
@@ -884,7 +884,7 @@ 
      */
     protected function getTraits(ClassMetadata $metadata)
     {
-        if (! ($metadata->getReflectionClass() !== null || class_exists($metadata->getClassName()))) {
+        if ( ! ($metadata->getReflectionClass() !== null || class_exists($metadata->getClassName()))) {
             return [];
         }
 
@@ -933,7 +933,7 @@ 
     {
         $refl = new \ReflectionClass($this->getClassToExtend());
 
-        return '\\' . $refl->getName();
+        return '\\'.$refl->getName();
     }
 
     /**
@@ -966,7 +966,7 @@ 
     {
         $lines = [];
         $lines[] = '/**';
-        $lines[] = ' * ' . $this->getClassName($metadata);
+        $lines[] = ' * '.$this->getClassName($metadata);
 
         if ($this->generateAnnotations) {
             $lines[] = ' *';
@@ -982,12 +982,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';
             }
         }
 
@@ -1003,17 +1003,17 @@ 
      */
     protected function generateEntityAnnotation(ClassMetadata $metadata)
     {
-        $prefix = '@' . $this->annotationsPrefix;
+        $prefix = '@'.$this->annotationsPrefix;
 
         if ($metadata->isEmbeddedClass) {
-            return $prefix . 'Embeddable';
+            return $prefix.'Embeddable';
         }
 
         $customRepository = $metadata->getCustomRepositoryClassName()
-            ? '(repositoryClass="' . $metadata->getCustomRepositoryClassName() . '")'
+            ? '(repositoryClass="'.$metadata->getCustomRepositoryClassName().'")'
             : '';
 
-        return $prefix . ($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity') . $customRepository;
+        return $prefix.($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity').$customRepository;
     }
 
     /**
@@ -1030,28 +1030,28 @@ 
         $table = [];
 
         if ($metadata->table->getSchema()) {
-            $table[] = 'schema="' . $metadata->table->getSchema() . '"';
+            $table[] = 'schema="'.$metadata->table->getSchema().'"';
         }
 
         if ($metadata->table->getName()) {
-            $table[] = 'name="' . $metadata->table->getName() . '"';
+            $table[] = 'name="'.$metadata->table->getName().'"';
         }
 
         if ($metadata->table->getOptions()) {
-            $table[] = 'options={' . $this->exportTableOptions($metadata->table->getOptions()) . '}';
+            $table[] = 'options={'.$this->exportTableOptions($metadata->table->getOptions()).'}';
         }
 
         if ($metadata->table->getUniqueConstraints()) {
             $constraints = $this->generateTableConstraints('UniqueConstraint', $metadata->table->getUniqueConstraints());
-            $table[] = 'uniqueConstraints={' . $constraints . '}';
+            $table[] = 'uniqueConstraints={'.$constraints.'}';
         }
 
         if ($metadata->table->getIndexes()) {
             $constraints = $this->generateTableConstraints('Index', $metadata->table->getIndexes());
-            $table[] = 'indexes={' . $constraints . '}';
+            $table[] = 'indexes={'.$constraints.'}';
         }
 
-        return '@' . $this->annotationsPrefix . 'Table(' . implode(', ', $table) . ')';
+        return '@'.$this->annotationsPrefix.'Table('.implode(', ', $table).')';
     }
 
     /**
@@ -1068,10 +1068,10 @@ 
             $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);
@@ -1085,7 +1085,7 @@ 
     protected function generateInheritanceAnnotation(ClassMetadata $metadata)
     {
         if ($metadata->inheritanceType !== InheritanceType::NONE) {
-            return '@' . $this->annotationsPrefix . 'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
+            return '@'.$this->annotationsPrefix.'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
         }
     }
 
@@ -1106,7 +1106,7 @@ 
                 $discrColumn->getLength()
             );
 
-            return '@' . $this->annotationsPrefix . 'DiscriminatorColumn(' . $columnDefinition . ')';
+            return '@'.$this->annotationsPrefix.'DiscriminatorColumn('.$columnDefinition.')';
         }
     }
 
@@ -1121,10 +1121,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).'})';
         }
     }
 
@@ -1155,7 +1155,7 @@ 
 
         foreach ($metadata->getDeclaredPropertiesIterator() as $fieldName => $property) {
             if ($property instanceof FieldMetadata) {
-                $nullable  = $property->isNullable() ? 'null' : null;
+                $nullable = $property->isNullable() ? 'null' : null;
 
                 if ($code = $this->generateEntityStubMethod($metadata, 'get', $fieldName, $property->getTypeName(), $nullable)) {
                     $methods[] = $code;
@@ -1211,7 +1211,7 @@ 
         ;
 
         foreach ($joinColumns as $joinColumn) {
-            if (! $joinColumn->isNullable()) {
+            if ( ! $joinColumn->isNullable()) {
                 return false;
             }
         }
@@ -1260,7 +1260,7 @@ 
 
             if ($property instanceof FieldMetadata) {
                 $options      = $property->getOptions();
-                $defaultValue = isset($options['default']) ? ' = ' . var_export($options['default'], true) : null;
+                $defaultValue = isset($options['default']) ? ' = '.var_export($options['default'], true) : null;
 
                 $lines[] = $this->generateFieldMappingPropertyDocBlock($property, $metadata);
             } else {
@@ -1269,7 +1269,7 @@ 
                 $lines[] = $this->generateAssociationMappingPropertyDocBlock($property, $metadata);
             }
 
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldName . $defaultValue . ";\n";
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldName.$defaultValue.";\n";
         }
 
         return implode("\n", $lines);
@@ -1307,7 +1307,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"])) {
@@ -1328,18 +1328,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)
         ];
 
@@ -1368,7 +1368,7 @@ 
         $this->staticReflection[$metadata->getClassName()]['methods'][] = $methodName;
 
         $replacements = [
-            '<name>'        => $this->annotationsPrefix . ucfirst($name),
+            '<name>'        => $this->annotationsPrefix.ucfirst($name),
             '<methodName>'  => $methodName,
         ];
 
@@ -1388,25 +1388,25 @@ 
      */
     protected function generateIdentifierAnnotation(Property $metadata)
     {
-        $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Id';
+        $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Id';
 
         if ($metadata instanceof FieldMetadata) {
             if ($generatorType = $this->getIdGeneratorTypeString($metadata->getValueGenerator()->getType())) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'GeneratedValue(strategy="'.$generatorType.'")';
             }
 
             if ($metadata->getValueGenerator()->getType()) {
                 $generator = [];
 
                 if (isset($metadata->getValueGenerator()->getDefinition()['sequenceName'])) {
-                    $generator[] = 'sequenceName="' . $metadata->getValueGenerator()->getDefinition()['sequenceName'] . '"';
+                    $generator[] = 'sequenceName="'.$metadata->getValueGenerator()->getDefinition()['sequenceName'].'"';
                 }
 
                 if (isset($metadata->getValueGenerator()->getDefinition()['allocationSize'])) {
-                    $generator[] = 'allocationSize=' . $metadata->getValueGenerator()->getDefinition()['allocationSize'];
+                    $generator[] = 'allocationSize='.$metadata->getValueGenerator()->getDefinition()['allocationSize'];
                 }
 
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'SequenceGenerator(' . implode(', ', $generator) . ')';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'SequenceGenerator('.implode(', ', $generator).')';
             }
         }
 
@@ -1422,34 +1422,34 @@ 
     {
         $lines            = [];
         $joinTableAnnot   = [];
-        $joinTableAnnot[] = 'name="' . $joinTable->getName() . '"';
+        $joinTableAnnot[] = 'name="'.$joinTable->getName().'"';
 
-        if (! empty($joinTable->getSchema())) {
-            $joinTableAnnot[] = 'schema="' . $joinTable->getSchema() . '"';
+        if ( ! empty($joinTable->getSchema())) {
+            $joinTableAnnot[] = 'schema="'.$joinTable->getSchema().'"';
         }
 
-        $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinTable(' . implode(', ', $joinTableAnnot) . ',';
-        $lines[] = $this->spaces . ' *   joinColumns={';
+        $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinTable('.implode(', ', $joinTableAnnot).',';
+        $lines[] = $this->spaces.' *   joinColumns={';
 
         $joinColumnsLines = [];
 
         foreach ($joinTable->getJoinColumns() 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 ($joinTable->getInverseJoinColumns() 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.' * )';
 
         return implode(PHP_EOL, $lines);
     }
@@ -1463,23 +1463,23 @@ 
     {
         $joinColumnAnnot = [];
 
-        $joinColumnAnnot[] = 'name="' . $joinColumn->getColumnName() . '"';
-        $joinColumnAnnot[] = 'referencedColumnName="' . $joinColumn->getReferencedColumnName() . '"';
+        $joinColumnAnnot[] = 'name="'.$joinColumn->getColumnName().'"';
+        $joinColumnAnnot[] = 'referencedColumnName="'.$joinColumn->getReferencedColumnName().'"';
 
         if ($joinColumn->isUnique()) {
             $joinColumnAnnot[] = 'unique=true';
         }
 
-        if (!$joinColumn->isNullable()) {
+        if ( ! $joinColumn->isNullable()) {
             $joinColumnAnnot[] = 'nullable=false';
         }
 
-        if (!empty($joinColumn->getOnDelete())) {
-            $joinColumnAnnot[] = 'onDelete="' . $joinColumn->getOnDelete() . '"';
+        if ( ! empty($joinColumn->getOnDelete())) {
+            $joinColumnAnnot[] = 'onDelete="'.$joinColumn->getOnDelete().'"';
         }
 
         if ($joinColumn->getColumnDefinition()) {
-            $joinColumnAnnot[] = 'columnDefinition="' . $joinColumn->getColumnDefinition() . '"';
+            $joinColumnAnnot[] = 'columnDefinition="'.$joinColumn->getColumnDefinition().'"';
         }
 
         $options = [];
@@ -1494,7 +1494,7 @@ 
             $joinColumnAnnot[] = 'options={'.implode(',', $options).'}';
         }
 
-        return '@' . $this->annotationsPrefix . 'JoinColumn(' . implode(', ', $joinColumnAnnot) . ')';
+        return '@'.$this->annotationsPrefix.'JoinColumn('.implode(', ', $joinColumnAnnot).')';
     }
 
     /**
@@ -1506,16 +1506,16 @@ 
     protected function generateAssociationMappingPropertyDocBlock(AssociationMetadata $association, ClassMetadata $metadata)
     {
         $lines = [];
-        $lines[] = $this->spaces . '/**';
+        $lines[] = $this->spaces.'/**';
 
         if ($association instanceof ToManyAssociationMetadata) {
-            $lines[] = $this->spaces . ' * @var \Doctrine\Common\Collections\Collection';
+            $lines[] = $this->spaces.' * @var \Doctrine\Common\Collections\Collection';
         } else {
-            $lines[] = $this->spaces . ' * @var \\' . ltrim($association->getTargetEntity(), '\\');
+            $lines[] = $this->spaces.' * @var \\'.ltrim($association->getTargetEntity(), '\\');
         }
 
         if ($this->generateAnnotations) {
-            $lines[] = $this->spaces . ' *';
+            $lines[] = $this->spaces.' *';
 
             if ($association->isPrimaryKey()) {
                 $lines[] = $this->generateIdentifierAnnotation($association);
@@ -1535,18 +1535,18 @@ 
 
             $typeOptions = [];
 
-            $typeOptions[] = 'targetEntity="' . $association->getTargetEntity() . '"';
+            $typeOptions[] = 'targetEntity="'.$association->getTargetEntity().'"';
 
             if ($association->getMappedBy()) {
-                $typeOptions[] = 'mappedBy="' . $association->getMappedBy() . '"';
+                $typeOptions[] = 'mappedBy="'.$association->getMappedBy().'"';
             }
 
             if ($association->getInversedBy()) {
-                $typeOptions[] = 'inversedBy="' . $association->getInversedBy() . '"';
+                $typeOptions[] = 'inversedBy="'.$association->getInversedBy().'"';
             }
 
             if ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy()) {
-                $typeOptions[] = 'indexBy="' . $association->getIndexedBy() . '"';
+                $typeOptions[] = 'indexBy="'.$association->getIndexedBy().'"';
             }
 
             if ($association->isOrphanRemoval()) {
@@ -1566,28 +1566,28 @@ 
                     $cascades = ['"all"'];
                 }
 
-                $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}';
+                $typeOptions[] = 'cascade={'.implode(',', $cascades).'}';
             }
 
             if ($association->getFetchMode() !== FetchMode::LAZY) {
-                $typeOptions[] = 'fetch="' . $association->getFetchMode() . '"';
+                $typeOptions[] = 'fetch="'.$association->getFetchMode().'"';
             }
 
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . '' . $type . '(' . implode(', ', $typeOptions) . ')';
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.''.$type.'('.implode(', ', $typeOptions).')';
 
             if ($association instanceof ToOneAssociationMetadata && $association->getJoinColumns()) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinColumns({';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinColumns({';
 
                 $joinColumnsLines = [];
 
                 foreach ($association->getJoinColumns() 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 ($association instanceof ToManyAssociationMetadata) {
@@ -1596,20 +1596,20 @@ 
                 }
 
                 if ($association->getOrderBy()) {
-                    $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'OrderBy({';
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'OrderBy({';
                     $orderBy = [];
 
                     foreach ($association->getOrderBy() as $name => $direction) {
-                        $orderBy[] = $this->spaces . ' *     "' . $name . '"="' . $direction . '"';
+                        $orderBy[] = $this->spaces.' *     "'.$name.'"="'.$direction.'"';
                     }
 
-                    $lines[] = implode(',' . PHP_EOL, $orderBy);
-                    $lines[] = $this->spaces . ' * })';
+                    $lines[] = implode(','.PHP_EOL, $orderBy);
+                    $lines[] = $this->spaces.' * })';
                 }
             }
         }
 
-        $lines[] = $this->spaces . ' */';
+        $lines[] = $this->spaces.' */';
 
         return implode("\n", $lines);
     }
@@ -1626,49 +1626,49 @@ 
 
         $lines = [];
 
-        $lines[] = $this->spaces . '/**';
-        $lines[] = $this->spaces . ' * @var '
+        $lines[] = $this->spaces.'/**';
+        $lines[] = $this->spaces.' * @var '
             . $this->getType($fieldType)
             . ($propertyMetadata->isNullable() ? '|null' : '');
 
         if ($this->generateAnnotations) {
             $column  = [];
-            $lines[] = $this->spaces . ' *';
+            $lines[] = $this->spaces.' *';
 
             if ($propertyMetadata->getColumnName()) {
-                $column[] = 'name="' . $propertyMetadata->getColumnName() . '"';
+                $column[] = 'name="'.$propertyMetadata->getColumnName().'"';
             }
 
-            $column[] = 'type="' . $fieldType . '"';
+            $column[] = 'type="'.$fieldType.'"';
 
             if (is_int($propertyMetadata->getLength())) {
-                $column[] = 'length=' . $propertyMetadata->getLength();
+                $column[] = 'length='.$propertyMetadata->getLength();
             }
 
             if (is_int($propertyMetadata->getPrecision())) {
-                $column[] = 'precision=' .  $propertyMetadata->getPrecision();
+                $column[] = 'precision='.$propertyMetadata->getPrecision();
             }
 
             if (is_int($propertyMetadata->getScale())) {
-                $column[] = 'scale=' .  $propertyMetadata->getScale();
+                $column[] = 'scale='.$propertyMetadata->getScale();
             }
 
             if ($propertyMetadata->isNullable()) {
-                $column[] = 'nullable=' .  var_export($propertyMetadata->isNullable(), true);
+                $column[] = 'nullable='.var_export($propertyMetadata->isNullable(), true);
             }
 
             if ($propertyMetadata->isUnique()) {
-                $column[] = 'unique=' . var_export($propertyMetadata->isUnique(), true);
+                $column[] = 'unique='.var_export($propertyMetadata->isUnique(), true);
             }
 
             if ($propertyMetadata->getColumnDefinition()) {
-                $column[] = 'columnDefinition="' . $propertyMetadata->getColumnDefinition() . '"';
+                $column[] = 'columnDefinition="'.$propertyMetadata->getColumnDefinition().'"';
             }
 
             $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']) {
@@ -1680,33 +1680,33 @@ 
             }
 
             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) {
                 $column[] = 'options={'.implode(',', $options).'}';
             }
 
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Column(' . implode(', ', $column) . ')';
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Column('.implode(', ', $column).')';
 
             if ($propertyMetadata->isPrimaryKey()) {
                 $lines[] = $this->generateIdentifierAnnotation($propertyMetadata);
             }
 
             if ($metadata->isVersioned() && $metadata->versionProperty->getName() === $propertyMetadata->getName()) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Version';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Version';
             }
         }
 
-        $lines[] = $this->spaces . ' */';
+        $lines[] = $this->spaces.' */';
 
         return implode("\n", $lines);
     }
@@ -1719,27 +1719,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);
     }
@@ -1753,13 +1753,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))
         );
@@ -1777,7 +1777,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];
             }
         }
 
@@ -1845,8 +1845,8 @@ 
 
         foreach ($options as $name => $option) {
             $optionValue = is_array($option)
-                ? '{' . $this->exportTableOptions($option) . '}'
-                : '"' . (string) $option . '"'
+                ? '{'.$this->exportTableOptions($option).'}'
+                : '"'.(string) $option.'"'
             ;
 
             $optionsStr[] = sprintf('"%s"=%s', $name, $optionValue);

lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php

Indentation +13 added lines, -13 removed lines

@@ -31,18 +31,18 @@ 
     protected function configure()
     {
         $this->setName('orm:generate-entities')
-             ->setAliases(['orm:generate:entities'])
-             ->setDescription('Generate entity classes and method stubs from your mapping information')
-             ->addArgument('dest-path', InputArgument::REQUIRED, 'The path to generate your entity classes.')
-             ->addOption('filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'A string pattern used to match entities that should be processed.')
-             ->addOption('generate-annotations', null, InputOption::VALUE_OPTIONAL, 'Flag to define if generator should generate annotation metadata on entities.', false)
-             ->addOption('generate-methods', null, InputOption::VALUE_OPTIONAL, 'Flag to define if generator should generate stub methods on entities.', true)
-             ->addOption('regenerate-entities', null, InputOption::VALUE_OPTIONAL, 'Flag to define if generator should regenerate entity if it exists.', false)
-             ->addOption('update-entities', null, InputOption::VALUE_OPTIONAL, 'Flag to define if generator should only update entity if it exists.', true)
-             ->addOption('extend', null, InputOption::VALUE_REQUIRED, 'Defines a base class to be extended by generated entity classes.')
-             ->addOption('num-spaces', null, InputOption::VALUE_REQUIRED, 'Defines the number of indentation spaces', 4)
-             ->addOption('no-backup', null, InputOption::VALUE_NONE, 'Flag to define if generator should avoid backuping existing entity file if it exists.')
-             ->setHelp(<<<EOT
+                ->setAliases(['orm:generate:entities'])
+                ->setDescription('Generate entity classes and method stubs from your mapping information')
+                ->addArgument('dest-path', InputArgument::REQUIRED, 'The path to generate your entity classes.')
+                ->addOption('filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'A string pattern used to match entities that should be processed.')
+                ->addOption('generate-annotations', null, InputOption::VALUE_OPTIONAL, 'Flag to define if generator should generate annotation metadata on entities.', false)
+                ->addOption('generate-methods', null, InputOption::VALUE_OPTIONAL, 'Flag to define if generator should generate stub methods on entities.', true)
+                ->addOption('regenerate-entities', null, InputOption::VALUE_OPTIONAL, 'Flag to define if generator should regenerate entity if it exists.', false)
+                ->addOption('update-entities', null, InputOption::VALUE_OPTIONAL, 'Flag to define if generator should only update entity if it exists.', true)
+                ->addOption('extend', null, InputOption::VALUE_REQUIRED, 'Defines a base class to be extended by generated entity classes.')
+                ->addOption('num-spaces', null, InputOption::VALUE_REQUIRED, 'Defines the number of indentation spaces', 4)
+                ->addOption('no-backup', null, InputOption::VALUE_NONE, 'Flag to define if generator should avoid backuping existing entity file if it exists.')
+                ->setHelp(<<<EOT
 Generate entity classes and method stubs from your mapping information.
 
 If you use the <comment>--update-entities</comment> or <comment>--regenerate-entities</comment> flags your existing
@@ -61,7 +61,7 @@ 
 for you correctly, because it doesn't know which class is supposed to extend
 which. You have to adjust the entity code manually for inheritance to work!
 EOT
-             );
+                );
     }
 
     /**

lib/Doctrine/ORM/Tools/Console/Command/InfoCommand.php

Indentation +5 added lines, -5 removed lines

@@ -24,13 +24,13 @@ 
     protected function configure()
     {
         $this->setName('orm:info')
-             ->setDescription('Show basic information about all mapped entities')
-             ->setHelp(<<<EOT
+                ->setDescription('Show basic information about all mapped entities')
+                ->setHelp(<<<EOT
 The <info>%command.name%</info> shows basic information about which
 entities exist and possibly if their mapping information contains errors or
 not.
 EOT
-             );
+                );
     }
 
     /**
@@ -42,8 +42,8 @@ 
         $entityManager = $this->getHelper('em')->getEntityManager();
 
         $entityClassNames = $entityManager->getConfiguration()
-                                          ->getMetadataDriverImpl()
-                                          ->getAllClassNames();
+                                            ->getMetadataDriverImpl()
+                                            ->getAllClassNames();
 
         if ( ! $entityClassNames) {
             throw new \Exception(

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Console\Command;
 

lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php

Spacing +74 added lines, -74 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Persisters\Entity;
 
@@ -300,14 +300,14 @@ 
         $tableName      = $versionedClass->table->getQuotedQualifiedName($this->platform);
         $columnName     = $this->platform->quoteIdentifier($versionProperty->getColumnName());
         $identifier     = array_map(
-            function ($columnName) { return $this->platform->quoteIdentifier($columnName); },
+            function($columnName) { return $this->platform->quoteIdentifier($columnName); },
             array_keys($versionedClass->getIdentifierColumns($this->em))
         );
 
         // FIXME: Order with composite keys might not be correct
-        $sql = 'SELECT ' . $columnName
-             . ' FROM '  . $tableName
-             . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
+        $sql = 'SELECT '.$columnName
+             . ' FROM '.$tableName
+             . ' WHERE '.implode(' = ? AND ', $identifier).' = ?';
 
         $flattenedId = $this->em->getIdentifierFlattener()->flattenIdentifier($versionedClass, $id);
         $versionType = $versionProperty->getType();
@@ -393,7 +393,7 @@ 
 
             if (($value = $identifier[$field]) !== null) {
                 // @todo guilhermeblanco Make sure we do not have flat association values.
-                if (! is_array($value)) {
+                if ( ! is_array($value)) {
                     $value = [$targetClass->identifier[0] => $value];
                 }
 
@@ -406,7 +406,7 @@ 
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
                 $targetField          = $targetClass->fieldNames[$referencedColumnName];
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -474,7 +474,7 @@ 
                         $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -501,18 +501,18 @@ 
                 case Type::SMALLINT:
                 case Type::INTEGER:
                 case Type::BIGINT:
-                    $set[] = $versionColumnName . ' = ' . $versionColumnName . ' + 1';
+                    $set[] = $versionColumnName.' = '.$versionColumnName.' + 1';
                     break;
 
                 case Type::DATETIME:
-                    $set[] = $versionColumnName . ' = CURRENT_TIMESTAMP';
+                    $set[] = $versionColumnName.' = CURRENT_TIMESTAMP';
                     break;
             }
         }
 
-        $sql = 'UPDATE ' . $quotedTableName
-             . ' SET ' . implode(', ', $set)
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
+        $sql = 'UPDATE '.$quotedTableName
+             . ' SET '.implode(', ', $set)
+             . ' WHERE '.implode(' = ? AND ', $where).' = ?';
 
         $result = $this->conn->executeUpdate($sql, $params, $types);
 
@@ -531,7 +531,7 @@ 
     protected function deleteJoinTableRecords($identifier)
     {
         foreach ($this->class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof ManyToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ManyToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -544,7 +544,7 @@ 
             $keys              = [];
 
             if ( ! $owningAssociation->isOwningSide()) {
-                $class       = $this->em->getClassMetadata($association->getTargetEntity());
+                $class = $this->em->getClassMetadata($association->getTargetEntity());
                 $owningAssociation = $class->getProperty($association->getMappedBy());
             }
 
@@ -656,7 +656,7 @@ 
             }
 
             // Only owning side of x-1 associations can have a FK column.
-            if (! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) {
+            if ( ! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) {
                 continue;
             }
 
@@ -676,7 +676,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -705,7 +705,7 @@ 
         $propertyName = $this->class->fieldNames[$columnName];
         $property     = $this->class->getProperty($propertyName);
 
-        if (! $property) {
+        if ( ! $property) {
             return null;
         }
 
@@ -724,7 +724,7 @@ 
             /** @var JoinColumnMetadata $joinColumn */
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -1061,7 +1061,7 @@ 
         $criteria       = [];
         $parameters     = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $class       = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssoc = $class->getProperty($association->getMappedBy());
         }
@@ -1089,7 +1089,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$joinTableName . '.' . $quotedColumnName] = $value;
+            $criteria[$joinTableName.'.'.$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -1140,11 +1140,11 @@ 
 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
-                $lockSql = ' ' . $this->platform->getReadLockSQL();
+                $lockSql = ' '.$this->platform->getReadLockSQL();
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
-                $lockSql = ' ' . $this->platform->getWriteLockSQL();
+                $lockSql = ' '.$this->platform->getWriteLockSQL();
                 break;
         }
 
@@ -1155,14 +1155,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
-        $select = 'SELECT ' . $columnList;
-        $from   = ' FROM ' . $tableName . ' '. $tableAlias;
-        $join   = $this->currentPersisterContext->selectJoinSql . $joinSql;
-        $where  = ($conditionSql ? ' WHERE ' . $conditionSql : '');
+        $select = 'SELECT '.$columnList;
+        $from   = ' FROM '.$tableName.' '.$tableAlias;
+        $join   = $this->currentPersisterContext->selectJoinSql.$joinSql;
+        $where  = ($conditionSql ? ' WHERE '.$conditionSql : '');
         $lock   = $this->platform->appendLockHint($from, $lockMode);
         $query  = $select
             . $lock
@@ -1170,7 +1170,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -1189,13 +1189,13 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $tableAlias
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . 'FROM '.$tableName.' '.$tableAlias
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -1212,7 +1212,7 @@ 
      */
     protected final function getOrderBySQL(array $orderBy, $baseTableAlias)
     {
-        if (! $orderBy) {
+        if ( ! $orderBy) {
             return '';
         }
 
@@ -1221,7 +1221,7 @@ 
         foreach ($orderBy as $fieldName => $orientation) {
             $orientation = strtoupper(trim($orientation));
 
-            if (! in_array($orientation, ['ASC', 'DESC'])) {
+            if ( ! in_array($orientation, ['ASC', 'DESC'])) {
                 throw ORMException::invalidOrientation($this->class->getClassName(), $fieldName);
             }
 
@@ -1231,11 +1231,11 @@ 
                 $tableAlias = $this->getSQLTableAlias($property->getTableName());
                 $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-                $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
 
                 continue;
             } else if ($property instanceof AssociationMetadata) {
-                if (! $property->isOwningSide()) {
+                if ( ! $property->isOwningSide()) {
                     throw ORMException::invalidFindByInverseAssociation($this->class->getClassName(), $fieldName);
                 }
 
@@ -1248,7 +1248,7 @@ 
                     /* @var JoinColumnMetadata $joinColumn */
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $orderByList[] = $tableAlias . '.' . $quotedColumnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$quotedColumnName.' '.$orientation;
                 }
 
                 continue;
@@ -1257,7 +1257,7 @@ 
             throw ORMException::unrecognizedField($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1279,7 +1279,7 @@ 
 
 
         $this->currentPersisterContext->rsm->addEntityResult($this->class->getClassName(), 'r'); // r for root
-        $this->currentPersisterContext->selectJoinSql    = '';
+        $this->currentPersisterContext->selectJoinSql = '';
 
         $eagerAliasCounter = 0;
         $columnList        = [];
@@ -1315,7 +1315,7 @@ 
                         break; // now this is why you shouldn't use inheritance
                     }
 
-                    $assocAlias = 'e' . ($eagerAliasCounter++);
+                    $assocAlias = 'e'.($eagerAliasCounter++);
 
                     $this->currentPersisterContext->rsm->addJoinedEntityResult($targetEntity, $assocAlias, 'r', $fieldName);
 
@@ -1340,14 +1340,14 @@ 
                         $this->currentPersisterContext->rsm->addIndexBy($assocAlias, $property->getIndexedBy());
                     }
 
-                    if (! $property->isOwningSide()) {
+                    if ( ! $property->isOwningSide()) {
                         $owningAssociation = $eagerEntity->getProperty($property->getMappedBy());
                     }
 
                     $joinTableAlias = $this->getSQLTableAlias($eagerEntity->getTableName(), $assocAlias);
                     $joinTableName  = $eagerEntity->table->getQuotedQualifiedName($this->platform);
 
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $this->getJoinSQLForAssociation($property);
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$this->getJoinSQLForAssociation($property);
 
                     $sourceClass      = $this->em->getClassMetadata($owningAssociation->getSourceEntity());
                     $targetClass      = $this->em->getClassMetadata($owningAssociation->getTargetEntity());
@@ -1369,7 +1369,7 @@ 
                         $joinCondition[] = $filterSql;
                     }
 
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
                     $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
 
                     break;
@@ -1393,7 +1393,7 @@ 
      */
     protected function getSelectColumnAssociationSQL($field, AssociationMetadata $association, ClassMetadata $class, $alias = 'r')
     {
-        if (! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
+        if ( ! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
             return '';
         }
 
@@ -1408,7 +1408,7 @@ 
             $referencedColumnName = $joinColumn->getReferencedColumnName();
             $resultColumnName     = $this->getSQLColumnAlias();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -1440,7 +1440,7 @@ 
         $owningAssociation = $association;
         $sourceTableAlias  = $this->getSQLTableAlias($this->class->getTableName());
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $targetEntity      = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssociation = $targetEntity->getProperty($association->getMappedBy());
         }
@@ -1462,7 +1462,7 @@ 
             );
         }
 
-        return ' INNER JOIN ' . $joinTableName . ' ON ' . implode(' AND ', $conditions);
+        return ' INNER JOIN '.$joinTableName.' ON '.implode(' AND ', $conditions);
     }
 
     /**
@@ -1557,7 +1557,7 @@ 
                             $columnName           = $joinColumn->getColumnName();
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                             }
 
@@ -1596,7 +1596,7 @@ 
 
         $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field, $class->getClassName());
 
-        return $property->getType()->convertToPHPValueSQL($sql, $this->platform) . ' AS ' . $columnAlias;
+        return $property->getType()->convertToPHPValueSQL($sql, $this->platform).' AS '.$columnAlias;
     }
 
     /**
@@ -1610,14 +1610,14 @@ 
     protected function getSQLTableAlias($tableName, $assocName = '')
     {
         if ($tableName) {
-            $tableName .= '#' . $assocName;
+            $tableName .= '#'.$assocName;
         }
 
         if (isset($this->currentPersisterContext->sqlTableAliases[$tableName])) {
             return $this->currentPersisterContext->sqlTableAliases[$tableName];
         }
 
-        $tableAlias = 't' . $this->currentPersisterContext->sqlAliasCounter++;
+        $tableAlias = 't'.$this->currentPersisterContext->sqlAliasCounter++;
 
         $this->currentPersisterContext->sqlTableAliases[$tableName] = $tableAlias;
 
@@ -1644,7 +1644,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql = 'SELECT 1 '
              . $lock
              . $where
@@ -1667,7 +1667,7 @@ 
         $tableName = $this->class->table->getQuotedQualifiedName($this->platform);
 
         return $this->platform->appendLockHint(
-            'FROM ' . $tableName . ' ' . $this->getSQLTableAlias($this->class->getTableName()),
+            'FROM '.$tableName.' '.$this->getSQLTableAlias($this->class->getTableName()),
             $lockMode
         );
     }
@@ -1720,19 +1720,19 @@ 
 
             if (null !== $comparison) {
                 // special case null value handling
-                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null ===$value) {
-                    $selectedColumns[] = $column . ' IS NULL';
+                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null === $value) {
+                    $selectedColumns[] = $column.' IS NULL';
 
                     continue;
                 }
 
                 if ($comparison === Comparison::NEQ && null === $value) {
-                    $selectedColumns[] = $column . ' IS NOT NULL';
+                    $selectedColumns[] = $column.' IS NOT NULL';
 
                     continue;
                 }
 
-                $selectedColumns[] = $column . ' ' . sprintf(self::$comparisonMap[$comparison], $placeholder);
+                $selectedColumns[] = $column.' '.sprintf(self::$comparisonMap[$comparison], $placeholder);
 
                 continue;
             }
@@ -1778,7 +1778,7 @@ 
         if (isset($this->class->fieldMappings[$field])) {
             $className = $this->class->fieldMappings[$field]['inherited'] ?? $this->class->name;
 
-            return [$tableAlias . '.' . $columnName];
+            return [$tableAlias.'.'.$columnName];
         }
 
         if ($property instanceof AssociationMetadata) {
@@ -1787,7 +1787,7 @@ 
 
             // Many-To-Many requires join table check for joinColumn
             if ($owningAssociation instanceof ManyToManyAssociationMetadata) {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     $owningAssociation = $association;
                 }
 
@@ -1801,17 +1801,17 @@ 
                 foreach ($joinColumns as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $joinTableName . '.' . $quotedColumnName;
+                    $columns[] = $joinTableName.'.'.$quotedColumnName;
                 }
 
             } else {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     throw ORMException::invalidFindByInverseAssociation($this->class->getClassName(), $field);
                 }
 
                 $className = $association['inherited'] ?? $this->class->name;
 
-                    $columns[] = $tableAlias . '.' . $quotedColumnName;
+                    $columns[] = $tableAlias.'.'.$quotedColumnName;
                 }
             }
 
@@ -1924,7 +1924,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$tableAlias . "." . $quotedColumnName] = $value;
+            $criteria[$tableAlias.".".$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -2011,7 +2011,7 @@ 
             case ($property instanceof AssociationMetadata):
                 $class = $this->em->getClassMetadata($property->getTargetEntity());
 
-                if (! $property->isOwningSide()) {
+                if ( ! $property->isOwningSide()) {
                     $property = $class->getProperty($property->getMappedBy());
                     $class    = $this->em->getClassMetadata($property->getTargetEntity());
                 }
@@ -2025,7 +2025,7 @@ 
                     /** @var JoinColumnMetadata $joinColumn */
                     $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
                     }
 
@@ -2040,7 +2040,7 @@ 
         }
 
         if (is_array($value)) {
-            return array_map(function ($type) {
+            return array_map(function($type) {
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
             }, $types);
         }
@@ -2119,12 +2119,12 @@ 
 
         $sql = 'SELECT 1 '
              . $this->getLockTablesSql(null)
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
+             . ' WHERE '.$this->getSelectConditionSQL($criteria);
 
         list($params, $types) = $this->expandParameters($criteria);
 
         if (null !== $extraConditions) {
-            $sql                                 .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
+            $sql                                 .= ' AND '.$this->getSelectConditionCriteriaSQL($extraConditions);
             list($criteriaParams, $criteriaTypes) = $this->expandCriteriaParameters($extraConditions);
 
             $params = array_merge($params, $criteriaParams);
@@ -2132,7 +2132,7 @@ 
         }
 
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2147,13 +2147,13 @@ 
      */
     protected function getJoinSQLForAssociation(AssociationMetadata $association)
     {
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return 'LEFT JOIN';
         }
 
         // if one of the join columns is nullable, return left join
         foreach ($association->getJoinColumns() as $joinColumn) {
-             if (! $joinColumn->isNullable()) {
+             if ( ! $joinColumn->isNullable()) {
                  continue;
              }
 
@@ -2170,7 +2170,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->currentPersisterContext->sqlAliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->currentPersisterContext->sqlAliasCounter++);
     }
 
     /**
@@ -2187,13 +2187,13 @@ 
 
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
             if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
         $sql = implode(' AND ', $filterClauses);
 
-        return $sql ? "(" . $sql . ")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
+        return $sql ? "(".$sql.")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
     }
 
     /**

lib/Doctrine/ORM/AbstractQuery.php

Spacing +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\ArrayCollection;;
+use Doctrine\Common\Collections\ArrayCollection; ;
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\Cache\QueryCacheKey;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
@@ -305,7 +305,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function (Query\Parameter $parameter) use ($key) : bool {
+            function(Query\Parameter $parameter) use ($key) : bool {
                 $parameterName = $parameter->getName();
 
                 return $key === $parameterName || (string) $key === (string) $parameterName;
@@ -443,7 +443,7 @@ 
      */
     private function translateNamespaces(Query\ResultSetMapping $rsm)
     {
-        $translate = function ($alias) {
+        $translate = function($alias) {
             return $this->em->getClassMetadata($alias)->getClassName();
         };
 
@@ -505,7 +505,7 @@ 
      */
     public function setResultCacheProfile(QueryCacheProfile $profile = null)
     {
-        if (! $profile->getResultCacheDriver()) {
+        if ( ! $profile->getResultCacheDriver()) {
             $resultCacheDriver = $this->em->getConfiguration()->getResultCacheImpl();
             $profile = $profile->setResultCacheDriver($resultCacheDriver);
         }
@@ -973,7 +973,7 @@ 
             $this->getTimestampKey()
         );
 
-        $result     = $queryCache->get($queryKey, $rsm, $this->hints);
+        $result = $queryCache->get($queryKey, $rsm, $this->hints);
 
         if ($result !== null) {
             if ($this->cacheLogger) {
@@ -1107,6 +1107,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Internal\Hydration;
 
@@ -97,10 +97,10 @@ 
                 // It's a joined result
 
                 $parent = $this->rsm->parentAliasMap[$dqlAlias];
-                $path   = $parent . '.' . $dqlAlias;
+                $path   = $parent.'.'.$dqlAlias;
 
                 // missing parent data, skipping as RIGHT JOIN hydration is not supported.
-                if ( ! isset($nonemptyComponents[$parent]) ) {
+                if ( ! isset($nonemptyComponents[$parent])) {
                     continue;
                 }
 
@@ -109,9 +109,9 @@ 
                 if ($this->rsm->isMixed && isset($this->rootAliases[$parent])) {
                     $first = reset($this->resultPointers);
                     // TODO: Exception if $key === null ?
-                    $baseElement =& $this->resultPointers[$parent][key($first)];
+                    $baseElement = & $this->resultPointers[$parent][key($first)];
                 } else if (isset($this->resultPointers[$parent])) {
-                    $baseElement =& $this->resultPointers[$parent];
+                    $baseElement = & $this->resultPointers[$parent];
                 } else {
                     unset($this->resultPointers[$dqlAlias]); // Ticket #1228
 
@@ -123,7 +123,7 @@ 
                 $relation      = $parentClass->getProperty($relationAlias);
 
                 // Check the type of the relation (many or single-valued)
-                if (! $relation instanceof ToOneAssociationMetadata) {
+                if ( ! $relation instanceof ToOneAssociationMetadata) {
                     $oneToOne = false;
 
                     if ( ! isset($baseElement[$relationAlias])) {
@@ -162,7 +162,7 @@ 
                     }
                 }
 
-                $coll =& $baseElement[$relationAlias];
+                $coll = & $baseElement[$relationAlias];
 
                 if (is_array($coll)) {
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
@@ -174,7 +174,7 @@ 
                 $entityKey = $this->rsm->entityMappings[$dqlAlias] ?: 0;
 
                 // if this row has a NULL value for the root result id then make it a null result.
-                if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
                     $result[] = $this->rsm->isMixed
                         ? [$entityKey => null]
                         : null;
@@ -273,13 +273,13 @@ 
         }
 
         if ($oneToOne) {
-            $this->resultPointers[$dqlAlias] =& $coll;
+            $this->resultPointers[$dqlAlias] = & $coll;
 
             return;
         }
 
         if ($index !== false) {
-            $this->resultPointers[$dqlAlias] =& $coll[$index];
+            $this->resultPointers[$dqlAlias] = & $coll[$index];
 
             return;
         }
@@ -289,7 +289,7 @@ 
         }
 
         end($coll);
-        $this->resultPointers[$dqlAlias] =& $coll[key($coll)];
+        $this->resultPointers[$dqlAlias] = & $coll[key($coll)];
 
         return;
     }