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
Remove FSRepo
[lhc/web/wiklou.git]
/
includes
/
Html.php
diff --git
a/includes/Html.php
b/includes/Html.php
index
2ef891d
..
0b6b655
100644
(file)
--- a/
includes/Html.php
+++ b/
includes/Html.php
@@
-3,7
+3,7
@@
* Collection of methods to generate HTML content
*
* Copyright © 2009 Aryeh Gregor
* Collection of methods to generate HTML content
*
* Copyright © 2009 Aryeh Gregor
- * http://www.mediawiki.org/
+ * http
s
://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-155,11
+155,11
@@
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
s://www.mediawiki.org/' ]
. See expandAttributes() for
* further documentation.
* @param string[] $modifiers classes to add to the button
* 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
+ * @see http
s
://tools.wmflabs.org/styleguide/desktop/index.html for guidance on available modifiers
* @return string Raw HTML
*/
public static function linkButton( $contents, array $attrs, array $modifiers = [] ) {
* @return string Raw HTML
*/
public static function linkButton( $contents, array $attrs, array $modifiers = [] ) {
@@
-175,11
+175,11
@@
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
s://www.mediawiki.org/' ]
. See expandAttributes() for
* further documentation.
* @param string[] $modifiers classes to add to the button
* 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
+ * @see http
s
://tools.wmflabs.org/styleguide/desktop/index.html for guidance on available modifiers
* @return string Raw HTML
*/
public static function submitButton( $contents, array $attrs, array $modifiers = [] ) {
* @return string Raw HTML
*/
public static function submitButton( $contents, array $attrs, array $modifiers = [] ) {
@@
-199,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
s://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!
@@
-320,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
s://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
*/
@@
-430,9
+430,9
@@
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
- * ' href="http://www.mediawiki.org"'. Again, this is like
+ * to stick after the element name in HTML output. Like
[
'href' =>
+ * 'http
s://www.mediawiki.org/' ]
becomes something like
+ * ' href="http
s
://www.mediawiki.org"'. Again, this is like
* Xml::expandAttributes(), but it implements some HTML-specific logic.
*
* Attributes that can contain space-separated lists ('class', 'accesskey' and 'rel') array
* Xml::expandAttributes(), but it implements some HTML-specific logic.
*
* Attributes that can contain space-separated lists ('class', 'accesskey' and 'rel') array
@@
-443,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
s://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 '>'
@@
-470,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;
}
@@
-501,8
+501,8
@@
class Html {
continue;
}
continue;
}
- // http://www.w3.org/TR/html401/index/attributes.html ("space-separated")
- // http://www.w3.org/TR/html5/index.html#attributes-1 ("space-separated")
+ // http
s
://www.w3.org/TR/html401/index/attributes.html ("space-separated")
+ // http
s
://www.w3.org/TR/html5/index.html#attributes-1 ("space-separated")
$spaceSeparatedListAttributes = [
'class', // html4, html5
'accesskey', // as of html5, multiple space-separated values allowed
$spaceSeparatedListAttributes = [
'class', // html4, html5
'accesskey', // as of html5, multiple space-separated values allowed
@@
-533,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;
}
}
@@
-956,7
+956,7
@@
class Html {
* @return bool
*/
public static function isXmlMimeType( $mimetype ) {
* @return bool
*/
public static function isXmlMimeType( $mimetype ) {
- # http
://www.whatwg.org/html
/infrastructure.html#xml-mime-type
+ # http
s://html.spec.whatwg.org/multipage
/infrastructure.html#xml-mime-type
# * text/xml
# * application/xml
# * Any MIME type with a subtype ending in +xml (this implicitly includes application/xhtml+xml)
# * text/xml
# * application/xml
# * Any MIME type with a subtype ending in +xml (this implicitly includes application/xhtml+xml)
@@
-1005,15
+1005,15
@@
class Html {
*
* @note srcset width and height values are not supported.
*
*
* @note srcset width and height values are not supported.
*
- * @see http
://www.whatwg.org/html/embedded-content-1.html
#attr-img-srcset
+ * @see http
s://html.spec.whatwg.org/
#attr-img-srcset
*
* @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
*