doctrine / orm

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

lib/Doctrine/ORM/UnitOfWork.php

Spacing +54 added lines, -54 removed lines

@@ -340,7 +340,7 @@ 
 
         $this->computeChangeSets();
 
-        if (! ($this->entityInsertions ||
+        if ( ! ($this->entityInsertions ||
                 $this->entityDeletions ||
                 $this->entityUpdates ||
                 $this->collectionUpdates ||
@@ -401,7 +401,7 @@ 
             // Entity deletions come last and need to be in reverse commit order
             if ($this->entityDeletions) {
                 foreach (array_reverse($commitOrder) as $committedEntityName) {
-                    if (! $this->entityDeletions) {
+                    if ( ! $this->entityDeletions) {
                         break; // just a performance optimisation
                     }
 
@@ -485,7 +485,7 @@ 
         $oid  = spl_object_id($entity);
         $data = [];
 
-        if (! isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -565,12 +565,12 @@ 
                     || ! $class->getProperty($name) instanceof FieldMetadata
                     || ! $class->getProperty($name)->hasValueGenerator()
                     || $class->getProperty($name)->getValueGenerator()->getType() !== GeneratorType::IDENTITY
-                ) && (! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
+                ) && ( ! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
                 $actualData[$name] = $value;
             }
         }
 
-        if (! isset($this->originalEntityData[$oid])) {
+        if ( ! isset($this->originalEntityData[$oid])) {
             // Entity is either NEW or MANAGED but not yet fully persisted (only has an id).
             // These result in an INSERT.
             $this->originalEntityData[$oid] = $actualData;
@@ -597,7 +597,7 @@ 
 
             foreach ($actualData as $propName => $actualValue) {
                 // skip field, its a partially omitted one!
-                if (! (isset($originalData[$propName]) || array_key_exists($propName, $originalData))) {
+                if ( ! (isset($originalData[$propName]) || array_key_exists($propName, $originalData))) {
                     continue;
                 }
 
@@ -619,7 +619,7 @@ 
                     if ($owner === null) { // cloned
                         $actualValue->setOwner($entity, $property);
                     } elseif ($owner !== $entity) { // no clone, we have to fix
-                        if (! $actualValue->isInitialized()) {
+                        if ( ! $actualValue->isInitialized()) {
                             $actualValue->initialize(); // we have to do this otherwise the cols share state
                         }
 
@@ -657,7 +657,7 @@ 
                         // Check if original value exists
                         if ($orgValue instanceof PersistentCollection) {
                             // A PersistentCollection was de-referenced, so delete it.
-                            if (! $this->isCollectionScheduledForDeletion($orgValue)) {
+                            if ( ! $this->isCollectionScheduledForDeletion($orgValue)) {
                                 $this->scheduleCollectionDeletion($orgValue);
 
                                 $changeSet[$propName] = $orgValue; // Signal changeset, to-many associations will be ignored
@@ -680,7 +680,7 @@ 
 
         // Look for changes in associations of the entity
         foreach ($class->getDeclaredPropertiesIterator() as $property) {
-            if (! $property instanceof AssociationMetadata) {
+            if ( ! $property instanceof AssociationMetadata) {
                 continue;
             }
 
@@ -747,7 +747,7 @@ 
                 // Only MANAGED entities that are NOT SCHEDULED FOR INSERTION OR DELETION are processed here.
                 $oid = spl_object_id($entity);
 
-                if (! isset($this->entityInsertions[$oid]) && ! isset($this->entityDeletions[$oid]) && isset($this->entityStates[$oid])) {
+                if ( ! isset($this->entityInsertions[$oid]) && ! isset($this->entityDeletions[$oid]) && isset($this->entityStates[$oid])) {
                     $this->computeChangeSet($class, $entity);
                 }
             }
@@ -784,13 +784,13 @@ 
         $targetClass    = $this->em->getClassMetadata($targetEntity);
 
         foreach ($unwrappedValue as $key => $entry) {
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $association, $entry);
             }
 
             $state = $this->getEntityState($entry, self::STATE_NEW);
 
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw UnexpectedAssociationValue::create(
                     $association->getSourceEntity(),
                     $association->getName(),
@@ -801,7 +801,7 @@ 
 
             switch ($state) {
                 case self::STATE_NEW:
-                    if (! in_array('persist', $association->getCascade(), true)) {
+                    if ( ! in_array('persist', $association->getCascade(), true)) {
                         $this->nonCascadedNewDetectedEntities[spl_object_id($entry)] = [$association, $entry];
 
                         break;
@@ -850,12 +850,12 @@ 
         $persister      = $this->getEntityPersister($class->getClassName());
         $generationPlan->executeImmediate($this->em, $entity);
 
-        if (! $generationPlan->containsDeferred()) {
+        if ( ! $generationPlan->containsDeferred()) {
             $id = $this->em->getIdentifierFlattener()->flattenIdentifier($class, $persister->getIdentifier($entity));
 
             // Some identifiers may be foreign keys to new entities.
             // In this case, we don't have the value yet and should treat it as if we have a post-insert generator
-            if (! $this->hasMissingIdsWhichAreForeignKeys($class, $id)) {
+            if ( ! $this->hasMissingIdsWhichAreForeignKeys($class, $id)) {
                 $this->entityIdentifiers[$oid] = $id;
             }
         }
@@ -900,7 +900,7 @@ 
     {
         $oid = spl_object_id($entity);
 
-        if (! isset($this->entityStates[$oid]) || $this->entityStates[$oid] !== self::STATE_MANAGED) {
+        if ( ! isset($this->entityStates[$oid]) || $this->entityStates[$oid] !== self::STATE_MANAGED) {
             throw ORMInvalidArgumentException::entityNotManaged($entity);
         }
 
@@ -922,7 +922,7 @@ 
                     break;
 
                 case $property instanceof FieldMetadata:
-                    if (! $property->isPrimaryKey()
+                    if ( ! $property->isPrimaryKey()
                         || ! $property->getValueGenerator()
                         || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY) {
                         $actualData[$name] = $property->getValue($entity);
@@ -936,7 +936,7 @@ 
             }
         }
 
-        if (! isset($this->originalEntityData[$oid])) {
+        if ( ! isset($this->originalEntityData[$oid])) {
             throw new RuntimeException('Cannot call recomputeSingleEntityChangeSet before computeChangeSet on an entity.');
         }
 
@@ -954,7 +954,7 @@ 
         if ($changeSet) {
             if (isset($this->entityChangeSets[$oid])) {
                 $this->entityChangeSets[$oid] = array_merge($this->entityChangeSets[$oid], $changeSet);
-            } elseif (! isset($this->entityInsertions[$oid])) {
+            } elseif ( ! isset($this->entityInsertions[$oid])) {
                 $this->entityChangeSets[$oid] = $changeSet;
                 $this->entityUpdates[$oid]    = $entity;
             }
@@ -1050,7 +1050,7 @@ 
                 $this->recomputeSingleEntityChangeSet($class, $entity);
             }
 
-            if (! empty($this->entityChangeSets[$oid])) {
+            if ( ! empty($this->entityChangeSets[$oid])) {
                 $persister->update($entity);
             }
 
@@ -1089,7 +1089,7 @@ 
 
             // Entity with this $oid after deletion treated as NEW, even if the $oid
             // is obtained by a new entity because the old one went out of scope.
-            if (! $class->isIdentifierComposite()) {
+            if ( ! $class->isIdentifierComposite()) {
                 $property = $class->getProperty($class->getSingleIdentifierFieldName());
 
                 if ($property instanceof FieldMetadata && $property->hasValueGenerator()) {
@@ -1136,13 +1136,13 @@ 
         // Calculate dependencies for new nodes
         while ($class = array_pop($newNodes)) {
             foreach ($class->getDeclaredPropertiesIterator() as $property) {
-                if (! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
+                if ( ! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
                     continue;
                 }
 
                 $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
-                if (! $calc->hasNode($targetClass->getClassName())) {
+                if ( ! $calc->hasNode($targetClass->getClassName())) {
                     $calc->addNode($targetClass->getClassName(), $targetClass);
 
                     $newNodes[] = $targetClass;
@@ -1150,7 +1150,7 @@ 
 
                 $weight = ! array_filter(
                     $property->getJoinColumns(),
-                    static function (JoinColumnMetadata $joinColumn) {
+                    static function(JoinColumnMetadata $joinColumn) {
                         return $joinColumn->isNullable();
                     }
                 );
@@ -1158,14 +1158,14 @@ 
                 $calc->addDependency($targetClass->getClassName(), $class->getClassName(), $weight);
 
                 // If the target class has mapped subclasses, these share the same dependency.
-                if (! $targetClass->getSubClasses()) {
+                if ( ! $targetClass->getSubClasses()) {
                     continue;
                 }
 
                 foreach ($targetClass->getSubClasses() as $subClassName) {
                     $targetSubClass = $this->em->getClassMetadata($subClassName);
 
-                    if (! $calc->hasNode($subClassName)) {
+                    if ( ! $calc->hasNode($subClassName)) {
                         $calc->addNode($targetSubClass->getClassName(), $targetSubClass);
 
                         $newNodes[] = $targetSubClass;
@@ -1241,7 +1241,7 @@ 
     {
         $oid = spl_object_id($entity);
 
-        if (! isset($this->entityIdentifiers[$oid])) {
+        if ( ! isset($this->entityIdentifiers[$oid])) {
             throw ORMInvalidArgumentException::entityHasNoIdentity($entity, 'scheduling for update');
         }
 
@@ -1249,7 +1249,7 @@ 
             throw ORMInvalidArgumentException::entityIsRemoved($entity, 'schedule for update');
         }
 
-        if (! isset($this->entityUpdates[$oid]) && ! isset($this->entityInsertions[$oid])) {
+        if ( ! isset($this->entityUpdates[$oid]) && ! isset($this->entityInsertions[$oid])) {
             $this->entityUpdates[$oid] = $entity;
         }
     }
@@ -1324,7 +1324,7 @@ 
             return; // entity has not been persisted yet, so nothing more to do.
         }
 
-        if (! $this->isInIdentityMap($entity)) {
+        if ( ! $this->isInIdentityMap($entity)) {
             return;
         }
 
@@ -1332,7 +1332,7 @@ 
 
         unset($this->entityUpdates[$oid]);
 
-        if (! isset($this->entityDeletions[$oid])) {
+        if ( ! isset($this->entityDeletions[$oid])) {
             $this->entityDeletions[$oid] = $entity;
             $this->entityStates[$oid]    = self::STATE_REMOVED;
         }
@@ -1434,7 +1434,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $id        = $persister->getIdentifier($entity);
 
-        if (! $id) {
+        if ( ! $id) {
             return self::STATE_NEW;
         }
 
@@ -1792,7 +1792,7 @@ 
         $class = $this->em->getClassMetadata(get_class($entity));
 
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('refresh', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('refresh', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1839,7 +1839,7 @@ 
         }
 
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('persist', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('persist', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1855,7 +1855,7 @@ 
 
                 case $relatedEntities instanceof Collection:
                 case is_array($relatedEntities):
-                    if (! ($association instanceof ToManyAssociationMetadata)) {
+                    if ( ! ($association instanceof ToManyAssociationMetadata)) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1870,7 +1870,7 @@ 
                     break;
 
                 case $relatedEntities !== null:
-                    if (! $relatedEntities instanceof $targetEntity) {
+                    if ( ! $relatedEntities instanceof $targetEntity) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1899,7 +1899,7 @@ 
         $class             = $this->em->getClassMetadata(get_class($entity));
 
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('remove', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('remove', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1958,7 +1958,7 @@ 
 
         switch (true) {
             case $lockMode === LockMode::OPTIMISTIC:
-                if (! $class->isVersioned()) {
+                if ( ! $class->isVersioned()) {
                     throw OptimisticLockException::notVersioned($class->getClassName());
                 }
 
@@ -1981,7 +1981,7 @@ 
             case $lockMode === LockMode::NONE:
             case $lockMode === LockMode::PESSIMISTIC_READ:
             case $lockMode === LockMode::PESSIMISTIC_WRITE:
-                if (! $this->em->getConnection()->isTransactionActive()) {
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
 
@@ -2139,7 +2139,7 @@ 
                     $entity->addPropertyChangedListener($this);
                 }
             } else {
-                if (! isset($hints[Query::HINT_REFRESH])
+                if ( ! isset($hints[Query::HINT_REFRESH])
                     || (isset($hints[Query::HINT_REFRESH_ENTITY]) && $hints[Query::HINT_REFRESH_ENTITY] !== $entity)) {
                     return $entity;
                 }
@@ -2187,7 +2187,7 @@ 
         }
 
         foreach ($class->getDeclaredPropertiesIterator() as $field => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -2236,7 +2236,7 @@ 
                 continue;
             }
 
-            if (! $association->isOwningSide()) {
+            if ( ! $association->isOwningSide()) {
                 // use the given entity association
                 if (isset($data[$field]) && is_object($data[$field]) &&
                     isset($this->entityStates[spl_object_id($data[$field])])) {
@@ -2286,7 +2286,7 @@ 
                 $associatedId[$targetField] = $joinColumnValue;
             }
 
-            if (! $associatedId) {
+            if ( ! $associatedId) {
                 // Foreign key is NULL
                 $association->setValue($entity, null);
                 $this->originalEntityData[$oid][$field] = null;
@@ -2295,7 +2295,7 @@ 
             }
 
             // @todo guilhermeblanco Can we remove the need of this somehow?
-            if (! isset($hints['fetchMode'][$class->getClassName()][$field])) {
+            if ( ! isset($hints['fetchMode'][$class->getClassName()][$field])) {
                 $hints['fetchMode'][$class->getClassName()][$field] = $association->getFetchMode();
             }
 
@@ -2312,7 +2312,7 @@ 
                     // If this is an uninitialized proxy, we are deferring eager loads,
                     // this association is marked as eager fetch, and its an uninitialized proxy (wtf!)
                     // then we can append this entity for eager loading!
-                    if (! $targetClass->isIdentifierComposite() &&
+                    if ( ! $targetClass->isIdentifierComposite() &&
                         $newValue instanceof GhostObjectInterface &&
                         isset($hints[self::HINT_DEFEREAGERLOAD]) &&
                         $hints['fetchMode'][$class->getClassName()][$field] === FetchMode::EAGER &&
@@ -2395,7 +2395,7 @@ 
 
     public function triggerEagerLoads()
     {
-        if (! $this->eagerLoadingEntities) {
+        if ( ! $this->eagerLoadingEntities) {
             return;
         }
 
@@ -2404,7 +2404,7 @@ 
         $this->eagerLoadingEntities = [];
 
         foreach ($eagerLoadingEntities as $entityName => $ids) {
-            if (! $ids) {
+            if ( ! $ids) {
                 continue;
             }
 
@@ -2702,7 +2702,7 @@ 
     {
         $class = $this->em->getClassMetadata(get_class($entity));
 
-        if (! $class->getProperty($propertyName)) {
+        if ( ! $class->getProperty($propertyName)) {
             return; // ignore non-persistent fields
         }
 
@@ -2711,7 +2711,7 @@ 
         // Update changeset and mark entity for synchronization
         $this->entityChangeSets[$oid][$propertyName] = [$oldValue, $newValue];
 
-        if (! isset($this->scheduledForSynchronization[$class->getRootClassName()][$oid])) {
+        if ( ! isset($this->scheduledForSynchronization[$class->getRootClassName()][$oid])) {
             $this->scheduleForSynchronization($entity);
         }
     }
@@ -2793,7 +2793,7 @@ 
      */
     private static function objToStr($obj)
     {
-        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj) . '@' . spl_object_id($obj);
+        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj).'@'.spl_object_id($obj);
     }
 
     /**
@@ -2808,7 +2808,7 @@ 
      */
     public function markReadOnly($object)
     {
-        if (! is_object($object) || ! $this->isInIdentityMap($object)) {
+        if ( ! is_object($object) || ! $this->isInIdentityMap($object)) {
             throw ORMInvalidArgumentException::readOnlyRequiresManagedEntity($object);
         }
 
@@ -2826,7 +2826,7 @@ 
      */
     public function isReadOnly($object)
     {
-        if (! is_object($object)) {
+        if ( ! is_object($object)) {
             throw ORMInvalidArgumentException::readOnlyRequiresManagedEntity($object);
         }
 
@@ -2838,7 +2838,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(static function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(static function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -2848,7 +2848,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(static function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(static function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }
@@ -2858,7 +2858,7 @@ 
      */
     private function performCallbackOnCachedPersister(callable $callback)
     {
-        if (! $this->hasCache) {
+        if ( ! $this->hasCache) {
             return;
         }
 

lib/Doctrine/ORM/AbstractQuery.php

Spacing +11 added lines, -11 removed lines

@@ -301,7 +301,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            static function (Query\Parameter $parameter) use ($key) : bool {
+            static function(Query\Parameter $parameter) use ($key) : bool {
                 $parameterName = $parameter->getName();
 
                 return $key === $parameterName || (string) $key === (string) $parameterName;
@@ -394,7 +394,7 @@ 
             return $value;
         }
 
-        if (! is_object($value)) {
+        if ( ! is_object($value)) {
             return $value;
         }
 
@@ -725,7 +725,7 @@ 
             return null;
         }
 
-        if (! is_array($result)) {
+        if ( ! is_array($result)) {
             return $result;
         }
 
@@ -759,7 +759,7 @@ 
             throw new NoResultException();
         }
 
-        if (! is_array($result)) {
+        if ( ! is_array($result)) {
             return $result;
         }
 
@@ -849,7 +849,7 @@ 
             $this->setHydrationMode($hydrationMode);
         }
 
-        if (! empty($parameters)) {
+        if ( ! empty($parameters)) {
             $this->setParameters($parameters);
         }
 
@@ -888,11 +888,11 @@ 
             $this->setHydrationMode($hydrationMode);
         }
 
-        if (! empty($parameters)) {
+        if ( ! empty($parameters)) {
             $this->setParameters($parameters);
         }
 
-        $setCacheEntry = static function () {
+        $setCacheEntry = static function() {
         };
 
         if ($this->hydrationCacheProfile !== null) {
@@ -906,11 +906,11 @@ 
                 return $result[$realCacheKey];
             }
 
-            if (! $result) {
+            if ( ! $result) {
                 $result = [];
             }
 
-            $setCacheEntry = static function ($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) {
+            $setCacheEntry = static function($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) {
                 $result[$realCacheKey] = $data;
 
                 $cache->save($cacheKey, $result, $queryCacheProfile->getLifetime());
@@ -1072,7 +1072,7 @@ 
     {
         $query  = $this->getSQL();
         $hints  = $this->getHints();
-        $params = array_map(function (Parameter $parameter) {
+        $params = array_map(function(Parameter $parameter) {
             $value = $parameter->getValue();
 
             // Small optimization
@@ -1086,6 +1086,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

lib/Doctrine/ORM/Query.php

Spacing +9 added lines, -9 removed lines

@@ -232,7 +232,7 @@ 
 
         // Check query cache.
         $queryCache = $this->getQueryCacheDriver();
-        if (! ($this->useQueryCache && $queryCache)) {
+        if ( ! ($this->useQueryCache && $queryCache)) {
             $parser = new Parser($this);
 
             $this->parserResult = $parser->parse();
@@ -367,7 +367,7 @@ 
         foreach ($this->parameters as $parameter) {
             $key = $parameter->getName();
 
-            if (! isset($paramMappings[$key])) {
+            if ( ! isset($paramMappings[$key])) {
                 throw QueryException::unknownParameter($key);
             }
 
@@ -696,7 +696,7 @@ 
     public function setLockMode($lockMode)
     {
         if (in_array($lockMode, [LockMode::NONE, LockMode::PESSIMISTIC_READ, LockMode::PESSIMISTIC_WRITE], true)) {
-            if (! $this->em->getConnection()->isTransactionActive()) {
+            if ( ! $this->em->getConnection()->isTransactionActive()) {
                 throw TransactionRequiredException::transactionRequired();
             }
         }
@@ -737,11 +737,11 @@ 
             ->getName();
 
         return md5(
-            $this->getDQL() . serialize($this->hints) .
-            '&platform=' . $platform .
-            ($this->em->hasFilters() ? $this->em->getFilters()->getHash() : '') .
-            '&firstResult=' . $this->firstResult . '&maxResult=' . $this->maxResults .
-            '&hydrationMode=' . $this->hydrationMode . '&types=' . serialize($this->parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT'
+            $this->getDQL().serialize($this->hints).
+            '&platform='.$platform.
+            ($this->em->hasFilters() ? $this->em->getFilters()->getHash() : '').
+            '&firstResult='.$this->firstResult.'&maxResult='.$this->maxResults.
+            '&hydrationMode='.$this->hydrationMode.'&types='.serialize($this->parsedTypes).'DOCTRINE_QUERY_CACHE_SALT'
         );
     }
 
@@ -750,7 +750,7 @@ 
      */
     protected function getHash()
     {
-        return sha1(parent::getHash() . '-' . $this->firstResult . '-' . $this->maxResults);
+        return sha1(parent::getHash().'-'.$this->firstResult.'-'.$this->maxResults);
     }
 
     /**

tests/Doctrine/Performance/EntityManagerFactory.php

Spacing +7 added lines, -7 removed lines

@@ -23,13 +23,13 @@ 
     {
         $config = new Configuration();
 
-        $config->setProxyDir(__DIR__ . '/../Tests/Proxies');
+        $config->setProxyDir(__DIR__.'/../Tests/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $config->setAutoGenerateProxyClasses(StaticProxyFactory::AUTOGENERATE_EVAL);
         $config->setMetadataDriverImpl(
             $config->newDefaultAnnotationDriver([
-                realpath(__DIR__ . '/Models/Cache'),
-                realpath(__DIR__ . '/Models/GeoNames'),
+                realpath(__DIR__.'/Models/Cache'),
+                realpath(__DIR__.'/Models/GeoNames'),
             ])
         );
 
@@ -51,13 +51,13 @@ 
     {
         $config = new Configuration();
 
-        $config->setProxyDir(__DIR__ . '/../Tests/Proxies');
+        $config->setProxyDir(__DIR__.'/../Tests/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([
-            realpath(__DIR__ . '/Models/Cache'),
-            realpath(__DIR__ . '/Models/Generic'),
-            realpath(__DIR__ . '/Models/GeoNames'),
+            realpath(__DIR__.'/Models/Cache'),
+            realpath(__DIR__.'/Models/Generic'),
+            realpath(__DIR__.'/Models/GeoNames'),
         ], true));
 
         // A connection that doesn't really do anything

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

Spacing +6 added lines, -6 removed lines

@@ -337,7 +337,7 @@ 
      */
     public function testGetParameterTypeJuggling() : void
     {
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id = ?0');
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id = ?0');
 
         $query->setParameter(0, 0);
 
@@ -351,7 +351,7 @@ 
      */
     public function testSetParameterWithNameZeroIsNotOverridden() : void
     {
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id != ?0 and u.username = :name');
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id != ?0 and u.username = :name');
 
         $query->setParameter(0, 0);
         $query->setParameter('name', 'Doctrine');
@@ -366,7 +366,7 @@ 
      */
     public function testSetParameterWithNameZeroDoesNotOverrideAnotherParameter() : void
     {
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id != ?0 and u.username = :name');
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id != ?0 and u.username = :name');
 
         $query->setParameter('name', 'Doctrine');
         $query->setParameter(0, 0);
@@ -381,7 +381,7 @@ 
      */
     public function testSetParameterWithTypeJugglingWorks() : void
     {
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id != ?0 and u.username = :name');
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id != ?0 and u.username = :name');
 
         $query->setParameter('0', 1);
         $query->setParameter('name', 'Doctrine');
@@ -401,7 +401,7 @@ 
     {
         $this->em->getConfiguration()->setResultCacheImpl(new ArrayCache());
 
-        $query = $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u');
+        $query = $this->em->createQuery('SELECT u FROM '.CmsUser::class.' u');
         $query->useResultCache(true);
         $query->setResultCacheProfile();
 
@@ -419,7 +419,7 @@ 
             ->expects(self::never())
             ->method('getSingleIdentifierValue');
 
-        $query = $this->em->createQuery('SELECT d FROM ' . DateTimeModel::class . ' d WHERE d.datetime = :value');
+        $query = $this->em->createQuery('SELECT d FROM '.DateTimeModel::class.' d WHERE d.datetime = :value');
 
         $query->setParameter('value', new DateTime(), Type::DATETIME);