jenkins-bot has submitted this change and it was merged.

Change subject: Remove all references to TemplateInfo
......................................................................


Remove all references to TemplateInfo

Change-Id: I5ffc8f75140a2c372fc1c64509b13a534fe07479
---
M TemplateData.hooks.php
M TemplateData.php
M TemplateDataBlob.php
M tests/TemplateDataBlobTest.php
4 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/TemplateData.hooks.php b/TemplateData.hooks.php
index ccfc87b..621f8a3 100644
--- a/TemplateData.hooks.php
+++ b/TemplateData.hooks.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Hooks for TemplateInfo extension
+ * Hooks for TemplateData extension
  *
  * @file
  * @ingroup Extensions
diff --git a/TemplateData.php b/TemplateData.php
index 0dec3b1..95e442a 100644
--- a/TemplateData.php
+++ b/TemplateData.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * TemplateInfo extension.
+ * TemplateData extension.
  *
  * @file
  * @ingroup Extensions
  */
 
 if ( version_compare( $wgVersion, '1.20', '<' ) ) {
-       echo "Extension:TemplateInfo requires MediaWiki 1.20 or higher.\n";
+       echo "Extension:TemplateData requires MediaWiki 1.20 or higher.\n";
        exit( 1 );
 }
 
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index d41b4dd..d86182f 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -21,7 +21,7 @@
        private $data;
 
        /**
-        * @var Status: Cache of TemplateInfo::validate
+        * @var Status: Cache of TemplateDataBlob::parse
         */
        private $status;
 
@@ -50,7 +50,7 @@
         * Parse and validate passed JSON (possibly gzip-compressed) and create 
a TemplateDataBlob object.
         *
         * @param string $json
-        * @return TemplateInfo
+        * @return TemplateDataBlob
         */
        public static function newFromDatabase( $json ) {
                // Handle GZIP compression. \037\213 is the header for GZIP 
files.
diff --git a/tests/TemplateDataBlobTest.php b/tests/TemplateDataBlobTest.php
index 37b371f..e652e85 100644
--- a/tests/TemplateDataBlobTest.php
+++ b/tests/TemplateDataBlobTest.php
@@ -394,7 +394,7 @@
                // Compress JSON to trigger the code pass in newFromDatabase 
that ends
                // up calling gzdecode().
                $gzJson = gzencode( '{}' );
-               $templateInfo = TemplateDataBlob::newFromDatabase( $gzJson );
-               $this->assertInstanceOf( 'TemplateDataBlob', $templateInfo );
+               $templateData = TemplateDataBlob::newFromDatabase( $gzJson );
+               $this->assertInstanceOf( 'TemplateDataBlob', $templateData );
        }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/83992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ffc8f75140a2c372fc1c64509b13a534fe07479
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Bartosz DziewoƄski <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to