Merge "Type hint against LinkTarget in WatchedItemStore"

[lhc/web/wiklou.git] / tests / phpunit / includes / logging / LogFormatterTestCase.php

diff --git a/tests/phpunit/includes/logging/LogFormatterTestCase.php b/tests/phpunit/includes/logging/LogFormatterTestCase.php
index 786d761..fc2ab91 100644 (file)
--- a/tests/phpunit/includes/logging/LogFormatterTestCase.php
+++ b/tests/phpunit/includes/logging/LogFormatterTestCase.php
@@ -1,4 +1,5 @@
 <?php
+use MediaWiki\Linker\LinkTarget;
 
 /**
  * @since 1.26
@@ -22,6 +23,22 @@ abstract class LogFormatterTestCase extends MediaWikiLangTestCase {
                        self::removeApiMetaData( $formatter->formatParametersForApi() ),
                        'Api log params is equal to expected array'
                );
+
+               if ( isset( $extra['preload'] ) ) {
+                       $this->assertArrayEquals(
+                               $this->getLinkTargetsAsStrings( $extra['preload'] ),
+                               $this->getLinkTargetsAsStrings(
+                                       $formatter->getPreloadTitles()
+                               )
+                       );
+               }
+       }
+
+       private function getLinkTargetsAsStrings( array $linkTargets ) {
+               return array_map( function ( LinkTarget $t ) {
+                       return $t->getInterwiki() . ':' . $t->getNamespace() . ':'
+                               . $t->getDBkey() . '#' . $t->getFragment();
+               }, $linkTargets );
        }
 
        protected function isLegacy( $extra ) {
@@ -33,19 +50,19 @@ abstract class LogFormatterTestCase extends MediaWikiLangTestCase {
                        // no log_id because no insert in database
                        'log_type' => $data['type'],
                        'log_action' => $data['action'],
-                       'log_timestamp' => isset( $data['timestamp'] ) ? $data['timestamp'] : wfTimestampNow(),
-                       'log_user' => isset( $data['user'] ) ? $data['user'] : 0,
-                       'log_user_text' => isset( $data['user_text'] ) ? $data['user_text'] : 'User',
-                       'log_actor' => isset( $data['actor'] ) ? $data['actor'] : 0,
-                       'log_namespace' => isset( $data['namespace'] ) ? $data['namespace'] : NS_MAIN,
-                       'log_title' => isset( $data['title'] ) ? $data['title'] : 'Main_Page',
-                       'log_page' => isset( $data['page'] ) ? $data['page'] : 0,
-                       'log_comment_text' => isset( $data['comment'] ) ? $data['comment'] : '',
+                       'log_timestamp' => $data['timestamp'] ?? wfTimestampNow(),
+                       'log_user' => $data['user'] ?? 0,
+                       'log_user_text' => $data['user_text'] ?? 'User',
+                       'log_actor' => $data['actor'] ?? 0,
+                       'log_namespace' => $data['namespace'] ?? NS_MAIN,
+                       'log_title' => $data['title'] ?? 'Main_Page',
+                       'log_page' => $data['page'] ?? 0,
+                       'log_comment_text' => $data['comment'] ?? '',
                        'log_comment_data' => null,
                        'log_params' => $legacy
                                ? LogPage::makeParamBlob( $data['params'] )
                                : LogEntryBase::makeParamBlob( $data['params'] ),
-                       'log_deleted' => isset( $data['deleted'] ) ? $data['deleted'] : 0,
+                       'log_deleted' => $data['deleted'] ?? 0,
                ];
        }