Skip to content

Commit

Permalink
Merge branch '5.0.x' into #15598-php8.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
#	ext/phalcon/container/container.zep.c
#	ext/phalcon/datamapper/pdo/profiler/memorylogger.zep.c
#	ext/phalcon/datamapper/pdo/profiler/profiler.zep.c
#	ext/phalcon/datamapper/pdo/profiler/profiler.zep.h
#	ext/phalcon/datamapper/pdo/profiler/profilerinterface.zep.h
#	ext/phalcon/http/message/abstractmessage.zep.c
#	ext/phalcon/http/message/abstractmessage.zep.h
#	ext/phalcon/http/message/abstractrequest.zep.c
#	ext/phalcon/http/message/abstractrequest.zep.h
#	ext/phalcon/http/message/request.zep.c
#	ext/phalcon/http/message/requestfactory.zep.c
#	ext/phalcon/http/message/requestfactory.zep.h
#	ext/phalcon/http/message/response.zep.c
#	ext/phalcon/http/message/responsefactory.zep.c
#	ext/phalcon/http/message/responsefactory.zep.h
#	ext/phalcon/http/message/serverrequest.zep.c
#	ext/phalcon/http/message/serverrequestfactory.zep.c
#	ext/phalcon/http/message/serverrequestfactory.zep.h
#	ext/phalcon/http/message/stream.zep.c
#	ext/phalcon/http/message/streamfactory.zep.c
#	ext/phalcon/http/message/streamfactory.zep.h
#	ext/phalcon/http/message/uploadedfile.zep.c
#	ext/phalcon/http/message/uploadedfilefactory.zep.c
#	ext/phalcon/http/message/uploadedfilefactory.zep.h
#	ext/phalcon/http/message/uri.zep.c
#	ext/phalcon/http/message/urifactory.zep.c
#	ext/phalcon/http/message/urifactory.zep.h
#	ext/phalcon/http/server/abstractmiddleware.zep.c
#	ext/phalcon/http/server/abstractmiddleware.zep.h
#	ext/phalcon/http/server/abstractrequesthandler.zep.c
#	ext/phalcon/http/server/abstractrequesthandler.zep.h
#	ext/phalcon/session/adapter/stream.zep.c
  • Loading branch information
Jeckerson committed May 19, 2022
2 parents 3cb5179 + 4728df6 commit 91eca8a
Show file tree
Hide file tree
Showing 511 changed files with 168,466 additions and 190,905 deletions.
34 changes: 1 addition & 33 deletions .github/actions/build-phalcon-win/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,37 +100,6 @@ runs:
.\.github\actions\build-phalcon-win\Expand-Item7zip.ps1 "${{ inputs.pecl }}" "${env:TEMP}"
.\.github\actions\build-phalcon-win\Expand-Item7zip.ps1 "${env:TEMP}\phalcon-pecl.tar" "${{ env.PHP_PECL_PATH }}\phalcon"
- name: PSR extension | init, phpize
shell: powershell
run: |
git clone https://github.com/jbboehr/php-psr.git ${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}
if (-not (Test-Path "${{ env.PHP_DEVPACK }}\include\ext\psr")) {
mkdir "${{ env.PHP_DEVPACK }}\include\ext\psr"
}
Set-Location "${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}"
phpize
- name: PSR extension | configure
working-directory: '${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}'
shell: powershell
run: |
echo "::group::Configure"
.\configure.bat --enable-psr
echo "::endgroup::"
- name: PSR extension | build
working-directory: '${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}'
shell: powershell
run: |
nmake
nmake install
- name: PSR extension | Inspecting Extension DLL File
shell: powershell
run: |
php --ri psr
Get-PhpExtension "${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}\${{ env.RELEASE_FOLDER }}\php_psr.dll"
- name: Phalcon | phpize
working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ env.PHALCON_VERSION }}'
shell: powershell
Expand All @@ -141,8 +110,7 @@ runs:
working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ env.PHALCON_VERSION }}'
shell: powershell
run: |
.\configure.bat --enable-phalcon `
--with-extra-libs="${{ env.PHP_PECL_PATH }}\psr\psr-${{ env.PSR_VERSION }}\${{ env.RELEASE_FOLDER }}"
.\configure.bat --enable-phalcon
- name: Phalcon | Build Project
working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ env.PHALCON_VERSION }}'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:

jobs:
build:

runs-on: ubuntu-20.04

strategy:
Expand Down
Loading

0 comments on commit 91eca8a

Please sign in to comment.