Skip to content

Commit cc0be1b

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.8
2 parents a03a765 + 55ca87b commit cc0be1b

52 files changed

Lines changed: 1784 additions & 5021 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/scripts/deploy-userguide‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export NO_MKDOCS_2_WARNING=1
3737
export SITE_URL=https://codeigniter.com/user_guide/
3838
mkdocs build --strict
3939
python admin/llms.py
40-
python admin/anchors.py
4140

4241
# Prepare the target
4342
cd $TARGET

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,10 @@ cleanup_finished_pids() {
665665
active+=("$pid")
666666
fi
667667
done
668-
bg_pids=("${active[@]:-}")
668+
bg_pids=()
669+
if [[ ${#active[@]} -gt 0 ]]; then
670+
bg_pids=("${active[@]}")
671+
fi
669672
}
670673

671674
spawn_limited_job() {

‎.github/workflows/deploy-userguide-latest.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
paths:
1212
- 'docs/**'
1313
- 'mkdocs.yml'
14-
- 'admin/anchors.py'
1514
- 'admin/llms.py'
1615
- '.github/workflows/deploy-userguide-latest.yml'
1716
workflow_dispatch:
@@ -73,7 +72,6 @@ jobs:
7372
cd "${name}"
7473
SITE_URL="${BASE_URL}/${name}/" mkdocs build --strict
7574
python admin/llms.py
76-
python admin/anchors.py
7775
)
7876
7977
mv "${name}/site" "pages/${name}"

‎.github/workflows/test-userguide.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
paths:
1010
- 'docs/**'
1111
- 'mkdocs.yml'
12-
- 'admin/anchors.py'
1312
- 'admin/llms.py'
1413
- 'admin/update-docs-nav.php'
1514
- '.github/workflows/test-userguide.yml'
@@ -61,7 +60,5 @@ jobs:
6160
NO_MKDOCS_2_WARNING: '1'
6261
run: mkdocs build --strict
6362

64-
- name: Write the llms files and the anchor aliases
65-
run: |
66-
python admin/llms.py
67-
python admin/anchors.py
63+
- name: Write the llms files
64+
run: python admin/llms.py

‎AGENTS.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,32 @@ CodeIgniter 4 is a mature open-source PHP framework. Framework production
44
code lives in `system/`; its tests mirror that structure under
55
`tests/system/`.
66

7+
## Before opening a pull request
8+
9+
Do not open a pull request unless the applicable pre-submission requirements
10+
in [CONTRIBUTING.md](CONTRIBUTING.md) and
11+
[Sending a Pull Request](contributing/pull_request.md) are met.
12+
13+
- A human contributor must have reviewed and understood the complete diff
14+
and taken responsibility for the submission. Agent review and passing
15+
checks do not replace this human review.
16+
- Verify the target branch, commit signing, relevant tests, and required
17+
documentation. Follow the focused validation policy below. Do not run
18+
the full CI matrix locally.
19+
- Remind the user of the applicable open pull request limit before
20+
submission. Check the contributor's open pull requests, including
21+
drafts, when possible. If the limit or a maintainer-approved exemption
22+
cannot be verified, clearly tell the user rather than claiming it has
23+
been checked.
24+
- If a requirement is unmet or cannot be verified, do not open the pull
25+
request. Tell the user which requirements remain unmet or unverified
26+
and what is needed before submission. Continue preparing the changes
27+
and completing any checks that can be performed. An unverified PR
28+
limit or exemption alone does not block submission; a known limit
29+
violation without an exemption does.
30+
- Report the checks performed, their results, and any validation left
31+
to CI. Do not claim that checks passed unless they were actually run.
32+
733
## Before making changes
834

935
Consult the relevant sections of:

‎CONTRIBUTING.md‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,42 @@
33
CodeIgniter is a community driven project and accepts contributions of
44
code and documentation from the community.
55

6-
If you'd like to contribute, please read the [Contributing to CodeIgniter](./contributing/README.md).
6+
## Responsibility for Contributions
7+
8+
AI-assisted contributions are welcome, but contributors remain responsible
9+
for everything they submit.
10+
11+
Before opening a pull request, you must:
12+
13+
- Review and understand all proposed changes.
14+
- Explain the problem being addressed and why the proposed solution is appropriate.
15+
- Verify the changes, run relevant tests, and describe what you tested,
16+
including any limitations.
17+
- Be prepared to answer review questions and revise your contribution.
18+
19+
These requirements apply regardless of the tools used. AI-generated
20+
explanations and passing CI checks do not replace your own review.
21+
22+
Automated submissions without meaningful human review are not accepted.
23+
Project-approved automation, such as dependency update bots, is exempt
24+
from this submission requirement.
25+
26+
Maintainers may close pull requests without detailed code review when
27+
the problem is unclear, the changes have not been adequately verified,
28+
or the contributor cannot explain them.
29+
30+
We do not require AI tool disclosures, prompts, or chat histories.
31+
32+
## Open Pull Request Limit
33+
34+
Contributors without write access may have up to three pull requests
35+
open in this repository at the same time, including drafts.
36+
Maintainers may grant exceptions to trusted contributors.
37+
38+
Please address feedback on your existing pull requests before opening
39+
additional ones.
40+
41+
## Further Guidance
42+
43+
For detailed contribution instructions, please read
44+
[Contributing to CodeIgniter](./contributing/README.md).

‎admin/RELEASE.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ venv/bin/pip install -r docs/requirements.txt
547547
rm -rf site/
548548
```
549549

550-
2. Build the site, the llms files and the anchor aliases:
550+
2. Build the site and the llms files:
551551

552552
```bash
553553
SITE_URL=https://codeigniter.com/user_guide/ venv/bin/mkdocs build --strict
@@ -557,10 +557,6 @@ venv/bin/pip install -r docs/requirements.txt
557557
venv/bin/python admin/llms.py
558558
```
559559

560-
```bash
561-
venv/bin/python admin/anchors.py
562-
```
563-
564560
3. Switch to the **userguide** repository and create the branch `release-$VERSION`.
565561
4. Replace **docs/** with **CodeIgniter4/site**.
566562
5. Commit the changes with the message `Update for $VERSION` and push to `origin`.

‎admin/anchors.py‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"phpunit/phpcov": "^9.0.2 || ^10.0",
3030
"phpunit/phpunit": "^10.5.16 || ^11.2",
3131
"predis/predis": "^3.0",
32-
"rector/rector": "2.8.3",
32+
"rector/rector": "2.8.4",
3333
"shipmonk/phpstan-baseline-per-identifier": "^2.0"
3434
},
3535
"replace": {

‎contributing/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ specifically interested in at any point in time. Join the discussion for those i
1212
if you want to take the lead on one of them.
1313

1414
- [Contributor Covenant Code of Conduct](../CODE_OF_CONDUCT.md)
15+
- [Responsibility for Contributions](../CONTRIBUTING.md#responsibility-for-contributions)
16+
- [Open Pull Request Limit](../CONTRIBUTING.md#open-pull-request-limit)
1517
- [Reporting a Bug](./bug_report.md)
1618
- [Sending a Pull Request](./pull_request.md)
1719
- [Configuring Upstream and Rebasing](./workflow.md#configuring-upstream-and-rebasing)

0 commit comments

Comments
 (0)