jenkins-bot has submitted this change and it was merged.
Change subject: build: Enable phpcs rule
'MediaWiki.Usage.DirUsage.FunctionFound' and make pass
......................................................................
build: Enable phpcs rule 'MediaWiki.Usage.DirUsage.FunctionFound' and make pass
Change-Id: I05c9299944a5a8e215ecb2996f1a3846e257e12c
---
M maintenance/processEchoEmailBatch.php
M maintenance/removeInvalidNotification.php
M maintenance/testDiscussionParser.php
M phpcs.xml
4 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/processEchoEmailBatch.php
b/maintenance/processEchoEmailBatch.php
index 9cb3e9f..ad94331 100644
--- a/maintenance/processEchoEmailBatch.php
+++ b/maintenance/processEchoEmailBatch.php
@@ -2,7 +2,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../../..';
+ $IP = __DIR__ . '/../../..';
}
require_once ( "$IP/maintenance/Maintenance.php" );
diff --git a/maintenance/removeInvalidNotification.php
b/maintenance/removeInvalidNotification.php
index c7dd8ec..c927157 100644
--- a/maintenance/removeInvalidNotification.php
+++ b/maintenance/removeInvalidNotification.php
@@ -6,7 +6,7 @@
*/
require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
- : dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
+ : __DIR__ . '/../../../maintenance/Maintenance.php' );
/**
* Maintenance script that removes invalid notifications
diff --git a/maintenance/testDiscussionParser.php
b/maintenance/testDiscussionParser.php
index 917c6fb..0f84dc7 100644
--- a/maintenance/testDiscussionParser.php
+++ b/maintenance/testDiscussionParser.php
@@ -2,7 +2,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../../..';
+ $IP = __DIR__ . '/../../..';
}
require_once ( "$IP/maintenance/Maintenance.php" );
diff --git a/phpcs.xml b/phpcs.xml
index ee4093a..f2a1c05 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -4,7 +4,6 @@
<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude name="Generic.Files.LineLength"/>
<exclude
name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.wfPrefix"/>
- <exclude name="MediaWiki.Usage.DirUsage.FunctionFound"/>
<exclude
name="MediaWiki.VariableAnalysis.UnusedGlobalVariables"/>
<exclude
name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment"/>
--
To view, visit https://gerrit.wikimedia.org/r/249773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05c9299944a5a8e215ecb2996f1a3846e257e12c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
