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

Conflicts:
	tests/system/CLI/CommandRunnerTest.php
	user_guide_src/source/changelogs/index.rst
	user_guide_src/source/installation/upgrading.rst

Author: kenjis

.github/scripts/validate-version

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -o pipefail
+
+if [[ -z $1 ]]; then
+    echo "validate-version requires a version identifier"
+    exit 1
+fi
+
+FILES=("system/CodeIgniter.php" "user_guide_src/source/conf.py")
+LENGTH="${#FILES[@]}"
+
+for FILE in "${FILES[@]}"; do
+    COUNT="$((COUNT + $(grep -c "$FILE" -e "$1")))"
+done
+
+if [[ $COUNT -ne $LENGTH ]]; then
+    echo "CodeIgniter version is not updated to v"$1""
+    exit 1
+fi
+
+echo "CodeIgniter version is updated to v"$1""

.github/workflows/deploy-framework.yml renamed to .github/workflows/deploy-distributables.yml

@@ -1,16 +1,40 @@
-# When a new Release is created, deploy relevant
+# When a new release is created, deploy relevant
 # files to each of the generated repos.
-name: Deploy Framework
+name: Deploy Distributable Repos
 
 on:
   release:
     types: [published]
 
 jobs:
+  check-version:
+    name: Check for updated version
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # fetch all tags
+
+      - name: Get latest version
+        run: |
+          echo 'LATEST_VERSION<<EOF' >> $GITHUB_ENV
+          echo $(git describe --tags --abbrev=0) | sed "s/v//" >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+
+      - name: Search for updated version
+        if: ${{ env.LATEST_VERSION }}
+        run: |
+          chmod +x ${GITHUB_WORKSPACE}/.github/scripts/validate-version
+          ${GITHUB_WORKSPACE}/.github/scripts/validate-version ${{ env.LATEST_VERSION }}
+
   framework:
     name: Deploy to framework
     if: github.repository == 'codeigniter4/CodeIgniter4'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    needs: check-version
+
     steps:
       - name: Identify
         run: |
@@ -55,7 +79,9 @@ jobs:
   appstarter:
     name: Deploy to appstarter
     if: github.repository == 'codeigniter4/CodeIgniter4'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    needs: check-version
+
     steps:
       - name: Identify
         run: |
@@ -96,3 +122,56 @@ jobs:
               name: release.data.name,
               body: release.data.body
             })
+
+  userguide:
+    name: Deploy to userguide
+    if: github.repository == 'codeigniter4/CodeIgniter4'
+    runs-on: ubuntu-22.04
+    needs: check-version
+
+    steps:
+      - name: Identify
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "${GITHUB_ACTOR}"
+
+      - name: Checkout source
+        uses: actions/checkout@v3
+        with:
+          path: source
+
+      - name: Checkout target
+        uses: actions/checkout@v3
+        with:
+          repository: codeigniter4/userguide
+          token: ${{ secrets.ACCESS_TOKEN }}
+          path: userguide
+
+      - name: Install Sphinx
+        run: |
+          sudo apt install python3-sphinx
+          sudo pip3 install sphinxcontrib-phpdomain
+          sudo pip3 install sphinx_rtd_theme
+
+      - name: Chmod
+        run: chmod +x ./source/.github/scripts/deploy-userguide
+
+      - name: Deploy
+        run: ./source/.github/scripts/deploy-userguide ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/userguide ${GITHUB_REF##*/}
+
+      - name: Release
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.ACCESS_TOKEN}}
+          script: |
+            const release = await github.rest.repos.getLatestRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            })
+            github.rest.repos.createRelease({
+              owner: context.repo.owner,
+              repo: 'userguide',
+              tag_name: release.data.tag_name,
+              name: release.data.name,
+              body: release.data.body
+            })

.github/workflows/deploy-userguide.yml

@@ -1,5 +1,16 @@
 # Changelog
 
+## [v4.2.10](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.10) (2022-11-05)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.9...v4.2.10)
+
+### Fixed Bugs
+* docs: fix PHPDoc types in Session by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6796
+* fix: output "0" at the end of toolbar js when Kint::$enabled_mode is false by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6809
+
+### Refactoring
+* Refactor assertHeaderEmitted and assertHeaderNotEmitted by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/6806
+* fix: variable types for PHPStan 1.9.0 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6810
+
 ## [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)
 

CHANGELOG.md

