jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325736 )
Change subject: HtmlArmor: Document that null is an acceptable value
......................................................................
HtmlArmor: Document that null is an acceptable value
And that you'll get null back.
Change-Id: Ibd74e6af16b51796b46c2e23b7442740f5f69a0f
---
M includes/libs/HtmlArmor.php
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/HtmlArmor.php b/includes/libs/HtmlArmor.php
index 4ba1bc3..1c141ab 100644
--- a/includes/libs/HtmlArmor.php
+++ b/includes/libs/HtmlArmor.php
@@ -28,12 +28,12 @@
class HtmlArmor {
/**
- * @var string
+ * @var string|null
*/
private $value;
/**
- * @param string $value
+ * @param string|null $value
*/
public function __construct( $value ) {
$this->value = $value;
@@ -44,7 +44,8 @@
* and get safe HTML back
*
* @param string|HtmlArmor $input
- * @return string safe for usage in HTML
+ * @return string|null safe for usage in HTML, or null
+ * if the HtmlArmor instance was wrapping null.
*/
public static function getHtml( $input ) {
if ( $input instanceof HtmlArmor ) {
--
To view, visit https://gerrit.wikimedia.org/r/325736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd74e6af16b51796b46c2e23b7442740f5f69a0f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Fomafix <foma...@googlemail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
