jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343626 )
Change subject: Move watcheditem classes to watcheditem directory
......................................................................
Move watcheditem classes to watcheditem directory
Change-Id: If915c875380b4ecd74fad64df7833de87ea6d6f7
---
M autoload.php
R includes/watcheditem/WatchedItem.php
R includes/watcheditem/WatchedItemQueryService.php
R includes/watcheditem/WatchedItemQueryServiceExtension.php
R includes/watcheditem/WatchedItemStore.php
R tests/phpunit/includes/watcheditem/WatchedItemIntegrationTest.php
R tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
R tests/phpunit/includes/watcheditem/WatchedItemStoreIntegrationTest.php
R tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
R tests/phpunit/includes/watcheditem/WatchedItemUnitTest.php
10 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
WMDE-Fisch: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index 39ec4b0..5496e3c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1591,10 +1591,10 @@
'WantedQueryPage' => __DIR__ .
'/includes/specialpage/WantedQueryPage.php',
'WantedTemplatesPage' => __DIR__ .
'/includes/specials/SpecialWantedtemplates.php',
'WatchAction' => __DIR__ . '/includes/actions/WatchAction.php',
- 'WatchedItem' => __DIR__ . '/includes/WatchedItem.php',
- 'WatchedItemQueryService' => __DIR__ .
'/includes/WatchedItemQueryService.php',
- 'WatchedItemQueryServiceExtension' => __DIR__ .
'/includes/WatchedItemQueryServiceExtension.php',
- 'WatchedItemStore' => __DIR__ . '/includes/WatchedItemStore.php',
+ 'WatchedItem' => __DIR__ . '/includes/watcheditem/WatchedItem.php',
+ 'WatchedItemQueryService' => __DIR__ .
'/includes/watcheditem/WatchedItemQueryService.php',
+ 'WatchedItemQueryServiceExtension' => __DIR__ .
'/includes/watcheditem/WatchedItemQueryServiceExtension.php',
+ 'WatchedItemStore' => __DIR__ .
'/includes/watcheditem/WatchedItemStore.php',
'WatchlistCleanup' => __DIR__ . '/maintenance/cleanupWatchlist.php',
'WebInstaller' => __DIR__ . '/includes/installer/WebInstaller.php',
'WebInstallerComplete' => __DIR__ .
'/includes/installer/WebInstallerComplete.php',
diff --git a/includes/WatchedItem.php b/includes/watcheditem/WatchedItem.php
similarity index 100%
rename from includes/WatchedItem.php
rename to includes/watcheditem/WatchedItem.php
diff --git a/includes/WatchedItemQueryService.php
b/includes/watcheditem/WatchedItemQueryService.php
similarity index 100%
rename from includes/WatchedItemQueryService.php
rename to includes/watcheditem/WatchedItemQueryService.php
diff --git a/includes/WatchedItemQueryServiceExtension.php
b/includes/watcheditem/WatchedItemQueryServiceExtension.php
similarity index 100%
rename from includes/WatchedItemQueryServiceExtension.php
rename to includes/watcheditem/WatchedItemQueryServiceExtension.php
diff --git a/includes/WatchedItemStore.php
b/includes/watcheditem/WatchedItemStore.php
similarity index 100%
rename from includes/WatchedItemStore.php
rename to includes/watcheditem/WatchedItemStore.php
diff --git a/tests/phpunit/includes/WatchedItemIntegrationTest.php
b/tests/phpunit/includes/watcheditem/WatchedItemIntegrationTest.php
similarity index 100%
rename from tests/phpunit/includes/WatchedItemIntegrationTest.php
rename to tests/phpunit/includes/watcheditem/WatchedItemIntegrationTest.php
diff --git a/tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php
b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
similarity index 100%
rename from tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php
rename to tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
diff --git a/tests/phpunit/includes/WatchedItemStoreIntegrationTest.php
b/tests/phpunit/includes/watcheditem/WatchedItemStoreIntegrationTest.php
similarity index 100%
rename from tests/phpunit/includes/WatchedItemStoreIntegrationTest.php
rename to tests/phpunit/includes/watcheditem/WatchedItemStoreIntegrationTest.php
diff --git a/tests/phpunit/includes/WatchedItemStoreUnitTest.php
b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
similarity index 99%
rename from tests/phpunit/includes/WatchedItemStoreUnitTest.php
rename to tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
index 950e220..43b4fe9 100644
--- a/tests/phpunit/includes/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
@@ -1,5 +1,6 @@
<?php
use MediaWiki\Linker\LinkTarget;
+use Wikimedia\Rdbms\LoadBalancer;
use Wikimedia\ScopedCallback;
/**
diff --git a/tests/phpunit/includes/WatchedItemUnitTest.php
b/tests/phpunit/includes/watcheditem/WatchedItemUnitTest.php
similarity index 100%
rename from tests/phpunit/includes/WatchedItemUnitTest.php
rename to tests/phpunit/includes/watcheditem/WatchedItemUnitTest.php
--
To view, visit https://gerrit.wikimedia.org/r/343626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If915c875380b4ecd74fad64df7833de87ea6d6f7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
