doctrine / orm

lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php

Spacing +10 added lines, -10 removed lines

@@ -51,27 +51,27 @@ 
         }
 
         if ($metadata->inheritanceType) {
-            $lines[] = '$metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_' . $this->_getInheritanceTypeString($metadata->inheritanceType) . ');';
+            $lines[] = '$metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_'.$this->_getInheritanceTypeString($metadata->inheritanceType).');';
         }
 
         if ($metadata->customRepositoryClassName) {
-            $lines[] = "\$metadata->customRepositoryClassName = '" . $metadata->customRepositoryClassName . "';";
+            $lines[] = "\$metadata->customRepositoryClassName = '".$metadata->customRepositoryClassName."';";
         }
 
         if ($metadata->table) {
-            $lines[] = '$metadata->setPrimaryTable(' . $this->_varExport($metadata->table) . ');';
+            $lines[] = '$metadata->setPrimaryTable('.$this->_varExport($metadata->table).');';
         }
 
         if ($metadata->discriminatorColumn) {
-            $lines[] = '$metadata->setDiscriminatorColumn(' . $this->_varExport($metadata->discriminatorColumn) . ');';
+            $lines[] = '$metadata->setDiscriminatorColumn('.$this->_varExport($metadata->discriminatorColumn).');';
         }
 
         if ($metadata->discriminatorMap) {
-            $lines[] = '$metadata->setDiscriminatorMap(' . $this->_varExport($metadata->discriminatorMap) . ');';
+            $lines[] = '$metadata->setDiscriminatorMap('.$this->_varExport($metadata->discriminatorMap).');';
         }
 
         if ($metadata->changeTrackingPolicy) {
-            $lines[] = '$metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_' . $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy) . ');';
+            $lines[] = '$metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_'.$this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy).');';
         }
 
         if ($metadata->lifecycleCallbacks) {
@@ -85,11 +85,11 @@ 
         $lines = array_merge($lines, $this->processEntityListeners($metadata));
 
         foreach ($metadata->fieldMappings as $fieldMapping) {
-            $lines[] = '$metadata->mapField(' . $this->_varExport($fieldMapping) . ');';
+            $lines[] = '$metadata->mapField('.$this->_varExport($fieldMapping).');';
         }
 
         if ( ! $metadata->isIdentifierComposite && $generatorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
-            $lines[] = '$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_' . $generatorType . ');';
+            $lines[] = '$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_'.$generatorType.');';
         }
 
         foreach ($metadata->associationMappings as $associationMapping) {
@@ -155,7 +155,7 @@ 
                 $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray);
             }
 
-            $lines[] = '$metadata->' . $method . '(' . $this->_varExport($associationMappingArray) . ');';
+            $lines[] = '$metadata->'.$method.'('.$this->_varExport($associationMappingArray).');';
         }
 
         return implode("\n", $lines);
