[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368094 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: I53168243c173ee2ed1e05eaf2371eba54d67a1d8
---
M TranslateUtils.php
M composer.json
M ffs/AmdFFS.php
M messagegroups/RecentAdditionsMessageGroup.php
M messagegroups/RecentMessageGroup.php
M phpcs.xml
M tag/TranslatablePage.php
M translationaids/SupportAid.php
M ttmserver/ElasticSearchTTMServer.php
M utils/TranslateSandbox.php
10 files changed, 12 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/TranslateUtils.php b/TranslateUtils.php
index 6ea3fb8..c6d26ab 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -148,7 +148,7 @@
* @return string Best-effort localisation of wanted language name.
*/
public static function getLanguageName( $code, $language = 'en' ) {
- $languages = TranslateUtils::getLanguageNames( $language );
+ $languages = self::getLanguageNames( $language );
if ( isset( $languages[$code] ) ) {
return $languages[$code];
diff --git a/composer.json b/composer.json
index 4791fb9..321c775 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0",
+ "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"suggest": {
diff --git a/ffs/AmdFFS.php b/ffs/AmdFFS.php
index 41f739c..c082dac 100644
--- a/ffs/AmdFFS.php
+++ b/ffs/AmdFFS.php
@@ -51,7 +51,7 @@
* @return bool
*/
public static function isValid( $data ) {
- $data = AmdFFS::extractMessagePart( $data );
+ $data = self::extractMessagePart( $data );
return is_array( FormatJson::decode( $data, /*as array*/true )
);
}
@@ -64,8 +64,8 @@
* @return array Parsed data.
*/
public function readFromVariable( $data ) {
- $authors = AmdFFS::extractAuthors( $data );
- $data = AmdFFS::extractMessagePart( $data );
+ $authors = self::extractAuthors( $data );
+ $data = self::extractMessagePart( $data );
$messages = (array)FormatJson::decode( $data, /*as array*/true
);
$metadata = [];
diff --git a/messagegroups/RecentAdditionsMessageGroup.php
b/messagegroups/RecentAdditionsMessageGroup.php
index 0dbee87..f4bbd3b 100644
--- a/messagegroups/RecentAdditionsMessageGroup.php
+++ b/messagegroups/RecentAdditionsMessageGroup.php
@@ -52,7 +52,7 @@
* as they are not displayed in other places.
*
* @param MessageHandle $handle
-* @return boolean
+* @return bool
*/
protected function matchingMessage( MessageHandle $handle ) {
return MessageGroups::isTranslatableMessage( $handle );
diff --git a/messagegroups/RecentMessageGroup.php
b/messagegroups/RecentMessageGroup.php
index a87cb87..09c192d 100644
--- a/messagegroups/RecentMessageGroup.php
+++ b/messagegroups/RecentMessageGroup.php
@@ -79,7 +79,7 @@
* Allows subclasses to filter out more unwanted messages.
*
* @param MessageHandle $msg
-* @return boolean
+* @return bool
*/
protected function matchingMessage( MessageHandle $msg ) {
return true;
diff --git a/phpcs.xml b/phpcs.xml
index a308716..673182e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,12 +15,10 @@
- Translate.alias.php
+ Translate\.alias\.php
.
^extensions
- ^vendor
- ^node_modules
diff --git a/tag/TranslatablePage.php b/tag/TranslatablePage.php
index 4e2c28a..bfbb914 100644
--- a/tag/TranslatablePage.php
+++ b/tag/TranslatablePage.php
@@ -845,7 +845,7 @@
return false;
}
- $page = TranslatablePage::newFromTitle( $newtitle );
+ $page = self::newFromTitle( $newtitle );
if ( $page->getMarkedTag() === false ) {
return false;
diff --git a/translationaids/SupportAid.php b/translationaids/SupportAid.php
index 71f01f9..6d94fea 100644
--- a/translationaids/SupportAid.php
+++ b/translationaids/SupportAid.php
@@ -17,7 +17,7 @@
class SupportAid extends TranslationAid {
public function getData() {
return [
- 'url' => SupportAid::getSupportUrl(
$this->handle->getTitle() ),
+ 'url' => self::getSupportUrl(
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368094 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: I53168243c173ee2ed1e05eaf2371eba54d67a1d8
---
M TranslateUtils.php
M composer.json
M ffs/AmdFFS.php
M messagegroups/RecentAdditionsMessageGroup.php
M messagegroups/RecentMessageGroup.php
M phpcs.xml
M tag/TranslatablePage.php
M translationaids/SupportAid.php
M ttmserver/ElasticSearchTTMServer.php
M utils/TranslateSandbox.php
10 files changed, 12 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/94/368094/1
diff --git a/TranslateUtils.php b/TranslateUtils.php
index 6ea3fb8..c6d26ab 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -148,7 +148,7 @@
* @return string Best-effort localisation of wanted language name.
*/
public static function getLanguageName( $code, $language = 'en' ) {
- $languages = TranslateUtils::getLanguageNames( $language );
+ $languages = self::getLanguageNames( $language );
if ( isset( $languages[$code] ) ) {
return $languages[$code];
diff --git a/composer.json b/composer.json
index 4791fb9..321c775 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0",
+ "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"suggest": {
diff --git a/ffs/AmdFFS.php b/ffs/AmdFFS.php
index 41f739c..c082dac 100644
--- a/ffs/AmdFFS.php
+++ b/ffs/AmdFFS.php
@@ -51,7 +51,7 @@
* @return bool
*/
public static function isValid( $data ) {
- $data = AmdFFS::extractMessagePart( $data );
+ $data = self::extractMessagePart( $data );
return is_array( FormatJson::decode( $data, /*as array*/true )
);
}
@@ -64,8 +64,8 @@
* @return array Parsed data.
*/
public function readFromVariable( $data ) {
- $authors = AmdFFS::extractAuthors( $data );
- $data = AmdFFS::extractMessagePart( $data );
+ $authors = self::extractAuthors( $data );
+ $data = self::extractMessagePart( $data );
$messages = (array)FormatJson::decode( $data, /*as array*/true
);
$metadata = [];
diff --git a/messagegroups/RecentAdditionsMessageGroup.php
b/messagegroups/RecentAdditionsMessageGroup.php
index 0dbee87..f4bbd3b 100644
--- a/messagegroups/RecentAdditionsMessageGroup.php
+++ b/messagegroups/RecentAdditionsMessageGroup.php
@@ -52,7 +52,7 @@
* as they are not displayed in other places.
*
* @param MessageHandle $handle
-* @return boolean
+* @return bool
*/
protected function matchingMessage( MessageHandle $handle ) {
return MessageGroups::isTranslatableMessage( $handle );
diff --git a/messagegroups/RecentMessageGroup.php
b/messagegroups/RecentMessageGroup.php
index a87cb87..09c192d 100644
--- a/messagegroups/RecentMessageGroup.php
+++ b/messagegroups/RecentMessageGroup.php
@@ -79,7 +79,7 @@
* Allows subclasses to filter out more unwanted messages.
*
* @param MessageHandle $msg
-* @return boolean
+* @return bool
*/
protected function matchingMessage( MessageHandle $msg ) {
return true;
diff --git a/phpcs.xml b/phpcs.xml
index a308716..673182e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,12 +15,10 @@
- Translate.alias.php
+ Translate\.alias\.php
.
^extensions
- ^vendor
- ^node_modules
diff --git a/tag/TranslatablePage.php b/tag/TranslatablePage.php
index 4e2c28a..bfbb914 100644
--- a/tag/TranslatablePage.php
+++ b/tag/TranslatablePage.php
@@ -845,7 +845,7 @@
return false;
}
- $page = TranslatablePage::newFromTitle( $newtitle );
+ $page = self::newFromTitle( $newtitle );
if ( $page->getMarkedTag() === false ) {
return false;
diff --git a/translationaids/SupportAid.php b/translationaids/SupportAid.php
index 71f01f9..6d94fea 100644
--- a/translationaids/SupportAid.php
+++ b/translationaids/SupportAid.php
@@ -17,7 +17,7 @@
class SupportAid extends TranslationAid {
public function getData() {
return [
- 'url' => SupportAid::getSupportUrl(
$this->handle->getTitle() ),
+ 'url' =>
