Merge pull request #9417 from codeigniter4/4.6

4.6.0 Merge code

Author: paulbalandan

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -25,11 +25,10 @@ body:
       description: Which PHP versions did you run your code?
       multiple: true
       options:
-        - '7.4'
-        - '8.0'
         - '8.1'
         - '8.2'
         - '8.3'
+        - '8.4'
     validations:
       required: true
 

.github/workflows/test-coding-standards.yml

@@ -29,7 +29,7 @@ jobs:
       matrix:
         php-version:
           - '8.1'
-          - '8.3'
+          - '8.4'
 
     steps:
       - name: Checkout base branch for PR
@@ -65,3 +65,5 @@ jobs:
 
       - name: Run lint
         run: composer cs
+        env:
+            PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-version == '8.4' }}

.github/workflows/test-phpunit.yml

@@ -59,9 +59,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
-        include:
-          - php-version: '8.3'
-            composer-option: '--ignore-platform-req=php'
+          - '8.4'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -88,6 +86,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         db-platform:
           - MySQLi
           - OCI8
@@ -100,8 +99,6 @@ jobs:
           - php-version: '8.1'
             db-platform: MySQLi
             mysql-version: '5.7'
-          - php-version: '8.3'
-            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -129,9 +126,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
-        include:
-          - php-version: '8.3'
-            composer-option: '--ignore-platform-req=php'
+          - '8.4'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -157,9 +152,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
-        include:
-          - php-version: '8.3'
-            composer-option: '--ignore-platform-req=php'
+          - '8.4'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:

.github/workflows/test-rector.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.3']
+        php-versions: ['8.1', '8.4']
     steps:
       - name: Checkout base branch for PR
         if: github.event_name == 'pull_request'

admin/framework/composer.json

@@ -13,18 +13,18 @@
         "php": "^8.1",
         "ext-intl": "*",
         "ext-mbstring": "*",
-        "laminas/laminas-escaper": "^2.13",
+        "laminas/laminas-escaper": "^2.14",
         "psr/log": "^3.0"
     },
     "require-dev": {
         "codeigniter/coding-standard": "^1.7",
-        "fakerphp/faker": "^1.9",
+        "fakerphp/faker": "^1.24",
         "friendsofphp/php-cs-fixer": "^3.47.1",
-        "kint-php/kint": "^5.0.4",
-        "mikey179/vfsstream": "^1.6",
+        "kint-php/kint": "^6.0",
+        "mikey179/vfsstream": "^1.6.12",
         "nexusphp/cs-config": "^3.6",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
-        "predis/predis": "^1.1 || ^2.0"
+        "predis/predis": "^1.1 || ^2.3"
     },
     "suggest": {
         "ext-curl": "If you use CURLRequest class",

app/Config/Cache.php

@@ -34,18 +34,6 @@ class Cache extends BaseConfig
      */
     public string $backupHandler = 'dummy';
 
-    /**
-     * --------------------------------------------------------------------------
-     * Cache Directory Path
-     * --------------------------------------------------------------------------
-     *
-     * The path to where cache files should be stored, if using a file-based
-     * system.
-     *
-     * @deprecated Use the driver-specific variant under $file
-     */
-    public string $storePath = WRITEPATH . 'cache/';
-
     /**
      * --------------------------------------------------------------------------
      * Key Prefix
@@ -86,6 +74,7 @@ class Cache extends BaseConfig
      * --------------------------------------------------------------------------
      * File settings
      * --------------------------------------------------------------------------
+     *
      * Your file storage preferences can be specified below, if you are using
      * the File driver.
      *
@@ -100,6 +89,7 @@ class Cache extends BaseConfig
      * -------------------------------------------------------------------------
      * Memcached settings
      * -------------------------------------------------------------------------
+     *
      * Your Memcached servers can be specified below, if you are using
      * the Memcached drivers.
      *

app/Config/Constants.php

@@ -77,18 +77,3 @@
 defined('EXIT_DATABASE')       || define('EXIT_DATABASE', 8);       // database error
 defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN', 9);      // lowest automatically-assigned error code
 defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125);    // highest automatically-assigned error code
-
-/**
- * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead.
- */
-define('EVENT_PRIORITY_LOW', 200);
-
-/**
- * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_NORMAL instead.
- */
-define('EVENT_PRIORITY_NORMAL', 100);
-
-/**
- * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_HIGH instead.
- */
-define('EVENT_PRIORITY_HIGH', 10);

app/Config/Database.php

@@ -43,6 +43,7 @@ class Database extends Config
         'failover'     => [],
         'port'         => 3306,
         'numberNative' => false,
+        'foundRows'    => false,
         'dateFormat'   => [
             'date'     => 'Y-m-d',
             'datetime' => 'Y-m-d H:i:s',
@@ -64,6 +65,7 @@ class Database extends Config
     //        'failover'    => [],
     //        'foreignKeys' => true,
     //        'busyTimeout' => 1000,
+    //        'synchronous' => null,
     //        'dateFormat'  => [
     //            'date'     => 'Y-m-d',
     //            'datetime' => 'Y-m-d H:i:s',

app/Config/Feature.php

@@ -10,9 +10,9 @@
 class Feature extends BaseConfig
 {
     /**
-     * Use improved new auto routing instead of the default legacy version.
+     * Use improved new auto routing instead of the legacy version.
      */
-    public bool $autoRoutesImproved = false;
+    public bool $autoRoutesImproved = true;
 
     /**
      * Use filter execution order in 4.4 or before.
@@ -26,4 +26,12 @@ class Feature extends BaseConfig
      * If false, `limit(0)` returns no records. (the behavior of 3.1.9 or later in version 3.x.)
      */
     public bool $limitZeroAsAll = true;
+
+    /**
+     * Use strict location negotiation.
+     *
+     * By default, the locale is selected based on a loose comparison of the language code (ISO 639-1)
+     * Enabling strict comparison will also consider the region code (ISO 3166-1 alpha-2).
+     */
+    public bool $strictLocaleNegotiation = false;
 }

app/Config/Format.php

@@ -3,7 +3,6 @@
 namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
-use CodeIgniter\Format\FormatterInterface;
 use CodeIgniter\Format\JSONFormatter;
 use CodeIgniter\Format\XMLFormatter;
 
@@ -62,16 +61,4 @@ class Format extends BaseConfig
         'application/xml'  => 0,
         'text/xml'         => 0,
     ];
-
-    /**
-     * A Factory method to return the appropriate formatter for the given mime type.
-     *
-     * @return FormatterInterface
-     *
-     * @deprecated This is an alias of `\CodeIgniter\Format\Format::getFormatter`. Use that instead.
-     */
-    public function getFormatter(string $mime)
-    {
-        return service('format')->getFormatter($mime);
-    }
 }