X-Git-Url: https://git.heureux-cyclage.org/w/index.php?a=blobdiff_plain;f=includes%2FAutoLoader.php;h=8428adecf0b9b0932a43e8ad36b1560eb6105f61;hb=6bd4f027479568191f96c6f9e00aca802aca30ef;hp=cfddb72fa5b5a5476dfe9ab01c0ee7b06850b513;hpb=d9d4fa85f889185716dfa96b5ce5a5140c126c0e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index cfddb72fa5..8428adecf0 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -361,7 +361,6 @@ $wgAutoloadLocalClasses = array( 'ApiRevisionDelete' => 'includes/api/ApiRevisionDelete.php', 'ApiRollback' => 'includes/api/ApiRollback.php', 'ApiRsd' => 'includes/api/ApiRsd.php', - 'ApiRunJobs' => 'includes/api/ApiRunJobs.php', 'ApiSetNotificationTimestamp' => 'includes/api/ApiSetNotificationTimestamp.php', 'ApiTokens' => 'includes/api/ApiTokens.php', 'ApiUnblock' => 'includes/api/ApiUnblock.php', @@ -386,7 +385,6 @@ $wgAutoloadLocalClasses = array( 'MapCacheLRU' => 'includes/cache/MapCacheLRU.php', 'MessageCache' => 'includes/cache/MessageCache.php', 'ObjectFileCache' => 'includes/cache/ObjectFileCache.php', - 'ProcessCacheLRU' => 'includes/cache/ProcessCacheLRU.php', 'ResourceFileCache' => 'includes/cache/ResourceFileCache.php', # includes/changes @@ -657,35 +655,35 @@ $wgAutoloadLocalClasses = array( 'WebInstallerPage' => 'includes/installer/WebInstallerPage.php', # includes/job - 'IJobSpecification' => 'includes/job/JobSpecification.php', - 'Job' => 'includes/job/Job.php', - 'JobQueue' => 'includes/job/JobQueue.php', - 'JobQueueAggregator' => 'includes/job/aggregator/JobQueueAggregator.php', - 'JobQueueAggregatorMemc' => 'includes/job/aggregator/JobQueueAggregatorMemc.php', - 'JobQueueAggregatorRedis' => 'includes/job/aggregator/JobQueueAggregatorRedis.php', - 'JobQueueDB' => 'includes/job/JobQueueDB.php', - 'JobQueueConnectionError' => 'includes/job/JobQueue.php', - 'JobQueueError' => 'includes/job/JobQueue.php', - 'JobQueueGroup' => 'includes/job/JobQueueGroup.php', - 'JobQueueFederated' => 'includes/job/JobQueueFederated.php', - 'JobQueueRedis' => 'includes/job/JobQueueRedis.php', - 'JobSpecification' => 'includes/job/JobSpecification.php', - - # includes/job/jobs - 'DoubleRedirectJob' => 'includes/job/jobs/DoubleRedirectJob.php', - 'DuplicateJob' => 'includes/job/jobs/DuplicateJob.php', - 'EmaillingJob' => 'includes/job/jobs/EmaillingJob.php', - 'EnotifNotifyJob' => 'includes/job/jobs/EnotifNotifyJob.php', - 'HTMLCacheUpdateJob' => 'includes/job/jobs/HTMLCacheUpdateJob.php', - 'NullJob' => 'includes/job/jobs/NullJob.php', - 'RefreshLinksJob' => 'includes/job/jobs/RefreshLinksJob.php', - 'RefreshLinksJob2' => 'includes/job/jobs/RefreshLinksJob2.php', - 'UploadFromUrlJob' => 'includes/job/jobs/UploadFromUrlJob.php', - 'AssembleUploadChunksJob' => 'includes/job/jobs/AssembleUploadChunksJob.php', - 'PublishStashedFileJob' => 'includes/job/jobs/PublishStashedFileJob.php', - - # includes/job/utils - 'BacklinkJobUtils' => 'includes/job/utils/BacklinkJobUtils.php', + 'IJobSpecification' => 'includes/jobqueue/JobSpecification.php', + 'Job' => 'includes/jobqueue/Job.php', + 'JobQueue' => 'includes/jobqueue/JobQueue.php', + 'JobQueueAggregator' => 'includes/jobqueue/aggregator/JobQueueAggregator.php', + 'JobQueueAggregatorMemc' => 'includes/jobqueue/aggregator/JobQueueAggregatorMemc.php', + 'JobQueueAggregatorRedis' => 'includes/jobqueue/aggregator/JobQueueAggregatorRedis.php', + 'JobQueueDB' => 'includes/jobqueue/JobQueueDB.php', + 'JobQueueConnectionError' => 'includes/jobqueue/JobQueue.php', + 'JobQueueError' => 'includes/jobqueue/JobQueue.php', + 'JobQueueGroup' => 'includes/jobqueue/JobQueueGroup.php', + 'JobQueueFederated' => 'includes/jobqueue/JobQueueFederated.php', + 'JobQueueRedis' => 'includes/jobqueue/JobQueueRedis.php', + 'JobSpecification' => 'includes/jobqueue/JobSpecification.php', + + # includes/jobqueue/jobs + 'DoubleRedirectJob' => 'includes/jobqueue/jobs/DoubleRedirectJob.php', + 'DuplicateJob' => 'includes/jobqueue/jobs/DuplicateJob.php', + 'EmaillingJob' => 'includes/jobqueue/jobs/EmaillingJob.php', + 'EnotifNotifyJob' => 'includes/jobqueue/jobs/EnotifNotifyJob.php', + 'HTMLCacheUpdateJob' => 'includes/jobqueue/jobs/HTMLCacheUpdateJob.php', + 'NullJob' => 'includes/jobqueue/jobs/NullJob.php', + 'RefreshLinksJob' => 'includes/jobqueue/jobs/RefreshLinksJob.php', + 'RefreshLinksJob2' => 'includes/jobqueue/jobs/RefreshLinksJob2.php', + 'UploadFromUrlJob' => 'includes/jobqueue/jobs/UploadFromUrlJob.php', + 'AssembleUploadChunksJob' => 'includes/jobqueue/jobs/AssembleUploadChunksJob.php', + 'PublishStashedFileJob' => 'includes/jobqueue/jobs/PublishStashedFileJob.php', + + # includes/jobqueue/utils + 'BacklinkJobUtils' => 'includes/jobqueue/utils/BacklinkJobUtils.php', # includes/json 'FormatJson' => 'includes/json/FormatJson.php', @@ -709,6 +707,7 @@ $wgAutoloadLocalClasses = array( 'JSTokenizer' => 'includes/libs/jsminplus.php', 'MultiHttpClient' => 'includes/libs/MultiHttpClient.php', 'MWMessagePack' => 'includes/libs/MWMessagePack.php', + 'ProcessCacheLRU' => 'includes/libs/ProcessCacheLRU.php', 'RunningStat' => 'includes/libs/RunningStat.php', 'ScopedCallback' => 'includes/libs/ScopedCallback.php', 'ScopedPHPTimeout' => 'includes/libs/ScopedPHPTimeout.php', @@ -907,18 +906,18 @@ $wgAutoloadLocalClasses = array( 'SearchDatabase' => 'includes/search/SearchDatabase.php', 'SearchEngine' => 'includes/search/SearchEngine.php', 'SearchEngineDummy' => 'includes/search/SearchEngine.php', - 'SearchHighlighter' => 'includes/search/SearchEngine.php', + 'SearchHighlighter' => 'includes/search/SearchHighlighter.php', 'SearchMssql' => 'includes/search/SearchMssql.php', 'SearchMySQL' => 'includes/search/SearchMySQL.php', - 'SearchNearMatchResultSet' => 'includes/search/SearchEngine.php', + 'SearchNearMatchResultSet' => 'includes/search/SearchResultSet.php', 'SearchOracle' => 'includes/search/SearchOracle.php', 'SearchPostgres' => 'includes/search/SearchPostgres.php', - 'SearchResult' => 'includes/search/SearchEngine.php', - 'SearchResultSet' => 'includes/search/SearchEngine.php', + 'SearchResult' => 'includes/search/SearchResult.php', + 'SearchResultSet' => 'includes/search/SearchResultSet.php', 'SearchResultTooMany' => 'includes/search/SearchEngine.php', 'SearchSqlite' => 'includes/search/SearchSqlite.php', 'SqliteSearchResultSet' => 'includes/search/SearchSqlite.php', - 'SqlSearchResultSet' => 'includes/search/SearchEngine.php', + 'SqlSearchResultSet' => 'includes/search/SearchResultSet.php', # includes/site 'MediaWikiSite' => 'includes/site/MediaWikiSite.php', @@ -954,6 +953,7 @@ $wgAutoloadLocalClasses = array( 'IPBlockForm' => 'includes/specials/SpecialBlock.php', 'LinkSearchPage' => 'includes/specials/SpecialLinkSearch.php', 'ListredirectsPage' => 'includes/specials/SpecialListredirects.php', + 'ListDuplicatedFilesPage' => 'includes/specials/SpecialListDuplicatedFiles.php', 'LoginForm' => 'includes/specials/SpecialUserlogin.php', 'LonelyPagesPage' => 'includes/specials/SpecialLonelypages.php', 'LongPagesPage' => 'includes/specials/SpecialLongpages.php', @@ -1018,10 +1018,12 @@ $wgAutoloadLocalClasses = array( 'SpecialRedirect' => 'includes/specials/SpecialRedirect.php', 'SpecialResetTokens' => 'includes/specials/SpecialResetTokens.php', 'SpecialRevisionDelete' => 'includes/specials/SpecialRevisiondelete.php', + 'SpecialRunJobs' => 'includes/specials/SpecialRunJobs.php', 'SpecialSearch' => 'includes/specials/SpecialSearch.php', 'SpecialSpecialpages' => 'includes/specials/SpecialSpecialpages.php', 'SpecialStatistics' => 'includes/specials/SpecialStatistics.php', 'SpecialTags' => 'includes/specials/SpecialTags.php', + 'SpecialTrackingCategories' => 'includes/specials/SpecialTrackingCategories.php', 'SpecialUnblock' => 'includes/specials/SpecialUnblock.php', 'SpecialUndelete' => 'includes/specials/SpecialUndelete.php', 'SpecialUnlockdb' => 'includes/specials/SpecialUnlockdb.php', @@ -1058,6 +1060,15 @@ $wgAutoloadLocalClasses = array( 'UserloginTemplate' => 'includes/templates/Userlogin.php', 'UsercreateTemplate' => 'includes/templates/Usercreate.php', + # includes/title + 'PageLinkRenderer' => 'includes/title/PageLinkRenderer.php', + 'TitleFormatter' => 'includes/title/TitleFormatter.php', + 'TitleParser' => 'includes/title/TitleParser.php', + 'TitleValue' => 'includes/title/TitleValue.php', + 'MalformedTitleException' => 'includes/title/MalformedTitleException.php', + 'MediaWikiPageLinkRenderer' => 'includes/title/MediaWikiPageLinkRenderer.php', + 'MediaWikiTitleCodec' => 'includes/title/MediaWikiTitleCodec.php', + # includes/upload 'UploadBase' => 'includes/upload/UploadBase.php', 'UploadFromFile' => 'includes/upload/UploadFromFile.php', @@ -1213,24 +1224,19 @@ class AutoLoader { } if ( isset( self::$autoloadLocalClassesLower[$lowerClass] ) ) { - if ( function_exists( 'wfDebug' ) ) { - wfDebug( "Class {$className} was loaded using incorrect case.\n" ); + if ( function_exists( 'wfDebugLog' ) ) { + wfDebugLog( 'autoloader', "Class {$className} was loaded using incorrect case" ); } $filename = self::$autoloadLocalClassesLower[$lowerClass]; } } if ( !$filename ) { - if ( function_exists( 'wfDebug' ) ) { - # FIXME: This is not very polite. Assume we do not manage the class. - wfDebug( "Class {$className} not found; skipped loading\n" ); - } - - # Give up + // Class not found; let the next autoloader try to find it return; } - # Make an absolute path, this improves performance by avoiding some stat calls + // Make an absolute path, this improves performance by avoiding some stat calls if ( substr( $filename, 0, 1 ) != '/' && substr( $filename, 1, 1 ) != ':' ) { global $IP; $filename = "$IP/$filename";