From 8ffbb077b3f4f2fa3a4a5230df65e5c5ed8f2d6d Mon Sep 17 00:00:00 2001 From: Hoo man Date: Mon, 27 Aug 2012 23:58:28 +0200 Subject: [PATCH] Use __DIR__ instead of dirname( __FILE__ ) Removed left over uses of dirname( __FILE__ ) to __DIR__, even in comments. Running the PHP version test in maintenance/Maintenance.php earlier, so that we no longer have to stay PHP < 5.3 compatible in there. Change-Id: I5a00bd5c6af44b7f826c4e5576a7b3de7b5026d8 --- extensions/README | 4 ++-- includes/DefaultSettings.php | 2 +- includes/Defines.php | 2 +- includes/installer/DatabaseUpdater.php | 2 +- includes/normal/UtfNormal.php | 2 +- languages/classes/LanguageKk.php | 2 +- maintenance/Maintenance.php | 13 +++++++------ maintenance/language/languages.inc | 2 +- maintenance/parse.php | 2 +- opensearch_desc.php | 2 +- serialized/serialize.php | 2 +- skins/Simple.php | 2 +- .../MediaWikiButtonsAvailabilityTestCase.php | 4 ++-- .../MediaWikiInstallationCommonFunction.php | 4 ++-- .../installer/MediaWikiMySQLDataBaseTestCase.php | 2 +- .../installer/MediaWikiMySQLiteDataBaseTestCase.php | 2 +- .../MediaWikiOnAlreadyInstalledTestCase.php | 2 +- .../MediaWikiRestartInstallationTestCase.php | 2 +- .../MediaWikiRightFrameworkLinksTestCase.php | 2 +- .../MediaWikiUpgradeExistingDatabaseTestCase.php | 4 ++-- .../installer/MediaWikiUserInterfaceTestCase.php | 2 +- 21 files changed, 31 insertions(+), 30 deletions(-) diff --git a/extensions/README b/extensions/README index 22f4710513..e81028628a 100644 --- a/extensions/README +++ b/extensions/README @@ -21,10 +21,10 @@ Please note that under POSIX systems (Linux...), parent of a symbolic path refers to the link source, NOT to the target! You should check the env variable MW_INSTALL_PATH in case the extension is not in the default location. -The following code snippet let you override the default path: +The following code snippet lets you override the default path: $IP = getenv( 'MW_INSTALL_PATH' ); if( $IP === false ) { - $IP = dirname( __FILE__ ) . '/../..'; + $IP = __DIR__ . '/../..'; } require_once( "$IP/maintenance/Maintenance.php" ); // a MediaWiki core file diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c58746b5ec..045eb98607 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -5212,7 +5212,7 @@ $wgExtensionFunctions = array(); * * @par Example: * @code - * $wgExtensionMessagesFiles['ConfirmEdit'] = dirname(__FILE__).'/ConfirmEdit.i18n.php'; + * $wgExtensionMessagesFiles['ConfirmEdit'] = __DIR__.'/ConfirmEdit.i18n.php'; * @endcode */ $wgExtensionMessagesFiles = array(); diff --git a/includes/Defines.php b/includes/Defines.php index 55d9a7a238..be9f981602 100644 --- a/includes/Defines.php +++ b/includes/Defines.php @@ -205,7 +205,7 @@ define( 'LIST_SET_PREPARED', 8); // List of (?, ?, ?) for DatabaseIbm_db2 /** * Unicode and normalisation related */ -require_once dirname(__FILE__).'/normal/UtfNormalDefines.php'; +require_once __DIR__.'/normal/UtfNormalDefines.php'; /**@{ * Hook support constants diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php index d98942744e..ff0a99e9ff 100644 --- a/includes/installer/DatabaseUpdater.php +++ b/includes/installer/DatabaseUpdater.php @@ -21,7 +21,7 @@ * @ingroup Deployment */ -require_once( dirname(__FILE__) . '/../../maintenance/Maintenance.php' ); +require_once( __DIR__ . '/../../maintenance/Maintenance.php' ); /** * Class for handling database updates. Roughly based off of updaters.inc, with diff --git a/includes/normal/UtfNormal.php b/includes/normal/UtfNormal.php index 2b400e5a85..08f85bd342 100644 --- a/includes/normal/UtfNormal.php +++ b/includes/normal/UtfNormal.php @@ -190,7 +190,7 @@ class UtfNormal { */ static function loadData() { if( !isset( self::$utfCombiningClass ) ) { - require_once( dirname(__FILE__) . '/UtfNormalData.inc' ); + require_once( __DIR__ . '/UtfNormalData.inc' ); } } diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php index 5cf1afd0ca..de0f4ff703 100644 --- a/languages/classes/LanguageKk.php +++ b/languages/classes/LanguageKk.php @@ -62,7 +62,7 @@ class KkConverter extends LanguageConverter { } function loadDefaultTables() { - // require( dirname(__FILE__)."/../../includes/KkConversion.php" ); + // require( __DIR__."/../../includes/KkConversion.php" ); // Placeholder for future implementing. Remove variables declarations // after generating KkConversion.php $kk2Cyrl = array(); diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index af549d793b..6da5815504 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -20,22 +20,23 @@ * @defgroup Maintenance Maintenance */ +// Make sure we're on PHP5 or better +if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3.2' ) < 0 ) { + require_once( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' ); + wfPHPVersionError( 'cli' ); +} + /** * @defgroup MaintenanceArchive Maintenance archives * @ingroup Maintenance */ // Define this so scripts can easily find doMaintenance.php -define( 'RUN_MAINTENANCE_IF_MAIN', dirname( __FILE__ ) . '/doMaintenance.php' ); +define( 'RUN_MAINTENANCE_IF_MAIN', __DIR__ . '/doMaintenance.php' ); define( 'DO_MAINTENANCE', RUN_MAINTENANCE_IF_MAIN ); // original name, harmless $maintClass = false; -// Make sure we're on PHP5 or better -if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3.2' ) < 0 ) { - require_once( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' ); - wfPHPVersionError( 'cli' ); -} /** * Abstract maintenance class for quickly writing and churning out diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc index 15fa71249c..b76f921dd6 100644 --- a/maintenance/language/languages.inc +++ b/maintenance/language/languages.inc @@ -46,7 +46,7 @@ class languages { * @param $exif bool Treat the EXIF messages? */ function __construct( $exif = true ) { - require( dirname(__FILE__) . '/messageTypes.inc' ); + require( __DIR__ . '/messageTypes.inc' ); $this->mIgnoredMessages = $wgIgnoredMessages; if ( $exif ) { $this->mOptionalMessages = array_merge( $wgOptionalMessages ); diff --git a/maintenance/parse.php b/maintenance/parse.php index c1a890bdf1..b0ab62443b 100644 --- a/maintenance/parse.php +++ b/maintenance/parse.php @@ -49,7 +49,7 @@ * @license GNU General Public License 2.0 or later */ -require_once( dirname(__FILE__) . '/Maintenance.php' ); +require_once( __DIR__ . '/Maintenance.php' ); /** * Maintenance script to parse some wikitext. diff --git a/opensearch_desc.php b/opensearch_desc.php index 630b05c16a..95f028ac73 100644 --- a/opensearch_desc.php +++ b/opensearch_desc.php @@ -20,7 +20,7 @@ * @file */ -require_once( dirname(__FILE__) . '/includes/WebStart.php' ); +require_once( __DIR__ . '/includes/WebStart.php' ); if( $wgRequest->getVal( 'ctype' ) == 'application/xml' ) { // Makes testing tweaks about a billion times easier diff --git a/serialized/serialize.php b/serialized/serialize.php index d8fb2b3b53..0e0ce80339 100644 --- a/serialized/serialize.php +++ b/serialized/serialize.php @@ -3,7 +3,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { $wgNoDBParam = true; $optionsWithArgs = array( 'o' ); - require_once( dirname(__FILE__).'/../maintenance/commandLine.inc' ); + require_once( __DIR__ .'/../maintenance/commandLine.inc' ); $stderr = fopen( 'php://stderr', 'w' ); if ( !isset( $args[0] ) ) { diff --git a/skins/Simple.php b/skins/Simple.php index d06bdfd4af..9a3ab9468c 100644 --- a/skins/Simple.php +++ b/skins/Simple.php @@ -26,7 +26,7 @@ if( !defined( 'MEDIAWIKI' ) ) die( -1 ); /** */ -require_once( dirname(__FILE__) . '/MonoBook.php' ); +require_once( __DIR__ . '/MonoBook.php' ); /** * Inherit main code from SkinTemplate, set the CSS and template filter. diff --git a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php index bf5b379d5e..8bca4b0db6 100644 --- a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php +++ b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 30 (http://www.mediawiki.org/wiki/New_installer/Test_plan) @@ -99,4 +99,4 @@ class MediaWikiButtonsAvailabilityTestCase extends MediaWikiInstallationCommonFu $this->assertTrue( $this->isElementPresent( "submit-back" )); $this->assertTrue( $this->isElementPresent( "submit-continue" )); } -} \ No newline at end of file +} diff --git a/tests/selenium/installer/MediaWikiInstallationCommonFunction.php b/tests/selenium/installer/MediaWikiInstallationCommonFunction.php index 9e6039138c..353fa2ee63 100644 --- a/tests/selenium/installer/MediaWikiInstallationCommonFunction.php +++ b/tests/selenium/installer/MediaWikiInstallationCommonFunction.php @@ -28,8 +28,8 @@ require_once 'PHPUnit/Extensions/SeleniumTestCase.php'; require_once ( __DIR__ . '/MediaWikiInstallationConfig.php' ); -require_once ( dirname(__FILE__) . '/MediaWikiInstallationMessage.php' ); -require_once ( dirname(__FILE__) . '/MediaWikiInstallationVariables.php'); +require_once ( __DIR__ . '/MediaWikiInstallationMessage.php' ); +require_once ( __DIR__ . '/MediaWikiInstallationVariables.php'); class MediaWikiInstallationCommonFunction extends PHPUnit_Extensions_SeleniumTestCase { diff --git a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php index 399ed4e5d8..16d065c769 100644 --- a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php +++ b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 01 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php index f57c1a559b..4ca6916254 100644 --- a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php +++ b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 06 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php index 4c05266651..7a1b615cb7 100644 --- a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php +++ b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** diff --git a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php index b9ca83057f..ea87de0838 100644 --- a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php +++ b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php @@ -29,7 +29,7 @@ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 11, 12 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php index 700172c299..7b0fcf369d 100644 --- a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php +++ b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 14, 15, 16, 17 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php index eb82071e5c..5cdc8d42c1 100644 --- a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php +++ b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 05 (http://www.mediawiki.org/wiki/New_installer/Test_plan) @@ -114,4 +114,4 @@ class MediaWikiUpgradeExistingDatabaseTestCase extends MediaWikiInstallationComm $this->chooseCancelOnNextConfirmation(); parent::restartInstallation(); } -} \ No newline at end of file +} diff --git a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php index 0994892fda..15fad95fcf 100644 --- a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php +++ b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php @@ -27,7 +27,7 @@ * */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 18 - 27 (http://www.mediawiki.org/wiki/New_installer/Test_plan) -- 2.20.1