Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "CSSMin: Make isRemoteUrl and isLocalUrl really private, now that we can in PHP 5.5"

Browse source
This commit is contained in:
jenkins-bot 2016-02-18 08:21:35 +00:00 committed by Gerrit Code Review
commit aeb7882171
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/libs/CSSMin.php
View file

@ -349,7 +349,7 @@ class CSSMin {
$url = $match['file'] . $match['query']; $url = $match['file'] . $match['query'];
$file = $local . $match['file']; $file = $local . $match['file'];
if ( if (
!CSSMin::isRemoteUrl( $url ) && !CSSMin::isLocalUrl( $url ) !self::isRemoteUrl( $url ) && !self::isLocalUrl( $url )
&& file_exists( $file ) && file_exists( $file )
) { ) {
$mimeTypes[ CSSMin::getMimeType( $file ) ] = true; $mimeTypes[ CSSMin::getMimeType( $file ) ] = true;
@ -391,11 +391,10 @@ class CSSMin {
/** /**
* Is this CSS rule referencing a remote URL? * Is this CSS rule referencing a remote URL?
* *
* @private Until we require PHP 5.5 and we can access self:: from closures.
* @param string $maybeUrl * @param string $maybeUrl
* @return bool * @return bool
*/ */
public static function isRemoteUrl( $maybeUrl ) { protected static function isRemoteUrl( $maybeUrl ) {
if ( substr( $maybeUrl, 0, 2 ) === '//' || parse_url( $maybeUrl, PHP_URL_SCHEME ) ) { if ( substr( $maybeUrl, 0, 2 ) === '//' || parse_url( $maybeUrl, PHP_URL_SCHEME ) ) {
return true; return true;
} }
@ -405,11 +404,10 @@ class CSSMin {
/** /**
* Is this CSS rule referencing a local URL? * Is this CSS rule referencing a local URL?
* *
* @private Until we require PHP 5.5 and we can access self:: from closures.
* @param string $maybeUrl * @param string $maybeUrl
* @return bool * @return bool
*/ */
public static function isLocalUrl( $maybeUrl ) { protected static function isLocalUrl( $maybeUrl ) {
if ( $maybeUrl !== '' && $maybeUrl[0] === '/' && !self::isRemoteUrl( $maybeUrl ) ) { if ( $maybeUrl !== '' && $maybeUrl[0] === '/' && !self::isRemoteUrl( $maybeUrl ) ) {
return true; return true;
} }

14
tests/phpunit/includes/libs/CSSMinTest.php
View file

@ -155,7 +155,7 @@ class CSSMinTest extends MediaWikiTestCase {
* @cover CSSMin::isRemoteUrl * @cover CSSMin::isRemoteUrl
*/ */
public function testIsRemoteUrl( $expect, $url ) { public function testIsRemoteUrl( $expect, $url ) {
$this->assertEquals( CSSMin::isRemoteUrl( $url ), $expect ); $this->assertEquals( CSSMinTestable::isRemoteUrl( $url ), $expect );
} }
public static function provideIsLocalUrls() { public static function provideIsLocalUrls() {
@ -172,7 +172,7 @@ class CSSMinTest extends MediaWikiTestCase {
* @cover CSSMin::isLocalUrl * @cover CSSMin::isLocalUrl
*/ */
public function testIsLocalUrl( $expect, $url ) { public function testIsLocalUrl( $expect, $url ) {
$this->assertEquals( CSSMin::isLocalUrl( $url ), $expect ); $this->assertEquals( CSSMinTestable::isLocalUrl( $url ), $expect );
} }
public static function provideRemapRemappingCases() { public static function provideRemapRemappingCases() {
@ -443,3 +443,13 @@ class CSSMinTest extends MediaWikiTestCase {
]; ];
} }
} }
class CSSMinTestable extends CSSMin {
// Make some protected methods public
public static function isRemoteUrl( $maybeUrl ) {
return parent::isRemoteUrl( $maybeUrl );
}
public static function isLocalUrl( $maybeUrl ) {
return parent::isLocalUrl( $maybeUrl );
}
}