@@ -169,7 +169,7 @@ 
     protected function _varExport($var)
     {
         $export = var_export($var, true);
-        $export = str_replace("\n", PHP_EOL . str_repeat(' ', 8), $export);
+        $export = str_replace("\n", PHP_EOL.str_repeat(' ', 8), $export);
         $export = str_replace('  ', ' ', $export);
         $export = str_replace('array (', 'array(', $export);
         $export = str_replace('array( ', 'array(', $export);

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

Spacing +13 added lines, -13 removed lines

@@ -109,7 +109,7 @@ 
         // Evaluate named native queries
         if (isset($element['namedNativeQueries'])) {
             foreach ($element['namedNativeQueries'] as $name => $mappingElement) {
-                if (!isset($mappingElement['name'])) {
+                if ( ! isset($mappingElement['name'])) {
                     $mappingElement['name'] = $name;
                 }
                 $metadata->addNamedNativeQuery(
@@ -126,7 +126,7 @@ 
         // Evaluate sql result set mappings
         if (isset($element['sqlResultSetMappings'])) {
             foreach ($element['sqlResultSetMappings'] as $name => $resultSetMapping) {
-                if (!isset($resultSetMapping['name'])) {
+                if ( ! isset($resultSetMapping['name'])) {
                     $resultSetMapping['name'] = $name;
                 }
 
@@ -173,7 +173,7 @@ 
         }
 
         if (isset($element['inheritanceType'])) {
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.strtoupper($element['inheritanceType'])));
 
             if ($metadata->inheritanceType != Metadata::INHERITANCE_TYPE_NONE) {
                 // Evaluate discriminatorColumn
@@ -362,7 +362,7 @@ 
                 }
 
                 if (isset($oneToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToOneElement['fetch']);
                 }
 
                 if (isset($oneToOneElement['mappedBy'])) {
@@ -416,7 +416,7 @@ 
                 ];
 
                 if (isset($oneToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToManyElement['fetch']);
                 }
 
                 if (isset($oneToManyElement['cascade'])) {
@@ -458,7 +458,7 @@ 
                 }
 
                 if (isset($manyToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToOneElement['fetch']);
                 }
 
                 if (isset($manyToOneElement['inversedBy'])) {
@@ -503,7 +503,7 @@ 
                 ];
 
                 if (isset($manyToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToManyElement['fetch']);
                 }
 
                 if (isset($manyToManyElement['mappedBy'])) {
@@ -573,7 +573,7 @@ 
         if (isset($element['associationOverride']) && is_array($element['associationOverride'])) {
 
             foreach ($element['associationOverride'] as $fieldName => $associationOverrideElement) {
-                $override   = [];
+                $override = [];
 
                 // Check for joinColumn
                 if (isset($associationOverrideElement['joinColumn'])) {
@@ -591,7 +591,7 @@ 
                 if (isset($associationOverrideElement['joinTable'])) {
 
                     $joinTableElement   = $associationOverrideElement['joinTable'];
-                    $joinTable          =  [
+                    $joinTable          = [
                         'name' => $joinTableElement['name']
                     ];
 
@@ -625,7 +625,7 @@ 
 
                 // Check for `fetch`
                 if (isset($associationOverrideElement['fetch'])) {
-                    $override['fetch'] = constant(Metadata::class . '::FETCH_' . $associationOverrideElement['fetch']);
+                    $override['fetch'] = constant(Metadata::class.'::FETCH_'.$associationOverrideElement['fetch']);
                 }
 
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -645,7 +645,7 @@ 
         if (isset($element['lifecycleCallbacks'])) {
             foreach ($element['lifecycleCallbacks'] as $type => $methods) {
                 foreach ($methods as $method) {
-                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::' . $type));
+                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::'.$type));
                 }
             }
         }
@@ -787,12 +787,12 @@ 
         $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null;
         $usage  = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null;
 
-        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) {
+        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) {
             throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage));
         }
 
         if ($usage) {
-            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage);
+            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage);
         }
 
         return [

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

Spacing +10 added lines, -10 removed lines

@@ -208,8 +208,8 @@ 
         $sqlIdentifier = $this->getSQLIdentifier($AST);
 
         if ($hasOrderBy) {
-            $orderGroupBy = ' GROUP BY ' . implode(', ', $sqlIdentifier);
-            $sqlIdentifier[] = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum';
+            $orderGroupBy = ' GROUP BY '.implode(', ', $sqlIdentifier);
+            $sqlIdentifier[] = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum';
         }
 
         // Build the counter query
@@ -220,7 +220,7 @@ 
         );
 
         if ($hasOrderBy) {
-            $sql .= $orderGroupBy . $outerOrderBy;
+            $sql .= $orderGroupBy.$outerOrderBy;
         }
 
         // Apply the limit and offset.
@@ -323,7 +323,7 @@ 
         foreach ($orderByPathExpressions as $pathExpression) {
             $idVar = $pathExpression->identificationVariable;
             $field = $pathExpression->field;
-            if (!isset($selects[$idVar])) {
+            if ( ! isset($selects[$idVar])) {
                 $selects[$idVar] = [];
             }
             $selects[$idVar][$field] = true;
@@ -334,7 +334,7 @@ 
         foreach ($AST->selectClause->selectExpressions as $selectExpression) {
             if ($selectExpression instanceof SelectExpression) {
                 $idVar = $selectExpression->expression;
-                if (!is_string($idVar)) {
+                if ( ! is_string($idVar)) {
                     continue;
                 }
                 $field = $selectExpression->fieldIdentificationVariable;
@@ -370,7 +370,7 @@ 
         ?OrderByClause $orderByClause
     ) : string {
         // If the sql statement has an order by clause, we need to wrap it in a new select distinct statement
-        if (! $orderByClause) {
+        if ( ! $orderByClause) {
             return $sql;
         }
 
@@ -412,7 +412,7 @@ 
             $orderByItems[] = $orderByItemString;
             $identifier     = \substr($orderByItemString, 0, \strrpos($orderByItemString, ' '));
 
-            if (! \in_array($identifier, $identifiers, true)) {
+            if ( ! \in_array($identifier, $identifiers, true)) {
                 $identifiers[] = $identifier;
             }
         }
@@ -444,7 +444,7 @@ 
             $class = $metadataList[$dqlAliasForFieldAlias];
 
             // If the field is from a joined child table, we won't be ordering on it.
-            if (! isset($class->fieldMappings[$fieldName])) {
+            if ( ! isset($class->fieldMappings[$fieldName])) {
                 continue;
             }
 
@@ -465,7 +465,7 @@ 
                 // for the joined parent table.
                 $otherClassMetadata = $this->em->getClassMetadata($fieldMapping['declared']);
 
-                if (! $otherClassMetadata->isMappedSuperclass) {
+                if ( ! $otherClassMetadata->isMappedSuperclass) {
                     $sqlTableAliasForFieldAlias = $this->getSQLTableAlias($otherClassMetadata->getTableName(), $dqlAliasForFieldAlias);
                 }
             }
@@ -582,7 +582,7 @@ 
      */
     public function walkPathExpression($pathExpr)
     {
-        if (!$this->inSubSelect && !$this->platformSupportsRowNumber() && !in_array($pathExpr, $this->orderByPathExpressions)) {
+        if ( ! $this->inSubSelect && ! $this->platformSupportsRowNumber() && ! in_array($pathExpr, $this->orderByPathExpressions)) {
             $this->orderByPathExpressions[] = $pathExpr;
         }
 

lib/Doctrine/ORM/ORMInvalidArgumentException.php

Indentation +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 
     /**
      * @param array[][]|object[][] $newEntitiesWithAssociations non-empty an array
- *                                                              of [array $associationMapping, object $entity] pairs
+     *                                                              of [array $associationMapping, object $entity] pairs
      *
      * @return ORMInvalidArgumentException
      */

Spacing +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
      */
     static public function scheduleInsertForManagedEntity($entity)
     {
-        return new self("A managed+dirty entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("A managed+dirty entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     static public function scheduleInsertForRemovedEntity($entity)
     {
-        return new self("Removed entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("Removed entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     static public function scheduleInsertTwice($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " can not be scheduled for insertion twice.");
+        return new self("Entity ".self::objToStr($entity)." can not be scheduled for insertion twice.");
     }
 
     /**
@@ -66,7 +66,7 @@ 
     static public function entityWithoutIdentity($className, $entity)
     {
         return new self(
-            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " .
+            "The given entity of type '".$className."' (".self::objToStr($entity).") has no identity/no ".
             "id values set. It cannot be added to the identity map."
         );
     }
@@ -78,7 +78,7 @@ 
      */
     static public function readOnlyRequiresManagedEntity($entity)
     {
-        return new self("Only managed entities can be marked or checked as read only. But " . self::objToStr($entity) . " is not");
+        return new self("Only managed entities can be marked or checked as read only. But ".self::objToStr($entity)." is not");
     }
 
     /**
@@ -90,7 +90,7 @@ 
     static public function newEntitiesFoundThroughRelationships($newEntitiesWithAssociations)
     {
         $errorMessages = array_map(
-            function (array $newEntityWithAssociation) : string {
+            function(array $newEntityWithAssociation) : string {
                 [$associationMapping, $entity] = $newEntityWithAssociation;
 
                 return self::newEntityFoundThroughRelationshipMessage($associationMapping, $entity);
@@ -128,8 +128,8 @@ 
      */
     static public function detachedEntityFoundThroughRelationship(array $assoc, $entry)
     {
-        return new self("A detached entity of type " . $assoc['targetEntity'] . " (" . self::objToStr($entry) . ") "
-            . " was found through the relationship '" . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' "
+        return new self("A detached entity of type ".$assoc['targetEntity']." (".self::objToStr($entry).") "
+            . " was found through the relationship '".$assoc['sourceEntity']."#".$assoc['fieldName']."' "
             . "during cascading a persist operation.");
     }
 
@@ -140,7 +140,7 @@ 
      */
     static public function entityNotManaged($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
+        return new self("Entity ".self::objToStr($entity)." is not managed. An entity is managed if its fetched ".
             "from the database or registered as new through EntityManager#persist");
     }
 
@@ -152,7 +152,7 @@ 
      */
     static public function entityHasNoIdentity($entity, $operation)
     {
-        return new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity has no identity, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -163,7 +163,7 @@ 
      */
     static public function entityIsRemoved($entity, $operation)
     {
-        return new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity is removed, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -174,7 +174,7 @@ 
      */
     static public function detachedEntityCannot($entity, $operation)
     {
-        return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation);
+        return new self("Detached entity ".self::objToStr($entity)." cannot be ".$operation);
     }
 
     /**
@@ -186,8 +186,8 @@ 
      */
     public static function invalidObject($context, $given, $parameterIndex = 1)
     {
-        return new self($context . ' expects parameter ' . $parameterIndex .
-            ' to be an entity object, '. gettype($given) . ' given.');
+        return new self($context.' expects parameter '.$parameterIndex.
+            ' to be an entity object, '.gettype($given).' given.');
     }
 
     /**
@@ -195,7 +195,7 @@ 
      */
     public static function invalidCompositeIdentifier()
     {
-        return new self("Binding an entity with a composite primary key to a query is not supported. " .
+        return new self("Binding an entity with a composite primary key to a query is not supported. ".
             "You should split the parameter into the explicit fields and bind them separately.");
     }
 
@@ -262,15 +262,15 @@ 
     private static function newEntityFoundThroughRelationshipMessage(array $associationMapping, $entity) : string
     {
         return 'A new entity was found through the relationship \''
-            . $associationMapping['sourceEntity'] . '#' . $associationMapping['fieldName'] . '\' that was not'
-            . ' configured to cascade persist operations for entity: ' . self::objToStr($entity) . '.'
+            . $associationMapping['sourceEntity'].'#'.$associationMapping['fieldName'].'\' that was not'
+            . ' configured to cascade persist operations for entity: '.self::objToStr($entity).'.'
             . ' To solve this issue: Either explicitly call EntityManager#persist()'
             . ' on this unknown entity or configure cascade persist'
             . ' this association in the mapping for example @ManyToOne(..,cascade={"persist"}).'
             . (method_exists($entity, '__toString')
                 ? ''
                 : ' If you cannot find out which entity causes the problem implement \''
-                . $associationMapping['targetEntity'] . '#__toString()\' to get a clue.'
+                . $associationMapping['targetEntity'].'#__toString()\' to get a clue.'
             );
     }
 }

tests/Doctrine/Tests/ORM/ORMInvalidArgumentExceptionTest.php

Spacing +8 added lines, -8 removed lines

@@ -81,12 +81,12 @@ 
             'fieldName'    => 'bar1',
             'targetEntity' => 'baz1',
         ];
-        $association2  = [
+        $association2 = [
             'sourceEntity' => 'foo2',
             'fieldName'    => 'bar2',
             'targetEntity' => 'baz2',
         ];
-        $association3  = [
+        $association3 = [
             'sourceEntity' => 'foo3',
             'fieldName'    => 'bar3',
             'targetEntity' => 'baz3',
@@ -103,7 +103,7 @@ 
                     ],
                 ],
                 'A new entity was found through the relationship \'foo1#bar1\' that was not configured to cascade '
-                . 'persist operations for entity: stdClass@' . spl_object_hash($entity1)
+                . 'persist operations for entity: stdClass@'.spl_object_hash($entity1)
                 . '. To solve this issue: Either explicitly call EntityManager#persist() on this unknown entity '
                 . 'or configure cascade persist this association in the mapping for example '
                 . '@ManyToOne(..,cascade={"persist"}). If you cannot find out which entity causes the problem '
@@ -120,15 +120,15 @@ 
                         $entity2,
                     ],
                 ],
-                'Multiple non-persisted new entities were found through the given association graph:' . "\n\n"
+                'Multiple non-persisted new entities were found through the given association graph:'."\n\n"
                 . ' * A new entity was found through the relationship \'foo1#bar1\' that was not configured to '
-                . 'cascade persist operations for entity: stdClass@' . spl_object_hash($entity1) . '. '
+                . 'cascade persist operations for entity: stdClass@'.spl_object_hash($entity1).'. '
                 . 'To solve this issue: Either explicitly call EntityManager#persist() on this unknown entity '
                 . 'or configure cascade persist this association in the mapping for example '
                 . '@ManyToOne(..,cascade={"persist"}). If you cannot find out which entity causes the problem '
-                . 'implement \'baz1#__toString()\' to get a clue.' . "\n"
+                . 'implement \'baz1#__toString()\' to get a clue.'."\n"
                 . ' * A new entity was found through the relationship \'foo2#bar2\' that was not configured to '
-                . 'cascade persist operations for entity: stdClass@' . spl_object_hash($entity2) . '. To solve '
+                . 'cascade persist operations for entity: stdClass@'.spl_object_hash($entity2).'. To solve '
                 . 'this issue: Either explicitly call EntityManager#persist() on this unknown entity or '
                 . 'configure cascade persist this association in the mapping for example '
                 . '@ManyToOne(..,cascade={"persist"}). If you cannot find out which entity causes the problem '
@@ -142,7 +142,7 @@ 
                     ],
                 ],
                 'A new entity was found through the relationship \'foo3#bar3\' that was not configured to cascade '
-                . 'persist operations for entity: ' . $stringEntity3
+                . 'persist operations for entity: '.$stringEntity3
                 . '. To solve this issue: Either explicitly call EntityManager#persist() on this unknown entity '
                 . 'or configure cascade persist this association in the mapping for example '
                 . '@ManyToOne(..,cascade={"persist"}).',

tests/Doctrine/Performance/Hydration/SimpleInsertPerformanceBench.php

Spacing +4 added lines, -4 removed lines

@@ -43,8 +43,8 @@ 
         for ($i = 1; $i <= 10000; ++$i) {
             $user           = new CMS\CmsUser;
             $user->status   = 'user';
-            $user->username = 'user' . $i;
-            $user->name     = 'Mr.Smith-' . $i;
+            $user->username = 'user'.$i;
+            $user->name     = 'Mr.Smith-'.$i;
 
             $this->users[$i] = $user;
         }
@@ -57,12 +57,12 @@ 
         // Yes, this is a lot of overhead, but I have no better solution other than
         // completely mocking out the DB, which would be silly (query impact is
         // necessarily part of our benchmarks)
-        $this->entityManager->getConnection()->executeQuery('DELETE FROM ' . $this->tableName)->execute();
+        $this->entityManager->getConnection()->executeQuery('DELETE FROM '.$this->tableName)->execute();
 
         foreach ($this->users as $key => $user) {
             $this->entityManager->persist($user);
 
-            if (! ($key % 20)) {
+            if ( ! ($key % 20)) {
                 $this->entityManager->flush();
                 $this->entityManager->clear();
             }

lib/Doctrine/ORM/Tools/ToolsException.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 {
     public static function schemaToolFailure(string $sql, Throwable $e) : self
     {
-        return new self("Schema-Tool failed with Error '" . $e->getMessage() . "' while executing DDL: " . $sql, "0", $e);
+        return new self("Schema-Tool failed with Error '".$e->getMessage()."' while executing DDL: ".$sql, "0", $e);
     }
 
     /**

lib/Doctrine/ORM/QueryBuilder.php

Indentation +26 added lines, -26 removed lines

@@ -118,11 +118,11 @@ 
      */
     private $joinRootAliases = [];
 
-     /**
-     * Whether to use second level cache, if available.
-     *
-     * @var boolean
-     */
+        /**
+         * Whether to use second level cache, if available.
+         *
+         * @var boolean
+         */
     protected $cacheable = false;
 
     /**
@@ -213,10 +213,10 @@ 
     }
 
     /**
-    * Obtain the name of the second level query cache region in which query results will be stored
-    *
-    * @return string|null The cache region name; NULL indicates the default region.
-    */
+     * Obtain the name of the second level query cache region in which query results will be stored
+     *
+     * @return string|null The cache region name; NULL indicates the default region.
+     */
     public function getCacheRegion()
     {
         return $this->cacheRegion;
@@ -1373,10 +1373,10 @@ 
      */
     private function _getDQLForDelete()
     {
-         return 'DELETE'
-              . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
-              . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+            return 'DELETE'
+                . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
+                . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
     }
 
     /**
@@ -1384,11 +1384,11 @@ 
      */
     private function _getDQLForUpdate()
     {
-         return 'UPDATE'
-              . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
-              . $this->_getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', '])
-              . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+            return 'UPDATE'
+                . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
+                . $this->_getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', '])
+                . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
     }
 
     /**
@@ -1397,8 +1397,8 @@ 
     private function _getDQLForSelect()
     {
         $dql = 'SELECT'
-             . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '')
-             . $this->_getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
+                . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '')
+                . $this->_getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
 
         $fromParts   = $this->getDQLPart('from');
         $joinParts   = $this->getDQLPart('join');
@@ -1422,10 +1422,10 @@ 
         }
 
         $dql .= implode(', ', $fromClauses)
-              . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->_getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', '])
-              . $this->_getReducedDQLQueryPart('having', ['pre' => ' HAVING '])
-              . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+                . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->_getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', '])
+                . $this->_getReducedDQLQueryPart('having', ['pre' => ' HAVING '])
+                . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
 
         return $dql;
     }
@@ -1445,8 +1445,8 @@ 
         }
 
         return ($options['pre'] ?? '')
-             . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
-             . ($options['post'] ?? '');
+                . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
+                . ($options['post'] ?? '');
     }
 
     /**

Spacing +9 added lines, -9 removed lines

@@ -603,7 +603,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function (Query\Parameter $parameter) use ($key) : bool {
+            function(Query\Parameter $parameter) use ($key) : bool {
                 $parameterName = $parameter->getName();
 
                 return $key === $parameterName || (string) $key === (string) $parameterName;
@@ -685,7 +685,7 @@ 
         }
 
         $isMultiple = is_array($this->_dqlParts[$dqlPartName])
-            && !($dqlPartName == 'join' && !$append);
+            && ! ($dqlPartName == 'join' && ! $append);
 
         // Allow adding any part retrieved from self::getDQLParts().
         if (is_array($dqlPart) && $dqlPartName != 'join') {
@@ -902,7 +902,7 @@ 
     {
         $rootAliases = $this->getRootAliases();
 
-        if (!in_array($alias, $rootAliases)) {
+        if ( ! in_array($alias, $rootAliases)) {
             throw new Query\QueryException(
                 sprintf('Specified root alias %s must be set before invoking indexBy().', $alias)
             );
@@ -1304,15 +1304,15 @@ 
             foreach ($criteria->getOrderings() as $sort => $order) {
 
                 $hasValidAlias = false;
-                foreach($allAliases as $alias) {
-                    if(strpos($sort . '.', $alias . '.') === 0) {
+                foreach ($allAliases as $alias) {
+                    if (strpos($sort.'.', $alias.'.') === 0) {
                         $hasValidAlias = true;
                         break;
                     }
                 }
 
-                if(!$hasValidAlias) {
-                    $sort = $allAliases[0] . '.' . $sort;
+                if ( ! $hasValidAlias) {
+                    $sort = $allAliases[0].'.'.$sort;
                 }
 
                 $this->addOrderBy($sort, $order);
@@ -1385,7 +1385,7 @@ 
     private function _getDQLForSelect()
     {
         $dql = 'SELECT'
-             . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '')
+             . ($this->_dqlParts['distinct'] === true ? ' DISTINCT' : '')
              . $this->_getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
 
         $fromParts   = $this->getDQLPart('from');
@@ -1401,7 +1401,7 @@ 
 
                 if ($from instanceof Expr\From && isset($joinParts[$from->getAlias()])) {
                     foreach ($joinParts[$from->getAlias()] as $join) {
-                        $fromClause .= ' ' . ((string) $join);
+                        $fromClause .= ' '.((string) $join);
                     }
                 }
 

lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -203,7 +203,7 @@ 
     {
         switch ($mode) {
             case self::COLUMN_RENAMING_INCREMENT:
-                return $columnName . $this->sqlCounter++;
+                return $columnName.$this->sqlCounter++;
 
             case self::COLUMN_RENAMING_CUSTOM:
                 return $customRenameColumns[$columnName] ?? $columnName;
@@ -325,19 +325,19 @@ 
         $counter        = 0;
         $resultMapping  = $class->getSqlResultSetMapping($resultSetMappingName);
         $rootShortName  = $class->reflClass->getShortName();
-        $rootAlias      = strtolower($rootShortName[0]) . $counter;
+        $rootAlias      = strtolower($rootShortName[0]).$counter;
 
 
         if (isset($resultMapping['entities'])) {
             foreach ($resultMapping['entities'] as $key => $entityMapping) {
-                $classMetadata  = $this->em->getClassMetadata($entityMapping['entityClass']);
+                $classMetadata = $this->em->getClassMetadata($entityMapping['entityClass']);
 
                 if ($class->reflClass->name == $classMetadata->reflClass->name) {
                     $this->addEntityResult($classMetadata->name, $rootAlias);
                     $this->addNamedNativeQueryEntityResultMapping($classMetadata, $entityMapping, $rootAlias);
                 } else {
                     $shortName      = $classMetadata->reflClass->getShortName();
-                    $joinAlias      = strtolower($shortName[0]) . ++ $counter;
+                    $joinAlias      = strtolower($shortName[0]).++ $counter;
                     $associations   = $class->getAssociationsByTargetClass($classMetadata->name);
 
                     $this->addNamedNativeQueryEntityResultMapping($classMetadata, $entityMapping, $joinAlias);
@@ -385,7 +385,7 @@ 
             $this->addMetaResult($alias, $discriminatorColumn, $discriminatorColumn, false, $discriminatorType);
         }
 
-        if (isset($entityMapping['fields']) && !empty($entityMapping['fields'])) {
+        if (isset($entityMapping['fields']) && ! empty($entityMapping['fields'])) {
             foreach ($entityMapping['fields'] as $field) {
                 $fieldName = $field['name'];
                 $relation  = null;
@@ -446,7 +446,7 @@ 
                 $sql .= ", ";
             }
 
-            $sql .= $tableAlias . ".";
+            $sql .= $tableAlias.".";
 
             if (isset($this->fieldMappings[$columnName])) {
                 $class = $this->em->getClassMetadata($this->declaringClasses[$columnName]);
@@ -457,7 +457,7 @@ 
                 $sql .= $this->discriminatorColumns[$dqlAlias];
             }
 
-            $sql .= " AS " . $columnName;
+            $sql .= " AS ".$columnName;
         }
 
         return $sql;