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 afc6bb5..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;
 
 /**
@@ -526,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 ) {
@@ -2225,7 +2226,7 @@ class OutputPageTest extends MediaWikiTestCase {
        }
 
        public function provideAdaptCdnTTL() {
-               global $wgSquidMaxage;
+               global $wgCdnMaxAge;
                $now = time();
                self::$fakeTime = $now;
                return [
@@ -2234,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 ],
@@ -2662,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' );
@@ -2775,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 ] )