Merge "Improve return types in class MagicWordArray"

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

diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 097aef7..1272b01 100644 (file)
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -25,6 +26,7 @@ class OutputPageTest extends MediaWikiTestCase {
                parent::setUp();
                ResourceLoader::clearCache();
        }
+
        protected function tearDown() {
                parent::tearDown();
                ResourceLoader::clearCache();
@@ -525,9 +527,9 @@ class OutputPageTest extends MediaWikiTestCase {
                                function ( $op ) {
                                        $op->getContext()->setUser( $this->getTestUser()->getUser() );
                                } ],
-                       'After Squid expiry' =>
+                       'After CDN expiry' =>
                                [ $lastModified, $lastModified, false,
-                                       [ 'UseSquid' => true, 'SquidMaxage' => 3599 ] ],
+                                       [ 'UseCdn' => true, 'CdnMaxAge' => 3599 ] ],
                        'Hook allows cache use' =>
                                [ $lastModified + 1, $lastModified, true, [],
                                function ( $op, $that ) {
@@ -2224,7 +2226,7 @@ class OutputPageTest extends MediaWikiTestCase {
        }
 
        public function provideAdaptCdnTTL() {
-               global $wgSquidMaxage;
+               global $wgCdnMaxAge;
                $now = time();
                self::$fakeTime = $now;
                return [
@@ -2233,7 +2235,7 @@ class OutputPageTest extends MediaWikiTestCase {
                        'Five minutes from now' => [ [ $now + 300 ], IExpiringStore::TTL_MINUTE ],
                        'Five minutes ago, initial maxage four minutes' =>
                                [ [ $now - 300 ], 270, [ 'initialMaxage' => 240 ] ],
-                       'A very long time ago' => [ [ $now - 1000000000 ], $wgSquidMaxage ],
+                       'A very long time ago' => [ [ $now - 1000000000 ], $wgCdnMaxAge ],
                        'Initial maxage zero' => [ [ $now - 300 ], 270, [ 'initialMaxage' => 0 ] ],
 
                        'false' => [ [ false ], IExpiringStore::TTL_MINUTE ],
@@ -2661,7 +2663,8 @@ class OutputPageTest extends MediaWikiTestCase {
                $method = $class->getMethod( 'makeResourceLoaderLink' );
                $method->setAccessible( true );
                $ctx = new RequestContext();
-               $ctx->setSkin( SkinFactory::getDefaultInstance()->makeSkin( 'fallback' ) );
+               $skinFactory = MediaWikiServices::getInstance()->getSkinFactory();
+               $ctx->setSkin( $skinFactory->makeSkin( 'fallback' ) );
                $ctx->setLanguage( 'en' );
                $out = new OutputPage( $ctx );
                $nonce = $class->getProperty( 'CSPNonce' );
@@ -2711,7 +2714,7 @@ class OutputPageTest extends MediaWikiTestCase {
                        // Single only=scripts load
                        [
                                [ 'test.foo', ResourceLoaderModule::TYPE_SCRIPTS ],
-                               "<script nonce=\"secret\">(window.RLQ=window.RLQ||[]).push(function(){"
+                               "<script nonce=\"secret\">(RLQ=window.RLQ||[]).push(function(){"
                                        . 'mw.loader.load("http://127.0.0.1:8080/w/load.php?lang=en\u0026modules=test.foo\u0026only=scripts\u0026skin=fallback");'
                                        . "});</script>"
                        ],
@@ -2724,14 +2727,14 @@ class OutputPageTest extends MediaWikiTestCase {
                        // Private embed (only=scripts)
                        [
                                [ 'test.quux', ResourceLoaderModule::TYPE_SCRIPTS ],
-                               "<script nonce=\"secret\">(window.RLQ=window.RLQ||[]).push(function(){"
+                               "<script nonce=\"secret\">(RLQ=window.RLQ||[]).push(function(){"
                                        . "mw.test.baz({token:123});\nmw.loader.state({\"test.quux\":\"ready\"});"
                                        . "});</script>"
                        ],
                        // Load private module (combined)
                        [
                                [ 'test.quux', ResourceLoaderModule::TYPE_COMBINED ],
-                               "<script nonce=\"secret\">(window.RLQ=window.RLQ||[]).push(function(){"
+                               "<script nonce=\"secret\">(RLQ=window.RLQ||[]).push(function(){"
                                        . "mw.loader.implement(\"test.quux@1ev0ijv\",function($,jQuery,require,module){"
                                        . "mw.test.baz({token:123});},{\"css\":[\".mw-icon{transition:none}"
                                        . "\"]});});</script>"
@@ -2749,7 +2752,7 @@ class OutputPageTest extends MediaWikiTestCase {
                        // Load two modules in separate groups
                        [
                                [ [ 'test.group.foo', 'test.group.bar' ], ResourceLoaderModule::TYPE_COMBINED ],
-                               "<script nonce=\"secret\">(window.RLQ=window.RLQ||[]).push(function(){"
+                               "<script nonce=\"secret\">(RLQ=window.RLQ||[]).push(function(){"
                                        . 'mw.loader.load("http://127.0.0.1:8080/w/load.php?lang=en\u0026modules=test.group.bar\u0026skin=fallback");'
                                        . 'mw.loader.load("http://127.0.0.1:8080/w/load.php?lang=en\u0026modules=test.group.foo\u0026skin=fallback");'
                                        . "});</script>"
@@ -2774,7 +2777,8 @@ class OutputPageTest extends MediaWikiTestCase {
 
                // Set up stubs
                $ctx = new RequestContext();
-               $ctx->setSkin( SkinFactory::getDefaultInstance()->makeSkin( 'fallback' ) );
+               $skinFactory = MediaWikiServices::getInstance()->getSkinFactory();
+               $ctx->setSkin( $skinFactory->makeSkin( 'fallback' ) );
                $ctx->setLanguage( 'en' );
                $op = $this->getMockBuilder( OutputPage::class )
                        ->setConstructorArgs( [ $ctx ] )