Merge branch 'develop' into 4.7

paulbalandan · paulbalandan · commit af86430b7161 · 2026-01-11T19:30:25.000+08:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -83,6 +83,20 @@ body:
     validations:
       required: true
 
+  - type: dropdown
+    id: environment
+    attributes:
+      label: Environment
+      description: Which CI_ENVIRONMENT setting are you using?
+      multiple: true
+      options:
+        - production
+        - development
+        - testing
+        - other (custom)
+    validations:
+      required: true
+
   - type: input
     id: database
     attributes:
diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml
@@ -43,6 +43,10 @@ on:
         description: Additional PHP extensions that are needed to be enabled
         type: string
         required: false
+      extra-ini-options:
+        description: Additional PHP configuration directives that should be appended to the php.ini
+        type: string
+        required: false
       extra-composer-options:
         description: Additional Composer options that should be appended to the `composer update` call
         type: string
@@ -163,6 +167,7 @@ jobs:
           php-version: ${{ inputs.php-version }}
           tools: composer
           extensions: gd, ${{ inputs.extra-extensions }}
+          ini-values: ${{ inputs.extra-ini-options }}
           coverage: ${{ env.COVERAGE_DRIVER }}
         env:
           COVERAGE_DRIVER: ${{ inputs.enable-coverage && 'xdebug' || 'none' }}
diff --git a/.github/workflows/reusable-serviceless-phpunit-test.yml b/.github/workflows/reusable-serviceless-phpunit-test.yml
@@ -37,6 +37,10 @@ on:
         description: Additional PHP extensions that are needed to be enabled
         type: string
         required: false
+      extra-ini-options:
+        description: Additional PHP configuration directives that should be appended to the php.ini
+        type: string
+        required: false
       extra-composer-options:
         description: Additional Composer options that should be appended to the `composer update` call
         type: string
@@ -75,6 +79,7 @@ jobs:
           php-version: ${{ inputs.php-version }}
           tools: composer
           extensions: gd, ${{ inputs.extra-extensions }}
+          ini-values: ${{ inputs.extra-ini-options }}
           coverage: ${{ env.COVERAGE_DRIVER }}
         env:
           COVERAGE_DRIVER: ${{ inputs.enable-coverage && 'xdebug' || 'none' }}
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -26,7 +26,6 @@
         'ThirdParty',
         'Validation/Views',
     ])
-    ->notName('#Foobar.php$#')
     ->append([
         __FILE__,
         __DIR__ . '/.php-cs-fixer.no-header.php',
@@ -37,9 +36,7 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [
-    'modernize_strpos' => ['modernize_stripos' => true],
-];
+$overrides = [];
 
 $options = [
     'cacheFile' => 'build/.php-cs-fixer.cache',
diff --git a/.php-cs-fixer.tests.php b/.php-cs-fixer.tests.php
@@ -11,10 +11,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use PhpCsFixer\ConfigInterface;
+use PhpCsFixer\Config;
 use PhpCsFixer\Finder;
+use Utils\PhpCsFixer\CodeIgniterRuleCustomisationPolicy;
 
-/** @var ConfigInterface $config */
+/** @var Config $config */
 $config = require __DIR__ . '/.php-cs-fixer.dist.php';
 
 $finder = Finder::create()
@@ -26,16 +27,15 @@
         '_support/View/Cells/multiplier.php',
         '_support/View/Cells/colors.php',
         '_support/View/Cells/addition.php',
-        'system/Database/Live/PreparedQueryTest.php',
-    ])
-    ->notName('#Foobar.php$#');
+    ]);
 
 $overrides = [
     'phpdoc_to_return_type' => true,
     'void_return'           => true,
 ];
 
 return $config
+    ->setRuleCustomisationPolicy(new CodeIgniterRuleCustomisationPolicy())
     ->setFinder($finder)
     ->setCacheFile('build/.php-cs-fixer.tests.cache')
     ->setRules(array_merge($config->getRules(), $overrides));
diff --git a/composer.json b/composer.json
@@ -114,9 +114,7 @@
         ],
         "metrics": "utils/vendor/bin/phpmetrics --config=phpmetrics.json",
         "phpstan:baseline": [
-            "bash -c \"rm -rf utils/phpstan-baseline/*.neon\"",
-            "bash -c \"touch utils/phpstan-baseline/loader.neon\"",
-            "phpstan analyse --ansi --generate-baseline=utils/phpstan-baseline/loader.neon --memory-limit=512M",
+            "phpstan analyse --ansi --generate-baseline=utils/phpstan-baseline/loader.neon",
             "split-phpstan-baseline utils/phpstan-baseline/loader.neon"
         ],
         "phpstan:check": "vendor/bin/phpstan analyse --verbose --ansi --memory-limit=512M",
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -399,7 +399,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
             helper('filesystem');
 
             // Updated to microtime() so we can get history
