Skip to content

Commit feaa3de

Browse files
authored
Merge pull request #16503 from niden/5.0.x
5.6.0
2 parents 28c9a04 + eb1c97d commit feaa3de

File tree

9 files changed

+18
-12
lines changed

9 files changed

+18
-12
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
env:
2121
# All versions should be declared here
22-
PHALCON_VERSION: 5.5.1
22+
PHALCON_VERSION: 5.6.0
2323
ZEPHIR_PARSER_VERSION: 1.6.0
2424

2525
# For tests

CHANGELOG-5.0.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# Changelog
22

3-
## [5.5.1](https://github.com/phalcon/cphalcon/releases/tag/v5.5.1) (2024-01-09)
3+
## [5.6.0](https://github.com/phalcon/cphalcon/releases/tag/v5.6.0) (2024-01-09)
44

55
### Changed
66

77
- 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)
88
- Merged `Phalcon\Db\AbstractDb` with `Phalcon\Db\Adapter\AbstractAdapter` since the former was not used [#16474](https://github.com/phalcon/cphalcon/issues/16474)
99

1010
### Added
11+
12+
- Added `resetColumns()`, `resetFrom()`, `resetWhere()`, `resetGroupBy()`, `resetHaving()`, `resetOrderBy()`, `resetLimit()`, `resetFlags()` to the `Phalcon\Datamapper\Query\AbstractQuery` to allow resetting query filters.
1113

1214
### Fixed
1315

build/phalcon/phalcon.zep.c

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/phalcon/php_phalcon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ typedef zend_function zephir_fcall_cache_entry;
103103

104104

105105
#define PHP_PHALCON_NAME "phalcon"
106-
#define PHP_PHALCON_VERSION "5.5.1"
106+
#define PHP_PHALCON_VERSION "5.6.0"
107107
#define PHP_PHALCON_EXTNAME "phalcon"
108108
#define PHP_PHALCON_AUTHOR "Phalcon Team and contributors"
109109
#define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$"

config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "phalcon",
44
"description": "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance.",
55
"author": "Phalcon Team and contributors",
6-
"version": "5.5.1",
6+
"version": "5.6.0",
77
"verbose": false,
88
"stubs": {
99
"path": "ide\/%version%\/%namespace%\/",

ext/phalcon/support/version.zep.c

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/php_phalcon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "kernel/globals.h"
1212

1313
#define PHP_PHALCON_NAME "phalcon"
14-
#define PHP_PHALCON_VERSION "5.5.1"
14+
#define PHP_PHALCON_VERSION "5.6.0"
1515
#define PHP_PHALCON_EXTNAME "phalcon"
1616
#define PHP_PHALCON_AUTHOR "Phalcon Team and contributors"
1717
#define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$"

package.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<date>2024-01-09</date>
2626
<time>17:00:00</time>
2727
<version>
28-
<release>5.5.1</release>
29-
<api>5.5.1</api>
28+
<release>5.6.0</release>
29+
<api>5.6.0</api>
3030
</version>
3131
<stability>
3232
<release>stable</release>
@@ -41,6 +41,10 @@
4141
- 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)
4242
- Merged `Phalcon\Db\AbstractDb` with `Phalcon\Db\Adapter\AbstractAdapter` since the former was not used [#16474](https://github.com/phalcon/cphalcon/issues/16474)
4343

44+
### Added
45+
46+
- Added `resetColumns()`, `resetFrom()`, `resetWhere()`, `resetGroupBy()`, `resetHaving()`, `resetOrderBy()`, `resetLimit()`, `resetFlags()` to the `Phalcon\Datamapper\Query\AbstractQuery` to allow resetting query filters.
47+
4448
### Fixed
4549

4650
- Fixed `Phalcon\Mvc\Model::count` to ignore the `order` parameter (needed for Posgresql) [#16471](https://github.com/phalcon/cphalcon/issues/16471)

phalcon/Support/Version.zep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class Version
7777
*/
7878
protected function getVersion() -> array
7979
{
80-
return [5, 5, 1, 4, 0];
80+
return [5, 6, 0, 4, 0];
8181
}
8282

8383
/**

0 commit comments

Comments
 (0)