From b64c1f36420458df6e79480a22729afbf6a0c15a Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Fri, 8 Apr 2022 01:47:34 +0100
Subject: [PATCH] Move EchoPush\Api namespace to
 MediaWiki\Extension\Notifications\Push\Api

Bug: T305667
Change-Id: I6168b386f532c83333cdc6700ba7e2917385a39c
---
 extension.json                                                  | 1 -
 includes/Hooks.php                                              | 2 +-
 includes/{api/Push => Push/Api}/ApiEchoPushSubscriptions.php    | 2 +-
 .../{api/Push => Push/Api}/ApiEchoPushSubscriptionsCreate.php   | 2 +-
 .../{api/Push => Push/Api}/ApiEchoPushSubscriptionsDelete.php   | 2 +-
 tests/phpunit/api/Push/ApiEchoPushSubscriptionsCreateTest.php   | 2 +-
 tests/phpunit/api/Push/ApiEchoPushSubscriptionsDeleteTest.php   | 2 +-
 tests/phpunit/api/Push/ApiEchoPushSubscriptionsTest.php         | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)
 rename includes/{api/Push => Push/Api}/ApiEchoPushSubscriptions.php (97%)
 rename includes/{api/Push => Push/Api}/ApiEchoPushSubscriptionsCreate.php (98%)
 rename includes/{api/Push => Push/Api}/ApiEchoPushSubscriptionsDelete.php (98%)

diff --git a/extension.json b/extension.json
index e241019a5..6aa060ae4 100644
--- a/extension.json
+++ b/extension.json
@@ -1162,7 +1162,6 @@
 		"MediaWiki\\Extension\\Notifications\\Push\\PushNotifier": "includes/Push/PushNotifier.php"
 	},
 	"AutoloadNamespaces": {
-		"EchoPush\\Api\\": "includes/api/Push/",
 		"MediaWiki\\Extension\\Notifications\\": "includes/"
 	},
 	"TestAutoloadClasses": {
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 42adfcba5..d4938b289 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -18,7 +18,6 @@ use EchoModerationController;
 use EchoNotification;
 use EchoNotificationController;
 use EchoNotificationMapper;
-use EchoPush\Api\ApiEchoPushSubscriptions;
 use EchoSeenTime;
 use EchoServices;
 use EmailNotification;
@@ -28,6 +27,7 @@ use HTMLCheckMatrix;
 use LinksUpdate;
 use LogEntry;
 use MailAddress;
+use MediaWiki\Extension\Notifications\Push\Api\ApiEchoPushSubscriptions;
 use MediaWiki\Hook\RecentChange_saveHook;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
diff --git a/includes/api/Push/ApiEchoPushSubscriptions.php b/includes/Push/Api/ApiEchoPushSubscriptions.php
similarity index 97%
rename from includes/api/Push/ApiEchoPushSubscriptions.php
rename to includes/Push/Api/ApiEchoPushSubscriptions.php
index 001a7d23a..f0f46e5f3 100644
--- a/includes/api/Push/ApiEchoPushSubscriptions.php
+++ b/includes/Push/Api/ApiEchoPushSubscriptions.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace EchoPush\Api;
+namespace MediaWiki\Extension\Notifications\Push\Api;
 
 use ApiBase;
 use ApiModuleManager;
diff --git a/includes/api/Push/ApiEchoPushSubscriptionsCreate.php b/includes/Push/Api/ApiEchoPushSubscriptionsCreate.php
similarity index 98%
rename from includes/api/Push/ApiEchoPushSubscriptionsCreate.php
rename to includes/Push/Api/ApiEchoPushSubscriptionsCreate.php
index 2a1bab9e5..31b34a975 100644
--- a/includes/api/Push/ApiEchoPushSubscriptionsCreate.php
+++ b/includes/Push/Api/ApiEchoPushSubscriptionsCreate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace EchoPush\Api;
+namespace MediaWiki\Extension\Notifications\Push\Api;
 
 use ApiBase;
 use ApiMain;
diff --git a/includes/api/Push/ApiEchoPushSubscriptionsDelete.php b/includes/Push/Api/ApiEchoPushSubscriptionsDelete.php
similarity index 98%
rename from includes/api/Push/ApiEchoPushSubscriptionsDelete.php
rename to includes/Push/Api/ApiEchoPushSubscriptionsDelete.php
index d1f1d9ab2..05181a337 100644
--- a/includes/api/Push/ApiEchoPushSubscriptionsDelete.php
+++ b/includes/Push/Api/ApiEchoPushSubscriptionsDelete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace EchoPush\Api;
+namespace MediaWiki\Extension\Notifications\Push\Api;
 
 use ApiBase;
 use ApiMain;
diff --git a/tests/phpunit/api/Push/ApiEchoPushSubscriptionsCreateTest.php b/tests/phpunit/api/Push/ApiEchoPushSubscriptionsCreateTest.php
index ea92c5f59..bdea3b730 100644
--- a/tests/phpunit/api/Push/ApiEchoPushSubscriptionsCreateTest.php
+++ b/tests/phpunit/api/Push/ApiEchoPushSubscriptionsCreateTest.php
@@ -6,7 +6,7 @@ use MediaWiki\Extension\Notifications\Push\Utils;
  * @group medium
  * @group API
  * @group Database
- * @covers \EchoPush\Api\ApiEchoPushSubscriptionsCreate
+ * @covers \MediaWiki\Extension\Notifications\Push\Api\ApiEchoPushSubscriptionsCreate
  */
 class ApiEchoPushSubscriptionsCreateTest extends ApiTestCase {
 
diff --git a/tests/phpunit/api/Push/ApiEchoPushSubscriptionsDeleteTest.php b/tests/phpunit/api/Push/ApiEchoPushSubscriptionsDeleteTest.php
index ee49f309b..83f82d399 100644
--- a/tests/phpunit/api/Push/ApiEchoPushSubscriptionsDeleteTest.php
+++ b/tests/phpunit/api/Push/ApiEchoPushSubscriptionsDeleteTest.php
@@ -6,7 +6,7 @@ use MediaWiki\Extension\Notifications\Push\Utils;
  * @group medium
  * @group API
  * @group Database
- * @covers \EchoPush\Api\ApiEchoPushSubscriptionsDelete
+ * @covers \MediaWiki\Extension\Notifications\Push\Api\ApiEchoPushSubscriptionsDelete
  */
 class ApiEchoPushSubscriptionsDeleteTest extends ApiTestCase {
 
diff --git a/tests/phpunit/api/Push/ApiEchoPushSubscriptionsTest.php b/tests/phpunit/api/Push/ApiEchoPushSubscriptionsTest.php
index 857464a8a..81ca5ad2f 100644
--- a/tests/phpunit/api/Push/ApiEchoPushSubscriptionsTest.php
+++ b/tests/phpunit/api/Push/ApiEchoPushSubscriptionsTest.php
@@ -3,7 +3,7 @@
 /**
  * @group medium
  * @group API
- * @covers \EchoPush\Api\ApiEchoPushSubscriptions
+ * @covers \MediaWiki\Extension\Notifications\Push\Api\ApiEchoPushSubscriptions
  */
 class ApiEchoPushSubscriptionsTest extends ApiTestCase {