doctrine / orm

lib/Doctrine/ORM/Id/UuidGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     public function generate(EntityManager $em, $entity)
     {
         $conn = $em->getConnection();
-        $sql = 'SELECT ' . $conn->getDatabasePlatform()->getGuidExpression();
+        $sql = 'SELECT '.$conn->getDatabasePlatform()->getGuidExpression();
 
         return $conn->query($sql)->fetchColumn(0);
     }

lib/Doctrine/ORM/Id/TableGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
                         $this->_tableName, $this->_sequenceName, $this->_allocationSize
                     );
 
-                    if ($conn->executeUpdate($updateSql, array(1 => $currentLevel, 2 => $currentLevel+1)) !== 1) {
+                    if ($conn->executeUpdate($updateSql, array(1 => $currentLevel, 2 => $currentLevel + 1)) !== 1) {
                         // no affected rows, concurrency issue, throw exception
                     }
                 } else {

lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php

Spacing +4 added lines, -4 removed lines

@@ -95,15 +95,15 @@
             $expressionList[] = $this->dispatch($child);
         }
 
-        switch($expr->getType()) {
+        switch ($expr->getType()) {
             case CompositeExpression::TYPE_AND:
-                return '(' . implode(' AND ', $expressionList) . ')';
+                return '('.implode(' AND ', $expressionList).')';
 
             case CompositeExpression::TYPE_OR:
-                return '(' . implode(' OR ', $expressionList) . ')';
+                return '('.implode(' OR ', $expressionList).')';
 
             default:
-                throw new \RuntimeException("Unknown composite " . $expr->getType());
+                throw new \RuntimeException("Unknown composite ".$expr->getType());
         }
     }
 

lib/Doctrine/ORM/Persisters/PersisterException.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     static public function matchingAssocationFieldRequiresObject($class, $associationName)
     {
         return new self(sprintf(
-            "Cannot match on %s::%s with a non-object value. Matching objects by id is " .
+            "Cannot match on %s::%s with a non-object value. Matching objects by id is ".
             "not compatible with matching on an in-memory collection, which compares objects by reference.",
             $class, $associationName
         ));

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

Spacing +32 added lines, -32 removed lines

@@ -132,7 +132,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);
         }
@@ -161,9 +161,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);
     }
@@ -191,7 +191,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);
     }
@@ -207,7 +207,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);
     }
@@ -223,7 +223,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);
     }
@@ -260,11 +260,11 @@ 
         $rsm = new Query\ResultSetMappingBuilder($this->em);
         $rsm->addRootEntityFromClassMetadata($mapping['targetEntity'], '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);
 
         $stmt = $this->conn->executeQuery($sql, $params);
 
@@ -301,8 +301,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 array($joinSql, $filterSql);
     }
@@ -321,12 +321,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).')'
             : '';
     }
 
@@ -354,7 +354,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;
@@ -376,8 +376,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).' = ?';
     }
 
     /**
@@ -436,8 +436,8 @@ 
         }
 
         return array(
-            '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,
         );
     }
@@ -485,10 +485,10 @@ 
         }
 
         return array(
-            '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,
         );
     }
@@ -573,7 +573,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'];
@@ -586,7 +586,7 @@ 
             $targetRelationMode     = 'relationToTargetKeyColumns';
         }
 
-        $quotedJoinTable = $this->quoteStrategy->getJoinTableName($mapping, $associationSourceClass, $this->platform). ' t';
+        $quotedJoinTable = $this->quoteStrategy->getJoinTableName($mapping, $associationSourceClass, $this->platform).' t';
         $whereClauses    = array();
         $params          = array();
         $types           = array();
@@ -597,14 +597,14 @@ 
             $joinConditions = array();
 
             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);
         }
@@ -612,7 +612,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]];
@@ -620,7 +620,7 @@ 
             } elseif ( ! $joinNeeded) {
                 $column = $mapping[$targetRelationMode][$joinTableColumn];
 
-                $whereClauses[] = 't.' . $joinTableColumn . ' = ?';
+                $whereClauses[] = 't.'.$joinTableColumn.' = ?';
                 $params[]       = $key;
                 $types[]        = PersisterHelper::getTypeOfColumn($column, $targetClass, $this->em);
             }
@@ -630,7 +630,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($filterMapping);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
             }
         }
@@ -674,7 +674,7 @@ 
         $types           = array();
 
         foreach ($mapping['joinTableColumns'] as $joinTableColumn) {
-            $whereClauses[] = ($addFilters ? 't.' : '') . $joinTableColumn . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '').$joinTableColumn.' = ?';
 
             if (isset($mapping['relationToTargetKeyColumns'][$joinTableColumn])) {
                 $targetColumn = $mapping['relationToTargetKeyColumns'][$joinTableColumn];
@@ -696,7 +696,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($filterMapping);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
             }
         }

lib/Doctrine/ORM/Persisters/SqlValueVisitor.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     /**
      * @var array
      */
