doctrine / orm

lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php

Indentation +6 added lines, -6 removed lines

@@ -37,9 +37,9 @@ 
  */
 abstract class AbstractCollectionPersister implements CachedCollectionPersister
 {
-     /**
-     * @var \Doctrine\ORM\UnitOfWork
-     */
+        /**
+         * @var \Doctrine\ORM\UnitOfWork
+         */
     protected $uow;
 
     /**
@@ -67,9 +67,9 @@ 
      */
     protected $association;
 
-     /**
-     * @var array
-     */
+        /**
+         * @var array
+         */
     protected $queuedCache = [];
 
     /**

lib/Doctrine/ORM/Cache/CacheConfiguration.php

Indentation +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
      */
     public function getCacheLogger()
     {
-         return $this->cacheLogger;
+            return $this->cacheLogger;
     }
 
     /**
@@ -115,7 +115,7 @@ 
             );
         }
 
-         return $this->queryValidator;
+            return $this->queryValidator;
     }
 
     /**

lib/Doctrine/ORM/Configuration.php

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
      */
     public function newDefaultAnnotationDriver($paths = [], $useSimpleAnnotationReader = true)
     {
-        AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
+        AnnotationRegistry::registerFile(__DIR__.'/Mapping/Driver/DoctrineAnnotations.php');
 
         if ($useSimpleAnnotationReader) {
             // Register the ORM Annotations in the AnnotationRegistry

lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php

Spacing +34 added lines, -34 removed lines

@@ -131,7 +131,7 @@ 
         foreach ($joinColumns as $joinColumn) {
             $columnName     = $this->quoteStrategy->getJoinColumnName($joinColumn, $sourceClass, $this->platform);
             $referencedName = $joinColumn['referencedColumnName'];
-            $conditions[]   = 't.' . $columnName . ' = ?';
+            $conditions[]   = 't.'.$columnName.' = ?';
             $params[]       = $id[$sourceClass->getFieldForColumn($referencedName)];
             $types[]        = PersisterHelper::getTypeOfColumn($referencedName, $sourceClass, $this->em);
         }
@@ -160,9 +160,9 @@ 
         }*/
 
         $sql = 'SELECT COUNT(*)'
-            . ' FROM ' . $joinTableName . ' t'
+            . ' FROM '.$joinTableName.' t'
             . $joinTargetEntitySQL
-            . ' WHERE ' . implode(' AND ', $conditions);
+            . ' WHERE '.implode(' AND ', $conditions);
 
         return $this->conn->fetchColumn($sql, $params, 0, $types);
     }
@@ -190,7 +190,7 @@ 
 
         list($quotedJoinTable, $whereClauses, $params, $types) = $this->getJoinTableRestrictionsWithKey($collection, $key, true);
 
-        $sql = 'SELECT 1 FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
+        $sql = 'SELECT 1 FROM '.$quotedJoinTable.' WHERE '.implode(' AND ', $whereClauses);
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
     }
@@ -206,7 +206,7 @@ 
 
         list($quotedJoinTable, $whereClauses, $params, $types) = $this->getJoinTableRestrictions($collection, $element, true);
 
-        $sql = 'SELECT 1 FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
+        $sql = 'SELECT 1 FROM '.$quotedJoinTable.' WHERE '.implode(' AND ', $whereClauses);
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
     }
@@ -222,7 +222,7 @@ 
 
         list($quotedJoinTable, $whereClauses, $params, $types) = $this->getJoinTableRestrictions($collection, $element, false);
 
-        $sql = 'DELETE FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
+        $sql = 'DELETE FROM '.$quotedJoinTable.' WHERE '.implode(' AND ', $whereClauses);
 
         return (bool) $this->conn->executeUpdate($sql, $params, $types);
     }
@@ -271,11 +271,11 @@ 
         $rsm = new Query\ResultSetMappingBuilder($this->em);
         $rsm->addRootEntityFromClassMetadata($targetClass->name, 'te');
 
-        $sql = 'SELECT ' . $rsm->generateSelectClause()
-            . ' FROM ' . $tableName . ' te'
-            . ' JOIN ' . $joinTable  . ' t ON'
+        $sql = 'SELECT '.$rsm->generateSelectClause()
+            . ' FROM '.$tableName.' te'
+            . ' JOIN '.$joinTable.' t ON'
             . implode(' AND ', $onConditions)
