doctrine / orm

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/OneToManyPersister.php

Indentation +3 added lines, -3 removed lines

@@ -147,9 +147,9 @@
         return (bool) $persister->count($criteria);
     }
 
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     public function contains(PersistentCollection $collection, $element)
     {
         if ( ! $this->isValidEntityState($element)) {

Spacing +9 added lines, -9 removed lines

@@ -217,8 +217,8 @@ 
             $parameters[] = $identifier[$sourceClass->getFieldForColumn($joinColumn['referencedColumnName'])];
         }
 
-        $statement = 'DELETE FROM ' . $this->quoteStrategy->getTableName($targetClass, $this->platform)
-            . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
+        $statement = 'DELETE FROM '.$this->quoteStrategy->getTableName($targetClass, $this->platform)
+            . ' WHERE '.implode(' = ? AND ', $columns).' = ?';
 
         return $this->conn->executeUpdate($statement, $parameters);
     }
@@ -255,18 +255,18 @@ 
             ];
         }
 
-        $statement = $this->platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable
-            . ' (' . $this->platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $statement = $this->platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable
+            . ' ('.$this->platform->getColumnDeclarationListSQL($columnDefinitions).')';
 
         $this->conn->executeUpdate($statement);
 
         // 2) Build insert table records into temporary table
         $query = $this->em->createQuery(
-            ' SELECT t0.' . implode(', t0.', $rootClass->getIdentifierFieldNames())
-            . ' FROM ' . $targetClass->name . ' t0 WHERE t0.' . $mapping['mappedBy'] . ' = :owner'
+            ' SELECT t0.'.implode(', t0.', $rootClass->getIdentifierFieldNames())
+            . ' FROM '.$targetClass->name.' t0 WHERE t0.'.$mapping['mappedBy'].' = :owner'
         )->setParameter('owner', $collection->getOwner());
 
-        $statement  = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ') ' . $query->getSQL();
+        $statement  = 'INSERT INTO '.$tempTable.' ('.$idColumnList.') '.$query->getSQL();
         $parameters = array_values($sourceClass->getIdentifierValues($collection->getOwner()));
         $numDeleted = $this->conn->executeUpdate($statement, $parameters);
 
@@ -275,8 +275,8 @@ 
 
         foreach (array_reverse($classNames) as $className) {
             $tableName = $this->quoteStrategy->getTableName($this->em->getClassMetadata($className), $this->platform);
-            $statement = 'DELETE FROM ' . $tableName . ' WHERE (' . $idColumnList . ')'
-                . ' IN (SELECT ' . $idColumnList . ' FROM ' . $tempTable . ')';
+            $statement = 'DELETE FROM '.$tableName.' WHERE ('.$idColumnList.')'
+                . ' IN (SELECT '.$idColumnList.' FROM '.$tempTable.')';
 
             $this->conn->executeUpdate($statement);
         }

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.')';
     }
 
     /**

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);
         }

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

Spacing +2 added lines, -2 removed lines

@@ -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/SizeFunction.php

Indentation +4 added lines, -4 removed lines

@@ -70,8 +70,8 @@ 
                 if ($first) $first = false; else $sql .= ' AND ';
 
                 $sql .= $targetTableAlias . '.' . $sourceColumn
-                      . ' = '
-                      . $sourceTableAlias . '.' . $quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
+                        . ' = '
+                        . $sourceTableAlias . '.' . $quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
             }
         } else { // many-to-many
             $targetClass = $sqlWalker->getEntityManager()->getClassMetadata($assoc['targetEntity']);
@@ -100,8 +100,8 @@ 
                 );
 
                 $sql .= $joinTableAlias . '.' . $joinColumn['name']
-                      . ' = '
-                      . $sourceTableAlias . '.' . $sourceColumnName;
+                        . ' = '
+                        . $sourceTableAlias . '.' . $sourceColumnName;
             }
         }
 

Spacing +7 added lines, -7 removed lines

@@ -60,7 +60,7 @@ 
             $targetTableAlias   = $sqlWalker->getSQLTableAlias($targetClass->getTableName());
             $sourceTableAlias   = $sqlWalker->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
-            $sql .= $quoteStrategy->getTableName($targetClass, $platform) . ' ' . $targetTableAlias . ' WHERE ';
+            $sql .= $quoteStrategy->getTableName($targetClass, $platform).' '.$targetTableAlias.' WHERE ';
 
             $owningAssoc = $targetClass->associationMappings[$assoc['mappedBy']];
 
@@ -69,9 +69,9 @@ 
             foreach ($owningAssoc['targetToSourceKeyColumns'] as $targetColumn => $sourceColumn) {
                 if ($first) $first = false; else $sql .= ' AND ';
 
-                $sql .= $targetTableAlias . '.' . $sourceColumn
+                $sql .= $targetTableAlias.'.'.$sourceColumn
                       . ' = '
-                      . $sourceTableAlias . '.' . $quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
+                      . $sourceTableAlias.'.'.$quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
             }
         } else { // many-to-many
             $targetClass = $sqlWalker->getEntityManager()->getClassMetadata($assoc['targetEntity']);
@@ -84,7 +84,7 @@ 
             $sourceTableAlias = $sqlWalker->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
             // join to target table
-            $sql .= $quoteStrategy->getJoinTableName($owningAssoc, $targetClass, $platform) . ' ' . $joinTableAlias . ' WHERE ';
+            $sql .= $quoteStrategy->getJoinTableName($owningAssoc, $targetClass, $platform).' '.$joinTableAlias.' WHERE ';
 
             $joinColumns = $assoc['isOwningSide']
                 ? $joinTable['joinColumns']
@@ -99,13 +99,13 @@ 
                     $class->fieldNames[$joinColumn['referencedColumnName']], $class, $platform
                 );
 
-                $sql .= $joinTableAlias . '.' . $joinColumn['name']
+                $sql .= $joinTableAlias.'.'.$joinColumn['name']
                       . ' = '
-                      . $sourceTableAlias . '.' . $sourceColumnName;
+                      . $sourceTableAlias.'.'.$sourceColumnName;
             }
         }
 
-        return '(' . $sql . ')';
+        return '('.$sql.')';
     }
 
     /**

Braces +10 added lines, -2 removed lines

@@ -67,7 +67,11 @@ 
             $first = true;
 
             foreach ($owningAssoc['targetToSourceKeyColumns'] as $targetColumn => $sourceColumn) {
-                if ($first) $first = false; else $sql .= ' AND ';
+                if ($first) {
+                    $first = false;
+                } else {
+                    $sql .= ' AND ';
+                }
 
                 $sql .= $targetTableAlias . '.' . $sourceColumn
                       . ' = '
@@ -93,7 +97,11 @@ 
             $first = true;
 
             foreach ($joinColumns as $joinColumn) {
-                if ($first) $first = false; else $sql .= ' AND ';
+                if ($first) {
+                    $first = false;
+                } else {
+                    $sql .= ' AND ';
+                }
 
                 $sourceColumnName = $quoteStrategy->getColumnName(
                     $class->fieldNames[$joinColumn['referencedColumnName']], $class, $platform

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

Spacing +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
      */
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'ABS(' . $sqlWalker->walkSimpleArithmeticExpression(
+        return 'ABS('.$sqlWalker->walkSimpleArithmeticExpression(
             $this->simpleArithmeticExpression
-        ) . ')';
+        ).')';
     }
 
     /**