Fix Ibcb23c81, and tweak array merge order

PS2 in Ibcb23c81 didn't do things correctly...

Change-Id: I6c1946b5a6ef1720767e236b419a3c5dd1332bf4

diff --git a/tests/phpunit/includes/specials/SpecialSearchTest.php b/tests/phpunit/includes/specials/SpecialSearchTest.php
index b2063eb..3be92d5 100644 (file)
--- a/tests/phpunit/includes/specials/SpecialSearchTest.php
+++ b/tests/phpunit/includes/specials/SpecialSearchTest.php
@@ -80,17 +80,15 @@ class SpecialSearchTest extends MediaWikiTestCase {
                                'Web request with specific NS should override user preference'
                        ),
                        array(
-                               $EMPTY_REQUEST, array( 'searchNs2' => 1, 'searchNs14' => 1 ),
-                               'advanced', array( 2, 14 ),
-                               'Bug 33583: search with no option should honor User search preferences'
-                       ),
-                       array(
-                               $EMPTY_REQUEST, array_fill_keys( array_map( function( $ns ) {
+                               $EMPTY_REQUEST, array(
+                                       'searchNs2' => 1,
+                                       'searchNs14' => 1,
+                               ) + array_fill_keys( array_map( function( $ns ) {
                                        return "searchNs$ns";
-                               }, $defaultNS ), 0 ) + array( 'searchNs2' => 1, 'searchNs14' => 1 ),
+                               }, $defaultNS ), 0 ),
                                'advanced', array( 2, 14 ),
                                'Bug 33583: search with no option should honor User search preferences'
-                               . 'and have all other namespace disabled'
+                               . ' and have all other namespace disabled'
                        ),
                );
        }