From: Máté Kocsis <kocsismate@woohoolabs.com>
Date: Thu, 18 Jun 2020 07:26:58 +0000 (+0200)
Subject: Remove the deprecated parameter of curl_version()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a43fd3bbef313c880b8acbeac7babef074471e31;p=php

Remove the deprecated parameter of curl_version()
---

diff --git a/UPGRADING b/UPGRADING
index b7670f813b..223abc46a5 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -760,6 +760,7 @@ PHP 8.0 UPGRADE NOTES
     checks for `false`. The curl_share_close() function no longer has an effect,
     instead the CurlShareHandle instance is automatically destroyed if it is no
     longer referenced.
+  . The deprecated parameter `$version` of curl_version() has been removed.
 
 - Enchant:
   . The enchant extension now uses libenchant-2 by default when available.
diff --git a/ext/curl/curl.stub.php b/ext/curl/curl.stub.php
index f7e20e30f6..04edb0f482 100644
--- a/ext/curl/curl.stub.php
+++ b/ext/curl/curl.stub.php
@@ -83,4 +83,4 @@ function curl_share_strerror(int $error_number): ?string {}
 
 function curl_strerror(int $error_number): ?string {}
 
-function curl_version(int $age = UNKNOWN): array|false {}
+function curl_version(): array|false {}
diff --git a/ext/curl/curl_arginfo.h b/ext/curl/curl_arginfo.h
index 72f68a6307..77956f1ff9 100644
--- a/ext/curl/curl_arginfo.h
+++ b/ext/curl/curl_arginfo.h
@@ -137,7 +137,6 @@ ZEND_END_ARG_INFO()
 #define arginfo_curl_strerror arginfo_curl_multi_strerror
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_curl_version, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, age, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index bdc284b4ab..7e9cbf2fdf 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1689,23 +1689,13 @@ static void curl_free_slist(zval *el)
 }
 /* }}} */
 
-/* {{{ proto array curl_version([int version])
+/* {{{ proto array curl_version()
    Return cURL version information. */
 PHP_FUNCTION(curl_version)
 {
 	curl_version_info_data *d;
-	zend_long uversion = -1;
 
-	ZEND_PARSE_PARAMETERS_START(0, 1)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_LONG(uversion)
-	ZEND_PARSE_PARAMETERS_END();
-
-	if (uversion == CURLVERSION_NOW) {
-		php_error_docref(NULL, E_DEPRECATED, "The $version parameter is deprecated");
-	} else if (ZEND_NUM_ARGS() > 0) {
-		php_error_docref(NULL, E_WARNING, "$version argument ignored");
-	}
+	ZEND_PARSE_PARAMETERS_NONE();
 
 	d = curl_version_info(CURLVERSION_NOW);
 	if (d == NULL) {
diff --git a/ext/curl/tests/curl_version_error_001.phpt b/ext/curl/tests/curl_version_error_001.phpt
deleted file mode 100644
index c281cc116b..0000000000
--- a/ext/curl/tests/curl_version_error_001.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-curl_version(): error conditions
---SKIPIF--
-<?php
-if (!extension_loaded('curl')) die('skip curl extension not available');
-?>
---FILE--
-<?php
-curl_version(CURLVERSION_NOW);
-curl_version(0);
-?>
---EXPECTF--
-Deprecated: curl_version(): The $version parameter is deprecated in %s on line %d
-
-Warning: curl_version(): $version argument ignored in %s on line %d