doctrine / orm

tests/Doctrine/Tests/OrmFunctionalTestCase.php

Spacing +20 added lines, -20 removed lines

@@ -346,7 +346,7 @@ 
         $conn = static::$sharedConn;
 
         // In case test is skipped, tearDown is called, but no setup may have run
-        if (! $conn) {
+        if ( ! $conn) {
             return;
         }
 
@@ -420,7 +420,7 @@ 
         }
 
         if (isset($this->usedModelSets['directorytree'])) {
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('file'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('file'));
             // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
             $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
             $conn->executeUpdate('DELETE FROM Directory');
@@ -513,12 +513,12 @@ 
                 )
             );
 
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-group'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-phone'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-user'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-address'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-group'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-phone'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-user'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-address'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city'));
         }
 
         if (isset($this->usedModelSets['vct_onetoone'])) {
@@ -630,7 +630,7 @@ 
         $classes = [];
 
         foreach ($classNames as $className) {
-            if (! isset(static::$entityTablesCreated[$className])) {
+            if ( ! isset(static::$entityTablesCreated[$className])) {
                 static::$entityTablesCreated[$className] = true;
                 $classes[]                               = $this->em->getClassMetadata($className);
             }
@@ -649,25 +649,25 @@ 
     {
         $this->setUpDBALTypes();
 
-        if (! isset(static::$sharedConn)) {
+        if ( ! isset(static::$sharedConn)) {
             static::$sharedConn = TestUtil::getConnection();
         }
 
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
             if (in_array(static::$sharedConn->getDatabasePlatform()->getName(), ['mysql', 'postgresql'], true)) {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . static::class . '*/');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.static::class.'*/');
             } elseif (static::$sharedConn->getDatabasePlatform()->getName() === 'oracle') {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . static::class . '*/ FROM dual');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.static::class.'*/ FROM dual');
             }
         }
 
