extension.json: DomainEventIngresses instead of DomainEventSubscribers

Why:
- "ingress" is the more meaningful concept when implementing listeners

What:
- Add support for DomainEventSubscribers in extension.json

Bug: T389033
Change-Id: I458bd7cd439a2e3213458d994cf87affa5da966b

2 files changed, 37 insertions, 10 deletions

diff --git a/tests/phpunit/includes/registration/ExtensionRegistrationTest.php b/tests/phpunit/includes/registration/ExtensionRegistrationTest.php
index b17aa67afdef..bf195a36a0aa 100644
--- a/tests/phpunit/includes/registration/ExtensionRegistrationTest.php
+++ b/tests/phpunit/includes/registration/ExtensionRegistrationTest.php
@@ -138,7 +138,7 @@ class ExtensionRegistrationTest extends MediaWikiIntegrationTestCase {
 		];
 
 		$manifest = [
-			'DomainEventSubscribers' => [ $subscriber ]
+			'DomainEventIngresses' => [ $subscriber ]
 		];
 
 		$file = $this->makeManifestFile( $manifest );
diff --git a/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php b/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php
index f3a611b99bd1..a85e07a7ed0b 100644
--- a/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php
+++ b/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php
@@ -596,15 +596,42 @@ class ExtensionProcessorTest extends MediaWikiUnitTestCase {
 		$processor->getExtractedInfo();
 	}
 
-	public function provideDomainEventDomainEventSubscribers() {
+	public function provideDomainEventDomainEventIngresses() {
 		// Format:
-		// Current DomainEventSubscribers attribute
+		// Current attributes
 		// Content in extension.json
-		// Expected DomainEventSubscribers attribute
+		// Expected DomainEventIngresses attribute
 		return [
-			[
+			'DomainEventIngresses' => [
+				[
+					'DomainEventIngresses' => [
+						[ 'events' => [ 'FooDone' ], 'factory' => 'PriorCallback' ]
+					]
+				],
+				[
+					'DomainEventIngresses' => [
+						[
+							'events' => [ 'FooDone', 'BarDone', ],
+							'class' => 'FooClass',
+							'services' => [],
+						],
+					]
+				] + self::$default,
 				[
-					[ 'events' => [ 'FooDone' ], 'factory' => 'PriorCallback' ]
+					[ 'events' => [ 'FooDone' ], 'factory' => 'PriorCallback' ],
+					[
+						'events' => [ 'FooDone', 'BarDone', ],
+						'class' => 'FooClass',
+						'services' => [],
+						'extensionPath' => $this->getExtensionPath()
+					]
+				]
+			],
+			'DomainEventSubscriber (deprecated, T389033)' => [
+				[
+					'DomainEventIngresses' => [
+						[ 'events' => [ 'FooDone' ], 'factory' => 'PriorCallback' ]
+					]
 				],
 				[
 					'DomainEventSubscribers' => [
@@ -629,13 +656,13 @@ class ExtensionProcessorTest extends MediaWikiUnitTestCase {
 	}
 
 	/**
-	 * @dataProvider provideDomainEventDomainEventSubscribers
+	 * @dataProvider provideDomainEventDomainEventIngresses
 	 */
-	public function testDomainEventDomainEventSubscribers( $pre, $info, $expected ) {
-		$processor = new MockExtensionProcessor( [ 'attributes' => [ 'DomainEventSubscribers' => $pre ] ] );
+	public function testDomainEventDomainEventIngresses( $pre, $info, $expected ) {
+		$processor = new MockExtensionProcessor( [ 'attributes' => $pre ] );
 		$processor->extractInfo( $this->extensionPath, $info, 1 );
 		$extracted = $processor->getExtractedInfo();
-		$this->assertEquals( $expected, $extracted['attributes']['DomainEventSubscribers'] );
+		$this->assertEquals( $expected, $extracted['attributes']['DomainEventIngresses'] );
 	}
 
 	public function testExtractConfig1() {