wikimedia/mediawiki-extensions-TemplateStyles
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateStyles synced 2024-11-15 03:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
mediawiki-extensions-Templa.../tests/phpunit/TemplateStylesHooksTest.php

318 lines
13 KiB
PHP
Raw Normal View History

Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
<?php
/**
* @group TemplateStyles
* @group Database
Add @covers tags Change-Id: Ie87849bc9dcc0b26363c9475930c967841e6a7f7
2018-02-06 02:19:30 +00:00
* @covers TemplateStylesHooks
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
*/
class TemplateStylesHooksTest extends MediaWikiLangTestCase {
protected function addPage( $page, $text, $model ) {
$title = Title::newFromText( 'Template:TemplateStyles test/' . $page );
$content = ContentHandler::makeContent( $text, $title, $model );
$page = WikiPage::factory( $title );
$user = static::getTestSysop()->getUser();
$status = $page->doEditContent( $content, 'Test for TemplateStyles', 0, false, $user );
if ( !$status->isOk() ) {
$this->fail( "Failed to create $title: " . $status->getWikiText( false, false, 'en' ) );
}
}
public function addDBDataOnce() {
$this->addPage( 'wikitext', '.foo { color: red; }', CONTENT_MODEL_WIKITEXT );
$this->addPage( 'nonsanitized.css', '.foo { color: red; }', CONTENT_MODEL_CSS );
$this->addPage( 'styles1.css', '.foo { color: blue; }', 'sanitized-css' );
$this->addPage( 'styles2.css', '.bar { color: green; }', 'sanitized-css' );
}
/**
* @dataProvider provideOnRegistration
* @param array $textModelsToParse
* @param bool $autoParseContent
* @param array $expect
*/
public function testOnRegistration( $textModelsToParse, $autoParseContent, $expect ) {
$this->setMwGlobals( [
'wgTextModelsToParse' => $textModelsToParse,
'wgTemplateStylesAutoParseContent' => $autoParseContent,
] );
global $wgTextModelsToParse;
TemplateStylesHooks::onRegistration();
$this->assertSame( $expect, $wgTextModelsToParse );
}
public static function provideOnRegistration() {
return [
[
[ CONTENT_MODEL_WIKITEXT ],
true,
[ CONTENT_MODEL_WIKITEXT ]
],
[
[ CONTENT_MODEL_WIKITEXT, CONTENT_MODEL_CSS ],
true,
[ CONTENT_MODEL_WIKITEXT, CONTENT_MODEL_CSS, 'sanitized-css' ],
],
[
[ CONTENT_MODEL_WIKITEXT, CONTENT_MODEL_CSS ],
false,
[ CONTENT_MODEL_WIKITEXT, CONTENT_MODEL_CSS ],
],
];
}
/**
* @dataProvider provideOnParserAfterTidy
*/
public function testOnParserAfterTidy( $text, $expect ) {
$p = new Parser();
TemplateStylesHooks::onParserAfterTidy( $p, $text );
$this->assertSame( $expect, $text );
}
public static function provideOnParserAfterTidy() {
return [
[
"<style>\n.foo { color: red; }\n</style>",
"<style>\n.foo { color: red; }\n</style>",
],
[
"<style>\n<![CDATA[\n.foo { color: red; }\n]]>\n</style>",
"<style>\n/*<![CDATA[*/\n.foo { color: red; }\n/*]]>*/\n</style>",
],
[
"<StYlE type='text/css'>\n<![CDATA[\n.foo { color: red; }\n]]>\n</sTyLe>",
"<StYlE type='text/css'>\n/*<![CDATA[*/\n.foo { color: red; }\n/*]]>*/\n</sTyLe>",
],
[
"<style>\n/*<![CDATA[*/\n.foo { color: red; }\n/*]]>*/\n</style>",
"<style>\n/*<![CDATA[*/\n.foo { color: red; }\n/*]]>*/\n</style>",
],
[
"<style>x\n<![CDATA[\n.foo { color: red; }\n]]>\n</style>",
"<style>x\n<![CDATA[\n.foo { color: red; }\n/*]]>*/\n</style>",
],
[
"<script>\n<![CDATA[\n.foo { color: red; }\n]]>\n</script>",
"<script>\n<![CDATA[\n.foo { color: red; }\n]]>\n</script>",
],
];
}
/**
* @dataProvider provideOnContentHandlerDefaultModelFor
*/
public function testOnContentHandlerDefaultModelFor( $ns, $title, $expect ) {
$this->setMwGlobals( [
'wgTemplateStylesNamespaces' => [ 10 => true, 2 => false, 3000 => true, 3002 => true ],
'wgNamespacesWithSubpages' => [ 10 => true, 2 => true, 3000 => true, 3002 => false ],
] );
$model = 'unchanged';
$ret = TemplateStylesHooks::onContentHandlerDefaultModelFor(
Title::makeTitle( $ns, $title ), $model
);
$this->assertSame( !$expect, $ret );
$this->assertSame( $expect ? 'sanitized-css' : 'unchanged', $model );
}
public static function provideOnContentHandlerDefaultModelFor() {
return [
[ 10, 'Test/test.css', true ],
[ 10, 'Test.css', false ],
[ 10, 'Test/test.xss', false ],
[ 10, 'Test/test.CSS', false ],
[ 3000, 'Test/test.css', true ],
[ 3002, 'Test/test.css', false ],
[ 2, 'Test/test.css', false ],
];
}
Fix coverage * Fix test for TemplateStylesFontFaceAtRuleSanitizer so it's actually run * Hack up a broken Sanitizer to test a code path in TemplateStylesContent::sanitize() that handles such things. * Ignore an InvalidArgumentException in TemplateStylesContent::processError() that's not worth checking. User input can't hit that, only logic bugs. * Ignore TemplateStylesHooks::getConfig(), it's tested but gets called before PHPUnit starts counting. * Test TemplateStylesHooksTest::onCodeEditorGetPageLanguage() * Test $wgTemplateStylesDisable * Test a back-compat code path in TemplateStylesHooks::handleTag(). Change-Id: I7078e5a353a624aa53fe72de7990b93a77b44cf6
2018-02-06 02:55:05 +00:00
/**
* @dataProvider provideOnCodeEditorGetPageLanguage
*/
public function testOnCodeEditorGetPageLanguage( $useCodeEditor, $model, $expect ) {
$this->setMwGlobals( [
'wgTemplateStylesUseCodeEditor' => $useCodeEditor,
] );
$title = Title::makeTitle( NS_TEMPLATE, 'Test.css' );
$lang = 'unchanged';
$ret = TemplateStylesHooks::onCodeEditorGetPageLanguage(
$title, $lang, $model, 'text/x-whatever'
);
$this->assertSame( !$expect, $ret );
$this->assertSame( $expect ? 'css' : 'unchanged', $lang );
}
public static function provideOnCodeEditorGetPageLanguage() {
return [
[ true, 'wikitext', false ],
[ true, 'css', false ],
[ true, 'sanitized-css', true ],
[ false, 'sanitized-css', false ],
];
}
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
/**
* Unfortunately we can't just use a parserTests.txt file because our
* tag's output depends on the revision IDs of the input pages.
* @dataProvider provideTag
*/
Fix coverage * Fix test for TemplateStylesFontFaceAtRuleSanitizer so it's actually run * Hack up a broken Sanitizer to test a code path in TemplateStylesContent::sanitize() that handles such things. * Ignore an InvalidArgumentException in TemplateStylesContent::processError() that's not worth checking. User input can't hit that, only logic bugs. * Ignore TemplateStylesHooks::getConfig(), it's tested but gets called before PHPUnit starts counting. * Test TemplateStylesHooksTest::onCodeEditorGetPageLanguage() * Test $wgTemplateStylesDisable * Test a back-compat code path in TemplateStylesHooks::handleTag(). Change-Id: I7078e5a353a624aa53fe72de7990b93a77b44cf6
2018-02-06 02:55:05 +00:00
public function testTag(
ParserOptions $popt, $getTextOptions, $wikitext, $expect, $globals = []
) {
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
global $wgParserConf;
Fix coverage * Fix test for TemplateStylesFontFaceAtRuleSanitizer so it's actually run * Hack up a broken Sanitizer to test a code path in TemplateStylesContent::sanitize() that handles such things. * Ignore an InvalidArgumentException in TemplateStylesContent::processError() that's not worth checking. User input can't hit that, only logic bugs. * Ignore TemplateStylesHooks::getConfig(), it's tested but gets called before PHPUnit starts counting. * Test TemplateStylesHooksTest::onCodeEditorGetPageLanguage() * Test $wgTemplateStylesDisable * Test a back-compat code path in TemplateStylesHooks::handleTag(). Change-Id: I7078e5a353a624aa53fe72de7990b93a77b44cf6
2018-02-06 02:55:05 +00:00
$this->setMwGlobals( $globals + [
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'wgScriptPath' => '',
'wgScript' => '/index.php',
'wgArticlePath' => '/wiki/$1',
] );
$oldCurrentRevisionCallback = $popt->setCurrentRevisionCallback(
Type annotations for some tests Also fix one function's case. Change-Id: Ibe1750e6cfed593304e027d4eda7609a73980e62
2017-11-14 21:51:17 +00:00
function ( Title $title, $parser = false ) use ( &$oldCurrentRevisionCallback ) {
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
if ( $title->getPrefixedText() === 'Template:Test replacement' ) {
$user = RequestContext::getMain()->getUser();
return new Revision( [
'page' => $title->getArticleID(),
'user_text' => $user->getName(),
'user' => $user->getId(),
Type annotations for some tests Also fix one function's case. Change-Id: Ibe1750e6cfed593304e027d4eda7609a73980e62
2017-11-14 21:51:17 +00:00
'parent_id' => $title->getLatestRevID(),
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'title' => $title,
'content' => new TemplateStylesContent( '.baz { color:orange; bogus:bogus; }' )
] );
}
return call_user_func( $oldCurrentRevisionCallback, $title, $parser );
}
);
$class = $wgParserConf['class'];
$parser = new $class( $wgParserConf );
Type annotations for some tests Also fix one function's case. Change-Id: Ibe1750e6cfed593304e027d4eda7609a73980e62
2017-11-14 21:51:17 +00:00
/** @var Parser $parser */
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
$parser->firstCallInit();
if ( !isset( $parser->mTagHooks['templatestyles'] ) ) {
Don't skip tests if the hook is not present This just hides the error if something's broken with extension registration because skipped tests don't result in a failed suite. Instead, explode in everybody's eyes to make it clear there's a problem. Change-Id: I2f1e80a1fa4b99d857671c9d1061d34449764f01
2017-11-14 21:51:50 +00:00
throw new Exception( 'templatestyles tag hook is not in the parser' );
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
}
$out = $parser->parse( $wikitext, Title::newFromText( 'Test' ), $popt );
$parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
Deduplicate embedded style rules Use the facility added in core change I055abdf4d to deduplicate the embedded style rules. Bug: T168333 Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650 Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
2017-11-24 19:20:47 +00:00
$expect = preg_replace_callback( '/\{\{REV:(.*?)\}\}/', function ( $m ) {
return Title::newFromText( 'Template:TemplateStyles test/' . $m[1] )->getLatestRevID();
}, $expect );
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$this->assertEquals( $expect, $out->getText( $getTextOptions ) );
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
}
public static function provideTag() {
$popt = ParserOptions::newFromContext( RequestContext::getMain() );
$popt->setWrapOutputClass( 'templatestyles-test' );
$popt2 = ParserOptions::newFromContext( RequestContext::getMain() );
Fix coverage * Fix test for TemplateStylesFontFaceAtRuleSanitizer so it's actually run * Hack up a broken Sanitizer to test a code path in TemplateStylesContent::sanitize() that handles such things. * Ignore an InvalidArgumentException in TemplateStylesContent::processError() that's not worth checking. User input can't hit that, only logic bugs. * Ignore TemplateStylesHooks::getConfig(), it's tested but gets called before PHPUnit starts counting. * Test TemplateStylesHooksTest::onCodeEditorGetPageLanguage() * Test $wgTemplateStylesDisable * Test a back-compat code path in TemplateStylesHooks::handleTag(). Change-Id: I7078e5a353a624aa53fe72de7990b93a77b44cf6
2018-02-06 02:55:05 +00:00
$popt3 = ParserOptions::newFromContext( RequestContext::getMain() );
Swap MediaWiki\quietCall -> Wikimedia\quietCall Bug: T182273 Change-Id: I9d5028ff04d5a8904462a8b6b0819d1974ee06a7
2018-02-11 06:03:39 +00:00
Wikimedia\quietCall( [ $popt3, 'setWrapOutputClass' ], false );
Fix coverage * Fix test for TemplateStylesFontFaceAtRuleSanitizer so it's actually run * Hack up a broken Sanitizer to test a code path in TemplateStylesContent::sanitize() that handles such things. * Ignore an InvalidArgumentException in TemplateStylesContent::processError() that's not worth checking. User input can't hit that, only logic bugs. * Ignore TemplateStylesHooks::getConfig(), it's tested but gets called before PHPUnit starts counting. * Test TemplateStylesHooksTest::onCodeEditorGetPageLanguage() * Test $wgTemplateStylesDisable * Test a back-compat code path in TemplateStylesHooks::handleTag(). Change-Id: I7078e5a353a624aa53fe72de7990b93a77b44cf6
2018-02-06 02:55:05 +00:00
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
return [
'Tag without src' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt, [],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'<templatestyles />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
"<div class=\"templatestyles-test\"><p><strong class=\"error\">TemplateStyles' <code>src</code> attribute must not be empty.</strong>\n</p></div>",
// @codingStandardsIgnoreEnd
],
'Tag with invalid src' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt, [],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'<templatestyles src="Test&lt;&gt;" />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
"<div class=\"templatestyles-test\"><p><strong class=\"error\">Invalid title for TemplateStyles' <code>src</code> attribute.</strong>\n</p></div>",
// @codingStandardsIgnoreEnd
],
'Tag with valid but nonexistent title' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt, [],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'<templatestyles src="ThisDoes\'\'\'Not\'\'\'Exist" />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
Fix tests Change-Id: I07d9271511e279cd0e12910673848654e6ff5eef
2017-11-14 21:48:20 +00:00
"<div class=\"templatestyles-test\"><p><strong class=\"error\">Page <a href=\"/index.php?title=Template:ThisDoes%27%27%27Not%27%27%27Exist&amp;action=edit&amp;redlink=1\" class=\"new\" title=\"Template:ThisDoes&#39;&#39;&#39;Not&#39;&#39;&#39;Exist (page does not exist)\">Template:ThisDoes&#39;&#39;&#39;Not&#39;&#39;&#39;Exist</a> has no content.</strong>\n</p></div>",
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
// @codingStandardsIgnoreEnd
],
'Tag with valid but nonexistent title, main namespace' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt, [],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'<templatestyles src=":ThisDoes\'\'\'Not\'\'\'Exist" />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
Fix tests Change-Id: I07d9271511e279cd0e12910673848654e6ff5eef
2017-11-14 21:48:20 +00:00
"<div class=\"templatestyles-test\"><p><strong class=\"error\">Page <a href=\"/index.php?title=ThisDoes%27%27%27Not%27%27%27Exist&amp;action=edit&amp;redlink=1\" class=\"new\" title=\"ThisDoes&#39;&#39;&#39;Not&#39;&#39;&#39;Exist (page does not exist)\">ThisDoes&#39;&#39;&#39;Not&#39;&#39;&#39;Exist</a> has no content.</strong>\n</p></div>",
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
// @codingStandardsIgnoreEnd
],
'Tag with wikitext page' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt, [],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'<templatestyles src="TemplateStyles test/wikitext" />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
"<div class=\"templatestyles-test\"><p><strong class=\"error\">Page <a href=\"/wiki/Template:TemplateStyles_test/wikitext\" title=\"Template:TemplateStyles test/wikitext\">Template:TemplateStyles test/wikitext</a> must have content model \"Sanitized CSS\" for TemplateStyles (current model is \"wikitext\").</strong>\n</p></div>",
// @codingStandardsIgnoreEnd
],
'Tag with CSS (not sanitized-css) page' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt, [],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'<templatestyles src="TemplateStyles test/nonsanitized.css" />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
"<div class=\"templatestyles-test\"><p><strong class=\"error\">Page <a href=\"/wiki/Template:TemplateStyles_test/nonsanitized.css\" title=\"Template:TemplateStyles test/nonsanitized.css\">Template:TemplateStyles test/nonsanitized.css</a> must have content model \"Sanitized CSS\" for TemplateStyles (current model is \"CSS\").</strong>\n</p></div>",
// @codingStandardsIgnoreEnd
],
'Working tag' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt, [],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'<templatestyles src="TemplateStyles test/styles1.css" />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
Fix <p> wrappers in unit tests Updates expected test results for Ide4005842c. Bug: T186965 Change-Id: Iff92e6cd0a88d4f595148f837d892b7123b12b29
2018-03-03 23:24:21 +00:00
"<div class=\"templatestyles-test\"><style data-mw-deduplicate=\"TemplateStyles:r{{REV:styles1.css}}/templatestyles-test\">.templatestyles-test .foo{color:blue}</style>\n</div>",
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
// @codingStandardsIgnoreEnd
],
Fix coverage * Fix test for TemplateStylesFontFaceAtRuleSanitizer so it's actually run * Hack up a broken Sanitizer to test a code path in TemplateStylesContent::sanitize() that handles such things. * Ignore an InvalidArgumentException in TemplateStylesContent::processError() that's not worth checking. User input can't hit that, only logic bugs. * Ignore TemplateStylesHooks::getConfig(), it's tested but gets called before PHPUnit starts counting. * Test TemplateStylesHooksTest::onCodeEditorGetPageLanguage() * Test $wgTemplateStylesDisable * Test a back-compat code path in TemplateStylesHooks::handleTag(). Change-Id: I7078e5a353a624aa53fe72de7990b93a77b44cf6
2018-02-06 02:55:05 +00:00
'Disabled' => [
$popt, [],
'<templatestyles src="TemplateStyles test/styles1.css" />',
"<div class=\"templatestyles-test\"></div>",
[ 'wgTemplateStylesDisable' => true ],
],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'Replaced content (which includes sanitization errors)' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt, [],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'<templatestyles src="Test replacement" />',
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
Fix <p> wrappers in unit tests Updates expected test results for Ide4005842c. Bug: T186965 Change-Id: Iff92e6cd0a88d4f595148f837d892b7123b12b29
2018-03-03 23:24:21 +00:00
"<div class=\"templatestyles-test\"><style data-mw-deduplicate=\"TemplateStyles:8fd14043c1cce91e8b9d1487a9d17d8d9ae43890/templatestyles-test\">/*\nErrors processing stylesheet [[:Template:Test replacement]] (rev ):\n• Unrecognized or unsupported property at line 1 character 22.\n*/\n.templatestyles-test .baz{color:orange}</style>\n</div>",
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
// @codingStandardsIgnoreEnd
],
'Still prefixed despite no wrapper' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt2, [ 'unwrap' => true ],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
'<templatestyles src="TemplateStyles test/styles1.css" />',
Deduplicate embedded style rules Use the facility added in core change I055abdf4d to deduplicate the embedded style rules. Bug: T168333 Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650 Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
2017-11-24 19:20:47 +00:00
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
Fix <p> wrappers in unit tests Updates expected test results for Ide4005842c. Bug: T186965 Change-Id: Iff92e6cd0a88d4f595148f837d892b7123b12b29
2018-03-03 23:24:21 +00:00
"<style data-mw-deduplicate=\"TemplateStyles:r{{REV:styles1.css}}\">.mw-parser-output .foo{color:blue}</style>\n",
Deduplicate embedded style rules Use the facility added in core change I055abdf4d to deduplicate the embedded style rules. Bug: T168333 Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650 Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
2017-11-24 19:20:47 +00:00
// @codingStandardsIgnoreEnd
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
],
Fix coverage * Fix test for TemplateStylesFontFaceAtRuleSanitizer so it's actually run * Hack up a broken Sanitizer to test a code path in TemplateStylesContent::sanitize() that handles such things. * Ignore an InvalidArgumentException in TemplateStylesContent::processError() that's not worth checking. User input can't hit that, only logic bugs. * Ignore TemplateStylesHooks::getConfig(), it's tested but gets called before PHPUnit starts counting. * Test TemplateStylesHooksTest::onCodeEditorGetPageLanguage() * Test $wgTemplateStylesDisable * Test a back-compat code path in TemplateStylesHooks::handleTag(). Change-Id: I7078e5a353a624aa53fe72de7990b93a77b44cf6
2018-02-06 02:55:05 +00:00
'Still prefixed despite deprecated no wrapper' => [
$popt3, [],
'<templatestyles src="TemplateStyles test/styles1.css" />',
Deduplicate embedded style rules Use the facility added in core change I055abdf4d to deduplicate the embedded style rules. Bug: T168333 Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650 Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
2017-11-24 19:20:47 +00:00
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
Fix <p> wrappers in unit tests Updates expected test results for Ide4005842c. Bug: T186965 Change-Id: Iff92e6cd0a88d4f595148f837d892b7123b12b29
2018-03-03 23:24:21 +00:00
"<style data-mw-deduplicate=\"TemplateStyles:r{{REV:styles1.css}}\">.mw-parser-output .foo{color:blue}</style>\n",
Deduplicate embedded style rules Use the facility added in core change I055abdf4d to deduplicate the embedded style rules. Bug: T168333 Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650 Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
2017-11-24 19:20:47 +00:00
// @codingStandardsIgnoreEnd
Fix coverage * Fix test for TemplateStylesFontFaceAtRuleSanitizer so it's actually run * Hack up a broken Sanitizer to test a code path in TemplateStylesContent::sanitize() that handles such things. * Ignore an InvalidArgumentException in TemplateStylesContent::processError() that's not worth checking. User input can't hit that, only logic bugs. * Ignore TemplateStylesHooks::getConfig(), it's tested but gets called before PHPUnit starts counting. * Test TemplateStylesHooksTest::onCodeEditorGetPageLanguage() * Test $wgTemplateStylesDisable * Test a back-compat code path in TemplateStylesHooks::handleTag(). Change-Id: I7078e5a353a624aa53fe72de7990b93a77b44cf6
2018-02-06 02:55:05 +00:00
],
Deduplicate embedded style rules Use the facility added in core change I055abdf4d to deduplicate the embedded style rules. Bug: T168333 Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650 Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
2017-11-24 19:20:47 +00:00
'Deduplicated tags' => [
Use 'unwrap' post-cache transform instead of setWrapOutputClass( false ) To reduce parser cache fragmentation, core is deprecating $parserOptions->setWrapOutputClass( false ) in favor of $parserOutput->getText( [ 'unwrap' => true ] ); Change-Id: I23a26ba0dfbe83007cd40e97d71a2139a5ecddc7 Depends-On: Iba16e78c41be992467101e7d83e9c3134765b101
2017-12-22 18:43:15 +00:00
$popt, [],
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
trim( '
<templatestyles src="TemplateStyles test/styles1.css" />
<templatestyles src="TemplateStyles test/styles1.css" />
<templatestyles src="TemplateStyles test/styles2.css" />
<templatestyles src="TemplateStyles test/styles1.css" />
<templatestyles src="TemplateStyles test/styles2.css" />
' ),
Deduplicate embedded style rules Use the facility added in core change I055abdf4d to deduplicate the embedded style rules. Bug: T168333 Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650 Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
2017-11-24 19:20:47 +00:00
// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
trim( '
Fix <p> wrappers in unit tests Updates expected test results for Ide4005842c. Bug: T186965 Change-Id: Iff92e6cd0a88d4f595148f837d892b7123b12b29
2018-03-03 23:24:21 +00:00
<div class="templatestyles-test"><style data-mw-deduplicate="TemplateStyles:r{{REV:styles1.css}}/templatestyles-test">.templatestyles-test .foo{color:blue}</style>
Deduplicate embedded style rules Use the facility added in core change I055abdf4d to deduplicate the embedded style rules. Bug: T168333 Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650 Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
2017-11-24 19:20:47 +00:00
<link rel="mw-deduplicated-inline-style" href="mw-data:TemplateStyles:r{{REV:styles1.css}}/templatestyles-test"/>
<style data-mw-deduplicate="TemplateStyles:r{{REV:styles2.css}}/templatestyles-test">.templatestyles-test .bar{color:green}</style>
<link rel="mw-deduplicated-inline-style" href="mw-data:TemplateStyles:r{{REV:styles1.css}}/templatestyles-test"/>
<link rel="mw-deduplicated-inline-style" href="mw-data:TemplateStyles:r{{REV:styles2.css}}/templatestyles-test"/>
Fix <p> wrappers in unit tests Updates expected test results for Ide4005842c. Bug: T186965 Change-Id: Iff92e6cd0a88d4f595148f837d892b7123b12b29
2018-03-03 23:24:21 +00:00
</div>
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
' ),
Deduplicate embedded style rules Use the facility added in core change I055abdf4d to deduplicate the embedded style rules. Bug: T168333 Change-Id: I98c6d5ca4b474de8826b19355f15a5230aef5650 Depends-On: I055abdf4d73ec65771eaa4fe0999ec907c831568
2017-11-24 19:20:47 +00:00
// @codingStandardsIgnoreEnd
Use wikimedia/css-sanitizer, and rewrite the hooking wikimedia/css-sanitizer provides a real CSS parser, which should be safer than poking at things with regular expressions. Instead of the strange hybrid model that tried to both process inline CSS and save CSS when the template is saved, it now looks for <templatestyles src="Title" /> during the parse to do all the transclusion of styles. The output method is "<style> tags in the body", pending someone implementing T160563. It now also registers a "sanitized-css" content model, which should pick up the CSS syntax highlighting and will validate the submitted CSS on submit and prevent a save if it's not valid. This patch also takes advantage of LGPL-2.x § 3 to relicense the extension as GPL-2.0+, although at this point none of the LGPL code remains anyway. Bug: T133408 Bug: T136054 Bug: T135788 Bug: T135789 Change-Id: I993e6f18d32a43aac8398743133d227b05133bbd Depends-On: If4eb5bf71f94fa366ec4eddb6964e8f4df6b824a
2017-02-20 04:33:24 +00:00
],
];
}
}
Reference in a new issue Copy permalink