-        if (! $this->em) {
+        if ( ! $this->em) {
             $this->em         = $this->getEntityManager();
             $this->schemaTool = new SchemaTool($this->em);
         }
 
         foreach ($this->usedModelSets as $setName => $bool) {
-            if (! isset(static::$tablesCreated[$setName])) {
+            if ( ! isset(static::$tablesCreated[$setName])) {
                 $this->setUpEntitySchema(static::$modelSets[$setName]);
 
                 static::$tablesCreated[$setName] = true;
@@ -742,8 +742,8 @@ 
 
         $config->setMetadataDriverImpl(
             $mappingDriver ?? $config->newDefaultAnnotationDriver([
-                realpath(__DIR__ . '/Models/Cache'),
-                realpath(__DIR__ . '/Models/GeoNames'),
+                realpath(__DIR__.'/Models/Cache'),
+                realpath(__DIR__.'/Models/GeoNames'),
             ])
         );
 
@@ -791,13 +791,13 @@ 
 
             foreach ($last25queries as $i => $query) {
                 $params = array_map(
-                    static function ($p) {
+                    static function($p) {
                         return is_object($p) ? get_class($p) : var_export($p, true);
                     },
                     $query['params'] ?: []
                 );
 
-                $queries .= $i . ". SQL: '" . $query['sql'] . "' Params: " . implode(', ', $params) . PHP_EOL;
+                $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(', ', $params).PHP_EOL;
             }
 
             $trace    = $e->getTrace();
@@ -810,11 +810,11 @@ 
                         break;
                     }
 
-                    $traceMsg .= $part['file'] . ':' . $part['line'] . PHP_EOL;
+                    $traceMsg .= $part['file'].':'.$part['line'].PHP_EOL;
                 }
             }
 
-            $message = '[' . get_class($e) . '] ' . $e->getMessage() . PHP_EOL . PHP_EOL . 'With queries:' . PHP_EOL . $queries . PHP_EOL . 'Trace:' . PHP_EOL . $traceMsg;
+            $message = '['.get_class($e).'] '.$e->getMessage().PHP_EOL.PHP_EOL.'With queries:'.PHP_EOL.$queries.PHP_EOL.'Trace:'.PHP_EOL.$traceMsg;
 
             throw new Exception($message, (int) $e->getCode(), $e);
         }

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

Spacing +25 added lines, -25 removed lines

@@ -109,7 +109,7 @@ 
             }
 
             foreach ($data as $columnName => $value) {
-                if (! is_array($id) || ! isset($id[$columnName])) {
+                if ( ! is_array($id) || ! isset($id[$columnName])) {
                     $type = $this->columns[$columnName]->getType();
 
                     $stmt->bindValue($paramIndex++, $value, $type);
@@ -133,7 +133,7 @@ 
     {
         $updateData = $this->prepareUpdateData($entity);
 
-        if (! $updateData) {
+        if ( ! $updateData) {
             return;
         }
 
@@ -151,7 +151,7 @@ 
             $versionedClass = $this->class->versionProperty->getDeclaringClass();
             $versionedTable = $versionedClass->getTableName();
 
-            if (! isset($updateData[$versionedTable])) {
+            if ( ! isset($updateData[$versionedTable])) {
                 $tableName = $versionedClass->table->getQuotedQualifiedName($this->platform);
 
                 $this->updateTable($entity, $tableName, [], true);
@@ -232,7 +232,7 @@ 
 
         if ($filterSql) {
             $conditionSql .= $conditionSql
-                ? ' AND ' . $filterSql
+                ? ' AND '.$filterSql
                 : $filterSql;
         }
 
@@ -240,26 +240,26 @@ 
 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
-                $lockSql = ' ' . $this->platform->getReadLockSQL();
+                $lockSql = ' '.$this->platform->getReadLockSQL();
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
-                $lockSql = ' ' . $this->platform->getWriteLockSQL();
+                $lockSql = ' '.$this->platform->getWriteLockSQL();
                 break;
         }
 
         $tableName  = $this->class->table->getQuotedQualifiedName($this->platform);
-        $from       = ' FROM ' . $tableName . ' ' . $baseTableAlias;
-        $where      = $conditionSql !== '' ? ' WHERE ' . $conditionSql : '';
+        $from       = ' FROM '.$tableName.' '.$baseTableAlias;
+        $where      = $conditionSql !== '' ? ' WHERE '.$conditionSql : '';
         $lock       = $this->platform->appendLockHint($from, $lockMode);
         $columnList = $this->getSelectColumnsSQL();
-        $query      = 'SELECT ' . $columnList
+        $query      = 'SELECT '.$columnList
                     . $lock
                     . $joinSql
                     . $where
                     . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset ?? 0) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset ?? 0).$lockSql;
     }
 
     /**
@@ -281,14 +281,14 @@ 
 
         if ($filterSql !== '') {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         return 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . 'FROM '.$tableName.' '.$baseTableAlias
             . $joinSql
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
     }
 
     /**
@@ -307,18 +307,18 @@ 
             $conditions = [];
             $tableName  = $parentClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias = $this->getSQLTableAlias($parentClass->getTableName());
-            $joinSql   .= ' INNER JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $joinSql   .= ' INNER JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
                 $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName());
 
-                $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $joinSql .= implode(' AND ', $conditions);
         }
 
-        return parent::getLockTablesSql($lockMode) . $joinSql;
+        return parent::getLockTablesSql($lockMode).$joinSql;
     }
 
     /**
@@ -345,7 +345,7 @@ 
                 continue;
             }
 
-            if (! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
+            if ( ! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
                 continue;
             }
 
@@ -355,7 +355,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -374,7 +374,7 @@ 
         $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName);
         $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType);
 
-        $columnList[] = $discrColumnType->convertToDatabaseValueSQL($discrTableAlias . '.' . $quotedColumnName, $this->platform);
+        $columnList[] = $discrColumnType->convertToDatabaseValueSQL($discrTableAlias.'.'.$quotedColumnName, $this->platform);
 
         // sub tables
         foreach ($this->class->getSubClasses() as $subClassName) {
@@ -398,7 +398,7 @@ 
                             /** @var JoinColumnMetadata $joinColumn */
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                             }
 
@@ -448,7 +448,7 @@ 
                         $columnName           = $joinColumn->getColumnName();
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -504,12 +504,12 @@ 
             $conditions = [];
             $tableName  = $parentClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias = $this->getSQLTableAlias($parentClass->getTableName());
-            $joinSql   .= ' INNER JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $joinSql   .= ' INNER JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
                 $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName());
 
-                $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $joinSql .= implode(' AND ', $conditions);
@@ -521,12 +521,12 @@ 
             $subClass   = $this->em->getClassMetadata($subClassName);
             $tableName  = $subClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias = $this->getSQLTableAlias($subClass->getTableName());
-            $joinSql   .= ' LEFT JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $joinSql   .= ' LEFT JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
                 $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName());
 
-                $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $joinSql .= implode(' AND ', $conditions);

lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php

Indentation +7 added lines, -7 removed lines

