[MediaWiki-commits] [Gerrit] mediawiki...VectorV2[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/361113 ) Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0 .. build: Updating mediawiki/mediawiki-codesniffer to 0.9.0 Change-Id: Ie6489c84c576fe4f0162f5c39e0100dc9c83f90f --- M .gitignore M VectorV2Template.php M composer.json M phpcs.xml 4 files changed, 26 insertions(+), 19 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 53bbca6..087740f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ sftp-config.json # Building & testing -node_modules/ +/node_modules # Composer /vendor diff --git a/VectorV2Template.php b/VectorV2Template.php index 9b203aa..5aeec5f 100644 --- a/VectorV2Template.php +++ b/VectorV2Template.php @@ -114,7 +114,7 @@ if ( $this->data['title'] != '' ) { ?> html( 'title' ) + $this->html( 'title' ) ?> @@ -322,7 +322,8 @@ renderAfterPortlet( $name ); @@ -520,17 +521,18 @@ makeSearchInput( [ 'id' => 'searchInput' ] ); echo Html::hidden( 'title', $this->get( 'searchtitle' ) ); - // We construct two buttons (for 'go' and 'fulltext' search modes), - // but only one will be visible and actionable at a time (they are - // overlaid on top of each other in CSS). - // * Browsers will use the 'fulltext' one by default (as it's the - // first in tree-order), which is desirable when they are unable - // to show search suggestions (either due to being broken or - // having JavaScript turned off). - // * The mediawiki.searchSuggest module, after doing tests for the - // broken browsers, removes the 'fulltext' button and handles - // 'fulltext' search itself; this will reveal the 'go' button and - // cause it to be used. + /* We construct two buttons (for 'go' and 'fulltext' search modes), +* but only one will be visible and actionable at a time (they are +* overlaid on top of each other in CSS). +* * Browsers will use the 'fulltext' one by default (as it's the +* first in tree-order), which is desirable when they are unable +* to show search suggestions (either due to being broken or +* having JavaScript turned off). +* * The mediawiki.searchSuggest module, after doing tests for the +* broken browsers, removes the 'fulltext' button and handles +* 'fulltext' search itself; this will reveal the 'go' button and +* cause it to be used. +*/ echo $this->makeSearchButton( 'fulltext', [ 'id' => 'mw-searchButton', 'class' => 'searchButton mw-fallbackSearchButton' ] diff --git a/composer.json b/composer.json index fe15d13..7e889a4 100644 --- a/composer.json +++ b/composer.json @@ -34,14 +34,14 @@ "installer-name": "VectorV2" }, "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9.*", - "mediawiki/mediawiki-codesniffer": "0.7.2", + "jakub-onderka/php-parallel-lint": "0.9.2", + "mediawiki/mediawiki-codesniffer": "0.9.0", "jakub-onderka/php-console-highlighter": "0.3.2" }, "scripts": { "fix": "phpcbf",
[MediaWiki-commits] [Gerrit] mediawiki...VectorV2[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/361113 ) Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0 .. build: Updating mediawiki/mediawiki-codesniffer to 0.9.0 Change-Id: Ie6489c84c576fe4f0162f5c39e0100dc9c83f90f --- M .gitignore M VectorV2Template.php M composer.json M phpcs.xml 4 files changed, 26 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/VectorV2 refs/changes/13/361113/1 diff --git a/.gitignore b/.gitignore index 53bbca6..087740f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ sftp-config.json # Building & testing -node_modules/ +/node_modules # Composer /vendor diff --git a/VectorV2Template.php b/VectorV2Template.php index 9b203aa..5aeec5f 100644 --- a/VectorV2Template.php +++ b/VectorV2Template.php @@ -114,7 +114,7 @@ if ( $this->data['title'] != '' ) { ?> html( 'title' ) + $this->html( 'title' ) ?> @@ -322,7 +322,8 @@ renderAfterPortlet( $name ); @@ -520,17 +521,18 @@ makeSearchInput( [ 'id' => 'searchInput' ] ); echo Html::hidden( 'title', $this->get( 'searchtitle' ) ); - // We construct two buttons (for 'go' and 'fulltext' search modes), - // but only one will be visible and actionable at a time (they are - // overlaid on top of each other in CSS). - // * Browsers will use the 'fulltext' one by default (as it's the - // first in tree-order), which is desirable when they are unable - // to show search suggestions (either due to being broken or - // having JavaScript turned off). - // * The mediawiki.searchSuggest module, after doing tests for the - // broken browsers, removes the 'fulltext' button and handles - // 'fulltext' search itself; this will reveal the 'go' button and - // cause it to be used. + /* We construct two buttons (for 'go' and 'fulltext' search modes), +* but only one will be visible and actionable at a time (they are +* overlaid on top of each other in CSS). +* * Browsers will use the 'fulltext' one by default (as it's the +* first in tree-order), which is desirable when they are unable +* to show search suggestions (either due to being broken or +* having JavaScript turned off). +* * The mediawiki.searchSuggest module, after doing tests for the +* broken browsers, removes the 'fulltext' button and handles +* 'fulltext' search itself; this will reveal the 'go' button and +* cause it to be used. +*/ echo $this->makeSearchButton( 'fulltext', [ 'id' => 'mw-searchButton', 'class' => 'searchButton mw-fallbackSearchButton' ] diff --git a/composer.json b/composer.json index fe15d13..7e889a4 100644 --- a/composer.json +++ b/composer.json @@ -34,14 +34,14 @@ "installer-name": "VectorV2" }, "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9.*", - "mediawiki/mediawiki-codesniffer": "0.7.2", + "jakub-onderka/php-parallel-lint": "0.9.2", + "mediawiki/mediawiki-codesniffer": "0.9.0", "jakub-onderka/php-console-highlighter": "0.3.2" }, "scripts": {