Merge branch '4.8' into 4.8

Author: gilads-otiannoh24

.github/carson.yml

@@ -4,8 +4,12 @@ version: 1
 subscribers:
   - auto-labeler
   - conflicts-notifier
+  - no-merge-commits
+  - no-response-closer
   - pr-title-linter
   - signed-commits
+  - template-enforcer
+  - welcome
 settings:
   auto-labeler:
     sync_labels: true
@@ -35,6 +39,30 @@ settings:
       You may want to sync :arrows_counterclockwise: your branch with upstream!
 
       Ref: [Syncing Your Branch](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch)
+  no-merge-commits:
+    name: 'Carson / no-merge-commits'
+    treat_merge_commits_as: failure
+    exempt_branches:
+      - head: '^develop$'
+        base: '^master$'
+      - head: '^4\.\d+$'
+        base: '^develop$'
+  no-response-closer:
+    rules:
+      - label: needs template
+        only: issues
+        days_until_close: 2
+        close_message: |-
+          Closing this issue: the description still does not follow the bug report template after {{days_until_close}} days.
+
+          Please open a new issue using the [bug report form](https://github.com/codeigniter4/CodeIgniter4/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=Bug%3A+). For feature requests or support questions, please use the [forums](https://forum.codeigniter.com/forum-30.html).
+      - label: waiting for info
+        days_until_close: 14
+        unlabel_on_response: true
+        close_message: |-
+          Closing this {{type}}: there has been no response for {{days_until_close}} days after more information was requested.
+
+          If you can provide the requested details, leave a comment and a maintainer can reopen it.
   pr-title-linter:
     name: 'Carson / pr-title-linter'
     rules:
@@ -44,3 +72,52 @@ settings:
   signed-commits:
     name: 'Carson / signed-commits'
     treat_unsigned_as: failure
+  template-enforcer:
+    label: needs template
+    exempt_roles: [admin, maintain, write, triage]
+    message: |-
+      Hi there, @{{user}}! :wave:
+
+      It looks like this {{type}} does not follow our template:
+
+      {{violations}}
+
+      Please update the description to follow the template. The `{{label}}` label will be removed automatically once it does.
+    issues:
+      rules:
+        - pattern: '### PHP Version[\s\S]*### CodeIgniter4 Version'
+          description: 'Use the [bug report form](https://github.com/codeigniter4/CodeIgniter4/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=Bug%3A+), which asks for your PHP and CodeIgniter4 versions. For a feature request or support question, please use the [forums](https://forum.codeigniter.com/forum-30.html).'
+    pull_requests:
+      rules:
+        - pattern: '\*\*Description\*\*'
+          description: 'Keep the **Description** heading from the [pull request template](https://github.com/codeigniter4/CodeIgniter4/blob/develop/.github/PULL_REQUEST_TEMPLATE.md) and explain what you have changed, and why.'
+        - pattern: '\*\*Checklist:?\*\*'
+          description: 'Keep the **Checklist** from the pull request template and tick the items that apply. See [what we expect in a pull request](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md).'
+        - pattern: 'Explain what you have changed, and why\.'
+          description: 'Replace the placeholder text under **Description** with your own explanation.'
+          mode: forbid
+  welcome:
+    first_time:
+      pull_request: |-
+        Hi there, @{{user}}! :wave:
+
+        Thank you for sending this PR!
+
+        We expect the following in all Pull Requests (PRs).
+        - PRs must be sent to the [appropriate branch](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#branching)
+        - All git commits must be [GPG-signed](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#signing)
+        - Must follow our [style guide](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#php-style)
+        - Be [commented](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#comments) in the PHP source file
+        - Be documented in the [user guide](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#user-guide)
+        - Be [unit tested](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#unit-testing)
+        - Pass all checks in GitHub Actions
+
+        > [!IMPORTANT]
+        > We expect all code changes or bug-fixes to be accompanied by one or more tests added to our test suite to prove the code works.
+
+        If pull requests do not comply with the above, they will likely be closed. Since we are a team of volunteers, we don't have any more time to work
+        on the framework than you do. Please make it as painless for your contributions to be included as possible.
+
+        See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md
+      issue: false
+    returning: false

.github/mergeable.yml

@@ -41,8 +41,9 @@ readonly BOLD='\033[1m'
 readonly RESET='\033[0m'
 
 # Script paths
-readonly script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-readonly project_root="$( cd "$script_dir/../.." && pwd )"
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+project_root="$( cd "$script_dir/../.." && pwd )"
+readonly script_dir project_root
 readonly config_file="$script_dir/random-tests-config.txt"
 readonly results_dir="$project_root/build/random-tests"
 
@@ -166,7 +167,8 @@ inflect() {
 }
 
 generate_phpunit_random_seed() {
-    local seed=$(date +%s)
+    local seed
+    seed=$(date +%s)
 
     if [[ ! "$seed" =~ ^[0-9]+$ ]]; then
         echo 1
@@ -233,7 +235,8 @@ get_failed_test_predecessor() {
 
 print_result() {
     local type=$1 completed=$2 total=$3 component=$4 elapsed_str=$5
-    local padded=$(printf "%${#total}d" "$completed")
+    local padded
+    padded=$(printf "%${#total}d" "$completed")
     local color symbol
 
     case "$type" in
@@ -462,7 +465,8 @@ run_component_tests() {
     fi
 
     local test_dir="tests/system/$component"
-    local start_time=$(date +%s%N)
+    local start_time
+    start_time=$(date +%s%N)
 
     print_debug "Running tests for: $component"
 
@@ -527,7 +531,8 @@ run_component_tests() {
 
                     if kill -0 "$test_pid" 2>/dev/null; then
                         touch "$timeout_marker"
-                        local pids_to_kill=$(pgrep -P "$test_pid" 2>/dev/null)
+                        local pids_to_kill
+                        pids_to_kill=$(pgrep -P "$test_pid" 2>/dev/null)
 
                         kill -TERM "$test_pid" 2>/dev/null || true
                         if [[ -n "$pids_to_kill" ]]; then
@@ -607,7 +612,8 @@ run_component_tests() {
         if [[ $exit_code -eq 124 ]]; then
             predecessor_info+=$'\nFailed test: (timeout before PHPUnit emitted failure event)'
             if [[ -f "$events_file" ]]; then
-                local last_prepared_test=$(extract_test_order "$events_file" | tail -n 1)
+                local last_prepared_test
+                last_prepared_test=$(extract_test_order "$events_file" | tail -n 1)
                 if [[ -n "$last_prepared_test" ]]; then
                     predecessor_info+=$'\nLast prepared test before timeout: '"${last_prepared_test}"
                 else
@@ -619,7 +625,8 @@ run_component_tests() {
             predecessor_info+=$'\nPrevious test: (unavailable due to timeout)'
         else
             if [[ -f "$events_file" ]]; then
-                local predecessor_result=$(get_failed_test_predecessor "$events_file")
+                local predecessor_result
+                predecessor_result=$(get_failed_test_predecessor "$events_file")
                 if [[ -n "$predecessor_result" ]]; then
                     local previous_test=${predecessor_result#*|}
                     predecessor_info+=$'\nFailed test: '"${predecessor_result%%|*}"
@@ -639,7 +646,7 @@ run_component_tests() {
         fi
 
         {
-            echo "> ${phpunit_args[@]:0:7}"
+            echo "> ${phpunit_args[*]:0:7}"
             echo ""
             echo "$output"
             echo "$predecessor_info"
@@ -691,8 +698,9 @@ process_result() {
         first_result=false
     fi
 
-    local status=$(grep "^Exit code:" "$result_file" | sed 's/Exit code: //')
-    local elapsed_str=$(format_elapsed_time "$elapsed")
+    local status elapsed_str
+    status=$(grep "^Exit code:" "$result_file" | sed 's/Exit code: //')
+    elapsed_str=$(format_elapsed_time "$elapsed")
 
     case "$status" in
         0)
@@ -728,7 +736,8 @@ get_completed_components() {
 
     while IFS= read -r file_path; do
         # Remove prefix: random_test_result_
-        local temp=$(basename "$file_path")
+        local temp
+        temp=$(basename "$file_path")
         temp=${temp#random_test_result_}
 
         # Extract elapsed time (everything before first underscore after number)
@@ -749,13 +758,35 @@ get_completed_components() {
     # Sort entries by elapsed time numerically
     printf '%s\n' "${entries[@]}" | sort -t'|' -k1,1n |
     while IFS='|' read -r elapsed listed_component; do
-        if [[ ! " ${displayed_components[*]:-} " =~ " ${listed_component} " ]]; then
+        if [[ " ${displayed_components[*]:-} " != *" ${listed_component} "* ]]; then
             echo "$listed_component|$elapsed"
         fi
     done
 }
 
 
+print_failed_component_details() {
+    local component=$1
+    local result_file=$2
+
+    # GitHub Actions renders ::group:: lines as collapsible log sections.
+    if [[ -z "${GITHUB_ACTIONS:-}" || ! -f "$result_file" ]]; then
+        return
+    fi
+
+    echo "::group::${component}: test result"
+    cat "$result_file"
+    echo "::endgroup::"
+
+    local order_file="${result_file/random_test_result_/random_test_order_}"
+
+    if [[ -f "$order_file" ]]; then
+        echo "::group::${component}: execution order"
+        cat "$order_file"
+        echo "::endgroup::"
+    fi
+}
+
 print_summary() {
     local run_number=$1
     local pass_percent=0.00
@@ -779,13 +810,15 @@ print_summary() {
     if [[ $failed -gt 0 ]]; then
         echo -e "\n${BOLD_RED}Failed $(inflect "$failed" "Component" "Components"):${RESET}"
         while IFS= read -r failed_component; do
-            local result_file=$(find "$results_dir" -name "random_test_result_*_${failed_component}.txt" 2>/dev/null | head -n 1)
+            local result_file
+            result_file=$(find "$results_dir" -name "random_test_result_*_${failed_component}.txt" 2>/dev/null | head -n 1)
 
             if [[ -z "$result_file" ]]; then
                 result_file="$results_dir/random_test_result_*_${failed_component}.txt"
             fi
 
             echo -e "  ${RED}✗${RESET} ${BOLD}$failed_component${RESET} ($result_file)"
+            print_failed_component_details "$failed_component" "$result_file"
         done < <(printf '%s\n' "${failed_components[@]}" | sort)
     fi
 
@@ -830,7 +863,7 @@ main() {
         # Read components from config file
         verify_config
         print_success "Configuration file: $config_file\n"
-        components_array=($(read_components))
+        read -ra components_array <<< "$(read_components)"
     fi
 
     total=${#components_array[@]}

.github/scripts/run-random-tests.sh

@@ -8,15 +8,21 @@ on:
       - synchronize
       - reopened
       - labeled
+      - ready_for_review
   issues:
     types:
       - opened
       - edited
       - labeled
+  issue_comment:
+    types:
+      - created
   push:
     branches:
       - develop
       - '4.*'
+  schedule:
+    - cron: '0 0 * * *'
 
 permissions: {}
 
@@ -25,7 +31,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Run Carson
-        uses: NexusPHP/carson@3973bbb86351a78861b75bbf504f53a83aede4dc # v1.4.2
+        uses: NexusPHP/carson@cb35604ab330c2e44dba673fcef712c78e75f858 # v1.7.0
         with:
           app_id: ${{ secrets.CARSON_APP_ID }}
           private_key: ${{ secrets.CARSON_PRIVATE_KEY }}

.github/workflows/run-carson.yml

@@ -17,19 +17,19 @@
         "psr/log": "^3.0"
     },
     "require-dev": {
-        "boundwize/structarmed": "^0.17",
+        "boundwize/structarmed": "^0.18",
         "codeigniter/phpstan-codeigniter": "^2.1",
         "fakerphp/faker": "^1.24",
         "kint-php/kint": "^6.1",
         "mikey179/vfsstream": "^1.6.12",
         "nexusphp/tachycardia": "^2.0",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "^2.2.1",
+        "phpstan/phpstan": "^2.2.15",
         "phpstan/phpstan-strict-rules": "^2.0",
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^3.0",
-        "rector/rector": "2.6.6",
+        "rector/rector": "2.6.7",
         "shipmonk/phpstan-baseline-per-identifier": "^2.0"
     },
     "replace": {

composer.json

@@ -84,6 +84,7 @@ private function saveCache(): void
      */
     public function deleteCache(): void
     {
+        $this->cache        = [];
         $this->cacheUpdated = false;
         $this->cacheHandler->delete($this->cacheKey);
     }