Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357430 )
Change subject: Use __DIR__ instead of dirname(__FILE__)
......................................................................
Use __DIR__ instead of dirname(__FILE__)
Change-Id: Icd03a4f7ece2527fd27d6207c7e3b856e1660d5e
---
M SecurePoll.i18n.php
M auth-api.php
M cli/cli.inc
M cli/convertVotes.php
M cli/delete.php
M cli/dump.php
M cli/dumpComments.php
M cli/dumpVoteCsv.php
M cli/import.php
M cli/purgePrivateVoteData.php
M cli/tally.php
M cli/testDebian.php
M cli/voterList.php
M cli/wm-scripts/bv2013/buildSpamTranslations.php
M cli/wm-scripts/bv2013/doSpam.php
M cli/wm-scripts/bv2013/dumpMetaTranslations.php
M cli/wm-scripts/bv2013/populateEditCount.php
M cli/wm-scripts/bv2013/sendMails.php
M cli/wm-scripts/bv2013/voterList.php
M cli/wm-scripts/bv2015/populateEditCount-fixup.php
M cli/wm-scripts/bv2015/populateEditCount.php
M cli/wm-scripts/bv2015/voterList.php
M cli/wm-scripts/bv2017/populateEditCount.php
M cli/wm-scripts/bv2017/voterList.php
M cli/wm-scripts/dumpGlobalVoterList.php
25 files changed, 30 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/30/357430/1
diff --git a/SecurePoll.i18n.php b/SecurePoll.i18n.php
index b921ffe..e2af401 100644
--- a/SecurePoll.i18n.php
+++ b/SecurePoll.i18n.php
@@ -15,7 +15,7 @@
function wfJsonI18nShim310d2110c88636f7( $cache, $code, &$cachedData ) {
$codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
+ $fileName = __DIR__ . "/i18n/$csCode.json";
if ( is_readable( $fileName ) ) {
$data = FormatJson::decode( file_get_contents(
$fileName ), true );
foreach ( array_keys( $data ) as $key ) {
diff --git a/auth-api.php b/auth-api.php
index 8887793..ef06d1e 100644
--- a/auth-api.php
+++ b/auth-api.php
@@ -2,7 +2,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( strval( $IP ) === '' ) {
- $IP = dirname( __FILE__ ).'/../..';
+ $IP = __DIR__.'/../..';
}
if ( !file_exists( "$IP/includes/WebStart.php" ) ) {
$IP .= '/core';
diff --git a/cli/cli.inc b/cli/cli.inc
index 759b70a..0ac96ee 100644
--- a/cli/cli.inc
+++ b/cli/cli.inc
@@ -2,7 +2,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( strval( $IP ) === '' ) {
- $IP = dirname( __FILE__ ).'/../../..';
+ $IP = __DIR__.'/../../..';
}
if ( !file_exists( "$IP/includes/WebStart.php" ) ) {
$IP .= '/core';
diff --git a/cli/convertVotes.php b/cli/convertVotes.php
index bfcf7e6..764f281 100644
--- a/cli/convertVotes.php
+++ b/cli/convertVotes.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ).'/cli.inc' );
+require( __DIR__.'/cli.inc' );
$usage = <<<EOT
Usage:
@@ -20,7 +20,7 @@
if ( isset( $options['name'] ) ) {
spFatal( "Cannot load from database when SecurePoll is not
installed" );
}
- require( dirname( __FILE__ ) . '/../SecurePoll.php' );
+ require( __DIR__ . '/../SecurePoll.php' );
}
$conv = new SecurePoll_ConvertVotes;
diff --git a/cli/delete.php b/cli/delete.php
index d1783fc..d0d26d2 100644
--- a/cli/delete.php
+++ b/cli/delete.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/cli.inc' );
+require( __DIR__ . '/cli.inc' );
$usage = <<<EOT
Delete a poll from the local SecurePoll database.
diff --git a/cli/dump.php b/cli/dump.php
index 806c4bd..6f1df13 100644
--- a/cli/dump.php
+++ b/cli/dump.php
@@ -6,7 +6,7 @@
$optionsWithArgs = array( 'o' );
-require( dirname(__FILE__).'/cli.inc' );
+require( __DIR__.'/cli.inc' );
$usage = <<<EOT
Usage: php dump.php [options...] <election name>
diff --git a/cli/dumpComments.php b/cli/dumpComments.php
index cfcb483..71d5270 100644
--- a/cli/dumpComments.php
+++ b/cli/dumpComments.php
@@ -11,7 +11,7 @@
*/
$optionsWithArgs = array( 'name' );
-require( dirname(__FILE__).'/cli.inc' );
+require( __DIR__.'/cli.inc' );
$wgTitle = Title::newFromText( 'Special:SecurePoll' );
@@ -29,7 +29,7 @@
if ( isset( $options['name'] ) ) {
spFatal( "Cannot load from database when SecurePoll is not
installed" );
}
- require( dirname( __FILE__ ) . '/../SecurePoll.php' );
+ require( __DIR__ . '/../SecurePoll.php' );
}
$context = new SecurePoll_Context;
diff --git a/cli/dumpVoteCsv.php b/cli/dumpVoteCsv.php
index de18c19..14d7fe2 100644
--- a/cli/dumpVoteCsv.php
+++ b/cli/dumpVoteCsv.php
@@ -11,7 +11,7 @@
*/
$optionsWithArgs = array( 'name' );
-require( dirname(__FILE__).'/cli.inc' );
+require( __DIR__.'/cli.inc' );
$wgTitle = Title::newFromText( 'Special:SecurePoll' );
@@ -29,7 +29,7 @@
if ( isset( $options['name'] ) ) {
spFatal( "Cannot load from database when SecurePoll is not
installed" );
}
- require( dirname( __FILE__ ) . '/../SecurePoll.php' );
+ require( __DIR__ . '/../SecurePoll.php' );
}
$context = new SecurePoll_Context;
diff --git a/cli/import.php b/cli/import.php
index e5936f0..92ba7ec 100644
--- a/cli/import.php
+++ b/cli/import.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/cli.inc' );
+require( __DIR__ . '/cli.inc' );
$usage = <<<EOT
Import configuration files into the local SecurePoll database. Files can be
diff --git a/cli/purgePrivateVoteData.php b/cli/purgePrivateVoteData.php
index 6e471f3..9b85782 100644
--- a/cli/purgePrivateVoteData.php
+++ b/cli/purgePrivateVoteData.php
@@ -28,7 +28,7 @@
if ( getenv( 'MW_INSTALL_PATH' ) ) {
$IP = getenv( 'MW_INSTALL_PATH' );
} else {
- $IP = dirname( __FILE__ ) . '/../../..';
+ $IP = __DIR__ . '/../../..';
}
require_once( "$IP/maintenance/Maintenance.php" );
diff --git a/cli/tally.php b/cli/tally.php
index 1f00ade..f44c475 100644
--- a/cli/tally.php
+++ b/cli/tally.php
@@ -8,7 +8,7 @@
*/
$optionsWithArgs = array( 'name' );
-require( dirname(__FILE__).'/cli.inc' );
+require( __DIR__.'/cli.inc' );
$wgTitle = Title::newFromText( 'Special:SecurePoll' );
@@ -26,7 +26,7 @@
if ( isset( $options['name'] ) ) {
spFatal( "Cannot load from database when SecurePoll is not
installed" );
}
- require( dirname( __FILE__ ) . '/../SecurePoll.php' );
+ require( __DIR__ . '/../SecurePoll.php' );
}
$context = new SecurePoll_Context;
diff --git a/cli/testDebian.php b/cli/testDebian.php
index 5c5551a..434677c 100644
--- a/cli/testDebian.php
+++ b/cli/testDebian.php
@@ -1,7 +1,7 @@
<?php
-require( dirname(__FILE__).'/cli.inc' );
-$testDir = dirname(__FILE__).'/debtest';
+require( __DIR__.'/cli.inc' );
+$testDir = __DIR__.'/debtest';
if ( !is_dir( $testDir ) ) {
mkdir( $testDir );
}
diff --git a/cli/voterList.php b/cli/voterList.php
index eec2d29..761ca30 100644
--- a/cli/voterList.php
+++ b/cli/voterList.php
@@ -1,7 +1,7 @@
<?php
$IP = getenv( 'MW_INSTALL_PATH' );
if ( strval( $IP ) === '' ) {
- $IP = dirname( __FILE__ ).'/../..';
+ $IP = __DIR__.'/../..';
}
if ( !file_exists( "$IP/includes/WebStart.php" ) ) {
$IP .= '/core';
diff --git a/cli/wm-scripts/bv2013/buildSpamTranslations.php
b/cli/wm-scripts/bv2013/buildSpamTranslations.php
index 7056de0..f747c80 100644
--- a/cli/wm-scripts/bv2013/buildSpamTranslations.php
+++ b/cli/wm-scripts/bv2013/buildSpamTranslations.php
@@ -2,7 +2,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../../../../..';
+ $IP = __DIR__ . '/../../../../..';
}
require_once( "$IP/maintenance/commandLine.inc" );
diff --git a/cli/wm-scripts/bv2013/doSpam.php b/cli/wm-scripts/bv2013/doSpam.php
index b7e35cd..578814c 100644
--- a/cli/wm-scripts/bv2013/doSpam.php
+++ b/cli/wm-scripts/bv2013/doSpam.php
@@ -2,7 +2,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../../../../..';
+ $IP = __DIR__ . '/../../../../..';
}
require_once( "$IP/maintenance/commandLine.inc" );
diff --git a/cli/wm-scripts/bv2013/dumpMetaTranslations.php
b/cli/wm-scripts/bv2013/dumpMetaTranslations.php
index f9fada8..a2a3e0b 100644
--- a/cli/wm-scripts/bv2013/dumpMetaTranslations.php
+++ b/cli/wm-scripts/bv2013/dumpMetaTranslations.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/../../cli.inc' );
+require( __DIR__ . '/../../cli.inc' );
$spConf = array(
'numCandidates' => 18,
diff --git a/cli/wm-scripts/bv2013/populateEditCount.php
b/cli/wm-scripts/bv2013/populateEditCount.php
index e96f6be..8253d43 100644
--- a/cli/wm-scripts/bv2013/populateEditCount.php
+++ b/cli/wm-scripts/bv2013/populateEditCount.php
@@ -6,7 +6,7 @@
* have made at least 20 edits between 15 December 2012 and 30 April 2013.
*/
-require( dirname(__FILE__) . '/../../cli.inc' );
+require( __DIR__ . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
diff --git a/cli/wm-scripts/bv2013/sendMails.php
b/cli/wm-scripts/bv2013/sendMails.php
index 141a273..8885bb7 100644
--- a/cli/wm-scripts/bv2013/sendMails.php
+++ b/cli/wm-scripts/bv2013/sendMails.php
@@ -2,7 +2,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../../../../..';
+ $IP = __DIR__ . '/../../../../..';
}
require_once( "$IP/maintenance/commandLine.inc" );
diff --git a/cli/wm-scripts/bv2013/voterList.php
b/cli/wm-scripts/bv2013/voterList.php
index b37595e..c0ea526 100644
--- a/cli/wm-scripts/bv2013/voterList.php
+++ b/cli/wm-scripts/bv2013/voterList.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/../../cli.inc' );
+require( __DIR__ . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
$fname = 'voterList.php';
diff --git a/cli/wm-scripts/bv2015/populateEditCount-fixup.php
b/cli/wm-scripts/bv2015/populateEditCount-fixup.php
index fc25ddf..24c2eae 100644
--- a/cli/wm-scripts/bv2015/populateEditCount-fixup.php
+++ b/cli/wm-scripts/bv2015/populateEditCount-fixup.php
@@ -3,7 +3,7 @@
/** Fix for populateEditCount.php which used a cutoff date of
* 20150401500000 instead of 20150415000000 for bv_long_edits
*/
-require( dirname(__FILE__) . '/../../cli.inc' );
+require( __DIR__ . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
diff --git a/cli/wm-scripts/bv2015/populateEditCount.php
b/cli/wm-scripts/bv2015/populateEditCount.php
index 72bbaf7..d90bee5 100644
--- a/cli/wm-scripts/bv2015/populateEditCount.php
+++ b/cli/wm-scripts/bv2015/populateEditCount.php
@@ -6,7 +6,7 @@
* have made at least 20 edits between 15 October 2014 and 15 April 2015.
*/
-require( dirname(__FILE__) . '/../../cli.inc' );
+require( __DIR__ . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
diff --git a/cli/wm-scripts/bv2015/voterList.php
b/cli/wm-scripts/bv2015/voterList.php
index 724625e..3f90968 100644
--- a/cli/wm-scripts/bv2015/voterList.php
+++ b/cli/wm-scripts/bv2015/voterList.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/../../cli.inc' );
+require( __DIR__ . '/../../cli.inc' );
$dbcr = CentralAuthUser::getCentralSlaveDB();
$dbcw = CentralAuthUser::getCentralDB();
diff --git a/cli/wm-scripts/bv2017/populateEditCount.php
b/cli/wm-scripts/bv2017/populateEditCount.php
index 28341d9..a36b6f8 100644
--- a/cli/wm-scripts/bv2017/populateEditCount.php
+++ b/cli/wm-scripts/bv2017/populateEditCount.php
@@ -6,7 +6,7 @@
* have made at least 20 edits between 01 October 2016 and 01 April 2017.
*/
-require( dirname(__FILE__) . '/../../cli.inc' );
+require( __DIR__ . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
diff --git a/cli/wm-scripts/bv2017/voterList.php
b/cli/wm-scripts/bv2017/voterList.php
index 8cf9aa7..7abffac 100644
--- a/cli/wm-scripts/bv2017/voterList.php
+++ b/cli/wm-scripts/bv2017/voterList.php
@@ -1,6 +1,6 @@
<?php
-require( dirname( __FILE__ ) . '/../../cli.inc' );
+require( __DIR__ . '/../../cli.inc' );
$dbcr = CentralAuthUser::getCentralSlaveDB();
$dbcw = CentralAuthUser::getCentralDB();
diff --git a/cli/wm-scripts/dumpGlobalVoterList.php
b/cli/wm-scripts/dumpGlobalVoterList.php
index 0ef6433..8606911 100644
--- a/cli/wm-scripts/dumpGlobalVoterList.php
+++ b/cli/wm-scripts/dumpGlobalVoterList.php
@@ -1,6 +1,6 @@
<?php
-require( dirname(__FILE__).'/../cli.inc' );
+require( __DIR__.'/../cli.inc' );
$voters = array();
$batchSize = 1000;
--
To view, visit https://gerrit.wikimedia.org/r/357430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd03a4f7ece2527fd27d6207c7e3b856e1660d5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
