From 7f1c9f7b63e91bc124e9c3a93e4966adf962d1d7 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Tue, 15 Mar 2011 12:06:40 +0000 Subject: [PATCH] Fixup some more old version comparison stuff --- maintenance/update.php | 4 ++-- tests/phpunit/includes/HttpTest.php | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/maintenance/update.php b/maintenance/update.php index 9c42b44e9d..99d8813999 100644 --- a/maintenance/update.php +++ b/maintenance/update.php @@ -25,8 +25,8 @@ * @ingroup Maintenance */ -if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.1.0' ) < 0 ) ) { - echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.1.0 or higher. ABORTING.\n" . +if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.2.3' ) < 0 ) ) { + echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.2.3 or higher. ABORTING.\n" . "Check if you have a newer php executable with a different name, such as php5.\n"; die( 1 ); } diff --git a/tests/phpunit/includes/HttpTest.php b/tests/phpunit/includes/HttpTest.php index 11ebd30ef2..f668310dc8 100644 --- a/tests/phpunit/includes/HttpTest.php +++ b/tests/phpunit/includes/HttpTest.php @@ -493,9 +493,6 @@ class HttpTest extends MediaWikiTestCase { $jar = $r->getCookieJar(); $this->assertThat( $jar, $this->isInstanceOf( 'CookieJar' ) ); - 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" ); $this->assertRegExp( '/\bCOUNTRY=[^=;]+/', $serialized ); $this->assertRegExp( '/\bLAST_LANG=[^=;]+/', $serialized ); -- 2.20.1