Skip to content

Commit 83ee909

Browse files
authored
Merge pull request #16937 from phalcon/5.0.x
5.12.0 Release
2 parents a05f6aa + 91b9053 commit 83ee909

3,052 files changed

Lines changed: 65017 additions & 30010 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci/after-failure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ then
3030
}
3131
fi
3232

33-
# for some reason Ubuntu 18.04 on Travis CI doesn't install gdb
33+
# for some reason Ubuntu 18.04 on Travis CI does not install gdb
3434
function install_gdb() {
3535
if [ "${CI}" = "true" ] && [ "$(command -v gdb 2>/dev/null)" = "" ]
3636
then

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ build/php7/* linguist-vendored
99

1010
*.png binary
1111

12-
tests/_data/assets/assets/* -text
12+
tests/support/assets/* -text

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: 'Phalcon PHP extension build action'
22
description: 'Build Phalcon Framework for Linux according to various PHP versions.'
33

44
inputs:
5-
pecl:
6-
description: 'PECL package path'
5+
source:
6+
description: 'Path to extension source directory (build/phalcon)'
77
required: true
88
php-version:
99
description: 'PHP version'
@@ -19,16 +19,19 @@ runs:
1919
steps:
2020
- name: Build Phalcon for Linux
2121
shell: bash
22-
working-directory: ${{ github.workspace }}
22+
working-directory: ${{ inputs.source }}
2323
run: |
2424
export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
25-
echo "::group::Install Phalcon with PECL"
26-
sudo pecl -v install ${{ inputs.pecl }}
25+
echo "::group::Build Phalcon extension"
26+
phpize
27+
./configure --enable-phalcon
28+
make
29+
sudo make install
2730
echo "::endgroup::"
2831
2932
- name: Enable extension
3033
shell: bash
31-
run: echo "extension=phalcon" >> /etc/php/${{ inputs.php-version }}/cli/conf.d/99-pecl.ini
34+
run: echo "extension=phalcon" | sudo tee /etc/php/${{ inputs.php-version }}/cli/conf.d/99-phalcon.ini
3235

3336
- name: Get extension directory
3437
id: get-ext-dir
@@ -37,4 +40,4 @@ runs:
3740

3841
- name: Check Extension
3942
shell: bash
40-
run: php --ri phalcon
43+
run: php --ri phalcon

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: 'Phalcon PHP extension build action (macOS)'
22
description: 'Build Phalcon Framework for macOS according to various PHP versions.'
33

44
inputs:
5-
pecl:
6-
description: 'PECL package path'
5+
source:
6+
description: 'Path to extension source directory (build/phalcon)'
77
required: true
88

99
runs:
@@ -17,13 +17,16 @@ runs:
1717
1818
- name: Build Phalcon Extension
1919
shell: bash
20-
working-directory: ${{ github.workspace }}
20+
working-directory: ${{ inputs.source }}
2121
run: |
2222
export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
23-
echo "::group::Install Phalcon with PECL"
24-
sudo pecl -v install ${{ inputs.pecl }}
23+
echo "::group::Build Phalcon extension"
24+
phpize
25+
./configure --enable-phalcon
26+
make
27+
sudo make install
2528
echo "::endgroup::"
2629
2730
- name: Check Phalcon Extension
2831
shell: bash
29-
run: php --ri phalcon
32+
run: php --ri phalcon

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: 'Phalcon PHP extension build action (Windows)'
22
description: 'Build Phalcon Framework for Windows according to various PHP versions.'
33

44
inputs:
5-
pecl:
6-
description: 'PECL package path'
5+
source:
6+
description: 'Path to extension source directory (build/phalcon)'
77
required: true
88
php-version:
99
description: 'PHP version'
@@ -58,15 +58,15 @@ runs:
5858
$OsName = "${{ inputs.os }}".replace('-','').ToLower()
5959
$ReleaseFolder = if ("${{ inputs.ts }}" -eq "ts") { "Release_TS" } else { "Release" }
6060
$ReleaseFolder = if ("${{ inputs.arch }}" -eq "x64") { "x64\${ReleaseFolder}" } else { "${ReleaseFolder}" }
61-
$ReleaseDllPath = "${{ inputs.tools-dir }}\pecl\phalcon\phalcon-${{ inputs.phalcon-version }}\${ReleaseFolder}\php_phalcon.dll"
61+
$SourceDir = "${{ inputs.source }}"
62+
$ReleaseDllPath = "${SourceDir}\${ReleaseFolder}\php_phalcon.dll"
6263
$ReleaseZipBall = "phalcon-php${{ inputs.php-version }}-${{ inputs.ts }}-${OsName}-${{ inputs.arch }}"
6364
6465
Write-Output "RELEASE_FOLDER=$ReleaseFolder" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
6566
Write-Output "RELEASE_DLL_PATH=$ReleaseDllPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
6667
Write-Output "RELEASE_ZIPBALL=$ReleaseZipBall" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
6768
Write-Output "PHP_ROOT=${{ inputs.tools-dir }}\php" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
68-
Write-Output "PHP_PECL_PATH=${{ inputs.tools-dir }}\pecl" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
69-
Write-Output "PHP_DEVPACK=${{ inputs.tools-dir }}\php-devpack" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
69+
Write-Output "SOURCE_DIR=$SourceDir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
7070
7171
- name: Setup PHP SDK tool kit
7272
uses: zephir-lang/setup-php-sdk@v1
@@ -94,24 +94,18 @@ runs:
9494
shell: powershell
9595
run: Get-Php (Get-Command php).Path
9696

97-
- name: Install PECL Package
98-
shell: powershell
99-
run: |
100-
.\.github\scripts\Expand-Item7zip.ps1 "${{ inputs.pecl }}" "${env:TEMP}"
101-
.\.github\scripts\Expand-Item7zip.ps1 "${env:TEMP}\phalcon-pecl.tar" "${{ env.PHP_PECL_PATH }}\phalcon"
102-
10397
- name: Phalcon phpize
104-
working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ inputs.phalcon-version }}'
98+
working-directory: ${{ inputs.source }}
10599
shell: powershell
106100
run: phpize
107101

108102
- name: Phalcon Configure Project
109-
working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ inputs.phalcon-version }}'
103+
working-directory: ${{ inputs.source }}
110104
shell: powershell
111105
run: .\configure.bat --enable-phalcon
112106

113107
- name: Phalcon Build Project
114-
working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ inputs.phalcon-version }}'
108+
working-directory: ${{ inputs.source }}
115109
shell: powershell
116110
run: nmake
117111

@@ -127,4 +121,4 @@ runs:
127121
128122
- name: Check Phalcon Extension
129123
shell: powershell
130-
run: php --ri phalcon
124+
run: php --ri phalcon

.github/workflows/compile-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
# All versions should be declared here
9-
PHALCON_VERSION: '5.11.1'
9+
PHALCON_VERSION: '5.12.0'
1010
PHP_VERSION_LIST: '8.1, 8.2, 8.3, 8.4, 8.5'
1111
ARCH_LIST: 'x64, x86'
1212
TS_LIST: 'nts, ts'

0 commit comments

Comments
 (0)