jenkins-bot has submitted this change and it was merged.
Change subject: Update AutoLoaderTest and ran
maintenance/generateLocalAutoload.php
......................................................................
Update AutoLoaderTest and ran maintenance/generateLocalAutoload.php
AutoLoaderTest didn't know about traits.
generateLocalAutoload found a missing Trait from the autoloader and
a class map ordering issue.
Change-Id: I34bf2698ad838b6a977c9bf39f6e416330ff0e5d
---
M autoload.php
M tests/phpunit/structure/AutoLoaderTest.php
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index ab6c5e0..83ca3b3 100644
--- a/autoload.php
+++ b/autoload.php
@@ -54,6 +54,7 @@
'ApiManageTags' => __DIR__ . '/includes/api/ApiManageTags.php',
'ApiMergeHistory' => __DIR__ . '/includes/api/ApiMergeHistory.php',
'ApiMessage' => __DIR__ . '/includes/api/ApiMessage.php',
+ 'ApiMessageTrait' => __DIR__ . '/includes/api/ApiMessage.php',
'ApiModuleManager' => __DIR__ . '/includes/api/ApiModuleManager.php',
'ApiMove' => __DIR__ . '/includes/api/ApiMove.php',
'ApiOpenSearch' => __DIR__ . '/includes/api/ApiOpenSearch.php',
@@ -563,7 +564,6 @@
'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
'IPTC' => __DIR__ . '/includes/media/IPTC.php',
'IRCColourfulRCFeedFormatter' => __DIR__ .
'/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
- 'LinkTarget' => __DIR__ . '/includes/LinkTarget.php',
'IcuCollation' => __DIR__ . '/includes/Collation.php',
'IdentityCollation' => __DIR__ . '/includes/Collation.php',
'ImageBuilder' => __DIR__ . '/maintenance/rebuildImages.php',
@@ -698,6 +698,7 @@
'LinkFilter' => __DIR__ . '/includes/LinkFilter.php',
'LinkHolderArray' => __DIR__ . '/includes/parser/LinkHolderArray.php',
'LinkSearchPage' => __DIR__ .
'/includes/specials/SpecialLinkSearch.php',
+ 'LinkTarget' => __DIR__ . '/includes/LinkTarget.php',
'Linker' => __DIR__ . '/includes/Linker.php',
'LinksDeletionUpdate' => __DIR__ .
'/includes/deferred/LinksDeletionUpdate.php',
'LinksUpdate' => __DIR__ . '/includes/deferred/LinksUpdate.php',
diff --git a/tests/phpunit/structure/AutoLoaderTest.php
b/tests/phpunit/structure/AutoLoaderTest.php
index 8674329..e5b7a93 100644
--- a/tests/phpunit/structure/AutoLoaderTest.php
+++ b/tests/phpunit/structure/AutoLoaderTest.php
@@ -71,7 +71,7 @@
$matches = array();
preg_match_all( '/
^ [\t ]* (?:
- (?:final\s+)? (?:abstract\s+)?
(?:class|interface) \s+
+ (?:final\s+)? (?:abstract\s+)?
(?:class|interface|trait) \s+
(?P<class> [a-zA-Z0-9_]+)
|
class_alias \s* \( \s*
--
To view, visit https://gerrit.wikimedia.org/r/270104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34bf2698ad838b6a977c9bf39f6e416330ff0e5d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