-    private $types  = array();
+    private $types = array();
 
     /**
      * Converts a comparison expression into the target query language output.

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

Indentation +12 added lines, -12 removed lines

@@ -339,8 +339,8 @@ 
 
         // FIXME: Order with composite keys might not be correct
         $sql = 'SELECT ' . $columnName
-             . ' FROM '  . $tableName
-             . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
+                . ' FROM '  . $tableName
+                . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
 
         $flatId = $this->identifierFlattener->flattenIdentifier($versionedClass, $id);
 
@@ -474,8 +474,8 @@ 
         }
 
         $sql = 'UPDATE ' . $quotedTableName
-             . ' SET ' . implode(', ', $set)
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
+                . ' SET ' . implode(', ', $set)
+                . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
 
         $result = $this->conn->executeUpdate($sql, $params, $types);
 
@@ -1528,9 +1528,9 @@ 
         $lock  = $this->getLockTablesSql($lockMode);
         $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
         $sql = 'SELECT 1 '
-             . $lock
-             . $where
-             . $lockSql;
+                . $lock
+                . $where
+                . $lockSql;
 
         list($params, $types) = $this->expandParameters($criteria);
 
@@ -1981,8 +1981,8 @@ 
         $alias = $this->getSQLTableAlias($this->class->name);
 
         $sql = 'SELECT 1 '
-             . $this->getLockTablesSql(null)
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
+                . $this->getLockTablesSql(null)
+                . ' WHERE ' . $this->getSelectConditionSQL($criteria);
 
         list($params, $types) = $this->expandParameters($criteria);
 
@@ -2012,9 +2012,9 @@ 
     {
         // if one of the join columns is nullable, return left join
         foreach ($joinColumns as $joinColumn) {
-             if ( ! isset($joinColumn['nullable']) || $joinColumn['nullable']) {
-                 return 'LEFT JOIN';
-             }
+                if ( ! isset($joinColumn['nullable']) || $joinColumn['nullable']) {
+                    return 'LEFT JOIN';
+                }
         }
 
         return 'INNER JOIN';

Spacing +63 added lines, -63 removed lines

@@ -338,9 +338,9 @@ 
         $columnName   = $this->quoteStrategy->getColumnName($versionField, $versionedClass, $this->platform);
 
         // FIXME: Order with composite keys might not be correct
-        $sql = 'SELECT ' . $columnName
-             . ' FROM '  . $tableName
-             . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
+        $sql = 'SELECT '.$columnName
+             . ' FROM '.$tableName
+             . ' WHERE '.implode(' = ? AND ', $identifier).' = ?';
 
         $flatId = $this->identifierFlattener->flattenIdentifier($versionedClass, $id);
 
@@ -416,7 +416,7 @@ 
             }
 
             $params[]   = $value;
-            $set[]      = $column . ' = ' . $placeholder;
+            $set[]      = $column.' = '.$placeholder;
             $types[]    = $this->columnTypes[$columnName];
         }
 
@@ -464,18 +464,18 @@ 
                 case Type::SMALLINT:
                 case Type::INTEGER:
                 case Type::BIGINT:
-                    $set[] = $versionColumn . ' = ' . $versionColumn . ' + 1';
+                    $set[] = $versionColumn.' = '.$versionColumn.' + 1';
                     break;
 
                 case Type::DATETIME:
-                    $set[] = $versionColumn . ' = CURRENT_TIMESTAMP';
+                    $set[] = $versionColumn.' = CURRENT_TIMESTAMP';
                     break;
             }
         }
 
-        $sql = 'UPDATE ' . $quotedTableName
-             . ' SET ' . implode(', ', $set)
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
+        $sql = 'UPDATE '.$quotedTableName
+             . ' SET '.implode(', ', $set)
+             . ' WHERE '.implode(' = ? AND ', $where).' = ?';
 
         $result = $this->conn->executeUpdate($sql, $params, $types);
 
@@ -518,7 +518,7 @@ 
 
 
             if ($selfReferential) {
-                $otherColumns = (! $mapping['isOwningSide'])
+                $otherColumns = ( ! $mapping['isOwningSide'])
                     ? $association['joinTable']['joinColumns']
                     : $association['joinTable']['inverseJoinColumns'];
             }
@@ -556,7 +556,7 @@ 
         $tableName  = $this->quoteStrategy->getTableName($class, $this->platform);
         $idColumns  = $this->quoteStrategy->getIdentifierColumnNames($class, $this->platform);
         $id         = array_combine($idColumns, $identifier);
-        $types      = array_map(function ($identifier) use ($class, $self) {
+        $types      = array_map(function($identifier) use ($class, $self) {
             if (isset($class->fieldMappings[$identifier])) {
                 return $class->fieldMappings[$identifier]['type'];
             }
@@ -783,7 +783,7 @@ 
 
             // unset the old value and set the new sql aliased value here. By definition
             // unset($identifier[$targetKeyColumn] works here with how UnitOfWork::createEntity() calls this method.
-            $identifier[$this->getSQLTableAlias($targetClass->name) . "." . $targetKeyColumn] =
+            $identifier[$this->getSQLTableAlias($targetClass->name).".".$targetKeyColumn] =
                 $sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity);
 
             unset($identifier[$targetKeyColumn]);
@@ -1017,7 +1017,7 @@ 
                     );
             }
 
-            $criteria[$quotedJoinTable . '.' . $quotedKeyColumn] = $value;
+            $criteria[$quotedJoinTable.'.'.$quotedKeyColumn] = $value;
             $parameters[] = array(
                 'value' => $value,
                 'field' => $field,
@@ -1060,11 +1060,11 @@ 
 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
-                $lockSql = ' ' . $this->platform->getReadLockSql();
+                $lockSql = ' '.$this->platform->getReadLockSql();
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
-                $lockSql = ' ' . $this->platform->getWriteLockSql();
+                $lockSql = ' '.$this->platform->getWriteLockSql();
                 break;
         }
 
@@ -1075,14 +1075,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
-        $select = 'SELECT ' . $columnList;
-        $from   = ' FROM ' . $tableName . ' '. $tableAlias;
-        $join   = $this->currentPersisterContext->selectJoinSql . $joinSql;
-        $where  = ($conditionSql ? ' WHERE ' . $conditionSql : '');
+        $select = 'SELECT '.$columnList;
+        $from   = ' FROM '.$tableName.' '.$tableAlias;
+        $join   = $this->currentPersisterContext->selectJoinSql.$joinSql;
+        $where  = ($conditionSql ? ' WHERE '.$conditionSql : '');
         $lock   = $this->platform->appendLockHint($from, $lockMode);
         $query  = $select
             . $lock
@@ -1090,7 +1090,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -1109,13 +1109,13 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $tableAlias
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . 'FROM '.$tableName.' '.$tableAlias
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -1148,7 +1148,7 @@ 
                     : $baseTableAlias;
 
                 $columnName    = $this->quoteStrategy->getColumnName($fieldName, $this->class, $this->platform);
-                $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
 
                 continue;
             }
@@ -1165,7 +1165,7 @@ 
 
                 foreach ($this->class->associationMappings[$fieldName]['joinColumns'] as $joinColumn) {
                     $columnName    = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
-                    $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
                 }
 
                 continue;
@@ -1174,7 +1174,7 @@ 
             throw ORMException::unrecognizedField($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1202,8 +1202,8 @@ 
             $columnList[] = $this->getSelectColumnSQL($field, $this->class);
         }
 
-        $this->currentPersisterContext->selectJoinSql    = '';
-        $eagerAliasCounter      = 0;
+        $this->currentPersisterContext->selectJoinSql = '';
+        $eagerAliasCounter = 0;
 
         foreach ($this->class->associationMappings as $assocField => $assoc) {
             $assocColumnSQL = $this->getSelectColumnAssociationSQL($assocField, $assoc, $this->class);
@@ -1229,7 +1229,7 @@ 
                 continue; // now this is why you shouldn't use inheritance
             }
 
-            $assocAlias = 'e' . ($eagerAliasCounter++);
+            $assocAlias = 'e'.($eagerAliasCounter++);
             $this->currentPersisterContext->rsm->addJoinedEntityResult($assoc['targetEntity'], $assocAlias, 'r', $assocField);
 
             foreach ($eagerEntity->fieldNames as $field) {
@@ -1262,14 +1262,14 @@ 
             $joinTableName  = $this->quoteStrategy->getTableName($eagerEntity, $this->platform);
 
             if ($assoc['isOwningSide']) {
-                $tableAlias           = $this->getSQLTableAlias($association['targetEntity'], $assocAlias);
-                $this->currentPersisterContext->selectJoinSql .= ' ' . $this->getJoinSQLForJoinColumns($association['joinColumns']);
+                $tableAlias = $this->getSQLTableAlias($association['targetEntity'], $assocAlias);
+                $this->currentPersisterContext->selectJoinSql .= ' '.$this->getJoinSQLForJoinColumns($association['joinColumns']);
 
                 foreach ($association['joinColumns'] as $joinColumn) {
                     $sourceCol       = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
                     $targetCol       = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $this->class, $this->platform);
                     $joinCondition[] = $this->getSQLTableAlias($association['sourceEntity'])
-                                        . '.' . $sourceCol . ' = ' . $tableAlias . '.' . $targetCol;
+                                        . '.'.$sourceCol.' = '.$tableAlias.'.'.$targetCol;
                 }
 
                 // Add filter SQL
@@ -1285,12 +1285,12 @@ 
                     $sourceCol       = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
                     $targetCol       = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $this->class, $this->platform);
 
-                    $joinCondition[] = $this->getSQLTableAlias($association['sourceEntity'], $assocAlias) . '.' . $sourceCol . ' = '
-                        . $this->getSQLTableAlias($association['targetEntity']) . '.' . $targetCol;
+                    $joinCondition[] = $this->getSQLTableAlias($association['sourceEntity'], $assocAlias).'.'.$sourceCol.' = '
+                        . $this->getSQLTableAlias($association['targetEntity']).'.'.$targetCol;
                 }
             }
 
-            $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
+            $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
             $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
         }
 
@@ -1311,7 +1311,7 @@ 
      */
     protected function getSelectColumnAssociationSQL($field, $assoc, ClassMetadata $class, $alias = 'r')
     {
-        if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) ) {
+        if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)) {
             return '';
         }
 
