Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216603
Change subject: Move all PHP code into includes/
......................................................................
Move all PHP code into includes/
Mainly because I was annoyed at m<tab>o<tab>d<tab>u<tab> to reach
modules/.
Change-Id: Ib149cb2e2612ccddd0503f9d0c5d05b554860a00
---
M autoload.php
R includes/api/ApiEchoMarkRead.php
R includes/api/ApiEchoMarkSeen.php
R includes/api/ApiEchoNotifications.php
R includes/controller/NotificationController.php
R includes/formatters/BasicFormatter.php
R includes/formatters/CommentFormatter.php
R includes/formatters/EditFormatter.php
R includes/formatters/EditUserTalkFormatter.php
R includes/formatters/MentionFormatter.php
R includes/formatters/NotificationFormatter.php
R includes/formatters/PageLinkFormatter.php
R includes/formatters/UserRightsFormatter.php
R includes/jobs/NotificationDeleteJob.php
R includes/jobs/NotificationEmailBundleJob.php
R includes/jobs/NotificationJob.php
R includes/model/AbstractEntity.php
R includes/model/Event.php
R includes/model/Notification.php
R includes/model/TargetPage.php
R includes/special/SpecialNotifications.php
M scripts/gen-autoload.php
22 files changed, 23 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/03/216603/1
diff --git a/autoload.php b/autoload.php
index 5409aa7..f957c57 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1,32 +1,32 @@
<?php
// This file is generated by scripts/gen-autoload.php, do not adjust manually
-
+// @codingStandardsIgnoreFile
global $wgAutoloadClasses;
$wgAutoloadClasses += array(
- 'ApiEchoMarkRead' => __DIR__ . '/api/ApiEchoMarkRead.php',
+ 'ApiEchoMarkRead' => __DIR__ . '/includes/api/ApiEchoMarkRead.php',
'ApiEchoMarkReadTest' => __DIR__ .
'/tests/phpunit/api/ApiEchoMarkReadTest.php',
- 'ApiEchoMarkSeen' => __DIR__ . '/api/ApiEchoMarkSeen.php',
- 'ApiEchoNotifications' => __DIR__ . '/api/ApiEchoNotifications.php',
+ 'ApiEchoMarkSeen' => __DIR__ . '/includes/api/ApiEchoMarkSeen.php',
+ 'ApiEchoNotifications' => __DIR__ .
'/includes/api/ApiEchoNotifications.php',
'ApiEchoNotificationsTest' => __DIR__ .
'/tests/phpunit/api/ApiEchoNotificationsTest.php',
'BatchRowUpdateTest' => __DIR__ .
'/tests/phpunit/includes/BatchRowUpdateTest.php',
'CallbackFilterIterator' => __DIR__ .
'/includes/iterator/CallbackFilterIterator.php',
'ContainmentSetTest' => __DIR__ .
'/tests/phpunit/includes/ContainmentSetTest.php',
- 'EchoAbstractEntity' => __DIR__ . '/model/AbstractEntity.php',
+ 'EchoAbstractEntity' => __DIR__ . '/includes/model/AbstractEntity.php',
'EchoAbstractMapper' => __DIR__ . '/includes/mapper/AbstractMapper.php',
'EchoAbstractMapperStub' => __DIR__ .
'/tests/phpunit/includes/mapper/AbstractMapperTest.php',
'EchoAbstractMapperTest' => __DIR__ .
'/tests/phpunit/includes/mapper/AbstractMapperTest.php',
'EchoArrayList' => __DIR__ . '/includes/ContainmentSet.php',
'EchoAttributeManager' => __DIR__ . '/includes/AttributeManager.php',
'EchoAttributeManagerTest' => __DIR__ .
'/tests/phpunit/includes/AttributeManagerTest.php',
- 'EchoBasicFormatter' => __DIR__ . '/formatters/BasicFormatter.php',
+ 'EchoBasicFormatter' => __DIR__ .
'/includes/formatters/BasicFormatter.php',
'EchoBatchRowIterator' => __DIR__ . '/includes/BatchRowUpdate.php',
'EchoBatchRowUpdate' => __DIR__ . '/includes/BatchRowUpdate.php',
'EchoBatchRowWriter' => __DIR__ . '/includes/BatchRowUpdate.php',
'EchoCachedList' => __DIR__ . '/includes/ContainmentSet.php',
'EchoCallbackIterator' => __DIR__ .
'/includes/iterator/CallbackIterator.php',
'EchoCatchableFatalErrorException' => __DIR__ .
'/includes/exception/CatchableFatalErrorException.php',
- 'EchoCommentFormatter' => __DIR__ . '/formatters/CommentFormatter.php',
+ 'EchoCommentFormatter' => __DIR__ .
'/includes/formatters/CommentFormatter.php',
'EchoContainmentList' => __DIR__ . '/includes/ContainmentSet.php',
'EchoContainmentSet' => __DIR__ . '/includes/ContainmentSet.php',
'EchoDataOutputFormatter' => __DIR__ .
'/includes/DataOutputFormatter.php',
@@ -36,15 +36,15 @@
'EchoDiffParserTest' => __DIR__ .
'/tests/phpunit/includes/DiffParserTest.php',
'EchoDiscussionParser' => __DIR__ . '/includes/DiscussionParser.php',
'EchoDiscussionParserTest' => __DIR__ .
'/tests/phpunit/includes/DiscussionParserTest.php',
- 'EchoEditFormatter' => __DIR__ . '/formatters/EditFormatter.php',
- 'EchoEditUserTalkFormatter' => __DIR__ .
'/formatters/EditUserTalkFormatter.php',
+ 'EchoEditFormatter' => __DIR__ .
'/includes/formatters/EditFormatter.php',
+ 'EchoEditUserTalkFormatter' => __DIR__ .
'/includes/formatters/EditUserTalkFormatter.php',
'EchoEmailDecorator' => __DIR__ . '/includes/EmailFormatter.php',
'EchoEmailDigest' => __DIR__ . '/includes/EmailFormatter.php',
'EchoEmailFormatter' => __DIR__ . '/includes/EmailFormatter.php',
'EchoEmailFormatterTest' => __DIR__ .
'/tests/phpunit/includes/EmailFormatterTest.php',
'EchoEmailMode' => __DIR__ . '/includes/EmailFormatter.php',
'EchoEmailSingle' => __DIR__ . '/includes/EmailFormatter.php',
- 'EchoEvent' => __DIR__ . '/model/Event.php',
+ 'EchoEvent' => __DIR__ . '/includes/model/Event.php',
'EchoEventMapper' => __DIR__ . '/includes/mapper/EventMapper.php',
'EchoEventMapperTest' => __DIR__ .
'/tests/phpunit/includes/mapper/EventMapperTest.php',
'EchoExecuteFirstArgumentStub' => __DIR__ .
'/tests/phpunit/includes/mapper/NotificationMapperTest.php',
@@ -54,26 +54,26 @@
'EchoHooks' => __DIR__ . '/Hooks.php',
'EchoIteratorDecorator' => __DIR__ .
'/includes/iterator/IteratorDecorator.php',
'EchoLocalCache' => __DIR__ . '/includes/cache/LocalCache.php',
- 'EchoMentionFormatter' => __DIR__ . '/formatters/MentionFormatter.php',
+ 'EchoMentionFormatter' => __DIR__ .
'/includes/formatters/MentionFormatter.php',
'EchoMultipleIterator' => __DIR__ .
'/includes/iterator/MultipleIterator.php',
'EchoNotRecursiveIterator' => __DIR__ .
'/includes/iterator/NotRecursiveIterator.php',
- 'EchoNotification' => __DIR__ . '/model/Notification.php',
- 'EchoNotificationController' => __DIR__ .
'/controller/NotificationController.php',
- 'EchoNotificationDeleteJob' => __DIR__ .
'/jobs/NotificationDeleteJob.php',
- 'EchoNotificationFormatter' => __DIR__ .
'/formatters/NotificationFormatter.php',
+ 'EchoNotification' => __DIR__ . '/includes/model/Notification.php',
+ 'EchoNotificationController' => __DIR__ .
'/includes/controller/NotificationController.php',
+ 'EchoNotificationDeleteJob' => __DIR__ .
'/includes/jobs/NotificationDeleteJob.php',
+ 'EchoNotificationFormatter' => __DIR__ .
'/includes/formatters/NotificationFormatter.php',
'EchoNotificationFormatterTest' => __DIR__ .
'/tests/phpunit/formatters/NotificationFormatterTest.php',
- 'EchoNotificationJob' => __DIR__ . '/jobs/NotificationJob.php',
+ 'EchoNotificationJob' => __DIR__ . '/includes/jobs/NotificationJob.php',
'EchoNotificationMapper' => __DIR__ .
'/includes/mapper/NotificationMapper.php',
'EchoNotificationMapperTest' => __DIR__ .
'/tests/phpunit/includes/mapper/NotificationMapperTest.php',
'EchoNotificationTest' => __DIR__ .
'/tests/phpunit/model/NotificationTest.php',
'EchoNotifier' => __DIR__ . '/Notifier.php',
'EchoOnWikiList' => __DIR__ . '/includes/ContainmentSet.php',
- 'EchoPageLinkFormatter' => __DIR__ .
'/formatters/PageLinkFormatter.php',
+ 'EchoPageLinkFormatter' => __DIR__ .
'/includes/formatters/PageLinkFormatter.php',
'EchoRevisionLocalCache' => __DIR__ .
'/includes/cache/RevisionLocalCache.php',
'EchoRowUpdateGenerator' => __DIR__ . '/includes/BatchRowUpdate.php',
'EchoSuppressionRowUpdateGenerator' => __DIR__ .
'/includes/schemaUpdate.php',
'EchoTalkPageFunctionalTest' => __DIR__ .
'/tests/phpunit/includes/TalkPageFunctionalTest.php',
- 'EchoTargetPage' => __DIR__ . '/model/TargetPage.php',
+ 'EchoTargetPage' => __DIR__ . '/includes/model/TargetPage.php',
'EchoTargetPageMapper' => __DIR__ .
'/includes/mapper/TargetPageMapper.php',
'EchoTargetPageMapperTest' => __DIR__ .
'/tests/phpunit/includes/mapper/TargetPageMapperTest.php',
'EchoTargetPageTest' => __DIR__ .
'/tests/phpunit/model/TargetPageTest.php',
@@ -85,7 +85,7 @@
'EchoUserLocatorTest' => __DIR__ .
'/tests/phpunit/includes/UserLocatorTest.php',
'EchoUserNotificationGateway' => __DIR__ .
'/includes/gateway/UserNotificationGateway.php',
'EchoUserNotificationGatewayTest' => __DIR__ .
'/tests/phpunit/includes/gateway/UserNotificationGatewayTest.php',
- 'EchoUserRightsFormatter' => __DIR__ .
'/formatters/UserRightsFormatter.php',
+ 'EchoUserRightsFormatter' => __DIR__ .
'/includes/formatters/UserRightsFormatter.php',
'FilteredSequentialIteratorTest' => __DIR__ .
'/tests/phpunit/includes/iterator/FilteredSequentialIteratorTest.php',
'MWDbEchoEmailBatch' => __DIR__ . '/includes/DbEmailBatch.php',
'MWDbEchoEmailBundler' => __DIR__ . '/includes/DbEmailBundler.php',
@@ -96,8 +96,9 @@
'MWEchoEventLogging' => __DIR__ . '/includes/EventLogging.php',
'MWEchoNotifUser' => __DIR__ . '/includes/NotifUser.php',
'MWEchoNotifUserTest' => __DIR__ .
'/tests/phpunit/includes/NotifUserTest.php',
- 'MWEchoNotificationEmailBundleJob' => __DIR__ .
'/jobs/NotificationEmailBundleJob.php',
+ 'MWEchoNotificationEmailBundleJob' => __DIR__ .
'/includes/jobs/NotificationEmailBundleJob.php',
'NotificationControllerTest' => __DIR__ .
'/tests/phpunit/controller/NotificationControllerTest.php',
- 'SpecialNotifications' => __DIR__ . '/special/SpecialNotifications.php',
+ 'NotificationsTest' => __DIR__ . '/tests/NotificationsTest.php',
+ 'SpecialNotifications' => __DIR__ .
'/includes/special/SpecialNotifications.php',
'SuppressionMaintenanceTest' => __DIR__ .
'/tests/phpunit/maintenance/SupressionMaintenanceTest.php',
);
diff --git a/api/ApiEchoMarkRead.php b/includes/api/ApiEchoMarkRead.php
similarity index 100%
rename from api/ApiEchoMarkRead.php
rename to includes/api/ApiEchoMarkRead.php
diff --git a/api/ApiEchoMarkSeen.php b/includes/api/ApiEchoMarkSeen.php
similarity index 100%
rename from api/ApiEchoMarkSeen.php
rename to includes/api/ApiEchoMarkSeen.php
diff --git a/api/ApiEchoNotifications.php
b/includes/api/ApiEchoNotifications.php
similarity index 100%
rename from api/ApiEchoNotifications.php
rename to includes/api/ApiEchoNotifications.php
diff --git a/controller/NotificationController.php
b/includes/controller/NotificationController.php
similarity index 100%
rename from controller/NotificationController.php
rename to includes/controller/NotificationController.php
diff --git a/formatters/BasicFormatter.php
b/includes/formatters/BasicFormatter.php
similarity index 100%
rename from formatters/BasicFormatter.php
rename to includes/formatters/BasicFormatter.php
diff --git a/formatters/CommentFormatter.php
b/includes/formatters/CommentFormatter.php
similarity index 100%
rename from formatters/CommentFormatter.php
rename to includes/formatters/CommentFormatter.php
diff --git a/formatters/EditFormatter.php
b/includes/formatters/EditFormatter.php
similarity index 100%
rename from formatters/EditFormatter.php
rename to includes/formatters/EditFormatter.php
diff --git a/formatters/EditUserTalkFormatter.php
b/includes/formatters/EditUserTalkFormatter.php
similarity index 100%
rename from formatters/EditUserTalkFormatter.php
rename to includes/formatters/EditUserTalkFormatter.php
diff --git a/formatters/MentionFormatter.php
b/includes/formatters/MentionFormatter.php
similarity index 100%
rename from formatters/MentionFormatter.php
rename to includes/formatters/MentionFormatter.php
diff --git a/formatters/NotificationFormatter.php
b/includes/formatters/NotificationFormatter.php
similarity index 100%
rename from formatters/NotificationFormatter.php
rename to includes/formatters/NotificationFormatter.php
diff --git a/formatters/PageLinkFormatter.php
b/includes/formatters/PageLinkFormatter.php
similarity index 100%
rename from formatters/PageLinkFormatter.php
rename to includes/formatters/PageLinkFormatter.php
diff --git a/formatters/UserRightsFormatter.php
b/includes/formatters/UserRightsFormatter.php
similarity index 100%
rename from formatters/UserRightsFormatter.php
rename to includes/formatters/UserRightsFormatter.php
diff --git a/jobs/NotificationDeleteJob.php
b/includes/jobs/NotificationDeleteJob.php
similarity index 100%
rename from jobs/NotificationDeleteJob.php
rename to includes/jobs/NotificationDeleteJob.php
diff --git a/jobs/NotificationEmailBundleJob.php
b/includes/jobs/NotificationEmailBundleJob.php
similarity index 100%
rename from jobs/NotificationEmailBundleJob.php
rename to includes/jobs/NotificationEmailBundleJob.php
diff --git a/jobs/NotificationJob.php b/includes/jobs/NotificationJob.php
similarity index 100%
rename from jobs/NotificationJob.php
rename to includes/jobs/NotificationJob.php
diff --git a/model/AbstractEntity.php b/includes/model/AbstractEntity.php
similarity index 100%
rename from model/AbstractEntity.php
rename to includes/model/AbstractEntity.php
diff --git a/model/Event.php b/includes/model/Event.php
similarity index 100%
rename from model/Event.php
rename to includes/model/Event.php
diff --git a/model/Notification.php b/includes/model/Notification.php
similarity index 100%
rename from model/Notification.php
rename to includes/model/Notification.php
diff --git a/model/TargetPage.php b/includes/model/TargetPage.php
similarity index 100%
rename from model/TargetPage.php
rename to includes/model/TargetPage.php
diff --git a/special/SpecialNotifications.php
b/includes/special/SpecialNotifications.php
similarity index 100%
rename from special/SpecialNotifications.php
rename to includes/special/SpecialNotifications.php
diff --git a/scripts/gen-autoload.php b/scripts/gen-autoload.php
index 082e70a..38290ff 100644
--- a/scripts/gen-autoload.php
+++ b/scripts/gen-autoload.php
@@ -6,13 +6,7 @@
$base = dirname( __DIR__ );
$generator = new AutoloadGenerator( $base );
$dirs = array(
- 'api',
- 'controller',
- 'formatters',
- 'includes',
- 'jobs',
- 'model',
- 'special',
+ 'includes',
'tests',
);
foreach ( $dirs as $dir ) {
--
To view, visit https://gerrit.wikimedia.org/r/216603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib149cb2e2612ccddd0503f9d0c5d05b554860a00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
