From 6778f737c1e5fa93e68994b6758f28e76a38d233 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 12 Jul 2019 18:30:06 +0100
Subject: [PATCH] resourceloader: Remove register() 'object' use in
 OutputPageTest

Follows-up d6dd6e4d7220a7b, missed one :)

Bug: T222637
Change-Id: I105772d655ce1b64e3eb1d6222b57adfb69ec51d
---
 tests/phpunit/includes/OutputPageTest.php | 44 +++++++++++++----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 448eec8fd0..00b8d1823f 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -2537,35 +2537,42 @@ class OutputPageTest extends MediaWikiTestCase {
 		$rl = $out->getResourceLoader();
 		$rl->setMessageBlobStore( $this->createMock( MessageBlobStore::class ) );
 		$rl->register( [
-			'test.foo' => new ResourceLoaderTestModule( [
+			'test.foo' => [
+				'class' => ResourceLoaderTestModule::class,
 				'script' => 'mw.test.foo( { a: true } );',
 				'styles' => '.mw-test-foo { content: "style"; }',
-			] ),
-			'test.bar' => new ResourceLoaderTestModule( [
+			],
+			'test.bar' => [
+				'class' => ResourceLoaderTestModule::class,
 				'script' => 'mw.test.bar( { a: true } );',
 				'styles' => '.mw-test-bar { content: "style"; }',
-			] ),
-			'test.baz' => new ResourceLoaderTestModule( [
+			],
+			'test.baz' => [
+				'class' => ResourceLoaderTestModule::class,
 				'script' => 'mw.test.baz( { a: true } );',
 				'styles' => '.mw-test-baz { content: "style"; }',
-			] ),
-			'test.quux' => new ResourceLoaderTestModule( [
+			],
+			'test.quux' => [
+				'class' => ResourceLoaderTestModule::class,
 				'script' => 'mw.test.baz( { token: 123 } );',
 				'styles' => '/* pref-animate=off */ .mw-icon { transition: none; }',
 				'group' => 'private',
-			] ),
-			'test.noscript' => new ResourceLoaderTestModule( [
+			],
+			'test.noscript' => [
+				'class' => ResourceLoaderTestModule::class,
 				'styles' => '.stuff { color: red; }',
 				'group' => 'noscript',
-			] ),
-			'test.group.foo' => new ResourceLoaderTestModule( [
+			],
+			'test.group.foo' => [
+				'class' => ResourceLoaderTestModule::class,
 				'script' => 'mw.doStuff( "foo" );',
 				'group' => 'foo',
-			] ),
-			'test.group.bar' => new ResourceLoaderTestModule( [
+			],
+			'test.group.bar' => [
+				'class' => ResourceLoaderTestModule::class,
 				'script' => 'mw.doStuff( "bar" );',
 				'group' => 'bar',
-			] ),
+			],
 		] );
 		$links = $method->invokeArgs( $out, $args );
 		$actualHtml = strval( $links );
@@ -2648,17 +2655,16 @@ class OutputPageTest extends MediaWikiTestCase {
 			->setConstructorArgs( [ $ctx ] )
 			->setMethods( [ 'buildCssLinksArray' ] )
 			->getMock();
-		$op->expects( $this->any() )
-			->method( 'buildCssLinksArray' )
+		$op->method( 'buildCssLinksArray' )
 			->willReturn( [] );
 		$rl = $op->getResourceLoader();
 		$rl->setMessageBlobStore( $this->createMock( MessageBlobStore::class ) );
 
 		// Register custom modules
 		$rl->register( [
-			'example.site.a' => new ResourceLoaderTestModule( [ 'group' => 'site' ] ),
-			'example.site.b' => new ResourceLoaderTestModule( [ 'group' => 'site' ] ),
-			'example.user' => new ResourceLoaderTestModule( [ 'group' => 'user' ] ),
+			'example.site.a' => [ 'class' => ResourceLoaderTestModule::class, 'group' => 'site' ],
+			'example.site.b' => [ 'class' => ResourceLoaderTestModule::class, 'group' => 'site' ],
+			'example.user' => [ 'class' => ResourceLoaderTestModule::class, 'group' => 'user' ],
 		] );
 
 		$op = TestingAccessWrapper::newFromObject( $op );
-- 
2.20.1