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.5 Ready code #8464

Merged
merged 193 commits into from
Jan 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
193 commits
Select commit Hold shift + click to select a range
aa78c32
chore(deps): bump actions/download-artifact from 3 to 4
dependabot[bot] Dec 21, 2023
19a54ba
docs: add changelog and upgrade for v4.4.5
kenjis Dec 28, 2023
4f4b969
docs: add instruction to merge develop into 4.x
kenjis Dec 28, 2023
95d4a8b
Merge pull request #8379 from kenjis/docs-changelog-4.4.5
kenjis Dec 28, 2023
43f3da3
docs: fix section title level
kenjis Dec 29, 2023
e5331d4
chore: update php-cs-fixer version
kenjis Dec 29, 2023
4b2985c
chore: add fully_qualified_strict_types config
kenjis Dec 29, 2023
a12d8d8
docs: composer cs-fix
kenjis Dec 29, 2023
f514d3b
test: composer cs-fix
kenjis Dec 29, 2023
86c15b0
fix phpunit badge
michalsn Dec 29, 2023
e424098
Merge pull request #8384 from kenjis/update-cs-fixer-v3.43.0
kenjis Dec 29, 2023
4d18f14
Remove overrides for coding-standard v1.7.12
paulbalandan Dec 29, 2023
ed6e0d0
Merge pull request #8385 from michalsn/fix/badge
paulbalandan Dec 29, 2023
08043b2
Fix leftover cases of `phpunit_data_provider_static`
paulbalandan Dec 29, 2023
3c2522f
test: fix path name of composer.json
paulbalandan Dec 29, 2023
f380460
Merge pull request #8382 from kenjis/update-RELEASE.md
kenjis Dec 29, 2023
e5e2fda
Merge pull request #8383 from kenjis/fix-v4.4.4.rst
kenjis Dec 29, 2023
4c3f90c
Merge pull request #8386 from paulbalandan/coding-standard
kenjis Dec 29, 2023
c85b65c
Merge pull request #8387 from paulbalandan/composer-json-test
kenjis Dec 29, 2023
0ee4e4a
Fix bug 4.4.4 spark not working
ALTITUDE-DEV-FR Dec 30, 2023
6dda636
Update Session.php
ALTITUDE-DEV-FR Dec 30, 2023
7b7e63c
Merge pull request #8389 from ALTITUDE-DEV-FR/patch-1
samsonasik Dec 30, 2023
8a7a689
test: ensure no .env when EncryptionTest is run
paulbalandan Dec 30, 2023
5f655f1
Merge pull request #8392 from paulbalandan/encryption-test-with-env
paulbalandan Jan 2, 2024
53d1382
chore: enforce PR title format with PRLint Reloaded
paulbalandan Dec 30, 2023
3013218
Merge pull request #8394 from paulbalandan/prlint-reloaded
paulbalandan Jan 2, 2024
69fc51f
Merge pull request #8357 from codeigniter4/dependabot/github_actions/…
MGatner Jan 3, 2024
688c8ba
fix: highlightFile() in BaseExceptionHandler
michalsn Jan 5, 2024
0cf729d
updates for $source handling based on kenjis PR
michalsn Jan 5, 2024
c9798b6
docs: make PHPDoc type more specific
kenjis Jan 5, 2024
7602145
refactor: remove unneeded if condition
kenjis Jan 5, 2024
3eac5ab
add IniTestTrait to easy backup ini values
michalsn Jan 5, 2024
128463c
add PHP 8.3 to the bug report template
michalsn Jan 5, 2024
e98dcfd
add group to the IniTestTratiTest
michalsn Jan 5, 2024
6d88cfe
Merge pull request #8404 from michalsn/chore/bug-report-template
kenjis Jan 6, 2024
766f76b
Merge pull request #8402 from kenjis/refactor-Table-phpstan-errors
kenjis Jan 6, 2024
f9bd4da
add separate results for PHP 7.4
michalsn Jan 6, 2024
d558f09
update separate results for PHP 7.4
michalsn Jan 6, 2024
83cffec
chore(deps): bump actions/upload-artifact from 3 to 4
dependabot[bot] Jan 7, 2024
fc62f96
Merge pull request #8401 from michalsn/fix/highlightFile
kenjis Jan 7, 2024
072318c
Merge pull request #8356 from codeigniter4/dependabot/github_actions/…
kenjis Jan 7, 2024
f6a59e6
docs: remove redundant @return
kenjis Jan 5, 2024
0643f57
test: update coding style with php-cs-fixer
kenjis Jan 5, 2024
be3397b
docs: update coding style with php-cs-fixer
kenjis Jan 5, 2024
73f5d46
docs: add namespace to sample code in testing
kenjis Jan 6, 2024
44d0bb6
chore: change coding style for User Guide sample code
kenjis Jan 6, 2024
f7ce5cd
docs: update coding style with php-cs-fixer
kenjis Jan 6, 2024
123f378
docs: add type to class property in sample code
kenjis Jan 6, 2024
5fc0849
docs: fix incorrect global classname in sample code
kenjis Jan 6, 2024
37a4a52
docs: fix incorrect global classname in sample code
kenjis Jan 6, 2024
20996a8
docs: add namespace App\Libraries to sample code
kenjis Jan 6, 2024
4dd42c2
docs: add namespace to sample class
kenjis Jan 6, 2024
3a06211
docs: fix namespace for UserModel
kenjis Jan 6, 2024
3d78f16
docs: add namespace App\Libraries to sample code
kenjis Jan 6, 2024
4bbc13c
docs: fix namespaces for sample classes
kenjis Jan 7, 2024
192c5b2
docs: improve $builder->insert() description
kenjis Jan 7, 2024
702261d
docs: split sample code file
kenjis Jan 7, 2024
73cb246
docs: improve sample for insert(), update(), upsert()
kenjis Jan 7, 2024
2aab393
Fix doc: include empty values by `array_group_by()` (#8396)
totoprayogo1916 Jan 7, 2024
495fb0c
fix: typo in pager default_simple
jasonliang-dev Jan 7, 2024
bbd4f1b
Merge pull request #8407 from jasonliang-dev/develop
samsonasik Jan 7, 2024
c0d134a
Merge pull request #8400 from kenjis/style-cs-fixer-3.46.0
kenjis Jan 7, 2024
d64fdb5
feat: remove `pre-commit` (#8406)
michalsn Jan 9, 2024
42afdb1
chore(deps-dev): update rector/rector requirement from 0.18.13 to 0.19.0
dependabot[bot] Jan 9, 2024
9fef925
Fix parallel timeout
samsonasik Jan 9, 2024
d5fb953
update Rector\Core subnamespace to Rector
samsonasik Jan 9, 2024
4308c0b
Merge pull request #8409 from codeigniter4/dependabot/composer/rector…
samsonasik Jan 9, 2024
edee5c7
docs: update `PULL_REQUEST_TEMPLATE` (#8413)
ddevsr Jan 14, 2024
e5a2ebc
chore: temporary fix for v3.47
ddevsr Jan 16, 2024
cbdfd38
fix duplicate
ddevsr Jan 16, 2024
675ec94
Update composer.json
ddevsr Jan 16, 2024
eaf2e08
Merge pull request #8416 from ddevsr/patch-1
kenjis Jan 16, 2024
6f045bf
Update Rector parallel config
samsonasik Jan 16, 2024
c12f75f
chore(deps-dev): update rector/rector requirement from 0.19.0 to 0.19.1
dependabot[bot] Jan 16, 2024
7fce7c6
chore: update php-cs-fixer vertion to ^3.47.1
kenjis Jan 16, 2024
1d8eb00
style: fix stdclass -> stdClass
kenjis Jan 16, 2024
8b2a991
test: composer cs-fix
kenjis Jan 16, 2024
4fc5e1c
chore: remove ignoreErrors
kenjis Jan 16, 2024
8c23fed
style: fix incorrect case method name
kenjis Jan 16, 2024
75d5400
DotArrayFilter replace rather than merge
grimpirate Jan 16, 2024
fa6fc02
Merge pull request #8421 from codeigniter4/dependabot/composer/rector…
samsonasik Jan 17, 2024
9582c8f
Merge pull request #8422 from kenjis/update-cs-fixer-3.47.1
kenjis Jan 17, 2024
1e61ebd
Merge pull request #8423 from kenjis/fix-SplFileInfo-getBasename-case
kenjis Jan 18, 2024
0788018
Merge pull request #8425 from grimpirate/grimpirate-patch-1
kenjis Jan 18, 2024
49acaf0
chore: update Sphinx version
kenjis Jan 18, 2024
b1f1a9c
test: remove duplicate assignment
kenjis Jan 18, 2024
8c4c5a7
Merge pull request #8429 from kenjis/fix-CITestSeeder-data
samsonasik Jan 18, 2024
434ebbd
Merge pull request #8428 from kenjis/update-sphinx-version
kenjis Jan 18, 2024
37cff22
chore(deps): bump actions/cache from 3 to 4
dependabot[bot] Jan 18, 2024
36d6150
test: add test for getFieldData() on SQLite3
kenjis Jan 19, 2024
2938cdf
test: rename folder name to exact same name as DB driver
kenjis Jan 19, 2024
0499e81
test: add markTestSkipped()
kenjis Jan 19, 2024
3b60067
test: add markTestSkipped() and remove DatabaseTestTrait
kenjis Jan 19, 2024
0114c4d
refactor: rename variable names
kenjis Jan 18, 2024
6c18480
docs: make @var more detailed
kenjis Jan 18, 2024
efaa41a
test: remove test1 table after testing
kenjis Jan 19, 2024
c452ad0
docs: add PHPDocs
kenjis Jan 19, 2024
add3e07
style: break long line
kenjis Jan 19, 2024
4ac6ca5
refactor: rename variable names
kenjis Jan 19, 2024
f34fc58
refactor: rename variable names when DROP column
kenjis Jan 19, 2024
8924cb0
refactor: rename parameter name in _alterTable()
kenjis Jan 19, 2024
145e89a
docs: add @TODO
kenjis Jan 19, 2024
a33ff9c
docs: add PHPDoc types
kenjis Jan 19, 2024
3f56cc5
refactor: replace $data with $field
kenjis Jan 19, 2024
601ec58
docs: fix @phpstan-return
kenjis Jan 19, 2024
e14ca8b
style: break long line
kenjis Jan 19, 2024
bf30645
fix: incorrect refactoring
kenjis Jan 19, 2024
4d930fb
docs: fix @phpstan-return
kenjis Jan 19, 2024
1dd2e96
refactor: rename parameter name in Table::modifyColumn()
kenjis Jan 19, 2024
f097aeb
refactor: replace $field with $fields
kenjis Jan 19, 2024
b9c063f
style: break long line
kenjis Jan 19, 2024
3d4e12b
style: add empty lines
kenjis Jan 19, 2024
b8db96a
docs: remove duplicated if
kenjis Jan 19, 2024
ee10766
refactor: replace `! is_array()` with `is_string()`
kenjis Jan 19, 2024
04b6643
docs: fix @return types
kenjis Jan 19, 2024
2e6fbdd
chore(deps-dev): update rector/rector requirement from 0.19.1 to 0.19.2
dependabot[bot] Jan 19, 2024
0f43ba1
Merge pull request #8435 from codeigniter4/dependabot/composer/rector…
samsonasik Jan 19, 2024
213f0b9
refactor: add $columnNamesToDrop
kenjis Jan 20, 2024
83c582c
Merge pull request #8432 from kenjis/test-live-sqlite3
kenjis Jan 20, 2024
28cf32b
Merge pull request #8434 from kenjis/refactor-Forge-variables
kenjis Jan 20, 2024
74f2b81
test: add test for getFieldData() for MySQLi
kenjis Jan 19, 2024
ebf8fab
test: extract AbstractGetFieldDataTest class
kenjis Jan 19, 2024
4411e44
test: fix assertions on MySQL 5.7
kenjis Jan 20, 2024
bdbc8e4
fix: OCI8 Forge always sets NOT NULL when BOOLEAN is specified
kenjis Jan 21, 2024
40bd88c
docs: fix incorrect descriptions
kenjis Jan 21, 2024
945da21
Merge pull request #8440 from kenjis/fix-OCI8-Forge-BOOLEAN-null
kenjis Jan 23, 2024
314e293
Merge pull request #8431 from codeigniter4/dependabot/github_actions/…
kenjis Jan 23, 2024
5bbf3af
Merge pull request #8433 from kenjis/test-mysqli-getFieldData
kenjis Jan 23, 2024
02de356
test: update comment
kenjis Jan 21, 2024
b796f0b
test: add test for type date and datetime
kenjis Jan 21, 2024
a71aa3c
refactor: copy _updateBatch() to override
kenjis Jan 17, 2024
f1b4a6c
refactor: make if condition more strict
kenjis Jan 17, 2024
8832601
fix: updateBatch() Postgre type error
kenjis Jan 21, 2024
1d96753
docs: add sub section titles and tweaks
kenjis Jan 18, 2024
9ae66a2
docs: add changelog
kenjis Jan 21, 2024
560e745
refactory: by rector
kenjis Jan 21, 2024
1bffa76
test: fix assertion for SQLSRV
kenjis Jan 21, 2024
38fb5b2
test: add test for updateBatch() with constrants DATE
kenjis Jan 22, 2024
3336010
fix: Postgre updateBatch() SQL type error in WHERE part
kenjis Jan 22, 2024
f86c6d2
test: add test for more types
kenjis Jan 22, 2024
fc0a858
refactor: add castValue() and use it
kenjis Jan 22, 2024
ec11284
test: refactor with dataProvider
kenjis Jan 22, 2024
d4f3e92
refactor: make type uppercase in SQL string for readablitiy
kenjis Jan 22, 2024
5ca6dfa
test: add test for int as string
kenjis Jan 22, 2024
64cd791
test: FLOAT on MySQL cannot be used as WHERE = key
kenjis Jan 22, 2024
6d4ce25
refactor: change castValue() API
kenjis Jan 23, 2024
19de81b
docs: add sub section titles
kenjis Jan 23, 2024
3cf3242
docs: remove HTTP link for example domain
kenjis Jan 23, 2024
ab7a678
docs: make links to subsection
kenjis Jan 23, 2024
cd644df
docs: add @param
kenjis Jan 23, 2024
92cc84e
refactor: change castValue(),getFieldTypes() to cast(),getFieldType()
kenjis Jan 23, 2024
fa2e073
refactor: by rector
kenjis Jan 23, 2024
12c4c7e
test: add test for getFieldData() for Postgre
kenjis Jan 20, 2024
fbacb30
refactor: use `CAST(expression AS type)` instead of `::type`
kenjis Jan 23, 2024
1741648
test: add tests for setAttachmentCID()
kenjis Jan 23, 2024
51d6963
fix: setAttachmentCID() does not work with buffer string
kenjis Jan 23, 2024
8c4695a
fix: DB Seeder may use wrong DB connection during testing
kenjis Jan 24, 2024
fa08bb2
docs: add "Notes on Data Types"
kenjis Jan 24, 2024
a506217
docs: improve readability
kenjis Jan 24, 2024
415012c
docs: align comments
kenjis Jan 24, 2024
9bda43a
docs: replace MySqli with MySQLi
kenjis Jan 24, 2024
3d8b04b
Merge pull request #8447 from kenjis/fix-DatabaseTestTrait-SQLite3-me…
kenjis Jan 24, 2024
22d8e74
test: add test for getFieldData() for SQLSRV
kenjis Jan 24, 2024
baca36e
docs: update PHPDoc
kenjis Jan 24, 2024
c7cfba4
Merge pull request #8439 from kenjis/fix-postgre-updateBatch-2
kenjis Jan 24, 2024
63ab12b
test: update testInsertBatch() to use various data types
kenjis Jan 24, 2024
fcf5384
test: add test for deleteBatch() with DATE where key
kenjis Jan 25, 2024
bec6422
fix: deleteBatch() Postgre type error
kenjis Jan 25, 2024
b6b8c31
refactor: use if statement
kenjis Jan 25, 2024
4be3bd8
fix: remove unneeded cast()
kenjis Jan 25, 2024
6d3ac2d
docs: add section titles for DeteteBatch
kenjis Jan 25, 2024
3c36686
docs: remove unneeded note
kenjis Jan 25, 2024
4531b3b
docs: move section positions
kenjis Jan 25, 2024
6df4911
docs: replace SQLite with SQLite3
kenjis Jan 25, 2024
6f83075
test: add test for Postgre upsertBatch()
kenjis Jan 25, 2024
0a2f0c7
docs: add section titles for UpsertBatch
kenjis Jan 25, 2024
ebb950a
docs: add section titles for InsertBatch
kenjis Jan 25, 2024
5fd5f63
Merge pull request #8451 from kenjis/fix-postgre-deleteBatch
kenjis Jan 25, 2024
88547ad
Merge pull request #8450 from kenjis/test-postgre-qb-InsertBatch
kenjis Jan 25, 2024
2190110
Merge pull request #8453 from kenjis/test-postgre-upsertBatch
kenjis Jan 25, 2024
cadc6f8
docs: add missing $allowEmptyInserts
kenjis Jan 25, 2024
aa66b79
fix: add missing $allowEmptyInserts to template
kenjis Jan 25, 2024
cb99069
Merge pull request #8438 from kenjis/test-postgre-getFieldData
kenjis Jan 25, 2024
ac50a3e
Merge pull request #8441 from kenjis/docs-fix-forge-modifyColumn-notes
kenjis Jan 25, 2024
1545503
Merge pull request #8444 from kenjis/docs-improve-csp
kenjis Jan 25, 2024
ca7d92c
Merge pull request #8446 from kenjis/fix-email-attach-cid
kenjis Jan 25, 2024
47f71fa
Merge pull request #8448 from kenjis/docs-forge-data-types
kenjis Jan 25, 2024
94b3701
Merge pull request #8449 from kenjis/test-sqlsrv-getFieldData
kenjis Jan 25, 2024
13590d6
Merge pull request #8452 from kenjis/docs-query_builder
kenjis Jan 25, 2024
ffb2027
Merge pull request #8456 from kenjis/add-model-allowEmptyInserts
kenjis Jan 25, 2024
94ac623
Prep for 4.4.5 release
kenjis Jan 27, 2024
769545e
chore: add PR title patterns for release
kenjis Jan 27, 2024
1e6c17a
Merge pull request #8463 from kenjis/release-4.4.5
kenjis Jan 27, 2024
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
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ body:
- '8.0'
- '8.1'
- '8.2'
- '8.3'
validations:
required: true

Expand Down
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

Each pull request should address a single issue and have a meaningful title.

- PR title must include the type (feat, fix, chore, docs, perf, refactor, style, test) of the commit per Conventional Commits specification. See https://www.conventionalcommits.org/en/v1.0.0/ for the discussion.
- Pull requests must be in English.
- If a pull request fixes an issue, reference the issue with a suitable keyword (e.g., Fixes <issue number>).
- All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.3"__
- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.5"__

-->
**Description**
Expand Down
8 changes: 8 additions & 0 deletions .github/prlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"title": [
{
"pattern": "^(\\[\\d+\\.\\d+\\]\\s{1})?(feat|fix|chore|docs|perf|refactor|style|test)(\\([\\-.@:`a-zA-Z0-9]+\\))?!?:\\s{1}\\S.+\\S|Prep for \\d\\.\\d\\.\\d release|\\d\\.\\d\\.\\d Ready code$",
"message": "PR title must include the type (feat, fix, chore, docs, perf, refactor, style, test) of the commit per Conventional Commits specification. See https://www.conventionalcommits.org/en/v1.0.0/ for the discussion."
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/deploy-userguide-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

# Create an artifact of the html output
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: HTML Documentation
path: user_guide_src/build/html/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/reusable-coveralls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
coverage: xdebug

- name: Download coverage files
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: build/cov

Expand All @@ -37,7 +37,7 @@ jobs:
echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
key: ${{ github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
Expand All @@ -46,7 +46,7 @@ jobs:
${{ github.job }}-

- name: Cache PHPUnit's static analysis cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: build/.phpunit.cache/code-coverage
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/reusable-phpunit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ jobs:
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}" >> $GITHUB_ENV

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-${{ hashFiles('**/composer.*') }}
Expand All @@ -178,7 +178,7 @@ jobs:

- name: Cache PHPUnit's static analysis cache
if: ${{ inputs.enable-artifact-upload }}
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: build/.phpunit.cache/code-coverage
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:

- name: Upload coverage results as artifact
if: ${{ inputs.enable-artifact-upload }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACT_NAME }}
path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/reusable-serviceless-phpunit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}" >> $GITHUB_ENV

- name: Cache Composer dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
Expand All @@ -89,7 +89,7 @@ jobs:

- name: Cache PHPUnit's static analysis cache
if: ${{ inputs.enable-artifact-upload }}
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: build/.phpunit.cache/code-coverage
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
Expand All @@ -116,7 +116,7 @@ jobs:

- name: Upload coverage results as artifact
if: ${{ inputs.enable-artifact-upload }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACT_NAME }}
path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-deptrac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
Expand All @@ -63,7 +63,7 @@ jobs:
run: mkdir -p build/

- name: Cache Deptrac results
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: build
key: ${{ runner.os }}-deptrac-${{ github.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
Expand All @@ -73,7 +73,7 @@ jobs:
run: mkdir -p build/phpstan

- name: Cache PHPStan result cache directory
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: build/phpstan
key: ${{ runner.os }}-phpstan-${{ github.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV

- name: Cache composer dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
Expand All @@ -54,7 +54,7 @@ jobs:
run: mkdir -p build/psalm

- name: Cache Psalm results
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: build/psalm
key: ${{ runner.os }}-psalm-${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-rector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
Expand Down
26 changes: 1 addition & 25 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,31 +43,7 @@
__DIR__ . '/spark',
]);

$overrides = [
'php_unit_data_provider_name' => [
'prefix' => 'provide',
'suffix' => '',
],
'php_unit_data_provider_static' => true,
'php_unit_data_provider_return_type' => true,
'no_extra_blank_lines' => [
'tokens' => [
'attribute',
'break',
'case',
'continue',
'curly_brace_block',
'default',
'extra',
'parenthesis_brace_block',
'return',
'square_brace_block',
'switch',
'throw',
'use',
],
],
];
$overrides = [];

$options = [
'cacheFile' => 'build/.php-cs-fixer.cache',
Expand Down
26 changes: 1 addition & 25 deletions .php-cs-fixer.no-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,7 @@
__DIR__ . '/admin/starter/builds',
]);

$overrides = [
'php_unit_data_provider_name' => [
'prefix' => 'provide',
'suffix' => '',
],
'php_unit_data_provider_static' => true,
'php_unit_data_provider_return_type' => true,
'no_extra_blank_lines' => [
'tokens' => [
'attribute',
'break',
'case',
'continue',
'curly_brace_block',
'default',
'extra',
'parenthesis_brace_block',
'return',
'square_brace_block',
'switch',
'throw',
'use',
],
],
];
$overrides = [];

$options = [
'cacheFile' => 'build/.php-cs-fixer.no-header.cache',
Expand Down
33 changes: 7 additions & 26 deletions .php-cs-fixer.user-guide.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,13 @@
]);

$overrides = [
'echo_tag_syntax' => false,
'php_unit_internal_class' => false,
'no_unused_imports' => false,
'class_attributes_separation' => false,
'php_unit_data_provider_return_type' => true,
'no_extra_blank_lines' => [
'tokens' => [
'attribute',
'break',
'case',
'continue',
'curly_brace_block',
'default',
'extra',
'parenthesis_brace_block',
'return',
'square_brace_block',
'switch',
'throw',
'use',
],
],
'php_unit_data_provider_static' => true,
'php_unit_data_provider_name' => [
'prefix' => 'provide',
'suffix' => '',
'echo_tag_syntax' => false,
'php_unit_internal_class' => false,
'no_unused_imports' => false,
'class_attributes_separation' => false,
'fully_qualified_strict_types' => [
'import_symbols' => false,
'leading_backslash_in_global_namespace' => true,
],
];

Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Changelog

## [v4.4.5](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.5) (2024-01-27)
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.4...v4.4.5)

### Fixed Bugs

* fix: bug 4.4.4 `spark serve` not working when using Session in Routes.php by @ALTITUDE-DEV-FR in https://github.com/codeigniter4/CodeIgniter4/pull/8389
* fix: `highlightFile()` in `BaseExceptionHandler` for PHP 8.3 by @michalsn in https://github.com/codeigniter4/CodeIgniter4/pull/8401
* fix: [Validation] DotArrayFilter returns incorrect array when numeric index array is passed by @grimpirate in https://github.com/codeigniter4/CodeIgniter4/pull/8425
* fix: OCI8 Forge always sets NOT NULL when BOOLEAN is specified by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8440
* fix: DB Seeder may use wrong DB connection during testing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8447
* fix: [Postgre] QueryBuilder::updateBatch() does not work (No API change) by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8439
* fix: [Postgre] QueryBuilder::deleteBatch() does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8451
* fix: [Email] setAttachmentCID() does not work with buffer string by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8446
* fix: add undocumented Model $allowEmptyInserts by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8456

### Refactoring

* refactor: remove overrides for coding-standard v1.7.12 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/8386
* refactor: Table class to fix phpstan errors by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8402
* fix: typo in pager default_simple by @jasonliang-dev in https://github.com/codeigniter4/CodeIgniter4/pull/8407
* refactor: improve Forge variable names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8434

## [v4.4.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.4) (2023-12-28)
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.3...v4.4.4)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CodeIgniter 4 Development

[![PHPUnit](https://github.com/codeigniter4/CodeIgniter4/workflows/PHPUnit/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpunit.yml)
[![PHPUnit](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpunit.yml/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpunit.yml)
[![PHPStan](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpstan.yml/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpstan.yml)
[![Psalm](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-psalm.yml/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-psalm.yml)
[![Coverage Status](https://coveralls.io/repos/github/codeigniter4/CodeIgniter4/badge.svg?branch=develop)](https://coveralls.io/github/codeigniter4/CodeIgniter4?branch=develop)
Expand Down
20 changes: 17 additions & 3 deletions admin/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,21 @@
>
> -MGatner, kenjis

## [Minor version only] Merge minor version branch into develop
## Merge `develop` branch into next minor version branch `4.x`

Before starting release process, if there are commits in `develop` branch that
are not merged into `4.x` branch, merge them. This is because if conflicts occur,
merging will take time.

```console
git fetch upstream
git switch 4.x
git merge upstream/4.x
git merge upstream/develop
git push upstream HEAD
```

## [Minor version only] Merge minor version branch into `develop`

If you release a new minor version.

Expand Down Expand Up @@ -149,15 +163,15 @@ Work off direct clones of the repos so the release branches persist for a time.
git merge origin/master
git push origin HEAD
```
* [ ] Update the next minor upgrade branch `4.x`:
* [ ] Update the next minor version branch `4.x`:
```console
git fetch origin
git checkout 4.x
git merge origin/4.x
git merge origin/develop
git push origin HEAD
```
* [ ] [Minor version only] Create the next minor upgrade branch `4.x`:
* [ ] [Minor version only] Create the new next minor version branch `4.x`:
```console
git fetch origin
git switch develop
Expand Down
4 changes: 2 additions & 2 deletions admin/framework/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"psr/log": "^1.1"
},
"require-dev": {
"codeigniter/coding-standard": "^1.5",
"codeigniter/coding-standard": "^1.7",
"fakerphp/faker": "^1.9",
"friendsofphp/php-cs-fixer": "~3.41.0",
"friendsofphp/php-cs-fixer": "^3.47.1",
"kint-php/kint": "^5.0.4",
"mikey179/vfsstream": "^1.6",
"nexusphp/cs-config": "^3.6",
Expand Down
Loading
Loading