@@ -33,13 +33,13 @@
     protected function configure()
     {
         $this->setName('orm:run-dql')
-             ->setDescription('Executes arbitrary DQL directly from the command line')
-             ->addArgument('dql', InputArgument::REQUIRED, 'The DQL to execute.')
-             ->addOption('hydrate', null, InputOption::VALUE_REQUIRED, 'Hydration mode of result set. Should be either: object, array, scalar or single-scalar.', 'object')
-             ->addOption('first-result', null, InputOption::VALUE_REQUIRED, 'The first result in the result set.')
-             ->addOption('max-result', null, InputOption::VALUE_REQUIRED, 'The maximum number of results in the result set.')
-             ->addOption('show-sql', null, InputOption::VALUE_NONE, 'Dump generated SQL instead of executing query')
-             ->setHelp('Executes arbitrary DQL directly from the command line.');
+                ->setDescription('Executes arbitrary DQL directly from the command line')
+                ->addArgument('dql', InputArgument::REQUIRED, 'The DQL to execute.')
+                ->addOption('hydrate', null, InputOption::VALUE_REQUIRED, 'Hydration mode of result set. Should be either: object, array, scalar or single-scalar.', 'object')
+                ->addOption('first-result', null, InputOption::VALUE_REQUIRED, 'The first result in the result set.')
+                ->addOption('max-result', null, InputOption::VALUE_REQUIRED, 'The maximum number of results in the result set.')
+                ->addOption('show-sql', null, InputOption::VALUE_NONE, 'Dump generated SQL instead of executing query')
+                ->setHelp('Executes arbitrary DQL directly from the command line.');
     }
 
     /**

Spacing +5 added lines, -5 removed lines

@@ -58,9 +58,9 @@ 
         }
 
         $hydrationModeName = $input->getOption('hydrate');
-        $hydrationMode     = 'Doctrine\ORM\Query::HYDRATE_' . strtoupper(str_replace('-', '_', $hydrationModeName));
+        $hydrationMode     = 'Doctrine\ORM\Query::HYDRATE_'.strtoupper(str_replace('-', '_', $hydrationModeName));
 
-        if (! defined($hydrationMode)) {
+        if ( ! defined($hydrationMode)) {
             throw new RuntimeException(sprintf(
                 "Hydration mode '%s' does not exist. It should be either: object. array, scalar or single-scalar.",
                 $hydrationModeName
@@ -71,7 +71,7 @@ 
         $firstResult = $input->getOption('first-result');
 
         if ($firstResult !== null) {
-            if (! is_numeric($firstResult)) {
+            if ( ! is_numeric($firstResult)) {
                 throw new LogicException("Option 'first-result' must contain an integer value");
             }
 
@@ -81,7 +81,7 @@ 
         $maxResult = $input->getOption('max-result');
 
         if ($maxResult !== null) {
-            if (! is_numeric($maxResult)) {
+            if ( ! is_numeric($maxResult)) {
                 throw new LogicException("Option 'max-result' must contain an integer value");
             }
 
@@ -95,7 +95,7 @@ 
 
         $resultSet = $query->execute([], constant($hydrationMode));
 
-        $dumper = new CliDumper(static function (string $payload) use ($output) : void {
+        $dumper = new CliDumper(static function(string $payload) use ($output) : void {
             $output->write($payload);
         });
         $dumper->dump((new VarCloner())->cloneVar($resultSet));

lib/Doctrine/ORM/Tools/Setup.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     {
         $cache = self::createCacheInstance($isDevMode, $cache);
 
-        if (! $cache instanceof CacheProvider) {
+        if ( ! $cache instanceof CacheProvider) {
             return $cache;
         }
 
@@ -96,7 +96,7 @@ 
             $namespace .= ':';
         }
 
-        $cache->setNamespace($namespace . 'dc2_' . md5($proxyDir) . '_'); // to avoid collisions
+        $cache->setNamespace($namespace.'dc2_'.md5($proxyDir).'_'); // to avoid collisions
 
         return $cache;
     }

tests/Doctrine/Tests/ORM/Tools/SetupTest.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
 
     public function tearDown() : void
     {
-        if (! $this->originalIncludePath) {
+        if ( ! $this->originalIncludePath) {
             return;
         }
 
@@ -74,7 +74,7 @@ 
         $config = Setup::createConfiguration(false, __DIR__);
         $cache  = $config->getMetadataCacheImpl();
 
-        self::assertSame('dc2_' . md5(__DIR__) . '_', $cache->getNamespace());
+        self::assertSame('dc2_'.md5(__DIR__).'_', $cache->getNamespace());
     }
 
     /**
@@ -85,7 +85,7 @@ 
         $config = Setup::createConfiguration(false, __DIR__, new ArrayCache());
         $cache  = $config->getMetadataCacheImpl();
 
-        self::assertSame('dc2_' . md5(__DIR__) . '_', $cache->getNamespace());
+        self::assertSame('dc2_'.md5(__DIR__).'_', $cache->getNamespace());
     }
 
     /**
@@ -100,7 +100,7 @@ 
         $cache  = $config->getMetadataCacheImpl();
 
         self::assertSame($originalCache, $cache);
-        self::assertSame('foo:dc2_' . md5(__DIR__) . '_', $cache->getNamespace());
+        self::assertSame('foo:dc2_'.md5(__DIR__).'_', $cache->getNamespace());
     }
 
     /**

tests/Doctrine/Performance/Query/QueryBoundParameterProcessingBench.php

Spacing +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
         $this->parsedQueryWithDeclaredParameterType = $entityManager->createQuery($dql);
 
         foreach (range(1, 10) as $index) {
-            $this->parsedQueryWithInferredParameterType->setParameter('parameter' . $index, new DateTime());
-            $this->parsedQueryWithDeclaredParameterType->setParameter('parameter' . $index, new DateTime(), DateTimeType::DATETIME);
+            $this->parsedQueryWithInferredParameterType->setParameter('parameter'.$index, new DateTime());
+            $this->parsedQueryWithDeclaredParameterType->setParameter('parameter'.$index, new DateTime(), DateTimeType::DATETIME);
         }
 
         // Force parsing upfront - we don't benchmark that bit in this scenario

tests/Doctrine/Tests/Mocks/DriverMock.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     public function getDatabasePlatform()
     {
-        if (! $this->platformMock) {
+        if ( ! $this->platformMock) {
             $this->platformMock = new DatabasePlatformMock();
         }
 

tests/Doctrine/Tests/Mocks/ConnectionMock.php

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
     public function quote($input, $type = null)
     {
         if (is_string($input)) {
-            return "'" . $input . "'";
+            return "'".$input."'";
         }
 
         return $input;

tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
 
         while ($worker->work()) {
             if ($worker->returnCode() !== GEARMAN_SUCCESS) {
-                echo 'return_code: ' . $worker->returnCode() . "\n";
+                echo 'return_code: '.$worker->returnCode()."\n";
                 break;
             }
         }
@@ -61,14 +61,14 @@ 
 
     public function findWithLock($job)
     {
-        return $this->process($job, static function ($fixture, $em) {
+        return $this->process($job, static function($fixture, $em) {
             $entity = $em->find($fixture['entityName'], $fixture['entityId'], $fixture['lockMode']);
         });
     }
 
     public function dqlWithLock($job)
     {
-        return $this->process($job, static function ($fixture, $em) {
+        return $this->process($job, static function($fixture, $em) {
             /** @var Doctrine\ORM\Query $query */
             $query = $em->createQuery($fixture['dql']);
 
