Collection and Helpers

Author: Fredrick Peter

composer.json

@@ -17,11 +17,11 @@
     ],
     "require": {
         "php": ">=7.2.5",
+        "psr/log": "^1.0 || ^1.1.4",
         "vlucas/phpdotenv": "^5.3",
         "ezyang/htmlpurifier": "^4.16.0",
-        "symfony/var-dumper": "^4.4 || ^5 || ^6",
         "filp/whoops": "^2.15",
-        "psr/log": "^1.0 || ^1.1.4"
+        "kint-php/kint": "^5.0"
     },
     "autoload": {
         "files": [

src/Collections/CollectionMapper.php

@@ -37,7 +37,7 @@ public function __construct($items = [], mixed $key = 0, object $collection)
         $this->isPaginate       = $collection->isPaginate;
         $this->pagination       = $collection->pagination;
         $this->isProxyAllowed   = $collection->isProxyAllowed;
-        $this->items            = $this->convertOnInit($items, true);
+        $this->items            = $this->convertOnInit($items);
     }
 
     /**

src/Collections/Traits/CollectionTrait.php

@@ -24,7 +24,7 @@ trait CollectionTrait{
     protected function wrapArrayIntoNewCollections()
     {
         // check if valid array data
-        if (is_array($this->items) && count($this->items) > 0) {
+        if (!$this->isProxyAllowed && is_array($this->items) && count($this->items) > 0) {
             return array_map(function ($item, $key){
                 return new CollectionMapper($item, $key, $this);
             }, $this->items, array_keys($this->items));

src/Collections/Traits/RelatedTrait.php

@@ -35,9 +35,9 @@ public function getPagination()
     }
 
     /**
-     * Get SQL Query
+     * Dump SQL Query
      *
-     * @return string|null
+     * @return void
      */
     public function toSql()
     {
@@ -47,9 +47,9 @@ public function toSql()
     }
 
     /**
-     * Dumb and Die
+     * Dumb and Die\DbQuery
      *
-     * @return mixed
+     * @return void
      */
     public function dd()
     {
@@ -246,19 +246,13 @@ private function isArray()
     /**
      * Convert data to an array on Initializaiton
      * @param mixed $items
-     * @param bool $mapper
      * 
      * @return array
      */ 
-    private function convertOnInit(mixed $items = null, ?bool $mapper = false)
+    private function convertOnInit(mixed $items = null)
     {
-        // on loop use
-        // if $mapper === false then we return for proxy checks 
-        // else then it's for Mapper Collections
-        $typePaginateOrProxy = !$mapper ? $this->isProxyAllowed : $this->isPaginate;
-
-        // first or insert request
-        if ($typePaginateOrProxy || is_array($items)) {
+        // For ORM Database Proxies Data
+        if ($this->isProxyAllowed || $this->isPaginate || is_array($items)) {
             return json_decode(json_encode($items), true);
         } elseif($this->isValidJson($items)) {
             return json_decode($items, true);

src/Traits/ReusableTrait.php

@@ -4,10 +4,11 @@
 
 namespace builder\Database\Traits;
 
+use Kint\Kint;
 use Whoops\Run;
+use Kint\Renderer\RichRenderer;
 use builder\Database\Capsule\Manager;
 use Whoops\Handler\PrettyPageHandler;
-use Symfony\Component\VarDumper\VarDumper;
 
 trait ReusableTrait{
 
@@ -22,12 +23,15 @@ public function dump(...$data)
         // if DEBUG MODE IS ON
         if(Manager::setEnvBool(APP_DEBUG)){ 
             $dataArray = $data[0] ?? $data;
+            RichRenderer::$folder   = false;
+            RichRenderer::$theme    = 'solarized.css';
+            
             if(is_array($dataArray)){
                 foreach ($dataArray as $var) {
-                    VarDumper::dump($var);
+                    Kint::dump($var);
                 }
             } else{
-                VarDumper::dump($dataArray);
+                Kint::dump($dataArray);
             }
         }
     }

src/helpers.php

@@ -400,3 +400,30 @@ function to_json(mixed $items)
         return json_encode( $items );
     }
 }
+
+if (! function_exists('dump')) {
+    /**
+     * Dump Data
+     * @param mixed $data
+     * 
+     * @return void
+     */ 
+    function dump(...$data)
+    {
+        env_orm()->dump($data);
+    }
+}
+
+if (! function_exists('dd')) {
+    /**
+     * Dump and Data
+     * @param mixed $data
+     * 
+     * @return void
+     */ 
+    function dd(...$data)
+    {
+        env_orm()->dump($data);
+        exit(1);
+    }
+}