doctrine / orm

lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php

Spacing +3 added lines, -3 removed lines

@@ -73,13 +73,13 @@
 
         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/SqlValueVisitor.php

Spacing +3 added lines, -3 removed lines

@@ -79,13 +79,13 @@
 
         switch ($comparison->getOperator()) {
             case Comparison::CONTAINS:
-                return '%' . $value . '%';
+                return '%'.$value.'%';
 
             case Comparison::STARTS_WITH:
-                return $value . '%';
+                return $value.'%';
 
             case Comparison::ENDS_WITH:
-                return '%' . $value;
+                return '%'.$value;
 
             default:
                 return $value;

lib/Doctrine/ORM/Persisters/Exception/InvalidOrientation.php

Spacing +1 added lines, -1 removed lines

@@ -10,6 +10,6 @@
 {
     public static function fromClassNameAndField(string $className, string $field) : self
     {
-        return new self('Invalid order by orientation specified for ' . $className . '#' . $field);
+        return new self('Invalid order by orientation specified for '.$className.'#'.$field);
     }
 }

lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php

Spacing +46 added lines, -46 removed lines

@@ -36,7 +36,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return; // ignore inverse side
         }
 
@@ -48,7 +48,7 @@ 
             /** @var JoinColumnMetadata $joinColumn */
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
             }
 
@@ -68,7 +68,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return; // ignore inverse side
         }
 
@@ -99,7 +99,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             throw new \BadMethodCallException('Selecting a collection by index is only supported on indexed collections.');
         }
 
@@ -146,7 +146,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $sourceClass, $this->em));
             }
 
@@ -178,9 +178,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);
     }
@@ -202,13 +202,13 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             throw new \BadMethodCallException('Selecting a collection by index is only supported on indexed collections.');
         }
 
         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);
     }
@@ -218,13 +218,13 @@ 
      */
     public function contains(PersistentCollection $collection, $element)
     {
-        if (! $this->isValidEntityState($element)) {
+        if ( ! $this->isValidEntityState($element)) {
             return false;
         }
 
         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);
     }
@@ -234,13 +234,13 @@ 
      */
     public function removeElement(PersistentCollection $collection, $element)
     {
-        if (! $this->isValidEntityState($element)) {
+        if ( ! $this->isValidEntityState($element)) {
             return false;
         }
 
         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);
     }
@@ -258,7 +258,7 @@ 
         $onConditions  = $this->getOnConditionSQL($association);
         $whereClauses  = $params = $types = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $association = $targetClass->getProperty($association->getMappedBy());
             $joinColumns = $association->getJoinTable()->getInverseJoinColumns();
         } else {
@@ -270,7 +270,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $ownerMetadata, $this->em));
             }
 
@@ -298,11 +298,11 @@ 
 
         $resultSetMapping->addRootEntityFromClassMetadata($targetClass->getClassName(), 'te');
 
-        $sql = 'SELECT ' . $resultSetMapping->generateSelectClause()
-            . ' FROM ' . $tableName . ' te'
-            . ' JOIN ' . $joinTableName . ' t ON'
+        $sql = 'SELECT '.$resultSetMapping->generateSelectClause()
+            . ' FROM '.$tableName.' te'
+            . ' JOIN '.$joinTableName.' t ON'
             . implode(' AND ', $onConditions)
-            . ' WHERE ' . implode(' AND ', $whereClauses);
+            . ' WHERE '.implode(' AND ', $whereClauses);
 
         $sql .= $this->getOrderingSql($criteria, $targetClass);
         $sql .= $this->getLimitSql($criteria);
@@ -337,8 +337,8 @@ 
 
         // A join is needed if there is filtering on the target entity
         $tableName = $rootClass->table->getQuotedQualifiedName($this->platform);
-        $joinSql   = ' JOIN ' . $tableName . ' te'
-            . ' ON' . implode(' AND ', $this->getOnConditionSQL($association));
+        $joinSql   = ' JOIN '.$tableName.' te'
+            . ' ON'.implode(' AND ', $this->getOnConditionSQL($association));
 
         return [$joinSql, $filterSql];
     }
@@ -359,18 +359,18 @@ 
             $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias);
 
             if ($filterExpr) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
-        if (! $filterClauses) {
+        if ( ! $filterClauses) {
             return '';
         }
 
         $filterSql = implode(' AND ', $filterClauses);
 
         return isset($filterClauses[1])
-            ? '(' . $filterSql . ')'
+            ? '('.$filterSql.')'
             : $filterSql
         ;
     }
@@ -399,7 +399,7 @@ 
             $quotedColumnName           = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $quotedReferencedColumnName = $this->platform->quoteIdentifier($joinColumn->getReferencedColumnName());
 
-            $conditions[] = ' t.' . $quotedColumnName . ' = te.' . $quotedReferencedColumnName;
+            $conditions[] = ' t.'.$quotedColumnName.' = te.'.$quotedReferencedColumnName;
         }
 
         return $conditions;
