Merge pull request #2470 from IonBazan/feature/php-7.4

Make use of PHP 7.4 syntax

Author: malarzm

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

@@ -277,9 +277,7 @@ public function getPipeline(/* bool $applyFilters = true */): array
         }
 
         $pipeline = array_map(
-            static function (Stage $stage) {
-                return $stage->getExpression();
-            },
+            static fn (Stage $stage) => $stage->getExpression(),
             $this->stages
         );
 

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

@@ -318,9 +318,7 @@ public function cond($if, $then, $else): self
     public static function convertExpression($expression)
     {
         if (is_array($expression)) {
-            return array_map(static function ($expression) {
-                return static::convertExpression($expression);
-            }, $expression);
+            return array_map(static fn ($expression) => static::convertExpression($expression), $expression);
         }
 
         if ($expression instanceof self) {

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

@@ -25,9 +25,7 @@ class Facet extends Stage
     public function getExpression(): array
     {
         return [
-            '$facet' => array_map(static function (Builder $builder) {
-                return $builder->getPipeline(false);
-            }, $this->pipelines),
+            '$facet' => array_map(static fn (Builder $builder) => $builder->getPipeline(false), $this->pipelines),
         ];
     }
 

lib/Doctrine/ODM/MongoDB/DocumentNotFoundException.php

@@ -4,9 +4,13 @@
 
 namespace Doctrine\ODM\MongoDB;
 
+use JsonException;
+
 use function json_encode;
 use function sprintf;
 
+use const JSON_THROW_ON_ERROR;
+
 /**
  * Class for exception when encountering proxy object that has
  * an identifier that does not exist in the database.
@@ -18,10 +22,15 @@ final class DocumentNotFoundException extends MongoDBException
      */
     public static function documentNotFound(string $className, $identifier): self
     {
+        try {
+            $id = json_encode($identifier, JSON_THROW_ON_ERROR);
+        } catch (JsonException $e) {
+        }
+
         return new self(sprintf(
             'The "%s" document with identifier %s could not be found.',
             $className,
-            json_encode($identifier)
-        ));
+            $id ?? false,
+        ), 0, $e ?? null);
     }
 }

lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php

@@ -8,6 +8,7 @@
 use BadMethodCallException;
 use DateTime;
 use DateTimeImmutable;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Instantiator\Instantiator;
 use Doctrine\Instantiator\InstantiatorInterface;
 use Doctrine\ODM\MongoDB\Id\IdGenerator;
@@ -1851,9 +1852,7 @@ public function getEmbeddedFieldsMappings(): array
     {
         return array_filter(
             $this->associationMappings,
-            static function ($assoc) {
-                return ! empty($assoc['embedded']);
-            }
+            static fn ($assoc) => ! empty($assoc['embedded'])
         );
     }
 
@@ -2206,7 +2205,7 @@ public function mapField(array $mapping): array
 
         if (! empty($mapping['collectionClass'])) {
             $rColl = new ReflectionClass($mapping['collectionClass']);
-            if (! $rColl->implementsInterface('Doctrine\\Common\\Collections\\Collection')) {
+            if (! $rColl->implementsInterface(Collection::class)) {
                 throw MappingException::collectionClassDoesNotImplementCommonInterface($this->name, $mapping['fieldName'], $mapping['collectionClass']);
             }
         }

lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php

@@ -738,9 +738,7 @@ private function validateSchema(string $filename): void
      */
     private function formatErrors(array $xmlErrors): string
     {
-        return implode("\n", array_map(static function (LibXMLError $error): string {
-            return sprintf('Line %d:%d: %s', $error->line, $error->column, $error->message);
-        }, $xmlErrors));
+        return implode("\n", array_map(static fn (LibXMLError $error): string => sprintf('Line %d:%d: %s', $error->line, $error->column, $error->message), $xmlErrors));
     }
 
     /**

lib/Doctrine/ODM/MongoDB/PersistentCollection/DefaultPersistentCollectionGenerator.php

@@ -154,7 +154,7 @@ public function __construct(BaseCollection \$coll, DocumentManager \$dm, UnitOfW
 
 CODE;
         $rc        = new ReflectionClass($for);
-        $rt        = new ReflectionClass('Doctrine\\ODM\\MongoDB\\PersistentCollection\\PersistentCollectionTrait');
+        $rt        = new ReflectionClass(PersistentCollectionTrait::class);
         foreach ($rc->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
             if (
                 $rt->hasMethod($method->name) ||
@@ -302,18 +302,14 @@ private function formatType(
     ): string {
         if ($type instanceof ReflectionUnionType) {
             return implode('|', array_map(
-                function (ReflectionType $unionedType) use ($method, $parameter) {
-                    return $this->formatType($unionedType, $method, $parameter);
-                },
+                fn (ReflectionType $unionedType) => $this->formatType($unionedType, $method, $parameter),
                 $type->getTypes()
             ));
         }
 
         if ($type instanceof ReflectionIntersectionType) {
             return implode('&', array_map(
-                function (ReflectionType $intersectedType) use ($method, $parameter) {
-                    return $this->formatType($intersectedType, $method, $parameter);
-                },
+                fn (ReflectionType $intersectedType) => $this->formatType($intersectedType, $method, $parameter),
                 $type->getTypes()
             ));
         }

lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php

@@ -249,9 +249,7 @@ public function getDeleteDiff()
         return array_udiff_assoc(
             $this->snapshot,
             $this->coll->toArray(),
-            static function ($a, $b) {
-                return $a === $b ? 0 : 1;
-            }
+            static fn ($a, $b) => $a === $b ? 0 : 1
         );
     }
 
@@ -269,9 +267,7 @@ public function getInsertDiff()
         return array_udiff_assoc(
             $this->coll->toArray(),
             $this->snapshot,
-            static function ($a, $b) {
-                return $a === $b ? 0 : 1;
-            }
+            static fn ($a, $b) => $a === $b ? 0 : 1
         );
     }
 

lib/Doctrine/ODM/MongoDB/Persisters/CollectionPersister.php

@@ -396,14 +396,10 @@ private function getValuePrepareCallback(PersistentCollectionInterface $coll): C
     {
         $mapping = $coll->getMapping();
         if (isset($mapping['embedded'])) {
-            return function ($v) use ($mapping) {
-                return $this->pb->prepareEmbeddedDocumentValue($mapping, $v);
-            };
+            return fn ($v) => $this->pb->prepareEmbeddedDocumentValue($mapping, $v);
         }
 
-        return function ($v) use ($mapping) {
-            return $this->pb->prepareReferencedDocumentValue($mapping, $v);
-        };
+        return fn ($v) => $this->pb->prepareReferencedDocumentValue($mapping, $v);
     }
 
     /**

lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php

@@ -1176,7 +1176,7 @@ private function convertToDatabaseValue(string $fieldName, $value)
      */
     private function prepareQueryElement(string $fieldName, $value = null, ?ClassMetadata $class = null, bool $prepareValue = true, bool $inNewObj = false): array
     {
-        $class = $class ?? $this->class;
+        $class ??= $this->class;
 
         // @todo Consider inlining calls to ClassMetadata methods
 
@@ -1662,9 +1662,7 @@ private function prepareReference(string $fieldName, object $value, array $mappi
         }
 
         return array_map(
-            static function ($key) use ($reference, $fieldName) {
-                return [$fieldName . '.' . $key, $reference[$key]];
-            },
+            static fn ($key) => [$fieldName . '.' . $key, $reference[$key]],
             array_keys($keys)
         );
     }