Merge "Warn if stateful ParserOutput transforms are used"

[lhc/web/wiklou.git] / includes / content / JsonContent.php

diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php
index 14c8182..7d8f67c 100644 (file)
--- a/includes/content/JsonContent.php
+++ b/includes/content/JsonContent.php
@@ -22,6 +22,7 @@ class JsonContent extends TextContent {
 
        /**
         * @param string $text JSON
+        * @param string $modelId
         */
        public function __construct( $text, $modelId = CONTENT_MODEL_JSON ) {
                parent::__construct( $text, $modelId );
@@ -74,8 +75,8 @@ class JsonContent extends TextContent {
        /**
         * Beautifies JSON prior to save.
         *
-        * @param Title $title Title
-        * @param User $user User
+        * @param Title $title
+        * @param User $user
         * @param ParserOptions $popts
         * @return JsonContent
         */
@@ -96,7 +97,7 @@ class JsonContent extends TextContent {
         * @param int $revId
         * @param ParserOptions $options
         * @param bool $generateHtml
-        * @param ParserOutput $output
+        * @param ParserOutput &$output
         */
        protected function fillParserOutput( Title $title, $revId,
                ParserOptions $options, $generateHtml, ParserOutput &$output