jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402581 )
Change subject: Expand sniff to replace some php aliases with main function
......................................................................
Expand sniff to replace some php aliases with main function
- is_writeable => is_writable
- join => implode
- key_exists => array_key_exists
- pos => current
- sizeof => count
Bug: T183220
Change-Id: I0bc74cd3556f1cae513f1bc28cefae16c39a43a5
---
M MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
M utils/bootstrap-ci.php
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
Thiemo Kreuz (WMDE): Looks good to me, but someone else must approve
diff --git a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
index d607ea8..048a688 100644
--- a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
+++ b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
@@ -32,6 +32,11 @@
*/
private $functions = [
'is_integer' => 'is_int',
+ 'is_writeable' => 'is_writable',
+ 'join' => 'implode',
+ 'key_exists' => 'array_key_exists',
+ 'pos' => 'current',
+ 'sizeof' => 'count',
'extract' => false,
// Deprecated in PHP 7.2
'create_function' => false,
diff --git a/utils/bootstrap-ci.php b/utils/bootstrap-ci.php
index 1ab6920..6c1e4da 100644
--- a/utils/bootstrap-ci.php
+++ b/utils/bootstrap-ci.php
@@ -61,8 +61,8 @@
unset( $_return );
return;
}
- $_prev_composer = json_decode( join( '', $_prev_composer ), true );
- $_cur_composer = json_decode( join( '', $_cur_composer ), true );
+ $_prev_composer = json_decode( implode( '', $_prev_composer ), true );
+ $_cur_composer = json_decode( implode( '', $_cur_composer ), true );
if ( $_prev_composer['require-dev']['mediawiki/mediawiki-codesniffer']
!==
$_cur_composer['require-dev']['mediawiki/mediawiki-codesniffer']
) {
--
To view, visit https://gerrit.wikimedia.org/r/402581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bc74cd3556f1cae513f1bc28cefae16c39a43a5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Thiemo Kreuz (WMDE) <thiemo.kr...@wikimedia.de>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
