Merge commit 'fa89acd'

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

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/phpunit/includes/title/ForeignTitleTest.php b/tests/phpunit/includes/title/ForeignTitleTest.php
index 599d2a33..10b7e28f 100644
--- a/tests/phpunit/includes/title/ForeignTitleTest.php
+++ b/tests/phpunit/includes/title/ForeignTitleTest.php
@@ -59,7 +59,7 @@ class ForeignTitleTest extends MediaWikiTestCase {
 		$this->assertEquals( $expectedText, $title->getText() );
 	}
 
-	public function testUnknownNamespaceCheck( ) {
+	public function testUnknownNamespaceCheck() {
 		$title = new ForeignTitle( null, 'this', 'that' );
 
 		$this->assertEquals( false, $title->isNamespaceIdKnown() );
@@ -67,7 +67,7 @@ class ForeignTitleTest extends MediaWikiTestCase {
 		$this->assertEquals( 'that', $title->getText() );
 	}
 
-	public function testUnknownNamespaceError( ) {
+	public function testUnknownNamespaceError() {
 		$this->setExpectedException( 'MWException' );
 		$title = new ForeignTitle( null, 'this', 'that' );
 		$title->getNamespaceId();
diff --git a/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php b/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php
index cd0d0b1c..1e5f9d01 100644
--- a/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php
+++ b/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php
@@ -158,7 +158,7 @@ class MediaWikiPageLinkRendererTest extends MediaWikiTestCase {
 				function ( TitleValue $title ) {
 					return str_replace( '_', ' ', "$title" );
 				}
-			));
+			) );
 
 		$renderer = new MediaWikiPageLinkRenderer( $formatter, '/' );
 		$actual = $renderer->renderWikitextLink( $title, $text );