From 07825883b009dca92d077aa0c458ae0ae4f8ef33 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 8 Jul 2025 14:13:42 +0200 Subject: [PATCH 1/2] build(deps): Bump php-http/guzzle7-adapter from 1.0.0 to 1.1.0 - Add support for PHP 8.4, drop support for PHP version 7.2 Signed-off-by: Ferdinand Thiessen --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index feff92626b298..ea127103c578c 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit feff92626b298768baad0ed37ab9801627c8c546 +Subproject commit ea127103c578c964009944f7748f245024c97e2e From 5b96cca038dbe93568fd6c4c342475195a12169b Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 8 Jul 2025 15:00:09 +0200 Subject: [PATCH 2/2] chore(Http\Client): fix linting issues Signed-off-by: Ferdinand Thiessen --- lib/private/Http/Client/DnsPinMiddleware.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/lib/private/Http/Client/DnsPinMiddleware.php b/lib/private/Http/Client/DnsPinMiddleware.php index 630d2c8e9f1c6..96e0f71adbe9a 100644 --- a/lib/private/Http/Client/DnsPinMiddleware.php +++ b/lib/private/Http/Client/DnsPinMiddleware.php @@ -13,23 +13,15 @@ use Psr\Http\Message\RequestInterface; class DnsPinMiddleware { - /** @var NegativeDnsCache */ - private $negativeDnsCache; - private IpAddressClassifier $ipAddressClassifier; public function __construct( - NegativeDnsCache $negativeDnsCache, - IpAddressClassifier $ipAddressClassifier, + private NegativeDnsCache $negativeDnsCache, + private IpAddressClassifier $ipAddressClassifier, ) { - $this->negativeDnsCache = $negativeDnsCache; - $this->ipAddressClassifier = $ipAddressClassifier; } /** * Fetch soa record for a target - * - * @param string $target - * @return array|null */ private function soaRecord(string $target): ?array { $labels = explode('.', $target); @@ -99,7 +91,7 @@ protected function dnsGetRecord(string $hostname, int $type): array|false { return \dns_get_record($hostname, $type); } - public function addDnsPinning() { + public function addDnsPinning(): callable { return function (callable $handler) { return function ( RequestInterface $request, @@ -109,7 +101,7 @@ public function addDnsPinning() { return $handler($request, $options); } - $hostName = (string)$request->getUri()->getHost(); + $hostName = $request->getUri()->getHost(); $port = $request->getUri()->getPort(); $ports = [