-            . ' WHERE ' . implode(' AND ', $whereClauses);
+            . ' WHERE '.implode(' AND ', $whereClauses);
 
         $sql .= $this->getOrderingSql($criteria, $targetClass);
 
@@ -316,8 +316,8 @@ 
 
         // A join is needed if there is filtering on the target entity
         $tableName = $this->quoteStrategy->getTableName($rootClass, $this->platform);
-        $joinSql   = ' JOIN ' . $tableName . ' te'
-            . ' ON' . implode(' AND ', $this->getOnConditionSQL($mapping));
+        $joinSql   = ' JOIN '.$tableName.' te'
+            . ' ON'.implode(' AND ', $this->getOnConditionSQL($mapping));
 
         return [$joinSql, $filterSql];
     }
@@ -336,12 +336,12 @@ 
 
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
             if ($filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
         return $filterClauses
-            ? '(' . implode(' AND ', $filterClauses) . ')'
+            ? '('.implode(' AND ', $filterClauses).')'
             : '';
     }
 
@@ -369,7 +369,7 @@ 
             $joinColumnName = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform);
             $refColumnName  = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $targetClass, $this->platform);
 
-            $conditions[] = ' t.' . $joinColumnName . ' = ' . 'te.' . $refColumnName;
+            $conditions[] = ' t.'.$joinColumnName.' = '.'te.'.$refColumnName;
         }
 
         return $conditions;
@@ -391,8 +391,8 @@ 
             $columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
         }
 
