dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "parser: Validate $length in padleft/padright parser functions" into REL1_31
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
OutputPageTest.php
diff --git
a/tests/phpunit/includes/OutputPageTest.php
b/tests/phpunit/includes/OutputPageTest.php
index
ad54544
..
88c585f
100644
(file)
--- a/
tests/phpunit/includes/OutputPageTest.php
+++ b/
tests/phpunit/includes/OutputPageTest.php
@@
-266,15
+266,15
@@
class OutputPageTest extends MediaWikiTestCase {
'UploadPath' => $uploadPath,
] );
'UploadPath' => $uploadPath,
] );
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$actual = OutputPage::transformResourcePath( $conf, $path );
$actual = OutputPage::transformResourcePath( $conf, $path );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
$this->assertEquals( $expected ?: $path, $actual );
}
public static function provideMakeResourceLoaderLink() {
$this->assertEquals( $expected ?: $path, $actual );
}
public static function provideMakeResourceLoaderLink() {
- //
@codingStandardsIgnoreStart
Generic.Files.LineLength
+ //
phpcs:disable
Generic.Files.LineLength
return [
// Single only=scripts load
[
return [
// Single only=scripts load
[
@@
-293,11
+293,11
@@
class OutputPageTest extends MediaWikiTestCase {
[
[ 'test.quux', ResourceLoaderModule::TYPE_SCRIPTS ],
"<script>(window.RLQ=window.RLQ||[]).push(function(){"
[
[ 'test.quux', ResourceLoaderModule::TYPE_SCRIPTS ],
"<script>(window.RLQ=window.RLQ||[]).push(function(){"
- . "mw.test.baz({token:123});mw.loader.state({\"test.quux\":\"ready\"});"
+ . "mw.test.baz({token:123});
\n
mw.loader.state({\"test.quux\":\"ready\"});"
. "});</script>"
],
];
. "});</script>"
],
];
- //
@codingStandardsIgnoreEnd
+ //
phpcs:enable
}
/**
}
/**
@@
-311,7
+311,7
@@
class OutputPageTest extends MediaWikiTestCase {
'wgResourceLoaderDebug' => false,
'wgLoadScript' => 'http://127.0.0.1:8080/w/load.php',
] );
'wgResourceLoaderDebug' => false,
'wgLoadScript' => 'http://127.0.0.1:8080/w/load.php',
] );
- $class = new ReflectionClass(
'OutputPage'
);
+ $class = new ReflectionClass(
OutputPage::class
);
$method = $class->getMethod( 'makeResourceLoaderLink' );
$method->setAccessible( true );
$ctx = new RequestContext();
$method = $class->getMethod( 'makeResourceLoaderLink' );
$method->setAccessible( true );
$ctx = new RequestContext();
@@
-345,6
+345,7
@@
class OutputPageTest extends MediaWikiTestCase {
}
public static function provideBuildExemptModules() {
}
public static function provideBuildExemptModules() {
+ // phpcs:disable Generic.Files.LineLength
return [
'empty' => [
'exemptStyleModules' => [],
return [
'empty' => [
'exemptStyleModules' => [],
@@
-354,7
+355,6
@@
class OutputPageTest extends MediaWikiTestCase {
'exemptStyleModules' => [ 'site' => [], 'noscript' => [], 'private' => [], 'user' => [] ],
'<meta name="ResourceLoaderDynamicStyles" content=""/>',
],
'exemptStyleModules' => [ 'site' => [], 'noscript' => [], 'private' => [], 'user' => [] ],
'<meta name="ResourceLoaderDynamicStyles" content=""/>',
],
- // @codingStandardsIgnoreStart Generic.Files.LineLength
'default logged-out' => [
'exemptStyleModules' => [ 'site' => [ 'site.styles' ] ],
'<meta name="ResourceLoaderDynamicStyles" content=""/>' . "\n" .
'default logged-out' => [
'exemptStyleModules' => [ 'site' => [ 'site.styles' ] ],
'<meta name="ResourceLoaderDynamicStyles" content=""/>' . "\n" .
@@
-377,8
+377,8
@@
class OutputPageTest extends MediaWikiTestCase {
'<link rel="stylesheet" href="/w/load.php?debug=false&lang=en&modules=example.user&only=styles&skin=fallback&version=0a56zyi"/>' . "\n" .
'<link rel="stylesheet" href="/w/load.php?debug=false&lang=en&modules=user.styles&only=styles&skin=fallback&version=1e9z0ox"/>',
],
'<link rel="stylesheet" href="/w/load.php?debug=false&lang=en&modules=example.user&only=styles&skin=fallback&version=0a56zyi"/>' . "\n" .
'<link rel="stylesheet" href="/w/load.php?debug=false&lang=en&modules=user.styles&only=styles&skin=fallback&version=1e9z0ox"/>',
],
- // @codingStandardsIgnoreEnd Generic.Files.LineLength
];
];
+ // phpcs:enable
}
/**
}
/**
@@
-398,7
+398,7
@@
class OutputPageTest extends MediaWikiTestCase {
$ctx = new RequestContext();
$ctx->setSkin( SkinFactory::getDefaultInstance()->makeSkin( 'fallback' ) );
$ctx->setLanguage( 'en' );
$ctx = new RequestContext();
$ctx->setSkin( SkinFactory::getDefaultInstance()->makeSkin( 'fallback' ) );
$ctx->setLanguage( 'en' );
- $outputPage = $this->getMockBuilder(
'OutputPage'
)
+ $outputPage = $this->getMockBuilder(
OutputPage::class
)
->setConstructorArgs( [ $ctx ] )
->setMethods( [ 'isUserCssPreview', 'buildCssLinksArray' ] )
->getMock();
->setConstructorArgs( [ $ctx ] )
->setMethods( [ 'isUserCssPreview', 'buildCssLinksArray' ] )
->getMock();
@@
-434,7
+434,7
@@
class OutputPageTest extends MediaWikiTestCase {
*/
public function testVaryHeaders( $calls, $vary, $key ) {
// get rid of default Vary fields
*/
public function testVaryHeaders( $calls, $vary, $key ) {
// get rid of default Vary fields
- $outputPage = $this->getMockBuilder(
'OutputPage'
)
+ $outputPage = $this->getMockBuilder(
OutputPage::class
)
->setConstructorArgs( [ new RequestContext() ] )
->setMethods( [ 'getCacheVaryCookies' ] )
->getMock();
->setConstructorArgs( [ new RequestContext() ] )
->setMethods( [ 'getCacheVaryCookies' ] )
->getMock();
@@
-525,7
+525,7
@@
class OutputPageTest extends MediaWikiTestCase {
$this->assertTrue( $outputPage->haveCacheVaryCookies() );
}
$this->assertTrue( $outputPage->haveCacheVaryCookies() );
}
- /*
+ /*
*
* @covers OutputPage::addCategoryLinks
* @covers OutputPage::getCategories
*/
* @covers OutputPage::addCategoryLinks
* @covers OutputPage::getCategories
*/
@@
-539,7
+539,7
@@
class OutputPageTest extends MediaWikiTestCase {
'page_title' => 'Test2'
]
] );
'page_title' => 'Test2'
]
] );
- $outputPage = $this->getMockBuilder(
'OutputPage'
)
+ $outputPage = $this->getMockBuilder(
OutputPage::class
)
->setConstructorArgs( [ new RequestContext() ] )
->setMethods( [ 'addCategoryLinksToLBAndGetResult' ] )
->getMock();
->setConstructorArgs( [ new RequestContext() ] )
->setMethods( [ 'addCategoryLinksToLBAndGetResult' ] )
->getMock();
@@
-640,6
+640,17
@@
class OutputPageTest extends MediaWikiTestCase {
'not all and (min-resolution: 2dppx),' .
'</img/two-x.png>;rel=preload;as=image;media=(min-resolution: 2dppx)'
],
'not all and (min-resolution: 2dppx),' .
'</img/two-x.png>;rel=preload;as=image;media=(min-resolution: 2dppx)'
],
+ [
+ [
+ 'ResourceBasePath' => '/w',
+ 'Logo' => '/img/default.png',
+ 'LogoHD' => [
+ 'svg' => '/img/vector.svg',
+ ],
+ ],
+ 'Link: </img/vector.svg>;rel=preload;as=image'
+
+ ],
[
[
'ResourceBasePath' => '/w',
[
[
'ResourceBasePath' => '/w',
@@
-685,10
+696,6
@@
class NullMessageBlobStore extends MessageBlobStore {
return [];
}
return [];
}
- public function insertMessageBlob( $name, ResourceLoaderModule $module, $lang ) {
- return false;
- }
-
public function updateModule( $name, ResourceLoaderModule $module, $lang ) {
}
public function updateModule( $name, ResourceLoaderModule $module, $lang ) {
}