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

#15598 - Add PHP8.1 support #15834

Merged
merged 97 commits into from
May 30, 2022
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
4096059
#15598 - Remove `install-zephir.sh` unused bash script
Jeckerson Dec 14, 2021
6edb1eb
#15598 - Add docker image with PHP8.1
Jeckerson Dec 14, 2021
6cb4112
#15598 - Use `FILTER_UNSAFE_RAW` constant instead of deprecated `FILT…
Jeckerson Dec 18, 2021
bd41856
#15598 - Bump ZEPHIR_PARSER_VERSION to `1.4.2`
Jeckerson Dec 19, 2021
66d7334
#15598 - Add methods `__serialize()` and `__unserialize()` to `Collec…
Jeckerson Dec 19, 2021
4e343c2
#15598 - Simplify method `unserialize()` method
Jeckerson Dec 19, 2021
299d30e
#15598 - Add methods `__serialize()` and `__unserialize()` Storage\Se…
Jeckerson Dec 19, 2021
e98dc79
#15598 - Add `mixed` type instead of `var`
Jeckerson Dec 19, 2021
e4321d5
#15598 - Add Zephir as composer dependency
Jeckerson Dec 19, 2021
16c1582
#15598 - Add `mixed` type instead of `var`
Jeckerson Dec 20, 2021
d1c4888
Merge branch '5.0.x' into #15598-php8.1
Jeckerson Dec 25, 2021
7282c0d
#15598 - Add test aliases
Jeckerson Jan 3, 2022
360120b
Merge branch '5.0.x' into #15598-php8.1
Jeckerson Jan 3, 2022
fd2707c
#15598 - Change from `var` to `mixed`
Jeckerson Jan 9, 2022
fdeb56f
#15598 - Add PHP 8.1 to the matrix
Jeckerson Jan 15, 2022
8d6c4bc
#15598 - Remove nullable from `AbstractValidator:prepareCode()` method
Jeckerson Jan 15, 2022
ce944da
Merge branch '5.0.x' into #15598-php8.1
Jeckerson Jan 15, 2022
8c7b73b
#15598 - Add `Phalcon\Db\Enum::FETCH_DEFAULT` constant
Jeckerson Jan 15, 2022
8f149bd
#15598 - Replicate `Phalcon\Filter\Sanitize\StringVal` to custom code
Jeckerson Jan 15, 2022
88cf733
#15598 - Mass change from `getenv()` to `$_ENV`
Jeckerson Jan 15, 2022
508deda
#15598 - Fix PHP8.1 compatibility in `Phalcon\Http\Request\File:getRe…
Jeckerson Jan 15, 2022
d231891
#15598 - Standardize property types on `fetch()` and `fetchAll()` met…
Jeckerson Jan 15, 2022
56cb416
#15598 - Change workflow template for PECL generation
Jeckerson Jan 15, 2022
1473de4
#15598 - Add `__serialize()` and `__unserialize()` methods in `Model`…
Jeckerson Jan 15, 2022
be7b05a
#15598 - Update composer dependencies
Jeckerson Jan 15, 2022
3d2fc9e
#15598 - Bump max supported version to `8.1.99` in package.xml
Jeckerson Jan 15, 2022
8ff4e62
#15598 - Change workflow template for stubs validation
Jeckerson Jan 15, 2022
bd5b05a
#15598 - Add PHP 8.1 to integration test's matrix workflow
Jeckerson Jan 15, 2022
df5ff79
#15598 - Change call of env variable 'DATA_MYSQL_NAME'
Jeckerson Jan 15, 2022
d91928c
#15598 - Bump PSR_VERSION version to `1.2.0`
Jeckerson Jan 15, 2022
34c4af9
#15598 - Update `env()` function
Jeckerson Jan 15, 2022
a59c3fc
#15598 - Change value of `Enum::FETCH_DEFAULT`
Jeckerson Jan 22, 2022
2fd5088
#15598 - Temporary use Zephir's specific branch
Jeckerson Jan 22, 2022
00ff349
#15598 - Update composer dependencies
Jeckerson Jan 23, 2022
5ea5b1b
#15598 - Update composer dependencies
Jeckerson Jan 23, 2022
5c223cd
#15598 - Update composer dependencies
Jeckerson Jan 23, 2022
22ef31c
#15598 - Update composer dependencies
Jeckerson Jan 23, 2022
1a06fb1
#15598 - Update composer dependencies
Jeckerson Jan 23, 2022
d6d9b97
#15598 - Mass rename prefix of PSR to `ExtPsr`
Jeckerson Jan 24, 2022
fc27afb
#15598 - Fix `SessionHandlerInterface::gc()` deprecation notice in PH…
Jeckerson Jan 24, 2022
6ea42d1
#15598 - Fix number of args in `ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_…
Jeckerson Jan 24, 2022
1ba3797
#15598 - Suppress `MissingDependency` in Psalm
Jeckerson Jan 24, 2022
3ac487e
#15598 - Partial fix of psalm errors
Jeckerson Jan 24, 2022
e572e98
Merge branch '5.0.x' into #15598-php8.1
Jeckerson Mar 20, 2022
db977a8
#15598 - Bump ZEPHIR_PARSER_VERSION and ZEPHIR_VERSION
Jeckerson Mar 20, 2022
d45270c
#15598 - Update composer packages
Jeckerson Mar 20, 2022
d958de7
#15598 - Regenerate `ext/` directory
Jeckerson Mar 20, 2022
1f911c0
#15598 - Revert usage of default workflow
Jeckerson Mar 21, 2022
94112bf
Revert "#15598 - Revert usage of default workflow"
Jeckerson Mar 21, 2022
5eb9369
Merge branch '5.0.x' into #15598-php8.1
Jeckerson Apr 24, 2022
b73c4d2
#15598 - Change value of `defaultModule` property from `null` to empt…
Jeckerson Apr 24, 2022
b71a706
#15598 - Adjust logic compatible with PHP8.1
Jeckerson Apr 24, 2022
72b2652
#15598 - Adjust tests for PHP7.4
Jeckerson Apr 24, 2022
eccaffe
#15598 - Mass rename `PsrExt` to `Psr`
Jeckerson Apr 24, 2022
0858f36
#15598 - Add PSR-4 for CLI tests
Jeckerson Apr 24, 2022
3cb5179
Revert "#15598 - Remove `install-zephir.sh` unused bash script"
Jeckerson Apr 24, 2022
91eca8a
Merge branch '5.0.x' into #15598-php8.1
Jeckerson May 19, 2022
3802feb
Update Dockerfiles
Jeckerson May 19, 2022
f2b7efa
#15598 - Update vlucas/phpdotenv min version
Jeckerson May 19, 2022
e1075fb
#15598 - Regenerate ext/ directory
Jeckerson May 19, 2022
a4613c7
#15598 - Add PHP8.1 in workflows
Jeckerson May 19, 2022
cd6bb98
#15598 - Fix CLI tests
Jeckerson May 21, 2022
c0adc8a
#15598 - Adjust CLI tests
Jeckerson May 21, 2022
805b018
#15598 - Map tcp ports
Jeckerson May 29, 2022
a319eef
#15598 - Optimize imports
Jeckerson May 29, 2022
1b5d6d6
#15598 - Cleanup code
Jeckerson May 29, 2022
c0a9000
#15598 - Change assertion method
Jeckerson May 29, 2022
f3f3445
#15598 - Change type from `string` to `mixed` in `unserialize()` methods
Jeckerson May 29, 2022
93f8059
#15598 - Add `null` check
Jeckerson May 29, 2022
06fa7aa
#15598 - Make `$name` nullable
Jeckerson May 29, 2022
cd800a8
#15598 - Simplify conditions to null check instead of `typeof`
Jeckerson May 29, 2022
a08e6cd
#15598 - Make default values empty strings instead of `null`
Jeckerson May 29, 2022
84a7af6
#15598 - Adjust integration tests
Jeckerson May 29, 2022
b1c455f
#15598 - Change postgres port
Jeckerson May 29, 2022
54b340c
#15598 - Fix CS
Jeckerson May 29, 2022
ca5d6a8
#15598 - Change exception classes
Jeckerson May 29, 2022
6a4b233
#15598 - Fix Sqlite:describeColumns()
Jeckerson May 29, 2022
cc0aec0
#15598 - Bump PHALCON_VERSION
Jeckerson May 29, 2022
1099a7d
#15598 - Regenerate ext/ directory
Jeckerson May 29, 2022
0f4e69b
#15598 - Regenerate build/ directory
Jeckerson May 29, 2022
3c3be29
#15598 - Change version in package.xml
Jeckerson May 29, 2022
c74dc4e
#15598 - Add 'options' for postgres service
Jeckerson May 29, 2022
a8c6982
#15598 - Remove mentions of PSR
Jeckerson May 29, 2022
0e8a4e1
#15598 - Add `*.dep` to ignore list
Jeckerson May 29, 2022
83f2ed6
#15598 - Implement `__serialize()` and `__unserialize()` methods
Jeckerson May 29, 2022
0ca88ff
#15598 - Adjust test case
Jeckerson May 29, 2022
f2de3da
#15598 - Uppercase 'release candidate (RC)' in version
Jeckerson May 29, 2022
adf1aa3
#15598 - Implement `__serialize()` and `__unserialize()` methods
Jeckerson May 29, 2022
bea1819
#15598 - Update postgres port
Jeckerson May 29, 2022
8468918
#15598 - Remove debug code
Jeckerson May 29, 2022
f1b4732
#15598 - Remove PSR dependency in config.w32
Jeckerson May 29, 2022
5e0d3e2
#15598 - Add 'DATA_POSTGRES_PASS' env variable
Jeckerson May 30, 2022
6013f32
#15598 - Implement `__serialize()` and `__unserialize()` methods
Jeckerson May 30, 2022
1ff4fc0
#15598 - Adjust test case
Jeckerson May 30, 2022
ade445f
#15598 - Add 'POSTGRES_USER' env variable
Jeckerson May 30, 2022
72a9522
#15598 - Regenerate ext/ directory
Jeckerson May 30, 2022
6ad8dd5
#15598 - Regenerate build/ directory
Jeckerson May 30, 2022
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 @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: [ '7.4', '8.0' ]
php-versions: [ '7.4', '8.0', '8.1' ]

