Update to doctrine/cs v6

composer.json

@@ -36,7 +36,7 @@
         "symfony/var-dumper": "^3.4|^4.1"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^5.0",
+        "doctrine/coding-standard": "^6.0",
         "jmikola/geojson": "^1.0",
         "phpstan/phpstan": "^0.10.3",
         "phpunit/phpunit": "^8.2"

lib/Doctrine/ODM/MongoDB/Aggregation/Expr.php

@@ -323,7 +323,9 @@ public static function convertExpression($expression)
             return array_map(static function ($expression) {
                 return static::convertExpression($expression);
             }, $expression);
-        } elseif ($expression instanceof self) {
+        }
+
+        if ($expression instanceof self) {
             return $expression->getExpression();
         }
 
@@ -1545,7 +1547,6 @@ public function zip($inputs, ?bool $useLongestLength = null, $defaults = null) :
         return $this->operator('$zip', $args);
     }
 
-
     /**
      * @param mixed|self $expression
      *
@@ -1555,9 +1556,13 @@ private function ensureArray($expression)
     {
         if (is_string($expression) && substr($expression, 0, 1) === '$') {
             return '$' . $this->getDocumentPersister()->prepareFieldName(substr($expression, 1));
-        } elseif (is_array($expression)) {
+        }
+
+        if (is_array($expression)) {
             return array_map([$this, 'ensureArray'], $expression);
-        } elseif ($expression instanceof self) {
+        }
+
+        if ($expression instanceof self) {
             return $expression->getExpression();
         }
 

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/AbstractBucket.php

@@ -85,7 +85,9 @@ private function convertExpression($expression)
     {
         if (is_array($expression)) {
             return array_map([$this, 'convertExpression'], $expression);
-        } elseif (is_string($expression) && substr($expression, 0, 1) === '$') {
+        }
+
+        if (is_string($expression) && substr($expression, 0, 1) === '$') {
             return '$' . $this->getDocumentPersister()->prepareFieldName(substr($expression, 1));
         }
 

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Bucket.php

@@ -31,6 +31,7 @@ class Bucket extends AbstractBucket
     public function boundaries(...$boundaries) : self
     {
         $this->boundaries = $boundaries;
+
         return $this;
     }
 
@@ -44,6 +45,7 @@ public function boundaries(...$boundaries) : self
     public function defaultBucket($default) : self
     {
         $this->default = $default;
+
         return $this;
     }
 
@@ -59,6 +61,7 @@ public function output() : Bucket\BucketOutput
         }
 
         assert($this->output instanceof Bucket\BucketOutput);
+
         return $this->output;
     }
 

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Bucket/BucketAutoOutput.php

@@ -25,6 +25,7 @@ public function __construct(Builder $builder, Stage\BucketAuto $bucket)
     public function groupBy($expression) : Stage\BucketAuto
     {
         assert($this->bucket instanceof Stage\BucketAuto);
+
         return $this->bucket->groupBy($expression);
     }
 
@@ -34,6 +35,7 @@ public function groupBy($expression) : Stage\BucketAuto
     public function buckets(int $buckets) : Stage\BucketAuto
     {
         assert($this->bucket instanceof Stage\BucketAuto);
+
         return $this->bucket->buckets($buckets);
     }
 
@@ -45,6 +47,7 @@ public function buckets(int $buckets) : Stage\BucketAuto
     public function granularity(string $granularity) : Stage\BucketAuto
     {
         assert($this->bucket instanceof Stage\BucketAuto);
+
         return $this->bucket->granularity($granularity);
     }
 }

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Bucket/BucketOutput.php

@@ -30,6 +30,7 @@ public function __construct(Builder $builder, Stage\Bucket $bucket)
     public function groupBy($expression)
     {
         assert($this->bucket instanceof Stage\Bucket);
+
         return $this->bucket->groupBy($expression);
     }
 
@@ -49,6 +50,7 @@ public function groupBy($expression)
     public function boundaries(...$boundaries)
     {
         assert($this->bucket instanceof Stage\Bucket);
+
         return $this->bucket->boundaries(...$boundaries);
     }
 
@@ -64,6 +66,7 @@ public function boundaries(...$boundaries)
     public function defaultBucket($default)
     {
         assert($this->bucket instanceof Stage\Bucket);
+
         return $this->bucket->defaultBucket($default);
     }
 }

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/BucketAuto.php

@@ -24,6 +24,7 @@ class BucketAuto extends AbstractBucket
     public function buckets(int $buckets) : self
     {
         $this->buckets = $buckets;
+
         return $this;
     }
 
@@ -35,6 +36,7 @@ public function buckets(int $buckets) : self
     public function granularity(string $granularity) : self
     {
         $this->granularity = $granularity;
+
         return $this;
     }
 
@@ -50,6 +52,7 @@ public function output() : Bucket\BucketAutoOutput
         }
 
         assert($this->output instanceof Bucket\BucketAutoOutput);
+
         return $this->output;
     }
 

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Facet.php

@@ -39,6 +39,7 @@ public function getExpression() : array
     public function field(string $field) : self
     {
         $this->field = $field;
+
         return $this;
     }
 
@@ -62,6 +63,7 @@ public function pipeline($builder) : self
         }
 
         $this->pipelines[$this->field] = $builder;
+
         return $this;
     }
 }

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup.php

@@ -93,12 +93,14 @@ public function connectFromField(string $connectFromField) : self
         // No targetClass mapping - simply use field name as is
         if (! $this->targetClass) {
             $this->connectFromField = $connectFromField;
+
             return $this;
         }
 
         // connectFromField doesn't have to be a reference - in this case, just convert the field name
         if (! $this->targetClass->hasReference($connectFromField)) {
             $this->connectFromField = $this->convertTargetFieldName($connectFromField);
+
             return $this;
         }
 
@@ -109,6 +111,7 @@ public function connectFromField(string $connectFromField) : self
         }
 
         $this->connectFromField = $this->getReferencedFieldName($connectFromField, $referenceMapping);
+
         return $this;
     }
 
@@ -119,6 +122,7 @@ public function connectFromField(string $connectFromField) : self
     public function connectToField(string $connectToField) : self
     {
         $this->connectToField = $this->convertTargetFieldName($connectToField);
+
         return $this;
     }
 
@@ -159,6 +163,7 @@ public function from(string $from) : self
             $this->targetClass = $this->dm->getClassMetadata($from);
         } catch (BaseMappingException $e) {
             $this->from = $from;
+
             return $this;
         }
 
@@ -167,6 +172,7 @@ public function from(string $from) : self
         }
 
         $this->from = $this->targetClass->getCollection();
+
         return $this;
     }
 
@@ -274,7 +280,9 @@ private function convertExpression($expression)
     {
         if (is_array($expression)) {
             return array_map([$this, 'convertExpression'], $expression);
-        } elseif (is_string($expression) && substr($expression, 0, 1) === '$') {
+        }
+
+        if (is_string($expression) && substr($expression, 0, 1) === '$') {
             return '$' . $this->getDocumentPersister($this->class)->prepareFieldName(substr($expression, 1));
         }
 
@@ -317,8 +325,6 @@ private function getReferencedFieldName(string $fieldName, array $mapping) : str
             case ClassMetadata::REFERENCE_STORE_AS_ID:
             case ClassMetadata::REFERENCE_STORE_AS_REF:
                 return ClassMetadata::getReferenceFieldName($mapping['storeAs'], $mapping['name']);
-                break;
-
             default:
                 throw MappingException::cannotLookupDbRefReference($this->class->name, $fieldName);
         }

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Lookup.php

@@ -83,6 +83,7 @@ public function from(string $from) : self
             $this->targetClass = $this->dm->getClassMetadata($from);
         } catch (BaseMappingException $e) {
             $this->from = $from;
+
             return $this;
         }
 
@@ -91,6 +92,7 @@ public function from(string $from) : self
         }
 
         $this->from = $this->targetClass->getCollection();
+
         return $this;
     }
 
@@ -120,6 +122,7 @@ public function getExpression() : array
     public function localField(string $localField) : self
     {
         $this->localField = $this->prepareFieldName($localField, $this->class);
+
         return $this;
     }
 
@@ -134,6 +137,7 @@ public function localField(string $localField) : self
     public function foreignField(string $foreignField) : self
     {
         $this->foreignField = $this->prepareFieldName($foreignField, $this->targetClass);
+
         return $this;
     }
 

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Out.php

@@ -46,10 +46,12 @@ public function out(string $collection) : Stage\Out
             $class = $this->dm->getClassMetadata($collection);
         } catch (BaseMappingException $e) {
             $this->collection = $collection;
+
             return $this;
         }
 
         $this->fromDocument($class);
+
         return $this;
     }
 

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php

@@ -49,7 +49,9 @@ private function convertExpression($expression)
     {
         if (is_array($expression)) {
             return array_map([$this, 'convertExpression'], $expression);
-        } elseif (is_string($expression) && substr($expression, 0, 1) === '$') {
+        }
+
+        if (is_string($expression) && substr($expression, 0, 1) === '$') {
             return '$' . $this->getDocumentPersister()->prepareFieldName(substr($expression, 1));
         }
 

lib/Doctrine/ODM/MongoDB/Configuration.php

@@ -339,6 +339,7 @@ public function getClassMetadataFactoryName() : string
         if (! isset($this->attributes['classMetadataFactoryName'])) {
             $this->attributes['classMetadataFactoryName'] = ClassMetadataFactory::class;
         }
+
         return $this->attributes['classMetadataFactoryName'];
     }
 
@@ -435,6 +436,7 @@ public function getPersistentCollectionFactory() : PersistentCollectionFactory
         if (! isset($this->attributes['persistentCollectionFactory'])) {
             $this->attributes['persistentCollectionFactory'] = new DefaultPersistentCollectionFactory();
         }
+
         return $this->attributes['persistentCollectionFactory'];
     }
 
@@ -459,6 +461,7 @@ public function getPersistentCollectionGenerator() : PersistentCollectionGenerat
                 $this->getPersistentCollectionNamespace()
             );
         }
+
         return $this->attributes['persistentCollectionGenerator'];
     }
 

lib/Doctrine/ODM/MongoDB/DocumentManager.php

@@ -510,6 +510,7 @@ public function merge($document)
             throw new InvalidArgumentException(gettype($document));
         }
         $this->errorIfClosed();
+
         return $this->unitOfWork->merge($document);
     }
 
@@ -678,6 +679,7 @@ public function contains($document)
         if (! is_object($document)) {
             throw new InvalidArgumentException(gettype($document));
         }
+
         return $this->unitOfWork->isScheduledForInsert($document) ||
             $this->unitOfWork->isInIdentityMap($document) &&
             ! $this->unitOfWork->isScheduledForDelete($document);
@@ -718,8 +720,6 @@ public function createReference(object $document, array $referenceMapping)
                 }
 
                 return $class->getDatabaseIdentifierValue($id);
-                break;
-
             case ClassMetadata::REFERENCE_STORE_AS_REF:
                 $reference = ['id' => $class->getDatabaseIdentifierValue($id)];
                 break;

lib/Doctrine/ODM/MongoDB/Event/LifecycleEventArgs.php

@@ -23,6 +23,7 @@ public function getDocumentManager() : DocumentManager
     {
         $dm = $this->getObjectManager();
         assert($dm instanceof DocumentManager);
+
         return $dm;
     }
 }

lib/Doctrine/ODM/MongoDB/Event/LoadClassMetadataEventArgs.php

@@ -17,6 +17,7 @@ public function getDocumentManager() : DocumentManager
     {
         $dm = $this->getObjectManager();
         assert($dm instanceof DocumentManager);
+
         return $dm;
     }
 }

lib/Doctrine/ODM/MongoDB/Event/ManagerEventArgs.php

@@ -17,6 +17,7 @@ public function getDocumentManager() : DocumentManager
     {
         $dm = $this->getObjectManager();
         assert($dm instanceof DocumentManager);
+
         return $dm;
     }
 }

lib/Doctrine/ODM/MongoDB/Event/OnClearEventArgs.php

@@ -17,6 +17,7 @@ public function getDocumentManager() : DocumentManager
     {
         $dm = $this->getObjectManager();
         assert($dm instanceof DocumentManager);
+
         return $dm;
     }
 

lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php

@@ -152,6 +152,7 @@ public function getHydratorFor(string $className) : HydratorInterface
             }
         }
         $this->hydrators[$className] = new $fqn($this->dm, $this->unitOfWork, $class);
+
         return $this->hydrators[$className];
     }
 

lib/Doctrine/ODM/MongoDB/Id/UuidGenerator.php

@@ -69,6 +69,7 @@ public function isValid(string $uuid) : bool
     public function generate(DocumentManager $dm, object $document)
     {
         $uuid = $this->generateV4();
+
         return $this->generateV5($uuid, $this->salt ?: php_uname('n'));
     }