Added Whoopsand Var-dumper Error Handler

Author: Fredrick Peter

README.md

@@ -116,7 +116,7 @@ Prior to installing `php-orm-database` get the [Composer](https://getcomposer.or
 **Step 1** — update your `composer.json`:
 ```composer.json
 "require": {
-    "peterson/php-orm-database": "^4.1.9"
+    "peterson/php-orm-database": "^4.2.0"
 }
 ```
 
@@ -210,7 +210,6 @@ $db->table('users')
 |-------------------|-----------|-----------------------|
 | DRIVER_NAME       |  string   |  mysql                |
 | APP_DEBUG         |  boolean  |  true                 |
-| APP_DEBUG_BG      |  string   |  Default value is `dark` and other color \| `light` |
 | DB_HOST           |  string   |  `localhost`          |
 | DB_USERNAME       |  string   |                       |
 | DB_PASSWORD       |  string   |                       |
@@ -1462,9 +1461,10 @@ class PostClass extends DB{
 
 ## Error Dump
 
-| function  | Description     |
-|-----------|-----------------|
-| dd        | Dump or Die - Error handling |
+| function  | Description       |
+|-----------|-------------------|
+| dump      | Dump Data         |
+| dd        | Dump and Die      |
 
 
 ## Error Status

composer.json

@@ -19,7 +19,8 @@
         "php": ">=7.2",
         "vlucas/phpdotenv": "^5.3",
         "ezyang/htmlpurifier": "^4.16.0",
-        "tracy/tracy": "^2.9.1"
+        "filp/whoops": "^2.15",
+        "symfony/var-dumper": "^4.4"
     },
     "config": {
         "platform": {
@@ -42,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.1.9-dev"
+            "dev-main": "4.2.0-dev"
         }
     },
     "minimum-stability": "stable",

src/Capsule/AppManager.php

@@ -30,7 +30,6 @@ static public function envDummy()
             APP_ENV=local
             APP_KEY='. self::generateAppKey() .'
             APP_DEBUG=true
-            APP_DEBUG_BG='. Manager::$default_bg .'
             SITE_EMAIL=
             
             DRIVER_NAME=mysql

src/Capsule/Manager.php

@@ -4,7 +4,6 @@
 
 namespace builder\Database\Capsule;
 
-use Exception;
 use builder\Database\Constants;
 
 
@@ -46,19 +45,6 @@ class Manager extends Constants{
         'bootstrap' => 'bootstrap',
         'simple'    => 'simple',
     ];
-    
-    /**
-     * @var array
-     */
-    static private $disallow_method = [
-        'errorTemp',
-        'executeAction',
-        'execute',
-        'insert',
-        'delete',
-        'update',
-        'select',
-    ];
 
     /**
      * @var array
@@ -81,11 +67,6 @@ class Manager extends Constants{
         'utf8',
         'latin1',
     ];
-
-    /**
-     * @var string
-     */
-    static public $default_bg = 'dark';
 
     /**
      * Initilize and Set the Database Configuration on constructor
@@ -106,7 +87,6 @@ static public function initConfiguration(?array $options = [])
     {
         $defaultOption = array_merge([
             'APP_DEBUG'     => true,
-            'APP_DEBUG_BG'  => self::$default_bg,
             'DRIVER_NAME'   => 'mysql',
             'DB_HOST'       => 'localhost',
             'DB_DATABASE'   => '',
@@ -127,11 +107,6 @@ static public function initConfiguration(?array $options = [])
             define('APP_DEBUG', self::setEnvBool($_ENV['APP_DEBUG'] ?? $defaultOption['APP_DEBUG']));
         }
 
-        // APP_DEBUG_BG
-        if ( ! defined('APP_DEBUG_BG') ) {
-            define('APP_DEBUG_BG', $_ENV['APP_DEBUG_BG'] ?? $defaultOption['APP_DEBUG_BG']);
-        }
-
         // DRIVER_NAME
         if ( ! defined('DRIVER_NAME') ) {
             define('DRIVER_NAME', $_ENV['DRIVER_NAME'] ?? $defaultOption['DRIVER_NAME']);
@@ -184,7 +159,6 @@ static public function getConfig($key = 'DB_HOST')
     {
         $data =  [
             'APP_DEBUG'     => defined('APP_DEBUG')     ? APP_DEBUG     : true,
-            'APP_DEBUG_BG'  => defined('APP_DEBUG_BG')  ? APP_DEBUG_BG  : self::$default_bg,
             'DRIVER_NAME'   => defined('DRIVER_NAME')   ? DRIVER_NAME   : 'mysql',
             'DB_HOST'       => defined('DB_HOST')       ? DB_HOST       : 'localhost',
             'DB_DATABASE'   => defined('DB_DATABASE')   ? DB_DATABASE   : null,

src/Collections/Collection.php

@@ -42,7 +42,7 @@ class Collection extends CollectionProperty implements IteratorAggregate, ArrayA
     public function __construct($items = [])
     {
         $this->unescapeIsObjectWithoutArray = self::checkProxiesType();
-        $this->items = $this->getArrayItems($items);
+        $this->items = $this->convertOnInit($items);
 
         // if pagination request is `true`
         if(self::$is_paginate){

src/Collections/Traits/CollectionTrait.php

@@ -49,10 +49,10 @@ static protected function checkProxiesType()
     static protected function getTrace() 
     {
         // get Trace
-        $getTrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
         // instance functions
-        $functions = array_map('strtolower', array_column($getTrace, 'function'));
+        $functions = array_map('strtolower', array_column($backtrace, 'function'));
 
         // get array interests
         $interest = array_intersect(self::$proxies_compact, $functions);
@@ -88,21 +88,4 @@ protected function wrapArrayIntoCollectionMappers(mixed $items)
         return $items;
     }
 
-    /**
-     * Results array of items from Collection or Arrayable.
-     *
-     * @param  mixed  $items
-     * 
-     * @return array
-     */
-    protected function getArrayItems($items)
-    {
-        // first or insert request
-        if ($this->unescapeIsObjectWithoutArray || !is_array($items)) {
-            return  $this->convertOnInit($items);
-        }
-
-        return $items;
-    }
-
 }