-            $time = sprintf('%.6f', Time::now()->format('U.u'));
+            $time = sprintf('%.6F', Time::now()->format('U.u'));
 
             if (! is_dir(WRITEPATH . 'debugbar')) {
                 mkdir(WRITEPATH . 'debugbar', 0777);
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
@@ -90,7 +90,7 @@ public function setFiles(string $current, int $limit = 20)
             $contents = @json_decode($contents);
             if (json_last_error() === JSON_ERROR_NONE) {
                 preg_match('/debugbar_(.*)\.json$/s', $filename, $time);
-                $time = sprintf('%.6f', $time[1] ?? 0);
+                $time = sprintf('%.6F', $time[1] ?? 0);
 
                 // Debugbar files shown in History Collector
                 $files[] = [
diff --git a/tests/_support/Commands/Foobar.php b/tests/_support/Commands/Foobar.php
@@ -1,11 +1,20 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 use Config\App;
 use CodeIgniter\CLI\CLI;
 
 return [
-   'foo' => 'The command will use this as foo.',
-   'bar' => 'The command will use this as bar.',
-   'baz' => 'The baz is here.',
-   'bas' => CLI::color('bas', 'green') . (new App())->baseURL,
+    'foo' => 'The command will use this as foo.',
+    'bar' => 'The command will use this as bar.',
+    'baz' => 'The baz is here.',
+    'bas' => CLI::color('bas', 'green') . (new App())->baseURL,
 ];
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
@@ -256,15 +256,15 @@ public function testDeallocatePreparedQueryThenTryToClose(): void
                 'name'    => 'a',
                 'email'   => 'b@example.com',
                 'country' => 'x',
-            ])
+            ]),
         );
 
         $this->query->close();
 
         // Try to close a non-existing prepared statement
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage(
-            'Cannot call close on a non-existing prepared statement.'
+            'Cannot call close on a non-existing prepared statement.',
         );
 
         $this->query->close();
@@ -325,7 +325,7 @@ public function testHandleTransStatusMarksTransactionFailedDuringTransaction():
 
         $this->seeInDatabase($this->db->DBPrefix . 'without_auto_increment', [
             'key'   => 'test_key',
-            'value' => 'test_value'
+            'value' => 'test_value',
         ]);
 
         $this->assertFalse($this->query->execute('test_key', 'different_value'));
@@ -339,7 +339,7 @@ public function testHandleTransStatusMarksTransactionFailedDuringTransaction():
         // Verify the first insert was rolled back
         $this->dontSeeInDatabase($this->db->DBPrefix . 'without_auto_increment', [
             'key'   => 'test_key',
-            'value' => 'test_value'
+            'value' => 'test_value',
         ]);
 
         $this->db->resetTransStatus();
diff --git a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php
@@ -34,7 +34,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->time = (float) sprintf('%.6f', microtime(true));
+        $this->time = (float) sprintf('%.6F', microtime(true));
     }
 
     protected function tearDown(): void
@@ -63,9 +63,9 @@ private function createDummyDebugbarJson(): void
 
         // create 20 dummy debugbar json files
         for ($i = 0; $i < 20; $i++) {
-            $path = str_replace((string) $time, sprintf('%.6f', $time - self::STEP), $path);
+            $path = str_replace((string) $time, sprintf('%.6F', $time - self::STEP), $path);
             file_put_contents($path, json_encode($dummyData));
-            $time = sprintf('%.6f', $time - self::STEP);
+            $time = sprintf('%.6F', $time - self::STEP);
         }
     }
 
@@ -76,7 +76,7 @@ public function testSetFiles(): void
         // test dir is now populated with json
         $this->createDummyDebugbarJson();
 
-        $activeRowTime = $time = sprintf('%.6f', $time - self::STEP);
+        $activeRowTime = $time = sprintf('%.6F', $time - self::STEP);
 
         $history = new History();
         $history->setFiles($time, 20);
@@ -85,14 +85,14 @@ public function testSetFiles(): void
         $this->assertNotEmpty($history->display()['files'], 'Dummy Debugbar data is empty');
 
         foreach ($history->display()['files'] as $request) {
-            $this->assertSame($request['time'], sprintf('%.6f', $time));
+            $this->assertSame($request['time'], sprintf('%.6F', $time));
             $this->assertSame(
                 $request['datetime'],
                 DateTime::createFromFormat('U.u', $time)->format('Y-m-d H:i:s.u'),
             );
             $this->assertSame($request['active'], ($time === $activeRowTime));
 
-            $time = sprintf('%.6f', $time - self::STEP);
+            $time = sprintf('%.6F', $time - self::STEP);
         }
     }
 }
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
@@ -492,7 +492,8 @@ Have it in mind though, every driver has different caveats, so be sure to
 get yourself familiar with them (below) before you make that choice.
 
 .. note:: The ArrayHandler is used during testing and stores all data within