@@ -1360,10 +1360,10 @@ 
         foreach ($joinColumns as $joinColumn) {
             $quotedSourceColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
             $quotedTargetColumn = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $this->class, $this->platform);
-            $conditions[]       = $sourceTableAlias . '.' . $quotedTargetColumn . ' = ' . $joinTableName . '.' . $quotedSourceColumn;
+            $conditions[]       = $sourceTableAlias.'.'.$quotedTargetColumn.' = '.$joinTableName.'.'.$quotedSourceColumn;
         }
 
-        return ' INNER JOIN ' . $joinTableName . ' ON ' . implode(' AND ', $conditions);
+        return ' INNER JOIN '.$joinTableName.' ON '.implode(' AND ', $conditions);
     }
 
     /**
@@ -1463,7 +1463,7 @@ 
      */
     protected function getSelectColumnSQL($field, ClassMetadata $class, $alias = 'r')
     {
-        $root         = $alias == 'r' ? '' : $alias ;
+        $root         = $alias == 'r' ? '' : $alias;
         $tableAlias   = $this->getSQLTableAlias($class->name, $root);
         $fieldMapping = $class->fieldMappings[$field];
         $sql          = sprintf('%s.%s', $tableAlias, $this->quoteStrategy->getColumnName($field, $class, $this->platform));
@@ -1476,7 +1476,7 @@ 
             $sql  = $type->convertToPHPValueSQL($sql, $this->platform);
         }
 
