From 5df587b5237c43456db1a51a0ba486bf13418802 Mon Sep 17 00:00:00 2001
From: Brad Kent <bkfake-github@yahoo.com>
Date: Thu, 26 Feb 2015 11:37:25 -0600
Subject: [PATCH] Many squashed commits

---
 Debug.php            |  30 +++++---
 ErrorHandler.php     |   4 +-
 Output.php           | 144 +++----------------------------------
 OutputFirephp.php    | 166 +++++++++++++++++++++++++++++++++++++++++++
 README.md            |   2 +-
 VarDump.php          |   1 -
 composer.json        |   2 +-
 tests/Debug_Test.php |  15 ++--
 8 files changed, 205 insertions(+), 159 deletions(-)
 create mode 100644 OutputFirephp.php

diff --git a/Debug.php b/Debug.php
index cec665c4..c56f50f5 100644
--- a/Debug.php
+++ b/Debug.php
@@ -83,17 +83,7 @@ public function __construct($cfg = array(), $errorHandler = null)
         if (!isset(self::$instance)) {
             self::$instance = $this;
         }
-        $files = array(
-            'ErrorHandler.php',
-            'Output.php',
-            'Utilities.php',
-            'VarDump.php',
-            'VarDumpArray.php',
-            'VarDumpObject.php',
-        );
-        foreach ($files as $file) {
-            require_once dirname(__FILE__).'/'.$file;
-        }
+        spl_autoload_register(array($this, 'autoloader'));
         $this->utilities = new Utilities();
         $this->output = new Output(array(), $this->data);
         $this->varDump = new VarDump(array(), $this->utilities);
@@ -109,6 +99,24 @@ public function __construct($cfg = array(), $errorHandler = null)
         return;
     }
 
