| Index: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php |
| — | — | @@ -243,7 +243,6 @@ |
| 244 | 244 | 'containerPaths' => array( |
| 245 | 245 | 'local-public' => "$this->uploadDir", |
| 246 | 246 | 'local-thumb' => "$this->uploadDir/thumb", |
| 247 | | - 'local-temp' => "$this->uploadDir/temp", |
| 248 | 247 | ) |
| 249 | 248 | ) ) |
| 250 | 249 | ), |
| Index: trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php |
| — | — | @@ -22,13 +22,13 @@ |
| 23 | 23 | |
| 24 | 24 | $tmpGlobals = array(); |
| 25 | 25 | |
| 26 | | - $tmpGlobals['$wgScript'] = '/index.php'; |
| 27 | | - $tmpGlobals['$wgScriptPath'] = '/'; |
| 28 | | - $tmpGlobals['$wgArticlePath'] = '/wiki/$1'; |
| 29 | | - $tmpGlobals['$wgStyleSheetPath'] = '/skins'; |
| 30 | | - $tmpGlobals['$wgStylePath'] = '/skins'; |
| 31 | | - $tmpGlobals['$wgThumbnailScriptPath'] = false; |
| 32 | | - $tmpGlobals['$wgLocalFileRepo'] = array( |
| | 26 | + $tmpGlobals['wgScript'] = '/index.php'; |
| | 27 | + $tmpGlobals['wgScriptPath'] = '/'; |
| | 28 | + $tmpGlobals['wgArticlePath'] = '/wiki/$1'; |
| | 29 | + $tmpGlobals['wgStyleSheetPath'] = '/skins'; |
| | 30 | + $tmpGlobals['wgStylePath'] = '/skins'; |
| | 31 | + $tmpGlobals['wgThumbnailScriptPath'] = false; |
| | 32 | + $tmpGlobals['wgLocalFileRepo'] = array( |
| 33 | 33 | 'class' => 'LocalRepo', |
| 34 | 34 | 'name' => 'local', |
| 35 | 35 | 'url' => 'http://example.com/images', |
| Index: trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php |
| — | — | @@ -32,6 +32,7 @@ |
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * Construct a new instance from configuration. |
| | 36 | + * |
| 36 | 37 | * $config paramaters include: |
| 37 | 38 | * 'dbServers' : Associative array of DB names to server configuration. |
| 38 | 39 | * Configuration is an associative array that includes: |
| Index: trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | * All locks are non-blocking, which avoids deadlocks. |
| 7 | 7 | * |
| 8 | 8 | * This should work fine for small sites running off one server. |
| 9 | | - * Do not use this with 'lockDir' set to an NFS mount unless the |
| | 9 | + * Do not use this with 'lockDirectory' set to an NFS mount unless the |
| 10 | 10 | * NFS client is at least version 2.6.12. Otherwise, the BSD flock() |
| 11 | 11 | * locks will be ignored; see http://nfs.sourceforge.net/#section_d. |
| 12 | 12 | * |
| — | — | @@ -24,7 +24,16 @@ |
| 25 | 25 | /** @var Array Map of (locked key => lock type => lock file handle) */ |
| 26 | 26 | protected $handles = array(); |
| 27 | 27 | |
| | 28 | + /** |
| | 29 | + * Construct a new instance from configuration. |
| | 30 | + * |
| | 31 | + * $config includes: |
| | 32 | + * 'lockDirectory' : Directory containing the lock files |
| | 33 | + * |
| | 34 | + * @param array $config |
| | 35 | + */ |
| 28 | 36 | function __construct( array $config ) { |
| | 37 | + parent::__construct( $config ); |
| 29 | 38 | $this->lockDir = $config['lockDirectory']; |
| 30 | 39 | } |
| 31 | 40 | |
| Index: trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php |
| — | — | @@ -33,6 +33,7 @@ |
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * Construct a new instance from configuration. |
| | 37 | + * |
| 37 | 38 | * $config paramaters include: |
| 38 | 39 | * 'lockServers' : Associative array of server names to configuration. |
| 39 | 40 | * Configuration is an associative array that includes: |
| Index: trunk/phase3/includes/filerepo/backend/FileBackend.php |
| — | — | @@ -527,6 +527,7 @@ |
| 528 | 528 | /** |
| 529 | 529 | * Create a file in the backend with the given contents. |
| 530 | 530 | * Do not call this function from places outside FileBackend and FileOp. |
| | 531 | + * |
| 531 | 532 | * $params include: |
| 532 | 533 | * content : the raw file contents |
| 533 | 534 | * dst : destination storage path |
| — | — | @@ -549,6 +550,7 @@ |
| 550 | 551 | /** |
| 551 | 552 | * Store a file into the backend from a file on disk. |
| 552 | 553 | * Do not call this function from places outside FileBackend and FileOp. |
| | 554 | + * |
| 553 | 555 | * $params include: |
| 554 | 556 | * src : source path on disk |
| 555 | 557 | * dst : destination storage path |
| — | — | @@ -571,6 +573,7 @@ |
| 572 | 574 | /** |
| 573 | 575 | * Copy a file from one storage path to another in the backend. |
| 574 | 576 | * Do not call this function from places outside FileBackend and FileOp. |
| | 577 | + * |
| 575 | 578 | * $params include: |
| 576 | 579 | * src : source storage path |
| 577 | 580 | * dst : destination storage path |
| — | — | @@ -593,6 +596,7 @@ |
| 594 | 597 | /** |
| 595 | 598 | * Delete a file at the storage path. |
| 596 | 599 | * Do not call this function from places outside FileBackend and FileOp. |
| | 600 | + * |
| 597 | 601 | * $params include: |
| 598 | 602 | * src : source storage path |
| 599 | 603 | * ignoreMissingSource : do nothing if the source file does not exist |
| — | — | @@ -614,6 +618,7 @@ |
| 615 | 619 | /** |
| 616 | 620 | * Move a file from one storage path to another in the backend. |
| 617 | 621 | * Do not call this function from places outside FileBackend and FileOp. |
| | 622 | + * |
| 618 | 623 | * $params include: |
| 619 | 624 | * src : source storage path |
| 620 | 625 | * dst : destination storage path |