Fix code review comments

EXTENSIONS

@@ -504,7 +504,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           uri
-PRIMARY MAINTAINER   Máté Kocsis <[email protected]> (2024 - 2024)
+PRIMARY MAINTAINER   Máté Kocsis <[email protected]> (2025 - 2025)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               8.5.0

ext/filter/logical_filters.c

@@ -613,7 +613,7 @@ void php_filter_validate_url(http://github.com/PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 	}
 
 	/* Parse the URI - if it fails, we return NULL */
-	php_uri *uri = php_uri_parse_to_struct(uri_handler, Z_STR_P(value), URI_COMPONENT_READ_NORMALIZED_FOR_MACHINE_PROCESSING, NULL);
+	php_uri *uri = php_uri_parse_to_struct(uri_handler, Z_STR_P(value), URI_COMPONENT_READ_NORMALIZED_ASCII, NULL);
 	if (uri == NULL) {
 		RETURN_VALIDATION_FAILED
 	}

ext/soap/php_http.c

@@ -440,7 +440,7 @@ int make_http_soap_request(zval              *this_ptr,
 			zend_argument_value_error(6, "must be a valid URI parser name");
 			return FALSE;
 		}
-		uri = php_uri_parse_to_struct(uri_handler, location, URI_COMPONENT_READ_NORMALIZED_FOR_MACHINE_PROCESSING, NULL);
+		uri = php_uri_parse_to_struct(uri_handler, location, URI_COMPONENT_READ_NORMALIZED_ASCII, NULL);
 	}
 
 	tmp = Z_CLIENT_STREAM_CONTEXT_P(this_ptr);
@@ -1161,7 +1161,7 @@ int make_http_soap_request(zval              *this_ptr,
 			}
 
 			zend_string *loc_str = zend_string_init(loc, strlen(loc), false);
