[#14551] - Corrected warning and get options for storage

phalcon · Nov 22, 2019 · 27e5986 · 27e5986
1 parent 9c2f9b5
commit 27e5986
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/phalcon/Storage/Adapter/AbstractAdapter.zep b/phalcon/Storage/Adapter/AbstractAdapter.zep
@@ -60,7 +60,7 @@ abstract class AbstractAdapter implements AdapterInterface
     /**
      * Sets parameters based on options
      */
-    protected function __construct(<SerializerFactory> factory = null, array! options)
+    protected function __construct(<SerializerFactory> factory = null, array! options = [])
     {
         /**
          * Lets set some defaults and options here
@@ -93,7 +93,7 @@ abstract class AbstractAdapter implements AdapterInterface
     /**
      * Reads data from the adapter
      */
-    abstract public function get(string! key) -> var;
+    abstract public function get(string! key, var defaultValue = null) -> var;
 
     /**
      * Returns the adapter - connects to the storage if not connected

diff --git a/phalcon/Storage/Adapter/AdapterInterface.zep b/phalcon/Storage/Adapter/AdapterInterface.zep
@@ -35,7 +35,7 @@ interface AdapterInterface
     /**
      * Reads data from the adapter
      */
-    public function get(string! key) -> var;
+    public function get(string! key, var defaultValue = null) -> var;
 
     /**
      * Returns the already connected adapter or connects to the backend

diff --git a/phalcon/Storage/Adapter/Memory.zep b/phalcon/Storage/Adapter/Memory.zep
@@ -24,7 +24,7 @@ class Memory extends AbstractAdapter
     /**
      * @var Collection
      */
-    protected data = [];
+    protected data;
 
     /**
      * @var array

diff --git a/phalcon/Storage/Adapter/Stream.zep b/phalcon/Storage/Adapter/Stream.zep
@@ -35,11 +35,6 @@ class Stream extends AbstractAdapter
      */
     protected options = [];
 
-    /**
-     * @var bool
-     */
-    private warning = false;
-
     /**
      * Stream constructor.
      *
@@ -324,26 +319,25 @@ class Stream extends AbstractAdapter
     {
         var payload;
 
-        let payload       = file_get_contents(filepath),
-            this->warning = false;
+        let payload = file_get_contents(filepath);
 
         if false === payload {
             return [];
         }
 
+        globals_set("warning.enable", false);
         set_error_handler(
             function (number, message, file, line, context) {
-                if number === E_WARNING {
-                    let this->warning = true;
-                }
-            }
+                globals_set("warning.enable", true);
+            },
+            E_NOTICE
         );
 
         let payload = unserialize(payload);
 
         restore_error_handler();
 
-        if unlikely (this->warning || typeof payload !== "array") {
+        if unlikely (globals_get("warning.enable") || typeof payload !== "array") {
             return [];
         }