src/Collections/Traits/RelatedTrait.php

@@ -90,7 +90,7 @@ public function has($key)
         return array_key_exists($key, $this->items);
     }
 
-     /**
+    /**
      * Check if an item exists in the collection.
      *
      * @param  string  $key
@@ -229,9 +229,9 @@ private function convertMapperOnInit(mixed $items = null)
     {
         if (self::$is_paginate) {
             return json_decode(json_encode($items), true);
-        } elseif ($this->isValidJson()) {
+        } elseif ($this->isValidJson($items)) {
             return json_decode($items, true);
-        } elseif (is_array($items) || is_string($items)) {
+        } elseif (is_array($items)) {
             return $items;
         } 
 
@@ -246,16 +246,16 @@ private function convertMapperOnInit(mixed $items = null)
      */ 
     private function convertOnInit(mixed $items = null)
     {
+        // first or insert request
         if ($this->unescapeIsObjectWithoutArray) {
-            if(!is_bool($items))
-                return json_decode(json_encode($items), true);
-        } elseif ($this->isValidJson()) {
+            return json_decode(json_encode($items), true);
+        } elseif($this->isValidJson($items)) {
             return json_decode($items, true);
-        } elseif (is_array($items) || is_string($items)) {
+        } elseif(is_array($items)){
             return $items;
         } 
 
-        return (array) $items;
+        return $items;
     }
 
     /**

src/DB.php

@@ -12,32 +12,27 @@
  */
 namespace builder\Database;
 
-use builder\Database\Query\MySqlExec;
 use builder\Database\Schema\Insertion;
+use builder\Database\Traits\DBSetupTrait;
 
 class DB extends Insertion{
 
+    use DBSetupTrait;
+    
     /**
-     * Extending Settings
+     * Extending Constructor opitons if Available
+     * - If User Extends the DB::Class and has their own __construct()
+     * - They must call the parent::__construct();
+     * - For Loaded Data to be returned
      * 
-     * @param  array $options
+     * @param array $options
      */
-    public function __construct(?array $options = []) {
-        parent::__construct($options);
-
-        // configuring pagination settings 
-        if ( ! defined('PAGINATION_CONFIG') ) {
-            $this->configPagination($options);
-        } else{
-            // if set to allow global use of ENV Autoloader Settings
-            if(is_bool(PAGINATION_CONFIG['allow']) && PAGINATION_CONFIG['allow'] === true){
-                $this->configPagination(PAGINATION_CONFIG);
-            }else{
-                $this->configPagination($options);
-            }
+    public function __construct(?array $options = []) 
+    {
+        if (!$this->initialized) {
+            $this->initializeSetup($options);
+            $this->initialized = true;
         }
-
-        // open default logger
-        (new MySqlExec)->autoStartDebugger();
     }
+
 }

src/EnvAutoLoad.php

@@ -17,7 +17,6 @@ class EnvAutoLoad{
      * 
      * @param array $options 
      * path \Path to .env file
-     * bg \dump background color (light | dark)
      * 
      * @return void
      */
@@ -30,7 +29,6 @@ static public function start(?array $options = [])
         */
         $default = array_merge([
             'path'  => null,
-            'bg'    => Manager::$default_bg,
         ], $options);
 
         /*
@@ -56,30 +54,6 @@ static public function start(?array $options = [])
         */
         $loader = $EnvOrm::loadOrFail();
 
-        /*
-        |--------------------------------------------------------------------------
-        | Defining background color for var dump
-        |--------------------------------------------------------------------------
-        | default | main | dark | red | blue
-        */
-        $EnvOrm->{'bg'} = $default['bg'];
-        
-        /*
-        |--------------------------------------------------------------------------
-        | Update ENV variable
-        |--------------------------------------------------------------------------
-        | Here we do not want to temper with the environment file always
-        | - Since this path will always run at every application call
-        | - We only will update APP_DEBUG_BG if env path is set and 
-        | - If the APP_DEBUG_BG is empty
-        |
-        */
-        if(isset($_ENV['APP_DEBUG_BG'])){
-            if(empty($_ENV['APP_DEBUG_BG'])){
-                $EnvOrm::updateENV('APP_DEBUG_BG', $EnvOrm->{'bg'}, false);
-            }
-        }
-        
         /*
         |--------------------------------------------------------------------------
         | Check If There was an error getting the environment file
@@ -90,11 +64,6 @@ static public function start(?array $options = [])
         |
         */
         if($loader['status'] != 200){
-            /**
-             * Setting application to use the dump error handling
-             */
-            $EnvOrm->dump_final = false;
-
             /**
              * Dump error message
              */