Merge branch '5.0.x' into manager-return-types

phalcon · Jan 5, 2024 · 8793a7f · 8793a7f
2 parents ffeb995 + 7212ba0
commit 8793a7f
Show file tree

Hide file tree

Showing 24 changed files with 163,115 additions and 181,586 deletions.
diff --git a/.github/actions/build-phalcon-win/action.yml b/.github/actions/build-phalcon-win/action.yml
@@ -74,15 +74,15 @@ runs:
         cache_dir: ${{ env.CACHE_DIR }}
 
     - name: Configure Developer Command Prompt for MSVC compiler
-      uses: ilammy/msvc-dev-cmd@v1.10.0
+      uses: ilammy/msvc-dev-cmd@v1.12.1
       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
-      uses: ilammy/msvc-dev-cmd@v1.10.0
+      uses: ilammy/msvc-dev-cmd@v1.12.1
       if: ${{ inputs.php_version }} == '7.4'
       with:
         arch: ${{ inputs.arch }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -284,7 +284,7 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download Phalcon Pecl Package
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: phalcon-pecl
           path: ./phalcon-pecl
@@ -386,12 +386,13 @@ jobs:
       - name: Get the release version
         id: get-version
         run: |
-          echo ::set-output name=version::${GITHUB_REF#refs/tags/}
+          echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+#          echo ::set-output name=version::${GITHUB_REF#refs/tags/}
 #          echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV" # This needs to be checked
 
       - name: Download Phalcon build artifacts
         id: download
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: ./build-artifacts
 
@@ -407,8 +408,8 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          name: ${{ steps.get-version.outputs.version }}
-          tag: ${{ steps.get-version.outputs.version }}
+          name: ${{ env.version }}
+          tag: ${{ env.version }}
           bodyFile: "./build-artifacts/release/release-notes.md"
           allowUpdates: true
           artifacts: "./build-artifacts/release/*.zip,./build-artifacts/release/*.tgz"

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [5.5.1](https://github.com/phalcon/cphalcon/releases/tag/v5.5.1) (xxxx-xx-xx)
+
+### Changed
+
+- Changed `Phalcon\Db\Adapter\Pdo\Mysql` to not use specific flags for `PDO` (`PDO::ATTR_EMULATE_PREPARES` or `PDO::ATTR_STRINGIFY_FETCHES`) for performance reasons [#16474](https://github.com/phalcon/cphalcon/issues/16474)
+- Merged `Phalcon\Db\AbstractDb` with `Phalcon\Db\Adapter\AbstractAdapter` since the former was not used [#16474](https://github.com/phalcon/cphalcon/issues/16474)
+
+### Added
+
+### Fixed
+
+- Fixed `Phalcon\Mvc\Model::count` to ignore the `order` parameter (needed for Posgresql) [#16471](https://github.com/phalcon/cphalcon/issues/16471)
+- Fixed `Phalcon\Mvc\Model::toArray` added parameter to ignore getters in order not to break serialize. [#16490](https://github.com/phalcon/cphalcon/issues/16490)
+
+### Removed
+
 ## [5.5.0](https://github.com/phalcon/cphalcon/releases/tag/v5.5.0) (2023-12-25)
 
 ### Changed