Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94157
Change subject: Declare visibility on Autoloader::$autoloadLocalClassesLower
......................................................................
Declare visibility on Autoloader::$autoloadLocalClassesLower
Make protected, add method to allow tests to clear the protected class
property, and remove a now unneeded class from the test.
Change-Id: I269cab8d3f4419c91dfe15d5722e19ff6da828d1
---
M includes/AutoLoader.php
M tests/phpunit/structure/AutoLoaderTest.php
2 files changed, 11 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/94157/1
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index e4570aa..5c3875f 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -1142,7 +1142,7 @@
);
class AutoLoader {
- static $autoloadLocalClassesLower = null;
+ static protected $autoloadLocalClassesLower = null;
/**
* autoload - take a class name and attempt to load it
@@ -1224,6 +1224,14 @@
static function loadClass( $class ) {
return class_exists( $class );
}
+
+ /**
+ * Method to clear the protected class property
$autoloadLocalClassesLower.
+ * Used in tests.
+ */
+ static function resetAutoloadLocalClassesLower() {
+ self::$autoloadLocalClassesLower = null;
+ }
}
spl_autoload_register( array( 'AutoLoader', 'autoload' ) );
diff --git a/tests/phpunit/structure/AutoLoaderTest.php
b/tests/phpunit/structure/AutoLoaderTest.php
index f5ff1d9..733368d 100644
--- a/tests/phpunit/structure/AutoLoaderTest.php
+++ b/tests/phpunit/structure/AutoLoaderTest.php
@@ -1,6 +1,6 @@
<?php
-class AutoLoaderTest extends MediaWikiTestCase {
+class AutoLoaderTest extends MediaWikiTestCase {
protected function setUp() {
global $wgAutoloadLocalClasses, $wgAutoloadClasses;
@@ -13,7 +13,7 @@
'TestAutoloadedSerializedClass' => __DIR__ .
'/../data/autoloader/TestAutoloadedSerializedClass.php',
);
$this->setMwGlobals( 'wgAutoloadLocalClasses',
$this->testLocalClasses + $wgAutoloadLocalClasses );
- InstrumentedAutoLoader::resetAutoloadLocalClassesLower();
+ AutoLoader::resetAutoloadLocalClassesLower();
$this->testExtensionClasses = array(
'TestAutoloadedClass' => __DIR__ .
'/../data/autoloader/TestAutoloadedClass.php',
@@ -91,14 +91,5 @@
$uncerealized = unserialize( $dummyCereal );
$this->assertFalse( $uncerealized instanceof
__PHP_Incomplete_Class,
"unserialize() can load classes case-insensitively.");
- }
-}
-
-/**
- * Cheater to poke protected members
- */
-class InstrumentedAutoLoader extends AutoLoader {
- static function resetAutoloadLocalClassesLower() {
- self::$autoloadLocalClassesLower = null;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/94157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I269cab8d3f4419c91dfe15d5722e19ff6da828d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