-			php_uri *new_uri = php_uri_parse_to_struct(uri_handler, loc_str, URI_COMPONENT_READ_NORMALIZED_FOR_MACHINE_PROCESSING, NULL);
+			php_uri *new_uri = php_uri_parse_to_struct(uri_handler, loc_str, URI_COMPONENT_READ_NORMALIZED_ASCII, NULL);
 			zend_string_release(loc_str);
 
 			if (new_uri != NULL) {

ext/soap/tests/SoapServer/__getLastResponse.phpt

@@ -18,7 +18,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction("f");
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/any.phpt

@@ -33,7 +33,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('echoAnyElement');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug28969.phpt

@@ -18,7 +18,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug29795.phpt

@@ -12,7 +12,7 @@ class LocalSoapClient extends SoapClient {
     parent::__construct($wsdl, $options);
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
 xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"

ext/soap/tests/bugs/bug29839.phpt

@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('EchoString');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug29844.phpt

@@ -22,7 +22,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->setClass('hello_world');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug30045.phpt

@@ -21,7 +21,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('foo');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     $xml = simplexml_load_string($request);
     echo $xml->children("http://schemas.xmlsoap.org/soap/envelope/")->Body->children("http://test-uri")->children()->param1->asXML(),"\n";
     unset($xml);

ext/soap/tests/bugs/bug30106.phpt

@@ -21,7 +21,7 @@ class LocalSoapClient extends SoapClient {
         $this->server->addFunction("getContinentList");
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     echo $request;
     ob_start();
     $this->server->handle($request);

ext/soap/tests/bugs/bug30175.phpt

@@ -9,7 +9,7 @@ soap.wsdl_cache_enabled=0
 
 class LocalSoapClient extends SoapClient {
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope

ext/soap/tests/bugs/bug30928.phpt

@@ -25,7 +25,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug31695.phpt

@@ -19,7 +19,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction("Test");
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     echo "$location\n";
     ob_start();
     $this->server->handle($request);

ext/soap/tests/bugs/bug31755.phpt

@@ -5,7 +5,7 @@ soap
 --FILE--
 <?php
 class MySoapClient extends SoapClient {
-    public function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+    public function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
         echo $request, "\n";
         return '';
     }

ext/soap/tests/bugs/bug32776.phpt

@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug32941.phpt

@@ -5,7 +5,7 @@ soap
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope

ext/soap/tests/bugs/bug34449.phpt

@@ -5,7 +5,7 @@ soap
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): never {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): never {
     echo "$request\n";
     exit;
   }

ext/soap/tests/bugs/bug34453.phpt

@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('EchoString');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug34643.phpt

@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->setClass('fp');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug35142.phpt

@@ -25,7 +25,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('PostEvents');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     echo "$request\n";
     ob_start();
     $this->server->handle($request);

ext/soap/tests/bugs/bug35273.phpt

@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): never {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): never {
     echo $request;
     exit;
   }

ext/soap/tests/bugs/bug36226-2.phpt

@@ -24,7 +24,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('PostEvents');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     echo "$request\n";
     $this->server->handle($request);
     return $response;

ext/soap/tests/bugs/bug36226.phpt

@@ -25,7 +25,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('PostEvents');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     echo "$request\n";
     ob_start();
     $this->server->handle($request);

ext/soap/tests/bugs/bug36999.phpt

@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('echoLong');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug37083.phpt

@@ -7,7 +7,7 @@ soap.wsdl_cache=3
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-    function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+    function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
         return <<<EOF
 <?xml version="1.0" encoding="utf-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

ext/soap/tests/bugs/bug38004.phpt

@@ -21,7 +21,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug38005.phpt

@@ -19,7 +19,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug38055.phpt

@@ -22,7 +22,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug38067.phpt

@@ -21,7 +21,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0, $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
@@ -32,13 +32,13 @@ class TestSoapClient extends SoapClient {
 
 $client = new TestSoapClient(__DIR__.'/bug38067.wsdl',
     array('encoding' => 'ISO-8859-1'));
-$str = 'test: �';
+$str = 'test: �';
 $res = $client->Test(array('str'=>$str));
 echo $str."\n";
 echo $res."\n";
 echo $g."\n";
 ?>
 --EXPECT--
-test: �
-test: �
-test: �
+test: �
+test: �
+test: �

ext/soap/tests/bugs/bug38536.phpt

@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class LocalSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope

ext/soap/tests/bugs/bug39121.phpt

@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class LocalSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">

ext/soap/tests/bugs/bug39815.phpt

@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug42692.phpt

@@ -19,7 +19,7 @@ class TestSoap extends SoapClient {
         $this->server->addFunction("checkAuth");
     }
 
-    function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+    function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
         ob_start();
         $this->server->handle($request);
         $response = ob_get_contents();

ext/soap/tests/bugs/bug43045.phpt

@@ -16,7 +16,7 @@ class TestSoapClient extends SoapClient {
     $this->server = new SoapServer($wsdl, $options);
     $this->server->addFunction('test');
   }
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug44882.phpt

@@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0
 <?php
 class TestSoapClient extends SoapClient
 {
-    public function __doRequest($req, $loc, $act, $ver, $one_way = 0, ?string $uriParserName = null): string
+    public function __doRequest($req, $loc, $act, $ver, $one_way = 0, ?string $uriParserClass = null): string
     {
         return <<<XML
 <?xml version="1.0" encoding="UTF-8"?>

ext/soap/tests/bugs/bug46419.phpt

@@ -17,7 +17,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('bar');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug47021.phpt

@@ -57,9 +57,9 @@ $options = [
 
 class BugSoapClient extends SoapClient
 {
-    public function __doRequest($request, $location, $action, $version, $one_way = null, ?string $uriParserName = null): string
+    public function __doRequest($request, $location, $action, $version, $one_way = null, ?string $uriParserClass = null): string
     {
-        $response = parent::__doRequest($request, $location, $action, $version, $one_way, $uriParserName);
+        $response = parent::__doRequest($request, $location, $action, $version, $one_way, $uriParserClass);
 
         var_dump(strlen($response));
 

ext/soap/tests/bugs/bug50675.phpt

@@ -6,7 +6,7 @@ soap
 <?php
 
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope

ext/soap/tests/bugs/bug50762.phpt

@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->setObject(new testSoap());
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug54911.phpt

@@ -5,7 +5,7 @@ soap
 --FILE--
 <?php
     class XSoapClient extends SoapClient {
-        function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): never {
+        function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): never {
             echo self::$crash;
         }
     }