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 "mw.Title: Use $wgIllegalFileChars for file title checking"
[lhc/web/wiklou.git]
/
includes
/
widget
/
ComplexNamespaceInputWidget.php
diff --git
a/includes/widget/ComplexNamespaceInputWidget.php
b/includes/widget/ComplexNamespaceInputWidget.php
index
dc95e75
..
d3ada03
100644
(file)
--- a/
includes/widget/ComplexNamespaceInputWidget.php
+++ b/
includes/widget/ComplexNamespaceInputWidget.php
@@
-37,17
+37,17
@@
class ComplexNamespaceInputWidget extends \OOUI\Widget {
* wrapping the "include associated namespace" checkbox
* @param string $config['associatedLabel']['label'] Label text for the label
*/
* wrapping the "include associated namespace" checkbox
* @param string $config['associatedLabel']['label'] Label text for the label
*/
- public function __construct( array $config =
array()
) {
+ public function __construct( array $config =
[]
) {
// Configuration initialization
$config = array_merge(
// Configuration initialization
$config = array_merge(
- array(
+ [
// Config options for nested widgets
// Config options for nested widgets
- 'namespace' =>
array()
,
- 'invert' =>
array()
,
- 'invertLabel' =>
array()
,
- 'associated' =>
array()
,
- 'associatedLabel' =>
array()
,
-
)
,
+ 'namespace' =>
[]
,
+ 'invert' =>
[]
,
+ 'invertLabel' =>
[]
,
+ 'associated' =>
[]
,
+ 'associatedLabel' =>
[]
,
+
]
,
$config
);
$config
);
@@
-60,28
+60,28
@@
class ComplexNamespaceInputWidget extends \OOUI\Widget {
$this->namespace = new NamespaceInputWidget( $config['namespace'] );
if ( $config['associated'] !== null ) {
$this->associated = new \OOUI\CheckboxInputWidget( array_merge(
$this->namespace = new NamespaceInputWidget( $config['namespace'] );
if ( $config['associated'] !== null ) {
$this->associated = new \OOUI\CheckboxInputWidget( array_merge(
-
array( 'value' => '1' )
,
+
[ 'value' => '1' ]
,
$config['associated']
) );
// TODO Should use a LabelWidget? But they don't work like HTML <label>s yet
$this->associatedLabel = new \OOUI\FieldLayout(
$this->associated,
array_merge(
$config['associated']
) );
// TODO Should use a LabelWidget? But they don't work like HTML <label>s yet
$this->associatedLabel = new \OOUI\FieldLayout(
$this->associated,
array_merge(
-
array( 'align' => 'inline' )
,
+
[ 'align' => 'inline' ]
,
$config['associatedLabel']
)
);
}
if ( $config['invert'] !== null ) {
$this->invert = new \OOUI\CheckboxInputWidget( array_merge(
$config['associatedLabel']
)
);
}
if ( $config['invert'] !== null ) {
$this->invert = new \OOUI\CheckboxInputWidget( array_merge(
-
array( 'value' => '1' )
,
+
[ 'value' => '1' ]
,
$config['invert']
) );
// TODO Should use a LabelWidget? But they don't work like HTML <label>s yet
$this->invertLabel = new \OOUI\FieldLayout(
$this->invert,
array_merge(
$config['invert']
) );
// TODO Should use a LabelWidget? But they don't work like HTML <label>s yet
$this->invertLabel = new \OOUI\FieldLayout(
$this->invert,
array_merge(
-
array( 'align' => 'inline' )
,
+
[ 'align' => 'inline' ]
,
$config['invertLabel']
)
);
$config['invertLabel']
)
);
@@
-89,7
+89,7
@@
class ComplexNamespaceInputWidget extends \OOUI\Widget {
// Initialization
$this
// Initialization
$this
- ->addClasses(
array( 'mw-widget-complexNamespaceInputWidget' )
)
+ ->addClasses(
[ 'mw-widget-complexNamespaceInputWidget' ]
)
->appendContent( $this->namespace, $this->associatedLabel, $this->invertLabel );
}
->appendContent( $this->namespace, $this->associatedLabel, $this->invertLabel );
}
@@
-103,13
+103,13
@@
class ComplexNamespaceInputWidget extends \OOUI\Widget {
array_intersect_key(
$this->config,
array_fill_keys(
array_intersect_key(
$this->config,
array_fill_keys(
- array(
+ [
'namespace',
'invert',
'invertLabel',
'associated',
'associatedLabel'
'namespace',
'invert',
'invertLabel',
'associated',
'associatedLabel'
-
)
,
+
]
,
true
)
)
true
)
)