doctrine / orm

lib/Doctrine/ORM/QueryBuilder.php

Indentation +15 added lines, -15 removed lines

@@ -1261,25 +1261,25 @@ 
     private function getDQLForDelete() : string
     {
         return 'DELETE'
-              . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
-              . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+                . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
+                . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
     }
 
     private function getDQLForUpdate() : string
     {
         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' => ', ']);
+                . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
+                . $this->getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', '])
+                . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
     }
 
     private function getDQLForSelect() : string
     {
         $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');
@@ -1303,10 +1303,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;
     }
@@ -1323,8 +1323,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 +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -378,7 +378,7 @@ 
     {
         $aliases = $this->getRootAliases();
 
-        if (! isset($aliases[0])) {
+        if ( ! isset($aliases[0])) {
             throw new \RuntimeException('No alias was set before invoking getRootAlias().');
         }
 
@@ -557,7 +557,7 @@ 
     public function getParameter($key) : ?Query\Parameter
     {
         $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;
@@ -627,7 +627,7 @@ 
     {
         if ($append && ($dqlPartName === 'where' || $dqlPartName === 'having')) {
             throw new \InvalidArgumentException(
-                "Using \$append = true does not have an effect with 'where' or 'having' " .
+                "Using \$append = true does not have an effect with 'where' or 'having' ".
                 'parts. See QueryBuilder#andWhere() for an example for correct usage.'
             );
         }
@@ -758,7 +758,7 @@ 
     {
         $this->type = self::DELETE;
 
-        if (! $delete) {
+        if ( ! $delete) {
             return $this;
         }
 
@@ -783,7 +783,7 @@ 
     {
         $this->type = self::UPDATE;
 
-        if (! $update) {
+        if ( ! $update) {
             return $this;
         }
 
@@ -834,7 +834,7 @@ 
     {
         $rootAliases = $this->getRootAliases();
 
-        if (! in_array($alias, $rootAliases, true)) {
+        if ( ! in_array($alias, $rootAliases, true)) {
             throw new Query\QueryException(
                 sprintf('Specified root alias %s must be set before invoking indexBy().', $alias)
             );
@@ -987,7 +987,7 @@ 
      */
     public function where($predicates) : self
     {
-        if (! (func_num_args() === 1 && $predicates instanceof Expr\Composite)) {
+        if ( ! (func_num_args() === 1 && $predicates instanceof Expr\Composite)) {
             $predicates = new Expr\Andx(func_get_args());
         }
 
@@ -1100,7 +1100,7 @@ 
      */
     public function having($having) : self
     {
-        if (! (func_num_args() === 1 && ($having instanceof Expr\Andx || $having instanceof Expr\Orx))) {
+        if ( ! (func_num_args() === 1 && ($having instanceof Expr\Andx || $having instanceof Expr\Orx))) {
             $having = new Expr\Andx(func_get_args());
         }
 
@@ -1188,7 +1188,7 @@ 
     public function addCriteria(Criteria $criteria) : self
     {
         $allAliases = $this->getAllAliases();
-        if (! isset($allAliases[0])) {
+        if ( ! isset($allAliases[0])) {
             throw new Query\QueryException('No aliases are set before invoking addCriteria().');
         }
 
@@ -1206,14 +1206,14 @@ 
             foreach ($criteria->getOrderings() as $sort => $order) {
                 $hasValidAlias = false;
                 foreach ($allAliases as $alias) {
-                    if (strpos($sort . '.', $alias . '.') === 0) {
+                    if (strpos($sort.'.', $alias.'.') === 0) {
                         $hasValidAlias = true;
                         break;
                     }
                 }
 
-                if (! $hasValidAlias) {
-                    $sort = $allAliases[0] . '.' . $sort;
+                if ( ! $hasValidAlias) {
+                    $sort = $allAliases[0].'.'.$sort;
                 }
 
                 $this->addOrderBy($sort, $order);
@@ -1278,7 +1278,7 @@ 
     private function getDQLForSelect() : string
     {
         $dql = 'SELECT'
-             . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '')
+             . ($this->dqlParts['distinct'] === true ? ' DISTINCT' : '')
              . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
 
         $fromParts   = $this->getDQLPart('from');
@@ -1286,7 +1286,7 @@ 
         $fromClauses = [];
 
         // Loop through all FROM clauses
-        if (! empty($fromParts)) {
+        if ( ! empty($fromParts)) {
             $dql .= ' FROM ';
 
             foreach ($fromParts as $from) {
@@ -1294,7 +1294,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/EntityManager.php

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -281,7 +281,7 @@ 
     {
         $query = new Query($this);
 
-        if (! empty($dql)) {
+        if ( ! empty($dql)) {
             $query->setDQL($dql);
         }
 
@@ -372,7 +372,7 @@ 
         $class     = $this->metadataFactory->getMetadataFor(ltrim($className, '\\'));
         $className = $class->getClassName();
 
-        if (! is_array($id)) {
+        if ( ! is_array($id)) {
             if ($class->isIdentifierComposite()) {
                 throw ORMInvalidArgumentException::invalidCompositeIdentifier();
             }
@@ -393,7 +393,7 @@ 
         $sortedId = [];
 
         foreach ($class->identifier as $identifier) {
-            if (! isset($id[$identifier])) {
+            if ( ! isset($id[$identifier])) {
                 throw ORMException::missingIdentifierField($className, $identifier);
             }
 
@@ -410,7 +410,7 @@ 
         // Check identity map first
         $entity = $unitOfWork->tryGetById($sortedId, $class->getRootClassName());
         if ($entity !== false) {
-            if (! ($entity instanceof $className)) {
+            if ( ! ($entity instanceof $className)) {
                 return null;
             }
 
@@ -434,7 +434,7 @@ 
 
         switch (true) {
             case $lockMode === LockMode::OPTIMISTIC:
-                if (! $class->isVersioned()) {
+                if ( ! $class->isVersioned()) {
                     throw OptimisticLockException::notVersioned($className);
                 }
 
@@ -446,7 +446,7 @@ 
 
             case $lockMode === LockMode::PESSIMISTIC_READ:
             case $lockMode === LockMode::PESSIMISTIC_WRITE:
-                if (! $this->getConnection()->isTransactionActive()) {
+                if ( ! $this->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
 
@@ -465,7 +465,7 @@ 
         $class     = $this->metadataFactory->getMetadataFor(ltrim($entityName, '\\'));
         $className = $class->getClassName();
 
-        if (! is_array($id)) {
+        if ( ! is_array($id)) {
             if ($class->isIdentifierComposite()) {
                 throw ORMInvalidArgumentException::invalidCompositeIdentifier();
             }
@@ -490,7 +490,7 @@ 
         $sortedId = [];
 
         foreach ($class->identifier as $identifier) {
-            if (! isset($scalarId[$identifier])) {
+            if ( ! isset($scalarId[$identifier])) {
                 throw ORMException::missingIdentifierField($className, $identifier);
             }
 
@@ -531,7 +531,7 @@ 
         $class     = $this->metadataFactory->getMetadataFor(ltrim($entityName, '\\'));
         $className = $class->getClassName();
 
-        if (! is_array($id)) {
+        if ( ! is_array($id)) {
             if ($class->isIdentifierComposite()) {
                 throw ORMInvalidArgumentException::invalidCompositeIdentifier();
             }
@@ -552,7 +552,7 @@ 
         $sortedId = [];
 
         foreach ($class->identifier as $identifier) {
-            if (! isset($id[$identifier])) {
+            if ( ! isset($id[$identifier])) {
                 throw ORMException::missingIdentifierField($className, $identifier);
             }
 
@@ -624,7 +624,7 @@ 
      */
     public function persist(object $object) : void
     {
-        if (! is_object($object)) {
+        if ( ! is_object($object)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#persist()', $object);
         }
 
@@ -646,7 +646,7 @@ 
      */
     public function remove(object $entity) : void
     {
-        if (! is_object($entity)) {
+        if ( ! is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#remove()', $entity);
         }
 
@@ -666,7 +666,7 @@ 
      */
     public function refresh(object $entity) : void
     {
-        if (! is_object($entity)) {
+        if ( ! is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#refresh()', $entity);
         }
 
@@ -819,7 +819,7 @@ 
      */
     public static function create($connection, Configuration $config, ?EventManager $eventManager = null) : self
     {
-        if (! $config->getMetadataDriverImpl()) {
+        if ( ! $config->getMetadataDriverImpl()) {
             throw ORMException::missingMappingDriverImpl();
         }
 
@@ -844,12 +844,12 @@ 
             return DriverManager::getConnection($connection, $config, $eventManager ?: new EventManager());
         }
 
-        if (! $connection instanceof Connection) {
+        if ( ! $connection instanceof Connection) {
             throw new \InvalidArgumentException(
                 sprintf(
                     'Invalid $connection argument of type %s given%s.',
                     is_object($connection) ? get_class($connection) : gettype($connection),
-                    is_object($connection) ? '' : ': "' . $connection . '"'
+                    is_object($connection) ? '' : ': "'.$connection.'"'
                 )
             );
         }

lib/Doctrine/ORM/AbstractQuery.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -284,7 +284,7 @@ 
     public function getParameter($key) : ?Parameter
     {
         $filteredParameters = $this->parameters->filter(
-            function (Parameter $parameter) use ($key) : bool {
+            function(Parameter $parameter) use ($key) : bool {
                 $parameterName = $parameter->getName();
 
                 return $key === $parameterName || (string) $key === (string) $parameterName;
@@ -670,7 +670,7 @@ 
             return null;
         }
 
-        if (! is_array($result)) {
+        if ( ! is_array($result)) {
             return $result;
         }
 
@@ -702,7 +702,7 @@ 
             throw new NoResultException();
         }
 
-        if (! is_array($result)) {
+        if ( ! is_array($result)) {
             return $result;
         }
 
@@ -790,7 +790,7 @@ 
             $this->setHydrationMode($hydrationMode);
         }
 
-        if (! empty($parameters)) {
+        if ( ! empty($parameters)) {
             $this->setParameters($parameters);
         }
 
@@ -830,11 +830,11 @@ 
             $this->setHydrationMode($hydrationMode);
         }
 
-        if (! empty($parameters)) {
+        if ( ! empty($parameters)) {
             $this->setParameters($parameters);
         }
 
-        $setCacheEntry = function () : void {
+        $setCacheEntry = function() : void {
         };
 
         if ($this->hydrationCacheProfile !== null) {
@@ -848,11 +848,11 @@ 
                 return $result[$realCacheKey];
             }
 
-            if (! $result) {
+            if ( ! $result) {
                 $result = [];
             }
 
-            $setCacheEntry = function ($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) : void {
+            $setCacheEntry = function($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) : void {
                 $result[$realCacheKey] = $data;
 
                 $cache->save($cacheKey, $result, $queryCacheProfile->getLifetime());
@@ -1004,7 +1004,7 @@ 
     {
         $query  = $this->getSQL();
         $hints  = $this->getHints();
-        $params = array_map(function (Parameter $parameter) {
+        $params = array_map(function(Parameter $parameter) {
             $value = $parameter->getValue();
 
             // Small optimization
@@ -1018,6 +1018,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

lib/Doctrine/ORM/Cache/DefaultCache.php

Spacing +16 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache;
 
@@ -55,7 +55,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return null;
         }
 
@@ -70,7 +70,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getCollectionPersister($metadata->getProperty($association));
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return null;
         }
 
@@ -85,7 +85,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return false;
         }
 
@@ -100,7 +100,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return;
         }
 
@@ -115,7 +115,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return;
         }
 
@@ -132,7 +132,7 @@ 
         foreach ($metadatas as $metadata) {
             $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-            if (! ($persister instanceof CachedPersister)) {
+            if ( ! ($persister instanceof CachedPersister)) {
                 continue;
             }
 
@@ -148,7 +148,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getCollectionPersister($metadata->getProperty($association));
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return false;
         }
 
@@ -163,7 +163,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getCollectionPersister($metadata->getProperty($association));
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return;
         }
 
@@ -178,7 +178,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getCollectionPersister($metadata->getProperty($association));
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return;
         }
 
@@ -194,13 +194,13 @@ 
 
         foreach ($metadatas as $metadata) {
             foreach ($metadata->getDeclaredPropertiesIterator() as $association) {
-                if (! $association instanceof ToManyAssociationMetadata) {
+                if ( ! $association instanceof ToManyAssociationMetadata) {
                     continue;
                 }
 
                 $persister = $this->uow->getCollectionPersister($association);
 
-                if (! ($persister instanceof CachedPersister)) {
+                if ( ! ($persister instanceof CachedPersister)) {
                     continue;
                 }
 
@@ -251,11 +251,10 @@ 
     public function getQueryCache(?string $regionName = null) : QueryCache
     {
         if ($regionName === null) {
-            return $this->defaultQueryCache ?:
-                $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
+            return $this->defaultQueryCache ?: $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
         }
 
-        if (! isset($this->queryCaches[$regionName])) {
+        if ( ! isset($this->queryCaches[$regionName])) {
             $this->queryCaches[$regionName] = $this->cacheFactory->buildQueryCache($this->em, $regionName);
         }
 
@@ -268,7 +267,7 @@ 
      */
     private function buildEntityCacheKey(ClassMetadata $metadata, $identifier) : EntityCacheKey
     {
-        if (! is_array($identifier)) {
+        if ( ! is_array($identifier)) {
             $identifier = $this->toIdentifierArray($metadata, $identifier);
         }
 
@@ -282,7 +281,7 @@ 
      */
     private function buildCollectionCacheKey(ClassMetadata $metadata, string $association, $ownerIdentifier) : CollectionCacheKey
     {
-        if (! is_array($ownerIdentifier)) {
+        if ( ! is_array($ownerIdentifier)) {
             $ownerIdentifier = $this->toIdentifierArray($metadata, $ownerIdentifier);
         }
 

lib/Doctrine/ORM/EntityRepository.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -229,14 +229,14 @@ 
      */
     private function resolveMagicCall(string $method, string $by, array $arguments)
     {
-        if (! $arguments) {
-            throw ORMException::findByRequiresParameter($method . $by);
+        if ( ! $arguments) {
+            throw ORMException::findByRequiresParameter($method.$by);
         }
 
         $fieldName = lcfirst(Inflector::classify($by));
 
         if ($this->class->getProperty($fieldName) === null) {
-            throw ORMException::invalidMagicCall($this->entityName, $fieldName, $method . $by);
+            throw ORMException::invalidMagicCall($this->entityName, $fieldName, $method.$by);
         }
 
         return $this->{$method}([$fieldName => $arguments[0]], ...array_slice($arguments, 1));

lib/Doctrine/ORM/Query.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -254,7 +254,7 @@ 
 
         // Check query cache.
         $queryCache = $this->getQueryCacheDriver();
-        if (! ($this->useQueryCache && $queryCache)) {
+        if ( ! ($this->useQueryCache && $queryCache)) {
             $parser = new Parser($this);
 
             $this->parserResult = $parser->parse();
@@ -391,7 +391,7 @@ 
             $value = $parameter->getValue();
             $rsm   = $this->getResultSetMapping();
 
-            if (! isset($paramMappings[$key])) {
+            if ( ! isset($paramMappings[$key])) {
                 throw QueryException::unknownParameter($key);
             }
 
@@ -683,7 +683,7 @@ 
     public function setLockMode(int $lockMode) : parent
     {
         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();
             }
         }
@@ -722,11 +722,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'
         );
     }
 
@@ -735,7 +735,7 @@ 
      */
     protected function getHash() : string
     {
-        return sha1(parent::getHash() . '-' . $this->firstResult . '-' . $this->maxResults);
+        return sha1(parent::getHash().'-'.$this->firstResult.'-'.$this->maxResults);
     }
 
     /**

lib/Doctrine/ORM/UnitOfWork.php

Spacing +53 added lines, -53 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -335,7 +335,7 @@ 
 
         $this->computeChangeSets();
 
-        if (! ($this->entityInsertions ||
+        if ( ! ($this->entityInsertions ||
                 $this->entityDeletions ||
                 $this->entityUpdates ||
                 $this->collectionUpdates ||
@@ -394,7 +394,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
                     }
 
@@ -475,7 +475,7 @@ 
         $oid  = spl_object_id($entity);
         $data = [];
 
-        if (! isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -556,12 +556,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;
@@ -588,7 +588,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;
                 }
 
@@ -610,7 +610,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
                         }
 
@@ -648,7 +648,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
@@ -671,7 +671,7 @@ 
 
         // Look for changes in associations of the entity
         foreach ($class->getDeclaredPropertiesIterator() as $property) {
-            if (! $property instanceof AssociationMetadata) {
+            if ( ! $property instanceof AssociationMetadata) {
                 continue;
             }
 
@@ -738,7 +738,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);
                 }
             }
@@ -775,13 +775,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 ORMException::unexpectedAssociationValue(
                     $association->getSourceEntity(),
                     $association->getName(),
@@ -792,7 +792,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;
@@ -837,7 +837,7 @@ 
         $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));
             $this->entityIdentifiers[$oid] = $id;
         }
@@ -868,7 +868,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);
         }
 
@@ -890,7 +890,7 @@ 
                     break;
 
                 case ($property instanceof FieldMetadata):
-                    if (! $property->isPrimaryKey()
+                    if ( ! $property->isPrimaryKey()
                         || ! $property->getValueGenerator()
                         || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY) {
                         $actualData[$name] = $property->getValue($entity);
@@ -904,7 +904,7 @@ 
             }
         }
 
-        if (! isset($this->originalEntityData[$oid])) {
+        if ( ! isset($this->originalEntityData[$oid])) {
             throw new \RuntimeException('Cannot call recomputeSingleEntityChangeSet before computeChangeSet on an entity.');
         }
 
@@ -922,7 +922,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;
             }
@@ -990,7 +990,7 @@ 
                 $this->recomputeSingleEntityChangeSet($class, $entity);
             }
 
-            if (! empty($this->entityChangeSets[$oid])) {
+            if ( ! empty($this->entityChangeSets[$oid])) {
 //                echo 'Update: ';
 //                \Doctrine\Common\Util\Debug::dump($this->entityChangeSets[$oid], 3);
 
@@ -1031,7 +1031,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.
             //$this->entityStates[$oid] = self::STATE_NEW;
-            if (! $class->isIdentifierComposite()) {
+            if ( ! $class->isIdentifierComposite()) {
                 $property = $class->getProperty($class->getSingleIdentifierFieldName());
 
                 if ($property instanceof FieldMetadata && $property->hasValueGenerator()) {
@@ -1078,13 +1078,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;
@@ -1092,7 +1092,7 @@ 
 
                 $weight = ! array_filter(
                     $property->getJoinColumns(),
-                    function (JoinColumnMetadata $joinColumn) {
+                    function(JoinColumnMetadata $joinColumn) {
                         return $joinColumn->isNullable();
                     }
                 );
@@ -1100,14 +1100,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;
@@ -1179,7 +1179,7 @@ 
     {
         $oid = spl_object_id($entity);
 
-        if (! isset($this->entityIdentifiers[$oid])) {
+        if ( ! isset($this->entityIdentifiers[$oid])) {
             throw ORMInvalidArgumentException::entityHasNoIdentity($entity, 'scheduling for update');
         }
 
@@ -1187,7 +1187,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;
         }
     }
@@ -1257,7 +1257,7 @@ 
             return; // entity has not been persisted yet, so nothing more to do.
         }
 
-        if (! $this->isInIdentityMap($entity)) {
+        if ( ! $this->isInIdentityMap($entity)) {
             return;
         }
 
@@ -1265,7 +1265,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;
         }
@@ -1358,7 +1358,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $id        = $persister->getIdentifier($entity);
 
-        if (! $id) {
+        if ( ! $id) {
             return self::STATE_NEW;
         }
 
@@ -1698,7 +1698,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;
             }
 
@@ -1744,7 +1744,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;
             }
 
@@ -1760,7 +1760,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,
@@ -1775,7 +1775,7 @@ 
                     break;
 
                 case ($relatedEntities !== null):
-                    if (! $relatedEntities instanceof $targetEntity) {
+                    if ( ! $relatedEntities instanceof $targetEntity) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1803,7 +1803,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;
             }
 
@@ -1860,7 +1860,7 @@ 
 
         switch (true) {
             case $lockMode === LockMode::OPTIMISTIC:
-                if (! $class->isVersioned()) {
+                if ( ! $class->isVersioned()) {
                     throw OptimisticLockException::notVersioned($class->getClassName());
                 }
 
@@ -1883,7 +1883,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();
                 }
 
@@ -2035,7 +2035,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;
                 }
@@ -2083,7 +2083,7 @@ 
         }
 
         foreach ($class->getDeclaredPropertiesIterator() as $field => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -2132,7 +2132,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])])) {
@@ -2182,7 +2182,7 @@ 
                 $associatedId[$targetField] = $joinColumnValue;
             }
 
-            if (! $associatedId) {
+            if ( ! $associatedId) {
                 // Foreign key is NULL
                 $association->setValue($entity, null);
                 $this->originalEntityData[$oid][$field] = null;
@@ -2191,7 +2191,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();
             }
 
@@ -2208,7 +2208,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 &&
@@ -2291,7 +2291,7 @@ 
 
     public function triggerEagerLoads() : void
     {
-        if (! $this->eagerLoadingEntities) {
+        if ( ! $this->eagerLoadingEntities) {
             return;
         }
 
@@ -2300,7 +2300,7 @@ 
         $this->eagerLoadingEntities = [];
 
         foreach ($eagerLoadingEntities as $entityName => $ids) {
-            if (! $ids) {
+            if ( ! $ids) {
                 continue;
             }
 
@@ -2586,7 +2586,7 @@ 
     {
         $class = $this->em->getClassMetadata(get_class($entity));
 
-        if (! $class->getProperty($propertyName)) {
+        if ( ! $class->getProperty($propertyName)) {
             return; // ignore non-persistent fields
         }
 
@@ -2595,7 +2595,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);
         }
     }
@@ -2674,7 +2674,7 @@ 
      */
     private static function objToStr(object $obj) : string
     {
-        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);
     }
 
     /**
@@ -2688,7 +2688,7 @@ 
      */
     public function markReadOnly(object $object) : void
     {
-        if (! $this->isInIdentityMap($object)) {
+        if ( ! $this->isInIdentityMap($object)) {
             throw ORMInvalidArgumentException::readOnlyRequiresManagedEntity($object);
         }
 
@@ -2710,7 +2710,7 @@ 
      */
     private function afterTransactionComplete() : void
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) : void {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) : void {
             $persister->afterTransactionComplete();
         });
     }
@@ -2720,7 +2720,7 @@ 
      */
     private function afterTransactionRolledBack() : void
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) : void {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) : void {
             $persister->afterTransactionRolledBack();
         });
     }
@@ -2730,7 +2730,7 @@ 
      */
     private function performCallbackOnCachedPersister(callable $callback) : void
     {
-        if (! $this->hasCache) {
+        if ( ! $this->hasCache) {
             return;
         }
 

lib/Doctrine/ORM/PersistentCollection.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -319,7 +319,7 @@ 
         //       association (table). Without initializing the collection.
         $removed = parent::remove($key);
 
-        if (! $removed) {
+        if ( ! $removed) {
             return $removed;
         }
 
@@ -340,7 +340,7 @@ 
      */
     public function removeElement($element) : bool
     {
-        if (! $this->initialized &&
+        if ( ! $this->initialized &&
             $this->association !== null &&
             $this->association->getFetchMode() === FetchMode::EXTRA_LAZY) {
             if ($this->collection->contains($element)) {
@@ -354,7 +354,7 @@ 
 
         $removed = parent::removeElement($element);
 
-        if (! $removed) {
+        if ( ! $removed) {
             return $removed;
         }
 
@@ -375,7 +375,7 @@ 
      */
     public function containsKey($key) : bool
     {
-        if (! $this->initialized &&
+        if ( ! $this->initialized &&
             $this->association !== null &&
             $this->association->getFetchMode() === FetchMode::EXTRA_LAZY &&
             $this->association->getIndexedBy()) {
@@ -392,7 +392,7 @@ 
      */
     public function contains($element) : bool
     {
-        if (! $this->initialized &&
+        if ( ! $this->initialized &&
             $this->association !== null &&
             $this->association->getFetchMode() === FetchMode::EXTRA_LAZY) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
@@ -408,11 +408,11 @@ 
      */
     public function get($key)
     {
-        if (! $this->initialized &&
+        if ( ! $this->initialized &&
             $this->association !== null &&
             $this->association->getFetchMode() === FetchMode::EXTRA_LAZY &&
             $this->association->getIndexedBy()) {
-            if (! $this->typeClass->isIdentifierComposite() && $this->typeClass->isIdentifier($this->association->getIndexedBy())) {
+            if ( ! $this->typeClass->isIdentifierComposite() && $this->typeClass->isIdentifier($this->association->getIndexedBy())) {
                 return $this->em->find($this->typeClass->getClassName(), $key);
             }
 
@@ -427,7 +427,7 @@ 
      */
     public function count() : int
     {
-        if (! $this->initialized &&
+        if ( ! $this->initialized &&
             $this->association !== null &&
             $this->association->getFetchMode() === FetchMode::EXTRA_LAZY) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
@@ -491,7 +491,7 @@ 
      */
     public function offsetSet($offset, $value) : void
     {
-        if (! isset($offset)) {
+        if ( ! isset($offset)) {
             $this->add($value);
             return;
         }
@@ -587,7 +587,7 @@ 
      */
     public function slice($offset, $length = null) : array
     {
-        if (! $this->initialized &&
+        if ( ! $this->initialized &&
             ! $this->isDirty &&
             $this->association !== null &&
             $this->association->getFetchMode() === FetchMode::EXTRA_LAZY) {

tests/Doctrine/Tests/ORM/EntityManagerTest.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM;
 
@@ -161,7 +161,7 @@ 
     {
         self::assertSame(
             $value,
-            $this->em->transactional(function ($em) use ($value) {
+            $this->em->transactional(function($em) use ($value) {
                 return $value;
             })
         );
@@ -194,8 +194,8 @@ 
     public function testTransactionalReThrowsThrowables() : void
     {
         try {
-            $this->em->transactional(function () {
-                (function (array $value) {
+            $this->em->transactional(function() {
+                (function(array $value) {
                     // this only serves as an IIFE that throws a `TypeError`
                 })(null);
             });