https://www.mediawiki.org/wiki/Special:Code/MediaWiki/108304
Revision: 108304
Author: aaron
Date: 2012-01-07 03:46:54 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
* Fixed bogus dollar signs left in $tmpGlobals array keys in r108300.
* Various documentation cleanups.
Modified Paths:
--------------
trunk/phase3/includes/filerepo/backend/FileBackend.php
trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php
trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php
trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php
trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php
trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php
Modified: trunk/phase3/includes/filerepo/backend/FileBackend.php
===================================================================
--- trunk/phase3/includes/filerepo/backend/FileBackend.php 2012-01-07
03:17:17 UTC (rev 108303)
+++ trunk/phase3/includes/filerepo/backend/FileBackend.php 2012-01-07
03:46:54 UTC (rev 108304)
@@ -527,6 +527,7 @@
/**
* Create a file in the backend with the given contents.
* Do not call this function from places outside FileBackend and FileOp.
+ *
* $params include:
* content : the raw file contents
* dst : destination storage path
@@ -549,6 +550,7 @@
/**
* Store a file into the backend from a file on disk.
* Do not call this function from places outside FileBackend and FileOp.
+ *
* $params include:
* src : source path on disk
* dst : destination storage path
@@ -571,6 +573,7 @@
/**
* Copy a file from one storage path to another in the backend.
* Do not call this function from places outside FileBackend and FileOp.
+ *
* $params include:
* src : source storage path
* dst : destination storage path
@@ -593,6 +596,7 @@
/**
* Delete a file at the storage path.
* Do not call this function from places outside FileBackend and FileOp.
+ *
* $params include:
* src : source storage path
* ignoreMissingSource : do nothing if the source file does not
exist
@@ -614,6 +618,7 @@
/**
* Move a file from one storage path to another in the backend.
* Do not call this function from places outside FileBackend and FileOp.
+ *
* $params include:
* src : source storage path
* dst : destination storage path
Modified: trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php
===================================================================
--- trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php
2012-01-07 03:17:17 UTC (rev 108303)
+++ trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php
2012-01-07 03:46:54 UTC (rev 108304)
@@ -32,6 +32,7 @@
/**
* Construct a new instance from configuration.
+ *
* $config paramaters include:
* 'dbServers' : Associative array of DB names to server
configuration.
* Configuration is an associative array that
includes:
Modified: trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php
===================================================================
--- trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php
2012-01-07 03:17:17 UTC (rev 108303)
+++ trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php
2012-01-07 03:46:54 UTC (rev 108304)
@@ -5,7 +5,7 @@
* All locks are non-blocking, which avoids deadlocks.
*
* This should work fine for small sites running off one server.
- * Do not use this with 'lockDir' set to an NFS mount unless the
+ * Do not use this with 'lockDirectory' set to an NFS mount unless the
* NFS client is at least version 2.6.12. Otherwise, the BSD flock()
* locks will be ignored; see http://nfs.sourceforge.net/#section_d.
*
@@ -24,7 +24,16 @@
/** @var Array Map of (locked key => lock type => lock file handle) */
protected $handles = array();
+ /**
+ * Construct a new instance from configuration.
+ *
+ * $config includes:
+ * 'lockDirectory' : Directory containing the lock files
+ *
+ * @param array $config
+ */
function __construct( array $config ) {
+ parent::__construct( $config );
$this->lockDir = $config['lockDirectory'];
}
Modified: trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php
===================================================================
--- trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php
2012-01-07 03:17:17 UTC (rev 108303)
+++ trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php
2012-01-07 03:46:54 UTC (rev 108304)
@@ -33,6 +33,7 @@
/**
* Construct a new instance from configuration.
+ *
* $config paramaters include:
* 'lockServers' : Associative array of server names to
configuration.
* Configuration is an associative array that
includes:
Modified: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php
2012-01-07 03:17:17 UTC (rev 108303)
+++ trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php
2012-01-07 03:46:54 UTC (rev 108304)
@@ -243,7 +243,6 @@
'containerPaths' => array(
'local-public' =>
"$this->uploadDir",
'local-thumb' =>
"$this->uploadDir/thumb",
- 'local-temp' =>
"$this->uploadDir/temp",
)
) )
),
Modified: trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php
===================================================================
--- trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php
2012-01-07 03:17:17 UTC (rev 108303)
+++ trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php
2012-01-07 03:46:54 UTC (rev 108304)
@@ -22,13 +22,13 @@
$tmpGlobals = array();
- $tmpGlobals['$wgScript'] = '/index.php';
- $tmpGlobals['$wgScriptPath'] = '/';
- $tmpGlobals['$wgArticlePath'] = '/wiki/$1';
- $tmpGlobals['$wgStyleSheetPath'] = '/skins';
- $tmpGlobals['$wgStylePath'] = '/skins';
- $tmpGlobals['$wgThumbnailScriptPath'] = false;
- $tmpGlobals['$wgLocalFileRepo'] = array(
+ $tmpGlobals['wgScript'] = '/index.php';
+ $tmpGlobals['wgScriptPath'] = '/';
+ $tmpGlobals['wgArticlePath'] = '/wiki/$1';
+ $tmpGlobals['wgStyleSheetPath'] = '/skins';
+ $tmpGlobals['wgStylePath'] = '/skins';
+ $tmpGlobals['wgThumbnailScriptPath'] = false;
+ $tmpGlobals['wgLocalFileRepo'] = array(
'class' => 'LocalRepo',
'name' => 'local',
'url' => 'http://example.com/images',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
