[phalcon#16102] - renamed property (psr12); better types for register…

…edEngines (view)
niden · Sep 19, 2022 · f827003 · f827003
1 parent 26129e8
commit f827003
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ on:
 env:
   # All versions should be declared here
   PHALCON_VERSION: 5.0.0RC4
-  ZEPHIR_PARSER_VERSION: 1.5.0
+  ZEPHIR_PARSER_VERSION: 1.5.1
   ZEPHIR_VERSION: 0.16.3
 
   # For tests

diff --git a/phalcon/Db/Column.zep b/phalcon/Db/Column.zep
@@ -249,7 +249,7 @@ class Column implements ColumnInterface
      *
      * @var mixed|null
      */
-    protected _default = null;
+    protected defaultValue = null;
 
     /**
      * Position is first
@@ -403,7 +403,7 @@ class Column implements ColumnInterface
          * Check if the column is default value
          */
         if fetch defaultValue, definition["default"] {
-            let this->_default = defaultValue;
+            let this->defaultValue = defaultValue;
         }
 
         /**
@@ -502,7 +502,7 @@ class Column implements ColumnInterface
      */
     public function getDefault() -> var
     {
-        return this->_default;
+        return this->defaultValue;
     }
 
     /**
@@ -562,7 +562,7 @@ class Column implements ColumnInterface
             return false;
         }
 
-        return this->_default !== null;
+        return this->defaultValue !== null;
     }
 
     /**

diff --git a/phalcon/Mvc/View.zep b/phalcon/Mvc/View.zep
@@ -382,7 +382,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
     /**
      * @return array
      */
-    public function getRegisteredEngines() -> array | null
+    public function getRegisteredEngines() -> array
     {
         return this->registeredEngines;
     }

diff --git a/phalcon/Mvc/View/Simple.zep b/phalcon/Mvc/View/Simple.zep
@@ -74,9 +74,9 @@ class Simple extends Injectable implements ViewBaseInterface, EventsAwareInterfa
     protected options = [];
 
     /**
-     * @var array | null
+     * @var array
      */
-    protected registeredEngines = null;
+    protected registeredEngines = [];
 
     /**
      * @var string
@@ -444,7 +444,7 @@ class Simple extends Injectable implements ViewBaseInterface, EventsAwareInterfa
 
             let registeredEngines = this->registeredEngines;
 
-            if typeof registeredEngines != "array" {
+            if empty registeredEngines {
                 /**
                  * We use Phalcon\Mvc\View\Engine\Php as default
                  * Use .phtml as extension for the PHP engine