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

#16477 - Add PHP8.3 support #16478

Merged
merged 27 commits into from
Dec 24, 2023
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e402b0c
#16477 - Remove PHP7.4 docker image and add PHP8.3
Jeckerson Dec 23, 2023
a36c7d8
#16477 - Enable `imagick` in PHP8.3
Jeckerson Dec 23, 2023
f6319f1
#16477 - Add digits check
Jeckerson Dec 23, 2023
7c00830
#16477 - Skip working tests with warnings in PHP8.3
Jeckerson Dec 23, 2023
64f9acd
#16477 - Update min version to 8.0
Jeckerson Dec 23, 2023
d9daf3a
#16477 - Bump `ZEPHIR_PARSER_VERSION` to `1.6.0`
Jeckerson Dec 23, 2023
54fda50
#16477 - Update PHP versions matrix
Jeckerson Dec 23, 2023
7349e8a
#16477 - Change template to use Zephir via composer
Jeckerson Dec 23, 2023
4de4592
#16477 - Adjust return types `bool` -> `false`
Jeckerson Dec 23, 2023
3ef9721
#16477 - Update CHANGELOG-5.0.md
Jeckerson Dec 23, 2023
dac4d38
#16477 - Shift minimal PHP version requirements
Jeckerson Dec 23, 2023
5fe0d76
#16477 - Update PHP versions matrix
Jeckerson Dec 23, 2023
c6ebd59
#16477 - Remove 7.4 from Windows matrix
Jeckerson Dec 23, 2023
6fc9f4f
#16477 - Update `vimeo/psalm` to latest
Jeckerson Dec 23, 2023
2ad33cb
#16477 - Suppress `MissingTemplateParam` issue
Jeckerson Dec 23, 2023
94ee748
#16477 - Update composer.lock
Jeckerson Dec 23, 2023
6af02d5
#16477 - Change return type of `Phalcon\Config\Adapter\Ini::cast()` t…
Jeckerson Dec 23, 2023
647e491
#16477 - Mass rename parameters to match `ParamNameMismatch` Psalm rule
Jeckerson Dec 23, 2023
6e00fe0
#16477 - Add return type
Jeckerson Dec 23, 2023
ad075d9
#16477 - Update composer.lock
Jeckerson Dec 23, 2023
a5b58db
#16477 - Add '--ignore-platform-reqs' flag
Jeckerson Dec 23, 2023
12bbf0e
#16477 - Add return type
Jeckerson Dec 23, 2023
40d7a2c
#16477 - Remove '--ignore-platform-reqs' flag
Jeckerson Dec 23, 2023
e2b05e1
#16477 - Temporary disable PHP 8.1 for Windows
Jeckerson Dec 23, 2023
5853914
#16477 - Remove `install-zephir.sh`
Jeckerson Dec 23, 2023
e34ccf8
#16477 - Regenerate ext/ directory
Jeckerson Dec 23, 2023
4c9e06f
#16477 - Remove mentions of `ZEPHIR_VERSION` env variable
Jeckerson Dec 23, 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 .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ '7.4', '8.0', '8.1', '8.2' ]
php: [ '8.0', '8.1', '8.2', '8.3' ]

name: Build Dockerfile PHP ${{ matrix.php }}
steps:
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
env:
# All versions should be declared here
PHALCON_VERSION: 5.4.0
ZEPHIR_PARSER_VERSION: 1.5.3
ZEPHIR_PARSER_VERSION: 1.6.0
ZEPHIR_VERSION: 0.17.0

# For tests
Expand Down Expand Up @@ -70,10 +70,10 @@ jobs:

generate:
needs: setup_workflow
uses: zephir-lang/templates/.github/workflows/phalcon-pecl.yml@main
uses: zephir-lang/templates/.github/workflows/phalcon-pecl-zephir-composer.yml@main
with:
extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }}
php_version: '8.2'
php_version: '8.3'
secrets:
composer-token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -87,7 +87,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ '7.4', '8.0', '8.1', '8.2' ]
php: [ '8.0', '8.1', '8.2', '8.3' ]
ts: [ 'nts', 'ts' ]
arch: [ 'x64' ]

Expand All @@ -103,8 +103,6 @@ jobs:
# macOS
- { name: macos-clang, os: macos-12, compiler: clang }
# Windows
- { php: '7.4', ts: 'ts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
- { php: '7.4', ts: 'nts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
- { php: '8.0', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
- { php: '8.0', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
- { php: '8.1', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
Expand Down Expand Up @@ -271,7 +269,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ '7.4', '8.0', '8.1', '8.2' ]
php: [ '8.0', '8.1', '8.2', '8.3' ]

steps:
- uses: actions/checkout@v3
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG-5.0.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
# Changelog

## [5.4.1](https://github.com/phalcon/cphalcon/releases/tag/v5.4.1) (xxxx-xx-xx)
## [5.5.0](https://github.com/phalcon/cphalcon/releases/tag/v5.5.0) (xxxx-xx-xx)

### Changed

- Shifted minimal support from PHP 7.4 to PHP 8.0 [#16477](https://github.com/phalcon/cphalcon/issues/16477)
- Changed `Phalcon\Mvc\Model::toArray` to use getters if present [#16320](https://github.com/phalcon/cphalcon/issues/16320)
- Adjusted return types identical to original interface `int|false` in `Phalcon\Session\Adapter\*::gc()` [#16477](https://github.com/phalcon/cphalcon/issues/16477)
- Changed return type of `Phalcon\Config\Adapter\Ini::cast()` to `mixed` [#16477](https://github.com/phalcon/cphalcon/issues/16477)

### Added

- Added support for PHP 8.3 [#16477](https://github.com/phalcon/cphalcon/issues/16477)

### Fixed

- Fixed `Phalcon\Filter\Validation\Validator\Numericality` to return false when input has spaces [#16461](https://github.com/phalcon/cphalcon/issues/16461)
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
],
"require": {
"php": ">=7.4"
"php": ">=8.0"
},
"require-dev": {
"ext-apcu": "*",
Expand Down Expand Up @@ -50,13 +50,13 @@
"codeception/module-redis": "^1.0.0",
"friendsofphp/php-cs-fixer": "~3.0",
"mustache/mustache": "^2.14.1",
"phalcon/ide-stubs": "^4.1",
"phalcon/zephir": "^0.17",
"phalcon/ide-stubs": "^5.4",
"phalcon/zephir": "dev-development",
"phpunit/phpunit": "^9.0",
"predis/predis": "^1.1",
"squizlabs/php_codesniffer": "^3.4",
"twig/twig": "~1.36",
"vimeo/psalm": "^4.7",
"vimeo/psalm": "^5.18",
"vlucas/phpdotenv": "^v5.4"
},
"config": {
Expand Down
Loading
Loading