doctrine / orm

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

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
             $sql    = $type->convertToPHPValueSQL($sql, $this->platform);
         }
 
-        return $sql . ' AS ' . $columnAlias;
+        return $sql.' AS '.$columnAlias;
     }
 
     /**
@@ -93,6 +93,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/JoinedSubclassPersister.php

Spacing +19 added lines, -19 removed lines

@@ -208,7 +208,7 @@ 
                 }
 
                 foreach ($data as $columnName => $value) {
-                    if (!is_array($id) || !isset($id[$columnName])) {
+                    if ( ! is_array($id) || ! isset($id[$columnName])) {
                         $stmt->bindValue($paramIndex++, $value, $this->columnTypes[$columnName]);
                     }
                 }
@@ -323,7 +323,7 @@ 
         // If the current class in the root entity, add the filters
         if ($filterSql = $this->generateFilterConditionSQL($this->em->getClassMetadata($this->class->rootEntityName), $this->getSQLTableAlias($this->class->rootEntityName))) {
             $conditionSql .= $conditionSql
-                ? ' AND ' . $filterSql
+                ? ' AND '.$filterSql
                 : $filterSql;
         }
 
@@ -342,29 +342,29 @@ 
         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;
         }
 
         $tableName  = $this->quoteStrategy->getTableName($this->class, $this->platform);
-        $from       = ' FROM ' . $tableName . ' ' . $baseTableAlias;
-        $where      = $conditionSql != '' ? ' WHERE ' . $conditionSql : '';
+        $from       = ' FROM '.$tableName.' '.$baseTableAlias;
+        $where      = $conditionSql != '' ? ' WHERE '.$conditionSql : '';
         $lock       = $this->platform->appendLockHint($from, $lockMode);
         $columnList = $this->getSelectColumnsSQL();
-        $query      = 'SELECT '  . $columnList
+        $query      = 'SELECT '.$columnList
                     . $lock
                     . $joinSql
                     . $where
                     . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -384,14 +384,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . 'FROM '.$tableName.' '.$baseTableAlias
             . $joinSql
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -410,16 +410,16 @@ 
             $conditions     = array();
             $tableAlias     = $this->getSQLTableAlias($parentClassName);
             $parentClass    = $this->em->getClassMetadata($parentClassName);
-            $joinSql       .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql       .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
         }
 
-        return parent::getLockTablesSql($lockMode) . $joinSql;
+        return parent::getLockTablesSql($lockMode).$joinSql;
     }
 
     /**
@@ -488,7 +488,7 @@ 
             ? $baseTableAlias
             : $this->getSQLTableAlias($this->class->rootEntityName);
 
-        $columnList[] = $tableAlias . '.' . $discrColumn;
+        $columnList[] = $tableAlias.'.'.$discrColumn;
 
         // sub tables
         foreach ($this->class->subClasses as $subClassName) {
@@ -603,11 +603,11 @@ 
             $conditions   = array();
             $parentClass  = $this->em->getClassMetadata($parentClassName);
             $tableAlias   = $this->getSQLTableAlias($parentClassName);
-            $joinSql     .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql     .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
@@ -618,10 +618,10 @@ 
             $conditions  = array();
             $subClass    = $this->em->getClassMetadata($subClassName);
             $tableAlias  = $this->getSQLTableAlias($subClassName);
-            $joinSql    .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql    .= ' LEFT JOIN '.$this->quoteStrategy->getTableName($subClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);

Unused Use Statements -2 removed lines

@@ -3,12 +3,10 @@
 namespace Doctrine\Tests\ORM\Cache\Persister\Entity;
 
 use Doctrine\Tests\OrmTestCase;
-
 use Doctrine\ORM\Cache\Region;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
-
 use Doctrine\Tests\Models\Cache\Country;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\ArrayCollection;

lib/Doctrine/ORM/Configuration.php

Spacing +1 added lines, -1 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -918,7 +918,7 @@
      * @since 2.5
      *
      * @param string $name  The name of the hint.
-     * @param mixed  $value The value of the hint.
+     * @param string  $value The value of the hint.
      */
     public function setDefaultQueryHint($name, $value)
     {

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

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