mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/RSS
synced 2024-12-18 02:40:36 +00:00
build: Upgrade mediawiki/mediawiki-codesniffer to v43.0.0
Change-Id: I14948431331e02e0659e80b159f4b2e0ed0469ef
This commit is contained in:
parent
f55f0b7785
commit
29503101e5
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"mediawiki/mediawiki-codesniffer": "41.0.0",
|
"mediawiki/mediawiki-codesniffer": "43.0.0",
|
||||||
"mediawiki/mediawiki-phan-config": "0.14.0",
|
"mediawiki/mediawiki-phan-config": "0.14.0",
|
||||||
"mediawiki/minus-x": "1.1.1",
|
"mediawiki/minus-x": "1.1.1",
|
||||||
"php-parallel-lint/php-console-highlighter": "1.0.0",
|
"php-parallel-lint/php-console-highlighter": "1.0.0",
|
||||||
|
@ -18,5 +18,10 @@
|
||||||
],
|
],
|
||||||
"phan": "phan -d . --long-progress-bar",
|
"phan": "phan -d . --long-progress-bar",
|
||||||
"phpcs": "phpcs -sp --cache"
|
"phpcs": "phpcs -sp --cache"
|
||||||
|
},
|
||||||
|
"config": {
|
||||||
|
"allow-plugins": {
|
||||||
|
"dealerdirect/phpcodesniffer-composer-installer": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@ class Hooks implements ParserFirstCallInitHook {
|
||||||
*/
|
*/
|
||||||
public static function renderRss( $input, array $args, Parser $parser, PPFrame $frame ) {
|
public static function renderRss( $input, array $args, Parser $parser, PPFrame $frame ) {
|
||||||
global $wgRSSCacheAge, $wgRSSCacheCompare, $wgRSSNamespaces,
|
global $wgRSSCacheAge, $wgRSSCacheCompare, $wgRSSNamespaces,
|
||||||
$wgRSSUrlWhitelist,$wgRSSAllowedFeeds;
|
$wgRSSUrlWhitelist, $wgRSSAllowedFeeds;
|
||||||
|
|
||||||
if ( is_array( $wgRSSNamespaces ) && count( $wgRSSNamespaces ) ) {
|
if ( is_array( $wgRSSNamespaces ) && count( $wgRSSNamespaces ) ) {
|
||||||
$nsUsed = $parser->getTitle()->getNamespace();
|
$nsUsed = $parser->getTitle()->getNamespace();
|
||||||
|
|
|
@ -71,7 +71,7 @@ class RSSParser {
|
||||||
* @param array $args
|
* @param array $args
|
||||||
*/
|
*/
|
||||||
public function __construct( $url, $args ) {
|
public function __construct( $url, $args ) {
|
||||||
global $wgRSSDateDefaultFormat,$wgRSSItemMaxLength;
|
global $wgRSSDateDefaultFormat, $wgRSSItemMaxLength;
|
||||||
|
|
||||||
$this->url = $url;
|
$this->url = $url;
|
||||||
|
|
||||||
|
@ -223,7 +223,7 @@ class RSSParser {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
list( $etag, $lastModified, $rss ) = $data;
|
[ $etag, $lastModified, $rss ] = $data;
|
||||||
if ( !isset( $rss->items ) ) {
|
if ( !isset( $rss->items ) ) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -424,29 +424,29 @@ class RSSParser {
|
||||||
foreach ( array_keys( $item ) as $info ) {
|
foreach ( array_keys( $item ) as $info ) {
|
||||||
if ( $item[$info] != "" ) {
|
if ( $item[$info] != "" ) {
|
||||||
switch ( $info ) {
|
switch ( $info ) {
|
||||||
// ATOM <id> elements and RSS <link> elements are item link urls
|
// ATOM <id> elements and RSS <link> elements are item link urls
|
||||||
case 'id':
|
case 'id':
|
||||||
$txt = $this->sanitizeUrl( $item['id'] );
|
$txt = $this->sanitizeUrl( $item['id'] );
|
||||||
$renderedItem = str_replace( '{{{link}}}', $txt, $renderedItem );
|
$renderedItem = str_replace( '{{{link}}}', $txt, $renderedItem );
|
||||||
break;
|
break;
|
||||||
case 'link':
|
case 'link':
|
||||||
$txt = $this->sanitizeUrl( $item['link'] );
|
$txt = $this->sanitizeUrl( $item['link'] );
|
||||||
$renderedItem = str_replace( '{{{link}}}', $txt, $renderedItem );
|
$renderedItem = str_replace( '{{{link}}}', $txt, $renderedItem );
|
||||||
break;
|
break;
|
||||||
case 'date':
|
case 'date':
|
||||||
$tempTimezone = date_default_timezone_get();
|
$tempTimezone = date_default_timezone_get();
|
||||||
date_default_timezone_set( 'UTC' );
|
date_default_timezone_set( 'UTC' );
|
||||||
$txt = date( $this->date,
|
$txt = date( $this->date,
|
||||||
strtotime( $this->escapeTemplateParameter( $item['date'] ) ) );
|
strtotime( $this->escapeTemplateParameter( $item['date'] ) ) );
|
||||||
date_default_timezone_set( $tempTimezone );
|
date_default_timezone_set( $tempTimezone );
|
||||||
$renderedItem = str_replace( '{{{date}}}', $txt, $renderedItem );
|
$renderedItem = str_replace( '{{{date}}}', $txt, $renderedItem );
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$str = $this->escapeTemplateParameter( $item[$info] );
|
$str = $this->escapeTemplateParameter( $item[$info] );
|
||||||
$str = $parser->getTargetLanguage()->truncateForVisual( $str, $this->ItemMaxLength );
|
$str = $parser->getTargetLanguage()->truncateForVisual( $str, $this->ItemMaxLength );
|
||||||
$str = $this->highlightTerms( $str );
|
$str = $this->highlightTerms( $str );
|
||||||
$renderedItem = str_replace( '{{{' . $info . '}}}',
|
$renderedItem = str_replace( '{{{' . $info . '}}}',
|
||||||
$this->insertStripItem( $str ), $renderedItem );
|
$this->insertStripItem( $str ), $renderedItem );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -527,8 +527,8 @@ class RSSParser {
|
||||||
|
|
||||||
$text = str_replace(
|
$text = str_replace(
|
||||||
[
|
[
|
||||||
'[', '|', ']', '\'', 'ISBN ',
|
'[', '|', ']', '\'', 'ISBN ',
|
||||||
'RFC ', '://', "\n=", '{{', '}}',
|
'RFC ', '://', "\n=", '{{', '}}',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'[', '|', ']', ''', 'ISBN ',
|
'[', '|', ']', ''', 'ISBN ',
|
||||||
|
|
Loading…
Reference in a new issue