Merge branch 'PHP-8.0'

nikic · nikic · commit dd64928f38b0 · 2021-02-10T10:52:28.000+01:00
* PHP-8.0:
  Accept null $location in SoapClient::__setLocation()
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -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();
 	}
 
diff --git a/ext/soap/soap.stub.php b/ext/soap/soap.stub.php
@@ -108,5 +108,5 @@ public function __getCookies() {}
     public function __setSoapHeaders($headers = null) {}
 
     /** @return string|null */
-    public function __setLocation(string $location = "") {}
+    public function __setLocation(?string $location = null) {}
 }

Original file line number	Diff line number	Diff line change
`@@ -2886,7 +2886,7 @@ PHP_METHOD(SoapClient, __setLocation)`
`2886`	`2886`	`zval *tmp;`
`2887`	`2887`	`zval *this_ptr = ZEND_THIS;`
`2888`	`2888`
`2889`		`- if (zend_parse_parameters(ZEND_NUM_ARGS(), "\|s", &location, &location_len) == FAILURE) {`
	`2889`	`+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "\|s!", &location, &location_len) == FAILURE) {`
`2890`	`2890`	`RETURN_THROWS();`
`2891`	`2891`	`}`
`2892`	`2892`
Original file line number	Diff line number	Diff line change
`@@ -108,5 +108,5 @@ public function __getCookies() {}`
`108`	`108`	`public function __setSoapHeaders($headers = null) {}`
`109`	`109`
`110`	`110`	`/** @return string\|null */`
`111`		`- public function __setLocation(string $location = "") {}`
	`111`	`+ public function __setLocation(?string $location = null) {}`
`112`	`112`	`}`