Merge "title: Convert binary regexp to use Unicode code points"

[lhc/web/wiklou.git] / includes / http / GuzzleHttpRequest.php

diff --git a/includes/http/GuzzleHttpRequest.php b/includes/http/GuzzleHttpRequest.php
index ef70467..3af7f56 100644 (file)
--- a/includes/http/GuzzleHttpRequest.php
+++ b/includes/http/GuzzleHttpRequest.php
@@ -45,7 +45,7 @@ class GuzzleHttpRequest extends MWHttpRequest {
 
        /**
         * @param string $url Url to use. If protocol-relative, will be expanded to an http:// URL
-        * @param array $options (optional) extra params to pass (see Http::request())
+        * @param array $options (optional) extra params to pass (see HttpRequestFactory::create())
         * @param string $caller The method making this request, for profiling
         * @param Profiler|null $profiler An instance of the profiler for profiling, or null
         * @throws Exception
@@ -95,7 +95,7 @@ class GuzzleHttpRequest extends MWHttpRequest {
         * If a sink is already specified, this does nothing.  This causes the 'sink' constructor
         * option to override the 'callback' constructor option.
         *
-        * @param $callback|null $callback
+        * @param callable|null $callback
         * @throws InvalidArgumentException
         */
        protected function doSetCallback( $callback ) {