From 25a54da9788f9e17b855e90ace28dbc58d7d32dc Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 10 Oct 2026 00:37:32 +0800
Subject: [PATCH] test: adjust `CURLRequestExceptionTest` to 4.8's base URI
 handling

---
 tests/system/HTTP/CURLRequestExceptionTest.php | 13 ++++++-------
 utils/phpstan-baseline/arguments.count.neon    |  7 +------
 utils/phpstan-baseline/loader.neon             |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/tests/system/HTTP/CURLRequestExceptionTest.php b/tests/system/HTTP/CURLRequestExceptionTest.php
index 581d66775c87..e8e290f2c8c8 100644
--- a/tests/system/HTTP/CURLRequestExceptionTest.php
+++ b/tests/system/HTTP/CURLRequestExceptionTest.php
@@ -38,7 +38,7 @@ public function testFailureResetsSetterOptions(string $failure, string $setter):
         $app     = new App();
         $request = $failure === 'transport'
             ? $this->failingRequest()
-            : new MockCURLRequest($app, new URI(), new Response($app));
+            : new MockCURLRequest($app, new URI(), new Response());
 
         $request->setHeader('Authorization', 'Bearer secret');
 
@@ -115,7 +115,7 @@ public function testRequestRestoresBaseURIAndDelay(bool $fail, string $defaults)
         $app     = new App();
         $request = $fail
             ? $this->failingRequest($options, $uri)
-            : new MockCURLRequest($app, $uri, new Response($app), $options);
+            : new MockCURLRequest($app, $uri, new Response(), $options);
 
         try {
             $request->get('reports', [
@@ -138,8 +138,7 @@ public function testRequestRestoresBaseURIAndDelay(bool $fail, string $defaults)
 
         $request->get('', ['baseURI' => 'https://other.example/']);
 
-        $expectedURL = $defaults === 'none' ? 'https://other.example/' : 'https://other.example/?default=value';
-        $this->assertSame($expectedURL, $request->curl_options[CURLOPT_URL]);
+        $this->assertSame('https://other.example/', $request->curl_options[CURLOPT_URL]);
         $this->assertSame($expectedURI, (string) $request->getBaseURI());
     }
 
@@ -163,7 +162,7 @@ public function testSharingPreservesBaseURIAndDelay(bool $fail): void
         $app     = new App();
         $request = $fail
             ? $this->failingRequest()
-            : new MockCURLRequest($app, new URI(), new Response($app));
+            : new MockCURLRequest($app, new URI(), new Response());
         $baseURI = 'https://alice@private.example:8443/v2/?api_key=secret';
 
         try {
@@ -229,7 +228,7 @@ public function testOptionValidationFailureResetsRequestOptions(): void
         $this->configureSharing(false);
 
         $app     = new App();
-        $request = new MockCURLRequest($app, new URI(), new Response($app));
+        $request = new MockCURLRequest($app, new URI(), new Response());
 
         try {
             $request->post('https://private.example/upload', [
@@ -284,7 +283,7 @@ private function failingRequest(array $options = [], ?URI $uri = null): MockCURL
     {
         $app = new App();
 
-        return new class ($app, $uri ?? new URI(), new Response($app), $options) extends MockCURLRequest {
+        return new class ($app, $uri ?? new URI(), new Response(), $options) extends MockCURLRequest {
             private bool $failNextRequest = true;
 
             protected function sendRequest(array $curlOptions = []): string
diff --git a/utils/phpstan-baseline/arguments.count.neon b/utils/phpstan-baseline/arguments.count.neon
index fbe6c520851c..eefe012fbfa7 100644
--- a/utils/phpstan-baseline/arguments.count.neon
+++ b/utils/phpstan-baseline/arguments.count.neon
@@ -1,4 +1,4 @@
-# total 11 errors
+# total 6 errors
 
 parameters:
     ignoreErrors:
@@ -12,11 +12,6 @@ parameters:
             count: 2
             path: ../../tests/system/Debug/ToolbarTest.php
 
-        -
-            message: '#^Class CodeIgniter\\HTTP\\Response constructor invoked with 1 parameter, 0 required\.$#'
-            count: 5
-            path: ../../tests/system/HTTP/CURLRequestExceptionTest.php
-
         -
             message: '#^Class CodeIgniter\\HTTP\\Response constructor invoked with 1 parameter, 0 required\.$#'
             count: 1
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
index 4a1142324b3e..20de678702e1 100644
--- a/utils/phpstan-baseline/loader.neon
+++ b/utils/phpstan-baseline/loader.neon
@@ -1,4 +1,4 @@
-# total 37 errors
+# total 32 errors
 
 includes:
     - arguments.count.neon