@@ -60,15 +60,15 @@ CodeIgniter 4.x.x release.
 
 See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md
 ```
-* Watch for the "Deploy Framework" Action to make sure **framework** and **appstarter** get updated
-* Run the following commands to install and test AppStarter and verify the new version:
+* Watch for the "Deploy Distributable Repos" action to make sure **framework**, **appstarter**, and **userguide** get updated
+* Run the following commands to install and test `appstarter` and verify the new version:
 ```console
 composer create-project codeigniter4/appstarter release-test
 cd release-test
 composer test && composer info codeigniter4/framework
 ```
-* Verify that the User Guide Actions succeeded:
-    * "Deploy User Guide", framework repo
+* Verify that the user guide actions succeeded:
+    * "Deploy Distributable Repos", framework repo
     * "Deploy Production", UG repo
     * "pages-build-deployment", both repos
 * Fast-forward `develop` branch to catch the merge commit from `master`

admin/RELEASE.md

@@ -47,7 +47,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.2.8';
+    public const CI_VERSION = '4.2.10';
 
     /**
      * App startup time.

system/CodeIgniter.php

@@ -157,8 +157,8 @@ public function setTable(string $table)
 
     /**
      * Fetches the row of database from $this->table with a primary key
-     * matching $id. This methods works only with dbCalls
-     * This methods works only with dbCalls
+     * matching $id.
+     * This method works only with dbCalls.
      *
      * @param bool                  $singleton Single or multiple results
      * @param array|int|string|null $id        One primary key or an array of primary keys
@@ -189,8 +189,8 @@ protected function doFind(bool $singleton, $id = null)
     }
 
     /**
-     * Fetches the column of database from $this->table
-     * This methods works only with dbCalls
+     * Fetches the column of database from $this->table.
+     * This method works only with dbCalls.
      *
      * @param string $columnName Column Name
      *
@@ -204,7 +204,7 @@ protected function doFindColumn(string $columnName)
     /**
      * Works with the current Query Builder instance to return
      * all results, while optionally limiting them.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param int $limit  Limit
      * @param int $offset Offset
@@ -227,7 +227,7 @@ protected function doFindAll(int $limit = 0, int $offset = 0)
     /**
      * Returns the first row of the result set. Will take any previous
      * Query Builder calls into account when determining the result set.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @return array|object|null
      */
@@ -252,7 +252,7 @@ protected function doFirst()
 
     /**
      * Inserts data into the current table.
-     * This method works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array $data Data
      *
@@ -315,7 +315,7 @@ protected function doInsert(array $data)
 
     /**
      * Compiles batch insert strings and runs the queries, validating each row prior.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|null $set       An associative array of insert values
      * @param bool|null  $escape    Whether to escape values
@@ -341,7 +341,7 @@ protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $
 
     /**
      * Updates a single record in $this->table.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|int|string|null $id
      * @param array|null            $data
@@ -367,7 +367,7 @@ protected function doUpdate($id = null, $data = null): bool
 
     /**
      * Compiles an update string and runs the query
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|null  $set       An associative array of update values
      * @param string|null $index     The where key
@@ -386,7 +386,7 @@ protected function doUpdateBatch(?array $set = null, ?string $index = null, int
     /**
      * Deletes a single record from $this->table where $id matches
      * the table's primaryKey
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|int|string|null $id    The rows primary key(s)
      * @param bool                  $purge Allows overriding the soft deletes setting.
@@ -431,7 +431,7 @@ protected function doDelete($id = null, bool $purge = false)
     /**
      * Permanently deletes all rows that have been marked as deleted
      * through soft deletes (deleted = 1)
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @return bool|string Returns a string if in test mode.
      */
@@ -445,7 +445,7 @@ protected function doPurgeDeleted()
     /**
      * Works with the find* methods to return only the rows that
      * have been deleted.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      */
     protected function doOnlyDeleted()
     {
@@ -454,7 +454,7 @@ protected function doOnlyDeleted()
 
     /**
      * Compiles a replace into string and runs the query
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|null $data      Data
      * @param bool       $returnSQL Set to true to return Query String
@@ -470,7 +470,7 @@ protected function doReplace(?array $data = null, bool $returnSQL = false)
      * Grabs the last error(s) that occurred from the Database connection.
      * The return array should be in the following format:
      *  ['source' => 'message']
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @return array<string,string>
      */
@@ -524,7 +524,7 @@ public function getIdValue($data)
      * Loops over records in batches, allowing you to operate on them.
      * Works with $this->builder to get the Compiled select to
      * determine the rows to operate on.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @throws DataException
      */

system/Model.php

@@ -24,6 +24,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ResponseTraitTest extends CIUnitTestCase
 {

tests/system/API/ResponseTraitTest.php

@@ -23,6 +23,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class AutoloaderTest extends CIUnitTestCase
 {

tests/system/Autoloader/AutoloaderTest.php

@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileLocatorTest extends CIUnitTestCase
 {