Merge pull request #16864 from phalcon/5.0.x

5.12.0 Release

Author: niden

.ci/setup-dbs.sh

@@ -9,20 +9,20 @@
 
 (>&1 echo "Create MySQL database...")
 mysql -u root -e "CREATE DATABASE IF NOT EXISTS phalcon charset=utf8mb4 collate=utf8mb4_unicode_ci;"
-#mysql -u root phalcon_test < ./tests/_data/assets/db/schemas/mysql_schema.sql
+#mysql -u root phalcon_test < ./tests/support/assets/db/schemas/mysql_schema.sql
 (>&1 echo "Done.")
 
 (>&1 echo "Create PostgreSQL database...")
 psql -c 'create database phalcon;' -U postgres
-#psql -U postgres phalcon_test -q -f ./tests/_data/assets/db/schemas/postgresql_schema.sql
+#psql -U postgres phalcon_test -q -f ./tests/support/assets/db/schemas/postgresql_schema.sql
 (>&1 echo "Done.")
 
 #(>&1 echo "Create SQLite database...")
-#sqlite3 ./tests/_output/phalcon_test.sqlite < ./tests/_data/assets/db/schemas/sqlite_schema.sql
+#sqlite3 ./tests/support/assets/phalcon_test.sqlite < ./tests/support/assets/db/schemas/sqlite_schema.sql
 #(>&1 echo "Done.")
 
 #(>&1 echo "Create translations SQLite database...")
-#sqlite3 ./tests/_output/translations.sqlite < ./tests/_data/assets/db/schemas/sqlite_translations_schema.sql
+#sqlite3 ./tests/support/assets/translations.sqlite < ./tests/support/assets/db/schemas/sqlite_translations_schema.sql
 #(>&1 echo "Done.")
 
 wait

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

@@ -9,10 +9,15 @@ inputs:
     description: 'PHP version'
     required: true
 
+outputs:
+  extension-dir:
+    description: 'PHP extension directory'
+    value: ${{ steps.get-ext-dir.outputs.dir }}
+
 runs:
   using: 'composite'
   steps:
-    - name: 'Build Phalcon for Linux'
+    - name: Build Phalcon for Linux
       shell: bash
       working-directory: ${{ github.workspace }}
       run: |
@@ -25,6 +30,11 @@ runs:
       shell: bash
       run: echo "extension=phalcon" >> /etc/php/${{ inputs.php-version }}/cli/conf.d/99-pecl.ini
 
+    - name: Get extension directory
+      id: get-ext-dir
+      shell: bash
+      run: echo "dir=$(php-config --extension-dir)" >> $GITHUB_OUTPUT
+
     - name: Check Extension
       shell: bash
       run: php --ri phalcon

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

@@ -0,0 +1,29 @@
+name: 'Phalcon PHP extension build action (macOS)'
+description: 'Build Phalcon Framework for macOS according to various PHP versions.'
+
+inputs:
+  pecl:
+    description: 'PECL package path'
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Configure macOS Environment
+      shell: bash
+      run: |
+        sudo xcode-select -s /Applications/Xcode_14.2.app
+        xcodebuild -version
+
+    - name: Build Phalcon Extension
+      shell: bash
+      working-directory: ${{ github.workspace }}
+      run: |
+        export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
+        echo "::group::Install Phalcon with PECL"
+        sudo pecl -v install ${{ inputs.pecl }}
+        echo "::endgroup::"
+
+    - name: Check Phalcon Extension
+      shell: bash
+      run: php --ri phalcon

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

@@ -1,44 +1,51 @@
-name: 'Phalcon PHP extension build action'
+name: 'Phalcon PHP extension build action (Windows)'
 description: 'Build Phalcon Framework for Windows according to various PHP versions.'
 
 inputs:
   pecl:
     description: 'PECL package path'
     required: true
-
-  php_version:
-    description: 'PHP version to build for (e.g: 7.4, 8.0)'
+  php-version:
+    description: 'PHP version'
     required: true
   ts:
-    description: 'Thread Safety'
-    required: false
-    default: 'nts'
-  msvc:
-    description: 'Microsoft Visual C++ compiler toolset prefix (e.g: vc14, vs15, vs16)'
+    description: 'Thread safety (nts or ts)'
+    required: true
+  compiler:
+    description: 'MSVC compiler version'
     required: true
   arch:
-    description: 'Target architecture (x64, x86)'
-    required: false
-    default: 'x64'
+    description: 'Architecture (x64)'
+    required: true
+  phalcon-version:
+    description: 'Phalcon version'
+    required: true
+  tools-dir:
+    description: 'Tools directory'
+    required: true
+  cache-dir:
+    description: 'Cache directory'
+    required: true
+  os:
+    description: 'OS name (e.g. windows-2019)'
+    required: true
 
 runs:
   using: 'composite'
   steps:
     - name: Setup Downloads Cache
-      uses: actions/cache@v3
+      uses: actions/cache@v5
       with:
-        path: ${{ env.CACHE_DIR }}
-        key: ${{ runner.os }}-downloads-${{ hashFiles('**/.github/actions/build-phalcon-win/action.yml') }}
+        path: ${{ inputs.cache-dir }}
+        key: Windows-downloads-${{ hashFiles('**/.github/actions/build-phalcon-win/action.yml') }}
         restore-keys: |
-          ${{ runner.os }}-downloads-${{ env.cache-name }}-
-          ${{ runner.os }}-downloads-
-          ${{ runner.os }}
+          Windows-downloads-
 
     - name: Setup Prerequisites
       shell: powershell
       run: |
         Write-Output "::group::Install dependencies"
-        choco install --no-progress -y --cache-location=${{ env.CACHE_DIR }}\Choco re2c
+        choco install --no-progress -y --cache-location=${{ inputs.cache-dir }}\Choco re2c
         Write-Output "::endgroup::"
 
         Write-Output "Install PowerShell PHP Manager module"
@@ -47,87 +54,77 @@ runs:
         } else {
           Install-Module -Name PhpManager -Repository PSGallery -Force
         }
-        Write-Output "::endgroup::"
 
-        $OsName = "${{ matrix.os }}".replace('-','').ToLower()
+        $OsName = "${{ inputs.os }}".replace('-','').ToLower()
         $ReleaseFolder = if ("${{ inputs.ts }}" -eq "ts") { "Release_TS" } else { "Release" }
         $ReleaseFolder = if ("${{ inputs.arch }}" -eq "x64") { "x64\${ReleaseFolder}" } else { "${ReleaseFolder}" }
-        $ReleaseDllPath = "${{ env.TOOLS_DIR }}\pecl\phalcon\phalcon-${{ env.PHALCON_VERSION }}\${ReleaseFolder}\php_phalcon.dll"
-        $ReleaseZipBall = "phalcon-php${{ inputs.php_version }}-${{ inputs.ts }}-${OsName}-${{ inputs.msvc }}-${{ inputs.arch }}"
+        $ReleaseDllPath = "${{ inputs.tools-dir }}\pecl\phalcon\phalcon-${{ inputs.phalcon-version }}\${ReleaseFolder}\php_phalcon.dll"
+        $ReleaseZipBall = "phalcon-php${{ inputs.php-version }}-${{ inputs.ts }}-${OsName}-${{ inputs.arch }}"
 
         Write-Output "RELEASE_FOLDER=$ReleaseFolder" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         Write-Output "RELEASE_DLL_PATH=$ReleaseDllPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         Write-Output "RELEASE_ZIPBALL=$ReleaseZipBall" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-        Write-Output "PHP_ROOT=${{ env.TOOLS_DIR }}\php" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        Write-Output "PHP_PECL_PATH=${{ env.TOOLS_DIR }}\pecl" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        Write-Output "PHP_DEVPACK=${{ env.TOOLS_DIR }}\php-devpack" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        Write-Output "PHP_ROOT=${{ inputs.tools-dir }}\php" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        Write-Output "PHP_PECL_PATH=${{ inputs.tools-dir }}\pecl" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        Write-Output "PHP_DEVPACK=${{ inputs.tools-dir }}\php-devpack" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
     - name: Setup PHP SDK tool kit
       uses: zephir-lang/setup-php-sdk@v1
       with:
