Improve AutoLoader test coverage

Change-Id: Iddb24cad41979a4798392ab08d104dac41ed736d

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 62b1d39..9fc063a 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -123,6 +123,7 @@ class AutoLoader {
         *
         * @see <http://www.php-fig.org/psr/psr-4/>
         * @private Only public for usage in AutoloadGenerator
+        * @codeCoverageIgnore
         * @since 1.31
         * @return string[]
         */

diff --git a/tests/phpunit/data/autoloader/psr4/TestFooBar.php b/tests/phpunit/data/autoloader/psr4/TestFooBar.php
new file mode 100644 (file)
index 0000000..4a2e11f
--- /dev/null
+++ b/tests/phpunit/data/autoloader/psr4/TestFooBar.php
@@ -0,0 +1,6 @@
+<?php
+
+namespace Test\MediaWiki\AutoLoader;
+
+class TestFooBar {
+}

diff --git a/tests/phpunit/includes/AutoLoaderTest.php b/tests/phpunit/includes/AutoLoaderTest.php
index 980fd8d..af6911d 100644 (file)
--- a/tests/phpunit/includes/AutoLoaderTest.php
+++ b/tests/phpunit/includes/AutoLoaderTest.php
@@ -4,6 +4,9 @@
  * @covers AutoLoader
  */
 class AutoLoaderTest extends MediaWikiTestCase {
+
+       private $oldPsr4;
+
        protected function setUp() {
                parent::setUp();
 
@@ -21,6 +24,15 @@ class AutoLoaderTest extends MediaWikiTestCase {
                $this->mergeMwGlobalArrayValue( 'wgAutoloadClasses', [
                        'TestAutoloadedClass' => __DIR__ . '/../data/autoloader/TestAutoloadedClass.php',
                ] );
+
+               $this->oldPsr4 = AutoLoader::$psr4Namespaces;
+               AutoLoader::$psr4Namespaces['Test\\MediaWiki\\AutoLoader\\'] =
+                       __DIR__ . '/../data/autoloader/psr4';
+       }
+
+       protected function tearDown() {
+               AutoLoader::$psr4Namespaces = $this->oldPsr4;
+               parent::tearDown();
        }
 
        public function testCoreClass() {
@@ -45,4 +57,8 @@ class AutoLoaderTest extends MediaWikiTestCase {
                $this->assertFalse( $uncerealized instanceof __PHP_Incomplete_Class,
                        "unserialize() can load classes case-insensitively." );
        }
+
+       public function testPsr4() {
+               $this->assertTrue( class_exists( 'Test\\MediaWiki\\AutoLoader\\TestFooBar' ) );
+       }
 }