-    a PHP array, while preventing the data from being persisted.
+    a PHP array, while preventing the data from being persisted. See
+    :doc:`Testing Sessions </testing/session_testing>`.
 
 FileHandler Driver (the default)
 ================================
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
@@ -63,6 +63,8 @@ override any existing routes in the system:
 Each of the "routes" is a 3 element array containing the HTTP verb (or "add" for all),
 the URI to match, and the routing destination.
 
+.. _feature-setting-session-values:
+
 Setting Session Values
 ----------------------
 
diff --git a/user_guide_src/source/testing/index.rst b/user_guide_src/source/testing/index.rst
@@ -1,20 +1,21 @@
-#######
-Testing
-#######
-
-CodeIgniter ships with a number of tools to help you test and debug your application thoroughly.
-The following sections should get you quickly testing your applications.
-
-.. toctree::
-    :titlesonly:
-
-    Getting Started <overview>
-    Database <database>
-    Generating Data <fabricator>
-    Controller Testing <controllers>
-    HTTP Testing <feature>
-    response
-    cli
-    Mocking <mocking>
-    benchmark
-    debugging
+#######
+Testing
+#######
+
+CodeIgniter ships with a number of tools to help you test and debug your application thoroughly.
+The following sections should get you quickly testing your applications.
+
+.. toctree::
+    :titlesonly:
+
+    Getting Started <overview>
+    Database <database>
+    Generating Data <fabricator>
+    Controller Testing <controllers>
+    HTTP Testing <feature>
+    response
+    cli
+    Mocking <mocking>
+    benchmark
+    debugging
+    Session Testing <session_testing>
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
@@ -100,6 +100,8 @@ Asserts that the HTTP status code returned matches $code.
 .. literalinclude:: response/010.php
    :lines: 2-
 
+.. _response-session-assertions:
+
 Session Assertions
 ==================
 
diff --git a/user_guide_src/source/testing/session_testing.rst b/user_guide_src/source/testing/session_testing.rst
@@ -0,0 +1,68 @@
+###############
+Session Testing
+###############
+
+Testing session behavior in your application is made simple with the ArrayHandler session driver.
+Unlike other session drivers, ArrayHandler does not persist data to disk, database, or external storage.
+This allows you to simulate session interactions safely during unit or integration tests, without affecting real session data.
+
+Using this driver, you can set, retrieve, and assert session data entirely in memory, making your tests faster and more isolated.
+While in most production scenarios you would use file, database, or cache-backed sessions, ArrayHandler exists specifically to support testing workflows and prevent side effects.
+
+.. contents::
+   :local:
+   :depth: 2
+
+Initializing Sessions
+=====================
+
+You can initialize a session using the ArrayHandler driver for testing. This example shows how to create a session instance with a proper configuration:
+
+.. literalinclude:: session_testing/001.php
+
+Setting and Retrieving Data
+===========================
+
+Once initialized, you can set session values and retrieve them as usual:
+
+.. literalinclude:: session_testing/002.php
+
+.. note::
+
+   Session data is stored in memory and lasts as long as the ArrayHandler object exists;
+   after the object is destroyed (typically at the end of a request or test), the data is lost.
+
+Example Test Case
+=================
+
+Here's a simple example demonstrating usage of the ArrayHandler in a PHPUnit test:
+
+.. literalinclude:: session_testing/003.php
+
+Session Assertions
+==================
+
+Using PHPUnit Assertions with ArrayHandler
+------------------------------------------
+
+When testing sessions directly with Session and ArrayHandler in a unit test, use standard PHPUnit assertions. 
+``assertSessionHas()`` and ``assertSessionMissing()`` are not available in this context because you are interacting directly with the session object,
+not a response object.
+
+.. literalinclude:: session_testing/004.php
+
+Session Assertions via TestResponse
+-----------------------------------
+
+When testing controllers or HTTP responses, you can use CodeIgniter 4’s session 
+assertion helpers, such as ``assertSessionHas()`` and ``assertSessionMissing()``,
+which are available on the ``TestResponse`` object. These helpers allow you to
+assert the state of the session during the HTTP request/response lifecycle.
+See more: :ref:`Session Assertions <response-session-assertions>`
+
+Custom Session Values
+=====================
+
+In Feature Tests, you can provide custom session data for a single test using the ``withSession()`` method.
+This allows you to simulate session states such as logged-in users or specific roles during the request.
+For full details and examples, see: :ref:`Setting Session Values <feature-setting-session-values>`
diff --git a/user_guide_src/source/testing/session_testing/001.php b/user_guide_src/source/testing/session_testing/001.php
diff --git a/user_guide_src/source/testing/session_testing/002.php b/user_guide_src/source/testing/session_testing/002.php
diff --git a/user_guide_src/source/testing/session_testing/003.php b/user_guide_src/source/testing/session_testing/003.php
diff --git a/user_guide_src/source/testing/session_testing/004.php b/user_guide_src/source/testing/session_testing/004.php
diff --git a/utils/src/PhpCsFixer/CodeIgniterRuleCustomisationPolicy.php b/utils/src/PhpCsFixer/CodeIgniterRuleCustomisationPolicy.php
