Merge pull request #16548 from phalcon/5.0.x

5.6.2 Release
phalcon · Mar 14, 2024 · 888d2b2 · 888d2b2
2 parents 3e4f2c6 + 0e50ba3
commit 888d2b2
Show file tree

Hide file tree

Showing 21 changed files with 445 additions and 227 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -19,7 +19,7 @@ jobs:
 
     name: Build Dockerfile PHP ${{ matrix.php }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build Dockerfile
         run: docker build docker/${{ matrix.php }}
diff --git a/.github/workflows/compile-windows.yml b/.github/workflows/compile-windows.yml
@@ -0,0 +1,108 @@
+name: "[Windows] Build Phalcon"
+on: [push, pull_request]
+
+jobs:
+  windows:
+    runs-on: windows-latest
+    name: "Build Phalcon (PHP ${{matrix.php}}-${{matrix.ts}}-${{matrix.arch}})"
+    defaults:
+      run:
+        shell: cmd
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ["8.0","8.1","8.2","8.3"]
+        arch: [x64,x86]
+        ts: [nts,ts]
+        experimental: [false]
+    steps:
+      - name: Checkout Phalcon
+        uses: actions/checkout@v4
+
+      - name: Extract Phalcon Version
+        shell: powershell
+        run: |
+          chcp 65001
+          $r = Select-String -Path build/phalcon/php_phalcon.h -Pattern 'PHP_PHALCON_VERSION\s+"(.*)"'
+          $s = $r.Matches[0].Groups[1]
+          echo "$s"
+          $PhalconVersion = 'PHALCON_VERSION=' + $s
+          echo $PhalconVersion >> $env:GITHUB_ENV
+
+      - name: Setup PHP
+        id: setup-php
+        uses: php/setup-php-sdk@v0.8
+        with:
+          version: ${{matrix.php}}
+          arch: ${{matrix.arch}}
+          ts: ${{matrix.ts}}
+          deps: zlib
+
+      - name: Generate build folder
+        run: |
+          cd build/
+          php gen-build.php
+
+      - name: Enable Developer Command Prompt
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{matrix.arch}}
+          toolset: ${{steps.setup-php.outputs.toolset}}
+
+      - name: Phpize
+        run: |
+          cd build/phalcon/
+          phpize
+
+      - name: Configure
+        run: |
+          cd build/phalcon/
+          ./configure --enable-phalcon --with-prefix=${{steps.setup-php.outputs.prefix}}
+
+      - name: Make
+        run: |
+          cd build/phalcon/
+          nmake
+
+      - name: Define Phalcon Module Env
+        shell: powershell
+        run: |
+          chcp 65001
+
+          $dir = (Get-Location).Path + '\build\phalcon\'
+          if ('x64' -eq '${{matrix.arch}}') { $dir = $dir + 'x64\' }
+          $dir = $dir + 'Release'
+          if ('ts' -eq '${{matrix.ts}}') { $dir = $dir + '_TS' }
+          $phalconDllOpt = 'TEST_PHP_ARGS=-n -d zend_extension=' + $dir + '\php_phalcon.dll'
+          echo $phalconDllOpt >> $env:GITHUB_ENV
+
+          $artifactName = 'php_phalcon-php${{matrix.php}}'
+
+          if ('nts' -ne '${{matrix.ts}}') { $artifactName = $artifactName + '-ts' }
+          if ('nts' -eq '${{matrix.ts}}') { $artifactName = $artifactName + '-nts' }
+
+          $artifactName = $artifactName + '-windows'
+
+          if ('8.0' -eq '${{matrix.php}}') { $artifactName = $artifactName + '-vs16' }
+          if ('8.1' -eq '${{matrix.php}}') { $artifactName = $artifactName + '-vs16' }
+          if ('8.2' -eq '${{matrix.php}}') { $artifactName = $artifactName + '-vs16' }
+          if ('8.3' -eq '${{matrix.php}}') { $artifactName = $artifactName + '-vs16' }
+
+          if ('x64' -eq '${{matrix.arch}}') { $artifactName = $artifactName + '-x64' }
+
+          $phalconArtifactName = "ARTIFACT_NAME=" + $artifactName
+          echo $phalconArtifactName >> $env:GITHUB_ENV
+
+          $from = $dir + '\php_phalcon.dll'
+          $to = '.\php_phalcon.dll'
+          Copy-Item $from -Destination $to
+          $phalconArtifact = "ARTIFACT=" + '.\php_phalcon.dll'
+          echo $phalconArtifact >> $env:GITHUB_ENV
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{env.ARTIFACT_NAME}}
+          path: |
+            ${{env.ARTIFACT}}
+            LICENSE.txt
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ on:
 
 env:
   # All versions should be declared here
-  PHALCON_VERSION: 5.6.1
+  PHALCON_VERSION: 5.6.2
   ZEPHIR_PARSER_VERSION: 1.6.0
 
   # For tests
@@ -113,7 +113,7 @@ jobs:
           #- { php: '8.2', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup platform specific environment
         shell: pwsh
@@ -271,7 +271,7 @@ jobs:
         php: [ '8.0', '8.1', '8.2', '8.3' ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -381,7 +381,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get the release version
         id: get-version

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [5.6.2](https://github.com/phalcon/cphalcon/releases/tag/v5.6.1) (2024-03-14)
+
+### Changed
+
+- Changed `Phalcon\Mvc\View\Engine\Volt\Compiler::filter` to use the helper with `upper` and `lower` for UTF-8 characters [#16543](https://github.com/phalcon/cphalcon/issues/16543)
+- Changed `Phalcon\Di\AbstractInjectionAware` to extend `stdClass` for PHP 8.2 deprecation warnings [#16543](https://github.com/phalcon/cphalcon/issues/16543)
+
+### Added
+
+### Fixed
+
+### Removed
+
 ## [5.6.1](https://github.com/phalcon/cphalcon/releases/tag/v5.6.1) (2024-02-08)
 
 ### Changed