X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FHtml.php;h=48b30c7802d8eba18eb493feb7e2bd367cfa1175;hb=f43fa6f4f0e2cb60b8543daad661b48a3e0653a9;hp=2ef891d16819c3f529edb7a0049bf76331353cd8;hpb=6244b8c23a7c15be3d9de2130d290a2437bb6587;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Html.php b/includes/Html.php index 2ef891d168..48b30c7802 100644 --- a/includes/Html.php +++ b/includes/Html.php @@ -155,8 +155,8 @@ class Html { * * @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 @@ -175,8 +175,8 @@ class Html { * * @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 @@ -199,8 +199,8 @@ class Html { * 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! @@ -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' - * @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 */ @@ -430,8 +430,8 @@ class Html { /** * 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. * @@ -443,25 +443,25 @@ class Html { * * @par Numerical array * @code - * Html::element( 'em', array( - * 'class' => array( 'foo', 'bar' ) - * ) ); + * Html::element( 'em', [ + * 'class' => [ 'foo', 'bar' ] + * ] ); * // gives '' * @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 '' * @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, - * 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 '>' @@ -470,13 +470,13 @@ class Html { 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; } - // 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; } @@ -533,7 +533,7 @@ class Html { } } 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; } } @@ -1009,11 +1009,11 @@ class Html { * * @par Example: * @code - * Html::srcSet( array( + * Html::srcSet( [ * '1x' => 'standard.jpeg', * '1.5x' => 'large.jpeg', * '3x' => 'extra-large.jpeg', - * ) ); + * ] ); * // gives 'standard.jpeg 1x, large.jpeg 1.5x, extra-large.jpeg 2x' * @endcode *