[#13518] - Added check to __isset for potential getter and changed th…

…e exception text
phalcon · Dec 25, 2019 · 5633dfd · 5633dfd
1 parent 2a1d3fa
commit 5633dfd
Show file tree

Hide file tree

Showing 3 changed files with 221 additions and 142 deletions.
diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
@@ -326,7 +326,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
      */
     public function __isset(string! property) -> bool
     {
-        var modelName, manager, relation;
+        var manager, method, modelName, relation, result;
 
         let modelName = get_class(this),
             manager   = <ManagerInterface> this->getModelsManager();
@@ -339,7 +339,16 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             property
         );
 
-        return typeof relation == "object";
+        if typeof relation === "object" {
+            let result = true;
+        } else {
+            // If this is a property
+            let method = "get" . camelize(property);
+
+            let result = method_exists(this, method);
+        }
+
+        return result;
     }
 
     /**
@@ -457,7 +466,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
 
             if unlikely !manager->isVisibleModelProperty(this, property) {
                 throw new Exception(
-                    "Property '" . property . "' does not have a setter."
+                    "Cannot access property '" . property . "' (not public)."
                 );
             }
         }

diff --git a/tests/_data/fixtures/models/Invoices.php b/tests/_data/fixtures/models/Invoices.php
@@ -22,8 +22,21 @@ class Invoices extends Model
     public $inv_total;
     public $inv_created_at;
 
+    private $secretValue;
+    private $superSecret;
+
     public function initialize()
     {
         $this->setSource('co_invoices');
     }
+
+    public function setSecretValue($value)
+    {
+        $this->secretValue = $value;
+    }
+
+    public function getSecretValue()
+    {
+        return $this->secretValue;
+    }
 }