Merge remote-tracking branch 'upstream/develop' into 4.8

# Conflicts:
#	system/Autoloader/Autoloader.php
#	system/Filters/Filters.php
#	utils/phpstan-baseline/loader.neon

Author: michalsn

.github/scripts/random-tests-config.txt

@@ -9,41 +9,41 @@
 # Reference: https://github.com/codeigniter4/CodeIgniter4/issues/9968
 
 API
-# AutoReview
-# Autoloader
+AutoReview
+Autoloader
 # Cache
 CLI
 # Commands
 # Config
-# Cookie
-# DataCaster
+Cookie
+DataCaster
 # DataConverter
 # Database
-# Debug
-# Email
-# Encryption
-# Entity
-# Events
-# Files
+Debug
+Email
+Encryption
+Entity
+Events
+Files
 # Filters
-# Format
+Format
 # HTTP
 # Helpers
 # Honeypot
-# HotReloader
-# I18n
+HotReloader
+I18n
 # Images
-# Language
-# Log
+Language
+Log
 # Models
-# Pager
-# Publisher
-# RESTful
+Pager
+Publisher
+RESTful
 # Router
-# Security
+Security
 # Session
 # Test
-# Throttle
-# Typography
+Throttle
+Typography
 # Validation
-# View
+View

.github/scripts/run-random-tests.sh

@@ -23,6 +23,7 @@
 ################################################################################
 
 set -u
+export LC_NUMERIC=C
 trap 'kill "${bg_pids[@]:-}" 2>/dev/null; wait 2>/dev/null' EXIT INT TERM
 
 ################################################################################

.github/workflows/reusable-phpunit-test.yml

@@ -114,7 +114,7 @@ jobs:
           --health-retries=3
 
       oracle:
-        image: gvenzl/oracle-xe:21
+        image: gvenzl/oracle-free:latest
         env:
           ORACLE_RANDOM_PASSWORD: true
           APP_USER: ORACLE

.github/workflows/test-random-execution.yml

@@ -25,7 +25,7 @@ on:
       - 'system/**.php'
       - 'tests/**.php'
 
-  workflow_call:
+  workflow_dispatch:
     inputs:
       quiet:
         description: Suppress debug output
@@ -120,7 +120,7 @@ jobs:
           --health-retries=3
 
       oracle:
-        image: gvenzl/oracle-xe:21
+        image: gvenzl/oracle-free:latest
         env:
           ORACLE_RANDOM_PASSWORD: true
           APP_USER: ORACLE
@@ -223,3 +223,12 @@ jobs:
         env:
           DB: ${{ matrix.db-platform }}
           TERM: xterm-256color
+
+      - name: Upload random-test artifacts on failure
+        if: ${{ always() && failure() }}
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: random-tests-${{ matrix.db-platform }}-php${{ matrix.php-version }}
+          path: build/random-tests/
+          retention-days: 1
+          overwrite: true

app/Config/Database.php

@@ -143,7 +143,7 @@ class Database extends Config
     //     * @var array<string, mixed>
     //     */
     //    public array $default = [
-    //        'DSN'        => 'localhost:1521/XEPDB1',
+    //        'DSN'        => 'localhost:1521/FREEPDB1',
     //        'username'   => 'root',
     //        'password'   => 'root',
     //        'DBDriver'   => 'OCI8',

system/Autoloader/Autoloader.php

@@ -93,6 +93,10 @@ class Autoloader
      */
     protected $helpers = ['url'];
 
+    public function __construct(private readonly string $composerPath = COMPOSER_PATH)
+    {
+    }
+
     /**
      * Reads in the configuration array (described above) and stores
      * the valid parts that we'll need.
@@ -127,7 +131,7 @@ public function initialize(Autoload $config, Modules $modules)
             $this->helpers = [...$this->helpers, ...$config->helpers];
         }
 
-        if (is_file(COMPOSER_PATH)) {
+        if (is_file($this->composerPath)) {
             $this->loadComposerAutoloader($modules);
         }
 
@@ -139,11 +143,11 @@ private function loadComposerAutoloader(Modules $modules): void
         // The path to the vendor directory.
         // We do not want to enforce this, so set the constant if Composer was used.
         if (! defined('VENDORPATH')) {
-            define('VENDORPATH', dirname(COMPOSER_PATH) . DIRECTORY_SEPARATOR);
+            define('VENDORPATH', dirname($this->composerPath) . DIRECTORY_SEPARATOR);
         }
 
         /** @var ClassLoader $composer */
-        $composer = include COMPOSER_PATH;
+        $composer = include $this->composerPath;
 
         // Should we load through Composer's namespaces, also?
         if ($modules->discoverInComposer) {

system/BaseModel.php

@@ -670,7 +670,7 @@ public function findColumn(string $columnName)
      */
     public function findAll(?int $limit = null, int $offset = 0)
     {
-        $limitZeroAsAll = config(Feature::class)->limitZeroAsAll ?? true;
+        $limitZeroAsAll = config(Feature::class)->limitZeroAsAll ?? true; // @phpstan-ignore nullCoalesce.property
         if ($limitZeroAsAll) {
             $limit ??= 0;
         }

system/Boot.php

@@ -205,7 +205,7 @@ public static function preload(Paths $paths): void
     protected static function loadDotEnv(Paths $paths): void
     {
         require_once $paths->systemDirectory . '/Config/DotEnv.php';
-        $envDirectory = $paths->envDirectory ?? $paths->appDirectory . '/../';
+        $envDirectory = $paths->envDirectory ?? $paths->appDirectory . '/../'; // @phpstan-ignore nullCoalesce.property
         (new DotEnv($envDirectory))->load();
     }
 

system/Cache/CacheFactory.php

@@ -49,14 +49,10 @@ class CacheFactory
      */
     public static function getHandler(Cache $config, ?string $handler = null, ?string $backup = null)
     {
-        if (! isset($config->validHandlers) || $config->validHandlers === []) {
+        if ($config->validHandlers === []) {
             throw CacheException::forInvalidHandlers();
         }
 
-        if (! isset($config->handler) || ! isset($config->backupHandler)) {
-            throw CacheException::forNoBackup();
-        }
-
         $handler ??= $config->handler;
         $backup ??= $config->backupHandler;
 

system/Cache/Handlers/PredisHandler.php

@@ -65,9 +65,7 @@ public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;
 
-        if (isset($config->redis)) {
-            $this->config = array_merge($this->config, $config->redis);
-        }
+        $this->config = array_merge($this->config, $config->redis);
     }
 
     public function initialize(): void