Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.4.2 Ready code #8062

Merged
merged 303 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
303 commits
Select commit Hold shift + click to select a range
94d546b
chore: add system/Test/ControllerResponse.php to skip list
kenjis Sep 7, 2023
f75e33d
chore: change PHPUnitLevelSetList::UP_TO_PHPUNIT_100 to PHPUnitSetLis…
kenjis Sep 7, 2023
0276d89
chore: skip the specific rule
kenjis Sep 8, 2023
b38cec4
Merge pull request #7911 from kenjis/fix-ReflectionHelper-setValue
samsonasik Sep 8, 2023
64819ee
Merge pull request #7904 from kenjis/update-rector.php
samsonasik Sep 8, 2023
9f2bac3
chore: add PHP 8.3 to test-phpunit.yml
kenjis Aug 31, 2023
f094a28
chore: composer require --dev phpstan/phpstan-strict-rules
kenjis Sep 9, 2023
92cf3bb
chore: enable disallowedConstructs
kenjis Sep 9, 2023
a3507c8
chore: update baseline
kenjis Sep 9, 2023
1ff3e6e
Merge pull request #7894 from kenjis/fix-migration-db-group
kenjis Sep 9, 2023
bdbb775
Merge pull request #7910 from kenjis/docs-filters.rst
kenjis Sep 10, 2023
cc28c41
Merge pull request #7916 from kenjis/add-phpstan-strict-rules-disallo…
kenjis Sep 10, 2023
7d3db2c
fix: types for common functions
paulbalandan Sep 10, 2023
a6eceb0
refactor: remove unneeded arguments to session
paulbalandan Sep 11, 2023
15787fd
GH: auto label conflict PR
ddevsr Sep 11, 2023
4ac597b
Update label-conflict.yml
ddevsr Sep 11, 2023
6f99752
test: change DBDebug to true
kenjis Sep 11, 2023
6c4f668
Merge pull request #7919 from paulbalandan/session-service
kenjis Sep 11, 2023
c3ccb20
remove uneeded trigger push
ddevsr Sep 11, 2023
042eaaa
Use phpstan-codeigniter
paulbalandan Sep 11, 2023
664aceb
fix: message issue comment
ddevsr Sep 11, 2023
10b2514
Merge pull request #7907 from ddevsr/patch-1
kenjis Sep 11, 2023
37ff3a4
Merge pull request #7917 from paulbalandan/phpstan-helpers
kenjis Sep 11, 2023
f314d0a
Merge pull request #7921 from ddevsr/patch-2
kenjis Sep 11, 2023
b6ecf0b
Merge pull request #7923 from paulbalandan/phpstan-codeigniter
kenjis Sep 11, 2023
3f77632
chore: add matchingInheritedMethodNames rule
kenjis Sep 11, 2023
b702cf6
fix: move labeler conflict PR
ddevsr Sep 12, 2023
f35f956
Merge pull request #7928 from ddevsr/move-labeler-conflict
kenjis Sep 12, 2023
d06f9cf
docs: add warning on PHP 7.4 EOL
kenjis Sep 12, 2023
4905fe9
chore: update phpstan exclude list
datamweb Sep 12, 2023
0333436
Merge pull request #7886 from kenjis/add-GA-php83
kenjis Sep 12, 2023
a42b84f
Merge pull request #7901 from kenjis/fix-cli-base_url
kenjis Sep 12, 2023
3711b14
Merge pull request #7922 from kenjis/test-DBDebug-true
kenjis Sep 12, 2023
987667a
Merge pull request #7927 from kenjis/phpstan-add-matchingInheritedMet…
kenjis Sep 12, 2023
ebc9a57
Merge pull request #7931 from kenjis/docs-warning-php74
kenjis Sep 12, 2023
89758d7
docs: add description of incompatible behavior
kenjis Sep 13, 2023
ee1f01f
Merge pull request #7902 from kenjis/docs-update-backward_compatibili…
kenjis Sep 13, 2023
7253a41
Merge pull request #7932 from datamweb/datamweb-phpstan
paulbalandan Sep 13, 2023
79716a2
dont ignore `.gitkeep`
totoprayogo1916 Sep 13, 2023
3230a72
gh: auto labeling unsigned PR
ddevsr Sep 13, 2023
49852f0
add permission
ddevsr Sep 13, 2023
5401c1a
added specified branch
ddevsr Sep 13, 2023
b3fb439
fix wrong branch
ddevsr Sep 13, 2023
7eabbb5
Update .github/workflows/label-signing.yml
ddevsr Sep 13, 2023
52fb912
build(deps-dev): update rector/rector requirement from 0.18.2 to 0.18.3
dependabot[bot] Sep 13, 2023
a4ec34a
update parallel and skip config
samsonasik Sep 13, 2023
0690704
Merge pull request #7939 from codeigniter4/dependabot/composer/rector…
samsonasik Sep 13, 2023
ab30253
[PHPStan] Add @var string[] on array of string with enable StringifyS…
samsonasik Sep 13, 2023
c1d21a5
remove unused cast
samsonasik Sep 13, 2023
83ed1a8
Merge pull request #7934 from kenjis/docs-upgrade_validations.rst
kenjis Sep 14, 2023
6782b03
Merge pull request #7937 from totoprayogo1916/dont-ignore-gitkeep
kenjis Sep 14, 2023
a542024
remove permission issue
ddevsr Sep 14, 2023
367c308
Merge pull request #7938 from ddevsr/label-signing
kenjis Sep 14, 2023
4549a7c
Update system/Commands/Utilities/Routes/AutoRouterImproved/Controller…
samsonasik Sep 14, 2023
02bcc04
Update system/Email/Email.php
samsonasik Sep 14, 2023
aa5dd51
Update system/Router/RouteCollection.php
samsonasik Sep 14, 2023
8d9afe0
Update system/Router/RouteCollection.php
samsonasik Sep 14, 2023
2ba4576
Update system/Router/RouteCollection.php
samsonasik Sep 14, 2023
29e3186
typo fix: arrray to array
samsonasik Sep 14, 2023
e420c03
Merge pull request #7940 from samsonasik/str-vars
samsonasik Sep 14, 2023
dcd8634
Fix: Routing::loadRoutes() in windows do not validate correctly $rout…
pjsde Sep 14, 2023
d4e0d9e
chore: enable disallowedLooseComparison
kenjis Sep 14, 2023
1767200
fix: event trigger label conflict
ddevsr Sep 13, 2023
9330473
fix: labeling manually but commenting with automation
ddevsr Sep 13, 2023
6403574
fix: labeling manually but commenting with automation
ddevsr Sep 13, 2023
209e4bb
added user login to message
ddevsr Sep 15, 2023
0f563a3
add token
ddevsr Sep 15, 2023
fbe374a
permission jobs
ddevsr Sep 15, 2023
521c50a
ordering permission
ddevsr Sep 15, 2023
df03d10
Merge pull request #7936 from ddevsr/event-trigger
kenjis Sep 15, 2023
642cf3b
Merge pull request #7942 from kenjis/phpstan-disallowedLooseComparison
kenjis Sep 15, 2023
843098a
chore: enable booleansInConditions
kenjis Sep 14, 2023
09062ec
chore: update baseline
kenjis Sep 14, 2023
72a1d16
docs: add note for feature to replace Config property
kenjis Sep 15, 2023
b63b625
docs: add link to how-to page
kenjis Sep 15, 2023
c48f34b
fix: check for CSRF token in the raw body
michalsn Sep 9, 2023
ca6c800
implement changes from code review
michalsn Sep 9, 2023
1528d0e
update changelog and user guide
michalsn Sep 9, 2023
4335c6b
implement missing changes from the code review
michalsn Sep 9, 2023
a63457f
apply changes from code review
michalsn Sep 15, 2023
be07d9c
make phpstan happy
michalsn Sep 15, 2023
46f8d5f
update phpstan-baseline.php
michalsn Sep 15, 2023
689c933
Merge pull request #7930 from pjsde/fix-routing
kenjis Sep 15, 2023
5073e8b
refactor: Apply PHPStan rule to RouteCollection::__construct()
pjsde Sep 16, 2023
26c4035
refactor: Apply PHPStan rule to RouteCollection::loadRoutesOptions()
pjsde Sep 16, 2023
66c356a
docs: PHPStan Codeigniter no type specified
ddevsr Sep 16, 2023
e90be66
Merge pull request #7915 from michalsn/fix/security
kenjis Sep 18, 2023
00ba7fb
Merge pull request #7943 from kenjis/phpstan-booleansInConditions
kenjis Sep 18, 2023
02ec2d9
Merge branch 'develop' into codeigniter-specified-type
ddevsr Sep 18, 2023
d736bcf
remove exception line from phpstan-baseline for RouteCollection
pjsde Sep 16, 2023
f188a75
update GA label
totoprayogo1916 Sep 19, 2023
f0af89d
Merge pull request #7948 from ddevsr/codeigniter-specified-type
kenjis Sep 19, 2023
188b185
run cs-fix after rules shorthand operator
ddevsr Sep 19, 2023
a05cae4
Merge pull request #7953 from ddevsr/run-cs-short-operator
kenjis Sep 19, 2023
3f5ac0d
Merge pull request #7950 from totoprayogo1916/confl
kenjis Sep 20, 2023
01ba309
Revert "GitHub Actions to add/remove label "stale" and comment"
kenjis Sep 20, 2023
d3d6875
Merge pull request #7954 from codeigniter4/revert-7950-confl
kenjis Sep 20, 2023
2ad658d
Merge pull request #7947 from pjsde/refactor-routecollection-phpstan
kenjis Sep 20, 2023
0d8064f
Merge pull request #7944 from kenjis/docs-configuration.rst
kenjis Sep 20, 2023
4ee20ad
chore: add hack to autoload.psr-4
kenjis Sep 20, 2023
34f1bfd
add or remove 'stale' label
totoprayogo1916 Sep 21, 2023
5712e6c
Merge pull request #7957 from totoprayogo1916/conflicting
kenjis Sep 21, 2023
7f6dd21
Separate workflow
totoprayogo1916 Sep 21, 2023
58acfec
Apply suggestions from code review by @kenjis
totoprayogo1916 Sep 21, 2023
c4bd34e
Merge pull request #7956 from kenjis/fix-reusable-coveralls.yml
kenjis Sep 22, 2023
7948535
fixed installation docs console typo
sammyskills Sep 21, 2023
dd2a4b1
updated debugbar image to use CodeIgniter 4.4.1
sammyskills Sep 21, 2023
689753d
updated welcome image to use CodeIgniter 4.4.1
sammyskills Sep 21, 2023
74f09a0
updated debugbar image
sammyskills Sep 22, 2023
0b9c49a
fix: lang() may return false
kenjis Sep 24, 2023
2809b1e
Make clear in documentation that setRules() overwrites any previously…
dgvirtual Sep 24, 2023
1e106b3
remove duplicate `export-ignore`
totoprayogo1916 Sep 24, 2023
a82faf6
Merge pull request #7970 from totoprayogo1916/patch-1
samsonasik Sep 24, 2023
8f34416
test: set locale to ar
kenjis Sep 24, 2023
1b94c4c
docs: add changelog
kenjis Sep 24, 2023
42970f1
docs: add missing message change to changelog
kenjis Sep 24, 2023
8847002
Merge pull request #7961 from sammyskills/installation-docs
kenjis Sep 24, 2023
79ae14f
Merge pull request #7959 from totoprayogo1916/conflicting
kenjis Sep 25, 2023
ebf7bc6
Merge pull request #7968 from dgvirtual/add_setRules_warning
kenjis Sep 25, 2023
f4af1a9
Small typo in validation.html
Sep 25, 2023
86fead7
Merge pull request #7973 from obozdag/patch-1
kenjis Sep 25, 2023
da0bddf
Merge pull request #7971 from kenjis/docs-add-changelog-440-message-c…
kenjis Sep 25, 2023
f4620bd
docs: add () after method names
kenjis Sep 25, 2023
310151c
docs: fix typo
kenjis Sep 25, 2023
fd6e698
docs: fix @param
kenjis Sep 25, 2023
cbeb86f
fix: CLI prompt message
kenjis Sep 25, 2023
902adad
build(deps-dev): update rector/rector requirement from 0.18.3 to 0.18.4
dependabot[bot] Sep 26, 2023
8eaba9b
Fix dependency set
samsonasik Sep 26, 2023
e1c2f5d
Merge pull request #7984 from codeigniter4/dependabot/composer/rector…
samsonasik Sep 26, 2023
eb1a952
fix: Services::request() should call AppServices instead static
pjsde Sep 26, 2023
b949a2e
Merge pull request #7975 from kenjis/fix-response.rst-method-names
kenjis Sep 28, 2023
f62e6cf
Merge pull request #7985 from pjsde/fix-services-request
kenjis Sep 28, 2023
c5e62f9
fix: fix the testcase error on mariaDB.
ping-yee Sep 28, 2023
e79250e
Small typo in email.rst
Sep 28, 2023
0cd3993
Merge pull request #7990 from obozdag/patch-1
kenjis Sep 28, 2023
72825b2
test: change `strpos` function to search the string.
ping-yee Sep 29, 2023
c3c170e
refactor: if condition
kenjis Sep 30, 2023
528200f
Merge pull request #7989 from ping-yee/230928_fix_db_test
kenjis Oct 1, 2023
87796a0
remove $_SESSION from methods and functions
pjsde Sep 26, 2023
88a842f
update phpstan-baseline.php
pjsde Sep 26, 2023
b357e47
update tests
pjsde Sep 28, 2023
b5d123a
reduce code as suggested
pjsde Oct 1, 2023
ca50f24
Merge pull request #7982 from pjsde/refactor-session-constant-usage
kenjis Oct 3, 2023
e67b42a
Merge pull request #7994 from kenjis/refactor-OCI8-Connection-if
kenjis Oct 3, 2023
d8777f8
chore: remove label-add-remove-conflict-single-pr.yml
kenjis Oct 3, 2023
f49b0a9
Merge pull request #7999 from kenjis/remove-label-add-remove-conflict…
kenjis Oct 3, 2023
96a822e
refactor: replace Services::request(config, false) with Services::inc…
kenjis Oct 1, 2023
262c048
docs: add ","
kenjis Oct 1, 2023
93001f1
fix: typo in method name
kenjis Oct 3, 2023
7ce08d3
fixed typo in docs/create_news_items.rst
sammyskills Oct 3, 2023
6af07c3
updated tutorial images
sammyskills Oct 3, 2023
efb12a8
Merge pull request #8001 from sammyskills/tutorial-fix
kenjis Oct 3, 2023
7b70ee1
refactor: delete duplicate codes for Composer loading
kenjis Oct 4, 2023
c27fb5d
Merge pull request #7966 from kenjis/fix-lang-format-error
kenjis Oct 5, 2023
58f06a9
build(deps-dev): update rector/rector requirement from 0.18.4 to 0.18.5
dependabot[bot] Oct 5, 2023
02e8805
remove CountOnNullRector from skip list as now deprecated
samsonasik Oct 5, 2023
83b64b4
Merge pull request #8007 from codeigniter4/dependabot/composer/rector…
samsonasik Oct 5, 2023
7f3b27a
fix: CI returns 200 OK to PageNotFound
kenjis Oct 6, 2023
33708a8
docs: add changelog
kenjis Oct 6, 2023
b7b6939
style: remove duplicate ()
kenjis Oct 6, 2023
f8acd58
docs: make discoverFilters() deprecated
kenjis Oct 6, 2023
8ac3828
docs: add changelog
kenjis Oct 6, 2023
11647e1
docs: fix class name
mostafakhudair Oct 6, 2023
7497532
apply suggestion
mostafakhudair Oct 6, 2023
56ed7b2
Merge pull request #8011 from kenjis/fix-200-OK-to-404
kenjis Oct 8, 2023
1c9d597
Merge pull request #8013 from kenjis/style-Toolbar-totalMemory
kenjis Oct 8, 2023
f277814
Merge pull request #8015 from mostafakhudair/patch-1
kenjis Oct 8, 2023
6212566
fix: bug that spark does not show error message
kenjis Sep 23, 2023
b201faf
docs: add changelog
kenjis Sep 25, 2023
334bf50
docs: move Routing Settings up
kenjis Oct 9, 2023
0d94606
Merge pull request #8014 from kenjis/deprecate-filter-discovery
kenjis Oct 10, 2023
6f97e82
test: fix incorrect test
kenjis Oct 10, 2023
e1e9a7b
test: add test case for empty string
kenjis Oct 10, 2023
61f080e
fix: reverse routing returns invalid route when '' is passed
kenjis Oct 10, 2023
a9cd190
test: add test
kenjis Oct 10, 2023
4892849
fix: CSP style nonce is added even if honeypot is not attached
kenjis Oct 10, 2023
49d3421
Merge pull request #7962 from kenjis/fix-spark-no-error-msg
kenjis Oct 10, 2023
1c5ff8d
docs: make public properties deprecated
kenjis Sep 25, 2023
dc84d18
docs: add @TODO to rename
kenjis Oct 10, 2023
eb1e7f6
Merge pull request #7977 from kenjis/fix-CLI-prompt-msg
kenjis Oct 10, 2023
ff5185a
Merge pull request #7998 from kenjis/refactor-service-request
kenjis Oct 10, 2023
815b802
Merge pull request #8004 from kenjis/refactor-composer-loading
kenjis Oct 10, 2023
aa83cd2
fix: named routes don't work with spark
kenjis Oct 11, 2023
155859b
Merge pull request #7976 from kenjis/fix-CLI-readline_support
kenjis Oct 11, 2023
9e96187
docs: deprecate unused param $config
kenjis Oct 11, 2023
ae7edbd
docs: fix typos in comments
kenjis Oct 11, 2023
f8015f1
docs: add changelog
kenjis Oct 11, 2023
6b23949
fix: add a primary key to an existing table
michalsn Oct 11, 2023
7c9c205
replace checks that use empty()
michalsn Oct 11, 2023
c61d8e7
update phpstan-baseline.php
michalsn Oct 11, 2023
da6492d
Merge pull request #8022 from kenjis/docs-improve-tutorial
kenjis Oct 12, 2023
b26809f
chore: update for phpstan-codeigniter v1.4.0
kenjis Oct 12, 2023
65b01f6
fix: incorrect class name
kenjis Oct 12, 2023
3e239d6
docs: fix typo
kenjis Oct 12, 2023
484cbe5
test: fix incorrect test
kenjis Oct 12, 2023
7869d35
Merge pull request #8035 from kenjis/fix-docs-upgrade_440
samsonasik Oct 12, 2023
f6ce13b
Merge pull request #8038 from kenjis/fix-RoutesTest-testRoutesCommand…
kenjis Oct 12, 2023
52dbf70
Merge pull request #8034 from kenjis/fix-phpstan-ci-errors
kenjis Oct 12, 2023
617180a
Merge pull request #8025 from kenjis/fix-Honeypot-CSP-style-nonce
kenjis Oct 13, 2023
586b9f2
Merge pull request #8028 from kenjis/fix-spark-named-routes
kenjis Oct 13, 2023
07d3ef8
Merge pull request #8030 from kenjis/depreacte-CodeIgniter-displayCac…
kenjis Oct 13, 2023
ce62326
Merge pull request #8031 from michalsn/fix/processIndexes
kenjis Oct 13, 2023
9221819
refactor: make sure $component is all lower case
kenjis Oct 12, 2023
e78a438
fix: $options are not saved in cache
kenjis Oct 12, 2023
34283e4
refactor: replace ::static with ::self
kenjis Oct 12, 2023
7664bb6
test: update assertion
kenjis Oct 12, 2023
5af603c
test: add test
kenjis Oct 13, 2023
68f8218
fix: DefinedRouteCollector returns incorrect route data
kenjis Oct 13, 2023
19cdaf2
docs: add changelog
kenjis Oct 13, 2023
ef37e12
docs: add text decoration
kenjis Oct 13, 2023
8d903a0
docs: improve explanation
kenjis Oct 13, 2023
50bd285
Merge pull request #8024 from kenjis/fix-url-to-empty-string
kenjis Oct 13, 2023
60a0fac
docs: fix anchor text
kenjis Oct 14, 2023
576dd68
[Rector] Enable $rectorConfig->removeUnusedImports()
samsonasik Oct 15, 2023
08458d3
Merge pull request #8044 from samsonasik/rector-enable-remove-unused-…
samsonasik Oct 16, 2023
83ebb79
[Rector] Apply BooleanInIfConditionRuleFixerRector
samsonasik Sep 18, 2023
8e288d2
use compare string for ini_get('display_errors')
samsonasik Sep 18, 2023
41ecd8b
use compare string for ini_get('display_errors')
samsonasik Sep 18, 2023
2d3327f
Update system/Config/Factories.php
samsonasik Sep 18, 2023
8be0e01
Fix missing semicolon
samsonasik Sep 18, 2023
eb8d382
re-run Rector
samsonasik Sep 18, 2023
594fcc2
fix instanceof assign
samsonasik Sep 26, 2023
11fcb7a
empty string context is impossible
samsonasik Oct 2, 2023
9c49724
add assert array for properties
samsonasik Oct 2, 2023
e73893f
move alternatives to previous assign
samsonasik Oct 16, 2023
534d917
updated to only check not null
samsonasik Oct 16, 2023
8f015f8
updated to only check not null
samsonasik Oct 16, 2023
9cb0fba
updated to only check not null
samsonasik Oct 16, 2023
201f4a0
updated to only check not null
samsonasik Oct 16, 2023
ca30ea6
updated to only check not null
samsonasik Oct 16, 2023
6f2c5ff
updated to only check not null
samsonasik Oct 16, 2023
3803fbc
add empty string check
samsonasik Oct 16, 2023
faa0c99
add empty string check
samsonasik Oct 16, 2023
0317245
run rector
samsonasik Oct 16, 2023
31ed124
regenerate baseline
samsonasik Oct 16, 2023
431748b
Merge pull request #7951 from samsonasik/boolean-in-if
kenjis Oct 16, 2023
21132d4
Merge pull request #8040 from kenjis/fix-spark-routes-bug
kenjis Oct 16, 2023
364d9e1
Merge pull request #8041 from kenjis/docs-improve-curlrequest.rst
kenjis Oct 16, 2023
1f753bc
docs: add note for routes after calling resetServices()
kenjis Oct 16, 2023
87ea6a9
fix: file sort order
kenjis Oct 16, 2023
dd02f5e
Merge pull request #8043 from kenjis/docs-fix-installation/upgrade_fi…
kenjis Oct 17, 2023
2fe4f94
Merge pull request #8047 from kenjis/docs-testing-service-reset
kenjis Oct 17, 2023
054061a
test: fix assertion
kenjis Oct 17, 2023
098bd10
Merge pull request #8052 from kenjis/fix-BaseConnectionTest-testStore…
kenjis Oct 18, 2023
a9fa8f0
Merge pull request #8037 from kenjis/fix-Factories-cache-bug
kenjis Oct 18, 2023
afe3cb2
Merge pull request #8048 from kenjis/fix-Files-Collector-sort
kenjis Oct 18, 2023
14fd67b
Prep for 4.4.2 release
kenjis Oct 18, 2023
1f5d5ee
docs: split CHANGELOG.md
kenjis Oct 18, 2023
28191cc
docs: fix typo
kenjis Oct 19, 2023
47b3460
Merge pull request #8061 from kenjis/release-4.4.2
kenjis Oct 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
admin/ export-ignore
contributing/ export-ignore
.editorconfig export-ignore
.nojekyll export-ignore export-ignore
.nojekyll export-ignore
CODE_OF_CONDUCT.md export-ignore
CONTRIBUTING.md export-ignore

