Skip to content

Commit 5f3e55a

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.8
# Conflicts: # utils/phpstan-baseline/loader.neon
2 parents dc75c06 + cef5cb5 commit 5f3e55a

Some content is hidden

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

55 files changed

+1745
-730
lines changed

.ai/forum-announcement-instructions.md

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

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
.gitignore export-ignore
99

1010
# admin files
11-
.ai/ export-ignore
1211
.github/ export-ignore
1312
admin/ export-ignore
1413
contributing/ export-ignore

.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/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)