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 "Fix $wgSharedDB with sqlite"
[lhc/web/wiklou.git]
/
includes
/
utils
/
MWRestrictions.php
diff --git
a/includes/utils/MWRestrictions.php
b/includes/utils/MWRestrictions.php
index
521e345
..
caf88a1
100644
(file)
--- a/
includes/utils/MWRestrictions.php
+++ b/
includes/utils/MWRestrictions.php
@@
-27,6
+27,7
@@
class MWRestrictions {
/**
* @param array $restrictions
/**
* @param array $restrictions
+ * @throws InvalidArgumentException
*/
protected function __construct( array $restrictions = null ) {
if ( $restrictions !== null ) {
*/
protected function __construct( array $restrictions = null ) {
if ( $restrictions !== null ) {
@@
-44,6
+45,7
@@
class MWRestrictions {
/**
* @param array $restrictions
* @return MWRestrictions
/**
* @param array $restrictions
* @return MWRestrictions
+ * @throws InvalidArgumentException
*/
public static function newFromArray( array $restrictions ) {
return new self( $restrictions );
*/
public static function newFromArray( array $restrictions ) {
return new self( $restrictions );
@@
-52,6
+54,7
@@
class MWRestrictions {
/**
* @param string $json JSON representation of the restrictions
* @return MWRestrictions
/**
* @param string $json JSON representation of the restrictions
* @return MWRestrictions
+ * @throws InvalidArgumentException
*/
public static function newFromJson( $json ) {
$restrictions = FormatJson::decode( $json, true );
*/
public static function newFromJson( $json ) {
$restrictions = FormatJson::decode( $json, true );
@@
-69,13
+72,13
@@
class MWRestrictions {
$invalidKeys = array_diff( $keys, $validKeys );
if ( $invalidKeys ) {
throw new InvalidArgumentException(
$invalidKeys = array_diff( $keys, $validKeys );
if ( $invalidKeys ) {
throw new InvalidArgumentException(
- 'Array contains invalid keys: ' .
join
( ', ', $invalidKeys )
+ 'Array contains invalid keys: ' .
implode
( ', ', $invalidKeys )
);
}
$missingKeys = array_diff( $neededKeys, $keys );
if ( $missingKeys ) {
throw new InvalidArgumentException(
);
}
$missingKeys = array_diff( $neededKeys, $keys );
if ( $missingKeys ) {
throw new InvalidArgumentException(
- 'Array is missing required keys: ' .
join
( ', ', $missingKeys )
+ 'Array is missing required keys: ' .
implode
( ', ', $missingKeys )
);
}
);
}