doctrine / orm

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/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 +58 added lines, -58 removed lines

@@ -334,9 +334,9 @@ 
         $identifier     = $this->quoteStrategy->getIdentifierColumnNames($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).' = ?';
 
         $flattenedId = $this->identifierFlattener->flattenIdentifier($versionedClass, $id);
         $value       = $this->conn->fetchColumn($sql, array_values($flattenedId));
@@ -402,7 +402,7 @@ 
                 $placeholder      = $type->convertToDatabaseValueSQL('?', $this->platform);
             }
 
-            $set[]    = $quotedColumnName . ' = ' . $placeholder;
+            $set[]    = $quotedColumnName.' = '.$placeholder;
             $params[] = $value;
             $types[]  = $type;
         }
@@ -455,18 +455,18 @@ 
                 case Type::SMALLINT:
                 case Type::INTEGER:
                 case Type::BIGINT:
-                    $set[] = $versionColumnName . ' = ' . $versionColumnName . ' + 1';
+                    $set[] = $versionColumnName.' = '.$versionColumnName.' + 1';
                     break;
 
                 case Type::DATETIME:
-                    $set[] = $versionColumnName . ' = CURRENT_TIMESTAMP';
+                    $set[] = $versionColumnName.' = CURRENT_TIMESTAMP';
                     break;
             }
         }
 
-        $sql = 'UPDATE ' . $quotedTableName
-             . ' SET ' . implode(', ', $set)
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
+        $sql = 'UPDATE '.$quotedTableName
+             . ' SET '.implode(', ', $set)
+             . ' WHERE '.implode(' = ? AND ', $where).' = ?';
 
         $result = $this->conn->executeUpdate($sql, $params, $types);
 
@@ -509,7 +509,7 @@ 
 
 
             if ($selfReferential) {
-                $otherColumns = (! $mapping['isOwningSide'])
+                $otherColumns = ( ! $mapping['isOwningSide'])
                     ? $association['joinTable']['joinColumns']
                     : $association['joinTable']['inverseJoinColumns'];
             }
@@ -547,7 +547,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 (($property = $class->getProperty($identifier)) !== null) {
                 return $property->getType();
             }
@@ -775,7 +775,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->getTableName()) . "." . $targetKeyColumn] =
+            $identifier[$this->getSQLTableAlias($targetClass->getTableName()).".".$targetKeyColumn] =
                 $sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity);
 
             unset($identifier[$targetKeyColumn]);
@@ -983,7 +983,7 @@ 
 
         foreach ($joinColumns as $joinColumn) {
             $sourceKeyColumn    = $joinColumn['referencedColumnName'];
-            $quotedKeyColumn    = $this->platform->quoteIdentifier($joinColumn['name']);;
+            $quotedKeyColumn    = $this->platform->quoteIdentifier($joinColumn['name']); ;
 
             switch (true) {
                 case $sourceClass->containsForeignIdentifier:
@@ -1009,7 +1009,7 @@ 
                     );
             }
 
-            $criteria[$quotedJoinTable . '.' . $quotedKeyColumn] = $value;
+            $criteria[$quotedJoinTable.'.'.$quotedKeyColumn] = $value;
 
             $parameters[] = array(
                 'value' => $value,
@@ -1054,11 +1054,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;
         }
 
@@ -1069,14 +1069,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
@@ -1084,7 +1084,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -1103,13 +1103,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;
     }
@@ -1139,7 +1139,7 @@ 
                 $tableAlias = $this->getSQLTableAlias($property->getTableName());
                 $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-                $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
 
                 continue;
             }
@@ -1157,7 +1157,7 @@ 
                 foreach ($this->class->associationMappings[$fieldName]['joinColumns'] as $joinColumn) {
                     $columnName = $this->platform->quoteIdentifier($joinColumn['name']);
 
-                    $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
                 }
 
                 continue;
@@ -1166,7 +1166,7 @@ 
             throw ORMException::unrecognizedField($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1194,8 +1194,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);
@@ -1221,7 +1221,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) {
@@ -1254,7 +1254,7 @@ 
             $joinTableName  = $this->quoteStrategy->getTableName($eagerEntity, $this->platform);
 
             if ($assoc['isOwningSide']) {
-                $this->currentPersisterContext->selectJoinSql .= ' ' . $this->getJoinSQLForJoinColumns($association['joinColumns']);
+                $this->currentPersisterContext->selectJoinSql .= ' '.$this->getJoinSQLForJoinColumns($association['joinColumns']);
 
                 $sourceClass = $this->em->getClassMetadata($association['sourceEntity']);
                 $targetClass = $this->em->getClassMetadata($association['targetEntity']);
@@ -1292,7 +1292,7 @@ 
                 }
             }
 
