doctrine / orm

lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php

Spacing +6 added lines, -6 removed lines

@@ -60,9 +60,9 @@ 
      */
     public function __construct($case = CASE_LOWER, bool $numberAware = false)
     {
-        if (! $numberAware) {
+        if ( ! $numberAware) {
             @trigger_error(
-                'Creating ' . self::class . ' without making it number aware is deprecated and will be removed in Doctrine ORM 3.0.',
+                'Creating '.self::class.' without making it number aware is deprecated and will be removed in Doctrine ORM 3.0.',
                 E_USER_DEPRECATED
             );
         }
@@ -125,7 +125,7 @@ 
      */
     public function referenceColumnName()
     {
-        return $this->case === CASE_UPPER ?  'ID' : 'id';
+        return $this->case === CASE_UPPER ? 'ID' : 'id';
     }
 
     /**
@@ -133,7 +133,7 @@ 
      */
     public function joinColumnName($propertyName, $className = null)
     {
-        return $this->underscore($propertyName) . '_' . $this->referenceColumnName();
+        return $this->underscore($propertyName).'_'.$this->referenceColumnName();
     }
 
     /**
@@ -141,7 +141,7 @@ 
      */
     public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
     {
-        return $this->classToTableName($sourceEntity) . '_' . $this->classToTableName($targetEntity);
+        return $this->classToTableName($sourceEntity).'_'.$this->classToTableName($targetEntity);
     }
 
     /**
@@ -149,7 +149,7 @@ 
      */
     public function joinKeyColumnName($entityName, $referencedColumnName = null)
     {
-        return $this->classToTableName($entityName) . '_' .
+        return $this->classToTableName($entityName).'_'.
                 ($referencedColumnName ?: $this->referenceColumnName());
     }
 

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

Spacing +2 added lines, -2 removed lines

@@ -301,7 +301,7 @@ 
 
         $queryCount = $this->getCurrentQueryCount();
         $this->assertFalse($user->articles->contains($article));
-        $this->assertEquals($queryCount+1, $this->getCurrentQueryCount(), 'Checking for contains of persisted entity should cause one query to be executed.');
+        $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount(), 'Checking for contains of persisted entity should cause one query to be executed.');
         $this->assertFalse($user->articles->isInitialized(), 'Post-Condition: Collection is not initialized.');
 
         // Test One to Many existence with state managed
@@ -468,7 +468,7 @@ 
 
         $queryCount = $this->getCurrentQueryCount();
         $this->assertTrue($group->users->contains($user));
-        $this->assertEquals($queryCount+1, $this->getCurrentQueryCount(), 'Checking for contains of managed entity should cause one query to be executed.');
+        $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount(), 'Checking for contains of managed entity should cause one query to be executed.');
         $this->assertFalse($user->groups->isInitialized(), 'Post-Condition: Collection is not initialized.');
 
         $newUser       = new CmsUser();

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

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
         $user->tweets->removeElement($tweet);
 
-        $tweets = $user->tweets->map(static function (GH7864Tweet $tweet) {
+        $tweets = $user->tweets->map(static function(GH7864Tweet $tweet) {
             return $tweet->content;
         });
 

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

Spacing +33 added lines, -33 removed lines

@@ -131,7 +131,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);
         }
@@ -160,9 +160,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);
     }
@@ -190,7 +190,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);
     }
@@ -206,7 +206,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);
     }
@@ -256,11 +256,11 @@ 
         $rsm = new Query\ResultSetMappingBuilder($this->em);
         $rsm->addRootEntityFromClassMetadata($targetClass->name, '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);
 
         $sql .= $this->getOrderingSql($criteria, $targetClass);
 
@@ -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 [$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 [
-            '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 [
-            '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,
         ];
     }
@@ -574,7 +574,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'];
@@ -587,7 +587,7 @@ 
             $targetRelationMode     = 'relationToTargetKeyColumns';
         }
 
-        $quotedJoinTable = $this->quoteStrategy->getJoinTableName($mapping, $associationSourceClass, $this->platform). ' t';
+        $quotedJoinTable = $this->quoteStrategy->getJoinTableName($mapping, $associationSourceClass, $this->platform).' t';
         $whereClauses    = [];
         $params          = [];
         $types           = [];
@@ -598,14 +598,14 @@ 
             $joinConditions = [];
 
             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);
         }
@@ -613,7 +613,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]];
@@ -621,7 +621,7 @@ 
             } elseif ( ! $joinNeeded) {
                 $column = $mapping[$targetRelationMode][$joinTableColumn];
 
-                $whereClauses[] = 't.' . $joinTableColumn . ' = ?';
+                $whereClauses[] = 't.'.$joinTableColumn.' = ?';
                 $params[]       = $key;
                 $types[]        = PersisterHelper::getTypeOfColumn($column, $targetClass, $this->em);
             }
@@ -631,7 +631,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($filterMapping);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
             }
         }
