NewParserTest: tear down globals before returning early

[lhc/web/wiklou.git] / includes / Pingback.php

diff --git a/includes/Pingback.php b/includes/Pingback.php
index f633029..0039d2b 100644 (file)
--- a/includes/Pingback.php
+++ b/includes/Pingback.php
@@ -115,9 +115,14 @@ class Pingback {
         * as an associative array conforming to the Pingback schema on MetaWiki
         * (<https://meta.wikimedia.org/wiki/Schema:MediaWikiPingback>).
         *
+        * This is public so we can display it in the installer
+        *
+        * Developers: If you're adding a new piece of data to this, please ensure
+        * that you update https://www.mediawiki.org/wiki/Manual:$wgPingback
+        *
         * @return array
         */
-       private function getData() {
+       public function getSystemInfo() {
                $event = [
                        'database'   => $this->config->get( 'DBtype' ),
                        'MediaWiki'  => $this->config->get( 'Version' ),
@@ -136,11 +141,20 @@ class Pingback {
                        $event['memoryLimit'] = $limit;
                }
 
+               return $event;
+       }
+
+       /**
+        * Get the EventLogging packet to be sent to the server
+        *
+        * @return array
+        */
+       private function getData() {
                return [
                        'schema'           => 'MediaWikiPingback',
                        'revision'         => self::SCHEMA_REV,
                        'wiki'             => $this->getOrCreatePingbackId(),
-                       'event'            => $event,
+                       'event'            => $this->getSystemInfo(),
                ];
        }
 
@@ -191,7 +205,7 @@ class Pingback {
         * <https://github.com/wikimedia/mediawiki-extensions-EventLogging/
         *   blob/7e5fe4f1ef/includes/EventLogging.php#L32-L74>
         *
-        * @param data Pingback data as an associative array
+        * @param array $data Pingback data as an associative array
         * @return bool true on success, false on failure
         */
        private function postPingback( array $data ) {