Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/277217
Change subject: Use PHP 5.5's …::class feature instead of strings in class_exists ...................................................................... Use PHP 5.5's …::class feature instead of strings in class_exists If you wonder how this can work, see http://maettig.com/1457600220 Change-Id: I25ebdbce0b315e1d27b9734de8779cbd1f470bf9 --- M client/includes/UpdateRepo/UpdateRepo.php M client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php M lib/includes/LanguageFallbackChainFactory.php M lib/maintenance/populateSitesTable.php M repo/includes/BabelUserLanguageLookup.php M repo/includes/Specials/SpecialMyLanguageFallbackChain.php M repo/tests/phpunit/includes/Hooks/CirrusSearchHookHandlersTest.php 7 files changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/17/277217/1 diff --git a/client/includes/UpdateRepo/UpdateRepo.php b/client/includes/UpdateRepo/UpdateRepo.php index 62598c0..8c92cd9 100644 --- a/client/includes/UpdateRepo/UpdateRepo.php +++ b/client/includes/UpdateRepo/UpdateRepo.php @@ -110,7 +110,7 @@ * @return bool */ public function userIsValidOnRepo() { - if ( !class_exists( 'CentralAuthUser' ) ) { + if ( !class_exists( CentralAuthUser::class ) ) { // We can't do anything without CentralAuth as there's no way to verify that // the local user equals the repo one with the same name wfDebugLog( diff --git a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php index 7c29166..de9198d 100644 --- a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php +++ b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php @@ -2,7 +2,7 @@ namespace Wikibase\Client\Tests\DataAccess\Scribunto; -if ( !class_exists( 'Scribunto_LuaEngineTestBase' ) ) { +if ( !class_exists( Scribunto_LuaEngineTestBase::class ) ) { abstract class Scribunto_LuaWikibaseLibraryTestCase extends \MediaWikiTestCase { protected function setUp() { @@ -15,6 +15,7 @@ } use Language; +use Scribunto_LuaEngineTestBase; use Title; use Wikibase\Client\Tests\DataAccess\WikibaseDataAccessTestItemSetUpHelper; use Wikibase\Client\WikibaseClient; diff --git a/lib/includes/LanguageFallbackChainFactory.php b/lib/includes/LanguageFallbackChainFactory.php index 34d6a0f..0617eb5 100644 --- a/lib/includes/LanguageFallbackChainFactory.php +++ b/lib/includes/LanguageFallbackChainFactory.php @@ -2,6 +2,7 @@ namespace Wikibase; +use Babel; use IContextSource; use InvalidArgumentException; use Language; @@ -214,7 +215,7 @@ * @return LanguageFallbackChain */ public function newFromUserAndLanguageCode( User $user, $languageCode ) { - if ( !class_exists( 'Babel' ) || $user->isAnon() ) { + if ( !class_exists( Babel::class ) || $user->isAnon() ) { return $this->newFromLanguageCode( $languageCode, self::FALLBACK_ALL ); } @@ -247,7 +248,7 @@ // Make the current language at the top of the chain. $levelBabel = array_unique( array_merge( array( $languageCode ), - \Babel::getUserLanguages( $user, $level ) + Babel::getUserLanguages( $user, $level ) ) ); $babel[$level] = array_diff( $levelBabel, $previousLevelBabel ); diff --git a/lib/maintenance/populateSitesTable.php b/lib/maintenance/populateSitesTable.php index 94cd922..ad46a3d 100644 --- a/lib/maintenance/populateSitesTable.php +++ b/lib/maintenance/populateSitesTable.php @@ -15,11 +15,11 @@ require_once $basePath . '/maintenance/Maintenance.php'; -if ( !class_exists( 'SitesBuilder' ) ) { +if ( !class_exists( SitesBuilder::class ) ) { require_once __DIR__ . '/../includes/sites/SitesBuilder.php'; } -if ( !class_exists( 'SiteMatrixParser' ) ) { +if ( !class_exists( SiteMatrixParser::class ) ) { require_once __DIR__ . '/../includes/sites/SiteMatrixParser.php'; } diff --git a/repo/includes/BabelUserLanguageLookup.php b/repo/includes/BabelUserLanguageLookup.php index 2445625..52bf85c 100644 --- a/repo/includes/BabelUserLanguageLookup.php +++ b/repo/includes/BabelUserLanguageLookup.php @@ -37,7 +37,7 @@ // Lazy initialisation if ( !isset( $this->babelLanguages[$key] ) ) { // If the extension is installed, grab the languages from the user's Babel box - if ( class_exists( 'Babel' ) && !$user->isAnon() ) { + if ( class_exists( Babel::class ) && !$user->isAnon() ) { $this->babelLanguages[$key] = Babel::getUserLanguages( $user ); } else { $this->babelLanguages[$key] = array(); diff --git a/repo/includes/Specials/SpecialMyLanguageFallbackChain.php b/repo/includes/Specials/SpecialMyLanguageFallbackChain.php index 7573db0..a48bc9a 100644 --- a/repo/includes/Specials/SpecialMyLanguageFallbackChain.php +++ b/repo/includes/Specials/SpecialMyLanguageFallbackChain.php @@ -2,6 +2,7 @@ namespace Wikibase\Repo\Specials; +use Babel; use Html; use IContextSource; use Language; @@ -103,7 +104,7 @@ $this->outputHeader(); $this->getOutput()->addWikiMsg( 'wikibase-mylanguagefallbackchain-text' ); - if ( class_exists( 'Babel' ) && !$this->getContext()->getUser()->isAnon() ) { + if ( class_exists( Babel::class ) && !$this->getContext()->getUser()->isAnon() ) { $this->getOutput()->addWikiMsg( 'wikibase-mylanguagefallbackchain-babel', $this->getContext()->getUser()->getName() ); } diff --git a/repo/tests/phpunit/includes/Hooks/CirrusSearchHookHandlersTest.php b/repo/tests/phpunit/includes/Hooks/CirrusSearchHookHandlersTest.php index 2170f7d..d975886 100644 --- a/repo/tests/phpunit/includes/Hooks/CirrusSearchHookHandlersTest.php +++ b/repo/tests/phpunit/includes/Hooks/CirrusSearchHookHandlersTest.php @@ -4,6 +4,7 @@ use CirrusSearch\Connection; use CirrusSearch\Maintenance\MappingConfigBuilder; +use CirrusSearch; use Elastica\Document; use ParserOutput; use PHPUnit_Framework_TestCase; @@ -33,7 +34,7 @@ protected function setUp() { parent::setUp(); - if ( !class_exists( 'CirrusSearch' ) ) { + if ( !class_exists( CirrusSearch::class ) ) { $this->markTestSkipped( 'CirrusSearch is not available' ); } } -- To view, visit https://gerrit.wikimedia.org/r/277217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25ebdbce0b315e1d27b9734de8779cbd1f470bf9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