-        return $sql . ' AS ' . $columnAlias;
+        return $sql.' AS '.$columnAlias;
     }
 
     /**
@@ -1492,14 +1492,14 @@ 
     protected function getSQLTableAlias($className, $assocName = '')
     {
         if ($assocName) {
-            $className .= '#' . $assocName;
+            $className .= '#'.$assocName;
         }
 
         if (isset($this->currentPersisterContext->sqlTableAliases[$className])) {
             return $this->currentPersisterContext->sqlTableAliases[$className];
         }
 
-        $tableAlias = 't' . $this->currentPersisterContext->sqlAliasCounter++;
+        $tableAlias = 't'.$this->currentPersisterContext->sqlAliasCounter++;
 
         $this->currentPersisterContext->sqlTableAliases[$className] = $tableAlias;
 
@@ -1526,7 +1526,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql = 'SELECT 1 '
              . $lock
              . $where
@@ -1548,7 +1548,7 @@ 
     {
         return $this->platform->appendLockHint(
             'FROM '
-            . $this->quoteStrategy->getTableName($this->class, $this->platform) . ' '
+            . $this->quoteStrategy->getTableName($this->class, $this->platform).' '
             . $this->getSQLTableAlias($this->class->name),
             $lockMode
         );
@@ -1600,19 +1600,19 @@ 
 
             if (null !== $comparison) {
                 // special case null value handling
-                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null ===$value) {
-                    $selectedColumns[] = $column . ' IS NULL';
+                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null === $value) {
+                    $selectedColumns[] = $column.' IS NULL';
 
                     continue;
                 }
 
                 if ($comparison === Comparison::NEQ && null === $value) {
-                    $selectedColumns[] = $column . ' IS NOT NULL';
+                    $selectedColumns[] = $column.' IS NOT NULL';
 
                     continue;
                 }
 
-                $selectedColumns[] = $column . ' ' . sprintf(self::$comparisonMap[$comparison], $placeholder);
+                $selectedColumns[] = $column.' '.sprintf(self::$comparisonMap[$comparison], $placeholder);
 
                 continue;
             }
@@ -1660,7 +1660,7 @@ 
                 ? $this->class->fieldMappings[$field]['inherited']
                 : $this->class->name;
 
-            return array($this->getSQLTableAlias($className) . '.' . $this->quoteStrategy->getColumnName($field, $this->class, $this->platform));
+            return array($this->getSQLTableAlias($className).'.'.$this->quoteStrategy->getColumnName($field, $this->class, $this->platform));
         }
 
         if (isset($this->class->associationMappings[$field])) {
@@ -1681,7 +1681,7 @@ 
 
 
                 foreach ($joinColumns as $joinColumn) {
-                    $columns[] = $joinTableName . '.' . $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
+                    $columns[] = $joinTableName.'.'.$this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
                 }
 
             } else {
@@ -1689,12 +1689,12 @@ 
                     throw ORMException::invalidFindByInverseAssociation($this->class->name, $field);
                 }
 
-                $className  = (isset($association['inherited']))
+                $className = (isset($association['inherited']))
                     ? $association['inherited']
                     : $this->class->name;
 
                 foreach ($association['joinColumns'] as $joinColumn) {
-                    $columns[] = $this->getSQLTableAlias($className) . '.' . $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
+                    $columns[] = $this->getSQLTableAlias($className).'.'.$this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
                 }
             }
             return $columns;
@@ -1786,7 +1786,7 @@ 
                     $value = $value[$this->em->getClassMetadata($sourceClass->associationMappings[$field]['targetEntity'])->identifier[0]];
                 }
 
-                $criteria[$tableAlias . "." . $targetKeyColumn] = $value;
+                $criteria[$tableAlias.".".$targetKeyColumn] = $value;
                 $parameters[]                                   = array(
                     'value' => $value,
                     'field' => $field,
@@ -1799,7 +1799,7 @@ 
             $field = $sourceClass->fieldNames[$sourceKeyColumn];
             $value = $sourceClass->reflFields[$field]->getValue($sourceEntity);
 
-            $criteria[$tableAlias . "." . $targetKeyColumn] = $value;
+            $criteria[$tableAlias.".".$targetKeyColumn] = $value;
             $parameters[] = array(
                 'value' => $value,
                 'field' => $field,
@@ -1886,7 +1886,7 @@ 
                 $assoc = $class->associationMappings[$field];
                 $class = $this->em->getClassMetadata($assoc['targetEntity']);
 
-                if (! $assoc['isOwningSide']) {
+                if ( ! $assoc['isOwningSide']) {
                     $assoc = $class->associationMappings[$assoc['mappedBy']];
                     $class = $this->em->getClassMetadata($assoc['targetEntity']);
                 }
@@ -1895,7 +1895,7 @@ 
                     ? $assoc['relationToTargetKeyColumns']
                     : $assoc['sourceToTargetKeyColumns'];
 
-                foreach ($columns as $column){
+                foreach ($columns as $column) {
                     $types[] = PersisterHelper::getTypeOfColumn($column, $class, $this->em);
                 }
                 break;
@@ -1906,7 +1906,7 @@ 
         }
 
         if (is_array($value)) {
-            return array_map(function ($type) {
+            return array_map(function($type) {
                 $type = Type::getType($type);
 
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
@@ -1982,12 +1982,12 @@ 
 
         $sql = 'SELECT 1 '
              . $this->getLockTablesSql(null)
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
+             . ' WHERE '.$this->getSelectConditionSQL($criteria);
 
         list($params, $types) = $this->expandParameters($criteria);
 
         if (null !== $extraConditions) {
-            $sql                                 .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
+            $sql                                 .= ' AND '.$this->getSelectConditionCriteriaSQL($extraConditions);
             list($criteriaParams, $criteriaTypes) = $this->expandCriteriaParameters($extraConditions);
 
             $params = array_merge($params, $criteriaParams);
@@ -1995,7 +1995,7 @@ 
         }
 
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2042,13 +2042,13 @@ 
 
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
             if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
         $sql = implode(' AND ', $filterClauses);
 
-        return $sql ? "(" . $sql . ")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
+        return $sql ? "(".$sql.")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
     }
 
     /**

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

Indentation +9 added lines, -9 removed lines

@@ -47,17 +47,17 @@
      * Get all queued inserts.
      *
      * @return array
-    */
+     */
     public function getInserts();
 
