doctrine / orm

lib/Doctrine/ORM/Query/Parser.php

Spacing +31 added lines, -31 removed lines

@@ -395,7 +395,7 @@ 
         }
 
         foreach ($this->queryComponents as $dqlAlias => $qComp) {
-            if (! isset($this->identVariableExpressions[$dqlAlias])) {
+            if ( ! isset($this->identVariableExpressions[$dqlAlias])) {
                 continue;
             }
 
@@ -459,7 +459,7 @@ 
         $tokenStr = substr($dql, (int) $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError(
             $message,
@@ -562,7 +562,7 @@ 
             $identVariable = $deferredItem['expression'];
 
             // Check if IdentificationVariable exists in queryComponents
-            if (! isset($this->queryComponents[$identVariable])) {
+            if ( ! isset($this->queryComponents[$identVariable])) {
                 $this->semanticalError(
                     sprintf("'%s' is not defined.", $identVariable),
                     $deferredItem['token']
@@ -572,7 +572,7 @@ 
             $qComp = $this->queryComponents[$identVariable];
 
             // Check if queryComponent points to an AbstractSchemaName or a ResultVariable
-            if (! isset($qComp['metadata'])) {
+            if ( ! isset($qComp['metadata'])) {
                 $this->semanticalError(
                     sprintf("'%s' does not point to a Class.", $identVariable),
                     $deferredItem['token']
@@ -606,7 +606,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn      = $namespace . '\\' . $className;
+                $fqcn      = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className = $fqcn;
@@ -614,13 +614,13 @@ 
                 }
             }
 
-            if (! class_exists($className)) {
+            if ( ! class_exists($className)) {
                 $this->semanticalError(sprintf('Class "%s" is not defined.', $className), $token);
             }
 
             $class = new \ReflectionClass($className);
 
-            if (! $class->isInstantiable()) {
+            if ( ! $class->isInstantiable()) {
                 $this->semanticalError(sprintf('Class "%s" can not be instantiated.', $className), $token);
             }
 
@@ -677,7 +677,7 @@ 
             $resultVariable = $deferredItem['expression'];
 
             // Check if ResultVariable exists in queryComponents
-            if (! isset($this->queryComponents[$resultVariable])) {
+            if ( ! isset($this->queryComponents[$resultVariable])) {
                 $this->semanticalError(
                     sprintf("'%s' is not defined.", $resultVariable),
                     $deferredItem['token']
@@ -687,7 +687,7 @@ 
             $qComp = $this->queryComponents[$resultVariable];
 
             // Check if queryComponent points to an AbstractSchemaName or a ResultVariable
-            if (! isset($qComp['resultVariable'])) {
+            if ( ! isset($qComp['resultVariable'])) {
                 $this->semanticalError(
                     sprintf("'%s' does not point to a ResultVariable.", $resultVariable),
                     $deferredItem['token']
@@ -729,9 +729,9 @@ 
             $property = $class->getProperty($field);
 
             // Check if field or association exists
-            if (! $property) {
+            if ( ! $property) {
                 $this->semanticalError(
-                    'Class ' . $class->getClassName() . ' has no field or association named ' . $field,
+                    'Class '.$class->getClassName().' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -748,7 +748,7 @@ 
             // Validate if PathExpression is one of the expected types
             $expectedType = $pathExpression->expectedType;
 
-            if (! ($expectedType & $fieldType)) {
+            if ( ! ($expectedType & $fieldType)) {
                 // We need to recognize which was expected type(s)
                 $expectedStringTypes = [];
 
@@ -770,8 +770,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= count($expectedStringTypes) === 1
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -783,7 +783,7 @@ 
 
     private function processRootEntityAliasSelected()
     {
-        if (! $this->identVariableExpressions) {
+        if ( ! $this->identVariableExpressions) {
             return;
         }
 
@@ -940,7 +940,7 @@ 
 
         [$namespaceAlias, $simpleClassName] = explode(':', $this->lexer->token['value']);
 
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
     }
 
     /**
@@ -1019,9 +1019,9 @@ 
     {
         $identVariable = $this->IdentificationVariable();
 
-        if (! isset($this->queryComponents[$identVariable])) {
+        if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable . ' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1035,8 +1035,8 @@ 
         $class    = $qComp['metadata'];
         $property = $class->getProperty($field);
 
-        if (! ($property !== null && $property instanceof AssociationMetadata)) {
-            $this->semanticalError('Class ' . $class->getClassName() . ' has no association named ' . $field);
+        if ( ! ($property !== null && $property instanceof AssociationMetadata)) {
+            $this->semanticalError('Class '.$class->getClassName().' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -1066,7 +1066,7 @@ 
             while ($this->lexer->isNextToken(Lexer::T_DOT)) {
                 $this->match(Lexer::T_DOT);
                 $this->match(Lexer::T_IDENTIFIER);
-                $field .= '.' . $this->lexer->token['value'];
+                $field .= '.'.$this->lexer->token['value'];
             }
         }
 
@@ -1450,7 +1450,7 @@ 
         // Still need to decide between IdentificationVariable or ResultVariable
         $lookaheadValue = $this->lexer->lookahead['value'];
 
-        if (! isset($this->queryComponents[$lookaheadValue])) {
+        if ( ! isset($this->queryComponents[$lookaheadValue])) {
             $this->semanticalError('Cannot group by undefined identification or result variable.');
         }
 
@@ -1798,7 +1798,7 @@ 
         while ($this->lexer->isNextToken(Lexer::T_DOT)) {
             $this->match(Lexer::T_DOT);
             $this->match(Lexer::T_IDENTIFIER);
-            $field .= '.' . $this->lexer->token['value'];
+            $field .= '.'.$this->lexer->token['value'];
         }
 
         $partialFieldSet[] = $field;
@@ -1812,7 +1812,7 @@ 
             while ($this->lexer->isNextToken(Lexer::T_DOT)) {
                 $this->match(Lexer::T_DOT);
                 $this->match(Lexer::T_IDENTIFIER);
-                $field .= '.' . $this->lexer->token['value'];
+                $field .= '.'.$this->lexer->token['value'];
             }
 
             $partialFieldSet[] = $field;
@@ -2433,7 +2433,7 @@ 
 
         // Phase 1 AST optimization: Prevent AST\ConditionalFactor
         // if only one AST\ConditionalPrimary is defined
-        if (! $not) {
+        if ( ! $not) {
             return $conditionalPrimary;
         }
 
@@ -2452,7 +2452,7 @@ 
     {
         $condPrimary = new AST\ConditionalPrimary();
 
-        if (! $this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
+        if ( ! $this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
 
             return $condPrimary;
@@ -2620,7 +2620,7 @@ 
             $this->match(Lexer::T_OF);
         }
 
-        $collMemberExpr      = new AST\CollectionMemberExpression(
+        $collMemberExpr = new AST\CollectionMemberExpression(
             $entityExpr,
             $this->CollectionValuedPathExpression()
         );
@@ -2955,7 +2955,7 @@ 
         $lookaheadType = $this->lexer->lookahead['type'];
         $isDistinct    = false;
 
-        if (! in_array($lookaheadType, [Lexer::T_COUNT, Lexer::T_AVG, Lexer::T_MAX, Lexer::T_MIN, Lexer::T_SUM], true)) {
+        if ( ! in_array($lookaheadType, [Lexer::T_COUNT, Lexer::T_AVG, Lexer::T_MAX, Lexer::T_MIN, Lexer::T_SUM], true)) {
             $this->syntaxError('One of: MAX, MIN, AVG, SUM, COUNT');
         }
 
@@ -2985,7 +2985,7 @@ 
         $lookaheadType = $this->lexer->lookahead['type'];
         $value         = $this->lexer->lookahead['value'];
 
-        if (! in_array($lookaheadType, [Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME], true)) {
+        if ( ! in_array($lookaheadType, [Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME], true)) {
             $this->syntaxError('ALL, ANY or SOME');
         }
 
@@ -3223,7 +3223,7 @@ 
                 $lookaheadValue = $this->lexer->lookahead['value'];
 
                 // Validate existing component
-                if (! isset($this->queryComponents[$lookaheadValue])) {
+                if ( ! isset($this->queryComponents[$lookaheadValue])) {
                     $this->semanticalError('Cannot add having condition on undefined result variable.');
                 }
 
@@ -3234,7 +3234,7 @@ 
                 }
 
                 // Validating ResultVariable
-                if (! isset($this->queryComponents[$lookaheadValue]['resultVariable'])) {
+                if ( ! isset($this->queryComponents[$lookaheadValue]['resultVariable'])) {
                     $this->semanticalError('Cannot add having condition on a non result variable.');
                 }
 

lib/Doctrine/ORM/Query/Printer.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function startProduction($name)
     {
-        $this->println('(' . $name);
+        $this->println('('.$name);
         $this->indent++;
     }
 
@@ -67,7 +67,7 @@ 
      */
     public function println($str)
     {
-        if (! $this->silent) {
+        if ( ! $this->silent) {
             echo str_repeat('    ', $this->indent), $str, "\n";
         }
     }

lib/Doctrine/ORM/Query/SqlWalker.php

Spacing +123 added lines, -123 removed lines

@@ -274,10 +274,10 @@ 
      */
     public function getSQLTableAlias($tableName, $dqlAlias = '')
     {
-        $tableName .= ($dqlAlias) ? '@[' . $dqlAlias . ']' : '';
+        $tableName .= ($dqlAlias) ? '@['.$dqlAlias.']' : '';
 
-        if (! isset($this->tableAliasMap[$tableName])) {
-            $this->tableAliasMap[$tableName] = 't' . $this->tableAliasCounter++;
+        if ( ! isset($this->tableAliasMap[$tableName])) {
+            $this->tableAliasMap[$tableName] = 't'.$this->tableAliasCounter++;
         }
 
         return $this->tableAliasMap[$tableName];
@@ -295,7 +295,7 @@ 
      */
     public function setSQLTableAlias($tableName, $alias, $dqlAlias = '')
     {
-        $tableName .= ($dqlAlias) ? '@[' . $dqlAlias . ']' : '';
+        $tableName .= ($dqlAlias) ? '@['.$dqlAlias.']' : '';
 
         $this->tableAliasMap[$tableName] = $alias;
 
@@ -309,7 +309,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->aliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->aliasCounter++);
     }
 
     /**
@@ -336,14 +336,14 @@ 
 
             // If this is a joined association we must use left joins to preserve the correct result.
             $sql .= isset($this->queryComponents[$dqlAlias]['relation']) ? ' LEFT ' : ' INNER ';
-            $sql .= 'JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $sql .= 'JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             $sqlParts = [];
 
             foreach ($class->getIdentifierColumns($this->em) as $column) {
                 $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-                $sqlParts[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $sqlParts[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $filterSql = $this->generateFilterConditionSQL($parentClass, $tableAlias);
@@ -367,14 +367,14 @@ 
             $tableName  = $subClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias = $this->getSQLTableAlias($subClass->getTableName(), $dqlAlias);
 
-            $sql .= ' LEFT JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $sql .= ' LEFT JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             $sqlParts = [];
 
             foreach ($subClass->getIdentifierColumns($this->em) as $column) {
                 $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-                $sqlParts[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $sqlParts[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -395,7 +395,7 @@ 
             $qComp       = $this->queryComponents[$dqlAlias];
             $association = $qComp['relation'];
 
-            if (! ($association instanceof ToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -403,7 +403,7 @@ 
                 $property      = $qComp['metadata']->getProperty($fieldName);
                 $tableName     = $property->getTableName();
                 $columnName    = $this->platform->quoteIdentifier($property->getColumnName());
-                $orderedColumn = $this->getSQLTableAlias($tableName, $dqlAlias) . '.' . $columnName;
+                $orderedColumn = $this->getSQLTableAlias($tableName, $dqlAlias).'.'.$columnName;
 
                 // OrderByClause should replace an ordered relation. see - DDC-2475
                 if (isset($this->orderedColumnsMap[$orderedColumn])) {
@@ -411,7 +411,7 @@ 
                 }
 
                 $this->orderedColumnsMap[$orderedColumn] = $orientation;
-                $orderedColumns[]                        = $orderedColumn . ' ' . $orientation;
+                $orderedColumns[]                        = $orderedColumn.' '.$orientation;
             }
         }
 
@@ -451,19 +451,19 @@ 
             $discrColumnType  = $discrColumn->getType();
             $quotedColumnName = $this->platform->quoteIdentifier($discrColumn->getColumnName());
             $sqlTableAlias    = ($this->useSqlTableAliases)
-                ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias) . '.'
+                ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias).'.'
                 : '';
 
             $sqlParts[] = sprintf(
                 '%s IN (%s)',
-                $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . $quotedColumnName, $this->platform),
+                $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.$quotedColumnName, $this->platform),
                 implode(', ', $values)
             );
         }
 
         $sql = implode(' AND ', $sqlParts);
 
-        return isset($sqlParts[1]) ? '(' . $sql . ')' : $sql;
+        return isset($sqlParts[1]) ? '('.$sql.')' : $sql;
     }
 
     /**
@@ -476,7 +476,7 @@ 
      */
     private function generateFilterConditionSQL(ClassMetadata $targetEntity, $targetTableAlias)
     {
-        if (! $this->em->hasFilters()) {
+        if ( ! $this->em->hasFilters()) {
             return '';
         }
 
@@ -509,7 +509,7 @@ 
             $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias);
 
             if ($filterExpr !== '') {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
@@ -540,11 +540,11 @@ 
             $sql .= $this->walkOrderByClause($AST->orderByClause);
         }
 
-        if (! $AST->orderByClause) {
+        if ( ! $AST->orderByClause) {
             $orderBySql = $this->generateOrderedCollectionOrderByItems();
 
             if ($orderBySql) {
-                $sql .= ' ORDER BY ' . $orderBySql;
+                $sql .= ' ORDER BY '.$orderBySql;
             }
         }
 
@@ -557,11 +557,11 @@ 
         }
 
         if ($lockMode === LockMode::PESSIMISTIC_READ) {
-            return $sql . ' ' . $this->platform->getReadLockSQL();
+            return $sql.' '.$this->platform->getReadLockSQL();
         }
 
         if ($lockMode === LockMode::PESSIMISTIC_WRITE) {
-            return $sql . ' ' . $this->platform->getWriteLockSQL();
+            return $sql.' '.$this->platform->getWriteLockSQL();
         }
 
         if ($lockMode !== LockMode::OPTIMISTIC) {
@@ -569,7 +569,7 @@ 
         }
 
         foreach ($this->selectedClasses as $selectedClass) {
-            if (! $selectedClass['class']->isVersioned()) {
+            if ( ! $selectedClass['class']->isVersioned()) {
                 throw OptimisticLockException::lockFailed($selectedClass['class']->getClassName());
             }
         }
@@ -618,7 +618,7 @@ 
         foreach ($class->getIdentifierColumns($this->em) as $column) {
             $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-            $sqlParts[] = $tableAlias . '.' . $quotedColumnName;
+            $sqlParts[] = $tableAlias.'.'.$quotedColumnName;
         }
 
         return implode(', ', $sqlParts);
@@ -636,7 +636,7 @@ 
     {
         $class = $this->queryComponents[$identificationVariable]['metadata'];
 
-        if (! $fieldName) {
+        if ( ! $fieldName) {
             return $this->getSQLTableAlias($class->getTableName(), $identificationVariable);
         }
 
@@ -665,7 +665,7 @@ 
                 $property  = $class->getProperty($fieldName);
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName) . '.';
+                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName).'.';
                 }
 
                 $sql .= $this->platform->quoteIdentifier($property->getColumnName());
@@ -679,7 +679,7 @@ 
                 $class       = $this->queryComponents[$dqlAlias]['metadata'];
                 $association = $class->getProperty($fieldName);
 
-                if (! $association->isOwningSide()) {
+                if ( ! $association->isOwningSide()) {
                     throw QueryException::associationPathInverseSideNotSupported($pathExpr);
                 }
 
@@ -693,7 +693,7 @@ 
                 $joinColumn = reset($joinColumns);
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias) . '.';
+                    $sql .= $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias).'.';
                 }
 
                 $sql .= $this->platform->quoteIdentifier($joinColumn->getColumnName());
@@ -711,7 +711,7 @@ 
      */
     public function walkSelectClause($selectClause)
     {
-        $sql                  = 'SELECT ' . (($selectClause->isDistinct) ? 'DISTINCT ' : '');
+        $sql                  = 'SELECT '.(($selectClause->isDistinct) ? 'DISTINCT ' : '');
         $sqlSelectExpressions = array_filter(array_map([$this, 'walkSelectExpression'], $selectClause->selectExpressions));
 
         if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) === true && $selectClause->isDistinct) {
@@ -754,7 +754,7 @@ 
 
                 $sqlSelectExpressions[] = sprintf(
                     '%s AS %s',
-                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . '.' . $quotedColumnName, $this->platform),
+                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.'.'.$quotedColumnName, $this->platform),
                     $sqlColumnAlias
                 );
 
@@ -764,7 +764,7 @@ 
 
             // Add foreign key columns of class and also parent classes
             foreach ($class->getDeclaredPropertiesIterator() as $association) {
-                if (! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())
+                if ( ! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())
                     || ( ! $addMetaColumns && ! $association->isPrimaryKey())) {
                     continue;
                 }
@@ -779,7 +779,7 @@ 
                     $columnAlias          = $this->getSQLColumnAlias();
                     $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                     }
 
@@ -795,7 +795,7 @@ 
             }
 
             // Add foreign key columns to SQL, if necessary
-            if (! $addMetaColumns) {
+            if ( ! $addMetaColumns) {
                 continue;
             }
 
@@ -809,7 +809,7 @@ 
                         continue;
                     }
 
-                    if (! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
+                    if ( ! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
                         continue;
                     }
 
@@ -823,7 +823,7 @@ 
                         $columnAlias          = $this->getSQLColumnAlias();
                         $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -857,7 +857,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($identificationVariableDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -932,7 +932,7 @@ 
         $tableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
         $sql = $this->platform->appendLockHint(
-            $tableName . ' ' . $tableAlias,
+            $tableName.' '.$tableAlias,
             $this->query->getHint(Query::HINT_LOCK_MODE)
         );
 
@@ -942,11 +942,11 @@ 
 
         $classTableInheritanceJoins = $this->generateClassTableInheritanceJoins($class, $dqlAlias);
 
-        if (! $buildNestedJoins) {
-            return $sql . $classTableInheritanceJoins;
+        if ( ! $buildNestedJoins) {
+            return $sql.$classTableInheritanceJoins;
         }
 
-        return $classTableInheritanceJoins === '' ? $sql : '(' . $sql . $classTableInheritanceJoins . ')';
+        return $classTableInheritanceJoins === '' ? $sql : '('.$sql.$classTableInheritanceJoins.')';
     }
 
     /**
@@ -983,7 +983,7 @@ 
         ;
 
         if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) === true &&
-            (! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
+            ( ! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
             if ($association instanceof ToManyAssociationMetadata) {
                 throw QueryException::iterateWithFetchJoinNotAllowed($owningAssociation);
             }
@@ -1037,7 +1037,7 @@ 
             }
 
             $targetTableJoin = [
-                'table' => $targetTableName . ' ' . $targetTableAlias,
+                'table' => $targetTableName.' '.$targetTableAlias,
                 'condition' => implode(' AND ', $conditions),
             ];
         } elseif ($owningAssociation instanceof ManyToManyAssociationMetadata) {
@@ -1065,7 +1065,7 @@ 
                 );
             }
 
-            $sql .= $joinTableName . ' ' . $joinTableAlias . ' ON ' . implode(' AND ', $conditions);
+            $sql .= $joinTableName.' '.$joinTableAlias.' ON '.implode(' AND ', $conditions);
 
             // Join target table
             $sql .= ($joinType === AST\Join::JOIN_TYPE_LEFT || $joinType === AST\Join::JOIN_TYPE_LEFTOUTER) ? ' LEFT JOIN ' : ' INNER JOIN ';
@@ -1104,7 +1104,7 @@ 
             }
 
             $targetTableJoin = [
-                'table' => $targetTableName . ' ' . $targetTableAlias,
+                'table' => $targetTableName.' '.$targetTableAlias,
                 'condition' => implode(' AND ', $conditions),
             ];
         } else {
@@ -1112,23 +1112,23 @@ 
         }
 
         // Handle WITH clause
-        $withCondition = ($condExpr === null) ? '' : ('(' . $this->walkConditionalExpression($condExpr) . ')');
+        $withCondition = ($condExpr === null) ? '' : ('('.$this->walkConditionalExpression($condExpr).')');
 
         if ($targetClass->inheritanceType === InheritanceType::JOINED) {
             $ctiJoins = $this->generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
 
             // If we have WITH condition, we need to build nested joins for target class table and cti joins
             if ($withCondition) {
-                $sql .= '(' . $targetTableJoin['table'] . $ctiJoins . ') ON ' . $targetTableJoin['condition'];
+                $sql .= '('.$targetTableJoin['table'].$ctiJoins.') ON '.$targetTableJoin['condition'];
             } else {
-                $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'] . $ctiJoins;
+                $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition'].$ctiJoins;
             }
         } else {
-            $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'];
+            $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition'];
         }
 
         if ($withCondition) {
-            $sql .= ' AND ' . $withCondition;
+            $sql .= ' AND '.$withCondition;
         }
 
         // Apply the indexes
@@ -1162,7 +1162,7 @@ 
             $orderByItems = array_merge($orderByItems, (array) $collectionOrderByItems);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByItems);
+        return ' ORDER BY '.implode(', ', $orderByItems);
     }
 
     /**
@@ -1179,10 +1179,10 @@ 
         $this->orderedColumnsMap[$sql] = $type;
 
         if ($expr instanceof AST\Subselect) {
-            return '(' . $sql . ') ' . $type;
+            return '('.$sql.') '.$type;
         }
 
-        return $sql . ' ' . $type;
+        return $sql.' '.$type;
     }
 
     /**
@@ -1190,7 +1190,7 @@ 
      */
     public function walkHavingClause($havingClause)
     {
-        return ' HAVING ' . $this->walkConditionalExpression($havingClause->conditionalExpression);
+        return ' HAVING '.$this->walkConditionalExpression($havingClause->conditionalExpression);
     }
 
     /**
@@ -1213,7 +1213,7 @@ 
                 $conditions = [];
 
                 if ($join->conditionalExpression) {
-                    $conditions[] = '(' . $this->walkConditionalExpression($join->conditionalExpression) . ')';
+                    $conditions[] = '('.$this->walkConditionalExpression($join->conditionalExpression).')';
                 }
 
                 $isUnconditionalJoin = empty($conditions);
@@ -1238,7 +1238,7 @@ 
                 }
 
                 if ($conditions) {
-                    $sql .= $condExprConjunction . implode(' AND ', $conditions);
+                    $sql .= $condExprConjunction.implode(' AND ', $conditions);
                 }
 
                 break;
@@ -1268,7 +1268,7 @@ 
             $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression);
         }
 
-        $sql .= implode(', ', $scalarExpressions) . ')';
+        $sql .= implode(', ', $scalarExpressions).')';
 
         return $sql;
     }
@@ -1290,7 +1290,7 @@ 
             ? $this->conn->quote($nullIfExpression->secondExpression)
             : $this->walkSimpleArithmeticExpression($nullIfExpression->secondExpression);
 
-        return 'NULLIF(' . $firstExpression . ', ' . $secondExpression . ')';
+        return 'NULLIF('.$firstExpression.', '.$secondExpression.')';
     }
 
     /**
@@ -1303,11 +1303,11 @@ 
         $sql = 'CASE';
 
         foreach ($generalCaseExpression->whenClauses as $whenClause) {
-            $sql .= ' WHEN ' . $this->walkConditionalExpression($whenClause->caseConditionExpression);
-            $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($whenClause->thenScalarExpression);
+            $sql .= ' WHEN '.$this->walkConditionalExpression($whenClause->caseConditionExpression);
+            $sql .= ' THEN '.$this->walkSimpleArithmeticExpression($whenClause->thenScalarExpression);
         }
 
-        $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression) . ' END';
+        $sql .= ' ELSE '.$this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression).' END';
 
         return $sql;
     }
@@ -1321,14 +1321,14 @@ 
      */
     public function walkSimpleCaseExpression($simpleCaseExpression)
     {
-        $sql = 'CASE ' . $this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand);
+        $sql = 'CASE '.$this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand);
 
         foreach ($simpleCaseExpression->simpleWhenClauses as $simpleWhenClause) {
-            $sql .= ' WHEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression);
-            $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression);
+            $sql .= ' WHEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression);
+            $sql .= ' THEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression);
         }
 
-        $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression) . ' END';
+        $sql .= ' ELSE '.$this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression).' END';
 
         return $sql;
     }
@@ -1369,7 +1369,7 @@ 
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, $property->getType());
                     $this->scalarFields[$dqlAlias][$fieldName] = $columnAlias;
                 }
@@ -1390,11 +1390,11 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     // Conceptually we could resolve field type here by traverse through AST to retrieve field type,
                     // but this is not a feasible solution; assume 'string'.
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, Type::getType('string'));
@@ -1405,11 +1405,11 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
+                $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     // We cannot resolve field type here; assume 'string'.
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, Type::getType('string'));
                 }
@@ -1433,7 +1433,7 @@ 
                 $class       = $queryComp['metadata'];
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: null;
 
-                if (! isset($this->selectedClasses[$dqlAlias])) {
+                if ( ! isset($this->selectedClasses[$dqlAlias])) {
                     $this->selectedClasses[$dqlAlias] = [
                         'class'       => $class,
                         'dqlAlias'    => $dqlAlias,
@@ -1445,7 +1445,7 @@ 
 
                 // Select all fields from the queried class
                 foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                    if (! ($property instanceof FieldMetadata)) {
+                    if ( ! ($property instanceof FieldMetadata)) {
                         continue;
                     }
 
@@ -1480,7 +1480,7 @@ 
                         $subClass = $this->em->getClassMetadata($subClassName);
 
                         foreach ($subClass->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                            if (! ($property instanceof FieldMetadata)) {
+                            if ( ! ($property instanceof FieldMetadata)) {
                                 continue;
                             }
 
@@ -1519,7 +1519,7 @@ 
      */
     public function walkQuantifiedExpression($qExpr)
     {
-        return ' ' . strtoupper($qExpr->type) . '(' . $this->walkSubselect($qExpr->subselect) . ')';
+        return ' '.strtoupper($qExpr->type).'('.$this->walkSubselect($qExpr->subselect).')';
     }
 
     /**
@@ -1559,7 +1559,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($subselectIdVarDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1567,7 +1567,7 @@ 
      */
     public function walkSimpleSelectClause($simpleSelectClause)
     {
-        return 'SELECT' . ($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
+        return 'SELECT'.($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
             . $this->walkSimpleSelectExpression($simpleSelectClause->simpleSelectExpression);
     }
 
@@ -1600,7 +1600,7 @@ 
                     break;
 
                 case ($e instanceof AST\Subselect):
-                    $sqlSelectExpressions[] = '(' . $e->dispatch($this) . ') AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = '('.$e->dispatch($this).') AS '.$columnAlias;
                     break;
 
                 case ($e instanceof AST\PathExpression):
@@ -1609,7 +1609,7 @@ 
                     $class     = $qComp['metadata'];
                     $fieldType = $class->getProperty($e->field)->getType();
 
-                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)).' AS '.$columnAlias;
                     break;
 
                 case ($e instanceof AST\Literal):
@@ -1623,11 +1623,11 @@ 
                             break;
                     }
 
-                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)).' AS '.$columnAlias;
                     break;
 
                 default:
-                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)).' AS '.$columnAlias;
                     break;
             }
 
@@ -1660,10 +1660,10 @@ 
             case ($expr instanceof AST\Subselect):
                 $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $columnAlias                        = 'sclr' . $this->aliasCounter++;
+                $columnAlias                        = 'sclr'.$this->aliasCounter++;
                 $this->scalarResultAliasMap[$alias] = $columnAlias;
 
-                $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
+                $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias;
                 break;
 
             case ($expr instanceof AST\Functions\FunctionNode):
@@ -1680,7 +1680,7 @@ 
                 $columnAlias                        = $this->getSQLColumnAlias();
                 $this->scalarResultAliasMap[$alias] = $columnAlias;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
                 break;
 
             case ($expr instanceof AST\ParenthesisExpression):
@@ -1700,8 +1700,8 @@ 
      */
     public function walkAggregateExpression($aggExpression)
     {
-        return $aggExpression->functionName . '(' . ($aggExpression->isDistinct ? 'DISTINCT ' : '')
-            . $this->walkSimpleArithmeticExpression($aggExpression->pathExpression) . ')';
+        return $aggExpression->functionName.'('.($aggExpression->isDistinct ? 'DISTINCT ' : '')
+            . $this->walkSimpleArithmeticExpression($aggExpression->pathExpression).')';
     }
 
     /**
@@ -1715,7 +1715,7 @@ 
             $sqlParts[] = $this->walkGroupByItem($groupByItem);
         }
 
-        return ' GROUP BY ' . implode(', ', $sqlParts);
+        return ' GROUP BY '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1724,7 +1724,7 @@ 
     public function walkGroupByItem($groupByItem)
     {
         // StateFieldPathExpression
-        if (! is_string($groupByItem)) {
+        if ( ! is_string($groupByItem)) {
             return $this->walkPathExpression($groupByItem);
         }
 
@@ -1778,7 +1778,7 @@ 
     {
         $class     = $this->em->getClassMetadata($deleteClause->abstractSchemaName);
         $tableName = $class->getTableName();
-        $sql       = 'DELETE FROM ' . $class->table->getQuotedQualifiedName($this->platform);
+        $sql       = 'DELETE FROM '.$class->table->getQuotedQualifiedName($this->platform);
 
         $this->setSQLTableAlias($tableName, $tableName, $deleteClause->aliasIdentificationVariable);
 
@@ -1794,12 +1794,12 @@ 
     {
         $class     = $this->em->getClassMetadata($updateClause->abstractSchemaName);
         $tableName = $class->getTableName();
-        $sql       = 'UPDATE ' . $class->table->getQuotedQualifiedName($this->platform);
+        $sql       = 'UPDATE '.$class->table->getQuotedQualifiedName($this->platform);
 
         $this->setSQLTableAlias($tableName, $tableName, $updateClause->aliasIdentificationVariable);
         $this->rootAliases[] = $updateClause->aliasIdentificationVariable;
 
-        $sql .= ' SET ' . implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
+        $sql .= ' SET '.implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
 
         return $sql;
     }
@@ -1812,7 +1812,7 @@ 
         $useTableAliasesBefore    = $this->useSqlTableAliases;
         $this->useSqlTableAliases = false;
 
-        $sql      = $this->walkPathExpression($updateItem->pathExpression) . ' = ';
+        $sql      = $this->walkPathExpression($updateItem->pathExpression).' = ';
         $newValue = $updateItem->newValue;
 
         switch (true) {
@@ -1856,7 +1856,7 @@ 
 
             if ($filterClauses) {
                 if ($condSql) {
-                    $condSql = '(' . $condSql . ') AND ';
+                    $condSql = '('.$condSql.') AND ';
                 }
 
                 $condSql .= implode(' AND ', $filterClauses);
@@ -1864,11 +1864,11 @@ 
         }
 
         if ($condSql) {
-            return ' WHERE ' . (( ! $discrSql) ? $condSql : '(' . $condSql . ') AND ' . $discrSql);
+            return ' WHERE '.(( ! $discrSql) ? $condSql : '('.$condSql.') AND '.$discrSql);
         }
 
         if ($discrSql) {
-            return ' WHERE ' . $discrSql;
+            return ' WHERE '.$discrSql;
         }
 
         return '';
@@ -1881,7 +1881,7 @@ 
     {
         // Phase 2 AST optimization: Skip processing of ConditionalExpression
         // if only one ConditionalTerm is defined
-        if (! ($condExpr instanceof AST\ConditionalExpression)) {
+        if ( ! ($condExpr instanceof AST\ConditionalExpression)) {
             return $this->walkConditionalTerm($condExpr);
         }
 
@@ -1895,7 +1895,7 @@ 
     {
         // Phase 2 AST optimization: Skip processing of ConditionalTerm
         // if only one ConditionalFactor is defined
-        if (! ($condTerm instanceof AST\ConditionalTerm)) {
+        if ( ! ($condTerm instanceof AST\ConditionalTerm)) {
             return $this->walkConditionalFactor($condTerm);
         }
 
@@ -1911,7 +1911,7 @@ 
         // if only one ConditionalPrimary is defined
         return ( ! ($factor instanceof AST\ConditionalFactor))
             ? $this->walkConditionalPrimary($factor)
-            : ($factor->not ? 'NOT ' : '') . $this->walkConditionalPrimary($factor->conditionalPrimary);
+            : ($factor->not ? 'NOT ' : '').$this->walkConditionalPrimary($factor->conditionalPrimary);
     }
 
     /**
@@ -1926,7 +1926,7 @@ 
         if ($primary->isConditionalExpression()) {
             $condExpr = $primary->conditionalExpression;
 
-            return '(' . $this->walkConditionalExpression($condExpr) . ')';
+            return '('.$this->walkConditionalExpression($condExpr).')';
         }
     }
 
@@ -1937,7 +1937,7 @@ 
     {
         $sql = ($existsExpr->not) ? 'NOT ' : '';
 
-        $sql .= 'EXISTS (' . $this->walkSubselect($existsExpr->subselect) . ')';
+        $sql .= 'EXISTS ('.$this->walkSubselect($existsExpr->subselect).')';
 
         return $sql;
     }
@@ -1986,7 +1986,7 @@ 
             $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName());
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
-            $sql .= $targetTableName . ' ' . $targetTableAlias . ' WHERE ';
+            $sql .= $targetTableName.' '.$targetTableAlias.' WHERE ';
 
             $sqlParts = [];
 
@@ -2007,7 +2007,7 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -2021,7 +2021,7 @@ 
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
             // join to target table
-            $sql .= $joinTableName . ' ' . $joinTableAlias . ' INNER JOIN ' . $targetTableName . ' ' . $targetTableAlias . ' ON ';
+            $sql .= $joinTableName.' '.$joinTableAlias.' INNER JOIN '.$targetTableName.' '.$targetTableAlias.' ON ';
 
             // join conditions
             $joinSqlParts = [];
@@ -2072,13 +2072,13 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
         }
 
-        return $sql . ')';
+        return $sql.')';
     }
 
     /**
@@ -2089,7 +2089,7 @@ 
         $sizeFunc                           = new AST\Functions\SizeFunction('size');
         $sizeFunc->collectionPathExpression = $emptyCollCompExpr->expression;
 
-        return $sizeFunc->getSql($this) . ($emptyCollCompExpr->not ? ' > 0' : ' = 0');
+        return $sizeFunc->getSql($this).($emptyCollCompExpr->not ? ' > 0' : ' = 0');
     }
 
     /**
@@ -2098,19 +2098,19 @@ 
     public function walkNullComparisonExpression($nullCompExpr)
     {
         $expression = $nullCompExpr->expression;
-        $comparison = ' IS' . ($nullCompExpr->not ? ' NOT' : '') . ' NULL';
+        $comparison = ' IS'.($nullCompExpr->not ? ' NOT' : '').' NULL';
 
         // Handle ResultVariable
         if (is_string($expression) && isset($this->queryComponents[$expression]['resultVariable'])) {
-            return $this->walkResultVariable($expression) . $comparison;
+            return $this->walkResultVariable($expression).$comparison;
         }
 
         // Handle InputParameter mapping inclusion to ParserResult
         if ($expression instanceof AST\InputParameter) {
-            return $this->walkInputParameter($expression) . $comparison;
+            return $this->walkInputParameter($expression).$comparison;
         }
 
-        return $expression->dispatch($this) . $comparison;
+        return $expression->dispatch($this).$comparison;
     }
 
     /**
@@ -2118,7 +2118,7 @@ 
      */
     public function walkInExpression($inExpr)
     {
-        $sql = $this->walkArithmeticExpression($inExpr->expression) . ($inExpr->not ? ' NOT' : '') . ' IN (';
+        $sql = $this->walkArithmeticExpression($inExpr->expression).($inExpr->not ? ' NOT' : '').' IN (';
 
         $sql .= ($inExpr->subselect)
             ? $this->walkSubselect($inExpr->subselect)
@@ -2142,12 +2142,12 @@ 
         $discrColumnType  = $discrColumn->getType();
         $quotedColumnName = $this->platform->quoteIdentifier($discrColumn->getColumnName());
         $sqlTableAlias    = $this->useSqlTableAliases
-            ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias) . '.'
+            ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias).'.'
             : '';
 
         return sprintf(
             '%s %sIN %s',
-            $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . $quotedColumnName, $this->platform),
+            $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.$quotedColumnName, $this->platform),
             ($instanceOfExpr->not ? 'NOT ' : ''),
             $this->getChildDiscriminatorsFromClassMetadata($discrClass, $instanceOfExpr)
         );
@@ -2194,8 +2194,8 @@ 
             $sql .= ' NOT';
         }
 
-        $sql .= ' BETWEEN ' . $this->walkArithmeticExpression($betweenExpr->leftBetweenExpression)
-            . ' AND ' . $this->walkArithmeticExpression($betweenExpr->rightBetweenExpression);
+        $sql .= ' BETWEEN '.$this->walkArithmeticExpression($betweenExpr->leftBetweenExpression)
+            . ' AND '.$this->walkArithmeticExpression($betweenExpr->rightBetweenExpression);
 
         return $sql;
     }
@@ -2210,7 +2210,7 @@ 
             ? $this->walkResultVariable($stringExpr)
             : $stringExpr->dispatch($this);
 
-        $sql = $leftExpr . ($likeExpr->not ? ' NOT' : '') . ' LIKE ';
+        $sql = $leftExpr.($likeExpr->not ? ' NOT' : '').' LIKE ';
 
         if ($likeExpr->stringPattern instanceof AST\InputParameter) {
             $sql .= $this->walkInputParameter($likeExpr->stringPattern);
@@ -2223,7 +2223,7 @@ 
         }
 
         if ($likeExpr->escapeChar) {
-            $sql .= ' ESCAPE ' . $this->walkLiteral($likeExpr->escapeChar);
+            $sql .= ' ESCAPE '.$this->walkLiteral($likeExpr->escapeChar);
         }
 
         return $sql;
@@ -2250,7 +2250,7 @@ 
             ? $leftExpr->dispatch($this)
             : (is_numeric($leftExpr) ? $leftExpr : $this->conn->quote($leftExpr));
 
-        $sql .= ' ' . $compExpr->operator . ' ';
+        $sql .= ' '.$compExpr->operator.' ';
 
         $sql .= ($rightExpr instanceof AST\Node)
             ? $rightExpr->dispatch($this)
@@ -2286,7 +2286,7 @@ 
     {
         return ($arithmeticExpr->isSimpleArithmeticExpression())
             ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)
-            : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';
+            : '('.$this->walkSubselect($arithmeticExpr->subselect).')';
     }
 
     /**
@@ -2294,7 +2294,7 @@ 
      */
     public function walkSimpleArithmeticExpression($simpleArithmeticExpr)
     {
-        if (! ($simpleArithmeticExpr instanceof AST\SimpleArithmeticExpression)) {
+        if ( ! ($simpleArithmeticExpr instanceof AST\SimpleArithmeticExpression)) {
             return $this->walkArithmeticTerm($simpleArithmeticExpr);
         }
 
@@ -2314,7 +2314,7 @@ 
 
         // Phase 2 AST optimization: Skip processing of ArithmeticTerm
         // if only one ArithmeticFactor is defined
-        if (! ($term instanceof AST\ArithmeticTerm)) {
+        if ( ! ($term instanceof AST\ArithmeticTerm)) {
             return $this->walkArithmeticFactor($term);
         }
 
@@ -2334,13 +2334,13 @@ 
 
         // Phase 2 AST optimization: Skip processing of ArithmeticFactor
         // if only one ArithmeticPrimary is defined
-        if (! ($factor instanceof AST\ArithmeticFactor)) {
+        if ( ! ($factor instanceof AST\ArithmeticFactor)) {
             return $this->walkArithmeticPrimary($factor);
         }
 
         $sign = $factor->isNegativeSigned() ? '-' : ($factor->isPositiveSigned() ? '+' : '');
 
-        return $sign . $this->walkArithmeticPrimary($factor->arithmeticPrimary);
+        return $sign.$this->walkArithmeticPrimary($factor->arithmeticPrimary);
     }
 
     /**
@@ -2353,7 +2353,7 @@ 
     public function walkArithmeticPrimary($primary)
     {
         if ($primary instanceof AST\SimpleArithmeticExpression) {
-            return '(' . $this->walkSimpleArithmeticExpression($primary) . ')';
+            return '('.$this->walkSimpleArithmeticExpression($primary).')';
         }
 
         if ($primary instanceof AST\Node) {
@@ -2411,7 +2411,7 @@ 
             $entityClassName = $entityClass->getClassName();
 
             if ($entityClassName !== $rootClass->getClassName()) {
-                if (! $entityClass->getReflectionClass()->isSubclassOf($rootClass->getClassName())) {
+                if ( ! $entityClass->getReflectionClass()->isSubclassOf($rootClass->getClassName())) {
                     throw QueryException::instanceOfUnrelatedClass($entityClassName, $rootClass->getClassName());
                 }
             }
@@ -2423,6 +2423,6 @@ 
             $sqlParameterList[] = $this->conn->quote($discriminator);
         }
 
-        return '(' . implode(', ', $sqlParameterList) . ')';
+        return '('.implode(', ', $sqlParameterList).')';
     }
 }

lib/Doctrine/ORM/Query/QueryException.php

Spacing +22 added lines, -22 removed lines

@@ -32,7 +32,7 @@ 
      */
     public static function syntaxError($message, $previous = null)
     {
-        return new self('[Syntax Error] ' . $message, 0, $previous);
+        return new self('[Syntax Error] '.$message, 0, $previous);
     }
 
     /**
@@ -43,7 +43,7 @@ 
      */
     public static function semanticalError($message, $previous = null)
     {
-        return new self('[Semantical Error] ' . $message, 0, $previous);
+        return new self('[Semantical Error] '.$message, 0, $previous);
     }
 
     /**
@@ -62,7 +62,7 @@ 
      */
     public static function invalidParameterType($expected, $received)
     {
-        return new self('Invalid parameter type, ' . $received . ' given, but ' . $expected . ' expected.');
+        return new self('Invalid parameter type, '.$received.' given, but '.$expected.' expected.');
     }
 
     /**
@@ -72,7 +72,7 @@ 
      */
     public static function invalidParameterPosition($pos)
     {
-        return new self('Invalid parameter position: ' . $pos);
+        return new self('Invalid parameter position: '.$pos);
     }
 
     /**
@@ -83,7 +83,7 @@ 
      */
     public static function tooManyParameters($expected, $received)
     {
-        return new self('Too many parameters: the query defines ' . $expected . ' parameters and you bound ' . $received);
+        return new self('Too many parameters: the query defines '.$expected.' parameters and you bound '.$received);
     }
 
     /**
@@ -94,7 +94,7 @@ 
      */
     public static function tooFewParameters($expected, $received)
     {
-        return new self('Too few parameters: the query defines ' . $expected . ' parameters but you only bound ' . $received);
+        return new self('Too few parameters: the query defines '.$expected.' parameters but you only bound '.$received);
     }
 
     /**
@@ -104,7 +104,7 @@ 
      */
     public static function invalidParameterFormat($value)
     {
-        return new self('Invalid parameter format, ' . $value . ' given, but :<name> or ?<num> expected.');
+        return new self('Invalid parameter format, '.$value.' given, but :<name> or ?<num> expected.');
     }
 
     /**
@@ -114,7 +114,7 @@ 
      */
     public static function unknownParameter($key)
     {
-        return new self('Invalid parameter: token ' . $key . ' is not defined in the query.');
+        return new self('Invalid parameter: token '.$key.' is not defined in the query.');
     }
 
     /**
@@ -133,7 +133,7 @@ 
     public static function invalidPathExpression($pathExpr)
     {
         return new self(
-            "Invalid PathExpression '" . $pathExpr->identificationVariable . '.' . $pathExpr->field . "'."
+            "Invalid PathExpression '".$pathExpr->identificationVariable.'.'.$pathExpr->field."'."
         );
     }
 
@@ -144,7 +144,7 @@ 
      */
     public static function invalidLiteral($literal)
     {
-        return new self("Invalid literal '" . $literal . "'");
+        return new self("Invalid literal '".$literal."'");
     }
 
     /**
@@ -155,8 +155,8 @@ 
     public static function iterateWithFetchJoinCollectionNotAllowed($assoc)
     {
         return new self(
-            'Invalid query operation: Not allowed to iterate over fetch join collections ' .
-            'in class ' . $assoc['sourceEntity'] . ' association ' . $assoc['fieldName']
+            'Invalid query operation: Not allowed to iterate over fetch join collections '.
+            'in class '.$assoc['sourceEntity'].' association '.$assoc['fieldName']
         );
     }
 
@@ -166,8 +166,8 @@ 
     public static function partialObjectsAreDangerous()
     {
         return new self(
-            'Loading partial objects is dangerous. Fetch full objects or consider ' .
-            'using a different fetch mode. If you really want partial objects, ' .
+            'Loading partial objects is dangerous. Fetch full objects or consider '.
+            'using a different fetch mode. If you really want partial objects, '.
             'set the doctrine.forcePartialLoad query hint to TRUE.'
         );
     }
@@ -180,8 +180,8 @@ 
     public static function overwritingJoinConditionsNotYetSupported($assoc)
     {
         return new self(
-            'Unsupported query operation: It is not yet possible to overwrite the join ' .
-            'conditions in class ' . $assoc['sourceEntityName'] . ' association ' . $assoc['fieldName'] . '. ' .
+            'Unsupported query operation: It is not yet possible to overwrite the join '.
+            'conditions in class '.$assoc['sourceEntityName'].' association '.$assoc['fieldName'].'. '.
             'Use WITH to append additional join conditions to the association.'
         );
     }
@@ -192,8 +192,8 @@ 
     public static function associationPathInverseSideNotSupported(PathExpression $pathExpr)
     {
         return new self(
-            'A single-valued association path expression to an inverse side is not supported in DQL queries. ' .
-            'Instead of "' . $pathExpr->identificationVariable . '.' . $pathExpr->field . '" use an explicit join.'
+            'A single-valued association path expression to an inverse side is not supported in DQL queries. '.
+            'Instead of "'.$pathExpr->identificationVariable.'.'.$pathExpr->field.'" use an explicit join.'
         );
     }
 
@@ -217,8 +217,8 @@ 
     public static function associationPathCompositeKeyNotSupported()
     {
         return new self(
-            'A single-valued association path expression to an entity with a composite primary ' .
-            'key is not supported. Explicitly name the components of the composite primary key ' .
+            'A single-valued association path expression to an entity with a composite primary '.
+            'key is not supported. Explicitly name the components of the composite primary key '.
             'in the query.'
         );
     }
@@ -231,7 +231,7 @@ 
      */
     public static function instanceOfUnrelatedClass($className, $rootClass)
     {
-        return new self("Cannot check if a child of '" . $rootClass . "' is instanceof '" . $className . "', " .
+        return new self("Cannot check if a child of '".$rootClass."' is instanceof '".$className."', ".
             'inheritance hierarchy does not exists between these two classes.');
     }
 
@@ -243,7 +243,7 @@ 
     public static function invalidQueryComponent($dqlAlias)
     {
         return new self(
-            "Invalid query component given for DQL alias '" . $dqlAlias . "', " .
+            "Invalid query component given for DQL alias '".$dqlAlias."', ".
             "requires 'metadata', 'parent', 'relation', 'map', 'nestingLevel' and 'token' keys."
         );
     }

lib/Doctrine/ORM/Proxy/Factory/StaticProxyFactory.php

Spacing +8 added lines, -8 removed lines

@@ -54,7 +54,7 @@ 
      */
     public function generateProxyClasses(array $classes) : int
     {
-        $concreteClasses = array_filter($classes, function (ClassMetadata $metadata) : bool {
+        $concreteClasses = array_filter($classes, function(ClassMetadata $metadata) : bool {
             return ! ($metadata->isMappedSuperclass || $metadata->getReflectionClass()->isAbstract());
         });
 
@@ -63,7 +63,7 @@ 
                 ->proxyFactory
                 ->createProxy(
                     $metadata->getClassName(),
-                    function () {
+                    function() {
                         // empty closure, serves its purpose, for now
                     },
                     $this->skippedFieldsFqns($metadata)
@@ -87,7 +87,7 @@ 
                 ->getUnitOfWork()
                 ->getEntityPersister($metadata->getClassName());
 
-        $proxyInstance                                            = $this
+        $proxyInstance = $this
             ->proxyFactory
             ->createProxy(
                 $metadata->getClassName(),
@@ -106,7 +106,7 @@ 
 
     private function makeInitializer(ClassMetadata $metadata, EntityPersister $persister) : \Closure
     {
-        return function (
+        return function(
             GhostObjectInterface $ghostObject,
             string $method,
             // we don't care
@@ -124,7 +124,7 @@ 
             $identifier = $persister->getIdentifier($ghostObject);
 
             // @TODO how do we use `$properties` in the persister? That would be a massive optimisation
-            if (! $persister->loadById($identifier, $ghostObject)) {
+            if ( ! $persister->loadById($identifier, $ghostObject)) {
                 $initializer = $originalInitializer;
 
                 throw EntityNotFoundException::fromClassNameAndIdentifier(
@@ -156,7 +156,7 @@ 
         $transientFieldsFqns = [];
 
         foreach ($metadata->getDeclaredPropertiesIterator() as $name => $property) {
-            if (! $property instanceof TransientMetadata) {
+            if ( ! $property instanceof TransientMetadata) {
                 continue;
             }
 
@@ -194,11 +194,11 @@ 
     private function propertyFqcn(\ReflectionProperty $property) : string
     {
         if ($property->isPrivate()) {
-            return "\0" . $property->getDeclaringClass()->getName() . "\0" . $property->getName();
+            return "\0".$property->getDeclaringClass()->getName()."\0".$property->getName();
         }
 
         if ($property->isProtected()) {
-            return "\0*\0" . $property->getName();
+            return "\0*\0".$property->getName();
         }
 
         return $property->getName();

lib/Doctrine/ORM/OptimisticLockException.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
         $expectedLockVersion = ($expectedLockVersion instanceof \DateTime) ? $expectedLockVersion->getTimestamp() : $expectedLockVersion;
         $actualLockVersion   = ($actualLockVersion instanceof \DateTime) ? $actualLockVersion->getTimestamp() : $actualLockVersion;
 
-        return new self('The optimistic lock failed, version ' . $expectedLockVersion . ' was expected, but is actually ' . $actualLockVersion, $entity);
+        return new self('The optimistic lock failed, version '.$expectedLockVersion.' was expected, but is actually '.$actualLockVersion, $entity);
     }
 
     /**
@@ -67,6 +67,6 @@ 
      */
     public static function notVersioned($entityName)
     {
-        return new self('Cannot obtain optimistic lock on unversioned entity ' . $entityName, null);
+        return new self('Cannot obtain optimistic lock on unversioned entity '.$entityName, null);
     }
 }

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +21 added lines, -21 removed lines

@@ -176,11 +176,11 @@ 
                     $pkColumns = [];
 
                     foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                        if (! ($property instanceof FieldMetadata)) {
+                        if ( ! ($property instanceof FieldMetadata)) {
                             continue;
                         }
 
-                        if (! $class->isInheritedProperty($fieldName)) {
+                        if ( ! $class->isInheritedProperty($fieldName)) {
                             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
                             $this->gatherColumn($class, $property, $table);
@@ -215,7 +215,7 @@ 
                             }
                         }
 
-                        if (! empty($inheritedKeyColumns)) {
+                        if ( ! empty($inheritedKeyColumns)) {
                             // Add a FK constraint on the ID column
                             $rootClass = $this->em->getClassMetadata($class->getRootClassName());
 
@@ -260,7 +260,7 @@ 
                 }
             }
 
-            if (! $table->hasIndex('primary')) {
+            if ( ! $table->hasIndex('primary')) {
                 $table->setPrimaryKey($pkColumns);
             }
 
@@ -320,7 +320,7 @@ 
             $processedClasses[$class->getClassName()] = true;
 
             foreach ($class->getDeclaredPropertiesIterator() as $property) {
-                if (! $property instanceof FieldMetadata
+                if ( ! $property instanceof FieldMetadata
                     || ! $property->hasValueGenerator()
                     || $property->getValueGenerator()->getType() !== GeneratorType::SEQUENCE
                     || $class->getClassName() !== $class->getRootClassName()) {
@@ -329,7 +329,7 @@ 
 
                 $quotedName = $this->platform->quoteIdentifier($property->getValueGenerator()->getDefinition()['sequenceName']);
 
-                if (! $schema->hasSequence($quotedName)) {
+                if ( ! $schema->hasSequence($quotedName)) {
                     $schema->createSequence($quotedName, $property->getValueGenerator()->getDefinition()['allocationSize']);
                 }
             }
@@ -342,7 +342,7 @@ 
             }
         }
 
-        if (! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas()) {
+        if ( ! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas()) {
             $schema->visit(new RemoveNamespacedAssets());
         }
 
@@ -381,7 +381,7 @@ 
                 break;
         }
 
-        if (! empty($discrColumn->getColumnDefinition())) {
+        if ( ! empty($discrColumn->getColumnDefinition())) {
             $options['columnDefinition'] = $discrColumn->getColumnDefinition();
         }
 
@@ -399,7 +399,7 @@ 
         $pkColumns = [];
 
         foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-            if (! ($property instanceof FieldMetadata)) {
+            if ( ! ($property instanceof FieldMetadata)) {
                 continue;
             }
 
@@ -514,7 +514,7 @@ 
     private function gatherRelationsSql($class, $table, $schema, &$addedFks, &$blacklistedFks)
     {
         foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-            if (! ($property instanceof AssociationMetadata)) {
+            if ( ! ($property instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -522,7 +522,7 @@ 
                 continue;
             }
 
-            if (! $property->isOwningSide()) {
+            if ( ! $property->isOwningSide()) {
                 continue;
             }
 
@@ -612,7 +612,7 @@ 
         $idColumns        = $class->getIdentifierColumns($this->em);
         $idColumnNameList = array_keys($idColumns);
 
-        if (! in_array($referencedColumnName, $idColumnNameList, true)) {
+        if ( ! in_array($referencedColumnName, $idColumnNameList, true)) {
             return null;
         }
 
@@ -620,7 +620,7 @@ 
         foreach ($class->getIdentifierFieldNames() as $fieldName) {
             $property = $class->getProperty($fieldName);
 
-            if (! ($property instanceof AssociationMetadata)) {
+            if ( ! ($property instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -676,7 +676,7 @@ 
                 $joinColumn->getReferencedColumnName()
             );
 
-            if (! $definingClass) {
+            if ( ! $definingClass) {
                 throw MissingColumnException::fromColumnSourceAndTarget(
                     $joinColumn->getReferencedColumnName(),
                     $mapping->getSourceEntity(),
@@ -691,14 +691,14 @@ 
             $localColumns[]      = $quotedColumnName;
             $foreignColumns[]    = $quotedReferencedColumnName;
 
-            if (! $theJoinTable->hasColumn($quotedColumnName)) {
+            if ( ! $theJoinTable->hasColumn($quotedColumnName)) {
                 // Only add the column to the table if it does not exist already.
                 // It might exist already if the foreign key is mapped into a regular
                 // property as well.
                 $property  = $definingClass->getProperty($referencedFieldName);
                 $columnDef = null;
 
-                if (! empty($joinColumn->getColumnDefinition())) {
+                if ( ! empty($joinColumn->getColumnDefinition())) {
                     $columnDef = $joinColumn->getColumnDefinition();
                 } elseif ($property->getColumnDefinition()) {
                     $columnDef = $property->getColumnDefinition();
@@ -732,7 +732,7 @@ 
                 $uniqueConstraints[] = ['columns' => [$quotedColumnName]];
             }
 
-            if (! empty($joinColumn->getOnDelete())) {
+            if ( ! empty($joinColumn->getOnDelete())) {
                 $fkOptions['onDelete'] = $joinColumn->getOnDelete();
             }
         }
@@ -743,7 +743,7 @@ 
             $theJoinTable->addUniqueIndex($unique['columns'], is_numeric($indexName) ? null : $indexName);
         }
 
-        $compositeName = $theJoinTable->getName() . '.' . implode('', $localColumns);
+        $compositeName = $theJoinTable->getName().'.'.implode('', $localColumns);
 
         if (isset($addedFks[$compositeName])
             && ($foreignTableName !== $addedFks[$compositeName]['foreignTableName']
@@ -760,7 +760,7 @@ 
             }
 
             $blacklistedFks[$compositeName] = true;
-        } elseif (! isset($blacklistedFks[$compositeName])) {
+        } elseif ( ! isset($blacklistedFks[$compositeName])) {
             $addedFks[$compositeName] = [
                 'foreignTableName' => $foreignTableName,
                 'foreignColumns'   => $foreignColumns,
@@ -842,7 +842,7 @@ 
         $fullSchema = $sm->createSchema();
 
         foreach ($fullSchema->getTables() as $table) {
-            if (! $schema->hasTable($table->getName())) {
+            if ( ! $schema->hasTable($table->getName())) {
                 foreach ($table->getForeignKeys() as $foreignKey) {
                     /** @var $foreignKey \Doctrine\DBAL\Schema\ForeignKeyConstraint */
                     if ($schema->hasTable($foreignKey->getForeignTableName())) {
@@ -867,7 +867,7 @@ 
                 if ($table->hasPrimaryKey()) {
                     $columns = $table->getPrimaryKey()->getColumns();
                     if (count($columns) === 1) {
-                        $checkSequence = $table->getName() . '_' . $columns[0] . '_seq';
+                        $checkSequence = $table->getName().'_'.$columns[0].'_seq';
                         if ($fullSchema->hasSequence($checkSequence)) {
                             $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
                         }

lib/Doctrine/ORM/Tools/ToolsException.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 {
     public static function schemaToolFailure(string $sql, Throwable $e) : self
     {
-        return new self("Schema-Tool failed with Error '" . $e->getMessage() . "' while executing DDL: " . $sql, 0, $e);
+        return new self("Schema-Tool failed with Error '".$e->getMessage()."' while executing DDL: ".$sql, 0, $e);
     }
 }

lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php

Spacing +12 added lines, -12 removed lines

@@ -61,28 +61,28 @@ 
         $fh = fopen($this->file, 'xb+');
 
         if (count($identityMap) === 0) {
-            fwrite($fh, 'Flush Operation [' . $this->context . "] - Empty identity map.\n");
+            fwrite($fh, 'Flush Operation ['.$this->context."] - Empty identity map.\n");
 
             return;
         }
 
-        fwrite($fh, 'Flush Operation [' . $this->context . "] - Dumping identity map:\n");
+        fwrite($fh, 'Flush Operation ['.$this->context."] - Dumping identity map:\n");
 
         foreach ($identityMap as $className => $map) {
-            fwrite($fh, 'Class: ' . $className . "\n");
+            fwrite($fh, 'Class: '.$className."\n");
 
             foreach ($map as $entity) {
-                fwrite($fh, ' Entity: ' . $this->getIdString($entity, $uow) . ' ' . spl_object_id($entity) . "\n");
+                fwrite($fh, ' Entity: '.$this->getIdString($entity, $uow).' '.spl_object_id($entity)."\n");
                 fwrite($fh, "  Associations:\n");
 
                 $cm = $em->getClassMetadata($className);
 
                 foreach ($cm->getDeclaredPropertiesIterator() as $field => $association) {
-                    if (! ($association instanceof AssociationMetadata)) {
+                    if ( ! ($association instanceof AssociationMetadata)) {
                         continue;
                     }
 
-                    fwrite($fh, '   ' . $field . ' ');
+                    fwrite($fh, '   '.$field.' ');
 
                     $value = $association->getValue($entity);
 
@@ -97,21 +97,21 @@ 
                             fwrite($fh, '[PROXY] ');
                         }
 
-                        fwrite($fh, $this->getIdString($value, $uow) . ' ' . spl_object_id($value) . "\n");
+                        fwrite($fh, $this->getIdString($value, $uow).' '.spl_object_id($value)."\n");
                     } else {
                         $initialized = ! ($value instanceof PersistentCollection) || $value->isInitialized();
 
                         if ($initialized) {
-                            fwrite($fh, '[INITIALIZED] ' . $this->getType($value) . ' ' . count($value) . " elements\n");
+                            fwrite($fh, '[INITIALIZED] '.$this->getType($value).' '.count($value)." elements\n");
 
                             foreach ($value as $obj) {
-                                fwrite($fh, '    ' . $this->getIdString($obj, $uow) . ' ' . spl_object_id($obj) . "\n");
+                                fwrite($fh, '    '.$this->getIdString($obj, $uow).' '.spl_object_id($obj)."\n");
                             }
                         } else {
-                            fwrite($fh, '[PROXY] ' . $this->getType($value) . " unknown element size\n");
+                            fwrite($fh, '[PROXY] '.$this->getType($value)." unknown element size\n");
 
                             foreach ($value->unwrap() as $obj) {
-                                fwrite($fh, '    ' . $this->getIdString($obj, $uow) . ' ' . spl_object_id($obj) . "\n");
+                                fwrite($fh, '    '.$this->getIdString($obj, $uow).' '.spl_object_id($obj)."\n");
                             }
                         }
                     }
@@ -150,7 +150,7 @@ 
             $idstring = '';
 
             foreach ($ids as $k => $v) {
-                $idstring .= $k . '=' . $v;
+                $idstring .= $k.'='.$v;
             }
         } else {
             $idstring = 'NEWOBJECT ';