Skip to content

Commit 35431ac

Browse files
authored
Merge pull request #16291 from phalcon/5.0.x
5.2.0
2 parents ce1392e + 598eac9 commit 35431ac

File tree

39 files changed

+478
-663
lines changed

39 files changed

+478
-663
lines changed

.github/actions/build-phalcon-win/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ runs:
3838
shell: powershell
3939
run: |
4040
Write-Output "::group::Install dependencies"
41-
mkdir ${{ env.CACHE_DIR }}\Choco
4241
choco install --no-progress -y --cache-location=${{ env.CACHE_DIR }}\Choco re2c
4342
Write-Output "::endgroup::"
4443

.github/workflows/build-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ permissions:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1414

1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
php: [ '7.4', '8.0', '8.1' ]
18+
php: [ '7.4', '8.0', '8.1', '8.2' ]
1919

2020
name: Build Dockerfile PHP ${{ matrix.php }}
2121
steps:

.github/workflows/main.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ on:
1919

2020
env:
2121
# All versions should be declared here
22-
PHALCON_VERSION: 5.1.4
23-
ZEPHIR_PARSER_VERSION: 1.5.1
24-
ZEPHIR_VERSION: 0.16.3
22+
PHALCON_VERSION: 5.2.0
23+
ZEPHIR_PARSER_VERSION: 1.5.3
24+
ZEPHIR_VERSION: 0.17.0
2525

2626
# For tests
2727
LANG: en_US.UTF-8
@@ -69,9 +69,10 @@ jobs:
6969

7070
generate:
7171
needs: setup_workflow
72-
uses: zephir-lang/templates/.github/workflows/phalcon-pecl-8.1.yml@main
72+
uses: zephir-lang/templates/.github/workflows/phalcon-pecl.yml@main
7373
with:
7474
extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }}
75+
php_version: '8.2'
7576
secrets:
7677
composer-token: ${{ secrets.GITHUB_TOKEN }}
7778

@@ -85,8 +86,7 @@ jobs:
8586
strategy:
8687
fail-fast: false
8788
matrix:
88-
php: [ '7.4', '8.0', '8.1' ]
89-
# php: [ '7.4', '8.0', '8.1', '8.2' ]
89+
php: [ '7.4', '8.0', '8.1', '8.2' ]
9090
ts: [ 'nts', 'ts' ]
9191
arch: [ 'x64' ]
9292

