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

Author: paulbalandan

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

@@ -65,7 +65,7 @@ env:
 jobs:
   tests:
     name: ${{ inputs.job-name }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     # Service containers cannot be extracted to caller workflows yet
     services:
@@ -97,7 +97,7 @@ jobs:
           --health-retries=3
 
       mssql:
-        image: mcr.microsoft.com/mssql/server:2022-latest
+        image: mcr.microsoft.com/mssql/server:2025-CU2-ubuntu-24.04
         env:
           MSSQL_SA_PASSWORD: 1Secure*Password1
           ACCEPT_EULA: Y
@@ -140,17 +140,32 @@ jobs:
           - 11211:11211
 
     steps:
+      - name: Install mssql-tools on runner
+        if: ${{ inputs.db-platform == 'SQLSRV' }}
+        run: |
+          # Detect Ubuntu version used by the runner (fallback to 24.04)
+          DISTRO=$(lsb_release -rs 2>/dev/null || echo '24.04')
+          curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
+          curl -sSL https://packages.microsoft.com/config/ubuntu/${DISTRO}/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
+          sudo apt-get update
+          sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 mssql-tools18 unixodbc-dev
+
+          # Make sqlcmd available to subsequent steps
+          echo "/opt/mssql-tools18/bin" >> $GITHUB_PATH
+
       - name: Create database for MSSQL Server
         if: ${{ inputs.db-platform == 'SQLSRV' }}
-        run: sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test COLLATE Latin1_General_100_CS_AS_SC_UTF8"
+        run: |
+          sqlcmd -S 127.0.0.1 \
+            -U sa -P 1Secure*Password1 \
+            -N -C \
+            -Q "CREATE DATABASE test COLLATE Latin1_General_100_CS_AS_SC_UTF8"
 
       - name: Install latest ImageMagick
         if: ${{ contains(inputs.extra-extensions, 'imagick') }}
         run: |
           sudo apt-get update
-          sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 libopenjp2-7:amd64 fonts-droid-fallback fonts-dejavu-core
-          sudo apt-get install -y gsfonts libmagickwand-dev imagemagick
-          sudo apt-get install --fix-broken
+          sudo apt-get install -y imagemagick libmagickwand-dev ghostscript poppler-data libjbig2dec0:amd64 libopenjp2-7:amd64
 
       - name: Checkout base branch for PR
         if: github.event_name == 'pull_request'

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

@@ -60,9 +60,7 @@ jobs:
         if: ${{ contains(inputs.extra-extensions, 'imagick') }}
         run: |
           sudo apt-get update
-          sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 gsfonts libopenjp2-7:amd64 fonts-droid-fallback fonts-dejavu-core
-          sudo apt-get install -y imagemagick
-          sudo apt-get install --fix-broken
+          sudo apt-get install -y imagemagick libmagickwand-dev ghostscript poppler-data libjbig2dec0:amd64 libopenjp2-7:amd64
 
       - name: Checkout base branch for PR
         if: github.event_name == 'pull_request'

.github/workflows/test-phpunit.yml

@@ -41,7 +41,7 @@ jobs:
   # in the caller workflow are not propagated to the called workflow.
   coverage-php-version:
     name: Setup PHP Version for Code Coverage
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       version: ${{ steps.coverage-php-version.outputs.version }}
     steps:

app/Config/Database.php

@@ -180,7 +180,7 @@ class Database extends Config
         'swapPre'     => '',
         'encrypt'     => false,
         'compress'    => false,
-        'strictOn'    => false,
+        'strictOn'    => true,
         'failover'    => [],
         'port'        => 3306,
         'foreignKeys' => true,

app/Config/WorkerMode.php

@@ -40,6 +40,18 @@ class WorkerMode
         'cache',
     ];
 
