Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automap events in AttachEntityListenersListener #10122

Merged
merged 1 commit into from
Oct 26, 2022
Merged

Automap events in AttachEntityListenersListener #10122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/Doctrine/ORM/Tools/AttachEntityListenersListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Doctrine\ORM\Tools;

use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
use Doctrine\ORM\Mapping\Builder\EntityListenerBuilder;

use function ltrim;

Expand All @@ -17,11 +18,11 @@ class AttachEntityListenersListener
private $entityListeners = [];

/**
* Adds a entity listener for a specific entity.
* Adds an entity listener for a specific entity.
*
* @param string $entityClass The entity to attach the listener.
* @param string $listenerClass The listener class.
* @param string $eventName The entity lifecycle event.
* @param string|null $eventName The entity lifecycle event.
* @param string|null $listenerCallback The listener callback method or NULL to use $eventName.
*
* @return void
Expand Down Expand Up @@ -49,7 +50,11 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $event)
}

foreach ($this->entityListeners[$metadata->name] as $listener) {
$metadata->addEntityListener($listener['event'], $listener['class'], $listener['method']);
if ($listener['event'] === null) {
EntityListenerBuilder::bindEntityListener($metadata, $listener['class']);
} else {
$metadata->addEntityListener($listener['event'], $listener['class'], $listener['method']);
}
}

unset($this->entityListeners[$metadata->name]);
Expand Down
25 changes: 25 additions & 0 deletions tests/Doctrine/Tests/ORM/Tools/AttachEntityListenersListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,31 @@ public function testDuplicateEntityListenerException(): void

$this->factory->getMetadataFor(AttachEntityListenersListenerTestFooEntity::class);
}

public function testAttachWithoutSpecifyingAnEventName(): void
{
$this->listener->addEntityListener(
AttachEntityListenersListenerTestFooEntity::class,
AttachEntityListenersListenerTestListener::class,
null
);

$metadata = $this->factory->getMetadataFor(AttachEntityListenersListenerTestFooEntity::class);

self::assertCount(2, $metadata->entityListeners);

self::assertArrayHasKey('prePersist', $metadata->entityListeners);
self::assertArrayHasKey('postPersist', $metadata->entityListeners);

self::assertCount(1, $metadata->entityListeners['prePersist']);
self::assertCount(1, $metadata->entityListeners['postPersist']);

self::assertEquals('prePersist', $metadata->entityListeners['prePersist'][0]['method']);
self::assertEquals(AttachEntityListenersListenerTestListener::class, $metadata->entityListeners['prePersist'][0]['class']);

self::assertEquals('postPersist', $metadata->entityListeners['postPersist'][0]['method']);
self::assertEquals(AttachEntityListenersListenerTestListener::class, $metadata->entityListeners['postPersist'][0]['class']);
}
}

/** @Entity */
Expand Down