Merge pull request #16651 from raicabogdan/5.0.x

Fix passing null of type string is deprecated warning
phalcon · Dec 25, 2024 · 53dfdc2 · 53dfdc2
2 parents 9806c09 + c5743b2
commit 53dfdc2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -11,6 +11,7 @@
 
 ### Fixed
 
+- Fixed `Phalcon\Http\Response\Cookies`, `Phalcon\Http\Response\CookiesInterface` and `Phalcon\Http\Cookie` to use correct cookie default arguments, avoid deprecated null assign warning when trying to assign the same cookie twice [#16649](https://github.com/phalcon/cphalcon/issues/16649)
 - Fixed `Phalcon\Encryption\Crypt` to use `strlen` instead of `mb_strlen` for padding calculations [#16642](https://github.com/phalcon/cphalcon/issues/16642)
 - Fixed `Phalcon\Filter\Validation\Validator\File\MimeType::validate` to close the handle when using `finfo` [#16647](https://github.com/phalcon/cphalcon/issues/16647)
 - Fixed `Phalcon\Mvc\Model\Manager::getRelationRecords` to explicitly set the `referencedModel` in the conditions along with the `referencedFields` [#16655](https://github.com/phalcon/cphalcon/pull/16655)

diff --git a/phalcon/Http/Cookie.zep b/phalcon/Http/Cookie.zep
@@ -100,9 +100,9 @@ class Cookie extends AbstractInjectionAware implements CookieInterface
         var value = null,
         int expire = 0,
         string path = "/",
-        bool secure = null,
-        string domain = null,
-        bool httpOnly = null,
+        bool secure = false,
+        string domain = "",
+        bool httpOnly = false,
         array options = []
     ) {
         let this->name     = name,

diff --git a/phalcon/Http/Response/Cookies.zep b/phalcon/Http/Response/Cookies.zep
@@ -251,9 +251,9 @@ class Cookies extends AbstractInjectionAware implements CookiesInterface
         var value = null,
         int expire = 0,
         string path = "/",
-        bool secure = null,
-        string! domain = null,
-        bool httpOnly = null,
+        bool secure = false,
+        string! domain = "",
+        bool httpOnly = false,
         array options = []
     ) -> <CookiesInterface> {
         var cookie, encryption, container, response;

diff --git a/phalcon/Http/Response/CookiesInterface.zep b/phalcon/Http/Response/CookiesInterface.zep
@@ -58,9 +58,9 @@ interface CookiesInterface
         var value = null,
         int expire = 0,
         string path = "/",
-        bool secure = null,
-        string! domain = null,
-        bool httpOnly = null,
+        bool secure = false,
+        string! domain = "",
+        bool httpOnly = false,
         array options = []
     ) -> <CookiesInterface>;