Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

12 files changed, 2385 insertions, 1 deletions

diff --git a/tests/phpunit/includes/logging/BlockLogFormatterTest.php b/tests/phpunit/includes/logging/BlockLogFormatterTest.php
new file mode 100644
index 00000000..c7dc641d
--- /dev/null
+++ b/tests/phpunit/includes/logging/BlockLogFormatterTest.php
@@ -0,0 +1,372 @@
+<?php
+
+class BlockLogFormatterTest extends LogFormatterTestCase {
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideBlockLogDatabaseRows() {
+		return array(
+			// Current log format
+			array(
+				array(
+					'type' => 'block',
+					'action' => 'block',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'5::duration' => 'infinite',
+						'6::flags' => 'anononly',
+					),
+				),
+				array(
+					'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite (anonymous users only)',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array( 'anononly' ),
+					),
+				),
+			),
+
+			// Old legacy log
+			array(
+				array(
+					'type' => 'block',
+					'action' => 'block',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'infinite',
+						'anononly',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite (anonymous users only)',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array( 'anononly' ),
+					),
+				),
+			),
+
+			// Old legacy log without flag
+			array(
+				array(
+					'type' => 'block',
+					'action' => 'block',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'infinite',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array(),
+					),
+				),
+			),
+
+			// Very old legacy log without duration
+			array(
+				array(
+					'type' => 'block',
+					'action' => 'block',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array(),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideBlockLogDatabaseRows
+	 */
+	public function testBlockLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideReblockLogDatabaseRows() {
+		return array(
+			// Current log format
+			array(
+				array(
+					'type' => 'block',
+					'action' => 'reblock',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'5::duration' => 'infinite',
+						'6::flags' => 'anononly',
+					),
+				),
+				array(
+					'text' => 'Sysop changed block settings for Logtestuser with an expiry time of'
+						. ' indefinite (anonymous users only)',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array( 'anononly' ),
+					),
+				),
+			),
+
+			// Old log
+			array(
+				array(
+					'type' => 'block',
+					'action' => 'reblock',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'infinite',
+						'anononly',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop changed block settings for Logtestuser with an expiry time of'
+						. ' indefinite (anonymous users only)',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array( 'anononly' ),
+					),
+				),
+			),
+
+			// Older log without flag
+			array(
+				array(
+					'type' => 'block',
+					'action' => 'reblock',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'infinite',
+					)
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop changed block settings for Logtestuser with an expiry time of indefinite',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array(),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideReblockLogDatabaseRows
+	 */
+	public function testReblockLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideUnblockLogDatabaseRows() {
+		return array(
+			// Current log format
+			array(
+				array(
+					'type' => 'block',
+					'action' => 'unblock',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(),
+				),
+				array(
+					'text' => 'Sysop unblocked Logtestuser',
+					'api' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideUnblockLogDatabaseRows
+	 */
+	public function testUnblockLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideSuppressBlockLogDatabaseRows() {
+		return array(
+			// Current log format
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'block',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'5::duration' => 'infinite',
+						'6::flags' => 'anononly',
+					),
+				),
+				array(
+					'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite (anonymous users only)',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array( 'anononly' ),
+					),
+				),
+			),
+
+			// legacy log
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'block',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'infinite',
+						'anononly',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite (anonymous users only)',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array( 'anononly' ),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideSuppressBlockLogDatabaseRows
+	 */
+	public function testSuppressBlockLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideSuppressReblockLogDatabaseRows() {
+		return array(
+			// Current log format
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'reblock',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'5::duration' => 'infinite',
+						'6::flags' => 'anononly',
+					),
+				),
+				array(
+					'text' => 'Sysop changed block settings for Logtestuser with an expiry time of'
+						. ' indefinite (anonymous users only)',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array( 'anononly' ),
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'reblock',
+					'comment' => 'Block comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Logtestuser',
+					'params' => array(
+						'infinite',
+						'anononly',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop changed block settings for Logtestuser with an expiry time of'
+						. ' indefinite (anonymous users only)',
+					'api' => array(
+						'duration' => 'infinite',
+						'flags' => array( 'anononly' ),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideSuppressReblockLogDatabaseRows
+	 */
+	public function testSuppressReblockLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}
diff --git a/tests/phpunit/includes/logging/DeleteLogFormatterTest.php b/tests/phpunit/includes/logging/DeleteLogFormatterTest.php
new file mode 100644
index 00000000..28e7efaf
--- /dev/null
+++ b/tests/phpunit/includes/logging/DeleteLogFormatterTest.php
@@ -0,0 +1,527 @@
+<?php
+
+class DeleteLogFormatterTest extends LogFormatterTestCase {
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideDeleteLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'delete',
+					'action' => 'delete',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(),
+				),
+				array(
+					'text' => 'User deleted page Page',
+					'api' => array(),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'delete',
+					'action' => 'delete',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User deleted page Page',
+					'api' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideDeleteLogDatabaseRows
+	 */
+	public function testDeleteLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideRestoreLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'delete',
+					'action' => 'restore',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(),
+				),
+				array(
+					'text' => 'User restored page Page',
+					'api' => array(),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'delete',
+					'action' => 'restore',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User restored page Page',
+					'api' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideRestoreLogDatabaseRows
+	 */
+	public function testRestoreLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideRevisionLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'delete',
+					'action' => 'revision',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'4::type' => 'archive',
+						'5::ids' => array( '1', '3', '4' ),
+						'6::ofield' => '1',
+						'7::nfield' => '2',
+					),
+				),
+				array(
+					'text' => 'User changed visibility of 3 revisions on page Page: edit summary '
+						. 'hidden and content unhidden',
+					'api' => array(
+						'type' => 'archive',
+						'ids' => array( '1', '3', '4' ),
+						'old' => array(
+							'bitmask' => 1,
+							'content' => true,
+							'comment' => false,
+							'user' => false,
+							'restricted' => false,
+						),
+						'new' => array(
+							'bitmask' => 2,
+							'content' => false,
+							'comment' => true,
+							'user' => false,
+							'restricted' => false,
+						),
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'delete',
+					'action' => 'revision',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'archive',
+						'1,3,4',
+						'ofield=1',
+						'nfield=2',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User changed visibility of 3 revisions on page Page: edit summary '
+						. 'hidden and content unhidden',
+					'api' => array(
+						'type' => 'archive',
+						'ids' => array( '1', '3', '4' ),
+						'old' => array(
+							'bitmask' => 1,
+							'content' => true,
+							'comment' => false,
+							'user' => false,
+							'restricted' => false,
+						),
+						'new' => array(
+							'bitmask' => 2,
+							'content' => false,
+							'comment' => true,
+							'user' => false,
+							'restricted' => false,
+						),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideRevisionLogDatabaseRows
+	 */
+	public function testRevisionLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideEventLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'delete',
+					'action' => 'event',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'4::ids' => array( '1', '3', '4' ),
+						'5::ofield' => '1',
+						'6::nfield' => '2',
+					),
+				),
+				array(
+					'text' => 'User changed visibility of 3 log events on Page: edit summary hidden '
+						. 'and content unhidden',
+					'api' => array(
+						'type' => 'logging',
+						'ids' => array( '1', '3', '4' ),
+						'old' => array(
+							'bitmask' => 1,
+							'content' => true,
+							'comment' => false,
+							'user' => false,
+							'restricted' => false,
+						),
+						'new' => array(
+							'bitmask' => 2,
+							'content' => false,
+							'comment' => true,
+							'user' => false,
+							'restricted' => false,
+						),
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'delete',
+					'action' => 'event',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'1,3,4',
+						'ofield=1',
+						'nfield=2',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User changed visibility of 3 log events on Page: edit summary hidden '
+						. 'and content unhidden',
+					'api' => array(
+						'type' => 'logging',
+						'ids' => array( '1', '3', '4' ),
+						'old' => array(
+							'bitmask' => 1,
+							'content' => true,
+							'comment' => false,
+							'user' => false,
+							'restricted' => false,
+						),
+						'new' => array(
+							'bitmask' => 2,
+							'content' => false,
+							'comment' => true,
+							'user' => false,
+							'restricted' => false,
+						),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideEventLogDatabaseRows
+	 */
+	public function testEventLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideSuppressRevisionLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'revision',
+					'comment' => 'Suppress comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'4::type' => 'archive',
+						'5::ids' => array( '1', '3', '4' ),
+						'6::ofield' => '1',
+						'7::nfield' => '10',
+					),
+				),
+				array(
+					'text' => 'User secretly changed visibility of 3 revisions on page Page: edit '
+						. 'summary hidden, content unhidden and applied restrictions to administrators',
+					'api' => array(
+						'type' => 'archive',
+						'ids' => array( '1', '3', '4' ),
+						'old' => array(
+							'bitmask' => 1,
+							'content' => true,
+							'comment' => false,
+							'user' => false,
+							'restricted' => false,
+						),
+						'new' => array(
+							'bitmask' => 10,
+							'content' => false,
+							'comment' => true,
+							'user' => false,
+							'restricted' => true,
+						),
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'revision',
+					'comment' => 'Suppress comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'archive',
+						'1,3,4',
+						'ofield=1',
+						'nfield=10',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User secretly changed visibility of 3 revisions on page Page: edit '
+						. 'summary hidden, content unhidden and applied restrictions to administrators',
+					'api' => array(
+						'type' => 'archive',
+						'ids' => array( '1', '3', '4' ),
+						'old' => array(
+							'bitmask' => 1,
+							'content' => true,
+							'comment' => false,
+							'user' => false,
+							'restricted' => false,
+						),
+						'new' => array(
+							'bitmask' => 10,
+							'content' => false,
+							'comment' => true,
+							'user' => false,
+							'restricted' => true,
+						),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideSuppressRevisionLogDatabaseRows
+	 */
+	public function testSuppressRevisionLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideSuppressEventLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'event',
+					'comment' => 'Suppress comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'4::ids' => array( '1', '3', '4' ),
+						'5::ofield' => '1',
+						'6::nfield' => '10',
+					),
+				),
+				array(
+					'text' => 'User secretly changed visibility of 3 log events on Page: edit '
+						. 'summary hidden, content unhidden and applied restrictions to administrators',
+					'api' => array(
+						'type' => 'logging',
+						'ids' => array( '1', '3', '4' ),
+						'old' => array(
+							'bitmask' => 1,
+							'content' => true,
+							'comment' => false,
+							'user' => false,
+							'restricted' => false,
+						),
+						'new' => array(
+							'bitmask' => 10,
+							'content' => false,
+							'comment' => true,
+							'user' => false,
+							'restricted' => true,
+						),
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'event',
+					'comment' => 'Suppress comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'1,3,4',
+						'ofield=1',
+						'nfield=10',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User secretly changed visibility of 3 log events on Page: edit '
+						. 'summary hidden, content unhidden and applied restrictions to administrators',
+					'api' => array(
+						'type' => 'logging',
+						'ids' => array( '1', '3', '4' ),
+						'old' => array(
+							'bitmask' => 1,
+							'content' => true,
+							'comment' => false,
+							'user' => false,
+							'restricted' => false,
+						),
+						'new' => array(
+							'bitmask' => 10,
+							'content' => false,
+							'comment' => true,
+							'user' => false,
+							'restricted' => true,
+						),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideSuppressEventLogDatabaseRows
+	 */
+	public function testSuppressEventLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideSuppressDeleteLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'delete',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(),
+				),
+				array(
+					'text' => 'User suppressed page Page',
+					'api' => array(),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'suppress',
+					'action' => 'delete',
+					'comment' => 'delete comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User suppressed page Page',
+					'api' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideSuppressDeleteLogDatabaseRows
+	 */
+	public function testSuppressDeleteLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}
diff --git a/tests/phpunit/includes/logging/LogFormatterTest.php b/tests/phpunit/includes/logging/LogFormatterTest.php
index 515990e6..844c9afb 100644
--- a/tests/phpunit/includes/logging/LogFormatterTest.php
+++ b/tests/phpunit/includes/logging/LogFormatterTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @group Database
  */
@@ -19,6 +20,16 @@ class LogFormatterTest extends MediaWikiLangTestCase {
 	 */
 	protected $context;
 
+	/**
+	 * @var Title
+	 */
+	protected $target;
+
+	/**
+	 * @var string
+	 */
+	protected $user_comment;
+
 	protected function setUp() {
 		parent::setUp();
 
@@ -35,12 +46,15 @@ class LogFormatterTest extends MediaWikiLangTestCase {
 		Language::getLocalisationCache()->recache( $wgLang->getCode() );
 
 		$this->user = User::newFromName( 'Testuser' );
-		$this->title = Title::newMainPage();
+		$this->title = Title::newFromText( 'SomeTitle' );
+		$this->target = Title::newFromText( 'TestTarget' );
 
 		$this->context = new RequestContext();
 		$this->context->setUser( $this->user );
 		$this->context->setTitle( $this->title );
 		$this->context->setLanguage( $wgLang );
+
+		$this->user_comment = '<User comment about action>';
 	}
 
 	protected function tearDown() {
@@ -292,4 +306,309 @@ class LogFormatterTest extends MediaWikiLangTestCase {
 			array( '4:user-link:key', 'foo', array( 'key' => 'Foo' ) ),
 		);
 	}
+
+	/**
+	 * @covers LogFormatter::getIRCActionComment
+	 * @covers LogFormatter::getIRCActionText
+	 */
+	public function testIrcMsgForLogTypeBlock() {
+		$sep = $this->context->msg( 'colon-separator' )->text();
+
+		# block/block
+		$this->assertIRCComment(
+			$this->context->msg( 'blocklogentry', 'SomeTitle', 'duration', '(flags)' )->plain()
+			. $sep . $this->user_comment,
+			'block', 'block',
+			array(
+				'5::duration' => 'duration',
+				'6::flags' => 'flags',
+			),
+			$this->user_comment
+		);
+		# block/block - legacy
+		$this->assertIRCComment(
+			$this->context->msg( 'blocklogentry', 'SomeTitle', 'duration', '(flags)' )->plain()
+			. $sep . $this->user_comment,
+			'block', 'block',
+			array(
+				'duration',
+				'flags',
+			),
+			$this->user_comment,
+			'',
+			true
+		);
+		# block/unblock
+		$this->assertIRCComment(
+			$this->context->msg( 'unblocklogentry', 'SomeTitle' )->plain() . $sep . $this->user_comment,
+			'block', 'unblock',
+			array(),
+			$this->user_comment
+		);
+		# block/reblock
+		$this->assertIRCComment(
+			$this->context->msg( 'reblock-logentry', 'SomeTitle', 'duration', '(flags)' )->plain()
+			. $sep . $this->user_comment,
+			'block', 'reblock',
+			array(
+				'5::duration' => 'duration',
+				'6::flags' => 'flags',
+			),
+			$this->user_comment
+		);
+	}
+
+	/**
+	 * @covers LogFormatter::getIRCActionComment
+	 * @covers LogFormatter::getIRCActionText
+	 */
+	public function testIrcMsgForLogTypeDelete() {
+		$sep = $this->context->msg( 'colon-separator' )->text();
+
+		# delete/delete
+		$this->assertIRCComment(
+			$this->context->msg( 'deletedarticle', 'SomeTitle' )->plain() . $sep . $this->user_comment,
+			'delete', 'delete',
+			array(),
+			$this->user_comment
+		);
+
+		# delete/restore
+		$this->assertIRCComment(
+			$this->context->msg( 'undeletedarticle', 'SomeTitle' )->plain() . $sep . $this->user_comment,
+			'delete', 'restore',
+			array(),
+			$this->user_comment
+		);
+	}
+
+	/**
+	 * @covers LogFormatter::getIRCActionComment
+	 * @covers LogFormatter::getIRCActionText
+	 */
+	public function testIrcMsgForLogTypeNewusers() {
+		$this->assertIRCComment(
+			'New user account',
+			'newusers', 'newusers',
+			array()
+		);
+		$this->assertIRCComment(
+			'New user account',
+			'newusers', 'create',
+			array()
+		);
+		$this->assertIRCComment(
+			'created new account SomeTitle',
+			'newusers', 'create2',
+			array()
+		);
+		$this->assertIRCComment(
+			'Account created automatically',
+			'newusers', 'autocreate',
+			array()
+		);
+	}
+
+	/**
+	 * @covers LogFormatter::getIRCActionComment
+	 * @covers LogFormatter::getIRCActionText
+	 */
+	public function testIrcMsgForLogTypeMove() {
+		$move_params = array(
+			'4::target' => $this->target->getPrefixedText(),
+			'5::noredir' => 0,
+		);
+		$sep = $this->context->msg( 'colon-separator' )->text();
+
+		# move/move
+		$this->assertIRCComment(
+			$this->context->msg( '1movedto2', 'SomeTitle', 'TestTarget' )
+				->plain() . $sep . $this->user_comment,
+			'move', 'move',
+			$move_params,
+			$this->user_comment
+		);
+
+		# move/move_redir
+		$this->assertIRCComment(
+			$this->context->msg( '1movedto2_redir', 'SomeTitle', 'TestTarget' )
+				->plain() . $sep . $this->user_comment,
+			'move', 'move_redir',
+			$move_params,
+			$this->user_comment
+		);
+	}
+
+	/**
+	 * @covers LogFormatter::getIRCActionComment
+	 * @covers LogFormatter::getIRCActionText
+	 */
+	public function testIrcMsgForLogTypePatrol() {
+		# patrol/patrol
+		$this->assertIRCComment(
+			$this->context->msg( 'patrol-log-line', 'revision 777', '[[SomeTitle]]', '' )->plain(),
+			'patrol', 'patrol',
+			array(
+				'4::curid' => '777',
+				'5::previd' => '666',
+				'6::auto' => 0,
+			)
+		);
+	}
+
+	/**
+	 * @covers LogFormatter::getIRCActionComment
+	 * @covers LogFormatter::getIRCActionText
+	 */
+	public function testIrcMsgForLogTypeProtect() {
+		$protectParams = array(
+			'[edit=sysop] (indefinite) ‎[move=sysop] (indefinite)'
+		);
+		$sep = $this->context->msg( 'colon-separator' )->text();
+
+		# protect/protect
+		$this->assertIRCComment(
+			$this->context->msg( 'protectedarticle', 'SomeTitle ' . $protectParams[0] )
+				->plain() . $sep . $this->user_comment,
+			'protect', 'protect',
+			$protectParams,
+			$this->user_comment
+		);
+
+		# protect/unprotect
+		$this->assertIRCComment(
+			$this->context->msg( 'unprotectedarticle', 'SomeTitle' )->plain() . $sep . $this->user_comment,
+			'protect', 'unprotect',
+			array(),
+			$this->user_comment
+		);
+
+		# protect/modify
+		$this->assertIRCComment(
+			$this->context->msg( 'modifiedarticleprotection', 'SomeTitle ' . $protectParams[0] )
+				->plain() . $sep . $this->user_comment,
+			'protect', 'modify',
+			$protectParams,
+			$this->user_comment
+		);
+
+		# protect/move_prot
+		$this->assertIRCComment(
+			$this->context->msg( 'movedarticleprotection', 'SomeTitle', 'OldTitle' )
+				->plain() . $sep . $this->user_comment,
+			'protect', 'move_prot',
+			array(
+				'4::oldtitle' => 'OldTitle'
+			),
+			$this->user_comment
+		);
+	}
+
+	/**
+	 * @covers LogFormatter::getIRCActionComment
+	 * @covers LogFormatter::getIRCActionText
+	 */
+	public function testIrcMsgForLogTypeUpload() {
+		$sep = $this->context->msg( 'colon-separator' )->text();
+
+		# upload/upload
+		$this->assertIRCComment(
+			$this->context->msg( 'uploadedimage', 'SomeTitle' )->plain() . $sep . $this->user_comment,
+			'upload', 'upload',
+			array(),
+			$this->user_comment
+		);
+
+		# upload/overwrite
+		$this->assertIRCComment(
+			$this->context->msg( 'overwroteimage', 'SomeTitle' )->plain() . $sep . $this->user_comment,
+			'upload', 'overwrite',
+			array(),
+			$this->user_comment
+		);
+	}
+
+	/**
+	 * @covers LogFormatter::getIRCActionComment
+	 * @covers LogFormatter::getIRCActionText
+	 */
+	public function testIrcMsgForLogTypeMerge() {
+		$sep = $this->context->msg( 'colon-separator' )->text();
+
+		# merge/merge
+		$this->assertIRCComment(
+			$this->context->msg( 'pagemerge-logentry', 'SomeTitle', 'Dest', 'timestamp' )->plain()
+			. $sep . $this->user_comment,
+			'merge', 'merge',
+			array(
+				'4::dest' => 'Dest',
+				'5::mergepoint' => 'timestamp',
+			),
+			$this->user_comment
+		);
+	}
+
+	/**
+	 * @covers LogFormatter::getIRCActionComment
+	 * @covers LogFormatter::getIRCActionText
+	 */
+	public function testIrcMsgForLogTypeImport() {
+		$sep = $this->context->msg( 'colon-separator' )->text();
+
+		# import/upload
+		$msg = $this->context->msg( 'import-logentry-upload', 'SomeTitle' )->plain() .
+			$sep .
+			$this->user_comment;
+		$this->assertIRCComment(
+			$msg,
+			'import', 'upload',
+			array(),
+			$this->user_comment
+		);
+
+		# import/interwiki
+		$msg = $this->context->msg( 'import-logentry-interwiki', 'SomeTitle' )->plain() .
+			$sep .
+			$this->user_comment;
+		$this->assertIRCComment(
+			$msg,
+			'import', 'interwiki',
+			array(),
+			$this->user_comment
+		);
+	}
+
+	/**
+	 * @param string $expected Expected IRC text without colors codes
+	 * @param string $type Log type (move, delete, suppress, patrol ...)
+	 * @param string $action A log type action
+	 * @param array $params
+	 * @param string $comment (optional) A comment for the log action
+	 * @param string $msg (optional) A message for PHPUnit :-)
+	 */
+	protected function assertIRCComment( $expected, $type, $action, $params,
+		$comment = null, $msg = '', $legacy = false
+	) {
+		$logEntry = new ManualLogEntry( $type, $action );
+		$logEntry->setPerformer( $this->user );
+		$logEntry->setTarget( $this->title );
+		if ( $comment !== null ) {
+			$logEntry->setComment( $comment );
+		}
+		$logEntry->setParameters( $params );
+		$logEntry->setLegacy( $legacy );
+
+		$formatter = LogFormatter::newFromEntry( $logEntry );
+		$formatter->setContext( $this->context );
+
+		// Apply the same transformation as done in IRCColourfulRCFeedFormatter::getLine for rc_comment
+		$ircRcComment = IRCColourfulRCFeedFormatter::cleanupForIRC( $formatter->getIRCActionComment() );
+
+		$this->assertEquals(
+			$expected,
+			$ircRcComment,
+			$msg
+		);
+	}
+
 }
diff --git a/tests/phpunit/includes/logging/LogFormatterTestCase.php b/tests/phpunit/includes/logging/LogFormatterTestCase.php
new file mode 100644
index 00000000..e88452b7
--- /dev/null
+++ b/tests/phpunit/includes/logging/LogFormatterTestCase.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @since 1.26
+ */
+abstract class LogFormatterTestCase extends MediaWikiLangTestCase {
+
+	public function doTestLogFormatter( $row, $extra ) {
+		RequestContext::resetMain();
+		$row = $this->expandDatabaseRow( $row, $this->isLegacy( $extra ) );
+
+		$formatter = LogFormatter::newFromRow( $row );
+
+		$this->assertEquals(
+			$extra['text'],
+			self::removeSomeHtml( $formatter->getActionText() ),
+			'Action text is equal to expected text'
+		);
+
+		$this->assertSame( // ensure types and array key order
+			$extra['api'],
+			self::removeApiMetaData( $formatter->formatParametersForApi() ),
+			'Api log params is equal to expected array'
+		);
+	}
+
+	protected function isLegacy( $extra ) {
+		return isset( $extra['legacy'] ) && $extra['legacy'];
+	}
+
+	protected function expandDatabaseRow( $data, $legacy ) {
+		return array(
+			// 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_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_params' => $legacy
+				? LogPage::makeParamBlob( $data['params'] )
+				: LogEntryBase::makeParamBlob( $data['params'] ),
+			'log_deleted' => isset( $data['deleted'] ) ? $data['deleted'] : 0,
+		);
+	}
+
+	private static function removeSomeHtml( $html ) {
+		$html = str_replace( '&quot;', '"', $html );
+		return trim( preg_replace( '/<(a|span)[^>]*>([^<]*)<\/\1>/', '$2', $html ) );
+	}
+
+	private static function removeApiMetaData( $val ) {
+		if ( is_array( $val ) ) {
+			unset( $val['_element'] );
+			unset( $val['_type'] );
+			foreach ( $val as $key => $value ) {
+				$val[$key] = self::removeApiMetaData( $value );
+			}
+		}
+		return $val;
+	}
+}
diff --git a/tests/phpunit/includes/logging/MergeLogFormatterTest.php b/tests/phpunit/includes/logging/MergeLogFormatterTest.php
new file mode 100644
index 00000000..2ff0ddf5
--- /dev/null
+++ b/tests/phpunit/includes/logging/MergeLogFormatterTest.php
@@ -0,0 +1,67 @@
+<?php
+
+class MergeLogFormatterTest extends LogFormatterTestCase {
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideMergeLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'merge',
+					'action' => 'merge',
+					'comment' => 'Merge comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'4::dest' => 'NewPage',
+						'5::mergepoint' => '20140804160710',
+					),
+				),
+				array(
+					'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
+					'api' => array(
+						'dest_ns' => 0,
+						'dest_title' => 'NewPage',
+						'mergepoint' => '2014-08-04T16:07:10Z',
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'merge',
+					'action' => 'merge',
+					'comment' => 'merge comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'NewPage',
+						'20140804160710',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
+					'api' => array(
+						'dest_ns' => 0,
+						'dest_title' => 'NewPage',
+						'mergepoint' => '2014-08-04T16:07:10Z',
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideMergeLogDatabaseRows
+	 */
+	public function testMergeLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}
diff --git a/tests/phpunit/includes/logging/MoveLogFormatterTest.php b/tests/phpunit/includes/logging/MoveLogFormatterTest.php
new file mode 100644
index 00000000..fdc4b7e1
--- /dev/null
+++ b/tests/phpunit/includes/logging/MoveLogFormatterTest.php
@@ -0,0 +1,270 @@
+<?php
+
+class MoveLogFormatterTest extends LogFormatterTestCase {
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideMoveLogDatabaseRows() {
+		return array(
+			// Current format - with redirect
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move',
+					'comment' => 'move comment with redirect',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'4::target' => 'NewPage',
+						'5::noredir' => '0',
+					),
+				),
+				array(
+					'text' => 'User moved page OldPage to NewPage',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => false,
+					),
+				),
+			),
+
+			// Current format - without redirect
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move',
+					'comment' => 'move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'4::target' => 'NewPage',
+						'5::noredir' => '1',
+					),
+				),
+				array(
+					'text' => 'User moved page OldPage to NewPage without leaving a redirect',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => true,
+					),
+				),
+			),
+
+			// legacy format - with redirect
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move',
+					'comment' => 'move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'NewPage',
+						'',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User moved page OldPage to NewPage',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => false,
+					),
+				),
+			),
+
+			// legacy format - without redirect
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move',
+					'comment' => 'move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'NewPage',
+						'1',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User moved page OldPage to NewPage without leaving a redirect',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => true,
+					),
+				),
+			),
+
+			// old format without flag for redirect suppression
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move',
+					'comment' => 'move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'NewPage',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User moved page OldPage to NewPage',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => false,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideMoveLogDatabaseRows
+	 */
+	public function testMoveLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideMoveRedirLogDatabaseRows() {
+		return array(
+			// Current format - with redirect
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move_redir',
+					'comment' => 'move comment with redirect',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'4::target' => 'NewPage',
+						'5::noredir' => '0',
+					),
+				),
+				array(
+					'text' => 'User moved page OldPage to NewPage over redirect',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => false,
+					),
+				),
+			),
+
+			// Current format - without redirect
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move_redir',
+					'comment' => 'move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'4::target' => 'NewPage',
+						'5::noredir' => '1',
+					),
+				),
+				array(
+					'text' => 'User moved page OldPage to NewPage over a redirect without leaving a redirect',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => true,
+					),
+				),
+			),
+
+			// legacy format - with redirect
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move_redir',
+					'comment' => 'move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'NewPage',
+						'',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User moved page OldPage to NewPage over redirect',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => false,
+					),
+				),
+			),
+
+			// legacy format - without redirect
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move_redir',
+					'comment' => 'move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'NewPage',
+						'1',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User moved page OldPage to NewPage over a redirect without leaving a redirect',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => true,
+					),
+				),
+			),
+
+			// old format without flag for redirect suppression
+			array(
+				array(
+					'type' => 'move',
+					'action' => 'move_redir',
+					'comment' => 'move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'OldPage',
+					'params' => array(
+						'NewPage',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User moved page OldPage to NewPage over redirect',
+					'api' => array(
+						'target_ns' => 0,
+						'target_title' => 'NewPage',
+						'suppressredirect' => false,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideMoveRedirLogDatabaseRows
+	 */
+	public function testMoveRedirLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}
diff --git a/tests/phpunit/includes/logging/NewUsersLogFormatterTest.php b/tests/phpunit/includes/logging/NewUsersLogFormatterTest.php
new file mode 100644
index 00000000..5b03370d
--- /dev/null
+++ b/tests/phpunit/includes/logging/NewUsersLogFormatterTest.php
@@ -0,0 +1,207 @@
+<?php
+
+/**
+ * @group Database
+ */
+class NewUsersLogFormatterTest extends LogFormatterTestCase {
+
+	protected function setUp() {
+		parent::setUp();
+
+		// Register LogHandler, see $wgNewUserLog in Setup.php
+		$this->mergeMwGlobalArrayValue( 'wgLogActionsHandlers', array(
+			'newusers/newusers' => 'NewUsersLogFormatter',
+			'newusers/create' => 'NewUsersLogFormatter',
+			'newusers/create2' => 'NewUsersLogFormatter',
+			'newusers/byemail' => 'NewUsersLogFormatter',
+			'newusers/autocreate' => 'NewUsersLogFormatter',
+		) );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideNewUsersLogDatabaseRows() {
+		return array(
+			// Only old logs
+			array(
+				array(
+					'type' => 'newusers',
+					'action' => 'newusers',
+					'comment' => 'newusers comment',
+					'user' => 0,
+					'user_text' => 'New user',
+					'namespace' => NS_USER,
+					'title' => 'New user',
+					'params' => array(),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User account New user was created',
+					'api' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideNewUsersLogDatabaseRows
+	 */
+	public function testNewUsersLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideCreateLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'newusers',
+					'action' => 'create',
+					'comment' => 'newusers comment',
+					'user' => 0,
+					'user_text' => 'New user',
+					'namespace' => NS_USER,
+					'title' => 'New user',
+					'params' => array(
+						'4::userid' => 1,
+					),
+				),
+				array(
+					'text' => 'User account New user was created',
+					'api' => array(
+						'userid' => 1,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideCreateLogDatabaseRows
+	 */
+	public function testCreateLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideCreate2LogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'newusers',
+					'action' => 'create2',
+					'comment' => 'newusers comment',
+					'user' => 0,
+					'user_text' => 'User',
+					'namespace' => NS_USER,
+					'title' => 'UTSysop',
+					'params' => array(
+						'4::userid' => 1,
+					),
+				),
+				array(
+					'text' => 'User account UTSysop was created by User',
+					'api' => array(
+						'userid' => 1,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideCreate2LogDatabaseRows
+	 */
+	public function testCreate2LogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideByemailLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'newusers',
+					'action' => 'byemail',
+					'comment' => 'newusers comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'UTSysop',
+					'params' => array(
+						'4::userid' => 1,
+					),
+				),
+				array(
+					'text' => 'User account UTSysop was created by Sysop and password was sent by email',
+					'api' => array(
+						'userid' => 1,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideByemailLogDatabaseRows
+	 */
+	public function testByemailLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideAutocreateLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'newusers',
+					'action' => 'autocreate',
+					'comment' => 'newusers comment',
+					'user' => 0,
+					'user_text' => 'New user',
+					'namespace' => NS_USER,
+					'title' => 'New user',
+					'params' => array(
+						'4::userid' => 1,
+					),
+				),
+				array(
+					'text' => 'User account New user was created automatically',
+					'api' => array(
+						'userid' => 1,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideAutocreateLogDatabaseRows
+	 */
+	public function testAutocreateLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}
diff --git a/tests/phpunit/includes/logging/PageLangLogFormatterTest.php b/tests/phpunit/includes/logging/PageLangLogFormatterTest.php
new file mode 100644
index 00000000..226e492b
--- /dev/null
+++ b/tests/phpunit/includes/logging/PageLangLogFormatterTest.php
@@ -0,0 +1,53 @@
+<?php
+
+class PageLangLogFormatterTest extends LogFormatterTestCase {
+
+	protected function setUp() {
+		parent::setUp();
+
+		// Disable cldr extension
+		$this->setMwGlobals( 'wgHooks', array() );
+		// Register LogHandler, see $wgPageLanguageUseDB in Setup.php
+		$this->mergeMwGlobalArrayValue( 'wgLogActionsHandlers', array(
+			'pagelang/pagelang' => 'PageLangLogFormatter',
+		) );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function providePageLangLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'pagelang',
+					'action' => 'pagelang',
+					'comment' => 'page lang comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'4::oldlanguage' => 'en',
+						'5::newlanguage' => 'de[def]',
+					),
+				),
+				array(
+					'text' => 'User changed page language for Page from English (en) to Deutsch (de) [default].',
+					'api' => array(
+						'oldlanguage' => 'en',
+						'newlanguage' => 'de[def]'
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider providePageLangLogDatabaseRows
+	 */
+	public function testPageLangLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}
diff --git a/tests/phpunit/includes/logging/PatrolLogFormatterTest.php b/tests/phpunit/includes/logging/PatrolLogFormatterTest.php
new file mode 100644
index 00000000..6e1c5efc
--- /dev/null
+++ b/tests/phpunit/includes/logging/PatrolLogFormatterTest.php
@@ -0,0 +1,118 @@
+<?php
+
+class PatrolLogFormatterTest extends LogFormatterTestCase {
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function providePatrolLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'patrol',
+					'action' => 'patrol',
+					'comment' => 'patrol comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'4::curid' => 2,
+						'5::previd' => 1,
+						'6::auto' => 0,
+					),
+				),
+				array(
+					'text' => 'User marked revision 2 of page Page patrolled',
+					'api' => array(
+						'curid' => 2,
+						'previd' => 1,
+						'auto' => false,
+					),
+				),
+			),
+
+			// Current format - autopatrol
+			array(
+				array(
+					'type' => 'patrol',
+					'action' => 'patrol',
+					'comment' => 'patrol comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'4::curid' => 2,
+						'5::previd' => 1,
+						'6::auto' => 1,
+					),
+				),
+				array(
+					'text' => 'User automatically marked revision 2 of page Page patrolled',
+					'api' => array(
+						'curid' => 2,
+						'previd' => 1,
+						'auto' => true,
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'patrol',
+					'action' => 'patrol',
+					'comment' => 'patrol comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'2',
+						'1',
+						'0',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User marked revision 2 of page Page patrolled',
+					'api' => array(
+						'curid' => 2,
+						'previd' => 1,
+						'auto' => false,
+					),
+				),
+			),
+
+			// Legacy format - autopatrol
+			array(
+				array(
+					'type' => 'patrol',
+					'action' => 'patrol',
+					'comment' => 'patrol comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'2',
+						'1',
+						'1',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User automatically marked revision 2 of page Page patrolled',
+					'api' => array(
+						'curid' => 2,
+						'previd' => 1,
+						'auto' => true,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider providePatrolLogDatabaseRows
+	 */
+	public function testPatrolLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}
diff --git a/tests/phpunit/includes/logging/ProtectLogFormatterTest.php b/tests/phpunit/includes/logging/ProtectLogFormatterTest.php
new file mode 100644
index 00000000..611b2dfc
--- /dev/null
+++ b/tests/phpunit/includes/logging/ProtectLogFormatterTest.php
@@ -0,0 +1,63 @@
+<?php
+
+class ProtectLogFormatterTest extends LogFormatterTestCase {
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideMoveProtLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'protect',
+					'action' => 'move_prot',
+					'comment' => 'Move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'NewPage',
+					'params' => array(
+						'4::oldtitle' => 'OldPage',
+					),
+				),
+				array(
+					'text' => 'User moved protection settings from OldPage to NewPage',
+					'api' => array(
+						'oldtitle_ns' => 0,
+						'oldtitle_title' => 'OldPage',
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'protect',
+					'action' => 'move_prot',
+					'comment' => 'Move comment',
+					'namespace' => NS_MAIN,
+					'title' => 'NewPage',
+					'params' => array(
+						'OldPage',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User moved protection settings from OldPage to NewPage',
+					'api' => array(
+						'oldtitle_ns' => 0,
+						'oldtitle_title' => 'OldPage',
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideMoveProtLogDatabaseRows
+	 */
+	public function testMoveProtLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}
diff --git a/tests/phpunit/includes/logging/RightsLogFormatterTest.php b/tests/phpunit/includes/logging/RightsLogFormatterTest.php
new file mode 100644
index 00000000..e9577f11
--- /dev/null
+++ b/tests/phpunit/includes/logging/RightsLogFormatterTest.php
@@ -0,0 +1,157 @@
+<?php
+
+class RightsLogFormatterTest extends LogFormatterTestCase {
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideRightsLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'rights',
+					'action' => 'rights',
+					'comment' => 'rights comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'User',
+					'params' => array(
+						'4::oldgroups' => array(),
+						'5::newgroups' => array( 'sysop', 'bureaucrat' ),
+					),
+				),
+				array(
+					'text' => 'Sysop changed group membership for User:User from (none) to '
+						. 'administrator and bureaucrat',
+					'api' => array(
+						'oldgroups' => array(),
+						'newgroups' => array( 'sysop', 'bureaucrat' ),
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'rights',
+					'action' => 'rights',
+					'comment' => 'rights comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'User',
+					'params' => array(
+						'',
+						'sysop, bureaucrat',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop changed group membership for User:User from (none) to '
+						. 'administrator and bureaucrat',
+					'api' => array(
+						'oldgroups' => array(),
+						'newgroups' => array( 'sysop', 'bureaucrat' ),
+					),
+				),
+			),
+
+			// Really old entry
+			array(
+				array(
+					'type' => 'rights',
+					'action' => 'rights',
+					'comment' => 'rights comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'User',
+					'params' => array(),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop changed group membership for User:User',
+					'api' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideRightsLogDatabaseRows
+	 */
+	public function testRightsLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideAutopromoteLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'rights',
+					'action' => 'autopromote',
+					'comment' => 'rights comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Sysop',
+					'params' => array(
+						'4::oldgroups' => array( 'sysop' ),
+						'5::newgroups' => array( 'sysop', 'bureaucrat' ),
+					),
+				),
+				array(
+					'text' => 'Sysop was automatically promoted from administrator to '
+						. 'administrator and bureaucrat',
+					'api' => array(
+						'oldgroups' => array( 'sysop' ),
+						'newgroups' => array( 'sysop', 'bureaucrat' ),
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'rights',
+					'action' => 'autopromote',
+					'comment' => 'rights comment',
+					'user' => 0,
+					'user_text' => 'Sysop',
+					'namespace' => NS_USER,
+					'title' => 'Sysop',
+					'params' => array(
+						'sysop',
+						'sysop, bureaucrat',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'Sysop was automatically promoted from administrator to '
+						. 'administrator and bureaucrat',
+					'api' => array(
+						'oldgroups' => array( 'sysop' ),
+						'newgroups' => array( 'sysop', 'bureaucrat' ),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideAutopromoteLogDatabaseRows
+	 */
+	public function testAutopromoteLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}
diff --git a/tests/phpunit/includes/logging/UploadLogFormatterTest.php b/tests/phpunit/includes/logging/UploadLogFormatterTest.php
new file mode 100644
index 00000000..12f51613
--- /dev/null
+++ b/tests/phpunit/includes/logging/UploadLogFormatterTest.php
@@ -0,0 +1,166 @@
+<?php
+
+class UploadLogFormatterTest extends LogFormatterTestCase {
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideUploadLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'upload',
+					'action' => 'upload',
+					'comment' => 'upload comment',
+					'namespace' => NS_FILE,
+					'title' => 'File.png',
+					'params' => array(
+						'img_sha1' => 'hash',
+						'img_timestamp' => '20150101000000',
+					),
+				),
+				array(
+					'text' => 'User uploaded File:File.png',
+					'api' => array(
+						'img_sha1' => 'hash',
+						'img_timestamp' => '2015-01-01T00:00:00Z',
+					),
+				),
+			),
+
+			// Old format without params
+			array(
+				array(
+					'type' => 'upload',
+					'action' => 'upload',
+					'comment' => 'upload comment',
+					'namespace' => NS_FILE,
+					'title' => 'File.png',
+					'params' => array(),
+				),
+				array(
+					'text' => 'User uploaded File:File.png',
+					'api' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideUploadLogDatabaseRows
+	 */
+	public function testUploadLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideOverwriteLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'upload',
+					'action' => 'overwrite',
+					'comment' => 'upload comment',
+					'namespace' => NS_FILE,
+					'title' => 'File.png',
+					'params' => array(
+						'img_sha1' => 'hash',
+						'img_timestamp' => '20150101000000',
+					),
+				),
+				array(
+					'text' => 'User uploaded a new version of File:File.png',
+					'api' => array(
+						'img_sha1' => 'hash',
+						'img_timestamp' => '2015-01-01T00:00:00Z',
+					),
+				),
+			),
+
+			// Old format without params
+			array(
+				array(
+					'type' => 'upload',
+					'action' => 'overwrite',
+					'comment' => 'upload comment',
+					'namespace' => NS_FILE,
+					'title' => 'File.png',
+					'params' => array(),
+				),
+				array(
+					'text' => 'User uploaded a new version of File:File.png',
+					'api' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideOverwriteLogDatabaseRows
+	 */
+	public function testOverwriteLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function provideRevertLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'upload',
+					'action' => 'revert',
+					'comment' => 'upload comment',
+					'namespace' => NS_FILE,
+					'title' => 'File.png',
+					'params' => array(
+						'img_sha1' => 'hash',
+						'img_timestamp' => '20150101000000',
+					),
+				),
+				array(
+					'text' => 'User uploaded File:File.png',
+					'api' => array(
+						'img_sha1' => 'hash',
+						'img_timestamp' => '2015-01-01T00:00:00Z',
+					),
+				),
+			),
+
+			// Old format without params
+			array(
+				array(
+					'type' => 'upload',
+					'action' => 'revert',
+					'comment' => 'upload comment',
+					'namespace' => NS_FILE,
+					'title' => 'File.png',
+					'params' => array(),
+				),
+				array(
+					'text' => 'User uploaded File:File.png',
+					'api' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideRevertLogDatabaseRows
+	 */
+	public function testRevertLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}