doctrine / orm

tools/sandbox/index.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 use Entities\Address;
 use Entities\User;
 
-$em = require_once __DIR__ . '/bootstrap.php';
+$em = require_once __DIR__.'/bootstrap.php';
 
 ## PUT YOUR TEST CODE BELOW
 
 $user = new User;
 $address = new Address;
 
-echo 'Hello World!' . PHP_EOL;
+echo 'Hello World!'.PHP_EOL;

tools/sandbox/bootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -5,8 +5,8 @@ 
 
 // Path to composer autoloader. You can use different provided by your favorite framework,
 // if you want to.
-$loaderPath = __DIR__ . '/../../vendor/autoload.php';
-if(!is_readable($loaderPath)){
+$loaderPath = __DIR__.'/../../vendor/autoload.php';
+if ( ! is_readable($loaderPath)) {
     throw new LogicException('Run php composer.phar install at first');
 }
 $loader = require $loaderPath;
@@ -19,7 +19,7 @@ 
 $config = new \Doctrine\ORM\Configuration();
 
 // Set up Metadata Drivers
-$driverImpl = $config->newDefaultAnnotationDriver(array(__DIR__ . "/Entities"));
+$driverImpl = $config->newDefaultAnnotationDriver(array(__DIR__."/Entities"));
 $config->setMetadataDriverImpl($driverImpl);
 
 // Set up caches, depending on $debug variable.
@@ -29,7 +29,7 @@ 
 $config->setQueryCacheImpl($cache);
 
 // Proxy configuration
-$config->setProxyDir(__DIR__ . '/Proxies');
+$config->setProxyDir(__DIR__.'/Proxies');
 $config->setProxyNamespace('Proxies');
 
 // Database connection information

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

Spacing +9 added lines, -9 removed lines

@@ -218,8 +218,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);
     }
@@ -256,18 +256,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);
 
@@ -276,8 +276,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/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.