-        return 'DELETE FROM ' . $joinTable
-            . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
+        return 'DELETE FROM '.$joinTable
+            . ' WHERE '.implode(' = ? AND ', $columns).' = ?';
     }
 
     /**
@@ -451,8 +451,8 @@ 
         }
 
         return [
-            'DELETE FROM ' . $this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform)
-            . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?',
+            'DELETE FROM '.$this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform)
+            . ' WHERE '.implode(' = ? AND ', $columns).' = ?',
             $types,
         ];
     }
@@ -500,10 +500,10 @@ 
         }
 
         return [
-            'INSERT INTO ' . $this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform)
-            . ' (' . implode(', ', $columns) . ')'
+            'INSERT INTO '.$this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform)
+            . ' ('.implode(', ', $columns).')'
             . ' VALUES'
-            . ' (' . implode(', ', array_fill(0, count($columns), '?')) . ')',
+            . ' ('.implode(', ', array_fill(0, count($columns), '?')).')',
             $types,
         ];
     }
@@ -588,7 +588,7 @@ 
         $sourceClass   = $this->em->getClassMetadata($mapping['sourceEntity']);
         $targetClass   = $this->em->getClassMetadata($mapping['targetEntity']);
 
-        if (! $mapping['isOwningSide']) {
+        if ( ! $mapping['isOwningSide']) {
             $associationSourceClass = $this->em->getClassMetadata($mapping['targetEntity']);
             $mapping                = $associationSourceClass->associationMappings[$mapping['mappedBy']];
             $joinColumns            = $mapping['joinTable']['joinColumns'];
@@ -601,7 +601,7 @@ 
             $targetRelationMode     = 'relationToTargetKeyColumns';
         }
 
-        $quotedJoinTable = $this->quoteStrategy->getJoinTableName($mapping, $associationSourceClass, $this->platform). ' t';
+        $quotedJoinTable = $this->quoteStrategy->getJoinTableName($mapping, $associationSourceClass, $this->platform).' t';
         $whereClauses    = [];
         $params          = [];
         $types           = [];
@@ -612,14 +612,14 @@ 
             $joinConditions = [];
 
             foreach ($joinColumns as $joinTableColumn) {
-                $joinConditions[] = 't.' . $joinTableColumn['name'] . ' = tr.' . $joinTableColumn['referencedColumnName'];
+                $joinConditions[] = 't.'.$joinTableColumn['name'].' = tr.'.$joinTableColumn['referencedColumnName'];
             }
 
             $tableName        = $this->quoteStrategy->getTableName($targetClass, $this->platform);
-            $quotedJoinTable .= ' JOIN ' . $tableName . ' tr ON ' . implode(' AND ', $joinConditions);
+            $quotedJoinTable .= ' JOIN '.$tableName.' tr ON '.implode(' AND ', $joinConditions);
             $columnName       = $targetClass->getColumnName($indexBy);
 
-            $whereClauses[] = 'tr.' . $columnName . ' = ?';
+            $whereClauses[] = 'tr.'.$columnName.' = ?';
             $params[]       = $key;
             $types[]        = PersisterHelper::getTypeOfColumn($columnName, $targetClass, $this->em);
         }
@@ -627,7 +627,7 @@ 
         foreach ($mapping['joinTableColumns'] as $joinTableColumn) {
             if (isset($mapping[$sourceRelationMode][$joinTableColumn])) {
                 $column         = $mapping[$sourceRelationMode][$joinTableColumn];
-                $whereClauses[] = 't.' . $joinTableColumn . ' = ?';
+                $whereClauses[] = 't.'.$joinTableColumn.' = ?';
                 $params[]       = $sourceClass->containsForeignIdentifier
                     ? $id[$sourceClass->getFieldForColumn($column)]
                     : $id[$sourceClass->fieldNames[$column]];
@@ -635,7 +635,7 @@ 
             } elseif ( ! $joinNeeded) {
                 $column = $mapping[$targetRelationMode][$joinTableColumn];
 
-                $whereClauses[] = 't.' . $joinTableColumn . ' = ?';
+                $whereClauses[] = 't.'.$joinTableColumn.' = ?';
                 $params[]       = $key;
                 $types[]        = PersisterHelper::getTypeOfColumn($column, $targetClass, $this->em);
             }
@@ -645,7 +645,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($filterMapping);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
             }
         }
@@ -689,7 +689,7 @@ 
         $types           = [];
 
         foreach ($mapping['joinTableColumns'] as $joinTableColumn) {
-            $whereClauses[] = ($addFilters ? 't.' : '') . $joinTableColumn . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '').$joinTableColumn.' = ?';
 
             if (isset($mapping['relationToTargetKeyColumns'][$joinTableColumn])) {
                 $targetColumn = $mapping['relationToTargetKeyColumns'][$joinTableColumn];
@@ -711,7 +711,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($filterMapping);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
             }
         }
@@ -760,10 +760,10 @@ 
                     $targetClass,
                     $this->platform
                 );
-                $orderBy[] = $field . ' ' . $direction;
+                $orderBy[] = $field.' '.$direction;
             }
 
-            return ' ORDER BY ' . implode(', ', $orderBy);
+            return ' ORDER BY '.implode(', ', $orderBy);
         }
         return '';
     }

lib/Doctrine/ORM/EntityNotFoundException.php

Spacing +2 added lines, -2 removed lines

@@ -40,12 +40,12 @@
         $ids = [];
 
         foreach ($id as $key => $value) {
-            $ids[] = $key . '(' . $value . ')';
+            $ids[] = $key.'('.$value.')';
         }
 
 
         return new self(
-            'Entity of type \'' . $className . '\'' . ($ids ? ' for IDs ' . implode(', ', $ids) : '') . ' was not found'
+            'Entity of type \''.$className.'\''.($ids ? ' for IDs '.implode(', ', $ids) : '').' was not found'
         );
     }
 }

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

Spacing +10 added lines, -10 removed lines

@@ -108,10 +108,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;
                 }
 
@@ -120,9 +120,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
 
@@ -173,7 +173,7 @@ 
                     }
                 }
 
-                $coll =& $baseElement[$relationAlias];
+                $coll = & $baseElement[$relationAlias];
 
                 if (is_array($coll)) {
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
@@ -185,7 +185,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;
@@ -246,7 +246,7 @@ 
                 $resultKey = $this->_resultCounter - 1;
             }
 
-            $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0);
+            $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0);
 
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
                 $class  = $newObject['class'];
@@ -284,13 +284,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;
         }
@@ -300,7 +300,7 @@ 
         }
 
         end($coll);
-        $this->_resultPointers[$dqlAlias] =& $coll[key($coll)];
+        $this->_resultPointers[$dqlAlias] = & $coll[key($coll)];
 
         return;
     }

lib/Doctrine/ORM/Query/QueryExpressionVisitor.php

Spacing +11 added lines, -11 removed lines

@@ -114,7 +114,7 @@ 
             $expressionList[] = $this->dispatch($child);
         }
 
-        switch($expr->getType()) {
+        switch ($expr->getType()) {
             case CompositeExpression::TYPE_AND:
                 return new Expr\Andx($expressionList);
 
@@ -122,7 +122,7 @@ 
                 return new Expr\Orx($expressionList);
 
             default:
-                throw new \RuntimeException("Unknown composite " . $expr->getType());
+                throw new \RuntimeException("Unknown composite ".$expr->getType());
         }
     }
 
@@ -136,10 +136,10 @@ 
             throw new QueryException('No aliases are set before invoking walkComparison().');
         }
 
-        $field = $this->queryAliases[0] . '.' . $comparison->getField();
+        $field = $this->queryAliases[0].'.'.$comparison->getField();
 
-        foreach($this->queryAliases as $alias) {
-            if(strpos($comparison->getField() . '.', $alias . '.') === 0) {
+        foreach ($this->queryAliases as $alias) {
+            if (strpos($comparison->getField().'.', $alias.'.') === 0) {
                 $field = $comparison->getField();
                 break;
             }
@@ -149,13 +149,13 @@ 
 
         foreach ($this->parameters as $parameter) {
             if ($parameter->getName() === $parameterName) {
-                $parameterName .= '_' . count($this->parameters);
+                $parameterName .= '_'.count($this->parameters);
                 break;
             }
         }
 
         $parameter = new Parameter($parameterName, $this->walkValue($comparison->getValue()));
-        $placeholder = ':' . $parameterName;
+        $placeholder = ':'.$parameterName;
 
         switch ($comparison->getOperator()) {
             case Comparison::IN:
@@ -182,17 +182,17 @@ 
 
                 return $this->expr->neq($field, $placeholder);
             case Comparison::CONTAINS:
-                $parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType());
+                $parameter->setValue('%'.$parameter->getValue().'%', $parameter->getType());
                 $this->parameters[] = $parameter;
 
                 return $this->expr->like($field, $placeholder);
             case Comparison::STARTS_WITH:
-                $parameter->setValue($parameter->getValue() . '%', $parameter->getType());
+                $parameter->setValue($parameter->getValue().'%', $parameter->getType());
                 $this->parameters[] = $parameter;
 
                 return $this->expr->like($field, $placeholder);
             case Comparison::ENDS_WITH:
-                $parameter->setValue('%' . $parameter->getValue(), $parameter->getType());
+                $parameter->setValue('%'.$parameter->getValue(), $parameter->getType());
                 $this->parameters[] = $parameter;
 
                 return $this->expr->like($field, $placeholder);
@@ -208,7 +208,7 @@ 
                     );
                 }
 
-                throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
+                throw new \RuntimeException("Unknown comparison operator: ".$comparison->getOperator());
         }
     }
 

lib/Doctrine/ORM/Mapping/MappingException.php

Spacing +22 added lines, -22 removed lines

@@ -284,7 +284,7 @@ 
         $message = "The mapping of field '{$field}' is invalid: The option '{$expectedOption}' is required.";
 
         if ( ! empty($hint)) {
-            $message .= ' (Hint: ' . $hint . ')';
+            $message .= ' (Hint: '.$hint.')';
         }
 
         return new self($message);
@@ -314,7 +314,7 @@ 
      */
     public static function reflectionFailure($entity, \ReflectionException $previousException)
     {
-        return new self('An error occurred in ' . $entity, 0, $previousException);
+        return new self('An error occurred in '.$entity, 0, $previousException);
     }
 
     /**
@@ -325,8 +325,8 @@ 
      */
     public static function joinColumnMustPointToMappedField($className, $joinColumn)
     {
-        return new self('The column ' . $joinColumn . ' must be mapped to a field in class '
-            . $className . ' since it is referenced by a join column of another class.');
+        return new self('The column '.$joinColumn.' must be mapped to a field in class '
+            . $className.' since it is referenced by a join column of another class.');
     }
 
     /**
@@ -431,7 +431,7 @@ 
      */
     public static function noIdDefined($entity)
     {
-        return new self('No ID defined for entity ' . $entity);
+        return new self('No ID defined for entity '.$entity);
     }
 
     /**
@@ -456,12 +456,12 @@ 
     public static function fileMappingDriversRequireConfiguredDirectoryPath($path = null)
     {
         if ( ! empty($path)) {
-            $path = '[' . $path . ']';
+            $path = '['.$path.']';
         }
 
         return new self(
-            'File mapping drivers must have a valid directory path, ' .
-            'however the given path ' . $path . ' seems to be incorrect!'
+            'File mapping drivers must have a valid directory path, '.
+            'however the given path '.$path.' seems to be incorrect!'
         );
     }
 
@@ -492,11 +492,11 @@ 
     public static function duplicateDiscriminatorEntry($className, array $entries, array $map)
     {
         return new self(
-            "The entries " . implode(', ', $entries) . " in discriminator map of class '" . $className . "' is duplicated. " .
-            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. " .
-            "The entries of the current map are: @DiscriminatorMap({" . implode(', ', array_map(
+            "The entries ".implode(', ', $entries)." in discriminator map of class '".$className."' is duplicated. ".
+            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. ".
+            "The entries of the current map are: @DiscriminatorMap({".implode(', ', array_map(
                 function($a, $b) { return "'$a': '$b'"; }, array_keys($map), array_values($map)
-            )) . "})"
+            ))."})"
         );
     }
 
@@ -643,7 +643,7 @@ 
     public static function illegalOrphanRemoval($className, $field)
     {
         return new self("Orphan removal is only allowed on one-to-one and one-to-many ".
-            "associations, but " . $className."#" .$field . " is not.");
+            "associations, but ".$className."#".$field." is not.");
     }
 
     /**
@@ -675,7 +675,7 @@ 
      */
     public static function noInheritanceOnMappedSuperClass($className)
     {
-        return new self("It is not supported to define inheritance information on a mapped superclass '" . $className . "'.");
+        return new self("It is not supported to define inheritance information on a mapped superclass '".$className."'.");
     }
 
     /**
@@ -687,8 +687,8 @@ 
     public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName)
     {
         return new self(
-            "Entity '" . $className . "' has to be part of the discriminator map of '" . $rootClassName . "' " .
-            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class " .
+            "Entity '".$className."' has to be part of the discriminator map of '".$rootClassName."' ".
+            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class ".
             "to avoid this exception from occurring."
         );
     }
@@ -701,7 +701,7 @@ 
      */
     public static function lifecycleCallbackMethodNotFound($className, $methodName)
     {
-        return new self("Entity '" . $className . "' has no method '" . $methodName . "' to be registered as lifecycle callback.");
+        return new self("Entity '".$className."' has no method '".$methodName."' to be registered as lifecycle callback.");
     }
 
     /**
@@ -747,7 +747,7 @@ 
      */
     public static function invalidFetchMode($className, $annotation)
     {
-        return new self("Entity '" . $className . "' has a mapping with invalid fetch mode '" . $annotation . "'");
+        return new self("Entity '".$className."' has a mapping with invalid fetch mode '".$annotation."'");
     }
 
     /**
@@ -757,7 +757,7 @@ 
      */
     public static function compositeKeyAssignedIdGeneratorRequired($className)
     {
-        return new self("Entity '". $className . "' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
+        return new self("Entity '".$className."' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
     }
 
     /**
@@ -769,7 +769,7 @@ 
      */
     public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $associationName)
     {
-        return new self("The target-entity " . $targetEntity . " cannot be found in '" . $sourceEntity."#".$associationName."'.");
+        return new self("The target-entity ".$targetEntity." cannot be found in '".$sourceEntity."#".$associationName."'.");
     }
 
     /**
@@ -781,7 +781,7 @@ 
      */
     public static function invalidCascadeOption(array $cascades, $className, $propertyName)
     {
-        $cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades));
+        $cascades = implode(", ", array_map(function($e) { return "'".$e."'"; }, $cascades));
 
         return new self(sprintf(
             "You have specified invalid cascade options for %s::$%s: %s; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'",
@@ -813,7 +813,7 @@ 
     {
         return new self(
             sprintf(
-                'Infinite nesting detected for embedded property %s::%s. ' .
+                'Infinite nesting detected for embedded property %s::%s. '.
                 'You cannot embed an embeddable from the same type inside an embeddable.',
                 $className,
                 $propertyName

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

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
             $sql    = $type->convertToPHPValueSQL($sql, $this->platform);
         }
 
-        return $sql . ' AS ' . $columnAlias;
+        return $sql.' AS '.$columnAlias;
     }
 
     /**
@@ -94,6 +94,6 @@ 
 
         $this->currentPersisterContext->rsm->addMetaResult('r', $columnAlias, $joinColumnName, false, $type);
 
-        return $tableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias;
+        return $tableAlias.'.'.$quotedColumnName.' AS '.$columnAlias;
     }
 }