Merge commit 'fa89acd'

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

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/phpunit/includes/json/FormatJsonTest.php b/tests/phpunit/includes/json/FormatJsonTest.php
index f0ac6acc..8bca3331 100644
--- a/tests/phpunit/includes/json/FormatJsonTest.php
+++ b/tests/phpunit/includes/json/FormatJsonTest.php
@@ -159,12 +159,12 @@ class FormatJsonTest extends MediaWikiTestCase {
 		$this->assertJson( $json );
 
 		$st = FormatJson::parse( $json );
-		$this->assertType( 'Status', $st );
+		$this->assertInstanceOf( 'Status', $st );
 		$this->assertTrue( $st->isGood() );
 		$this->assertEquals( $expected, $st->getValue() );
 
 		$st = FormatJson::parse( $json, FormatJson::FORCE_ASSOC );
-		$this->assertType( 'Status', $st );
+		$this->assertInstanceOf( 'Status', $st );
 		$this->assertTrue( $st->isGood() );
 		$this->assertEquals( $value, $st->getValue() );
 	}
@@ -230,7 +230,7 @@ class FormatJsonTest extends MediaWikiTestCase {
 		}
 
 		$st = FormatJson::parse( $value, FormatJson::TRY_FIXING );
-		$this->assertType( 'Status', $st );
+		$this->assertInstanceOf( 'Status', $st );
 		if ( $expected === false ) {
 			$this->assertFalse( $st->isOK(), 'Expected isOK() == false' );
 		} else {
@@ -256,7 +256,7 @@ class FormatJsonTest extends MediaWikiTestCase {
 	 */
 	public function testParseErrors( $value ) {
 		$st = FormatJson::parse( $value );
-		$this->assertType( 'Status', $st );
+		$this->assertInstanceOf( 'Status', $st );
 		$this->assertFalse( $st->isOK() );
 	}
 
@@ -313,7 +313,7 @@ class FormatJsonTest extends MediaWikiTestCase {
 	 */
 	public function testParseStripComments( $json, $expect ) {
 		$st = FormatJson::parse( $json, FormatJson::STRIP_COMMENTS );
-		$this->assertType( 'Status', $st );
+		$this->assertInstanceOf( 'Status', $st );
 		$this->assertTrue( $st->isGood() );
 		$this->assertEquals( $expect, $st->getValue() );
 	}