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

Conflicts:
	user_guide_src/source/changelogs/index.rst

Author: kenjis

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,6 +2,8 @@
 
 Each pull request should address a single issue and have a meaningful title.
 
+- Pull requests must be in English.
+- If a pull request fixes an issue, reference the issue with a suitable keyword (e.g., Fixes <issue number>).
 - All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
 - PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.3"__
 
@@ -15,15 +17,3 @@ Explain what you have changed, and why.
 - [ ] Unit testing, with >80% coverage
 - [ ] User guide updated
 - [ ] Conforms to style guide
-
-<!--
-
-**Notes**
-- Pull requests must be in English
-- If the PR solves an issue, reference it with a suitable verb and the issue number
-(e.g. fixes <hash>12345)
-- Unsolicited pull requests will be considered, but there is no guarantee of acceptance
-- Pull requests should be from a feature branch in the contributor's fork of the repository
-  to the develop branch of the project repository
-
--->

.github/workflows/test-deptrac.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: composer, phive
           extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3
 

.github/workflows/test-phpunit.yml

@@ -47,13 +47,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1', '8.2']
         db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV', 'OCI8']
         mysql-versions: ['5.7']
         include:
           - php-versions: '7.4'
             db-platforms: MySQLi
             mysql-versions: '8.0'
+          - php-versions: '8.2'
+            composer-option: '--ignore-platform-req=php'
 
     services:
       mysql:
