mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/Linter
synced 2024-11-23 15:36:52 +00:00
build: Updating dependencies
composer: * mediawiki/mediawiki-phan-config: 0.12.1 → 0.14.0 npm: * grunt-banana-checker: 0.11.0 → 0.11.1 Change-Id: I7dbb4861df50848b803babe3dab10811adc3faae
This commit is contained in:
parent
4143a127f8
commit
fa24bc16e1
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"require-dev": {
|
||||
"mediawiki/mediawiki-codesniffer": "41.0.0",
|
||||
"mediawiki/mediawiki-phan-config": "0.12.1",
|
||||
"mediawiki/mediawiki-phan-config": "0.14.0",
|
||||
"mediawiki/minus-x": "1.1.1",
|
||||
"php-parallel-lint/php-console-highlighter": "1.0.0",
|
||||
"php-parallel-lint/php-parallel-lint": "1.3.2"
|
||||
|
|
|
@ -106,8 +106,8 @@ class LintErrorsPager extends TablePager {
|
|||
$this->namespaces = $namespaces;
|
||||
$this->exactMatch = $exactMatch;
|
||||
$this->title = $title;
|
||||
$this->throughTemplate = empty( $throughTemplate ) ? 'all' : $throughTemplate;
|
||||
$this->tag = empty( $tag ) ? 'all' : $tag;
|
||||
$this->throughTemplate = $throughTemplate ?: 'all';
|
||||
$this->tag = $tag ?: 'all';
|
||||
parent::__construct( $context );
|
||||
}
|
||||
|
||||
|
@ -127,7 +127,7 @@ class LintErrorsPager extends TablePager {
|
|||
$queryBuilder->where( [ 'linter_cat' => $this->categoryId ] );
|
||||
}
|
||||
|
||||
if ( !empty( $this->namespaces ) ) {
|
||||
if ( $this->namespaces ) {
|
||||
$namespaceCol = $mainConfig->get( 'LinterUseNamespaceColumnStage' )
|
||||
? "linter_namespace" : "page_namespace";
|
||||
$queryBuilder->where( [ $namespaceCol => $this->namespaces ] );
|
||||
|
|
|
@ -142,13 +142,13 @@ class SpecialLintErrors extends SpecialPage {
|
|||
$titleNamespace = null;
|
||||
}
|
||||
|
||||
if ( !empty( $namespaces ) && $titleNamespace !== null && !in_array( $titleNamespace, $namespaces ) ) {
|
||||
if ( $namespaces && $titleNamespace !== null && !in_array( $titleNamespace, $namespaces ) ) {
|
||||
// Show the namespace mismatch error if the namespaces specified in drop-down and title text do not match.
|
||||
return [ 'titlefield' => null, 'error' => 'linter-namespace-mismatch' ];
|
||||
}
|
||||
|
||||
// If no namespaces are selected (null), return the namespace from the title text
|
||||
$namespaces = ( empty( $namespaces ) ) ? [ $titleNamespace ] : $namespaces;
|
||||
$namespaces = $namespaces ?: [ $titleNamespace ];
|
||||
|
||||
return [ 'titlefield' => $titleElements->getDBkey(), 'namespace' => $namespaces ];
|
||||
}
|
||||
|
|
14
package-lock.json
generated
14
package-lock.json
generated
|
@ -8,7 +8,7 @@
|
|||
"devDependencies": {
|
||||
"eslint-config-wikimedia": "0.26.0",
|
||||
"grunt": "1.6.1",
|
||||
"grunt-banana-checker": "0.11.0",
|
||||
"grunt-banana-checker": "0.11.1",
|
||||
"grunt-eslint": "24.3.0"
|
||||
}
|
||||
},
|
||||
|
@ -1916,9 +1916,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/grunt-banana-checker": {
|
||||
"version": "0.11.0",
|
||||
"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.11.0.tgz",
|
||||
"integrity": "sha512-qXtcxu7y9GFEIx6ELm5jSf+JqvCafdco+t/YsrUhUDNe9AgCnP7X0R+PxT0qZaDftKVrDrR2gPOYqpaAye5bDw==",
|
||||
"version": "0.11.1",
|
||||
"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.11.1.tgz",
|
||||
"integrity": "sha512-CF0h/TXaX9sbF2yIz+fUfJc4Zvms7XGYQ7ZYMD5+vv0LMZzSFf7JSHXDaBEs72nQWw4r4ap5fOW3baAliW+0bQ==",
|
||||
"dev": true,
|
||||
"bin": {
|
||||
"banana-checker": "src/cli.js"
|
||||
|
@ -5005,9 +5005,9 @@
|
|||
}
|
||||
},
|
||||
"grunt-banana-checker": {
|
||||
"version": "0.11.0",
|
||||
"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.11.0.tgz",
|
||||
"integrity": "sha512-qXtcxu7y9GFEIx6ELm5jSf+JqvCafdco+t/YsrUhUDNe9AgCnP7X0R+PxT0qZaDftKVrDrR2gPOYqpaAye5bDw==",
|
||||
"version": "0.11.1",
|
||||
"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.11.1.tgz",
|
||||
"integrity": "sha512-CF0h/TXaX9sbF2yIz+fUfJc4Zvms7XGYQ7ZYMD5+vv0LMZzSFf7JSHXDaBEs72nQWw4r4ap5fOW3baAliW+0bQ==",
|
||||
"dev": true
|
||||
},
|
||||
"grunt-cli": {
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
"devDependencies": {
|
||||
"eslint-config-wikimedia": "0.26.0",
|
||||
"grunt": "1.6.1",
|
||||
"grunt-banana-checker": "0.11.0",
|
||||
"grunt-banana-checker": "0.11.1",
|
||||
"grunt-eslint": "24.3.0"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue