X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Flogging%2FLogFormatterTestCase.php;h=786d761900e712428884b15eec0d71511d44edf3;hb=dcee65673b531ebe39a093ee0c021a926ea74ad9;hp=b09e5b1847214103732f716e80fddb21812d7a61;hpb=3071f1fad720f1773864621158a0c59b73124896;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/includes/logging/LogFormatterTestCase.php b/tests/phpunit/includes/logging/LogFormatterTestCase.php index b09e5b1847..786d761900 100644 --- a/tests/phpunit/includes/logging/LogFormatterTestCase.php +++ b/tests/phpunit/includes/logging/LogFormatterTestCase.php @@ -36,10 +36,12 @@ abstract class LogFormatterTestCase extends MediaWikiLangTestCase { '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' => isset( $data['comment'] ) ? $data['comment'] : '', + 'log_comment_text' => isset( $data['comment'] ) ? $data['comment'] : '', + 'log_comment_data' => null, 'log_params' => $legacy ? LogPage::makeParamBlob( $data['params'] ) : LogEntryBase::makeParamBlob( $data['params'] ), @@ -50,7 +52,7 @@ abstract class LogFormatterTestCase extends MediaWikiLangTestCase { private static function removeSomeHtml( $html ) { $html = str_replace( '"', '"', $html ); $html = preg_replace( '/\xE2\x80[\x8E\x8F]/', '', $html ); // Strip lrm/rlm - return trim( preg_replace( '/<(a|span)[^>]*>([^<]*)<\/\1>/', '$2', $html ) ); + return trim( strip_tags( $html ) ); } private static function removeApiMetaData( $val ) {