@@ -148,8 +150,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer update --ansi --no-interaction
-          composer remove --ansi --dev --unused -W -- rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
+          composer update --ansi --no-interaction ${{ matrix.composer-option }}
+          composer remove --ansi --dev --unused ${{ matrix.composer-option }} -W -- rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
 
       - name: Profile slow tests in PHP ${{ env.COVERAGE_PHP_VERSION }}
         if: matrix.php-versions == env.COVERAGE_PHP_VERSION

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [v4.2.9](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.9) (2022-10-30)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.8...v4.2.9)
+
+**Hotfix release to fix PHPUnit errors (see https://github.com/codeigniter4/CodeIgniter4/pull/6794)**
+
 ## [v4.2.8](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.8) (2022-10-30)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.7...v4.2.8)
 

system/Config/Factories.php

@@ -31,15 +31,15 @@ class Factories
      * Store of component-specific options, usually
      * from CodeIgniter\Config\Factory.
      *
-     * @var array<string, array>
+     * @var array<string, array<string, bool|string|null>>
      */
     protected static $options = [];
 
     /**
      * Explicit options for the Config
      * component to prevent logic loops.
      *
-     * @var array<string, mixed>
+     * @var array<string, bool|string|null>
      */
     private static array $configOptions = [
         'component'  => 'config',
@@ -53,7 +53,8 @@ class Factories
      * Mapping of class basenames (no namespace) to
      * their instances.
      *
-     * @var array<string, string[]>
+     * @var array<string, array<string, string>>
+     * @phpstan-var array<string, array<string, class-string>>
      */
     protected static $basenames = [];
 
@@ -63,7 +64,8 @@ class Factories
      * A multi-dimensional array with components as
      * keys to the array of name-indexed instances.
      *
-     * @var array<string, array>
+     * @var array<string, array<string, object>>
+     * @phpstan-var  array<string, array<class-string, object>>
      */
     protected static $instances = [];
 
@@ -74,9 +76,10 @@ class Factories
      *
      * @template T of Model
      *
-     * @param class-string<T> $name
+     * @phpstan-param class-string<T> $name
      *
-     * @return T
+     * @return Model
+     * @phpstan-return T
      */
     public static function models(string $name, array $options = [], ?ConnectionInterface &$conn = null)
     {
@@ -228,7 +231,7 @@ protected static function verifyInstanceOf(array $options, string $name): bool
      *
      * @param string $component Lowercase, plural component name
      *
-     * @return array<string, mixed>
+     * @return array<string, bool|string|null>
      */
     public static function getOptions(string $component): array
     {
@@ -253,7 +256,7 @@ public static function getOptions(string $component): array
      *
      * @param string $component Lowercase, plural component name
      *
-     * @return array<string, mixed> The result after applying defaults and normalization
+     * @return array<string, bool|string|null> The result after applying defaults and normalization
      */
     public static function setOptions(string $component, array $values): array
     {

system/Session/Session.php

@@ -196,7 +196,7 @@ public function __construct(SessionHandlerInterface $driver, App $config)
     /**
      * Initialize the session container and starts up the session.
      *
-     * @return mixed
+     * @return $this|void
      */
     public function start()
     {
@@ -449,8 +449,8 @@ public function destroy()
      * If $data is an array, it is expected to be an array of key/value pairs
      * to be set as session properties.
      *
-     * @param array|string $data  Property name or associative array of properties
-     * @param mixed        $value Property value if single key provided
+     * @param array|string                            $data  Property name or associative array of properties
+     * @param array|bool|float|int|object|string|null $value Property value if single key provided
      */
     public function set($data, $value = null)
     {
@@ -611,8 +611,8 @@ public function __isset(string $key): bool
      * Otherwise, it is interpreted as the identifier of a specific
      * flashdata property, with $value containing the property value.
      *
-     * @param array|string $data  Property identifier or associative array of properties
-     * @param array|string $value Property value if $data is a scalar
+     * @param array|string                            $data  Property identifier or associative array of properties
+     * @param array|bool|float|int|object|string|null $value Property value if $data is a scalar
      */
     public function setFlashdata($data, $value = null)
     {
@@ -694,7 +694,7 @@ public function markAsFlashdata($key): bool
     /**
      * Unmark data in the session as flashdata.
      *
-     * @param mixed $key Property identifier or array of them
+     * @param array|string $key Property identifier or array of them
      */
     public function unmarkFlashdata($key)
     {
@@ -743,9 +743,9 @@ public function getFlashKeys(): array
      * Sets new data into the session, and marks it as temporary data
      * with a set lifespan.
      *
-     * @param array|string $data  Session data key or associative array of items
-     * @param null         $value Value to store
-     * @param int          $ttl   Time-to-live in seconds
+     * @param array|string                            $data  Session data key or associative array of items
+     * @param array|bool|float|int|object|string|null $value Value to store
+     * @param int                                     $ttl   Time-to-live in seconds
      */
     public function setTempdata($data, $value = null, int $ttl = 300)
     {
@@ -759,7 +759,7 @@ public function setTempdata($data, $value = null, int $ttl = 300)
      *
      * @param string $key Session data key
      *
-     * @return mixed Session data value or null if not found.
+     * @return array|bool|float|int|object|string|null Session data value or null if not found.
      */
     public function getTempdata(?string $key = null)
     {

user_guide_src/source/changelogs/index.rst

@@ -13,6 +13,7 @@ See all the changes.
     :titlesonly:
 
     v4.3.0
+    v4.2.9
     v4.2.8
     v4.2.7
     v4.2.6

user_guide_src/source/changelogs/v4.2.9.rst

@@ -0,0 +1,19 @@
+Version 4.2.9
+#############
+
+Release Date: October 30, 2022
+
+**4.2.9 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+**Hotfix release to fix PHPUnit errors in 4.2.8; no other content changes.**
+
+Bugs Fixed
+**********
+
+- Fixed a bug that causes `PHP Fatal error:  Trait "Nexus\PHPUnit\Extension\Expeditable" not found` when running PHPUnit.
+
+See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.

user_guide_src/source/libraries/images/002.php

@@ -1,3 +1,3 @@
 <?php
 
-$image = Config\Services::image('imagick');
+$image = \Config\Services::image('imagick');

user_guide_src/source/testing/controllers/005.php

@@ -1,6 +1,6 @@
 <?php
 
-$config              = new Config\App();
+$config              = new \Config\App();
 $config->appTimezone = 'America/Chicago';
 
 $results = $this->withConfig($config)