@@ -421,7 +421,7 @@ 
             $columns[] = $this->platform->quoteIdentifier($joinColumn->getColumnName());
         }
 
-        return 'DELETE FROM ' . $joinTableName . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
+        return 'DELETE FROM '.$joinTableName.' WHERE '.implode(' = ? AND ', $columns).' = ?';
     }
 
     /**
@@ -476,7 +476,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
             }
 
@@ -489,7 +489,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -540,7 +540,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
             }
 
@@ -553,7 +553,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -637,7 +637,7 @@ 
         $sourceClass       = $this->em->getClassMetadata($owningAssociation->getSourceEntity());
         $targetClass       = $this->em->getClassMetadata($owningAssociation->getTargetEntity());
 
-        if (! $owningAssociation->isOwningSide()) {
+        if ( ! $owningAssociation->isOwningSide()) {
             $owningAssociation  = $targetClass->getProperty($owningAssociation->getMappedBy());
             $joinTable          = $owningAssociation->getJoinTable();
             $joinColumns        = $joinTable->getJoinColumns();
@@ -649,7 +649,7 @@ 
         }
 
         $joinTableName   = $joinTable->getQuotedQualifiedName($this->platform);
-        $quotedJoinTable = $joinTableName . ' t';
+        $quotedJoinTable = $joinTableName.' t';
         $whereClauses    = [];
         $params          = [];
         $types           = [];
@@ -663,11 +663,11 @@ 
                 $quotedColumnName           = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                 $quotedReferencedColumnName = $this->platform->quoteIdentifier($joinColumn->getReferencedColumnName());
 
-                $joinConditions[] = ' t.' . $quotedColumnName . ' = tr.' . $quotedReferencedColumnName;
+                $joinConditions[] = ' t.'.$quotedColumnName.' = tr.'.$quotedReferencedColumnName;
             }
 
             $tableName        = $targetClass->table->getQuotedQualifiedName($this->platform);
-            $quotedJoinTable .= ' JOIN ' . $tableName . ' tr ON ' . implode(' AND ', $joinConditions);
+            $quotedJoinTable .= ' JOIN '.$tableName.' tr ON '.implode(' AND ', $joinConditions);
             $indexByProperty  = $targetClass->getProperty($indexBy);
 
             switch (true) {
@@ -690,7 +690,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $sourceClass, $this->em));
             }
 
@@ -699,13 +699,13 @@ 
             $types[]        = $joinColumn->getType();
         }
 
-        if (! $joinNeeded) {
+        if ( ! $joinNeeded) {
             foreach ($joinColumns as $joinColumn) {
                 /** @var JoinColumnMetadata $joinColumn */
                 $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -719,7 +719,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($association);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[]   = $filterSql;
             }
         }
@@ -742,7 +742,7 @@ 
         $association       = $collection->getMapping();
         $owningAssociation = $association;
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $sourceClass      = $this->em->getClassMetadata($association->getTargetEntity());
             $targetClass      = $this->em->getClassMetadata($association->getSourceEntity());
             $sourceIdentifier = $this->uow->getEntityIdentifier($element);
@@ -768,11 +768,11 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $sourceClass, $this->em));
             }
 
-            $whereClauses[] = ($addFilters ? 't.' : '') . $quotedColumnName . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '').$quotedColumnName.' = ?';
             $params[]       = $sourceIdentifier[$sourceClass->fieldNames[$referencedColumnName]];
             $types[]        = $joinColumn->getType();
         }
@@ -782,11 +782,11 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
-            $whereClauses[] = ($addFilters ? 't.' : '') . $quotedColumnName . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '').$quotedColumnName.' = ?';
             $params[]       = $targetIdentifier[$targetClass->fieldNames[$referencedColumnName]];
             $types[]        = $joinColumn->getType();
         }
@@ -797,7 +797,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($association);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[]   = $filterSql;
             }
         }
@@ -842,10 +842,10 @@ 
                 $property   = $targetClass->getProperty($name);
                 $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-                $orderBy[] = $columnName . ' ' . $direction;
+                $orderBy[] = $columnName.' '.$direction;
             }
 
-            return ' ORDER BY ' . implode(', ', $orderBy);
+            return ' ORDER BY '.implode(', ', $orderBy);
         }
         return '';
     }

tests/Doctrine/Performance/Hydration/MixedQueryFetchJoinArrayHydrationPerformanceBench.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
                 'u__status'      => 'developer',
                 'u__username'    => 'jwage',
                 'u__name'        => 'Jonathan',
-                'sclr0'          => 'JWAGE' . $i,
+                'sclr0'          => 'JWAGE'.$i,
                 'p__phonenumber' => '91',
             ];
         }

lib/Doctrine/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersister.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         $isInitialized = $collection->isInitialized();
         $isDirty       = $collection->isDirty();
 
