diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 14e4456f9d..b4b73cfacf 100644
--- 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.5.1
+ PHALCON_VERSION: 5.6.0
ZEPHIR_PARSER_VERSION: 1.6.0
# For tests
diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 79911a9284..258940bc9d 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -1,6 +1,6 @@
# Changelog
-## [5.5.1](https://github.com/phalcon/cphalcon/releases/tag/v5.5.1) (2024-01-09)
+## [5.6.0](https://github.com/phalcon/cphalcon/releases/tag/v5.6.0) (2024-01-09)
### Changed
@@ -8,6 +8,8 @@
- Merged `Phalcon\Db\AbstractDb` with `Phalcon\Db\Adapter\AbstractAdapter` since the former was not used [#16474](https://github.com/phalcon/cphalcon/issues/16474)
### Added
+
+- Added `resetColumns()`, `resetFrom()`, `resetWhere()`, `resetGroupBy()`, `resetHaving()`, `resetOrderBy()`, `resetLimit()`, `resetFlags()` to the `Phalcon\Datamapper\Query\AbstractQuery` to allow resetting query filters.
### Fixed
diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c
index 6405c4a9b8..919baaac5f 100644
--- a/build/phalcon/phalcon.zep.c
+++ b/build/phalcon/phalcon.zep.c
@@ -183858,10 +183858,10 @@ static PHP_METHOD(Phalcon_Support_Version, getVersion)
ZVAL_LONG(&_0, 5);
zephir_array_fast_append(return_value, &_0);
ZEPHIR_INIT_NVAR(&_0);
- ZVAL_LONG(&_0, 5);
+ ZVAL_LONG(&_0, 6);
zephir_array_fast_append(return_value, &_0);
ZEPHIR_INIT_NVAR(&_0);
- ZVAL_LONG(&_0, 1);
+ ZVAL_LONG(&_0, 0);
zephir_array_fast_append(return_value, &_0);
ZEPHIR_INIT_NVAR(&_0);
ZVAL_LONG(&_0, 4);
diff --git a/build/phalcon/php_phalcon.h b/build/phalcon/php_phalcon.h
index 9408927ee0..55fd575f1f 100644
--- a/build/phalcon/php_phalcon.h
+++ b/build/phalcon/php_phalcon.h
@@ -103,7 +103,7 @@ typedef zend_function zephir_fcall_cache_entry;
#define PHP_PHALCON_NAME "phalcon"
-#define PHP_PHALCON_VERSION "5.5.1"
+#define PHP_PHALCON_VERSION "5.6.0"
#define PHP_PHALCON_EXTNAME "phalcon"
#define PHP_PHALCON_AUTHOR "Phalcon Team and contributors"
#define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$"
diff --git a/config.json b/config.json
index 47a10c4e52..33d9bac85a 100644
--- a/config.json
+++ b/config.json
@@ -3,7 +3,7 @@
"name": "phalcon",
"description": "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance.",
"author": "Phalcon Team and contributors",
- "version": "5.5.1",
+ "version": "5.6.0",
"verbose": false,
"stubs": {
"path": "ide\/%version%\/%namespace%\/",
diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c
index 400891b370..73e33c4ea7 100644
--- a/ext/phalcon/support/version.zep.c
+++ b/ext/phalcon/support/version.zep.c
@@ -112,10 +112,10 @@ PHP_METHOD(Phalcon_Support_Version, getVersion)
ZVAL_LONG(&_0, 5);
zephir_array_fast_append(return_value, &_0);
ZEPHIR_INIT_NVAR(&_0);
- ZVAL_LONG(&_0, 5);
+ ZVAL_LONG(&_0, 6);
zephir_array_fast_append(return_value, &_0);
ZEPHIR_INIT_NVAR(&_0);
- ZVAL_LONG(&_0, 1);
+ ZVAL_LONG(&_0, 0);
zephir_array_fast_append(return_value, &_0);
ZEPHIR_INIT_NVAR(&_0);
ZVAL_LONG(&_0, 4);
diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h
index bcc43069e2..808f6e37d3 100644
--- a/ext/php_phalcon.h
+++ b/ext/php_phalcon.h
@@ -11,7 +11,7 @@
#include "kernel/globals.h"
#define PHP_PHALCON_NAME "phalcon"
-#define PHP_PHALCON_VERSION "5.5.1"
+#define PHP_PHALCON_VERSION "5.6.0"
#define PHP_PHALCON_EXTNAME "phalcon"
#define PHP_PHALCON_AUTHOR "Phalcon Team and contributors"
#define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$"
diff --git a/package.xml b/package.xml
index 5bec05b2c4..e9f445025e 100644
--- a/package.xml
+++ b/package.xml
@@ -25,8 +25,8 @@
2024-01-09
- 5.5.1
- 5.5.1
+ 5.6.0
+ 5.6.0
stable
@@ -41,6 +41,10 @@
- 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
+
+ - Added `resetColumns()`, `resetFrom()`, `resetWhere()`, `resetGroupBy()`, `resetHaving()`, `resetOrderBy()`, `resetLimit()`, `resetFlags()` to the `Phalcon\Datamapper\Query\AbstractQuery` to allow resetting query filters.
+
### Fixed
- Fixed `Phalcon\Mvc\Model::count` to ignore the `order` parameter (needed for Posgresql) [#16471](https://github.com/phalcon/cphalcon/issues/16471)
diff --git a/phalcon/Support/Version.zep b/phalcon/Support/Version.zep
index 7b507b31fe..47bb667ffa 100644
--- a/phalcon/Support/Version.zep
+++ b/phalcon/Support/Version.zep
@@ -77,7 +77,7 @@ class Version
*/
protected function getVersion() -> array
{
- return [5, 5, 1, 4, 0];
+ return [5, 6, 0, 4, 0];
}
/**