MWHttpRequest: Restore ability to pass null for $options

[lhc/web/wiklou.git] / tests / phpunit / includes / http / HttpTest.php

diff --git a/tests/phpunit/includes/http/HttpTest.php b/tests/phpunit/includes/http/HttpTest.php
index 3693a27..1e685bd 100644 (file)
--- a/tests/phpunit/includes/http/HttpTest.php
+++ b/tests/phpunit/includes/http/HttpTest.php
@@ -495,8 +495,11 @@ class HttpTest extends MediaWikiTestCase {
         * where it did not define a cURL constant. T72570
         *
         * @dataProvider provideCurlConstants
+        * @coversNothing
         */
        public function testCurlConstants( $value ) {
+               $this->checkPHPExtension( 'curl' );
+
                $this->assertTrue( defined( $value ), $value . ' not defined' );
        }
 }
@@ -507,7 +510,7 @@ class HttpTest extends MediaWikiTestCase {
 class MWHttpRequestTester extends MWHttpRequest {
        // function derived from the MWHttpRequest factory function but
        // returns appropriate tester class here
-       public static function factory( $url, $options = null, $caller = __METHOD__ ) {
+       public static function factory( $url, array $options = null, $caller = __METHOD__ ) {
                if ( !Http::$httpEngine ) {
                        Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php';
                } elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) {