From db47c86bc5ddadfe866279a7a0257897d5dd3f5a Mon Sep 17 00:00:00 2001 From: Bryan Davis Date: Thu, 11 Feb 2016 13:58:33 -0700 Subject: [PATCH] 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 --- autoload.php | 3 ++- tests/phpunit/structure/AutoLoaderTest.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/autoload.php b/autoload.php index ab6c5e0b80..83ca3b35ff 100644 --- a/autoload.php +++ b/autoload.php @@ -54,6 +54,7 @@ $wgAutoloadLocalClasses = array( '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 @@ $wgAutoloadLocalClasses = array( '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 @@ $wgAutoloadLocalClasses = array( '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 8674329af2..e5b7a931ee 100644 --- a/tests/phpunit/structure/AutoLoaderTest.php +++ b/tests/phpunit/structure/AutoLoaderTest.php @@ -71,7 +71,7 @@ class AutoLoaderTest extends MediaWikiTestCase { $matches = array(); preg_match_all( '/ ^ [\t ]* (?: - (?:final\s+)? (?:abstract\s+)? (?:class|interface) \s+ + (?:final\s+)? (?:abstract\s+)? (?:class|interface|trait) \s+ (?P [a-zA-Z0-9_]+) | class_alias \s* \( \s* -- 2.20.1