1
0
mirror of https://github.com/php/php-src.git synced 2026-04-03 06:02:23 +02:00

Merge branch 'PHP-8.0'

* PHP-8.0:
  Accept null $location in SoapClient::__setLocation()
This commit is contained in:
Nikita Popov
2021-02-10 10:52:28 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -2886,7 +2886,7 @@ PHP_METHOD(SoapClient, __setLocation)
zval *tmp;
zval *this_ptr = ZEND_THIS;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &location, &location_len) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &location, &location_len) == FAILURE) {
RETURN_THROWS();
}

View File

@@ -108,5 +108,5 @@ class SoapClient
public function __setSoapHeaders($headers = null) {}
/** @return string|null */
public function __setLocation(string $location = "") {}
public function __setLocation(?string $location = null) {}
}