From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 16 Nov 2010 15:10:46 +0000 (+0000)
Subject: More is_a() -> instanceof
X-Git-Tag: 1.31.0-rc.0~33863
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=033c5e9ebf9041e1a1f7b1e07aa516a3872d7765;p=lhc%2Fweb%2Fwiklou.git

More is_a() -> instanceof
---

diff --git a/maintenance/tests/phpunit/includes/HttpTest.php b/maintenance/tests/phpunit/includes/HttpTest.php
index b11ce4c5a5..b127a021ef 100644
--- a/maintenance/tests/phpunit/includes/HttpTest.php
+++ b/maintenance/tests/phpunit/includes/HttpTest.php
@@ -119,7 +119,7 @@ class HttpTest extends PHPUnit_Framework_TestCase {
 
 		$r = MWHttpRequest::factory( "http://www.example.com/this-file-does-not-exist" );
 		$er = $r->execute();
-		if ( is_a( $r, 'PhpHttpRequest' ) && version_compare( '5.2.10', phpversion(), '>' ) ) {
+		if ( $r instanceof PhpHttpRequest && version_compare( '5.2.10', phpversion(), '>' ) ) {
 			$this->assertRegexp( "/HTTP request failed/", $er->getWikiText() );
 		} else {
 			$this->assertRegexp( "/404 Not Found/", $er->getWikiText() );
@@ -538,7 +538,7 @@ class HttpTest extends PHPUnit_Framework_TestCase {
 		$jar = $r->getCookieJar();
 		$this->assertThat( $jar, $this->isInstanceOf( 'CookieJar' ) );
 
-		if ( is_a( $r, 'PhpHttpRequest' ) && version_compare( '5.1.7', phpversion(), '>' ) ) {
+		if ( $r instanceof PhpHttpRequest && version_compare( '5.1.7', phpversion(), '>' ) ) {
 			$this->markTestSkipped( 'Redirection fails or crashes PHP on 5.1.6 and prior' );
 		}
 		$serialized = $jar->serializeToHttpRequest( "/search?q=test", "www.php.net" );
diff --git a/maintenance/tests/phpunit/includes/LicensesTest.php b/maintenance/tests/phpunit/includes/LicensesTest.php
index 26437e40fd..36496a8cd8 100644
--- a/maintenance/tests/phpunit/includes/LicensesTest.php
+++ b/maintenance/tests/phpunit/includes/LicensesTest.php
@@ -9,6 +9,6 @@ class LicensesTest extends PHPUnit_Framework_TestCase {
 ";
 
 		$lc = new Licenses( array( 'licenses' => $str ) );
-		$this->assertTrue( is_a( $lc, 'Licenses' ), 'Correct class' );
+		$this->assertThat( $r, $this->isInstanceOf( 'Licenses' ) );
 	}
 }
diff --git a/maintenance/tests/phpunit/includes/api/ApiUploadTest.php b/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
index a5ccf38b80..2ab91f9ab2 100644
--- a/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
@@ -596,7 +596,7 @@ class ApiUploadTest extends ApiTestCase {
 			// see if it now doesn't exist; reload	
 			$title = Title::newFromText( $fileName, NS_FILE );
 		}
-		return ! ( $title && is_a( $title, 'Title' ) && $title->exists() );
+		return ! ( $title && $title instanceof Title && $title->exists() );
 	}
 
 	/**