Merge pull request #12486 from greg0ire/3.6.x

Merge 2.20.x up into 3.6.x

Author: greg0ire

phpstan-baseline.neon

@@ -2856,12 +2856,6 @@ parameters:
 			count: 1
 			path: src/Tools/Console/Command/MappingDescribeCommand.php
 
-		-
-			message: '#^Parameter \#1 \$entityListeners of method Doctrine\\ORM\\Tools\\Console\\Command\\MappingDescribeCommand\:\:formatEntityListeners\(\) expects list\<object\>, array\<string, list\<array\{class\: class\-string, method\: string\}\>\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Tools/Console/Command/MappingDescribeCommand.php
-
 		-
 			message: '#^Parameter \#2 \$callback of function array_filter expects \(callable\(class\-string\)\: bool\)\|null, Closure\(mixed\)\: \(0\|1\|false\) given\.$#'
 			identifier: argument.type

src/Tools/Console/Command/MappingDescribeCommand.php

@@ -376,13 +376,21 @@ private function formatMappingsAsJson(array $propertyMappings): array
     /**
      * Format the entity listeners
      *
-     * @phpstan-param list<object> $entityListeners
+     * @phpstan-param array<string, list<array{class: class-string, method: string}>> $entityListeners
      *
      * @return string[]
      * @phpstan-return array{0: string, 1: string}
      */
     private function formatEntityListeners(array $entityListeners): array
     {
-        return $this->formatField('Entity listeners', array_map('get_class', $entityListeners));
+        $listeners = [];
+
+        foreach ($entityListeners as $eventName => $eventListeners) {
+            foreach ($eventListeners as $listener) {
+                $listeners[] = sprintf('%s: %s::%s', $eventName, $listener['class'], $listener['method']);
+            }
+        }
+
+        return $this->formatField('Entity listeners', $listeners);
     }
 }

tests/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php

@@ -8,6 +8,7 @@
 use Doctrine\ORM\Tools\Console\Command\MappingDescribeCommand;
 use Doctrine\ORM\Tools\Console\EntityManagerProvider\SingleManagerProvider;
 use Doctrine\Tests\Models\Cache\AttractionInfo;
+use Doctrine\Tests\Models\CMS\CmsAddress;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\CoversClass;
@@ -138,4 +139,22 @@ public static function provideCompletionSuggestions(): iterable
             ['text', 'json'],
         ];
     }
+
+    public function testShowEntityWithEntityListeners(): void
+    {
+        $this->tester->execute(
+            [
+                'command'    => $this->command->getName(),
+                'entityName' => CmsAddress::class,
+            ],
+        );
+
+        $display = $this->tester->getDisplay();
+
+        self::assertStringContainsString(CmsAddress::class, $display);
+        self::assertStringContainsString('Entity listeners', $display);
+        self::assertStringContainsString('CmsAddressListener', $display);
+        self::assertStringContainsString('postPersist', $display);
+        self::assertStringContainsString('prePersist', $display);
+    }
 }