Skip to content

Commit d125a64

Browse files
authored
Merge pull request #10060 from codeigniter4/develop
4.7.1 Ready code
2 parents 17d2d66 + a9a2eb0 commit d125a64

File tree

154 files changed

+4524
-1199
lines changed

Some content is hidden

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

154 files changed

+4524
-1199
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Each pull request should address a single issue and have a meaningful title.
77
- If a pull request fixes an issue, reference the issue with a suitable keyword (e.g., Fixes <issue number>).
88
- Your branch name and the target name should be different.
99
- All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
10-
- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.7"__
10+
- PRs with any enhancement should be sent to the next minor version branch.
1111
1212
-->
1313
**Description**

.github/dependabot.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@ updates:
66
schedule:
77
interval: 'daily'
88
open-pull-requests-limit: 10
9+
groups:
10+
composer-dependencies:
11+
patterns:
12+
- '*'
913

1014
- package-ecosystem: 'github-actions'
11-
directory: '/'
15+
directories:
16+
- '/'
17+
- '/admin/framework'
18+
- '/admin/starter'
19+
- '/admin/userguide'
1220
schedule:
1321
interval: 'daily'
14-
ignore:
15-
- dependency-name: '*'
16-
update-types:
17-
- 'version-update:semver-minor'
18-
- 'version-update:semver-patch'
22+
groups:
23+
github-actions:
24+
patterns:
25+
- '*'
26+
group-by: dependency-name

.github/labeler.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# https://github.com/actions/labeler?tab=readme-ov-file#usage
2+
3+
# Add the `4.8` label to PRs that target the `4.8` branch.
4+
'4.8': # @todo change value whenever the next minor version is changed
5+
- base-branch: '4.8'
6+
7+
# Add the `github_actions` label to PRs that change any file in the `.github/workflows/` directory.
8+
'github_actions':
9+
- changed-files:
10+
- any-glob-to-any-file:
11+
- '.github/workflows/*'
12+
13+
# Add the `documentation` label to PRs that change any file in the `user_guide_src/source/` directory.
14+
'documentation':
15+
- changed-files:
16+
- any-glob-to-all-files:
17+
- 'user_guide_src/source/*'
18+
19+
# Add the `testing` label to PRs that change files in the `tests/` directory ONLY.
20+
'testing':
21+
- changed-files:
22+
- any-glob-to-all-files:
23+
- 'tests/*'

.github/scripts/deploy-appstarter

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ cp -Rf ${SOURCE}/admin/starter/. ./
3232
# Commit the changes
3333
git add .
3434
git commit -m "Release ${RELEASE}"
35-
git push
35+
bash ${SOURCE}/.github/scripts/secure-git-push https://github.com/codeigniter4/appstarter.git HEAD:master

.github/scripts/deploy-framework

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ cp -Rf ${SOURCE}/admin/starter/tests/. ./tests/
3434
# Commit the changes
3535
git add .
3636
git commit -m "Release ${RELEASE}"
37-
git push
37+
bash ${SOURCE}/.github/scripts/secure-git-push https://github.com/codeigniter4/framework.git HEAD:master

.github/scripts/deploy-userguide

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ touch ${TARGET}/docs/.nojekyll
5858
# Commit the changes
5959
git add .
6060
git commit -m "Release ${RELEASE}"
61-
git push
61+
bash ${SOURCE}/.github/scripts/secure-git-push https://github.com/codeigniter4/userguide.git HEAD:master
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# CodeIgniter4 Components Verified for Random Test Execution
2+
# This file lists components that have been verified to pass all tests
3+
# when run in random order (--order-by=random)
4+
#
5+
# Format: One component directory name per line (matching tests/system/<component>/)
6+
# Comments start with #
7+
# Uncomment components as they are verified to work with random execution
8+
#
9+
# Reference: https://github.com/codeigniter4/CodeIgniter4/issues/9968
10+
11+
API
12+
# AutoReview
13+
# Autoloader
14+
# Cache
15+
CLI
16+
# Commands
17+
# Config
18+
# Cookie
19+
# DataCaster
20+
# DataConverter
21+
# Database
22+
# Debug
23+
# Email
24+
# Encryption
25+
# Entity
26+
# Events
27+
# Files
28+
# Filters
29+
# Format
30+
# HTTP
31+
# Helpers
32+
# Honeypot
33+
# HotReloader
34+
# I18n
35+
# Images
36+
# Language
37+
# Log
38+
# Models
39+
# Pager
40+
# Publisher
41+
# RESTful
42+
# Router
43+
# Security
44+
# Session
45+
# Test
46+
# Throttle
47+
# Typography
48+
# Validation
49+
# View

0 commit comments

Comments
 (0)