Skip to content

Commit d2c3df9

Browse files
committed
Remove the deprecated parameter of curl_version()
1 parent 553dbf5 commit d2c3df9

File tree

4 files changed

+13
-21
lines changed

4 files changed

+13
-21
lines changed

ext/curl/curl.stub.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@ function curl_share_strerror(int $error_number): ?string {}
8383

8484
function curl_strerror(int $error_number): ?string {}
8585

86-
function curl_version(int $age = UNKNOWN): array|false {}
86+
function curl_version(): array|false {}

ext/curl/curl_arginfo.h

-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ ZEND_END_ARG_INFO()
137137
#define arginfo_curl_strerror arginfo_curl_multi_strerror
138138

139139
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_curl_version, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
140-
ZEND_ARG_TYPE_INFO(0, age, IS_LONG, 0)
141140
ZEND_END_ARG_INFO()
142141

143142

ext/curl/interface.c

+2-12
Original file line numberDiff line numberDiff line change
@@ -1689,23 +1689,13 @@ static void curl_free_slist(zval *el)
16891689
}
16901690
/* }}} */
16911691

1692-
/* {{{ proto array curl_version([int version])
1692+
/* {{{ proto array curl_version()
16931693
Return cURL version information. */
16941694
PHP_FUNCTION(curl_version)
16951695
{
16961696
curl_version_info_data *d;
1697-
zend_long uversion = -1;
16981697

1699-
ZEND_PARSE_PARAMETERS_START(0, 1)
1700-
Z_PARAM_OPTIONAL
1701-
Z_PARAM_LONG(uversion)
1702-
ZEND_PARSE_PARAMETERS_END();
1703-
1704-
if (uversion == CURLVERSION_NOW) {
1705-
php_error_docref(NULL, E_DEPRECATED, "The $version parameter is deprecated");
1706-
} else if (ZEND_NUM_ARGS() > 0) {
1707-
php_error_docref(NULL, E_WARNING, "$version argument ignored");
1708-
}
1698+
ZEND_PARSE_PARAMETERS_NONE();
17091699

17101700
d = curl_version_info(CURLVERSION_NOW);
17111701
if (d == NULL) {
+10-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
--TEST--
2-
curl_version(): error conditions
2+
curl_version(): error condition
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('curl')) die('skip curl extension not available');
66
?>
77
--FILE--
88
<?php
9-
curl_version(CURLVERSION_NOW);
10-
curl_version(0);
11-
?>
12-
--EXPECTF--
13-
Deprecated: curl_version(): The $version parameter is deprecated in %s on line %d
149

15-
Warning: curl_version(): $version argument ignored in %s on line %d
10+
try {
11+
curl_version(1);
12+
} catch (ArgumentCountError $exception) {
13+
echo $exception->getMessage() . "\n";
14+
}
15+
16+
?>
17+
--EXPECT--
18+
curl_version() expects exactly 0 parameters, 1 given

0 commit comments

Comments
 (0)