Expand Down
51 changes: 51 additions & 0 deletions .github/workflows/label-add-conflict-all-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Auto Label "stale" for All PRs

on:
push:
branches:
- develop
- '4.*'

jobs:
build:
name: Check Conflicts

permissions:
contents: read
pull-requests: write

runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Get PR List
id: PR-list
run: echo "pr_list=$(gh pr list -L 100 --json mergeable,url,labels,author)" >> $GITHUB_OUTPUT
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: 'Add label "stale" and comment'
env:
PR_LIST: ${{ steps.PR-list.outputs.pr_list }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |

IFS=$'\n' # Set Internal Field Separator to newline to handle array elements

# Iterate through the PRs in PR_LIST
for pr in $(echo "$PR_LIST" | jq -c '.[]'); do
mergeable=$(echo "$pr" | jq -r '.mergeable')
author=$(echo "$pr" | jq -r '.author.login')
labels=$(echo "$pr" | jq -c '.labels[].name' | tr -d '[]"')
url=$(echo "$pr" | jq -r '.url')

# CONFLICTING and no 'stale' label
if [ "$mergeable" == "CONFLICTING" ] && [[ ! "$labels" == *"stale"* ]]; then
# Add "stale" label
gh pr edit $url --add-label "stale"

# Add a comment
gh pr comment $url --body ":wave: Hi, @$author!<br><br>We detected conflicts in your PR against the base branch :speak_no_evil:<br>You may want to sync :arrows_counterclockwise: your branch with upstream!<br><br>Ref: [Syncing Your Branch](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch)"
fi
done
32 changes: 32 additions & 0 deletions .github/workflows/label-signing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Check Signed PR
on:
pull_request:
branches:
- 'develop'
- '4.*'

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

permissions:
contents: read
pull-requests: write

jobs:
build:
name: Check Signed Commit
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Check signed commits in PR
uses: 1Password/check-signed-commits-action@v1
with:
comment: |
You must GPG-sign your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open-source project. See Developer's Certificate of Origin. See [signing][1].

**Note that all your commits must be signed.** If you have an unsigned commit, you can sign the previous commits by referring to [gpg-signing-old-commits][2].
[1]: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#signing
[2]: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits
5 changes: 4 additions & 1 deletion .github/workflows/reusable-coveralls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ jobs:
run: composer update --ansi

- name: Merge coverage files
run: vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
run: |
jq '.autoload."psr-4" += {"Config\\": "app/Config/"}' composer.json > temp.json && mv temp.json composer.json
composer dump-autoload
vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov

- name: Upload coverage to Coveralls
run: vendor/bin/php-coveralls --verbose --exclude-no-stmt --ansi
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/test-phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ jobs:
- '8.0'
- '8.1'
- '8.2'
- '8.3'
include:
- php-version: '8.3'
composer-option: '--ignore-platform-req=php'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand All @@ -70,6 +74,7 @@ jobs:
enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
extra-extensions: imagick, redis, memcached
extra-composer-options: ${{ matrix.composer-option }}

database-live-tests:
needs:
Expand All @@ -84,6 +89,7 @@ jobs:
- '8.0'
- '8.1'
- '8.2'
- '8.3'
db-platform:
- MySQLi
- OCI8
Expand All @@ -96,6 +102,8 @@ jobs:
- php-version: '7.4'
db-platform: MySQLi
mysql-version: '8.0'
- php-version: '8.3'
composer-option: '--ignore-platform-req=php'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand All @@ -109,6 +117,7 @@ jobs:
enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
extra-extensions: mysqli, oci8, pgsql, sqlsrv-5.10.1, sqlite3
extra-composer-options: ${{ matrix.composer-option }}

separate-process-tests:
needs:
Expand All @@ -122,6 +131,10 @@ jobs:
- '8.0'
- '8.1'
- '8.2'
- '8.3'
include:
- php-version: '8.3'
composer-option: '--ignore-platform-req=php'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand All @@ -133,6 +146,7 @@ jobs:
enable-coverage: true # needs xdebug for assertHeaderEmitted() tests
enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
extra-extensions: mysqli, oci8, pgsql, sqlsrv-5.10.1, sqlite3
extra-composer-options: ${{ matrix.composer-option }}

cache-live-tests:
needs:
Expand All @@ -146,6 +160,10 @@ jobs:
- '8.0'
- '8.1'
- '8.2'
- '8.3'
include:
- php-version: '8.3'
composer-option: '--ignore-platform-req=php'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand All @@ -157,6 +175,7 @@ jobs:
enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }}
extra-extensions: redis, memcached
extra-composer-options: ${{ matrix.composer-option }}

coveralls:
name: Upload coverage results to Coveralls
Expand Down
Loading
Loading