http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76798
Revision: 76798
Author: demon
Date: 2010-11-16 15:10:46 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
More is_a() -> instanceof
Modified Paths:
--------------
trunk/phase3/maintenance/tests/phpunit/includes/HttpTest.php
trunk/phase3/maintenance/tests/phpunit/includes/LicensesTest.php
trunk/phase3/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
Modified: trunk/phase3/maintenance/tests/phpunit/includes/HttpTest.php
===================================================================
--- trunk/phase3/maintenance/tests/phpunit/includes/HttpTest.php
2010-11-16 14:47:18 UTC (rev 76797)
+++ trunk/phase3/maintenance/tests/phpunit/includes/HttpTest.php
2010-11-16 15:10:46 UTC (rev 76798)
@@ -119,7 +119,7 @@
$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 @@
$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" );
Modified: trunk/phase3/maintenance/tests/phpunit/includes/LicensesTest.php
===================================================================
--- trunk/phase3/maintenance/tests/phpunit/includes/LicensesTest.php
2010-11-16 14:47:18 UTC (rev 76797)
+++ trunk/phase3/maintenance/tests/phpunit/includes/LicensesTest.php
2010-11-16 15:10:46 UTC (rev 76798)
@@ -9,6 +9,6 @@
";
$lc = new Licenses( array( 'licenses' => $str ) );
- $this->assertTrue( is_a( $lc, 'Licenses' ), 'Correct class' );
+ $this->assertThat( $r, $this->isInstanceOf( 'Licenses' ) );
}
}
Modified: trunk/phase3/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
===================================================================
--- trunk/phase3/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
2010-11-16 14:47:18 UTC (rev 76797)
+++ trunk/phase3/maintenance/tests/phpunit/includes/api/ApiUploadTest.php
2010-11-16 15:10:46 UTC (rev 76798)
@@ -596,7 +596,7 @@
// 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() );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
