Merge pull request #16881 from phalcon/5.0.x

v5.11.1

Author: niden

.github/workflows/compile-windows.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   # All versions should be declared here
-  PHALCON_VERSION: '5.12.0'
+  PHALCON_VERSION: '5.11.1'
   PHP_VERSION_LIST: '8.1, 8.2, 8.3, 8.4, 8.5'
   ARCH_LIST: 'x64, x86'
   TS_LIST: 'nts, ts'
@@ -55,31 +55,3 @@ jobs:
           php-version: ${{ matrix.php-version }}
           arch: ${{ matrix.arch }}
           ts: ${{ matrix.ts }}
-
-
-#      - 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.11
-#        with:
-#          version: ${{matrix.php}}
-#          arch: ${{matrix.arch}}
-#          ts: ${{matrix.ts}}
-#          deps: zlib
-#
-#      - name: Upload artifacts
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: ${{env.ARTIFACT_NAME}}
-#          path: |
-#            ${{env.ARTIFACT}}
-#            LICENSE.txt

.github/workflows/main.yml

@@ -17,7 +17,7 @@ on:
 
 env:
   # All versions should be declared here
-  PHALCON_VERSION: 5.11.0
+  PHALCON_VERSION: 5.11.1
   ZEPHIR_PARSER_VERSION: 1.8.0
   # For tests
   LANG: en_US.UTF-8
@@ -104,28 +104,21 @@ jobs:
       - name: Validate extension loads
         run: php -d extension=build/phalcon/modules/phalcon.so -r 'echo "phalcon " . (new Phalcon\Support\Version())->get() . PHP_EOL;'
 
-  # Generate IDE stubs and validate with Psalm
+  # Generate IDE stubs, validate with Psalm, fix code style and store as artifact
   stubs:
-    name: Stubs / PHP ${{ matrix.php }}
+    permissions:
+      contents: read
+    name: Stubs
     runs-on: ubuntu-latest
     timeout-minutes: 15
-    strategy:
-      fail-fast: false
-      matrix:
-        php:
-          - '8.1'
-          - '8.2'
-          - '8.3'
-          - '8.4'
-          - '8.5'
 
     steps:
       - uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
+          php-version: '8.5'
           tools: pecl
           extensions: zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}
 
@@ -136,11 +129,23 @@ jobs:
 
       - run: composer install --prefer-dist --ignore-platform-reqs
 
-      - name: Validate stubs
+      - name: Generate and validate stubs
         run: |
           vendor/bin/zephir stubs
           vendor/bin/psalm ide/
 
+      - name: Fix code style on generated stubs
+        # phpcbf exits 1 when it fixes files; passing the path on the CLI overrides
+        # the <file> entries in phpcs.xml so the PSR12 ruleset is applied to the stubs.
+        run: vendor/bin/phpcbf --standard=phpcs.xml ide/${{ env.PHALCON_VERSION }}/ || true
+
+      - name: Upload IDE stubs artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: phalcon-ide-stubs
+          path: ide/${{ env.PHALCON_VERSION }}/Phalcon/
+          retention-days: 5
+
   # Build Phalcon PECL package (artifact consumed by build-and-test and database_test)
   generate_pecl:
     name: Build Phalcon PECL package
@@ -426,6 +431,17 @@ jobs:
           PHPTS: ${{ matrix.ts }}
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Redis Cluster
+        uses: vishnudxb/redis-cluster@1.10.0
+        with:
+          master1-port: 5000
+          master2-port: 5001
+          master3-port: 5002
+          slave1-port: 5003
+          slave2-port: 5004
+          slave3-port: 5005
+          sleep-duration: 5
+
       - name: Download compiled Phalcon extension
         uses: actions/download-artifact@v8
         with:
@@ -706,3 +722,70 @@ jobs:
           allowUpdates: true
           artifacts: "./build-artifacts/release/*.zip,./build-artifacts/release/*.tgz"
           artifactContentType: application/octet-stream
