Skip to content

Commit 8793a7f

Browse files
authored
Merge branch '5.0.x' into manager-return-types
2 parents ffeb995 + 7212ba0 commit 8793a7f

File tree

24 files changed

+163115
-181586
lines changed

24 files changed

+163115
-181586
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ runs:
7474
cache_dir: ${{ env.CACHE_DIR }}
7575

7676
- name: Configure Developer Command Prompt for MSVC compiler
77-
uses: ilammy/msvc-dev-cmd@v1.10.0
77+
uses: ilammy/msvc-dev-cmd@v1.12.1
7878
with:
7979
arch: ${{ inputs.arch }}
8080

8181
# Workaround for
8282
# PHP Warning: PHP Startup: Can't load module 'C:\tools\php\ext\php_zephir_parser.dll'
8383
# as it's linked with 14.29, but the core is linked with 14.16 in Unknown on line 0
8484
- name: Configure Developer Command Prompt for MSVC compiler
85-
uses: ilammy/msvc-dev-cmd@v1.10.0
85+
uses: ilammy/msvc-dev-cmd@v1.12.1
8686
if: ${{ inputs.php_version }} == '7.4'
8787
with:
8888
arch: ${{ inputs.arch }}

.github/workflows/main.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ jobs:
284284
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
285285

286286
- name: Download Phalcon Pecl Package
287-
uses: actions/download-artifact@v2
287+
uses: actions/download-artifact@v3
288288
with:
289289
name: phalcon-pecl
290290
path: ./phalcon-pecl
@@ -386,12 +386,13 @@ jobs:
386386
- name: Get the release version
387387
id: get-version
388388
run: |
389-
echo ::set-output name=version::${GITHUB_REF#refs/tags/}
389+
echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
390+
# echo ::set-output name=version::${GITHUB_REF#refs/tags/}
390391
# echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV" # This needs to be checked
391392

392393
- name: Download Phalcon build artifacts
393394
id: download
394-
uses: actions/download-artifact@v2
395+
uses: actions/download-artifact@v3
395396
with:
396397
path: ./build-artifacts
397398

@@ -407,8 +408,8 @@ jobs:
407408
uses: ncipollo/release-action@v1
408409
with:
409410
token: ${{ secrets.GITHUB_TOKEN }}
410-
name: ${{ steps.get-version.outputs.version }}
411-
tag: ${{ steps.get-version.outputs.version }}
411+
name: ${{ env.version }}
412+
tag: ${{ env.version }}
412413
bodyFile: "./build-artifacts/release/release-notes.md"
413414
allowUpdates: true
414415
artifacts: "./build-artifacts/release/*.zip,./build-artifacts/release/*.tgz"

CHANGELOG-5.0.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## [5.5.1](https://github.com/phalcon/cphalcon/releases/tag/v5.5.1) (xxxx-xx-xx)
4+
5+
### Changed
6+
7+
- 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)
8+
- Merged `Phalcon\Db\AbstractDb` with `Phalcon\Db\Adapter\AbstractAdapter` since the former was not used [#16474](https://github.com/phalcon/cphalcon/issues/16474)
9+
10+
### Added
11+
12+
### Fixed
13+
14+
- Fixed `Phalcon\Mvc\Model::count` to ignore the `order` parameter (needed for Posgresql) [#16471](https://github.com/phalcon/cphalcon/issues/16471)
15+
- Fixed `Phalcon\Mvc\Model::toArray` added parameter to ignore getters in order not to break serialize. [#16490](https://github.com/phalcon/cphalcon/issues/16490)
16+
17+
### Removed
18+
319
## [5.5.0](https://github.com/phalcon/cphalcon/releases/tag/v5.5.0) (2023-12-25)
420

521
### Changed

0 commit comments

Comments
 (0)