Merge pull request #16066 from phalcon/#16023-event-getter

#16023 - Improve object return type
phalcon · Aug 22, 2022 · 446277f · 446277f
2 parents da1b48a + b87f9cc
commit 446277f
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 36 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ env:
   # All versions should be declared here
   PHALCON_VERSION: 5.0.0RC4
   ZEPHIR_PARSER_VERSION: 1.5.0
-  ZEPHIR_VERSION: 0.16.0
+  ZEPHIR_VERSION: 0.16.2
 
   # For tests
   LANG: en_US.UTF-8

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -1,3 +1,8 @@
+# [x.x.x](https://github.com/phalcon/cphalcon/releases/tag/vx.x.x) (xxxx-xx-xx)
+
+## Fixed
+- Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)
+
 # [5.0.0rc4](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC4) (2022-08-08)
 
 ## Fixed 

diff --git a/docker/7.4/.bashrc b/docker/7.4/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.0"
+ZEPHIR_VERSION="0.16.2"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."

diff --git a/docker/8.0/.bashrc b/docker/8.0/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.0"
+ZEPHIR_VERSION="0.16.2"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."

diff --git a/docker/8.1/.bashrc b/docker/8.1/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.15.2"
+ZEPHIR_VERSION="0.16.2"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."

diff --git a/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.h b/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.h
diff --git a/ext/phalcon/datamapper/pdo/connection/connectioninterface.zep.h b/ext/phalcon/datamapper/pdo/connection/connectioninterface.zep.h
diff --git a/ext/phalcon/events/event.zep.c b/ext/phalcon/events/event.zep.c
diff --git a/ext/phalcon/events/event.zep.h b/ext/phalcon/events/event.zep.h
diff --git a/ext/phalcon/http/cookie.zep.c b/ext/phalcon/http/cookie.zep.c
diff --git a/ext/phalcon/mvc/micro/lazyloader.zep.h b/ext/phalcon/mvc/micro/lazyloader.zep.h
diff --git a/ext/phalcon/support/helper/arr/toobject.zep.h b/ext/phalcon/support/helper/arr/toobject.zep.h
diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h
@@ -14,7 +14,7 @@
 #define PHP_PHALCON_VERSION     "5.0.0RC4"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.16.0-4fac47b"
+#define PHP_PHALCON_ZEPVERSION  "0.16.2-3e961ab"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

diff --git a/phalcon/Events/Event.zep b/phalcon/Events/Event.zep
@@ -44,7 +44,7 @@ class Event implements EventInterface
      *
      * @var object|null
      */
-    protected source { get };
+    protected source = null;
 
     /**
      * Is event propagation stopped?
@@ -67,7 +67,7 @@ class Event implements EventInterface
      */
     public function __construct(string! type, var source = null, var data = null, bool cancelable = true)
     {
-        if unlikely null !== source && typeof source != "object" {
+        if unlikely null !== source && typeof source !== "object" {
             throw new Exception(
                 "The source of " . type . " event must be an object, got " . (typeof source)
             );
@@ -100,6 +100,11 @@ class Event implements EventInterface
         return this->stopped;
     }
 
+    public function getSource() -> object | null
+    {
+        return this->source;
+    }
+
     /**
      * Sets event data.
      */

diff --git a/phalcon/Tag.zep b/phalcon/Tag.zep
@@ -1477,8 +1477,8 @@ class Tag
         }
 
         /**
-        * Automatically assign the id if the name is not an array
-        */
+         * Automatically assign the id if the name is not an array
+         */
         if !strpos(id, "[") {
             if !isset params["id"] {
                 let params["id"] = id;
@@ -1502,15 +1502,15 @@ class Tag
             let value = self::getValue(id, params);
 
             /**
-            * Evaluate the value in POST
-            */
+             * Evaluate the value in POST
+             */
             if value != null {
                 let params["checked"] = "checked";
             }
 
             /**
-            * Update the value anyways
-            */
+             * Update the value anyways
+             */
             let params["value"] = value;
         }