Fix warnings and enforce conventions in ContentHandler tests.

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

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index d98556e..c97c95a 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -1095,13 +1095,15 @@ $wgAutoloadLocalClasses = array(
        'TestRecorder' => 'tests/testHelpers.inc',
 
        # tests/phpunit
-       'DummyContentHandlerForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
-       'DummyContentForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
-       'JavascriptContentTest' => 'tests/phpunit/includes/JavascriptContentTest.php',
        'RevisionStorageTest' => 'tests/phpunit/includes/RevisionStorageTest.php',
-       'TextContentTest' => 'tests/phpunit/includes/TextContentTest.php',
        'WikiPageTest' => 'tests/phpunit/includes/WikiPageTest.php',
 
+       # tests/phpunit/content
+       'DummyContentHandlerForTesting' => 'tests/phpunit/includes/content/ContentHandlerTest.php',
+       'DummyContentForTesting' => 'tests/phpunit/includes/content/ContentHandlerTest.php',
+       'JavascriptContentTest' => 'tests/phpunit/includes/content/JavascriptContentTest.php',
+       'TextContentTest' => 'tests/phpunit/includes/content/TextContentTest.php',
+
        # tests/phpunit/includes
        'GenericArrayObjectTest' => 'tests/phpunit/includes/libs/GenericArrayObjectTest.php',