doctrine / orm

lib/Doctrine/ORM/Query/Parser.php

Spacing +12 added lines, -12 removed lines

@@ -487,7 +487,7 @@ 
         $tokenStr = substr($dql, $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError($message, QueryException::dqlError($this->query->getDQL()));
     }
@@ -634,7 +634,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn       = $namespace . '\\' . $className;
+                $fqcn       = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className  = $fqcn;
@@ -686,13 +686,13 @@ 
                 }
 
                 $this->semanticalError(
-                    "There is no mapped field named '$field' on class " . $class->name . ".", $deferredItem['token']
+                    "There is no mapped field named '$field' on class ".$class->name.".", $deferredItem['token']
                 );
             }
 
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
                 $this->semanticalError(
-                    "The partial field selection of class " . $class->name . " must contain the identifier.",
+                    "The partial field selection of class ".$class->name." must contain the identifier.",
                     $deferredItem['token']
                 );
             }
@@ -761,7 +761,7 @@ 
             // Check if field or association exists
             if ( ! isset($class->associationMappings[$field]) && ! isset($class->fieldMappings[$field])) {
                 $this->semanticalError(
-                    'Class ' . $class->name . ' has no field or association named ' . $field,
+                    'Class '.$class->name.' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -801,8 +801,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= (count($expectedStringTypes) == 1)
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -976,7 +976,7 @@ 
 
         [$namespaceAlias, $simpleClassName] = explode(':', $this->lexer->token['value']);
 
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
     }
 
     /**
@@ -988,7 +988,7 @@ 
      */
     private function validateAbstractSchemaName($schemaName)
     {
-        if (! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
+        if ( ! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
             $this->semanticalError("Class '$schemaName' is not defined.", $this->lexer->token);
         }
     }
@@ -1044,7 +1044,7 @@ 
 
         if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1058,7 +1058,7 @@ 
         $class = $qComp['metadata'];
 
         if ( ! $class->hasAssociation($field)) {
-            $this->semanticalError('Class ' . $class->name . ' has no association named ' . $field);
+            $this->semanticalError('Class '.$class->name.' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2587,7 +2587,7 @@ 
             return $this->NullComparisonExpression();
         }
 
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
             return $this->EmptyCollectionComparisonExpression();
         }
 

lib/Doctrine/ORM/PersistentCollection.php

Spacing +4 added lines, -4 removed lines

@@ -401,7 +401,7 @@ 
      */
     public function containsKey($key)
     {
-        if (! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
+        if ( ! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
 
@@ -434,7 +434,7 @@ 
             && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])
         ) {
-            if (!$this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
+            if ( ! $this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
                 return $this->em->find($this->typeClass->name, $key);
             }
 
@@ -449,7 +449,7 @@ 
      */
     public function count()
     {
-        if (! $this->initialized && $this->association !== null && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY) {
+        if ( ! $this->initialized && $this->association !== null && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
 
             return $persister->count($this) + ($this->isDirty ? $this->collection->count() : 0);
@@ -567,7 +567,7 @@ 
         if ($this->association['isOwningSide'] && $this->owner) {
             $this->changed();
 
-            if (! $this->em->getClassMetadata(get_class($this->owner))->isChangeTrackingDeferredExplicit()) {
+            if ( ! $this->em->getClassMetadata(get_class($this->owner))->isChangeTrackingDeferredExplicit()) {
                 $uow->scheduleCollectionDeletion($this);
             }
 

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php

Spacing +10 added lines, -10 removed lines

@@ -108,15 +108,15 @@ 
     {
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
 
-        $metadataDriver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Global/']);
+        $metadataDriver = $this->createAnnotationDriver([__DIR__.'/../../Models/Global/']);
 
         $entityManager = $this->_createEntityManager($metadataDriver);
 
         $mf = $entityManager->getMetadataFactory();
         $m1 = $mf->getMetadataFor(DoctrineGlobal_Article::class);
         $h1 = $mf->hasMetadataFor(DoctrineGlobal_Article::class);
-        $h2 = $mf->hasMetadataFor('\\' . DoctrineGlobal_Article::class);
-        $m2 = $mf->getMetadataFor('\\' . DoctrineGlobal_Article::class);
+        $h2 = $mf->hasMetadataFor('\\'.DoctrineGlobal_Article::class);
+        $m2 = $mf->getMetadataFor('\\'.DoctrineGlobal_Article::class);
 
         $this->assertNotSame($m1, $m2);
         $this->assertFalse($h2);
@@ -173,7 +173,7 @@ 
         self::markTestSkipped('This test is just incorrect and must be fixed');
 
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/JoinedInheritanceType/']);
         $em = $this->_createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -213,7 +213,7 @@ 
     {
         // DDC-3551
         $conn = $this->createMock(Connection::class);
-        $mockDriver    = new MetadataDriverMock();
+        $mockDriver = new MetadataDriverMock();
         $em = $this->_createEntityManager($mockDriver, $conn);
 
         $conn->expects($this->any())
@@ -233,10 +233,10 @@ 
     {
         $driverMock = new DriverMock();
         $config = new Configuration();
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $eventManager = new EventManager();
-        if (!$conn) {
+        if ( ! $conn) {
             $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
         }
         $config->setMetadataDriverImpl($metadataDriver);
@@ -290,7 +290,7 @@ 
     public function testQuoteMetadata()
     {
         $cmf    = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Quote/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/Quote/']);
         $em     = $this->_createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -385,7 +385,7 @@ 
         $listener
             ->expects($this->any())
             ->method('onClassMetadataNotFound')
-            ->will($this->returnCallback(function (OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) {
+            ->will($this->returnCallback(function(OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) {
                 $test->assertNull($args->getFoundMetadata());
                 $test->assertSame('Foo', $args->getClassName());
                 $test->assertSame($em, $args->getObjectManager());
@@ -445,7 +445,7 @@ 
     public function testInheritsIdGeneratorMappingFromEmbeddable()
     {
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/DDC4006/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/DDC4006/']);
         $em = $this->_createEntityManager($driver);
         $cmf->setEntityManager($em);
 

tests/Doctrine/Tests/ORM/Functional/Ticket/GH7820Test.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
     {
         parent::setUp();
 
-        if (! Type::hasType(GH7820LineTextType::class)) {
+        if ( ! Type::hasType(GH7820LineTextType::class)) {
             Type::addType(GH7820LineTextType::class, GH7820LineTextType::class);
         }
 
@@ -68,7 +68,7 @@ 
 
         self::assertSame(
             self::SONG,
-            array_map(static function (GH7820Line $line) : string {
+            array_map(static function(GH7820Line $line) : string {
                 return $line->toString();
             }, iterator_to_array(new Paginator($query)))
         );
@@ -125,7 +125,7 @@ 
 
     public function __toString() : string
     {
-        return 'Line: ' . $this->text;
+        return 'Line: '.$this->text;
     }
 }
 
@@ -135,7 +135,7 @@ 
     {
         $text = parent::convertToPHPValue($value, $platform);
 
-        if (! is_string($text)) {
+        if ( ! is_string($text)) {
             return $text;
         }
 
@@ -144,7 +144,7 @@ 
 
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        if (! $value instanceof GH7820LineText) {
+        if ( ! $value instanceof GH7820LineText) {
             return parent::convertToDatabaseValue($value, $platform);
         }
 

tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
     {
         parent::setUp();
 
-        if (! Type::hasType('rot13')) {
+        if ( ! Type::hasType('rot13')) {
             Type::addType('rot13', Rot13Type::class);
         }
     }
@@ -188,7 +188,7 @@ 
      */
     public function testWhereInQueryWithArbitraryJoin_NoWhere()
     {
-        $whereInQuery  = $this->entityManager->createQuery(
+        $whereInQuery = $this->entityManager->createQuery(
             'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c'
         );
         $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]);
@@ -227,7 +227,7 @@ 
     public function testWillReplaceBoundQueryIdentifiersWithConvertedTypesAsPerIdentifierMapping() : void
     {
         $whereInQuery = $this->entityManager->createQuery(
-            'SELECT e.id4 FROM ' . AuxiliaryEntity::class . ' e'
+            'SELECT e.id4 FROM '.AuxiliaryEntity::class.' e'
         );
         $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 3);
@@ -242,7 +242,7 @@ 
     public function testWillReplaceBoundQueryIdentifiersWithConvertedTypesAsPerAssociatedEntityIdentifierMapping() : void
     {
         $whereInQuery = $this->entityManager->createQuery(
-            'SELECT e FROM ' . OwningManyToOneIdForeignKeyEntity::class . ' e'
+            'SELECT e FROM '.OwningManyToOneIdForeignKeyEntity::class.' e'
         );
         $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 3);

lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php

Spacing +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
                 [$pathExpression]
             );
             $expression = new InExpression($arithmeticExpression);
-            $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS);
+            $expression->literals[] = new InputParameter(":".self::PAGINATOR_ID_ALIAS);
 
             $this->convertWhereInIdentifiersToDatabaseValue(
                 PersisterHelper::getTypeOfField(
@@ -177,7 +177,7 @@ 
             ->getEntityManager()
             ->getConnection();
 
-        $query->setParameter(self::PAGINATOR_ID_ALIAS, array_map(static function ($id) use ($connection, $type) {
+        $query->setParameter(self::PAGINATOR_ID_ALIAS, array_map(static function($id) use ($connection, $type) {
             return $connection->convertToDatabaseValue($id, $type);
         }, $identifiers));
     }

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

Spacing +63 added lines, -63 removed lines

@@ -344,9 +344,9 @@ 
         $columnName   = $this->quoteStrategy->getColumnName($versionField, $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).' = ?';
 
 
         $flatId = $this->identifierFlattener->flattenIdentifier($versionedClass, $id);
@@ -439,7 +439,7 @@ 
             }
 
             $params[]   = $value;
-            $set[]      = $column . ' = ' . $placeholder;
+            $set[]      = $column.' = '.$placeholder;
             $types[]    = $this->columnTypes[$columnName];
         }
 
@@ -485,18 +485,18 @@ 
                 case Type::SMALLINT:
                 case Type::INTEGER:
                 case Type::BIGINT:
-                    $set[] = $versionColumn . ' = ' . $versionColumn . ' + 1';
+                    $set[] = $versionColumn.' = '.$versionColumn.' + 1';
                     break;
 
                 case Type::DATETIME:
-                    $set[] = $versionColumn . ' = CURRENT_TIMESTAMP';
+                    $set[] = $versionColumn.' = 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);
 
@@ -539,7 +539,7 @@ 
 
 
             if ($selfReferential) {
-                $otherColumns = (! $mapping['isOwningSide'])
+                $otherColumns = ( ! $mapping['isOwningSide'])
                     ? $association['joinTable']['joinColumns']
                     : $association['joinTable']['inverseJoinColumns'];
             }
@@ -1021,7 +1021,7 @@ 
                     );
             }
 
-            $criteria[$quotedJoinTable . '.' . $quotedKeyColumn] = $value;
+            $criteria[$quotedJoinTable.'.'.$quotedKeyColumn] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $field,
@@ -1064,11 +1064,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;
         }
 
@@ -1079,14 +1079,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
@@ -1094,7 +1094,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -1113,13 +1113,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;
     }
@@ -1152,7 +1152,7 @@ 
                     : $baseTableAlias;
 
                 $columnName    = $this->quoteStrategy->getColumnName($fieldName, $this->class, $this->platform);
-                $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
 
                 continue;
             }
@@ -1169,7 +1169,7 @@ 
 
                 foreach ($this->class->associationMappings[$fieldName]['joinColumns'] as $joinColumn) {
                     $columnName    = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
-                    $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
                 }
 
                 continue;
@@ -1178,7 +1178,7 @@ 
             throw ORMException::unrecognizedField($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1206,8 +1206,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);
@@ -1233,7 +1233,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) {
@@ -1266,14 +1266,14 @@ 
             $joinTableName  = $this->quoteStrategy->getTableName($eagerEntity, $this->platform);
 
             if ($assoc['isOwningSide']) {
-                $tableAlias           = $this->getSQLTableAlias($association['targetEntity'], $assocAlias);
-                $this->currentPersisterContext->selectJoinSql .= ' ' . $this->getJoinSQLForJoinColumns($association['joinColumns']);
+                $tableAlias = $this->getSQLTableAlias($association['targetEntity'], $assocAlias);
+                $this->currentPersisterContext->selectJoinSql .= ' '.$this->getJoinSQLForJoinColumns($association['joinColumns']);
 
                 foreach ($association['joinColumns'] as $joinColumn) {
                     $sourceCol       = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
                     $targetCol       = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $this->class, $this->platform);
                     $joinCondition[] = $this->getSQLTableAlias($association['sourceEntity'])
-                                        . '.' . $sourceCol . ' = ' . $tableAlias . '.' . $targetCol;
+                                        . '.'.$sourceCol.' = '.$tableAlias.'.'.$targetCol;
                 }
 
                 // Add filter SQL
@@ -1289,12 +1289,12 @@ 
                     $sourceCol       = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
                     $targetCol       = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $this->class, $this->platform);
 
-                    $joinCondition[] = $this->getSQLTableAlias($association['sourceEntity'], $assocAlias) . '.' . $sourceCol . ' = '
-                        . $this->getSQLTableAlias($association['targetEntity']) . '.' . $targetCol;
+                    $joinCondition[] = $this->getSQLTableAlias($association['sourceEntity'], $assocAlias).'.'.$sourceCol.' = '
+                        . $this->getSQLTableAlias($association['targetEntity']).'.'.$targetCol;
                 }
             }
 
-            $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
+            $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
             $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
         }
 
@@ -1315,7 +1315,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 '';
         }
 
@@ -1364,10 +1364,10 @@ 
         foreach ($joinColumns as $joinColumn) {
             $quotedSourceColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
             $quotedTargetColumn = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $this->class, $this->platform);
-            $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);
     }
 
     /**
@@ -1446,7 +1446,7 @@ 
                 continue;
             }
 
-            if (! $this->class->isIdGeneratorIdentity() || $this->class->identifier[0] != $name) {
+            if ( ! $this->class->isIdGeneratorIdentity() || $this->class->identifier[0] != $name) {
                 $columns[]                = $this->quoteStrategy->getColumnName($name, $this->class, $this->platform);
                 $this->columnTypes[$name] = $this->class->fieldMappings[$name]['type'];
             }
@@ -1467,7 +1467,7 @@ 
      */
     protected function getSelectColumnSQL($field, ClassMetadata $class, $alias = 'r')
     {
-        $root         = $alias == 'r' ? '' : $alias ;
+        $root         = $alias == 'r' ? '' : $alias;
         $tableAlias   = $this->getSQLTableAlias($class->name, $root);
         $fieldMapping = $class->fieldMappings[$field];
         $sql          = sprintf('%s.%s', $tableAlias, $this->quoteStrategy->getColumnName($field, $class, $this->platform));
@@ -1480,7 +1480,7 @@ 
             $sql  = $type->convertToPHPValueSQL($sql, $this->platform);
         }
 
-        return $sql . ' AS ' . $columnAlias;
+        return $sql.' AS '.$columnAlias;
     }
 
     /**
@@ -1496,14 +1496,14 @@ 
     protected function getSQLTableAlias($className, $assocName = '')
     {
         if ($assocName) {
-            $className .= '#' . $assocName;
+            $className .= '#'.$assocName;
         }
 
         if (isset($this->currentPersisterContext->sqlTableAliases[$className])) {
             return $this->currentPersisterContext->sqlTableAliases[$className];
         }
 
-        $tableAlias = 't' . $this->currentPersisterContext->sqlAliasCounter++;
+        $tableAlias = 't'.$this->currentPersisterContext->sqlAliasCounter++;
 
         $this->currentPersisterContext->sqlTableAliases[$className] = $tableAlias;
 
@@ -1530,7 +1530,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql = 'SELECT 1 '
              . $lock
              . $where
@@ -1552,7 +1552,7 @@ 
     {
         return $this->platform->appendLockHint(
             'FROM '
-            . $this->quoteStrategy->getTableName($this->class, $this->platform) . ' '
+            . $this->quoteStrategy->getTableName($this->class, $this->platform).' '
             . $this->getSQLTableAlias($this->class->name),
             $lockMode
         );
@@ -1604,19 +1604,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;
             }
@@ -1664,7 +1664,7 @@ 
                 ? $this->class->fieldMappings[$field]['inherited']
                 : $this->class->name;
 
-            return [$this->getSQLTableAlias($className) . '.' . $this->quoteStrategy->getColumnName($field, $this->class, $this->platform)];
+            return [$this->getSQLTableAlias($className).'.'.$this->quoteStrategy->getColumnName($field, $this->class, $this->platform)];
         }
 
         if (isset($this->class->associationMappings[$field])) {
@@ -1685,7 +1685,7 @@ 
 
 
                 foreach ($joinColumns as $joinColumn) {
-                    $columns[] = $joinTableName . '.' . $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
+                    $columns[] = $joinTableName.'.'.$this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
                 }
 
             } else {
@@ -1693,12 +1693,12 @@ 
                     throw ORMException::invalidFindByInverseAssociation($this->class->name, $field);
                 }
 
-                $className  = (isset($association['inherited']))
+                $className = (isset($association['inherited']))
                     ? $association['inherited']
                     : $this->class->name;
 
                 foreach ($association['joinColumns'] as $joinColumn) {
-                    $columns[] = $this->getSQLTableAlias($className) . '.' . $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
+                    $columns[] = $this->getSQLTableAlias($className).'.'.$this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
                 }
             }
             return $columns;
@@ -1790,7 +1790,7 @@ 
                     $value = $value[$this->em->getClassMetadata($sourceClass->associationMappings[$field]['targetEntity'])->identifier[0]];
                 }
 
-                $criteria[$tableAlias . "." . $targetKeyColumn] = $value;
+                $criteria[$tableAlias.".".$targetKeyColumn] = $value;
                 $parameters[]                                   = [
                     'value' => $value,
                     'field' => $field,
@@ -1803,7 +1803,7 @@ 
             $field = $sourceClass->fieldNames[$sourceKeyColumn];
             $value = $sourceClass->reflFields[$field]->getValue($sourceEntity);
 
-            $criteria[$tableAlias . "." . $targetKeyColumn] = $value;
+            $criteria[$tableAlias.".".$targetKeyColumn] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $field,
@@ -1891,7 +1891,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']);
                 }
@@ -1900,7 +1900,7 @@ 
                     ? $assoc['relationToTargetKeyColumns']
                     : $assoc['sourceToTargetKeyColumns'];
 
-                foreach ($columns as $column){
+                foreach ($columns as $column) {
                     $types[] = PersisterHelper::getTypeOfColumn($column, $class, $this->em);
                 }
                 break;
@@ -1911,7 +1911,7 @@ 
         }
 
         if (is_array($value)) {
-            return array_map(function ($type) {
+            return array_map(function($type) {
                 $type = Type::getType($type);
 
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
@@ -1987,12 +1987,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);
@@ -2000,7 +2000,7 @@ 
         }
 
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2047,13 +2047,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"
     }
 
     /**
@@ -2083,7 +2083,7 @@ 
         $entityManager = $this->em;
 
         return array_map(
-            static function ($fieldName) use ($class, $entityManager) : string {
+            static function($fieldName) use ($class, $entityManager) : string {
                 $types = PersisterHelper::getTypeOfField($fieldName, $class, $entityManager);
                 assert(isset($types[0]));
 

tests/Doctrine/Tests/ORM/Functional/GH5988Test.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     {
         parent::setUp();
 
-        if (! DBALType::hasType(GH5988CustomIdObjectHashType::class)) {
+        if ( ! DBALType::hasType(GH5988CustomIdObjectHashType::class)) {
             DBALType::addType(GH5988CustomIdObjectHashType::class, GH5988CustomIdObjectHashType::class);
         }
 
@@ -54,7 +54,7 @@ 
      */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        return $value->id . '_test';
+        return $value->id.'_test';
     }
     /**
      * {@inheritdoc}