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
Make SessionBackend::save() update the user post-send
[lhc/web/wiklou.git]
/
includes
/
Html.php
diff --git
a/includes/Html.php
b/includes/Html.php
index
8c01448
..
48b30c7
100644
(file)
--- a/
includes/Html.php
+++ b/
includes/Html.php
@@
-46,13
+46,12
@@
* @since 1.16
*/
class Html {
* @since 1.16
*/
class Html {
- // List of void elements from HTML5, section 8.1.2 as of 201
1-08-12
+ // List of void elements from HTML5, section 8.1.2 as of 201
6-09-19
private static $voidElements = [
'area',
'base',
'br',
'col',
private static $voidElements = [
'area',
'base',
'br',
'col',
- 'command',
'embed',
'hr',
'img',
'embed',
'hr',
'img',
@@
-156,8
+155,8
@@
class Html {
*
* @param string $contents The raw HTML contents of the element: *not*
* escaped!
*
* @param string $contents The raw HTML contents of the element: *not*
* escaped!
- * @param array $attrs Associative array of attributes, e.g.,
array(
- * 'href' => 'http://www.mediawiki.org/'
)
. See expandAttributes() for
+ * @param array $attrs Associative array of attributes, e.g.,
[
+ * 'href' => 'http://www.mediawiki.org/'
]
. See expandAttributes() for
* further documentation.
* @param string[] $modifiers classes to add to the button
* @see http://tools.wmflabs.org/styleguide/desktop/index.html for guidance on available modifiers
* further documentation.
* @param string[] $modifiers classes to add to the button
* @see http://tools.wmflabs.org/styleguide/desktop/index.html for guidance on available modifiers
@@
-176,8
+175,8
@@
class Html {
*
* @param string $contents The raw HTML contents of the element: *not*
* escaped!
*
* @param string $contents The raw HTML contents of the element: *not*
* escaped!
- * @param array $attrs Associative array of attributes, e.g.,
array(
- * 'href' => 'http://www.mediawiki.org/'
)
. See expandAttributes() for
+ * @param array $attrs Associative array of attributes, e.g.,
[
+ * 'href' => 'http://www.mediawiki.org/'
]
. See expandAttributes() for
* further documentation.
* @param string[] $modifiers classes to add to the button
* @see http://tools.wmflabs.org/styleguide/desktop/index.html for guidance on available modifiers
* further documentation.
* @param string[] $modifiers classes to add to the button
* @see http://tools.wmflabs.org/styleguide/desktop/index.html for guidance on available modifiers
@@
-200,8
+199,8
@@
class Html {
* content model.
*
* @param string $element The element's name, e.g., 'a'
* content model.
*
* @param string $element The element's name, e.g., 'a'
- * @param array $attribs Associative array of attributes, e.g.,
array(
- * 'href' => 'http://www.mediawiki.org/'
)
. See expandAttributes() for
+ * @param array $attribs Associative array of attributes, e.g.,
[
+ * 'href' => 'http://www.mediawiki.org/'
]
. See expandAttributes() for
* further documentation.
* @param string $contents The raw HTML contents of the element: *not*
* escaped!
* further documentation.
* @param string $contents The raw HTML contents of the element: *not*
* escaped!
@@
-321,8
+320,8
@@
class Html {
* to the input array (currently per the HTML 5 draft as of 2009-09-06).
*
* @param string $element Name of the element, e.g., 'a'
* to the input array (currently per the HTML 5 draft as of 2009-09-06).
*
* @param string $element Name of the element, e.g., 'a'
- * @param array $attribs Associative array of attributes, e.g.,
array(
- * 'href' => 'http://www.mediawiki.org/'
)
. See expandAttributes() for
+ * @param array $attribs Associative array of attributes, e.g.,
[
+ * 'href' => 'http://www.mediawiki.org/'
]
. See expandAttributes() for
* further documentation.
* @return array An array of attributes functionally identical to $attribs
*/
* further documentation.
* @return array An array of attributes functionally identical to $attribs
*/
@@
-339,7
+338,6
@@
class Html {
'height' => '150',
'width' => '300',
],
'height' => '150',
'width' => '300',
],
- 'command' => [ 'type' => 'command' ],
'form' => [
'action' => 'GET',
'autocomplete' => 'on',
'form' => [
'action' => 'GET',
'autocomplete' => 'on',
@@
-432,8
+430,8
@@
class Html {
/**
* Given an associative array of element attributes, generate a string
/**
* Given an associative array of element attributes, generate a string
- * to stick after the element name in HTML output. Like
array(
'href' =>
- * 'http://www.mediawiki.org/'
)
becomes something like
+ * to stick after the element name in HTML output. Like
[
'href' =>
+ * 'http://www.mediawiki.org/'
]
becomes something like
* ' href="http://www.mediawiki.org"'. Again, this is like
* Xml::expandAttributes(), but it implements some HTML-specific logic.
*
* ' href="http://www.mediawiki.org"'. Again, this is like
* Xml::expandAttributes(), but it implements some HTML-specific logic.
*
@@
-445,25
+443,25
@@
class Html {
*
* @par Numerical array
* @code
*
* @par Numerical array
* @code
- * Html::element( 'em',
array(
- * 'class' =>
array( 'foo', 'bar' )
- *
)
);
+ * Html::element( 'em',
[
+ * 'class' =>
[ 'foo', 'bar' ]
+ *
]
);
* // gives '<em class="foo bar"></em>'
* @endcode
*
* @par Associative array
* @code
* // gives '<em class="foo bar"></em>'
* @endcode
*
* @par Associative array
* @code
- * Html::element( 'em',
array(
- * 'class' =>
array( 'foo', 'bar', 'foo' => false, 'quux' => true )
- *
)
);
+ * Html::element( 'em',
[
+ * 'class' =>
[ 'foo', 'bar', 'foo' => false, 'quux' => true ]
+ *
]
);
* // gives '<em class="bar quux"></em>'
* @endcode
*
* // gives '<em class="bar quux"></em>'
* @endcode
*
- * @param array $attribs Associative array of attributes, e.g.,
array(
- * 'href' => 'http://www.mediawiki.org/'
)
. Values will be HTML-escaped.
+ * @param array $attribs Associative array of attributes, e.g.,
[
+ * 'href' => 'http://www.mediawiki.org/'
]
. Values will be HTML-escaped.
* A value of false means to omit the attribute. For boolean attributes,
* A value of false means to omit the attribute. For boolean attributes,
- * you can omit the key, e.g.,
array( 'checked' )
instead of
- *
array( 'checked' => 'checked' )
or such.
+ * you can omit the key, e.g.,
[ 'checked' ]
instead of
+ *
[ 'checked' => 'checked' ]
or such.
*
* @throws MWException If an attribute that doesn't allow lists is set to an array
* @return string HTML fragment that goes between element name and '>'
*
* @throws MWException If an attribute that doesn't allow lists is set to an array
* @return string HTML fragment that goes between element name and '>'
@@
-472,13
+470,13
@@
class Html {
public static function expandAttributes( array $attribs ) {
$ret = '';
foreach ( $attribs as $key => $value ) {
public static function expandAttributes( array $attribs ) {
$ret = '';
foreach ( $attribs as $key => $value ) {
- // Support intuitive
array( 'checked' => true/false )
form
+ // Support intuitive
[ 'checked' => true/false ]
form
if ( $value === false || is_null( $value ) ) {
continue;
}
if ( $value === false || is_null( $value ) ) {
continue;
}
- // For boolean attributes, support
array( 'foo' )
instead of
- // requiring
array( 'foo' => 'meaningless' )
.
+ // For boolean attributes, support
[ 'foo' ]
instead of
+ // requiring
[ 'foo' => 'meaningless' ]
.
if ( is_int( $key ) && in_array( strtolower( $value ), self::$boolAttribs ) ) {
$key = $value;
}
if ( is_int( $key ) && in_array( strtolower( $value ), self::$boolAttribs ) ) {
$key = $value;
}
@@
-535,7
+533,7
@@
class Html {
}
} elseif ( $v ) {
// If the value is truthy but not a string this is likely
}
} elseif ( $v ) {
// If the value is truthy but not a string this is likely
- // an
array( 'foo' => true )
, falsy values don't add strings
+ // an
[ 'foo' => true ]
, falsy values don't add strings
$newValue[] = $k;
}
}
$newValue[] = $k;
}
}
@@
-1011,11
+1009,11
@@
class Html {
*
* @par Example:
* @code
*
* @par Example:
* @code
- * Html::srcSet(
array(
+ * Html::srcSet(
[
* '1x' => 'standard.jpeg',
* '1.5x' => 'large.jpeg',
* '3x' => 'extra-large.jpeg',
* '1x' => 'standard.jpeg',
* '1.5x' => 'large.jpeg',
* '3x' => 'extra-large.jpeg',
- *
)
);
+ *
]
);
* // gives 'standard.jpeg 1x, large.jpeg 1.5x, extra-large.jpeg 2x'
* @endcode
*
* // gives 'standard.jpeg 1x, large.jpeg 1.5x, extra-large.jpeg 2x'
* @endcode
*