jenkins-bot has submitted this change and it was merged.
Change subject: Implement redirects in CssContent
......................................................................
Implement redirects in CssContent
Just like ad9f14d662f959 which was for JavaScript. The redirect will be
of the form "/* #REDIRECT */@import url(...);".
Bug: T73201
Bug: T35973
Change-Id: I10bae44af4b4923f8797172702974cd45dc25ab4
---
M includes/content/CssContent.php
M includes/content/CssContentHandler.php
A tests/phpunit/includes/content/CssContentHandlerTest.php
M tests/phpunit/includes/content/CssContentTest.php
4 files changed, 115 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/CssContent.php b/includes/content/CssContent.php
index 8290603..b4f5196 100644
--- a/includes/content/CssContent.php
+++ b/includes/content/CssContent.php
@@ -33,6 +33,11 @@
class CssContent extends TextContent {
/**
+ * @var bool|Title|null
+ */
+ private $redirectTarget = false;
+
+ /**
* @param string $text CSS code.
* @param string $modelId the content content model
*/
@@ -74,4 +79,43 @@
return $html;
}
+ /**
+ * @param Title $target
+ * @return CssContent
+ */
+ public function updateRedirect( Title $target ) {
+ if ( !$this->isRedirect() ) {
+ return $this;
+ }
+
+ return $this->getContentHandler()->makeRedirectContent( $target
);
+ }
+
+ /**
+ * @return Title|null
+ */
+ public function getRedirectTarget() {
+ if ( $this->redirectTarget !== false ) {
+ return $this->redirectTarget;
+ }
+ $this->redirectTarget = null;
+ $text = $this->getNativeData();
+ if ( strpos( $text, '/* #REDIRECT */' ) === 0 ) {
+ // Extract the title from the url
+ preg_match( '/title=(.*?)&action=raw/', $text, $matches
);
+ if ( isset( $matches[1] ) ) {
+ $title = Title::newFromText( $matches[1] );
+ if ( $title ) {
+ // Have a title, check that the current
content equals what
+ // the redirect content should be
+ if ( $this->equals(
$this->getContentHandler()->makeRedirectContent( $title ) ) ) {
+ $this->redirectTarget = $title;
+ }
+ }
+ }
+ }
+
+ return $this->redirectTarget;
+ }
+
}
diff --git a/includes/content/CssContentHandler.php
b/includes/content/CssContentHandler.php
index b2a8676..dfa01e2 100644
--- a/includes/content/CssContentHandler.php
+++ b/includes/content/CssContentHandler.php
@@ -39,4 +39,23 @@
protected function getContentClass() {
return 'CssContent';
}
+
+ public function supportsRedirects() {
+ return true;
+ }
+
+ /**
+ * Create a redirect that is also valid CSS
+ *
+ * @param Title $destination
+ * @param string $text ignored
+ * @return JavaScriptContent
+ */
+ public function makeRedirectContent( Title $destination, $text = '' ) {
+ // The parameters are passed as a string so the / is not
url-encoded by wfArrayToCgi
+ $url = $destination->getFullURL( 'action=raw&ctype=text/css',
false, PROTO_RELATIVE );
+ $class = $this->getContentClass();
+ return new $class( '/* #REDIRECT */@import ' .
CSSMin::buildUrlValue( $url ) . ';' );
+ }
+
}
diff --git a/tests/phpunit/includes/content/CssContentHandlerTest.php
b/tests/phpunit/includes/content/CssContentHandlerTest.php
new file mode 100644
index 0000000..e1785a9
--- /dev/null
+++ b/tests/phpunit/includes/content/CssContentHandlerTest.php
@@ -0,0 +1,30 @@
+<?php
+
+class CssContentHandlerTest extends MediaWikiTestCase {
+
+ /**
+ * @dataProvider provideMakeRedirectContent
+ * @covers CssContentHandler::makeRedirectContent
+ */
+ public function testMakeRedirectContent( $title, $expected ) {
+ $this->setMwGlobals( array(
+ 'wgServer' => '//example.org',
+ 'wgScript' => '/w/index.php',
+ ) );
+ $ch = new CssContentHandler();
+ $content = $ch->makeRedirectContent( Title::newFromText( $title
) );
+ $this->assertInstanceOf( 'CssContent', $content );
+ $this->assertEquals( $expected, $content->serialize(
CONTENT_FORMAT_CSS ) );
+ }
+
+ /**
+ * Keep this in sync with CssContentTest::provideGetRedirectTarget()
+ */
+ public static function provideMakeRedirectContent() {
+ return array(
+ array( 'MediaWiki:MonoBook.css', "/* #REDIRECT
*/@import
url(//example.org/w/index.php?title=MediaWiki:MonoBook.css&action=raw&ctype=text/css);"
),
+ array( 'User:FooBar/common.css', "/* #REDIRECT
*/@import
url(//example.org/w/index.php?title=User:FooBar/common.css&action=raw&ctype=text/css);"
),
+ array( 'Gadget:FooBaz.css', "/* #REDIRECT */@import
url(//example.org/w/index.php?title=Gadget:FooBaz.css&action=raw&ctype=text/css);"
),
+ );
+ }
+}
diff --git a/tests/phpunit/includes/content/CssContentTest.php
b/tests/phpunit/includes/content/CssContentTest.php
index 44427ba..c4d87c2 100644
--- a/tests/phpunit/includes/content/CssContentTest.php
+++ b/tests/phpunit/includes/content/CssContentTest.php
@@ -83,11 +83,31 @@
}
/**
- * Override this since CssContent does not support redirects yet
+ * @dataProvider provideGetRedirectTarget
+ */
+ public function testGetRedirectTarget( $title, $text ) {
+ $this->setMwGlobals( array(
+ 'wgServer' => '//example.org',
+ 'wgScriptPath' => '/w',
+ 'wgScript' => '/w/index.php',
+ ) );
+ $content = new CssContent( $text );
+ $target = $content->getRedirectTarget();
+ $this->assertEquals( $title, $target ?
$target->getPrefixedText() : null );
+ }
+
+ /**
+ * Keep this in sync with
CssContentHandlerTest::provideMakeRedirectContent()
*/
public static function provideGetRedirectTarget() {
return array(
- array( null, '' ),
+ array( 'MediaWiki:MonoBook.css', "/* #REDIRECT
*/@import
url(//example.org/w/index.php?title=MediaWiki:MonoBook.css&action=raw&ctype=text/css);"
),
+ array( 'User:FooBar/common.css', "/* #REDIRECT
*/@import
url(//example.org/w/index.php?title=User:FooBar/common.css&action=raw&ctype=text/css);"
),
+ array( 'Gadget:FooBaz.css', "/* #REDIRECT */@import
url(//example.org/w/index.php?title=Gadget:FooBaz.css&action=raw&ctype=text/css);"
),
+ # No #REDIRECT comment
+ array( null, "@import
url(//example.org/w/index.php?title=Gadget:FooBaz.css&action=raw&ctype=text/css);"
),
+ # Wrong domain
+ array( null, "/* #REDIRECT */@import
url(//example.com/w/index.php?title=Gadget:FooBaz.css&action=raw&ctype=text/css);"
),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/225709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10bae44af4b4923f8797172702974cd45dc25ab4
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
