Merge pull request #16503 from niden/5.0.x

5.6.0
phalcon · Jan 9, 2024 · feaa3de · feaa3de
2 parents 28c9a04 + eb1c97d
commit feaa3de
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 12 deletions.
diff --git 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
@@ -1,13 +1,15 @@
 # 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
 
 - 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
 

diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c
diff --git 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
@@ -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
diff --git 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
@@ -25,8 +25,8 @@
   <date>2024-01-09</date>
   <time>17:00:00</time>
   <version>
-    <release>5.5.1</release>
-    <api>5.5.1</api>
+    <release>5.6.0</release>
+    <api>5.6.0</api>
   </version>
   <stability>
     <release>stable</release>
@@ -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
@@ -77,7 +77,7 @@ class Version
      */
     protected function getVersion() -> array
     {
-        return [5, 5, 1, 4, 0];
+        return [5, 6, 0, 4, 0];
     }
 
     /**