Merge "Fix sessionfailure i18n message during authentication"

[lhc/web/wiklou.git] / tests / phpunit / includes / registration / ExtensionRegistryTest.php

diff --git a/tests/phpunit/includes/registration/ExtensionRegistryTest.php b/tests/phpunit/includes/registration/ExtensionRegistryTest.php
index 167f52a..a6f69b6 100644 (file)
--- a/tests/phpunit/includes/registration/ExtensionRegistryTest.php
+++ b/tests/phpunit/includes/registration/ExtensionRegistryTest.php
@@ -28,7 +28,7 @@ class ExtensionRegistryTest extends MediaWikiTestCase {
                        'autoloaderPaths' => []
                ];
                $registry = new ExtensionRegistry();
-               $class = new ReflectionClass( 'ExtensionRegistry' );
+               $class = new ReflectionClass( ExtensionRegistry::class );
                $method = $class->getMethod( 'exportExtractedData' );
                $method->setAccessible( true );
                $method->invokeArgs( $registry, [ $info ] );
@@ -252,6 +252,53 @@ class ExtensionRegistryTest extends MediaWikiTestCase {
                                        'mwtestT100767' => false,
                                ],
                        ],
+                       [
+                               'test array_replace_recursive',
+                               [
+                                       'mwtestJsonConfigs' => [
+                                               'JsonZeroConfig' => [
+                                                       'namespace' => 480,
+                                                       'nsName' => 'Zero',
+                                                       'isLocal' => true,
+                                               ],
+                                       ],
+                               ],
+                               [
+                                       'mwtestJsonConfigs' => [
+                                               'JsonZeroConfig' => [
+                                                       'isLocal' => false,
+                                                       'remote' => [
+                                                               'username' => 'foo',
+                                                       ],
+                                               ],
+                                               ExtensionRegistry::MERGE_STRATEGY => 'array_replace_recursive',
+                                       ],
+                               ],
+                               [
+                                       'mwtestJsonConfigs' => [
+                                               'JsonZeroConfig' => [
+                                                       'namespace' => 480,
+                                                       'nsName' => 'Zero',
+                                                       'isLocal' => false,
+                                                       'remote' => [
+                                                               'username' => 'foo',
+                                                       ],
+                                               ],
+                                       ],
+                               ],
+                       ],
+                       [
+                               'global is null before',
+                               [
+                                       'NullGlobal' => null,
+                               ],
+                               [
+                                       'NullGlobal' => 'not-null'
+                               ],
+                               [
+                                       'NullGlobal' => null
+                               ],
+                       ],
                ];
        }
 }