Merged the changes

Author: patel-vansh

.github/workflows/test-file-permissions.yml

@@ -20,5 +20,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+
       - name: Detect unnecessary execution permissions
         run: php utils/check_permission_x.php

.github/workflows/test-userguide.yml

@@ -26,6 +26,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+
       - name: Setup Python
         uses: actions/setup-python@v6
         with:

composer.json

@@ -28,7 +28,7 @@
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^3.0",
-        "rector/rector": "2.3.6",
+        "rector/rector": "2.3.7",
         "shipmonk/phpstan-baseline-per-identifier": "^2.0"
     },
     "replace": {

system/BaseModel.php

@@ -582,6 +582,7 @@ abstract public function countAllResults(bool $reset = true, bool $test = false)
      * @return void
      *
      * @throws DataException
+     * @throws InvalidArgumentException if $size is not a positive integer
      */
     abstract public function chunk(int $size, Closure $userFunc);
 

system/Config/Services.php

@@ -198,6 +198,8 @@ public static function csp(?CSPConfig $config = null, bool $getShared = true)
      * The CURL Request class acts as a simple HTTP client for interacting
      * with other servers, typically through APIs.
      *
+     * @todo v4.8.0 Remove $config parameter since unused
+     *
      * @return CURLRequest
      */
     public static function curlrequest(array $options = [], ?ResponseInterface $response = null, ?App $config = null, bool $getShared = true)
@@ -207,7 +209,7 @@ public static function curlrequest(array $options = [], ?ResponseInterface $resp
         }
 
         $config ??= config(App::class);
-        $response ??= new Response($config);
+        $response ??= new Response();
 
         return new CURLRequest(
             $config,
@@ -576,6 +578,8 @@ public static function incomingrequest(?App $config = null, bool $getShared = tr
     /**
      * The Response class models an HTTP response.
      *
+     * @todo v4.8.0 Remove $config parameter since unused
+     *
      * @return ResponseInterface
      */
     public static function response(?App $config = null, bool $getShared = true)
@@ -584,14 +588,14 @@ public static function response(?App $config = null, bool $getShared = true)
             return static::getSharedInstance('response', $config);
         }
 
-        $config ??= config(App::class);
-
-        return new Response($config);
+        return new Response();
     }
 
     /**
      * The Redirect class provides nice way of working with redirects.
      *
+     * @todo v4.8.0 Remove $config parameter since unused
+     *
      * @return RedirectResponse
      */
     public static function redirectresponse(?App $config = null, bool $getShared = true)
@@ -600,8 +604,7 @@ public static function redirectresponse(?App $config = null, bool $getShared = t
             return static::getSharedInstance('redirectresponse', $config);
         }
 
-        $config ??= config(App::class);
-        $response = new RedirectResponse($config);
+        $response = new RedirectResponse();
         $response->setProtocolVersion(AppServices::get('request')->getProtocolVersion());
 
         return $response;

system/Database/BaseConnection.php

@@ -1524,7 +1524,7 @@ public function callFunction(string $functionName, ...$params): bool
     {
         $driver = $this->getDriverFunctionPrefix();
 
-        if (! str_contains($driver, $functionName)) {
+        if (! str_starts_with($functionName, $driver)) {
             $functionName = $driver . $functionName;
         }
 

system/Database/BasePreparedQuery.php

@@ -80,10 +80,10 @@ public function __construct(BaseConnection $db)
      */
     public function prepare(string $sql, array $options = [], string $queryClass = Query::class)
     {
-        // We only supports positional placeholders (?)
-        // in order to work with the execute method below, so we
-        // need to replace our named placeholders (:name)
-        $sql = preg_replace('/:[^\s,)]+/', '?', $sql);
+        // We only support positional placeholders (?), so convert
+        // named placeholders (:name or :name:) while leaving dialect
+        // syntax like PostgreSQL casts (::type) untouched.
+        $sql = preg_replace('/(?<!:):([a-zA-Z_]\w*):?(?!:)/', '?', $sql);
 
         /** @var Query $query */
         $query = new $queryClass($this->db);

system/Debug/BaseExceptionHandler.php

@@ -13,10 +13,6 @@
 
 namespace CodeIgniter\Debug;
 
-use CodeIgniter\HTTP\CLIRequest;
-use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Exceptions as ExceptionsConfig;
 use Throwable;
 
@@ -53,21 +49,6 @@ public function __construct(ExceptionsConfig $config)
         }
     }
 
-    /**
-     * The main entry point into the handler.
-     *
-     * @param CLIRequest|IncomingRequest $request
-     *
-     * @return void
-     */
-    abstract public function handle(
-        Throwable $exception,
-        RequestInterface $request,
-        ResponseInterface $response,
-        int $statusCode,
-        int $exitCode,
-    );
-
     /**
      * Gathers the variables that will be made available to the view.
      */
@@ -76,7 +57,7 @@ protected function collectVars(Throwable $exception, int $statusCode): array
         // Get the first exception.
         $firstException = $exception;
 
-        while ($prevException = $firstException->getPrevious()) {
+        while (($prevException = $firstException->getPrevious()) instanceof Throwable) {
             $firstException = $prevException;
         }
 
@@ -103,24 +84,22 @@ protected function collectVars(Throwable $exception, int $statusCode): array
     protected function maskSensitiveData(array $trace, array $keysToMask, string $path = ''): array
     {
         foreach ($trace as $i => $line) {
-            $trace[$i]['args'] = $this->maskData($line['args'], $keysToMask);
+            $trace[$i]['args'] = $this->maskData($line['args'], $keysToMask, $path);
         }
 
         return $trace;
     }
 
     /**
-     * @param array|object $args
-     *
-     * @return array|object
+     * @param array<int, string> $keysToMask
      */
-    private function maskData($args, array $keysToMask, string $path = '')
+    private function maskData(mixed $args, array $keysToMask, string $path = ''): mixed
     {
-        foreach ($keysToMask as $keyToMask) {
-            $explode = explode('/', $keyToMask);
+        foreach ($keysToMask as $key) {
+            $explode = explode('/', $key);
             $index   = end($explode);
 
-            if (str_starts_with(strrev($path . '/' . $index), strrev($keyToMask))) {
+            if (str_starts_with(strrev($path . '/' . $index), strrev($key))) {
                 if (is_array($args) && array_key_exists($index, $args)) {
                     $args[$index] = '******************';
                 } elseif (

system/Debug/ExceptionHandler.php

@@ -95,9 +95,7 @@ public function handle(
                 $this->respond($data, $statusCode)->send();
 
                 if (ENVIRONMENT !== 'testing') {
-                    // @codeCoverageIgnoreStart
-                    exit($exitCode);
-                    // @codeCoverageIgnoreEnd
+                    exit($exitCode); // @codeCoverageIgnore
                 }
 
                 return;
@@ -126,9 +124,7 @@ public function handle(
         $this->render($exception, $statusCode, $viewFile);
 
         if (ENVIRONMENT !== 'testing') {
-            // @codeCoverageIgnoreStart
-            exit($exitCode);
-            // @codeCoverageIgnoreEnd
+            exit($exitCode); // @codeCoverageIgnore
         }
     }