improve foxes for php 8.5 by avoiding @ silencing

Author: gggeek

demo/server/methodProviders/testsuite.php

@@ -70,7 +70,7 @@ function setCookies($cookies)
                 isset($cookieDesc['httponly']) ? (bool)$cookieDesc['httponly'] : false
             );
         } else {
-            /// @todo
+            /// @todo what to do?
         }
     }
 

src/Client.php

@@ -1274,19 +1274,19 @@ protected function sendViaCURL($req, $method, $server, $port, $path, $opts)
             $this->errstr = 'no response';
             $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
                 ': ' . curl_error($curl));
-            @curl_close($curl);
+            if (PHP_MAJOR_VERSION < 8) curl_close($curl);
             if ($opts['keepalive']) {
                 $this->xmlrpc_curl_handle = null;
             }
         } else {
             if (!$opts['keepalive']) {
-                @curl_close($curl);
+                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
             }
             $resp = $req->parseResponse($result, true, $opts['return_type']);
             if ($opts['keepalive']) {
                 /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls
                 if ($resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) {
-                    @curl_close($curl);
+                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
                     $this->xmlrpc_curl_handle = null;
                 }
             }
@@ -1442,7 +1442,7 @@ protected function createCURLHandle($req, $method, $server, $port, $path, $opts)
                     curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
                 } else {
                     $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install');
-                    @curl_close($curl);
+                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
                     return false;
                 }
                 break;
@@ -1457,7 +1457,7 @@ protected function createCURLHandle($req, $method, $server, $port, $path, $opts)
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']);
             } elseif ($opts['authtype'] != 1) {
                 $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
-                @curl_close($curl);
+                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
                 return false;
             }
         }
@@ -1508,7 +1508,7 @@ protected function createCURLHandle($req, $method, $server, $port, $path, $opts)
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']);
                 } elseif ($opts['proxy_authtype'] != 1) {
                     $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
-                    @curl_close($curl);
+                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
                     return false;
                 }
             }

src/Helper/XMLParser.php

@@ -272,19 +272,19 @@ public function parse($data, $returnType = self::RETURN_XMLRPCVALS, $accept = 3,
             }
         /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times
         } catch (\Exception $e) {
-            @xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
             $this->current_parsing_options = array();
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         } catch (\Error $e) {
-            @xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
             $this->current_parsing_options = array();
             //$this->accept = $prevAccept;
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         }
 
-        @xml_parser_free($parser);
+        if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
         $this->current_parsing_options = array();
 
         // BC

tests/WebTestCase.php

@@ -41,7 +41,7 @@ protected function request($path, $method = 'GET', $payload = '', $emptyPageOk =
         }
         $page = curl_exec($ch);
         $info = curl_getinfo($ch);
-        @curl_close($ch);
+        if (PHP_MAJOR_VERSION < 8) curl_close($ch);
 
         $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']);
         if (!$emptyPageOk) {