@@ -80,7 +80,7 @@ 
 
     public function lock($job)
     {
-        return $this->process($job, static function ($fixture, $em) {
+        return $this->process($job, static function($fixture, $em) {
             $entity = $em->find($fixture['entityName'], $fixture['entityId']);
 
             $em->lock($entity, $fixture['lockMode']);
@@ -89,18 +89,18 @@ 
 
     protected function processWorkload($job)
     {
-        echo 'Received job: ' . $job->handle() . ' for function ' . $job->functionName() . "\n";
+        echo 'Received job: '.$job->handle().' for function '.$job->functionName()."\n";
 
         $workload = $job->workload();
         $workload = unserialize($workload);
 
-        if (! isset($workload['conn']) || ! is_array($workload['conn'])) {
+        if ( ! isset($workload['conn']) || ! is_array($workload['conn'])) {
             throw new InvalidArgumentException('Missing Database parameters');
         }
 
         $this->em = $this->createEntityManager($workload['conn']);
 
-        if (! isset($workload['fixture'])) {
+        if ( ! isset($workload['fixture'])) {
             throw new InvalidArgumentException('Missing Fixture parameters');
         }
 
@@ -110,11 +110,11 @@ 
     protected function createEntityManager($conn)
     {
         $config = new Configuration();
-        $config->setProxyDir(__DIR__ . '/../../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../../Proxies');
         $config->setProxyNamespace('MyProject\Proxies');
         $config->setAutoGenerateProxyClasses(true);
 
-        $annotDriver = $config->newDefaultAnnotationDriver([__DIR__ . '/../../../Models/']);
+        $annotDriver = $config->newDefaultAnnotationDriver([__DIR__.'/../../../Models/']);
         $config->setMetadataDriverImpl($annotDriver);
 
         $cache = new ArrayCache();