Allow defining PHP mapping with a static function

lib/Doctrine/Persistence/Mapping/Driver/AnnotationDriver.php

@@ -14,7 +14,6 @@
 use function array_merge;
 use function array_unique;
 use function assert;
-use function get_class;
 use function get_declared_classes;
 use function in_array;
 use function is_dir;
@@ -179,7 +178,7 @@ public function isTransient($className)
         $classAnnotations = $this->reader->getClassAnnotations(new ReflectionClass($className));
 
         foreach ($classAnnotations as $annot) {
-            if (isset($this->entityAnnotationClasses[get_class($annot)])) {
+            if (isset($this->entityAnnotationClasses[$annot::class])) {
                 return false;
             }
         }

lib/Doctrine/Persistence/Mapping/Driver/PHPDriver.php

@@ -40,7 +40,12 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
     protected function loadMappingFile($file)
     {
         $metadata = $this->metadata;
-        include $file;
+
+        $mapping = include $file;
+
+        if (is_callable($mapping)) {
+            $mapping($metadata);
+        }
 
         return [$metadata->getName() => $metadata];
     }

tests/Doctrine/Tests/Persistence/Mapping/PHPDriverTest.php

@@ -16,8 +16,21 @@ public function testLoadMetadata(): void
         $driver = new PHPDriver([__DIR__ . '/_files']);
         $driver->loadMetadataForClass(PHPTestEntity::class, $metadata);
     }
+
+    public function testLoadMetadataWithFunction(): void
+    {
+        $metadata = $this->createMock(ClassMetadata::class);
+        $metadata->expects($this->once())->method('getFieldNames');
+
+        $driver = new PHPDriver([__DIR__ . '/_files']);
+        $driver->loadMetadataForClass(PHPStaticTestEntity::class, $metadata);
+    }
 }
 
 class PHPTestEntity
 {
 }
+
+class PHPStaticTestEntity
+{
+}

tests/Doctrine/Tests/Persistence/Mapping/_files/Doctrine.Tests.Persistence.Mapping.PHPStaticTestEntity.php

@@ -0,0 +1,8 @@
+<?php
+
+use Doctrine\Persistence\Mapping\ClassMetadata;
+
+return static function (ClassMetadata $metadata): void
+{
+    $metadata->getFieldNames();
+};

tests/Doctrine/Tests/Persistence/RuntimePublicReflectionPropertyTest.php

@@ -167,10 +167,7 @@ public function __setInitialized($initialized)
         $this->initialized = (bool) $initialized;
     }
 
-    /**
-     * @return mixed
-     */
-    public function __get(string $name)
+    public function __get(string $name): mixed
     {
         if ($this->initializer) {
             $cb = $this->initializer;
@@ -180,10 +177,7 @@ public function __get(string $name)
         return $this->checkedProperty;
     }
 
-    /**
-     * @param mixed $value
-     */
-    public function __set(string $name, $value): void
+    public function __set(string $name, mixed $value): void
     {
         if ($this->initializer) {
             $cb = $this->initializer;

tests/Doctrine/Tests_PHP74/Persistence/Reflection/TypedNoDefaultReflectionPropertyTest.php

@@ -64,10 +64,7 @@ class TypedFoo
 {
     private int $id;
 
-    /**
-     * @param mixed $id
-     */
-    public function setId($id): void
+    public function setId(mixed $id): void
     {
         $this->id = $id;
     }
@@ -77,18 +74,12 @@ class TypedNullableFoo
 {
     private ?string $value;
 
-    /**
-     * @param mixed $value
-     */
-    public function setValue($value): void
+    public function setValue(mixed $value): void
     {
         $this->value = $value;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getValue()
+    public function getValue(): mixed
     {
         return $this->value;
     }