doctrine / orm

lib/Doctrine/ORM/OptimisticLockException.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,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);
     }
 
     /**
@@ -85,6 +85,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/Persisters/Entity/AbstractEntityInheritancePersister.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
         $tableAlias  = $alias == 'r' ? '' : $alias;
         $columnName  = $class->columnNames[$field];
         $columnAlias = $this->getSQLColumnAlias($columnName);
-        $sql         = $this->getSQLTableAlias($class->name, $tableAlias) . '.'
+        $sql         = $this->getSQLTableAlias($class->name, $tableAlias).'.'
                             . $this->quoteStrategy->getColumnName($field, $class, $this->platform);
 
         $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field, $class->name);
@@ -73,7 +73,7 @@ 
             $sql    = $type->convertToPHPValueSQL($sql, $this->platform);
         }
 
-        return $sql . ' AS ' . $columnAlias;
+        return $sql.' AS '.$columnAlias;
     }
 
     /**
@@ -90,6 +90,6 @@ 
 
         $this->currentPersisterContext->rsm->addMetaResult('r', $columnAlias, $joinColumnName, false, $type);
 
-        return $tableAlias . '.' . $joinColumnName . ' AS ' . $columnAlias;
+        return $tableAlias.'.'.$joinColumnName.' AS '.$columnAlias;
     }
 }

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'];
         $columnList[]   = $tableAlias . '.' . $discrColumn;
 

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
 
          // Append discriminator column
         $discrColumn    = $this->class->discriminatorColumn['name'];
-        $columnList[]   = $tableAlias . '.' . $discrColumn;
+        $columnList[]   = $tableAlias.'.'.$discrColumn;
 
         $resultColumnName = $this->platform->getSQLResultCasing($discrColumn);
 
@@ -88,7 +88,7 @@ 
                 }
 
                 foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
-                    $className      = isset($assoc['inherited']) ? $assoc['inherited'] : $this->class->name;
+                    $className = isset($assoc['inherited']) ? $assoc['inherited'] : $this->class->name;
 
                     $targetClass = $this->em->getClassMetadata($assoc['targetEntity']);
 
@@ -143,7 +143,7 @@ 
             $conditionSql .= ' AND ';
         }
 
-        return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL();
+        return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL();
     }
 
     /**
@@ -157,7 +157,7 @@ 
             $conditionSql .= ' AND ';
         }
 
-        return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL();
+        return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL();
     }
 
     /**
@@ -181,7 +181,7 @@ 
         $discColumn = $this->class->discriminatorColumn['name'];
         $tableAlias = $this->getSQLTableAlias($this->class->name);
 
-        return $tableAlias . '.' . $discColumn . ' IN (' . $values . ')';
+        return $tableAlias.'.'.$discColumn.' IN ('.$values.')';
     }
 
     /**

lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php

Spacing +7 added lines, -7 removed lines

@@ -75,8 +75,8 @@ 
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 't0', $primaryDqlAlias);
 
-        $this->_insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ')'
-                . ' SELECT t0.' . implode(', t0.', $idColumnNames);
+        $this->_insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnList.')'
+                . ' SELECT t0.'.implode(', t0.', $idColumnNames);
 
         $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $primaryDqlAlias);
         $fromClause = new AST\FromClause(array(new AST\IdentificationVariableDeclaration($rangeDecl, null, array())));
@@ -88,14 +88,14 @@ 
         }
 
         // 2. Create ID subselect statement used in DELETE ... WHERE ... IN (subselect)
-        $idSubselect = 'SELECT ' . $idColumnList . ' FROM ' . $tempTable;
+        $idSubselect = 'SELECT '.$idColumnList.' FROM '.$tempTable;
 
         // 3. Create and store DELETE statements
         $classNames = array_merge($primaryClass->parentClasses, array($primaryClass->name), $primaryClass->subClasses);
         foreach (array_reverse($classNames) as $className) {
             $tableName = $quoteStrategy->getTableName($em->getClassMetadata($className), $platform);
-            $this->_sqlStatements[] = 'DELETE FROM ' . $tableName
-                    . ' WHERE (' . $idColumnList . ') IN (' . $idSubselect . ')';
+            $this->_sqlStatements[] = 'DELETE FROM '.$tableName
+                    . ' WHERE ('.$idColumnList.') IN ('.$idSubselect.')';
         }
 
         // 4. Store DDL for temporary identifier table.
@@ -106,8 +106,8 @@ 
                 'type' => \Doctrine\DBAL\Types\Type::getType($rootClass->getTypeOfColumn($idColumnName))
             );
         }
-        $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
         $this->_dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
     }
 

lib/Doctrine/ORM/Query/Lexer.php

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 
             // Recognize identifiers
             case (ctype_alpha($value[0]) || $value[0] === '_'):
-                $name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value);
+                $name = 'Doctrine\ORM\Query\Lexer::T_'.strtoupper($value);
 
                 if (defined($name)) {
                     $type = constant($name);

lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php

Spacing +13 added lines, -13 removed lines

@@ -202,7 +202,7 @@ 
     {
         switch ($mode) {
             case self::COLUMN_RENAMING_INCREMENT:
-                return $columnName . $this->sqlCounter++;
+                return $columnName.$this->sqlCounter++;
 
             case self::COLUMN_RENAMING_CUSTOM:
                 return isset($customRenameColumns[$columnName])
@@ -290,7 +290,7 @@ 
         }
 
         foreach ($classMetadata->getColumnNames() as $key => $columnName) {
-            $propertyName   = $classMetadata->getFieldName($columnName);
+            $propertyName = $classMetadata->getFieldName($columnName);
             $this->addFieldResult($alias, $columnName, $propertyName);
         }
 
@@ -319,19 +319,19 @@ 
         $counter        = 0;
         $resultMapping  = $class->getSqlResultSetMapping($resultSetMappingName);
         $rooShortName   = $class->reflClass->getShortName();
-        $rootAlias      = strtolower($rooShortName[0]) . $counter;
+        $rootAlias      = strtolower($rooShortName[0]).$counter;
 
 
         if (isset($resultMapping['entities'])) {
             foreach ($resultMapping['entities'] as $key => $entityMapping) {
-                $classMetadata  = $this->em->getClassMetadata($entityMapping['entityClass']);
+                $classMetadata = $this->em->getClassMetadata($entityMapping['entityClass']);
 
                 if ($class->reflClass->name == $classMetadata->reflClass->name) {
                     $this->addEntityResult($classMetadata->name, $rootAlias);
                     $this->addNamedNativeQueryEntityResultMapping($classMetadata, $entityMapping, $rootAlias);
                 } else {
                     $shortName      = $classMetadata->reflClass->getShortName();
-                    $joinAlias      = strtolower($shortName[0]) . ++ $counter;
+                    $joinAlias      = strtolower($shortName[0]).++ $counter;
                     $associations   = $class->getAssociationsByTargetClass($classMetadata->name);
 
                     foreach ($associations as $relation => $mapping) {
@@ -371,28 +371,28 @@ 
             $this->addMetaResult($alias, $discriminatorColumn, $discriminatorColumn);
         }
 
-        if (isset($entityMapping['fields']) && !empty($entityMapping['fields'])) {
+        if (isset($entityMapping['fields']) && ! empty($entityMapping['fields'])) {
             foreach ($entityMapping['fields'] as $field) {
                 $fieldName = $field['name'];
                 $relation  = null;
 
-                if(strpos($fieldName, '.')){
+                if (strpos($fieldName, '.')) {
                     list($relation, $fieldName) = explode('.', $fieldName);
                 }
 
                 if (isset($classMetadata->associationMappings[$relation])) {
-                    if($relation) {
+                    if ($relation) {
                         $associationMapping = $classMetadata->associationMappings[$relation];
                         $joinAlias          = $alias.$relation;
                         $parentAlias        = $alias;
 
                         $this->addJoinedEntityResult($associationMapping['targetEntity'], $joinAlias, $parentAlias, $relation);
                         $this->addFieldResult($joinAlias, $field['column'], $fieldName);
-                    }else {
+                    } else {
                         $this->addFieldResult($alias, $field['column'], $fieldName, $classMetadata->name);
                     }
                 } else {
-                    if(!isset($classMetadata->fieldMappings[$fieldName])) {
+                    if ( ! isset($classMetadata->fieldMappings[$fieldName])) {
                         throw new \InvalidArgumentException("Entity '".$classMetadata->name."' has no field '".$fieldName."'. ");
                     }
                     $this->addFieldResult($alias, $field['column'], $fieldName, $classMetadata->name);
@@ -401,7 +401,7 @@ 
 
         } else {
             foreach ($classMetadata->getColumnNames() as $columnName) {
-                $propertyName   = $classMetadata->getFieldName($columnName);
+                $propertyName = $classMetadata->getFieldName($columnName);
                 $this->addFieldResult($alias, $columnName, $propertyName);
             }
         }
@@ -431,7 +431,7 @@ 
                 $sql .= ", ";
             }
 
-            $sql .= $tableAlias . ".";
+            $sql .= $tableAlias.".";
 
             if (isset($this->fieldMappings[$columnName])) {
                 $class = $this->em->getClassMetadata($this->declaringClasses[$columnName]);
@@ -442,7 +442,7 @@ 
                 $sql .= $this->discriminatorColumns[$dqlAlias];
             }
 
-            $sql .= " AS " . $columnName;
+            $sql .= " AS ".$columnName;
         }
 
         return $sql;

Braces +1 added lines, -1 removed lines

@@ -388,7 +388,7 @@
 
                         $this->addJoinedEntityResult($associationMapping['targetEntity'], $joinAlias, $parentAlias, $relation);
                         $this->addFieldResult($joinAlias, $field['column'], $fieldName);
-                    }else {
+                    } else {
                         $this->addFieldResult($alias, $field['column'], $fieldName, $classMetadata->name);
                     }
                 } else {

lib/Doctrine/ORM/Query/QueryException.php

Spacing +13 added lines, -13 removed lines

@@ -49,7 +49,7 @@ 
      */
     public static function syntaxError($message, $previous = null)
     {
-        return new self('[Syntax Error] ' . $message, 0, $previous);
+        return new self('[Syntax Error] '.$message, 0, $previous);
     }
 
     /**
@@ -60,7 +60,7 @@ 
      */
     public static function semanticalError($message, $previous = null)
     {
-        return new self('[Semantical Error] ' . $message, 0, $previous);
+        return new self('[Semantical Error] '.$message, 0, $previous);
     }
 
     /**
@@ -79,7 +79,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.');
     }
 
     /**
@@ -89,7 +89,7 @@ 
      */
     public static function invalidParameterPosition($pos)
     {
-        return new self('Invalid parameter position: ' . $pos);
+        return new self('Invalid parameter position: '.$pos);
     }
 
     /**
@@ -100,7 +100,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);
     }
 
     /**
@@ -111,7 +111,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);
     }
 
     /**
@@ -150,7 +150,7 @@ 
     public static function invalidPathExpression($pathExpr)
     {
         return new self(
-            "Invalid PathExpression '" . $pathExpr->identificationVariable . "." . $pathExpr->field . "'."
+            "Invalid PathExpression '".$pathExpr->identificationVariable.".".$pathExpr->field."'."
         );
     }
 
@@ -183,8 +183,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."
         );
     }
@@ -222,8 +222,8 @@ 
     public static function iterateWithFetchJoinNotAllowed($assoc)
     {
         return new self(
-            "Iterate with fetch join in class " . $assoc['sourceEntity'] .
-            " using association " . $assoc['fieldName'] . " not allowed."
+            "Iterate with fetch join in class ".$assoc['sourceEntity'].
+            " using association ".$assoc['fieldName']." not allowed."
         );
     }
 
@@ -247,7 +247,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.");
     }
 
@@ -259,7 +259,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/Query/AST/Functions/IdentityFunction.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 
             foreach ($assoc['joinColumns'] as $mapping) {
 
-                if($mapping['referencedColumnName'] === $field['columnName']) {
+                if ($mapping['referencedColumnName'] === $field['columnName']) {
                     $joinColumn = $mapping;
 
                     break;
@@ -86,9 +86,9 @@ 
         $tableName = $sqlWalker->getEntityManager()->getClassMetadata($assoc['sourceEntity'])->getTableName();
 
         $tableAlias = $sqlWalker->getSQLTableAlias($tableName, $dqlAlias);
-        $columnName  = $quoteStrategy->getJoinColumnName($joinColumn, $targetEntity, $platform);
+        $columnName = $quoteStrategy->getJoinColumnName($joinColumn, $targetEntity, $platform);
 
-        return $tableAlias . '.' . $columnName;
+        return $tableAlias.'.'.$columnName;
     }
 
     /**

lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
         return $sqlWalker->getConnection()->getDatabasePlatform()->getUpperExpression(
-               $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary)
+                $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary)
         );
     }