name: Build Dockerfile PHP ${{ matrix.php-versions }}
steps:
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ on:

env:
# All versions should be declared here
PHALCON_VERSION: 5.0.0alpha7
PHALCON_VERSION: 5.0.0beta3
ZEPHIR_PARSER_VERSION: 1.4.2
ZEPHIR_VERSION: 0.15.0
ZEPHIR_VERSION: 0.15.2
PSR_VERSION: 1.1.0

# For tests
Expand Down Expand Up @@ -66,9 +66,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.1'
secrets:
composer-token: ${{ secrets.GITHUB_TOKEN }}

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

Expand Down Expand Up @@ -120,6 +121,9 @@ jobs:
- name: windows2016-vc15
php: '8.0'

- name: windows2016-vc15
php: '8.1'

steps:
- uses: actions/checkout@v2

Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG-5.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

## Fixed
- Fixed `Phalcon\Logger\AbstractAdapter::getFormattedItem()` to not add `PHP_EOL` at the end of the message and added it to the `Phalcon\Logger\Adapter\Stream` [#14547](https://github.com/phalcon/cphalcon/issues/14547)
- Fixed PHP8.1 compatibility in `Phalcon\Http\Request\File:getRealType()` method [#15598](https://github.com/phalcon/cphalcon/issues/15598)

## Added
- Added missing PDO constant `Phalcon\Db\Enum::FETCH_DEFAULT` (`\Pdo::FETCH_DEFAULT`) [#15598](https://github.com/phalcon/cphalcon/issues/15598)

## Changed
- Replicated `filter_var(input, FILTER_SANITIZE_STRING)` in `Phalcon\Filter\Sanitize\StringVal` to custom solution, due PHP8.1 deprecation [#15598](https://github.com/phalcon/cphalcon/issues/15598)
- Changed property types, as in original, in `Phalcon\Db\Result\Pdo:fetch()` and `Phalcon\Db\Result\Pdo:fetchAll()` methods [#15598](https://github.com/phalcon/cphalcon/issues/15598)


# [5.0.0beta2](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta2) (2022-01-06)
Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"composer/package-versions-deprecated": true
}
},
"autoload-dev": {
"psr-4": {
Expand Down
Loading