@@ -108,8 +108,11 @@ jobs:
108108
- { php: '8.0', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
109109
- { php: '8.1', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
110110
- { php: '8.1', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
111-
# - { php: '8.2', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
112-
# - { php: '8.2', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
111+
# Most of the extensions wasn't compiled for PHP 8.2.
112+
# So it is not possible to test in this version, inside Windows OS.
113+
# List of .dlls - https://windows.php.net/downloads/pecl/releases/
114+
#- { php: '8.2', ts: 'ts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
115+
#- { php: '8.2', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
113116

114117
steps:
115118
- uses: actions/checkout@v3
@@ -228,7 +231,7 @@ jobs:
228231
contents: read # to fetch code (actions/checkout)
229232

230233
needs: [generate]
231-
runs-on: ubuntu-20.04
234+
runs-on: ubuntu-latest
232235

233236
services:
234237
mysql:
@@ -265,8 +268,7 @@ jobs:
265268
strategy:
266269
fail-fast: false
267270
matrix:
268-
php: [ '7.4', '8.0', '8.1' ]
269-
# php: [ '7.4', '8.0', '8.1', '8.2' ]
271+
php: [ '7.4', '8.0', '8.1', '8.2' ]
270272

271273
steps:
272274
- uses: actions/checkout@v3
@@ -375,7 +377,7 @@ jobs:
375377

376378
needs: [generate, install, build-and-test, integration-test]
377379
name: Create Release
378-
runs-on: ubuntu-20.04
380+
runs-on: ubuntu-latest
379381

380382
steps:
381383
- uses: actions/checkout@v3

BACKERS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ Thanks for the support
104104
<a href="https://github.com/yannux"><img src="https://avatars.githubusercontent.com/u/533125?s=460&u=4f1e888783d1faafaa76282e5c388501c2b2df83&v=4" title="Yann" width="60" height="60"></a>
105105
<a href="https://github.com/elcreator"><img src="https://avatars.githubusercontent.com/u/974975?v=4" title="Artur Kyryliuk" width="60" height="60"></a>
106106
<a href="https://github.com/Ultimater"><img src="https://avatars.githubusercontent.com/u/1922199?v=4" title="Kevin Yarmak" width="60" height="60"></a>
107-
<a href="https://github.com/qmegas"><img src="https://avatars3.githubusercontent.com/u/2444896?s=460&v=4" title="qmegas" width="60" height="60"></a>
108107
<a href="https://github.com/Ruzgfpegk"><img src="https://avatars1.githubusercontent.com/u/3818364?s=460&v=4" title="Ruzgfpegk" width="60" height="60"></a>
108+
<a href="https://github.com/SliceOfLife"><img src="https://avatars.githubusercontent.com/u/3955618?v=4" title="SliceOfLife" width="60" height="60"></a>
109109
<a href="https://github.com/f-do"><img src="https://avatars.githubusercontent.com/u/4299065?v=4" title="Florian" width="60" height="60"></a>
110110
<a href="https://github.com/borisdelev"><img src="https://avatars.githubusercontent.com/u/4441663?s=460&u=be604c39153e26326f2123c6e1bfe880d5ec0947&v=4" title="Boris Delev" width="60" height="60"></a>
111111
<a href="https://github.com/stdnk"><img src="https://avatars.githubusercontent.com/u/5130969?v=4" title="Vasily Stadnik" width="60" height="60"></a>
@@ -115,6 +115,7 @@ Thanks for the support
115115
<a href="https://github.com/ruudboon"><img src="https://avatars3.githubusercontent.com/u/7444246?s=460&v=4" title="Ruud Boon" width="60" height="60"></a>
116116
<a href="https://github.com/sitchi"><img src="https://avatars.githubusercontent.com/u/11546683?v=4" title="Nikoloz Sitchinava" width="60" height="60"></a>
117117
<a href="https://github.com/6trading"><img src="https://avatars.githubusercontent.com/u/12135941?v=4" title="Chris" width="60" height="60"></a>
118+
<a href="https://github.com/aircodepl"><img src="https://avatars.githubusercontent.com/u/17483386?v=4" title="Mateusz" width="60" height="60"></a>
118119
<a href="https://github.com/fvromera"><img src="https://avatars.githubusercontent.com/u/32909196?s=460&u=a4a6d765c836be52ab247354399d0ed1a49224fa&v=4" title="fvromera" width="60" height="60"></a>
119120
<a href="https://github.com/ak1113"><img src="https://avatars0.githubusercontent.com/u/38716832?s=460&v=4" title="Akira Kato" width="60" height="60"></a>
120121
<a href="https://github.com/dredasss"><img src="https://avatars1.githubusercontent.com/u/38747389?s=460&u=ee99a8bb28ee6bedbbea6325d49d4eb99080d421&v=4" title="Nerijus Alex" width="60" height="60"></a>

CHANGELOG-5.0.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## [5.2.0](https://github.com/phalcon/cphalcon/releases/tag/v5.2.0) (2023-02-26)
4+
5+
### Fixed
6+
7+
- Fixed `Phalcon\Html\Helper\Title::prepend` to correctly prepend text in subsequent calls [#16283](https://github.com/phalcon/cphalcon/issues/16283)
8+
9+
### Added
10+
11+
- Added support for PHP 8.2 [#15973](https://github.com/phalcon/cphalcon/issues/15973)
12+
313
## [5.1.4](https://github.com/phalcon/cphalcon/releases/tag/v5.1.4) (2023-01-10)
414

515
### Fixed

build/phalcon/phalcon.zep.c

Lines changed: 51 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/phalcon/php_phalcon.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ typedef zend_function zephir_fcall_cache_entry;
103103

104104

105105
#define PHP_PHALCON_NAME "phalcon"
106-
#define PHP_PHALCON_VERSION "5.1.4"
106+
#define PHP_PHALCON_VERSION "5.2.0"
107107
#define PHP_PHALCON_EXTNAME "phalcon"
108108
#define PHP_PHALCON_AUTHOR "Phalcon Team and contributors"
109-
#define PHP_PHALCON_ZEPVERSION "0.16.3-5099f34"
109+
#define PHP_PHALCON_ZEPVERSION "0.17.0-9f99da6"
110110
#define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
111111

112112
typedef struct _zephir_struct_db {

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"friendsofphp/php-cs-fixer": "~3.0",
5252
"mustache/mustache": "^2.14.1",
5353
"phalcon/ide-stubs": "^4.1",
54-
"phalcon/zephir": "^0.16.0",
54+
"phalcon/zephir": "^0.17",
5555
"phpunit/phpunit": "^9.0",
5656
"predis/predis": "^1.1",
5757
"squizlabs/php_codesniffer": "^3.4",

0 commit comments

Comments
 (0)