From 70e92cdad5bc8cece50a0fc2f522d9f2856192d2 Mon Sep 17 00:00:00 2001 From: mainframe98 Date: Fri, 15 Dec 2017 11:58:11 +0100 Subject: [PATCH] Fix additional usage of incorrect case Courtesy of the PhpStorm inspection Case mismatch in method call or class usage. Bug: T166759 Change-Id: I27c53658b99048fa0dd8f9d6ef1398620386e1cc --- includes/AutoLoader.php | 2 +- includes/changes/ChangesListFilter.php | 4 ++-- includes/parser/ParserOutput.php | 2 +- includes/registration/ExtensionRegistry.php | 2 +- .../includes/Storage/RevisionStoreRecordTest.php | 14 +++++++------- tests/phpunit/includes/jobqueue/JobTest.php | 2 +- tests/phpunit/structure/ResourcesTest.php | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 675e347b0d..52410fede8 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -133,5 +133,5 @@ class AutoLoader { } } -Autoloader::$psr4Namespaces = AutoLoader::getAutoloadNamespaces(); +AutoLoader::$psr4Namespaces = AutoLoader::getAutoloadNamespaces(); spl_autoload_register( [ 'AutoLoader', 'autoload' ] ); diff --git a/includes/changes/ChangesListFilter.php b/includes/changes/ChangesListFilter.php index 2546f2ba82..1c86d44174 100644 --- a/includes/changes/ChangesListFilter.php +++ b/includes/changes/ChangesListFilter.php @@ -468,7 +468,7 @@ abstract class ChangesListFilter { * @param FormOptions $opts * @return bool */ - public function activelyInConflictWithFilter( ChangeslistFilter $filter, FormOptions $opts ) { + public function activelyInConflictWithFilter( ChangesListFilter $filter, FormOptions $opts ) { if ( $this->isSelected( $opts ) && $filter->isSelected( $opts ) ) { /** @var ChangesListFilter $siblingFilter */ foreach ( $this->getSiblings() as $siblingFilter ) { @@ -484,7 +484,7 @@ abstract class ChangesListFilter { return false; } - private function hasConflictWithFilter( ChangeslistFilter $filter ) { + private function hasConflictWithFilter( ChangesListFilter $filter ) { return in_array( $filter, $this->getConflictingFilters() ); } diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php index ff9c28d2bb..153a7708f4 100644 --- a/includes/parser/ParserOutput.php +++ b/includes/parser/ParserOutput.php @@ -596,7 +596,7 @@ class ParserOutput extends CacheTime { # Replace unnecessary URL escape codes with the referenced character # This prevents spammers from hiding links from the filters - $url = parser::normalizeLinkUrl( $url ); + $url = Parser::normalizeLinkUrl( $url ); $registerExternalLink = true; if ( !$wgRegisterInternalExternals ) { diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php index 994de9726f..6308461438 100644 --- a/includes/registration/ExtensionRegistry.php +++ b/includes/registration/ExtensionRegistry.php @@ -323,7 +323,7 @@ class ExtensionRegistry { } if ( isset( $info['autoloaderNS'] ) ) { - Autoloader::$psr4Namespaces += $info['autoloaderNS']; + AutoLoader::$psr4Namespaces += $info['autoloaderNS']; } foreach ( $info['defines'] as $name => $val ) { diff --git a/tests/phpunit/includes/Storage/RevisionStoreRecordTest.php b/tests/phpunit/includes/Storage/RevisionStoreRecordTest.php index db85727ee0..aa59a5b50b 100644 --- a/tests/phpunit/includes/Storage/RevisionStoreRecordTest.php +++ b/tests/phpunit/includes/Storage/RevisionStoreRecordTest.php @@ -300,28 +300,28 @@ class RevisionStoreRecordTest extends MediaWikiTestCase { private function provideAudienceCheckData( $field ) { yield 'field accessible for oversighter (ALL)' => [ - Revisionrecord::SUPPRESSED_ALL, + RevisionRecord::SUPPRESSED_ALL, [ 'oversight' ], true, false ]; yield 'field accessible for oversighter' => [ - Revisionrecord::DELETED_RESTRICTED | $field, + RevisionRecord::DELETED_RESTRICTED | $field, [ 'oversight' ], true, false ]; yield 'field not accessible for sysops (ALL)' => [ - Revisionrecord::SUPPRESSED_ALL, + RevisionRecord::SUPPRESSED_ALL, [ 'sysop' ], false, false ]; yield 'field not accessible for sysops' => [ - Revisionrecord::DELETED_RESTRICTED | $field, + RevisionRecord::DELETED_RESTRICTED | $field, [ 'sysop' ], false, false @@ -342,9 +342,9 @@ class RevisionStoreRecordTest extends MediaWikiTestCase { ]; yield 'unrelated field suppressed' => [ - $field === Revisionrecord::DELETED_COMMENT - ? Revisionrecord::DELETED_USER - : Revisionrecord::DELETED_COMMENT, + $field === RevisionRecord::DELETED_COMMENT + ? RevisionRecord::DELETED_USER + : RevisionRecord::DELETED_COMMENT, [ 'user' ], true, true diff --git a/tests/phpunit/includes/jobqueue/JobTest.php b/tests/phpunit/includes/jobqueue/JobTest.php index e2aacae2f6..395d12c5d9 100644 --- a/tests/phpunit/includes/jobqueue/JobTest.php +++ b/tests/phpunit/includes/jobqueue/JobTest.php @@ -101,7 +101,7 @@ class JobTest extends MediaWikiTestCase { * @covers Job::factory */ public function testJobFactory( $handler ) { - $this->mergeMWGlobalArrayValue( 'wgJobClasses', [ 'testdummy' => $handler ] ); + $this->mergeMwGlobalArrayValue( 'wgJobClasses', [ 'testdummy' => $handler ] ); $job = Job::factory( 'testdummy', Title::newMainPage(), [] ); $this->assertInstanceOf( NullJob::class, $job ); diff --git a/tests/phpunit/structure/ResourcesTest.php b/tests/phpunit/structure/ResourcesTest.php index d31779d0ba..62ddacebfe 100644 --- a/tests/phpunit/structure/ResourcesTest.php +++ b/tests/phpunit/structure/ResourcesTest.php @@ -55,7 +55,7 @@ class ResourcesTest extends MediaWikiTestCase { public function testIllegalDependencies() { $data = self::getAllModules(); - $illegalDeps = ResourceLoaderStartupModule::getStartupModules(); + $illegalDeps = ResourceLoaderStartUpModule::getStartupModules(); foreach ( $data['modules'] as $moduleName => $module ) { if ( $module->isRaw() ) { $illegalDeps[] = $moduleName; -- 2.20.1