-        if (! $isInitialized && ! $isDirty) {
+        if ( ! $isInitialized && ! $isDirty) {
             return;
         }
 

tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
             $this->addToAssertionCount(1);
         } catch (QueryException $e) {
             if ($debug) {
-                echo $e->getTraceAsString() . PHP_EOL;
+                echo $e->getTraceAsString().PHP_EOL;
             }
 
             $this->fail($e->getMessage());
@@ -44,8 +44,8 @@ 
             $this->fail('No syntax errors were detected, when syntax errors were expected');
         } catch (QueryException $e) {
             if ($debug) {
-                echo $e->getMessage() . PHP_EOL;
-                echo $e->getTraceAsString() . PHP_EOL;
+                echo $e->getMessage().PHP_EOL;
+                echo $e->getTraceAsString().PHP_EOL;
             }
             $this->addToAssertionCount(1);
         }
@@ -107,7 +107,7 @@ 
             ['SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'],
 
             /* Checks for invalid AbstractSchemaName */
-            ['SELECT u FROM UnknownClass u'],  // unknown
+            ['SELECT u FROM UnknownClass u'], // unknown
             ['SELECT u FROM \Unknown\Class u'], // unknown, leading backslash
             ['SELECT u FROM Unknown\\\\Class u'], // unknown, syntactically bogus (duplicate \\)
             ['SELECT u FROM Unknown\Class\ u'], // unknown, syntactically bogus (trailing \)
@@ -573,7 +573,7 @@ 
      */
     public function testDQLKeywordInJoinIsAllowed() : void
     {
-        self::assertValidDQL('SELECT u FROM ' . __NAMESPACE__ . '\DQLKeywordsModelUser u JOIN u.group g');
+        self::assertValidDQL('SELECT u FROM '.__NAMESPACE__.'\DQLKeywordsModelUser u JOIN u.group g');
     }
 
     /**
@@ -581,7 +581,7 @@ 
      */
     public function testDQLKeywordInConditionIsAllowed() : void
     {
-        self::assertValidDQL('SELECT g FROM ' . __NAMESPACE__ . '\DQLKeywordsModelGroup g WHERE g.from=0');
+        self::assertValidDQL('SELECT g FROM '.__NAMESPACE__.'\DQLKeywordsModelGroup g WHERE g.from=0');
     }
 
     /* The exception is currently thrown in the SQLWalker, not earlier.
@@ -686,7 +686,7 @@ 
      */
     public function testNewLiteralExpression() : void
     {
-        self::assertValidDQL('SELECT new ' . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
+        self::assertValidDQL('SELECT new '.__NAMESPACE__."\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
     }
 
     /**
@@ -694,7 +694,7 @@ 
      */
     public function testNewLiteralWithSubselectExpression() : void
     {
-        self::assertValidDQL('SELECT new ' . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
+        self::assertValidDQL('SELECT new '.__NAMESPACE__."\\DummyStruct(u.id, 'foo', (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
     }
 
     public function testStringPrimaryAcceptsAggregateExpression() : void

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

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     {
         $query = $this->em->createQuery(
             'SELECT CONCAT(e.type, MIN(e.version)) pair'
-            . ' FROM ' . GH7286Entity::class . ' e'
+            . ' FROM '.GH7286Entity::class.' e'
             . ' WHERE e.type IS NOT NULL'
             . ' GROUP BY e.type'
             . ' ORDER BY e.type'
@@ -63,7 +63,7 @@ 
 
         $query = $this->em->createQuery(
             'SELECT CC(e.type, MIN(e.version)) pair'
-            . ' FROM ' . GH7286Entity::class . ' e'
+            . ' FROM '.GH7286Entity::class.' e'
             . ' WHERE e.type IS NOT NULL AND e.type != :type'
             . ' GROUP BY e.type'
         );

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

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 {
     protected function loadDriver()
     {
-        return new XmlDriver(__DIR__ . DIRECTORY_SEPARATOR . 'xml');
+        return new XmlDriver(__DIR__.DIRECTORY_SEPARATOR.'xml');
     }
 
     public function testClassTableInheritanceDiscriminatorMap() : void
@@ -170,7 +170,7 @@ 
      */
     public function testValidateXmlSchema($xmlMappingFile) : void
     {
-        $xsdSchemaFile = __DIR__ . '/../../../../../doctrine-mapping.xsd';
+        $xsdSchemaFile = __DIR__.'/../../../../../doctrine-mapping.xsd';
         $dom           = new \DOMDocument();
 
         $dom->load($xmlMappingFile);
@@ -180,14 +180,14 @@ 
 
     public static function dataValidSchema()
     {
-        $list    = glob(__DIR__ . '/xml/*.xml');
+        $list    = glob(__DIR__.'/xml/*.xml');
         $invalid = ['Doctrine.Tests.Models.DDC889.DDC889Class.dcm'];
 
-        $list = array_filter($list, function ($item) use ($invalid) {
+        $list = array_filter($list, function($item) use ($invalid) {
             return ! in_array(pathinfo($item, PATHINFO_FILENAME), $invalid, true);
         });
 
-        return array_map(function ($item) {
+        return array_map(function($item) {
             return [$item];
         }, $list);
     }