+    /**
+     * Debug class autoloader
+     *
+     * @param string $className classname to attempt to load
+     *
+     * @return void
+     */
+    protected function autoloader($className)
+    {
+        $className = ltrim($className, '\\'); // leading backslash _shouldn't_ have been passed
+        if (preg_match('/^(.*?)\\\\([^\\\\]+)$/', $className, $matches) && $matches[1] === __NAMESPACE__) {
+            $filePath = __DIR__.'/'.$matches[2].'.php';
+            if (file_exists($filePath)) {
+                require_once $filePath;
+            }
+        }
+    }
+
     /**
      * Log a message and stack trace to console if first argument is false.
      *
diff --git a/ErrorHandler.php b/ErrorHandler.php
index 39fdd4bd..c1301eb7 100644
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -82,7 +82,7 @@ public function __construct($cfg = array())
             'emailMask'         => E_ERROR | E_PARSE | E_COMPILE_ERROR | E_WARNING | E_USER_ERROR | E_USER_NOTICE,
             'emailTraceMask'    => E_WARNING | E_USER_ERROR | E_USER_NOTICE,
             'continueToPrevHandler' => true,    // if there was a prev error handler
-            'emailThrottleFile' => dirname(__FILE__).'/error_emails.json',
+            'emailThrottleFile' => __DIR__.'/error_emails.json',
             // set onError to something callable, will receive error array
             //     shortcut for registerOnErrorFunction()
             'onError' => null,
@@ -527,7 +527,7 @@ public function setErrorCaller($caller = 'notPassed', $offset = 1)
      * Catch Fatal Error ( if PHP >= 5.2 )
      *
      * @return void
-     * @requires PHP 5.2.0
+     * @requires PHP >= 5.2.0 / should be met as class requires PHP >= 5.3.0 (namespaces)
      */
     public function shutdownFunction()
     {
diff --git a/Output.php b/Output.php
index 8d0bc9fa..7c282f59 100644
--- a/Output.php
+++ b/Output.php
@@ -18,7 +18,7 @@ class Output
 
     private $cfg = array();
     private $data = array();
-    private $debug = null;
+    private $debug;
 
     /**
      * Constructor
@@ -31,9 +31,9 @@ public function __construct($cfg = array(), &$data = array())
         $this->debug = Debug::getInstance();
         $this->cfg = array(
             'css' => '',                    // additional "override" css
-            'filepathCss' => dirname(__FILE__).'/css/Debug.css',
-            'filepathScript' => dirname(__FILE__).'/js/Debug.jquery.min.js',
-            'firephpInc' => dirname(__FILE__).'/FirePHP.class.php',
+            'filepathCss' => __DIR__.'/css/Debug.css',
+            'filepathScript' => __DIR__.'/js/Debug.jquery.min.js',
+            'firephpInc' => __DIR__.'/FirePHP.class.php',
             'firephpOptions' => array(
                 'useNativeJsonEncode'   => true,
                 'includeLineNumbers'    => false,
@@ -292,144 +292,17 @@ public function output()
         if ($outputAs == 'html') {
             $return = $this->outputAsHtml();
         } elseif ($outputAs == 'firephp') {
-            $this->outputAsFirephp();
+            $this->uncollapseErrors();
+            $outputFirephp = new OutputFirephp($this->data);
+            $outputFirephp->output();
             $return = null;
         } elseif ($outputAs == 'script') {
+            $this->uncollapseErrors();
             $return = $this->outputAsScript();
         }
         return $return;
     }
 
-    /**
-     * Pass the log to FirePHP methods
-     *
-     * @return void
-     */
-    protected function outputAsFirephp()
-    {
-        if (!file_exists($this->cfg['firephpInc'])) {
-            return;
-        }
-        require_once $this->cfg['firephpInc'];
-        $this->firephp = \FirePHP::getInstance(true);
-        $this->firephp->setOptions($this->cfg['firephpOptions']);
-        $this->firephpMethods = get_class_methods($this->firephp);
-        if (!empty($this->data['alert'])) {
-            $alert = str_replace('<br />', ", \n", $this->data['alert']);
-            array_unshift($this->data['log'], array('error', $alert));
-        }
-        $this->uncollapseErrors();
-        foreach ($this->data['log'] as $args) {
-            $method = array_shift($args);
-            $this->outputFirephpLogEntry($method, $args);
-        }
-        while ($this->data['groupDepth'] > 0) {
-            $this->firephp->groupEnd();
-            $this->data['groupDepth']--;
-        }
-        return;
-    }
-
-    /**
-     * output a log entry to Firephp
-     *
-     * @param string $method method
-     * @param array  $args   args
-     *
-     * @return void
-     */
-    protected function outputFirephpLogEntry($method, $args)
-    {
-        $opts = array();
-        if (in_array($method, array('error','warn'))) {
-            $meta = $this->getMetaArg($args);
-            if ($meta && isset($meta['file'])) {
-                $opts = array(
-                    'File' => $end['file'],
-                    'Line' => $end['line'],
-                );
-            }
-        }
-        foreach ($args as $k => $arg) {
-            $args[$k] = $this->debug->varDump->dump($arg, 'firephp');
-        }
-        if (in_array($method, array('group','groupCollapsed','groupEnd'))) {
-            list($method, $args, $opts) = $this->outputFirephpGroupMethod($method, $args);
-        } elseif ($method == 'table' && is_array($args[0])) {
-            $label = isset($args[1])
-                ? $args[1]
-                : 'table';
-            $keys = $this->debug->utilities->arrayColkeys($args[0]);
-            $table = array();
-            $table[] = $keys;
-            array_unshift($table[0], '');
-            foreach ($args[0] as $k => $row) {
-                $values = array($k);
-                foreach ($keys as $key) {
-                    $values[] = isset($row[$key])
-                        ? $row[$key]
-                        : null;
-                }
-                $table[] = $values;
-            }
-            $args = array($label, $table);
-        } elseif ($method == 'table') {
-            $method = 'log';
-        } else {
-            if (count($args) > 1) {
-                $label = array_shift($args);
-                if (count($args) > 1) {
-                    $args = array( implode(', ', $args) );
-                }
-                $args[] = $label;
-            } elseif (is_string($args[0])) {
-                $args[0] = strip_tags($args[0]);
-            }
-        }
-        if (!in_array($method, $this->firephpMethods)) {
-            $method = 'log';
-        }
-        if ($opts) {
-            // opts array needs to be 2nd arg for group method, 3rd arg for all others
-            if ($method !== 'group' && count($args) == 1) {
-                $args[] = null;
-            }
-            $args[] = $opts;
-        }
-        call_user_func_array(array($this->firephp,$method), $args);
-        return;
-    }
-
-    /**
-     * handle firephp output of group, groupCollapsed, & groupEnd
-     *
-     * @param string $method method
-     * @param array  $args   args passed to method
-     *
-     * @return array [$method, $args, $opts]
-     */
-    protected function outputFirephpGroupMethod($method, $args = array())
-    {
-        $opts = array();
-        if (in_array($method, array('group','groupCollapsed'))) {
-            $firephpMethod = 'group';
-            $this->data['groupDepth']++;
-            $opts = array(
-                'Collapsed' => $method == 'groupCollapsed',    // collapse both group and groupCollapsed
-            );
-            if (empty($args)) {
-                $args[] = 'group';
-            } elseif (count($args) > 1) {
-                $more = array_splice($args, 1);
-                $args[0] .= ' - '.implode(', ', $more);
-            }
-        } elseif ($method == 'groupEnd') {
-            $firephpMethod = 'groupEnd';
-            $this->data['groupDepth']--;
-        }
-        return array($firephpMethod, $args, $opts);
-    }
-
     /**
      * return log entry for writing to file
      *
@@ -628,7 +501,6 @@ protected function outputHtmlGroupMethod($method, $args = array())
      */
     protected function outputAsScript()
     {
-        $this->uncollapseErrors();
         $str = '<script type="text/javascript">'."\n";
         $str .= 'console.groupCollapsed("PHP");'."\n";
         foreach ($this->data['log'] as $args) {
diff --git a/OutputFirephp.php b/OutputFirephp.php
new file mode 100644
index 00000000..06eb56d1
--- /dev/null
+++ b/OutputFirephp.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * FirePHP Output methods
+ *
+ * @package PHPDebugConsole
+ * @author  Brad Kent <bkfake-github@yahoo.com>
+ * @license http://opensource.org/licenses/MIT MIT
+ * @version v1.3b
+ */
+
+namespace bdk\Debug;
+
+/**
+ * Output methods
+ */
+class OutputFirephp
+{
+
+    private $data = array();
+    private $debug = null;
+    protected $firephpMethods;
+    public $firephp;
+
+    /**
+     * Constructor
+     *
+     * @param array $data data
+     */
+    public function __construct(&$data = array())
+    {
+        $this->debug = Debug::getInstance();
+        $this->data = &$data;
+        $firephpInc = $this->debug->output->get('firephpInc');
+        if (file_exists($firephpInc)) {
+            require_once $firephpInc;
+            $this->firephp = \FirePHP::getInstance(true);
+            $this->firephp->setOptions($this->debug->output->get('firephpOptions'));
+            $this->firephpMethods = get_class_methods($this->firephp);
+        }
+    }
+
+    /**
+     * Pass the log to FirePHP methods
+     *
+     * @return void
+     */
+    public function output()
+    {
+        if (!$this->firephp) {
+        	return;
+        }
+        if (!empty($this->data['alert'])) {
+            $alert = str_replace('<br />', ", \n", $this->data['alert']);
+            array_unshift($this->data['log'], array('error', $alert));
+        }
+        foreach ($this->data['log'] as $args) {
+            $method = array_shift($args);
+            $this->outputFirephpLogEntry($method, $args);
+        }
+        while ($this->data['groupDepth'] > 0) {
+            $this->firephp->groupEnd();
+            $this->data['groupDepth']--;
+        }
+        return;
+    }
+
+    /**
+     * output a log entry to Firephp
+     *
+     * @param string $method method
+     * @param array  $args   args
+     *
+     * @return void
+     */
+    protected function outputFirephpLogEntry($method, $args)
+    {
+        $opts = array();
+        if (in_array($method, array('error','warn'))) {
+            $meta = $this->debug->output->getMetaArg($args);
+            if ($meta && isset($meta['file'])) {
+                $opts = array(
+                    'File' => $end['file'],
+                    'Line' => $end['line'],
+                );
+            }
+        }
+        foreach ($args as $k => $arg) {
+            $args[$k] = $this->debug->varDump->dump($arg, 'firephp');
+        }
+        if (in_array($method, array('group','groupCollapsed','groupEnd'))) {
+            list($method, $args, $opts) = $this->outputFirephpGroupMethod($method, $args);
+        } elseif ($method == 'table' && is_array($args[0])) {
+            $label = isset($args[1])
+                ? $args[1]
+                : 'table';
+            $keys = $this->debug->utilities->arrayColkeys($args[0]);
+            $table = array();
+            $table[] = $keys;
+            array_unshift($table[0], '');
+            foreach ($args[0] as $k => $row) {
+                $values = array($k);
+                foreach ($keys as $key) {
+                    $values[] = isset($row[$key])
+                        ? $row[$key]
+                        : null;
+                }
+                $table[] = $values;
+            }
+            $args = array($label, $table);
+        } elseif ($method == 'table') {
+            $method = 'log';
+        } else {
+            if (count($args) > 1) {
+                $label = array_shift($args);
+                if (count($args) > 1) {
+                    $args = array( implode(', ', $args) );
+                }
+                $args[] = $label;
+            } elseif (is_string($args[0])) {
+                $args[0] = strip_tags($args[0]);
+            }
+        }
+        if (!in_array($method, $this->firephpMethods)) {
+            $method = 'log';
+        }
+        if ($opts) {
+            // opts array needs to be 2nd arg for group method, 3rd arg for all others
+            if ($method !== 'group' && count($args) == 1) {
+                $args[] = null;
+            }
+            $args[] = $opts;
+        }
+        call_user_func_array(array($this->firephp,$method), $args);
+        return;
+    }
+
+    /**
+     * handle firephp output of group, groupCollapsed, & groupEnd
+     *
+     * @param string $method method
+     * @param array  $args   args passed to method
+     *
+     * @return array [$method, $args, $opts]
+     */
+    protected function outputFirephpGroupMethod($method, $args = array())
+    {
+        $opts = array();
+        if (in_array($method, array('group','groupCollapsed'))) {
+            $firephpMethod = 'group';
+            $this->data['groupDepth']++;
+            $opts = array(
+                'Collapsed' => $method == 'groupCollapsed',    // collapse both group and groupCollapsed
+            );
+            if (empty($args)) {
+                $args[] = 'group';
+            } elseif (count($args) > 1) {
+                $more = array_splice($args, 1);
+                $args[0] .= ' - '.implode(', ', $more);
+            }
+        } elseif ($method == 'groupEnd') {
+            $firephpMethod = 'groupEnd';
+            $this->data['groupDepth']--;
+        }
+        return array($firephpMethod, $args, $opts);
+    }
+}
diff --git a/README.md b/README.md
index 0abab0d6..2814f71e 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Browser/javascript like console class for PHP
 ![Screenshot of PHPDebugConsole's Output](http://www.bradkent.com/images/bradkent.com/php/screenshot.png)
 
 ### Installation
-This library requires PHP 5.0 or later (PHP 5.2 to "catch" fatal errors), and has no userland dependencies.
+This library requires PHP 5.3 (namespaces) or later and has no userland dependencies.
 
 It is installable and autoloadable via [Composer](https://getcomposer.org/) as [bdk/debug](https://packagist.org/packages/bdk/debug).
 
diff --git a/VarDump.php b/VarDump.php
index 3e22fd99..e2c9b3c1 100644
--- a/VarDump.php
+++ b/VarDump.php
@@ -41,7 +41,6 @@ public function __construct($cfg = array(), $utilities = null)
         if (is_object($utilities)) {
             $this->utilities = $utilities;
         } else {
-            require_once dirname(__FILE__).'/Utilities.php';
             $this->utilities = new Utilities();
         }
         $this->varDumpArray = new VarDumpArray();
diff --git a/composer.json b/composer.json
index 2254e204..d543e0bd 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,6 @@
 		"psr-4": { "bdk\\Debug\\": "" }
 	},
 	"require": {
-		"php": ">=5.0.0"
+		"php": ">=5.3.0"
 	}
 }
diff --git a/tests/Debug_Test.php b/tests/Debug_Test.php
index f968e550..e9cdad6e 100644
--- a/tests/Debug_Test.php
+++ b/tests/Debug_Test.php
@@ -149,11 +149,12 @@ public function testRecursiveObjectProp1()
         $output = $this->debug->output();
         $xml = new DomDocument;
         $xml->loadXML($output);
-        $select = '.log
+        $select = '.m_log
             > .t_object > .object-inner
-            > .t_array > .t_array-inner > .t_key_value
-            > .t_array > .t_array-inner > .t_key_value
-            > .t_array > .t_recursion';
+            > .property
+            > .t_array .array-inner > .key-value
+            > .t_array
+            > .t_recursion';
         $this->assertSelectCount($select, 1, $xml);
     }
 
@@ -169,7 +170,7 @@ public function testRecursiveObjectProp2()
         $output = $this->debug->output();
         $xml = new DomDocument;
         $xml->loadXML($output);
-        $select = '.log
+        $select = '.m_log
             > .t_object > .object-inner
             > .t_array > .array-inner > .key-value
             > .t_object > .t_recursion';
@@ -196,7 +197,7 @@ public function testRecursiveObjectProp3()
         $output = $this->debug->output();
         $xml = new DomDocument;
         $xml->loadXML($output);
-        $select = '.log
+        $select = '.m_log
             > .t_object > .object-inner
             > .t_array > .array-inner > .key-value
             > .t_array > .array-inner > .key-value
@@ -246,7 +247,7 @@ public function testCrossRefObjects()
         $output = $this->debug->output();
         $xml = new DomDocument;
         $xml->loadXML($output);
-        $select = '.log
+        $select = '.m_log
             > .t_object > .object-inner
             > .t_array > .array-inner > .t_key_value
             > .t_object > .object-inner