Skip to content

Commit

Permalink
Merge pull request phalcon#16478 from phalcon/phalcon#16477-php83
Browse files Browse the repository at this point in the history
phalcon#16477 - Add PHP8.3 support
  • Loading branch information
niden authored Dec 24, 2023
2 parents 078c41e + 4c9e06f commit b4d4d7e
Show file tree
Hide file tree
Showing 687 changed files with 11,268 additions and 29,954 deletions.
35 changes: 0 additions & 35 deletions .ci/install-zephir.sh

This file was deleted.

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
19 changes: 8 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ on:
env:
# All versions should be declared here
PHALCON_VERSION: 5.4.0
ZEPHIR_PARSER_VERSION: 1.5.3
ZEPHIR_VERSION: 0.17.0
ZEPHIR_PARSER_VERSION: 1.6.0

# For tests
LANG: en_US.UTF-8
Expand Down Expand Up @@ -70,10 +69,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 +86,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,12 +102,10 @@ 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' }
- { php: '8.1', 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' }
#- { php: '8.1', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
# Most of the extensions wasn't compiled for PHP 8.2.
# So it is not possible to test in this version, inside Windows OS.
# List of .dlls - https://windows.php.net/downloads/pecl/releases/
Expand Down Expand Up @@ -271,7 +268,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 Expand Up @@ -308,7 +305,7 @@ jobs:
run: composer validate --no-check-all --no-check-publish

- name: "Install development dependencies with Composer"
uses: "ramsey/composer-install@v2"
uses: ramsey/composer-install@v2
with:
composer-options: "--prefer-dist"

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

0 comments on commit b4d4d7e

Please sign in to comment.