-     /**
-     * @TODO - It should not be here.
-     * But its necessary since JoinedSubclassPersister#executeInserts invoke the root persister.
-     *
-     * Gets the INSERT SQL used by the persister to persist a new entity.
-     *
-     * @return string
-     */
+        /**
+         * @TODO - It should not be here.
+         * But its necessary since JoinedSubclassPersister#executeInserts invoke the root persister.
+         *
+         * Gets the INSERT SQL used by the persister to persist a new entity.
+         *
+         * @return string
+         */
     public function getInsertSQL();
 
     /**

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

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         $rootClass  = $this->em->getClassMetadata($this->class->rootEntityName);
         $tableAlias = $this->getSQLTableAlias($rootClass->name);
 
-         // Append discriminator column
+            // Append discriminator column
         $discrColumn     = $this->class->discriminatorColumn['name'];
         $discrColumnType = $this->class->discriminatorColumn['type'];
 

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
         $discrColumn     = $this->class->discriminatorColumn['name'];
         $discrColumnType = $this->class->discriminatorColumn['type'];
 
-        $columnList[]   = $tableAlias . '.' . $discrColumn;
+        $columnList[] = $tableAlias.'.'.$discrColumn;
 
         $resultColumnName = $this->platform->getSQLResultCasing($discrColumn);
 
@@ -142,7 +142,7 @@ 
             $conditionSql .= ' AND ';
         }
 
-        return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL();
+        return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL();
     }
 
     /**
@@ -156,7 +156,7 @@ 
             $conditionSql .= ' AND ';
         }
 
-        return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL();
+        return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL();
     }
 
     /**
@@ -180,7 +180,7 @@ 
         $discColumn = $this->class->discriminatorColumn['name'];
         $tableAlias = $this->getSQLTableAlias($this->class->name);
 
-        return $tableAlias . '.' . $discColumn . ' IN (' . $values . ')';
+        return $tableAlias.'.'.$discColumn.' IN ('.$values.')';
     }
 
     /**