From 52ea1026adf67ccb04b6b3d09f7feb89e27aa346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Jun 2015 15:13:30 +0200 Subject: [PATCH] Remove type annotation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems to be broken on some PHP versions: Argument 1 passed to PMA_Util::configureCurl() must be an instance of resource, resource given, called in libraries/Config.class.php on line 774 and defined Seen this on my workstation with PHP 5.6.1 and Google shows some hits of this as well. Signed-off-by: Michal Čihař --- libraries/Util.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index bbc7f8efb8..c4465fe8e2 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -4474,7 +4474,7 @@ class PMA_Util * * @return resource curl_handle with updated options */ - public static function configureCurl(resource $curl_handle) + public static function configureCurl($curl_handle) { if (/*overload*/mb_strlen($GLOBALS['cfg']['ProxyUrl'])) { curl_setopt($curl_handle, CURLOPT_PROXY, $GLOBALS['cfg']['ProxyUrl']);