jenkins-bot has submitted this change and it was merged.
Change subject: Add @codingStandardsIgnoreStart to 5 files under
tests/phpunit/includes
......................................................................
Add @codingStandardsIgnoreStart to 5 files under tests/phpunit/includes
To pass phpcs.
Bug: T102614
Change-Id: I4c7d60d26112c7ba67b66f1923ce945e96175d15
---
M tests/phpunit/includes/OutputPageTest.php
M tests/phpunit/includes/content/CssContentTest.php
M tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
M tests/phpunit/includes/content/JavaScriptContentTest.php
M tests/phpunit/includes/utils/MWCryptHashTest.php
5 files changed, 16 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/OutputPageTest.php
b/tests/phpunit/includes/OutputPageTest.php
index fbb3982..51a19c6 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -137,6 +137,7 @@
}
public static function provideMakeResourceLoaderLink() {
+ // @codingStandardsIgnoreStart Generic.Files.LineLength
return array(
// Load module script only
array(
@@ -193,6 +194,7 @@
. "\n} );</script>"
),
);
+ // @codingStandardsIgnoreEnd
}
/**
diff --git a/tests/phpunit/includes/content/CssContentTest.php
b/tests/phpunit/includes/content/CssContentTest.php
index 59bfb03..24b0c68 100644
--- a/tests/phpunit/includes/content/CssContentTest.php
+++ b/tests/phpunit/includes/content/CssContentTest.php
@@ -100,6 +100,7 @@
* Keep this in sync with
CssContentHandlerTest::provideMakeRedirectContent()
*/
public static function provideGetRedirectTarget() {
+ // @codingStandardsIgnoreStart Generic.Files.LineLength
return array(
array( 'MediaWiki:MonoBook.css', "/* #REDIRECT
*/@import
url(//example.org/w/index.php?title=MediaWiki:MonoBook.css&action=raw&ctype=text/css);"
),
array( 'User:FooBar/common.css', "/* #REDIRECT
*/@import
url(//example.org/w/index.php?title=User:FooBar/common.css&action=raw&ctype=text/css);"
),
@@ -109,6 +110,7 @@
# Wrong domain
array( null, "/* #REDIRECT */@import
url(//example.com/w/index.php?title=Gadget:FooBaz.css&action=raw&ctype=text/css);"
),
);
+ // @codingStandardsIgnoreEnd
}
public static function dataEquals() {
diff --git a/tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
b/tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
index 0f41020..69fc9af 100644
--- a/tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
+++ b/tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
@@ -21,10 +21,12 @@
* Keep this in sync with
JavaScriptContentTest::provideGetRedirectTarget()
*/
public static function provideMakeRedirectContent() {
+ // @codingStandardsIgnoreStart Generic.Files.LineLength
return array(
array( 'MediaWiki:MonoBook.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js\u0026action=raw\u0026ctype=text/javascript");'
),
array( 'User:FooBar/common.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=User:FooBar/common.js\u0026action=raw\u0026ctype=text/javascript");'
),
array( 'Gadget:FooBaz.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=Gadget:FooBaz.js\u0026action=raw\u0026ctype=text/javascript");'
),
);
+ // @codingStandardsIgnoreEnd
}
}
diff --git a/tests/phpunit/includes/content/JavaScriptContentTest.php
b/tests/phpunit/includes/content/JavaScriptContentTest.php
index fec1c73..b97842c 100644
--- a/tests/phpunit/includes/content/JavaScriptContentTest.php
+++ b/tests/phpunit/includes/content/JavaScriptContentTest.php
@@ -116,10 +116,12 @@
public static function dataPreloadTransform() {
return array(
- array( 'hello this is ~~~',
+ array(
+ 'hello this is ~~~',
'hello this is ~~~',
),
- array( 'hello \'\'this\'\' is
<noinclude>foo</noinclude><includeonly>bar</includeonly>',
+ array(
+ 'hello \'\'this\'\' is
<noinclude>foo</noinclude><includeonly>bar</includeonly>',
'hello \'\'this\'\' is
<noinclude>foo</noinclude><includeonly>bar</includeonly>',
),
);
@@ -326,6 +328,7 @@
* Keep this in sync with
JavaScriptContentHandlerTest::provideMakeRedirectContent()
*/
public static function provideGetRedirectTarget() {
+ // @codingStandardsIgnoreStart Generic.Files.LineLength
return array(
array( 'MediaWiki:MonoBook.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js\u0026action=raw\u0026ctype=text/javascript");'
),
array( 'User:FooBar/common.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=User:FooBar/common.js\u0026action=raw\u0026ctype=text/javascript");'
),
@@ -335,5 +338,6 @@
// Different domain
array( null, '/* #REDIRECT
*/mw.loader.load("//example.com/w/index.php?title=MediaWiki:OtherWiki.js\u0026action=raw\u0026ctype=text/javascript");'
),
);
+ // @codingStandardsIgnoreEnd
}
}
diff --git a/tests/phpunit/includes/utils/MWCryptHashTest.php
b/tests/phpunit/includes/utils/MWCryptHashTest.php
index 406f421..ad54e2f 100644
--- a/tests/phpunit/includes/utils/MWCryptHashTest.php
+++ b/tests/phpunit/includes/utils/MWCryptHashTest.php
@@ -21,7 +21,9 @@
}
$data = 'foobar';
+ // @codingStandardsIgnoreStart Generic.Files.LineLength
$hash =
'9923afaec3a86f865bb231a588f453f84e8151a2deb4109aebc6de4284be5bebcff4fab82a7e51d920237340a043736e9d13bab196006dcca0fe65314d68eab9';
+ // @codingStandardsIgnoreEnd
$this->assertEquals(
pack( 'H*', $hash ),
@@ -42,7 +44,9 @@
$data = 'foobar';
$key = 'secret';
+ // @codingStandardsIgnoreStart Generic.Files.LineLength
$hash =
'ddc94177b2020e55ce2049199fd9cc6327f416ff6dc621cc34cb43d9bec61d73372b4790c0e24957f565ecaf2d42821e6303619093e99cbe14a3b9250bda5f81';
+ // @codingStandardsIgnoreEnd
$this->assertEquals(
pack( 'H*', $hash ),
--
To view, visit https://gerrit.wikimedia.org/r/243016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c7d60d26112c7ba67b66f1923ce945e96175d15
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
