Merge pull request #16526 from niden/5.0.x

5.6.1 Prep
phalcon · Feb 8, 2024 · 1f2239e · 1f2239e
2 parents 51e2d32 + 5e4d7dc
commit 1f2239e
Show file tree

Hide file tree

Showing 21 changed files with 698 additions and 615 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.6.0
+  PHALCON_VERSION: 5.6.1
   ZEPHIR_PARSER_VERSION: 1.6.0
 
   # For tests

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [5.6.1](https://github.com/phalcon/cphalcon/releases/tag/v5.6.0) (xxxx-xx-xx)
+## [5.6.1](https://github.com/phalcon/cphalcon/releases/tag/v5.6.1) (2024-02-08)
 
 ### Changed
 

diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c
diff --git a/build/phalcon/phalcon.zep.h b/build/phalcon/phalcon.zep.h
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.6.0"
+#define PHP_PHALCON_VERSION     "5.6.1"
 #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.6.0",
+  "version": "5.6.1",
   "verbose": false,
   "stubs": {
     "path": "ide\/%version%\/%namespace%\/",

diff --git a/ext/kernel/fcall.c b/ext/kernel/fcall.c
@@ -371,7 +371,11 @@ int zephir_call_user_function(
 
 		char *is_callable_error = NULL;
 		zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
+		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fcic, &is_callable_error)) {
+#else
 		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, 0, &fcic, &is_callable_error)) {
+#endif
 			if (is_callable_error) {
 				zend_error(E_WARNING, "%s", is_callable_error);
 				efree(is_callable_error);
@@ -591,7 +595,11 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
 	}
 
 	zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
+	if (!zend_is_callable_at_frame(handler, NULL, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fci_cache, &is_callable_error)) {
+#else
 	if (!zend_is_callable_at_frame(handler, NULL, frame, 0, &fci_cache, &is_callable_error)) {
+#endif
 		if (is_callable_error) {
 			zend_error(E_WARNING, "%s", is_callable_error);
 			efree(is_callable_error);

diff --git a/ext/phalcon/cache/abstractcache.zep.h b/ext/phalcon/cache/abstractcache.zep.h
diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c
diff --git a/ext/phalcon/cli/router.zep.h b/ext/phalcon/cli/router.zep.h
diff --git a/ext/phalcon/db/adapter/pdo/postgresql.zep.c b/ext/phalcon/db/adapter/pdo/postgresql.zep.c
diff --git a/ext/phalcon/filter/validation.zep.c b/ext/phalcon/filter/validation.zep.c
diff --git a/ext/phalcon/filter/validation.zep.h b/ext/phalcon/filter/validation.zep.h
diff --git a/ext/phalcon/filter/validation/validationinterface.zep.c b/ext/phalcon/filter/validation/validationinterface.zep.c
diff --git a/ext/phalcon/filter/validation/validationinterface.zep.h b/ext/phalcon/filter/validation/validationinterface.zep.h