Merge pull request #8 from phalcon/4.0.x

4.0.x
phalcon · Apr 30, 2019 · 376b359 · 376b359
2 parents 78a533a + 3f7f7b7
commit 376b359
Show file tree

Hide file tree

Showing 330 changed files with 14,214 additions and 11,675 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -35,6 +35,7 @@
 - Renamed `Phalcon\Paginator\Adapter::getPaginate()` to `paginate()` in documentation/tests (originally renamed in 4.0.0-alpha.1). [#13973](https://github.com/phalcon/cphalcon/pull/13973)
 - Fixed the exception message in `Phalcon\Security::computeHmac()` by removing `"%s"` from output.
 - `Phalcon\Mvc\Model\Relation::isForeignKey()` now returns false if the `foreignKey` option is set to `false`.
+- Fixed `Phalcon\Flash\Session::output()` not to throw an exception when there are no messages stored in session. [#14023](https://github.com/phalcon/cphalcon/issues/14023)
 
 ## Removed
 - Removed `arrayHelpers` property from the Volt compiler. [#13925](https://github.com/phalcon/cphalcon/pull/13925)

diff --git a/ext/config.m4 b/ext/config.m4
@@ -249,6 +249,7 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/helper/arr.zep.c
 	phalcon/helper/exception.zep.c
 	phalcon/helper/number.zep.c
+	phalcon/helper/str.zep.c
 	phalcon/html/breadcrumbs.zep.c
 	phalcon/html/exception.zep.c
 	phalcon/html/helper/anchor.zep.c

diff --git a/ext/config.w32 b/ext/config.w32
@@ -76,7 +76,7 @@ if (PHP_PHALCON != "no") {
 	ADD_SOURCES(configure_module_dirname + "/phalcon/filter/sanitize", "absint.zep.c alnum.zep.c alpha.zep.c boolval.zep.c email.zep.c floatval.zep.c intval.zep.c lower.zep.c lowerfirst.zep.c regex.zep.c remove.zep.c replace.zep.c special.zep.c specialfull.zep.c stringval.zep.c striptags.zep.c trim.zep.c upper.zep.c upperfirst.zep.c upperwords.zep.c url.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/flash", "direct.zep.c exception.zep.c session.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/forms/element", "check.zep.c date.zep.c email.zep.c file.zep.c hidden.zep.c numeric.zep.c password.zep.c radio.zep.c select.zep.c submit.zep.c text.zep.c textarea.zep.c", "phalcon");
-	ADD_SOURCES(configure_module_dirname + "/phalcon/helper", "arr.zep.c exception.zep.c number.zep.c", "phalcon");
+	ADD_SOURCES(configure_module_dirname + "/phalcon/helper", "arr.zep.c exception.zep.c number.zep.c str.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/html", "breadcrumbs.zep.c exception.zep.c tag.zep.c taglocator.zep.c taglocatorfactory.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/http/cookie", "exception.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/http/message/stream", "input.zep.c memory.zep.c temp.zep.c", "phalcon");

diff --git a/ext/kernel/fcall.c b/ext/kernel/fcall.c
@@ -421,6 +421,8 @@ int zephir_call_user_function(zval *object_pp, zend_class_entry *obj_ce, zephir_
 	}
 	else if (FAILURE == status || EG(exception)) {
 		ZVAL_NULL(retval_ptr);
+	} else if (Z_TYPE_P(retval_ptr) == IS_ARRAY) {
+		SEPARATE_ARRAY(retval_ptr);
 	}
 
 	return status;

diff --git a/ext/kernel/object.c b/ext/kernel/object.c
@@ -570,6 +570,10 @@ int zephir_update_property_zval(zval *object, const char *property_name, unsigne
 
 	ZVAL_STRINGL(&property, property_name, property_length);
 
+	if (Z_TYPE_P(value) == IS_ARRAY) {
+		SEPARATE_ARRAY(value);
+	}
+
 	/* write_property will add 1 to refcount, so no Z_TRY_ADDREF_P(value); is necessary */
 	Z_OBJ_HT_P(object)->write_property(object, &property, value, 0);
 	zval_ptr_dtor(&property);

diff --git a/ext/phalcon.c b/ext/phalcon.c
@@ -315,6 +315,7 @@ zend_class_entry *phalcon_forms_manager_ce;
 zend_class_entry *phalcon_helper_arr_ce;
 zend_class_entry *phalcon_helper_exception_ce;
 zend_class_entry *phalcon_helper_number_ce;
+zend_class_entry *phalcon_helper_str_ce;
 zend_class_entry *phalcon_html_breadcrumbs_ce;
 zend_class_entry *phalcon_html_exception_ce;
 zend_class_entry *phalcon_html_helper_anchor_ce;
@@ -771,6 +772,7 @@ static PHP_MINIT_FUNCTION(phalcon)
 	ZEPHIR_INIT(Phalcon_Helper_Arr);
 	ZEPHIR_INIT(Phalcon_Helper_Exception);
 	ZEPHIR_INIT(Phalcon_Helper_Number);
+	ZEPHIR_INIT(Phalcon_Helper_Str);
 	ZEPHIR_INIT(Phalcon_Html_Breadcrumbs);
 	ZEPHIR_INIT(Phalcon_Html_Exception);
 	ZEPHIR_INIT(Phalcon_Html_Helper_Anchor);

diff --git a/ext/phalcon.h b/ext/phalcon.h
@@ -244,6 +244,7 @@
 #include "phalcon/helper/arr.zep.h"
 #include "phalcon/helper/exception.zep.h"
 #include "phalcon/helper/number.zep.h"
+#include "phalcon/helper/str.zep.h"
 #include "phalcon/html/breadcrumbs.zep.h"
 #include "phalcon/html/exception.zep.h"
 #include "phalcon/html/helper/anchor.zep.h"

diff --git a/ext/phalcon/26__closure.zep.c b/ext/phalcon/26__closure.zep.c
diff --git a/ext/phalcon/28__closure.zep.c b/ext/phalcon/28__closure.zep.c
diff --git a/ext/phalcon/29__closure.zep.c b/ext/phalcon/29__closure.zep.c
diff --git a/ext/phalcon/acl/adapter.zep.c b/ext/phalcon/acl/adapter.zep.c