+    /**
+     * Reset Event Listeners
+     *
+     * List of event names whose listeners should be removed between requests.
+     * Use this if you register event listeners inside other event callbacks
+     * (rather than at the top level of Config/Events.php), which would cause
+     * them to accumulate across requests in worker mode.
+     *
+     * @var list<string>
+     */
+    public array $resetEventListeners = [];
+
     /**
      * Force Garbage Collection
      *

system/CLI/CLI.php

@@ -1099,7 +1099,35 @@ protected static function fwrite($handle, string $string)
     /**
      * Testing purpose only
      *
-     * @testTag
+     * @internal
+     */
+    public static function reset(): void
+    {
+        static::$initialized = false;
+        static::$segments    = [];
+        static::$options     = [];
+        static::$lastWrite   = 'write';
+        static::$height      = null;
+        static::$width       = null;
+        static::$isColored   = static::hasColorSupport(STDOUT);
+
+        static::resetInputOutput();
+    }
+
+    /**
+     * Testing purpose only
+     *
+     * @internal
+     */
+    public static function resetLastWrite(): void
+    {
+        static::$lastWrite = null;
+    }
+
+    /**
+     * Testing purpose only
+     *
+     * @internal
      */
     public static function setInputOutput(InputOutput $io): void
     {
@@ -1109,7 +1137,7 @@ public static function setInputOutput(InputOutput $io): void
     /**
      * Testing purpose only
      *
-     * @testTag
+     * @internal
      */
     public static function resetInputOutput(): void
     {

system/Commands/Worker/Views/frankenphp-worker.php.tpl

@@ -122,8 +122,10 @@ while (frankenphp_handle_request($handler)) {
     // Reset services except persistent ones
     Services::resetForWorkerMode($workerConfig);
 
+    // Reset event listeners
+    Events::cleanupForWorkerMode($workerConfig->resetEventListeners);
+
     if (CI_DEBUG) {
-        Events::cleanupForWorkerMode();
         Services::toolbar()->reset();
     }
 }

system/Database/SQLSRV/Forge.php

@@ -168,6 +168,25 @@ public function createDatabase(string $dbName, bool $ifNotExists = false): bool
         }
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @see https://stackoverflow.com/questions/7469130/cannot-drop-database-because-it-is-currently-in-use
+     */
+    public function dropDatabase(string $dbName): bool
+    {
+        try {
+            $this->db->query(sprintf(
+                'ALTER DATABASE %s SET SINGLE_USER WITH ROLLBACK IMMEDIATE',
+                $this->db->escapeIdentifier($dbName),
+            ));
+        } catch (DatabaseException) {
+            // no-op
+        }
+
+        return parent::dropDatabase($dbName);
+    }
+
     /**
      * CREATE TABLE attributes
      */

system/Events/Events.php

@@ -289,10 +289,18 @@ public static function getPerformanceLogs()
      * Cleanup performance log and request-specific listeners for worker mode.
      *
      * Called at the END of each request to clean up state.
+     *
+     * @param list<string> $resetEventListeners Additional event names to reset.
      */
-    public static function cleanupForWorkerMode(): void
+    public static function cleanupForWorkerMode(array $resetEventListeners = []): void
     {
-        static::$performanceLog = [];
-        static::removeAllListeners('DBQuery');
+        if (CI_DEBUG) {
+            static::$performanceLog = [];
+            static::removeAllListeners('DBQuery');
+        }
+
+        foreach ($resetEventListeners as $event) {
+            static::removeAllListeners($event);
+        }
     }
 }

system/HTTP/ContentSecurityPolicy.php

@@ -400,6 +400,10 @@ public function getStyleNonce(): string
         if ($this->styleNonce === null) {
             $this->styleNonce = base64_encode(random_bytes(12));
             $this->addStyleSrc('nonce-' . $this->styleNonce);
+
+            if ($this->styleSrcElem !== []) {
+                $this->addStyleSrcElem('nonce-' . $this->styleNonce);
+            }
         }
 
         return $this->styleNonce;
@@ -413,6 +417,10 @@ public function getScriptNonce(): string
         if ($this->scriptNonce === null) {
             $this->scriptNonce = base64_encode(random_bytes(12));
             $this->addScriptSrc('nonce-' . $this->scriptNonce);
+
+            if ($this->scriptSrcElem !== []) {
+                $this->addScriptSrcElem('nonce-' . $this->scriptNonce);
+            }
         }
 
         return $this->scriptNonce;