dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "registration: Use the correct key for skin dependencies"
[lhc/web/wiklou.git]
/
includes
/
libs
/
lockmanager
/
ScopedLock.php
diff --git
a/includes/libs/lockmanager/ScopedLock.php
b/includes/libs/lockmanager/ScopedLock.php
index
2ad8ac8
..
d877db0
100644
(file)
--- a/
includes/libs/lockmanager/ScopedLock.php
+++ b/
includes/libs/lockmanager/ScopedLock.php
@@
-70,7
+70,7
@@
class ScopedLock {
public static function factory(
LockManager $manager, array $paths, $type, StatusValue $status, $timeout = 0
) {
public static function factory(
LockManager $manager, array $paths, $type, StatusValue $status, $timeout = 0
) {
- $pathsByType = is_int
eger
( $type ) ? [ $type => $paths ] : $paths;
+ $pathsByType = is_int( $type ) ? [ $type => $paths ] : $paths;
$lockStatus = $manager->lockByType( $pathsByType, $timeout );
$status->merge( $lockStatus );
if ( $lockStatus->isOK() ) {
$lockStatus = $manager->lockByType( $pathsByType, $timeout );
$status->merge( $lockStatus );
if ( $lockStatus->isOK() ) {
@@
-85,7
+85,7
@@
class ScopedLock {
* This is useful for early release of locks before function scope is destroyed.
* This is the same as setting the lock object to null.
*
* This is useful for early release of locks before function scope is destroyed.
* This is the same as setting the lock object to null.
*
- * @param ScopedLock &$lock
+ * @param ScopedLock
|null
&$lock
* @since 1.21
*/
public static function release( ScopedLock &$lock = null ) {
* @since 1.21
*/
public static function release( ScopedLock &$lock = null ) {