-        php_version: ${{ inputs.php_version }}
+        php_version: ${{ inputs.php-version }}
         ts: ${{ inputs.ts }}
-        msvc: ${{ inputs.msvc }}
+        msvc: ${{ inputs.compiler }}
         arch: ${{ inputs.arch }}
-        install_dir: ${{ env.TOOLS_DIR }}
-        cache_dir: ${{ env.CACHE_DIR }}
+        install_dir: ${{ inputs.tools-dir }}
+        cache_dir: ${{ inputs.cache-dir }}
 
-    - name: Configure Developer Command Prompt for MSVC compiler
+    - name: Configure Developer Command Prompt for MSVC
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: ${{ inputs.arch }}
 
-    # Workaround for
-    # PHP Warning:  PHP Startup: Can't load module 'C:\tools\php\ext\php_zephir_parser.dll'
-    # as it's linked with 14.29, but the core is linked with 14.16 in Unknown on line 0
-    - name: Configure Developer Command Prompt for MSVC compiler
+    - name: Configure Developer Command Prompt for MSVC toolset 14.16 (PHP 7.4)
+      if: inputs.php-version == '7.4'
       uses: ilammy/msvc-dev-cmd@v1
-      if: ${{ inputs.php_version }} == '7.4'
       with:
         arch: ${{ inputs.arch }}
         toolset: 14.16
 
     - name: Getting Details About Installed PHP
       shell: powershell
-      run: |
-        Get-Php (Get-Command php).Path
+      run: Get-Php (Get-Command php).Path
 
     - name: Install PECL Package
       shell: powershell
       run: |
-        .\.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"
+        .\.github\scripts\Expand-Item7zip.ps1 "${{ inputs.pecl }}" "${env:TEMP}"
+        .\.github\scripts\Expand-Item7zip.ps1 "${env:TEMP}\phalcon-pecl.tar" "${{ env.PHP_PECL_PATH }}\phalcon"
 
-    - name: Phalcon | phpize
-      working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ env.PHALCON_VERSION }}'
+    - name: Phalcon phpize
+      working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ inputs.phalcon-version }}'
       shell: powershell
-      run: |
-        phpize
+      run: phpize
 
-    - name: Phalcon | Configure Project
-      working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ env.PHALCON_VERSION }}'
+    - name: Phalcon Configure Project
+      working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ inputs.phalcon-version }}'
       shell: powershell
-      run: |
-        .\configure.bat --enable-phalcon
+      run: .\configure.bat --enable-phalcon
 
-    - name: Phalcon | Build Project
-      working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ env.PHALCON_VERSION }}'
+    - name: Phalcon Build Project
+      working-directory: '${{ env.PHP_PECL_PATH }}\phalcon\phalcon-${{ inputs.phalcon-version }}'
       shell: powershell
-      run: |
-        nmake
+      run: nmake
 
-    - name: Inspecting Phalcon Extension DLL File
+    - name: Inspect Phalcon Extension DLL
       shell: powershell
-      run: |
-        Get-PhpExtension "${{ env.RELEASE_DLL_PATH }}"
+      run: Get-PhpExtension "${{ env.RELEASE_DLL_PATH }}"
 
     - name: Enable Phalcon Extension
       shell: powershell
       run: |
         Copy-Item -Path "${{ env.RELEASE_DLL_PATH }}" -Destination "${{ env.PHP_ROOT }}\ext\"
         Enable-PhpExtension -Extension 'phalcon' -Path "${{ env.PHP_ROOT }}"
 
-    - name: Check Extension
+    - name: Check Phalcon Extension
       shell: powershell
       run: php --ri phalcon

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

@@ -25,4 +25,3 @@ process {
         Exit $LastExitCode
     }
 }
-

.github/actions/pack-phalcon-ext/action.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
 
     name: Build Dockerfile PHP ${{ matrix.php }}
     steps: