doctrine / orm

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

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
             $sql    = $type->convertToPHPValueSQL($sql, $this->platform);
         }
 
-        return $sql . ' AS ' . $columnAlias;
+        return $sql.' AS '.$columnAlias;
     }
 
     /**
@@ -94,6 +94,6 @@ 
 
         $this->currentPersisterContext->rsm->addMetaResult('r', $columnAlias, $joinColumnName, false, $type);
 
-        return $tableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias;
+        return $tableAlias.'.'.$quotedColumnName.' AS '.$columnAlias;
     }
 }

lib/Doctrine/ORM/Cache/DefaultCacheFactory.php

Spacing +4 added lines, -4 removed lines

@@ -215,12 +215,12 @@ 
                 null === $this->fileLockRegionDirectory
             ) {
                 throw new \LogicException(
-                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, ' .
+                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, '.
                     'The default implementation provided by doctrine is "Doctrine\ORM\Cache\Region\FileLockRegion" if you want to use it please provide a valid directory, DefaultCacheFactory#setFileLockRegionDirectory(). '
                 );
             }
 
-            $directory = $this->fileLockRegionDirectory . DIRECTORY_SEPARATOR . $cache['region'];
+            $directory = $this->fileLockRegionDirectory.DIRECTORY_SEPARATOR.$cache['region'];
             $region    = new FileLockRegion($region, $directory, $this->regionsConfig->getLockLifetime($cache['region']));
         }
 
@@ -236,7 +236,7 @@ 
     {
         $cacheAdapter = clone $this->cache;
 
-        if (!$cacheAdapter instanceof CacheProvider) {
+        if ( ! $cacheAdapter instanceof CacheProvider) {
             return $cacheAdapter;
         }
 
@@ -246,7 +246,7 @@ 
             $namespace .= ':';
         }
 
-        $cacheAdapter->setNamespace($namespace . $name);
+        $cacheAdapter->setNamespace($namespace.$name);
 
         return $cacheAdapter;
     }

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

Spacing +9 added lines, -9 removed lines

@@ -149,7 +149,7 @@ 
             $cacheAnnot = $classAnnotations[Mapping\Cache::class];
             $cacheMap   = [
                 'region' => $cacheAnnot->region,
-                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
+                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
             ];
 
             $metadata->enableCache($cacheMap);
@@ -237,7 +237,7 @@ 
             $inheritanceTypeAnnot = $classAnnotations[Mapping\InheritanceType::class];
 
             $metadata->setInheritanceType(
-                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value)
+                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceTypeAnnot->value)
             );
 
             if ($metadata->inheritanceType != Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
@@ -269,7 +269,7 @@ 
         // Evaluate DoctrineChangeTrackingPolicy annotation
         if (isset($classAnnotations[Mapping\ChangeTrackingPolicy::class])) {
             $changeTrackingAnnot = $classAnnotations[Mapping\ChangeTrackingPolicy::class];
-            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_' . $changeTrackingAnnot->value));
+            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_'.$changeTrackingAnnot->value));
         }
 
         // Evaluate annotations on properties/fields
@@ -293,7 +293,7 @@ 
                 $mapping['cache'] = $metadata->getAssociationCacheDefaults(
                     $mapping['fieldName'],
                     [
-                        'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
+                        'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
                         'region' => $cacheAnnot->region,
                     ]
                 );
@@ -323,7 +323,7 @@ 
                 }
 
                 if ($generatedValueAnnot = $this->reader->getPropertyAnnotation($property, Mapping\GeneratedValue::class)) {
-                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $generatedValueAnnot->strategy));
+                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'.$generatedValueAnnot->strategy));
                 }
 
                 if ($this->reader->getPropertyAnnotation($property, Mapping\Version::class)) {
@@ -472,7 +472,7 @@ 
 
                 // Check for `fetch`
                 if ($associationOverride->fetch) {
-                    $override['fetch'] = constant(Mapping\ClassMetadata::class . '::FETCH_' . $associationOverride->fetch);
+                    $override['fetch'] = constant(Mapping\ClassMetadata::class.'::FETCH_'.$associationOverride->fetch);
                 }
 
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -516,7 +516,7 @@ 
                 }
 
                 // Evaluate the listener using naming convention.
-                if ( ! $hasMapping ) {
+                if ( ! $hasMapping) {
                     EntityListenerBuilder::bindEntityListener($metadata, $listenerClassName);
                 }
             }
@@ -545,11 +545,11 @@ 
      */
     private function getFetchMode($className, $fetchMode)
     {
-        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) {
+        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode)) {
             throw MappingException::invalidFetchMode($className, $fetchMode);
         }
 
-        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode);
+        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode);
     }
 
     /**

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

Spacing +19 added lines, -19 removed lines

@@ -207,7 +207,7 @@ 
                 }
 
                 foreach ($data as $columnName => $value) {
-                    if (!is_array($id) || !isset($id[$columnName])) {
+                    if ( ! is_array($id) || ! isset($id[$columnName])) {
                         $stmt->bindValue($paramIndex++, $value, $this->columnTypes[$columnName]);
                     }
                 }
@@ -322,7 +322,7 @@ 
         // If the current class in the root entity, add the filters
         if ($filterSql = $this->generateFilterConditionSQL($this->em->getClassMetadata($this->class->rootEntityName), $this->getSQLTableAlias($this->class->rootEntityName))) {
             $conditionSql .= $conditionSql
-                ? ' AND ' . $filterSql
+                ? ' AND '.$filterSql
                 : $filterSql;
         }
 
@@ -341,29 +341,29 @@ 
         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->quoteStrategy->getTableName($this->class, $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) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -383,14 +383,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . 'FROM '.$tableName.' '.$baseTableAlias
             . $joinSql
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -409,16 +409,16 @@ 
             $conditions     = [];
             $tableAlias     = $this->getSQLTableAlias($parentClassName);
             $parentClass    = $this->em->getClassMetadata($parentClassName);
-            $joinSql       .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql       .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
         }
 
-        return parent::getLockTablesSql($lockMode) . $joinSql;
+        return parent::getLockTablesSql($lockMode).$joinSql;
     }
 
     /**
@@ -479,7 +479,7 @@ 
             ? $baseTableAlias
             : $this->getSQLTableAlias($this->class->rootEntityName);
 
-        $columnList[] = $tableAlias . '.' . $discrColumn;
+        $columnList[] = $tableAlias.'.'.$discrColumn;
 
         // sub tables
         foreach ($this->class->subClasses as $subClassName) {
@@ -586,11 +586,11 @@ 
             $conditions   = [];
             $parentClass  = $this->em->getClassMetadata($parentClassName);
             $tableAlias   = $this->getSQLTableAlias($parentClassName);
-            $joinSql     .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql     .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
@@ -601,10 +601,10 @@ 
             $conditions  = [];
             $subClass    = $this->em->getClassMetadata($subClassName);
             $tableAlias  = $this->getSQLTableAlias($subClassName);
-            $joinSql    .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql    .= ' LEFT JOIN '.$this->quoteStrategy->getTableName($subClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);

lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

Spacing +13 added lines, -13 removed lines

@@ -199,7 +199,7 @@ 
             $class->reflFields[$fieldName]->setValue($entity, $value);
             $this->_uow->setOriginalEntityProperty($oid, $fieldName, $value);
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else if (
             isset($this->_hints[Query::HINT_REFRESH]) ||
             isset($this->_hints['fetched'][$parentDqlAlias][$fieldName]) &&
@@ -210,10 +210,10 @@ 
             $value->setInitialized(true);
             $value->unwrap()->clear();
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else {
             // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN!
-            $this->existingCollections[$oid . $fieldName] = $value;
+            $this->existingCollections[$oid.$fieldName] = $value;
         }
 
         return $value;
@@ -287,7 +287,7 @@ 
             $idHash = '';
 
             foreach ($class->identifier as $fieldName) {
-                $idHash .= ' ' . (isset($class->associationMappings[$fieldName])
+                $idHash .= ' '.(isset($class->associationMappings[$fieldName])
                     ? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]
                     : $data[$fieldName]);
             }
@@ -343,7 +343,7 @@ 
                 $parentAlias = $this->_rsm->parentAliasMap[$dqlAlias];
                 // we need the $path to save into the identifier map which entities were already
                 // seen for this parent-child relationship
-                $path = $parentAlias . '.' . $dqlAlias;
+                $path = $parentAlias.'.'.$dqlAlias;
 
                 // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
                 if ( ! isset($nonemptyComponents[$parentAlias])) {
@@ -383,7 +383,7 @@ 
                     $reflFieldValue = $reflField->getValue($parentObject);
 
                     if (isset($nonemptyComponents[$dqlAlias])) {
-                        $collKey = $oid . $relationField;
+                        $collKey = $oid.$relationField;
                         if (isset($this->initializedCollections[$collKey])) {
                             $reflFieldValue = $this->initializedCollections[$collKey];
                         } else if ( ! isset($this->existingCollections[$collKey])) {
@@ -431,7 +431,7 @@ 
                     // PATH B: Single-valued association
                     $reflFieldValue = $reflField->getValue($parentObject);
 
-                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && !$reflFieldValue->__isInitialized__)) {
+                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && ! $reflFieldValue->__isInitialized__)) {
                         // we only need to take action if this value is null,
                         // we refresh the entity or its an uninitialized proxy.
                         if (isset($nonemptyComponents[$dqlAlias])) {
@@ -476,7 +476,7 @@ 
                 $entityKey = $this->_rsm->entityMappings[$dqlAlias] ?: 0;
 
                 // if this row has a NULL value for the root result id then make it a null result.
-                if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
                     if ($this->_rsm->isMixed) {
                         $result[] = [$entityKey => null];
                     } else {
@@ -532,13 +532,13 @@ 
             }
         }
 
-        if ( ! isset($resultKey) ) {
+        if ( ! isset($resultKey)) {
             $this->resultCounter++;
         }
 
         // Append scalar values to mixed result sets
         if (isset($rowData['scalars'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = (isset($this->_rsm->indexByMap['scalars']))
                     ? $row[$this->_rsm->indexByMap['scalars']]
                     : $this->resultCounter - 1;
@@ -551,19 +551,19 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 
 
-            $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0);
+            $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0);
 
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
                 $class  = $newObject['class'];
                 $args   = $newObject['args'];
                 $obj    = $class->newInstanceArgs($args);
 
-                if ($scalarCount == 0 && count($rowData['newObjects']) == 1 ) {
+                if ($scalarCount == 0 && count($rowData['newObjects']) == 1) {
                     $result[$resultKey] = $obj;
 
                     continue;

bin/doctrine-pear.php

Spacing +2 added lines, -2 removed lines

@@ -25,13 +25,13 @@
 $classLoader = new \Doctrine\Common\ClassLoader('Symfony');
 $classLoader->register();
 
-$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
+$configFile = getcwd().DIRECTORY_SEPARATOR.'cli-config.php';
 
 $helperSet = null;
 if (file_exists($configFile)) {
     if ( ! is_readable($configFile)) {
         trigger_error(
-            'Configuration file [' . $configFile . '] does not have read permission.', E_USER_ERROR
+            'Configuration file ['.$configFile.'] does not have read permission.', E_USER_ERROR
         );
     }
 

bin/doctrine.php

Spacing +5 added lines, -5 removed lines

@@ -21,8 +21,8 @@ 
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 
 $autoloadFiles = [
-    __DIR__ . '/../vendor/autoload.php',
-    __DIR__ . '/../../../autoload.php'
+    __DIR__.'/../vendor/autoload.php',
+    __DIR__.'/../../../autoload.php'
 ];
 
 foreach ($autoloadFiles as $autoloadFile) {
@@ -32,11 +32,11 @@ 
     }
 }
 
-$directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'];
+$directories = [getcwd(), getcwd().DIRECTORY_SEPARATOR.'config'];
 
 $configFile = null;
 foreach ($directories as $directory) {
-    $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
+    $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php';
 
     if (file_exists($configFile)) {
         break;
@@ -49,7 +49,7 @@ 
 }
 
 if ( ! is_readable($configFile)) {
-    echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n";
+    echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n";
     exit(1);
 }
 

tests/Doctrine/Tests/OrmFunctionalTestCase.php

Braces +6 added lines, -1 removed lines

@@ -787,7 +787,12 @@
             $queries = "";
             $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true);
             foreach ($last25queries as $i => $query) {
-                $params = array_map(function($p) { if (is_object($p)) return get_class($p); else return var_export($p, true); }, $query['params'] ?: []
+                $params = array_map(function($p) { if (is_object($p)) {
+                    return get_class($p);
+                } else {
+                    return var_export($p, true);
+                }
+                }, $query['params'] ?: []
                 );
                 $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(", ", $params).PHP_EOL;
             }

Spacing +18 added lines, -18 removed lines

@@ -400,7 +400,7 @@ 
             $conn->executeUpdate('DELETE FROM RoutingLocation');
         }
 
-        if(isset($this->_usedModelSets['navigation'])) {
+        if (isset($this->_usedModelSets['navigation'])) {
             $conn->executeUpdate('DELETE FROM navigation_tour_pois');
             $conn->executeUpdate('DELETE FROM navigation_photos');
             $conn->executeUpdate('DELETE FROM navigation_pois');
@@ -408,7 +408,7 @@ 
             $conn->executeUpdate('DELETE FROM navigation_countries');
         }
         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');
@@ -503,12 +503,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'])) {
@@ -647,9 +647,9 @@ 
 
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
             if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) {
-                static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
+                static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/');
             } else if (static::$_sharedConn->getDatabasePlatform()->getName() == "oracle") {
-                static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
+                static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual');
             }
         }
 
@@ -711,7 +711,7 @@ 
         $config = new Configuration();
         $config->setMetadataCacheImpl(self::$_metadataCacheImpl);
         $config->setQueryCacheImpl(self::$_queryCacheImpl);
-        $config->setProxyDir(__DIR__ . '/Proxies');
+        $config->setProxyDir(__DIR__.'/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
 
         if (null !== $this->resultCacheImpl) {
@@ -743,8 +743,8 @@ 
         $config->setMetadataDriverImpl(
             $mappingDriver ?? $config->newDefaultAnnotationDriver(
                 [
-                    realpath(__DIR__ . '/Models/Cache'),
-                    realpath(__DIR__ . '/Models/GeoNames')
+                    realpath(__DIR__.'/Models/Cache'),
+                    realpath(__DIR__.'/Models/GeoNames')
                 ],
                 true
             )
@@ -792,7 +792,7 @@ 
             throw $e;
         }
 
-        if(isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) {
+        if (isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) {
             $queries = "";
             $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true);
             foreach ($last25queries as $i => $query) {
@@ -803,9 +803,9 @@ 
 
             $trace = $e->getTrace();
             $traceMsg = "";
-            foreach($trace AS $part) {
-                if(isset($part['file'])) {
-                    if(strpos($part['file'], "PHPUnit/") !== false) {
+            foreach ($trace AS $part) {
+                if (isset($part['file'])) {
+                    if (strpos($part['file'], "PHPUnit/") !== false) {
                         // Beginning with PHPUnit files we don't print the trace anymore.
                         break;
                     }
@@ -816,7 +816,7 @@ 
 
             $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);
+            throw new \Exception($message, (int) $e->getCode(), $e);
         }
         throw $e;
     }

tests/Doctrine/Tests/TestInit.php

Spacing +8 added lines, -8 removed lines

@@ -7,21 +7,21 @@
 error_reporting(E_ALL | E_STRICT);
 date_default_timezone_set('UTC');
 
-if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) {
+if (file_exists(__DIR__.'/../../../vendor/autoload.php')) {
     // dependencies were installed via composer - this is the main project
-    require __DIR__ . '/../../../vendor/autoload.php';
-} elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) {
+    require __DIR__.'/../../../vendor/autoload.php';
+} elseif (file_exists(__DIR__.'/../../../../../autoload.php')) {
     // installed as a dependency in `vendor`
-    require __DIR__ . '/../../../../../autoload.php';
+    require __DIR__.'/../../../../../autoload.php';
 } else {
     throw new \Exception('Can\'t find autoload.php. Did you install dependencies via composer?');
 }
 
-if ( ! file_exists(__DIR__ . '/Proxies') && ! mkdir(__DIR__ . '/Proxies')) {
-    throw new \Exception("Could not create " . __DIR__."/Proxies Folder.");
+if ( ! file_exists(__DIR__.'/Proxies') && ! mkdir(__DIR__.'/Proxies')) {
+    throw new \Exception("Could not create ".__DIR__."/Proxies Folder.");
 }
 
-if ( ! file_exists(__DIR__ . '/ORM/Proxy/generated') &&  ! mkdir(__DIR__ . '/ORM/Proxy/generated')) {
-    throw new \Exception('Could not create ' . __DIR__ . '/ORM/Proxy/generated Folder.');
+if ( ! file_exists(__DIR__.'/ORM/Proxy/generated') && ! mkdir(__DIR__.'/ORM/Proxy/generated')) {
+    throw new \Exception('Could not create '.__DIR__.'/ORM/Proxy/generated Folder.');
 }