1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88
|
From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
Date: Wed, 4 Jan 2023 07:02:21 +0100
Subject: Allow doctrine/event-manager 2
Add return types to Doctrine bridge.
Origin: backport, http://github.com/symfony/symfony/commit/1ea501dfb2d477b5b136d171a8965055cfd989ef
---
composer.json | 2 +-
src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php | 10 +++++-----
src/Symfony/Bridge/Doctrine/composer.json | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/composer.json b/composer.json
index d2e49b6..da8858c 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
"php": ">=7.2.5",
"ext-xml": "*",
"friendsofphp/proxy-manager-lts": "^1.0.2",
- "doctrine/event-manager": "~1.0",
+ "doctrine/event-manager": "~1.0|~2.0",
"doctrine/persistence": "^2|^3",
"twig/twig": "^2.13|^3.0.4",
"psr/cache": "^1.0|^2.0",
diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
index db5cc92..8d5069d 100644
--- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
+++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
@@ -49,7 +49,7 @@ class ContainerAwareEventManager extends EventManager
*
* @return void
*/
- public function dispatchEvent($eventName, EventArgs $eventArgs = null)
+ public function dispatchEvent($eventName, EventArgs $eventArgs = null): void
{
if (!$this->initializedSubscribers) {
$this->initializeSubscribers();
@@ -74,7 +74,7 @@ class ContainerAwareEventManager extends EventManager
*
* @return object[][]
*/
- public function getListeners($event = null)
+ public function getListeners($event = null): array
{
if (null === $event) {
return $this->getAllListeners();
@@ -109,7 +109,7 @@ class ContainerAwareEventManager extends EventManager
*
* @return bool
*/
- public function hasListeners($event)
+ public function hasListeners($event): bool
{
if (!$this->initializedSubscribers) {
$this->initializeSubscribers();
@@ -123,7 +123,7 @@ class ContainerAwareEventManager extends EventManager
*
* @return void
*/
- public function addEventListener($events, $listener)
+ public function addEventListener($events, $listener): void
{
if (!$this->initializedSubscribers) {
$this->initializeSubscribers();
@@ -149,7 +149,7 @@ class ContainerAwareEventManager extends EventManager
*
* @return void
*/
- public function removeEventListener($events, $listener)
+ public function removeEventListener($events, $listener): void
{
if (!$this->initializedSubscribers) {
$this->initializeSubscribers();
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 655bcd8..c5380b2 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -17,7 +17,7 @@
],
"require": {
"php": ">=7.2.5",
- "doctrine/event-manager": "~1.0",
+ "doctrine/event-manager": "~1.0|~2.0",
"doctrine/persistence": "^2|^3",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-ctype": "~1.8",
|