Clean up CDB classes

[lhc/web/wiklou.git] / includes / AutoLoader.php

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 1417c77..96dda05 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -843,12 +843,14 @@ $wgAutoloadLocalClasses = array(
        'ResourceLoaderNoscriptModule' => 'includes/resourceloader/ResourceLoaderNoscriptModule.php',
        'ResourceLoaderSiteModule' => 'includes/resourceloader/ResourceLoaderSiteModule.php',
        'ResourceLoaderStartUpModule' => 'includes/resourceloader/ResourceLoaderStartUpModule.php',
-       'ResourceLoaderUserCSSPrefsModule' => 'includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php',
+       'ResourceLoaderUserCSSPrefsModule' =>
+               'includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php',
        'ResourceLoaderUserGroupsModule' => 'includes/resourceloader/ResourceLoaderUserGroupsModule.php',
        'ResourceLoaderUserModule' => 'includes/resourceloader/ResourceLoaderUserModule.php',
        'ResourceLoaderUserOptionsModule' => 'includes/resourceloader/ResourceLoaderUserOptionsModule.php',
        'ResourceLoaderUserTokensModule' => 'includes/resourceloader/ResourceLoaderUserTokensModule.php',
-       'ResourceLoaderLanguageDataModule' => 'includes/resourceloader/ResourceLoaderLanguageDataModule.php',
+       'ResourceLoaderLanguageDataModule' =>
+               'includes/resourceloader/ResourceLoaderLanguageDataModule.php',
        'ResourceLoaderWikiModule' => 'includes/resourceloader/ResourceLoaderWikiModule.php',
 
        # includes/revisiondelete
@@ -1044,13 +1046,14 @@ $wgAutoloadLocalClasses = array(
 
        # includes/utils
        'ArrayUtils' => 'includes/utils/ArrayUtils.php',
-       'CdbFunctions' => 'includes/utils/Cdb_PHP.php',
+       'CdbException' => 'includes/utils/Cdb.php',
+       'CdbFunctions' => 'includes/utils/CdbPHP.php',
        'CdbReader' => 'includes/utils/Cdb.php',
-       'CdbReader_DBA' => 'includes/utils/Cdb.php',
-       'CdbReader_PHP' => 'includes/utils/Cdb_PHP.php',
+       'CdbReaderDBA' => 'includes/utils/CdbDBA.php',
+       'CdbReaderPHP' => 'includes/utils/CdbPHP.php',
        'CdbWriter' => 'includes/utils/Cdb.php',
-       'CdbWriter_DBA' => 'includes/utils/Cdb.php',
-       'CdbWriter_PHP' => 'includes/utils/Cdb_PHP.php',
+       'CdbWriterDBA' => 'includes/utils/CdbDBA.php',
+       'CdbWriterPHP' => 'includes/utils/CdbPHP.php',
        'ConfEditor' => 'includes/utils/ConfEditor.php',
        'ConfEditorParseError' => 'includes/utils/ConfEditor.php',
        'ConfEditorToken' => 'includes/utils/ConfEditor.php',
@@ -1140,7 +1143,7 @@ $wgAutoloadLocalClasses = array(
 );
 
 class AutoLoader {
-       static $autoloadLocalClassesLower = null;
+       static protected  $autoloadLocalClassesLower = null;
 
        /**
         * autoload - take a class name and attempt to load it
@@ -1222,6 +1225,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' ) );