-            $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
+            $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
             $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
         }
 
@@ -1313,7 +1313,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 '';
         }
 
@@ -1363,10 +1363,10 @@ 
             $quotedSourceColumn = $this->platform->quoteIdentifier($joinColumn['name']);
             $quotedTargetColumn = $this->platform->quoteIdentifier($joinColumn['referencedColumnName']);
 
-            $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);
     }
 
     /**
@@ -1495,7 +1495,7 @@ 
 
         $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field, $class->name);
 
-        return $property->getType()->convertToPHPValueSQL($sql, $this->platform) . ' AS ' . $columnAlias;
+        return $property->getType()->convertToPHPValueSQL($sql, $this->platform).' AS '.$columnAlias;
     }
 
     /**
@@ -1509,14 +1509,14 @@ 
     protected function getSQLTableAlias($tableName, $assocName = '')
     {
         if ($tableName) {
-            $tableName .= '#' . $assocName;
+            $tableName .= '#'.$assocName;
         }
 
         if (isset($this->currentPersisterContext->sqlTableAliases[$tableName])) {
             return $this->currentPersisterContext->sqlTableAliases[$tableName];
         }
 
-        $tableAlias = 't' . $this->currentPersisterContext->sqlAliasCounter++;
+        $tableAlias = 't'.$this->currentPersisterContext->sqlAliasCounter++;
 
         $this->currentPersisterContext->sqlTableAliases[$tableName] = $tableAlias;
 
@@ -1543,7 +1543,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql = 'SELECT 1 '
              . $lock
              . $where
@@ -1565,7 +1565,7 @@ 
     {
         return $this->platform->appendLockHint(
             'FROM '
-            . $this->quoteStrategy->getTableName($this->class, $this->platform) . ' '
+            . $this->quoteStrategy->getTableName($this->class, $this->platform).' '
             . $this->getSQLTableAlias($this->class->getTableName()),
             $lockMode
         );
@@ -1616,19 +1616,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;
             }
@@ -1675,7 +1675,7 @@ 
             $tableAlias = $this->getSQLTableAlias($property->getTableName());
             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-            return array($tableAlias . '.' . $columnName);
+            return array($tableAlias.'.'.$columnName);
         }
 
         if (isset($this->class->associationMappings[$field])) {
@@ -1698,7 +1698,7 @@ 
                 foreach ($joinColumns as $joinColumn) {
                     $columnName = $this->platform->quoteIdentifier($joinColumn['name']);
 
-                    $columns[] = $joinTableName . '.' . $columnName;
+                    $columns[] = $joinTableName.'.'.$columnName;
                 }
 
             } else {
@@ -1714,7 +1714,7 @@ 
                 foreach ($association['joinColumns'] as $joinColumn) {
                     $columnName = $this->platform->quoteIdentifier($joinColumn['name']);
 
-                    $columns[] = $tableAlias . '.' . $columnName;
+                    $columns[] = $tableAlias.'.'.$columnName;
                 }
             }
 
@@ -1812,7 +1812,7 @@ 
                     $value = $value[$targetClass->identifier[0]];
                 }
 
-                $criteria[$tableAlias . "." . $targetKeyColumn] = $value;
+                $criteria[$tableAlias.".".$targetKeyColumn] = $value;
                 $parameters[] = array(
                     'value' => $value,
                     'field' => $field,
@@ -1825,7 +1825,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,
@@ -1914,7 +1914,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']);
                 }
@@ -1923,7 +1923,7 @@ 
                     ? $assoc['relationToTargetKeyColumns']
                     : $assoc['sourceToTargetKeyColumns'];
 
-                foreach ($columns as $column){
+                foreach ($columns as $column) {
                     $types[] = PersisterHelper::getTypeOfColumn($column, $class, $this->em);
                 }
                 break;
@@ -1934,7 +1934,7 @@ 
         }
 
         if (is_array($value)) {
-            return array_map(function ($type) {
+            return array_map(function($type) {
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
             }, $types);
         }
@@ -2008,12 +2008,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);
@@ -2021,7 +2021,7 @@ 
         }
 
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2068,13 +2068,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

@@ -59,7 +59,7 @@ 
         $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName);
         $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType);
 
-        $columnList[] = $discrColumnType->convertToDatabaseValueSQL($tableAlias . '.' . $quotedColumnName, $this->platform);
+        $columnList[] = $discrColumnType->convertToDatabaseValueSQL($tableAlias.'.'.$quotedColumnName, $this->platform);
 
         // Append subclass columns
         foreach ($this->class->subClasses as $subClassName) {
@@ -132,7 +132,7 @@ 
             $conditionSql .= ' AND ';
         }
 
-        return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL();
+        return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL();
     }
 
     /**
@@ -146,7 +146,7 @@ 
             $conditionSql .= ' AND ';
         }
 
-        return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL();
+        return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL();
     }
 
     /**
@@ -173,7 +173,7 @@ 
 
         return sprintf(
             '%s IN (%s)',
-            $discrColumnType->convertToDatabaseValueSQL($tableAlias . '.' . $quotedColumnName, $this->platform),
+            $discrColumnType->convertToDatabaseValueSQL($tableAlias.'.'.$quotedColumnName, $this->platform),
             implode(', ', $values)
         );
     }

lib/Doctrine/ORM/EntityRepository.php

Spacing +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
         }
 
         if (empty($arguments)) {
-            throw ORMException::findByRequiresParameter($method . $by);
+            throw ORMException::findByRequiresParameter($method.$by);
         }
 
         $fieldName = lcfirst(\Doctrine\Common\Util\Inflector::classify($by));

lib/Doctrine/ORM/Query/AST/ASTException.php

Spacing +1 added lines, -1 removed lines

@@ -33,6 +33,6 @@
      */
     public static function noDispatchForNode($node)
     {
-        return new self("Double-dispatch for node " . get_class($node) . " is not supported.");
+        return new self("Double-dispatch for node ".get_class($node)." is not supported.");
     }
 }

