From 6073f19e12ec186f328c2d5f972cf3a0f821e4ae Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Wed, 12 Mar 2014 18:08:40 +0100 Subject: [PATCH] Fix CodeSniffer errors and warnings in changes tests Follow-up to 1c6b7c74859e7. Change-Id: Ib42621a03a43487d94ff1cb755544823a8adda9c --- .../changes/RCCacheEntryFactoryTest.php | 26 +++++++++++++------ .../includes/changes/RecentChangeTest.php | 18 ++++++++----- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php b/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php index dc47e359ee..49feec1ccc 100644 --- a/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php +++ b/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php @@ -1,4 +1,5 @@ */ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { - protected function setUp() { parent::setUp(); @@ -20,7 +20,9 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { /** * @dataProvider editChangeProvider */ - public function testNewFromRecentChange( $expected, $context, $messages, $recentChange, $watched ) { + public function testNewFromRecentChange( $expected, $context, $messages, + $recentChange, $watched + ) { $cacheEntryFactory = new RCCacheEntryFactory( $context, $messages ); $cacheEntry = $cacheEntryFactory->newFromRecentChange( $recentChange, $watched ); @@ -28,7 +30,10 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { $this->assertEquals( $watched, $cacheEntry->watched, 'watched' ); $this->assertEquals( $expected['timestamp'], $cacheEntry->timestamp, 'timestamp' ); - $this->assertEquals( $expected['numberofWatchingusers'], $cacheEntry->numberofWatchingusers, 'watching users' ); + $this->assertEquals( + $expected['numberofWatchingusers'], $cacheEntry->numberofWatchingusers, + 'watching users' + ); $this->assertEquals( $expected['unpatrolled'], $cacheEntry->unpatrolled, 'unpatrolled' ); $this->assertUserLinks( 'Mary', $cacheEntry ); @@ -98,7 +103,10 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { $this->assertEquals( $watched, $cacheEntry->watched, 'watched' ); $this->assertEquals( $expected['timestamp'], $cacheEntry->timestamp, 'timestamp' ); - $this->assertEquals( $expected['numberofWatchingusers'], $cacheEntry->numberofWatchingusers, 'watching users' ); + $this->assertEquals( + $expected['numberofWatchingusers'], + $cacheEntry->numberofWatchingusers, 'watching users' + ); $this->assertEquals( $expected['unpatrolled'], $cacheEntry->unpatrolled, 'unpatrolled' ); $this->assertDeleteLogLink( $cacheEntry ); @@ -168,7 +176,10 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { $this->assertEquals( $watched, $cacheEntry->watched, 'watched' ); $this->assertEquals( $expected['timestamp'], $cacheEntry->timestamp, 'timestamp' ); - $this->assertEquals( $expected['numberofWatchingusers'], $cacheEntry->numberofWatchingusers, 'watching users' ); + $this->assertEquals( + $expected['numberofWatchingusers'], + $cacheEntry->numberofWatchingusers, 'watching users' + ); $this->assertEquals( $expected['unpatrolled'], $cacheEntry->unpatrolled, 'unpatrolled' ); $this->assertRevDel( $cacheEntry ); @@ -325,7 +336,7 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { 'assert query link element' ); - foreach( $params as $key => $value ) { + foreach ( $params as $key => $value ) { $this->assertRegExp( '/' . $key . '=' . $value . '/', $link, "verify $key link params" ); } } @@ -368,7 +379,7 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { private function getTestUser() { $user = User::newFromName( 'Mary' ); - if ( ! $user->getId() ) { + if ( !$user->getId() ) { $user->addToDatabase(); } @@ -401,5 +412,4 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { return $context; } - } diff --git a/tests/phpunit/includes/changes/RecentChangeTest.php b/tests/phpunit/includes/changes/RecentChangeTest.php index cfa3e777df..c63675e9d0 100644 --- a/tests/phpunit/includes/changes/RecentChangeTest.php +++ b/tests/phpunit/includes/changes/RecentChangeTest.php @@ -1,4 +1,5 @@ assertIRCComment( - $this->context->msg( '1movedto2', 'SomeTitle', 'TestTarget' )->plain() . $sep . $this->user_comment, + $this->context->msg( '1movedto2', 'SomeTitle', 'TestTarget' ) + ->plain() . $sep . $this->user_comment, 'move', 'move', $move_params, $this->user_comment @@ -144,7 +146,8 @@ class RecentChangeTest extends MediaWikiTestCase { # move/move_redir $this->assertIRCComment( - $this->context->msg( '1movedto2_redir', 'SomeTitle', 'TestTarget' )->plain() . $sep . $this->user_comment, + $this->context->msg( '1movedto2_redir', 'SomeTitle', 'TestTarget' ) + ->plain() . $sep . $this->user_comment, 'move', 'move_redir', $move_params, $this->user_comment @@ -178,7 +181,8 @@ class RecentChangeTest extends MediaWikiTestCase { # protect/protect $this->assertIRCComment( - $this->context->msg( 'protectedarticle', 'SomeTitle ' . $protectParams[0] )->plain() . $sep . $this->user_comment, + $this->context->msg( 'protectedarticle', 'SomeTitle ' . $protectParams[0] ) + ->plain() . $sep . $this->user_comment, 'protect', 'protect', $protectParams, $this->user_comment @@ -194,7 +198,8 @@ class RecentChangeTest extends MediaWikiTestCase { # protect/modify $this->assertIRCComment( - $this->context->msg( 'modifiedarticleprotection', 'SomeTitle ' . $protectParams[0] )->plain() . $sep . $this->user_comment, + $this->context->msg( 'modifiedarticleprotection', 'SomeTitle ' . $protectParams[0] ) + ->plain() . $sep . $this->user_comment, 'protect', 'modify', $protectParams, $this->user_comment @@ -255,8 +260,9 @@ class RecentChangeTest extends MediaWikiTestCase { * @param $comment String (optional) A comment for the log action * @param $msg String (optional) A message for PHPUnit :-) */ - protected function assertIRCComment( $expected, $type, $action, $params, $comment = null, $msg = '' ) { - + protected function assertIRCComment( $expected, $type, $action, $params, + $comment = null, $msg = '' + ) { $logEntry = new ManualLogEntry( $type, $action ); $logEntry->setPerformer( $this->user ); $logEntry->setTarget( $this->title ); -- 2.20.1