fixed default value issues

nahid · Aug 27, 2019 · e8be38f · e8be38f
1 parent f9a4d69
commit e8be38f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/helpers/presento.php b/helpers/presento.php
@@ -27,13 +27,18 @@ function to_camel_case(string $string, $delimiter = '_') : string
 if (!function_exists('get_from_array')) {
    function get_from_array($map, string $node)
     {
+        if ($map === null) {
+            return $map;
+        }
+
         if (!is_array($map)) {
             return $map;
         }
 
         if (empty($node)) {
             return $map;
         }
+
         if ($node) {
             $terminate = false;
             $path = explode('.', $node);

diff --git a/src/Presenter.php b/src/Presenter.php
@@ -26,7 +26,7 @@ public function __construct($data = null, string $transformer = null)
         $this->generatedData = $this->handle();
     }
 
-    public function __invoke() : array
+    public function __invoke()
     {
         return $this->generatedData;
     }
@@ -36,6 +36,19 @@ public function __toString() : string
         return json_encode($this->generatedData);
     }
 
+    public function setPresent(array $present)
+    {
+        $this->presentScheme = $present;
+        return $this;
+    }
+
+
+    public function setTransformer(string $transformer)
+    {
+        $this->transformer = $transformer;
+        return $this;
+    }
+
     abstract public function present() : array;
 
     /**
@@ -63,13 +76,7 @@ public function handle()
         if (is_collection($this->data)) {
             $generatedData = [];
             foreach ($this->data  as $property => $data) {
-                if (!$this->isBlank($data)) {
-                    $generatedData[$property] = $this->transform($this->process($this->convert($data)));
-                }
-
-                if ($this->isBlank($data)) {
-                    $generatedData[$property] = $this->handleDefault($this->convert($data));
-                }
+                $generatedData[$property] = $this->handleDefault($this->convert($data));
             }
 
             return $generatedData;
@@ -80,12 +87,11 @@ public function handle()
 
     protected function handleDefault($data)
     {
-
-        if (is_null($this->default) || $this->default == '') {
-            return $this->default;
+        if (!$this->isBlank($data)) {
+            return $this->transform($this->process($data));
         }
 
-        if (is_array($this->default) && count($this->default)>0) {
+        if (is_array($this->default) && count($this->default) > 0) {
             $this->presentScheme = $this->default;
             return $this->transform($this->process($data));
         }