Release v4.7.1

Author: actions-user

.github/workflows/close-pull-request.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   main:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Close PR with nice message
         run: gh pr close ${{ env.ISSUE }} -c "${{ env.COMMENT }}"

.github/workflows/phpunit.yml

@@ -5,24 +5,28 @@ on:
     branches:
       - develop
 
+permissions:
+  contents: read
+
 jobs:
   main:
     name: Build and test
 
     strategy:
       matrix:
-        php-versions: ['8.2', '8.4']
-
-    runs-on: ubuntu-latest
+        php-versions: ['8.2', '8.5']
 
-    if: (! contains(github.event.head_commit.message, '[ci skip]'))
+    runs-on: ubuntu-24.04
+    if: (! contains(github.event.pull_request.title, '[ci skip]'))
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
 
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
         with:
           php-version: ${{ matrix.php-versions }}
           tools: composer, pecl, phpunit
@@ -31,17 +35,17 @@ jobs:
 
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "COMPOSER_CACHE_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies
-        run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --no-interaction
         # To prevent rate limiting you may need to supply an OAuth token in Settings > Secrets
         # env:
           # https://getcomposer.org/doc/articles/troubleshooting.md#api-rate-limit-and-oauth-tokens

.gitignore

@@ -48,38 +48,38 @@ Vagrantfile
 #-------------------------
 # Temporary Files
 #-------------------------
-writable/cache/*
-!writable/cache/index.html
+/writable/cache/*
+!/writable/cache/index.html
 
-writable/logs/*
-!writable/logs/index.html
+/writable/logs/*
+!/writable/logs/index.html
 
-writable/session/*
-!writable/session/index.html
+/writable/session/*
+!/writable/session/index.html
 
-writable/uploads/*
-!writable/uploads/index.html
+/writable/uploads/*
+!/writable/uploads/index.html
 
-writable/debugbar/*
-!writable/debugbar/index.html
+/writable/debugbar/*
+!/writable/debugbar/index.html
 
 php_errors.log
 
 #-------------------------
 # User Guide Temp Files
 #-------------------------
-user_guide_src/build/*
-user_guide_src/cilexer/build/*
-user_guide_src/cilexer/dist/*
-user_guide_src/cilexer/pycilexer.egg-info/*
+/user_guide_src/build/*
+/user_guide_src/cilexer/build/*
+/user_guide_src/cilexer/dist/*
+/user_guide_src/cilexer/pycilexer.egg-info/*
 
 #-------------------------
 # Test Files
 #-------------------------
-tests/coverage*
+/tests/coverage*
 
 # Don't save phpunit under version control.
-phpunit
+/phpunit
 
 #-------------------------
 # Composer

app/Config/Database.php

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

app/Config/Paths.php

@@ -75,4 +75,16 @@ class Paths
      * is used when no value is provided to `Services::renderer()`.
      */
     public string $viewDirectory = __DIR__ . '/../Views';
+
+    /**
+     * ---------------------------------------------------------------
+     * ENVIRONMENT DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of the directory where
+     * the .env file is located.
+     * Please consider security implications when changing this
+     * value - the directory should not be publicly accessible.
+     */
+    public string $envDirectory = __DIR__ . '/../../';
 }

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
      *

builds

@@ -1,7 +1,9 @@
 #!/usr/bin/env php
 <?php
 
-define('LATEST_RELEASE', '^4.0');
+define('LATEST_RELEASE', '^4.7');
+define('DEVELOP_BRANCH', 'dev-develop');
+define('NEXT_MINOR', '^4.8-dev');
 define('GITHUB_URL', 'https://github.com/codeigniter4/codeigniter4');
 
 /*
@@ -11,18 +13,18 @@ define('GITHUB_URL', 'https://github.com/codeigniter4/codeigniter4');
  * Use this script to toggle the CodeIgniter dependency between the
  * latest stable release and the most recent development update.
  *
- * Usage: php builds [release|development]
+ * Usage: php builds [release|development|next]
  */
 
+$branch = $argv[1] ?? '';
+
 // Determine the requested stability
-if (empty($argv[1]) || ! in_array($argv[1], ['release', 'development'], true)) {
-    echo 'Usage: php builds [release|development]' . PHP_EOL;
+if ($branch === '' || ! in_array($branch, ['release', 'development', 'next'], true)) {
+    echo 'Usage: php builds [release|development|next]' . PHP_EOL;
 
     exit;
 }
 
-$dev = $argv[1] === 'development';
-
 $modified = [];
 
 // Locate each file and update it for the requested stability
@@ -36,7 +38,7 @@ if (is_file($file)) {
         $array = json_decode($contents, true);
 
         if (is_array($array)) {
-            if ($dev) {
+            if ($branch !== 'release') {
                 $array['minimum-stability'] = 'dev';
                 $array['prefer-stable']     = true;
                 $array['repositories'] ??= [];
@@ -57,7 +59,7 @@ if (is_file($file)) {
                     ];
                 }
 
-                $array['require']['codeigniter4/codeigniter4'] = 'dev-develop';
+                $array['require']['codeigniter4/codeigniter4'] = $branch === 'next' ? NEXT_MINOR : DEVELOP_BRANCH;
                 unset($array['require']['codeigniter4/framework']);
             } else {
                 unset($array['minimum-stability']);
@@ -70,7 +72,7 @@ if (is_file($file)) {
                         }
                     }
 
-                    if (empty($array['repositories'])) {
+                    if ($array['repositories'] === []) {
                         unset($array['repositories']);
                     }
                 }
@@ -100,7 +102,7 @@ foreach ($files as $file) {
     if (is_file($file)) {
         $contents = file_get_contents($file);
 
-        if ($dev) {
+        if ($branch !== 'release') {
             $contents = str_replace('vendor/codeigniter4/framework', 'vendor/codeigniter4/codeigniter4', $contents);
         } else {
             $contents = str_replace('vendor/codeigniter4/codeigniter4', 'vendor/codeigniter4/framework', $contents);
@@ -120,6 +122,7 @@ if ($modified === []) {
     foreach ($modified as $file) {
         echo " * {$file}" . PHP_EOL;
     }
-
-    echo 'Run `composer update` to sync changes with your vendor folder.' . PHP_EOL;
 }
+
+echo 'Run `composer update` to sync changes with your vendor folder.' . PHP_EOL;
+echo 'Don\'t forget to update the project files in app folder from "vendor/codeigniter4/*/app/".' . PHP_EOL;