@@ -675,7 +675,7 @@ 
         $types           = [];
 
         foreach ($mapping['joinTableColumns'] as $joinTableColumn) {
-            $whereClauses[] = ($addFilters ? 't.' : '') . $joinTableColumn . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '').$joinTableColumn.' = ?';
 
             if (isset($mapping['relationToTargetKeyColumns'][$joinTableColumn])) {
                 $targetColumn = $mapping['relationToTargetKeyColumns'][$joinTableColumn];
@@ -697,7 +697,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($filterMapping);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
             }
         }
@@ -746,10 +746,10 @@ 
                     $targetClass,
                     $this->platform
                 );
-                $orderBy[] = $field . ' ' . $direction;
+                $orderBy[] = $field.' '.$direction;
             }
 
-            return ' ORDER BY ' . implode(', ', $orderBy);
+            return ' ORDER BY '.implode(', ', $orderBy);
         }
         return '';
     }

tests/Doctrine/Tests/VerifyDeprecations.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         $this->ignoredDeprecations  = [];
 
         $this->originalHandler = set_error_handler(
-            function (int $errorNumber, string $errorMessage) : void {
+            function(int $errorNumber, string $errorMessage) : void {
                 if (in_array($errorMessage, $this->ignoredDeprecations, true)) {
                     return;
                 }

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +6 added lines, -6 removed lines

@@ -226,7 +226,7 @@ 
                             $targetEntity = current(
                                 array_filter(
                                     $classes,
-                                    function (ClassMetadata $class) use ($idMapping) : bool {
+                                    function(ClassMetadata $class) use ($idMapping) : bool {
                                         return $class->name === $idMapping['targetEntity'];
                                     }
                                 )
@@ -646,8 +646,8 @@ 
 
             if ( ! $definingClass) {
                 throw new \Doctrine\ORM\ORMException(
-                    'Column name `' . $joinColumn['referencedColumnName'] . '` referenced for relation from '
-                    . $mapping['sourceEntity'] . ' towards ' . $mapping['targetEntity'] . ' does not exist.'
+                    'Column name `'.$joinColumn['referencedColumnName'].'` referenced for relation from '
+                    . $mapping['sourceEntity'].' towards '.$mapping['targetEntity'].' does not exist.'
                 );
             }
 
@@ -742,7 +742,7 @@ 
      */
     private function gatherColumnOptions(array $mapping) : array
     {
-        if (! isset($mapping['options'])) {
+        if ( ! isset($mapping['options'])) {
             return [];
         }
 
@@ -848,7 +848,7 @@ 
                 if ($table->hasPrimaryKey()) {
                     $columns = $table->getPrimaryKey()->getColumns();
                     if (count($columns) == 1) {
-                        $checkSequence = $table->getName() . '_' . $columns[0] . '_seq';
+                        $checkSequence = $table->getName().'_'.$columns[0].'_seq';
                         if ($fullSchema->hasSequence($checkSequence)) {
                             $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
                         }
@@ -922,7 +922,7 @@ 
         }
 
         // whitelist assets we already know about in $toSchema, use the existing filter otherwise
-        $config->setSchemaAssetsFilter(static function ($asset) use ($previousFilter, $toSchema) : bool {
+        $config->setSchemaAssetsFilter(static function($asset) use ($previousFilter, $toSchema) : bool {
             $assetName = $asset instanceof AbstractAsset ? $asset->getName() : $asset;
 
             return $toSchema->hasTable($assetName) || $toSchema->hasSequence($assetName) || $previousFilter($asset);

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

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
      */
     private function filterCreateTable(array $sqls, string $tableName) : array
     {
-        return array_filter($sqls, static function (string $sql) use ($tableName) : bool {
+        return array_filter($sqls, static function(string $sql) use ($tableName) : bool {
             return strpos($sql, sprintf('CREATE TABLE %s (', $tableName)) === 0;
         });
     }
@@ -54,7 +54,7 @@ 
 
         $this->_em->getConnection()->exec(current($sqls));
 
-        $sqls = array_filter($tool->getUpdateSchemaSql($classes), static function (string $sql) : bool {
+        $sqls = array_filter($tool->getUpdateSchemaSql($classes), static function(string $sql) : bool {
             return strpos($sql, ' gh7875_my_entity ') !== false;
         });
 
@@ -77,7 +77,7 @@ 
             ['/^(?!my_enti)/', null],
             [
                 null,
-                static function ($assetName) : bool {
+                static function($assetName) : bool {
                     return $assetName !== 'gh7875_my_entity';
                 },
             ],
@@ -106,7 +106,7 @@ 
         $previousFilter = $config->getSchemaAssetsFilter();
 
         $sqls = $tool->getUpdateSchemaSql($classes);
-        $sqls = array_filter($sqls, static function (string $sql) : bool {
+        $sqls = array_filter($sqls, static function(string $sql) : bool {
             return strpos($sql, ' gh7875_my_entity ') !== false;
         });
 

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

Spacing +15 added lines, -15 removed lines

@@ -105,7 +105,7 @@ 
      */
     protected function onNotFoundMetadata($className)
     {
-        if (! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
+        if ( ! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
             return;
         }
 
@@ -162,7 +162,7 @@ 
             $this->completeIdGeneratorMapping($class);
         }
 
-        if (!$class->isMappedSuperclass) {
+        if ( ! $class->isMappedSuperclass) {
             foreach ($class->embeddedClasses as $property => $embeddableClass) {
 
                 if (isset($embeddableClass['inherited'])) {
@@ -187,7 +187,7 @@ 
 
                 $identifier = $embeddableMetadata->getIdentifier();
 
-                if (! empty($identifier)) {
+                if ( ! empty($identifier)) {
                     $this->inheritIdGeneratorMapping($class, $embeddableMetadata);
                 }
 
@@ -257,7 +257,7 @@ 
      */
     protected function validateRuntimeMetadata($class, $parent)
     {
-        if ( ! $class->reflClass ) {
+        if ( ! $class->reflClass) {
             // only validate if there is a reflection class instance
             return;
         }
@@ -267,7 +267,7 @@ 
         $class->validateLifecycleCallbacks($this->getReflectionService());
 
         // verify inheritance
-        if ( ! $class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
+        if ( ! $class->isMappedSuperclass && ! $class->isInheritanceTypeNone()) {
             if ( ! $parent) {
                 if (count($class->discriminatorMap) == 0) {
                     throw MappingException::missingDiscriminatorMap($class->name);
@@ -401,10 +401,10 @@ 
     private function addInheritedFields(ClassMetadata $subClass, ClassMetadata $parentClass)
     {
         foreach ($parentClass->fieldMappings as $mapping) {
-            if (! isset($mapping['inherited']) && ! $parentClass->isMappedSuperclass && ! $parentClass->isEmbeddedClass) {
+            if ( ! isset($mapping['inherited']) && ! $parentClass->isMappedSuperclass && ! $parentClass->isEmbeddedClass) {
                 $mapping['inherited'] = $parentClass->name;
             }
-            if (! isset($mapping['declared'])) {
+            if ( ! isset($mapping['declared'])) {
                 $mapping['declared'] = $parentClass->name;
             }
             $subClass->addInheritedFieldMapping($mapping);
@@ -428,7 +428,7 @@ 
     {
         foreach ($parentClass->associationMappings as $field => $mapping) {
             if ($parentClass->isMappedSuperclass) {
-                if ($mapping['type'] & ClassMetadata::TO_MANY && !$mapping['isOwningSide']) {
+                if ($mapping['type'] & ClassMetadata::TO_MANY && ! $mapping['isOwningSide']) {
                     throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field);
                 }
                 $mapping['sourceEntity'] = $subClass->name;
@@ -473,11 +473,11 @@ 
 
             $parentClass->mapEmbedded(
                 [
-                    'fieldName' => $prefix . '.' . $property,
+                    'fieldName' => $prefix.'.'.$property,
                     'class' => $embeddableMetadata->name,
                     'columnPrefix' => $embeddableClass['columnPrefix'],
                     'declaredField' => $embeddableClass['declaredField']
-                            ? $prefix . '.' . $embeddableClass['declaredField']
+                            ? $prefix.'.'.$embeddableClass['declaredField']
                             : $prefix,
                     'originalField' => $embeddableClass['originalField'] ?: $property,
                 ]
@@ -495,7 +495,7 @@ 
      */
     private function addInheritedIndexes(ClassMetadata $subClass, ClassMetadata $parentClass)
     {
-        if (! $parentClass->isMappedSuperclass) {
+        if ( ! $parentClass->isMappedSuperclass) {
             return;
         }
 
@@ -703,14 +703,14 @@ 
                     throw new ORMException("Can't instantiate custom generator : no custom generator definition");
                 }
                 if ( ! class_exists($definition['class'])) {
-                    throw new ORMException("Can't instantiate custom generator : " .
+                    throw new ORMException("Can't instantiate custom generator : ".
                         $definition['class']);
                 }
                 $class->setIdGenerator(new $definition['class']);
                 break;
 
             default:
-                throw new ORMException("Unknown generator type: " . $class->generatorType);
+                throw new ORMException("Unknown generator type: ".$class->generatorType);
         }
     }
 
@@ -760,7 +760,7 @@ 
      */
     protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
     {
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
     }
 
     /**
@@ -785,7 +785,7 @@ 
      */
     private function getTargetPlatform()
     {
-        if (!$this->targetPlatform) {
+        if ( ! $this->targetPlatform) {
             $this->targetPlatform = $this->em->getConnection()->getDatabasePlatform();
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
     public function testConvertToPHPValueSQLForNewObjectExpression() : void
     {
-        $dql           = 'SELECT NEW ' . GH8061Class::class . '(e.field) FROM ' . GH8061Entity::class . ' e';
+        $dql           = 'SELECT NEW '.GH8061Class::class.'(e.field) FROM '.GH8061Entity::class.' e';
         $entityManager = $this->_getTestEntityManager();
         $query         = $entityManager->createQuery($dql);