r84010 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r84009‎ | r84010 | r84011 >
Date:12:06, 15 March 2011
Author:reedy
Status:ok
Tags:
Comment:
Fixup some more old version comparison stuff
Modified paths:
  • /trunk/phase3/maintenance/update.php (modified) (history)
  • /trunk/phase3/tests/phpunit/includes/HttpTest.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/update.php
@@ -25,8 +25,8 @@
2626 * @ingroup Maintenance
2727 */
2828
29 -if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.1.0' ) < 0 ) ) {
30 - echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.1.0 or higher. ABORTING.\n" .
 29+if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.2.3' ) < 0 ) ) {
 30+ echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.2.3 or higher. ABORTING.\n" .
3131 "Check if you have a newer php executable with a different name, such as php5.\n";
3232 die( 1 );
3333 }
Index: trunk/phase3/tests/phpunit/includes/HttpTest.php
@@ -493,9 +493,6 @@
494494 $jar = $r->getCookieJar();
495495 $this->assertThat( $jar, $this->isInstanceOf( 'CookieJar' ) );
496496
497 - if ( $r instanceof PhpHttpRequest && version_compare( '5.1.7', phpversion(), '>' ) ) {
498 - $this->markTestSkipped( 'Redirection fails or crashes PHP on 5.1.6 and prior' );
499 - }
500497 $serialized = $jar->serializeToHttpRequest( "/search?q=test", "www.php.net" );
501498 $this->assertRegExp( '/\bCOUNTRY=[^=;]+/', $serialized );
502499 $this->assertRegExp( '/\bLAST_LANG=[^=;]+/', $serialized );

Status & tagging log