From: umherirrender Date: Fri, 15 Aug 2014 16:28:30 +0000 (+0200) Subject: Remove wrong null type from @param of Content::fillParserOutput X-Git-Tag: 1.31.0-rc.0~14362^2 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=93a23bc256b38a51661acfc325d7ce8794169de9;p=lhc%2Fweb%2Fwiklou.git Remove wrong null type from @param of Content::fillParserOutput Change-Id: Iae152214c52c611e8c118d2537e92f551b1c7ab8 --- diff --git a/includes/content/AbstractContent.php b/includes/content/AbstractContent.php index e09be5673a..683c9596be 100644 --- a/includes/content/AbstractContent.php +++ b/includes/content/AbstractContent.php @@ -503,7 +503,7 @@ abstract class AbstractContent implements Content { * * @param Title $title Context title for parsing * @param int|null $revId Revision ID (for {{REVISIONID}}) - * @param ParserOptions|null $options Parser options + * @param ParserOptions $options Parser options * @param bool $generateHtml Whether or not to generate HTML * @param ParserOutput &$output The output object to fill (reference). * diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php index abedc6ceb8..042ae93e4b 100644 --- a/tests/phpunit/includes/content/ContentHandlerTest.php +++ b/tests/phpunit/includes/content/ContentHandlerTest.php @@ -514,7 +514,7 @@ class DummyContentForTesting extends AbstractContent { * * @param Title $title Context title for parsing * @param int|null $revId Revision ID (for {{REVISIONID}}) - * @param ParserOptions|null $options Parser options + * @param ParserOptions $options Parser options * @param bool $generateHtml Whether or not to generate HTML * @param ParserOutput &$output The output object to fill (reference). */