lib/Doctrine/ORM/Query/AST/Node.php

Indentation +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
             foreach ($props as $name => $prop) {
                 $ident += 4;
                 $str .= str_repeat(' ', $ident) . '"' . $name . '": '
-                      . $this->dump($prop) . ',' . PHP_EOL;
+                        . $this->dump($prop) . ',' . PHP_EOL;
                 $ident -= 4;
             }
 
@@ -86,7 +86,7 @@ 
 
             foreach ($obj as $k => $v) {
                 $str .= PHP_EOL . str_repeat(' ', $ident) . '"'
-                      . $k . '" => ' . $this->dump($v) . ',';
+                        . $k . '" => ' . $this->dump($v) . ',';
                 $some = true;
             }
 

Spacing +8 added lines, -8 removed lines

@@ -68,32 +68,32 @@
         $str = '';
 
         if ($obj instanceof Node) {
-            $str .= get_class($obj) . '(' . PHP_EOL;
+            $str .= get_class($obj).'('.PHP_EOL;
             $props = get_object_vars($obj);
 
             foreach ($props as $name => $prop) {
                 $ident += 4;
-                $str .= str_repeat(' ', $ident) . '"' . $name . '": '
-                      . $this->dump($prop) . ',' . PHP_EOL;
+                $str .= str_repeat(' ', $ident).'"'.$name.'": '
+                      . $this->dump($prop).','.PHP_EOL;
                 $ident -= 4;
             }
 
-            $str .= str_repeat(' ', $ident) . ')';
+            $str .= str_repeat(' ', $ident).')';
         } else if (is_array($obj)) {
             $ident += 4;
             $str .= 'array(';
             $some = false;
 
             foreach ($obj as $k => $v) {
-                $str .= PHP_EOL . str_repeat(' ', $ident) . '"'
-                      . $k . '" => ' . $this->dump($v) . ',';
+                $str .= PHP_EOL.str_repeat(' ', $ident).'"'
+                      . $k.'" => '.$this->dump($v).',';
                 $some = true;
             }
 
             $ident -= 4;
-            $str .= ($some ? PHP_EOL . str_repeat(' ', $ident) : '') . ')';
+            $str .= ($some ? PHP_EOL.str_repeat(' ', $ident) : '').')';
         } else if (is_object($obj)) {
-            $str .= 'instanceof(' . get_class($obj) . ')';
+            $str .= 'instanceof('.get_class($obj).')';
         } else {
             $str .= var_export($obj, true);
         }