Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use __DIR__ instead of dirname( __FILE__ )

Browse source 
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
This commit is contained in:
Hoo man 2012-08-27 23:58:28 +02:00
parent db705be9f6
commit 8ffbb077b3
21 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/README
View file

@ -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

2
includes/DefaultSettings.php
View file

@ -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();

2
includes/Defines.php
View file

@ -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

2
includes/installer/DatabaseUpdater.php
View file

@ -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

2
includes/normal/UtfNormal.php
View file

@ -190,7 +190,7 @@ class UtfNormal {
*/
static function loadData() {
if( !isset( self::$utfCombiningClass ) ) {
require_once( dirname(__FILE__) . '/UtfNormalData.inc' );
require_once( __DIR__ . '/UtfNormalData.inc' );
}
}

2
languages/classes/LanguageKk.php
View file

@ -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();

13
maintenance/Maintenance.php
View file

@ -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

2
maintenance/language/languages.inc
View file

@ -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 );

2
maintenance/parse.php
View file

@ -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.

2
opensearch_desc.php
View file

@ -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

2
serialized/serialize.php
View file

@ -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] ) ) {

2
skins/Simple.php
View file

@ -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.

4
tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php
View file

@ -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" ));
}
}
}

4
tests/selenium/installer/MediaWikiInstallationCommonFunction.php
View file

@ -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 {

2
tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php
View file

@ -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)

2
tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php
View file

@ -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)

2
tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php
View file

@ -28,7 +28,7 @@
*/
require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php');
require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
/**

2
tests/selenium/installer/MediaWikiRestartInstallationTestCase.php
View file

@ -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)

2
tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php
View file

@ -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)

4
tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php
View file

@ -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();
}
}
}

2
tests/selenium/installer/MediaWikiUserInterfaceTestCase.php
View file

@ -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)