+
+  publish_stubs:
+    permissions:
+      contents: read
+
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+
+    name: Publish IDE Stubs
+    runs-on: ubuntu-latest
+    needs: [release, stubs]
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Download IDE stubs artifact
+        uses: actions/download-artifact@v8
+        with:
+          name: phalcon-ide-stubs
+          path: ./ide-stubs
+
+      - name: Checkout phalcon-ide-stubs
+        uses: actions/checkout@v6
+        with:
+          repository: phalcon/phalcon-ide-stubs
+          token: ${{ secrets.STUBS_REPO_TOKEN }}
+          path: phalcon-ide-stubs
+
+      - name: Copy stubs into phalcon-ide-stubs
+        # Copies the contents of ide/<version>/Phalcon/ into the stubs repo src/ folder.
+        # No files are deleted; other repo files are unaffected.
+        run: cp -r ./ide-stubs/. phalcon-ide-stubs/src/
+
+      - name: Commit and push stubs branch
+        working-directory: phalcon-ide-stubs
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git checkout -b stubs/v${{ env.PHALCON_VERSION }}
+          git add src/
+          git commit -m "stubs: update to v${{ env.PHALCON_VERSION }}"
+          git push origin stubs/v${{ env.PHALCON_VERSION }}
+
+      - name: Create Pull Request in phalcon-ide-stubs
+        working-directory: phalcon-ide-stubs
+        env:
+          GH_TOKEN: ${{ secrets.STUBS_REPO_TOKEN }}
+        run: |
+          gh pr create \
+            --repo phalcon/phalcon-ide-stubs \
+            --head stubs/v${{ env.PHALCON_VERSION }} \
+            --base master \
+            --title "stubs: update to v${{ env.PHALCON_VERSION }}" \
+            --body "v${{ env.PHALCON_VERSION }} Stubs"
+
+      - name: Create draft release in phalcon-ide-stubs
+        uses: ncipollo/release-action@v1
+        with:
+          token: ${{ secrets.STUBS_REPO_TOKEN }}
+          owner: phalcon
+          repo: phalcon-ide-stubs
+          tag: v${{ env.PHALCON_VERSION }}
+          name: v${{ env.PHALCON_VERSION }} Stubs
+          body: "v${{ env.PHALCON_VERSION }} Stubs"
+          draft: true
+          allowUpdates: true
+          commit: master
+

.github/workflows/release-windows.yml

@@ -1,5 +1,31 @@
 # Changelog
-## 5.12.0 (2026-04-03)
+## 5.11.1 (2026-XX-XX)
+
+### Changed
+
+### Added
+
+### Fixed
+
+### Removed
+
+# Changelog
+## 5.11.1 (2026-04-04)
+
+### Changed
+
+### Added
+
+- Added `Phalcon\Storage\Adapter\RedisCluster` adapter to support Redis Cluster connections [#16867](https://github.com/phalcon/cphalcon/issues/16867)
+- Added `Phalcon\Support\Settings` to be used for ini settings throughout the framework [#16873](https://github.com/phalcon/cphalcon/issues/16873)
+
+### Fixed
+
+- Fixed `Phalcon\Encryption\Security::computeHmac()` to catch `\ValueError` thrown by PHP 8.1+ when an unknown hashing algorithm is passed [#16893](https://github.com/phalcon/cphalcon/issues/16893)
+
+### Removed
+
+## 5.11.0 (2026-04-03)
 
 ### Changed
 
@@ -25,6 +51,7 @@
 - Fixed `Phalcon\Acl\Adapter\Memory::isAllowed()` and `Phalcon\Mvc\Model\Binder` to handle PHP 8.1+ union and intersection types by checking for `ReflectionNamedType` before calling `getName()` [#16261](https://github.com/phalcon/cphalcon/issues/16261)
 - Fixed memory leak in PHQL parser (phql_internal_parse_phql()) during repeated query execution. [#16854](https://github.com/phalcon/cphalcon/issues/16854)
 - Fixed a deadlock issue when running the db suite [#16862](https://github.com/phalcon/cphalcon/issues/16862)
+- Fixed `Phalcon\Storage\Adapter\Redis::clear()` and `Phalcon\Storage\Adapter\Stream::clear()` to only delete keys belonging to the current prefix instead of flushing the entire storage [#16806](https://github.com/phalcon/cphalcon/issues/16806)
 
 ### Removed