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

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 1417c77..dc977fe 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -1140,7 +1140,7 @@ $wgAutoloadLocalClasses = array(
 );
 
 class AutoLoader {
-       static $autoloadLocalClassesLower = null;
+       static protected  $autoloadLocalClassesLower = null;
 
        /**
         * autoload - take a class name and attempt to load it
@@ -1222,6 +1222,14 @@ class AutoLoader {
        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 (file)
--- 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 @@ class AutoLoaderTest extends MediaWikiTestCase {
                        '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',
@@ -93,12 +93,3 @@ class AutoLoaderTest extends MediaWikiTestCase {
                        "unserialize() can load classes case-insensitively.");
        }
 }
-
-/**
- * Cheater to poke protected members
- */
-class InstrumentedAutoLoader extends AutoLoader {
-       static function resetAutoloadLocalClassesLower() {
-               self::$autoloadLocalClassesLower = null;
-       }
-}