fix: remove unused parameters in Services::exceptions() and Exception

Author: kenjis

system/Config/BaseService.php

@@ -101,7 +101,7 @@
  * @method static CURLRequest                curlrequest($options = [], ResponseInterface $response = null, App $config = null, $getShared = true)
  * @method static Email                      email($config = null, $getShared = true)
  * @method static EncrypterInterface         encrypter(Encryption $config = null, $getShared = false)
- * @method static Exceptions                 exceptions(ConfigExceptions $config = null, IncomingRequest $request = null, ResponseInterface $response = null, $getShared = true)
+ * @method static Exceptions                 exceptions(ConfigExceptions $config = null, $getShared = true)
  * @method static Filters                    filters(ConfigFilters $config = null, $getShared = true)
  * @method static Format                     format(ConfigFormat $config = null, $getShared = true)
  * @method static Honeypot                   honeypot(ConfigHoneyPot $config = null, $getShared = true)

system/Config/Services.php

@@ -257,25 +257,18 @@ public static function encrypter(?EncryptionConfig $config = null, $getShared =
      *  - register_shutdown_function
      *
      * @return Exceptions
-     *
-     * @deprecated The parameter $request and $response are deprecated.
      */
     public static function exceptions(
         ?ExceptionsConfig $config = null,
-        ?IncomingRequest $request = null,
-        ?ResponseInterface $response = null,
         bool $getShared = true
     ) {
         if ($getShared) {
-            return static::getSharedInstance('exceptions', $config, $request, $response);
+            return static::getSharedInstance('exceptions', $config);
         }
 
         $config ??= config(ExceptionsConfig::class);
 
-        // @TODO remove instantiation of Response in the future.
-        $response ??= AppServices::response();
-
-        return new Exceptions($config, $request, $response);
+        return new Exceptions($config);
     }
 
     /**

system/Debug/Exceptions.php

@@ -74,12 +74,7 @@ class Exceptions
 
     private ?Throwable $exceptionCaughtByExceptionHandler = null;
 
-    /**
-     * @param RequestInterface|null $request
-     *
-     * @deprecated The parameter $request and $response are deprecated. No longer used.
-     */
-    public function __construct(ExceptionsConfig $config, $request, ResponseInterface $response) /** @phpstan-ignore-line */
+    public function __construct(ExceptionsConfig $config)
     {
         // For backward compatibility
         $this->ob_level = ob_get_level();

tests/system/Config/ServicesTest.php

@@ -127,13 +127,13 @@ public function testNewUnsharedEmailWithNonEmptyConfig(): void
 
     public function testNewExceptions(): void
     {
-        $actual = Services::exceptions(new Exceptions(), Services::request(), Services::response());
+        $actual = Services::exceptions(new Exceptions());
         $this->assertInstanceOf(\CodeIgniter\Debug\Exceptions::class, $actual);
     }
 
     public function testNewExceptionsWithNullConfig(): void
     {
-        $actual = Services::exceptions(null, null, null, false);
+        $actual = Services::exceptions(null, false);
         $this->assertInstanceOf(\CodeIgniter\Debug\Exceptions::class, $actual);
     }
 

tests/system/Debug/ExceptionsTest.php

@@ -19,7 +19,6 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\ReflectionHelper;
 use Config\Exceptions as ExceptionsConfig;
-use Config\Services;
 use ErrorException;
 use RuntimeException;
 
@@ -52,7 +51,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->exception = new Exceptions(new ExceptionsConfig(), Services::request(), Services::response());
+        $this->exception = new Exceptions(new ExceptionsConfig());
     }
 
     /**
@@ -65,7 +64,7 @@ public function testDeprecationsOnPhp81DoNotThrow(): void
         $config->logDeprecations     = true;
         $config->deprecationLogLevel = 'error';
 
-        $this->exception = new Exceptions($config, Services::request(), Services::response());
+        $this->exception = new Exceptions($config);
         $this->exception->initialize();
 
         // this is only needed for IDEs not to complain that strlen does not accept explicit null
@@ -89,7 +88,7 @@ public function testSuppressedDeprecationsAreLogged(): void
         $config->logDeprecations     = true;
         $config->deprecationLogLevel = 'error';
 
-        $this->exception = new Exceptions($config, Services::request(), Services::response());
+        $this->exception = new Exceptions($config);
         $this->exception->initialize();
 
         @trigger_error('Hello! I am a deprecation!', E_USER_DEPRECATED);