Feature/monolog pqp handler

bootstrap.php

@@ -54,7 +54,14 @@
     return $pdo;
 });
 
+// setup the profiler
+$console = new Particletree\Pqp\Console();
+$profiler = new Particletree\Pqp\PhpQuickProfiler();
+$profiler->setConsole($console);
+
 // setup the service locator
 $container = new Pimple\Container();
 $container['db_connection_locator'] = $db_connections;
+$container['console'] = $console;
+$container['profiler'] = $profiler;
 $container['default_timezone'] = new DateTimeZone('America/Phoenix');

composer.json

@@ -17,6 +17,7 @@
     "aura/sql": "^2.4",
     "dg/rss-php": "^1.2",
     "knplabs/github-api": "^1.5",
+    "jacobemerick/monolog-pqp": "^0.1",
     "madcoda/php-youtube-api": "^1.2",
     "monolog/monolog": "^1.17",
     "particletree/pqp": "^1.0",
@@ -32,10 +33,6 @@
   },
   "autoload": {
     "classmap": [
-      "collector/",
-      "controller/",
-      "module/",
-      "router/",
       "utility/"
     ],
     "psr-4": {

controller/PageController.class.inc.php

@@ -36,10 +36,11 @@ public function __construct()
 			'link' => Loader::getRootUrl('site'),
 			'anchor' => 'jacobemerick.com',
 			'date' => date('Y')));
-
-		Loader::loadInstance('utility', 'Database');
-		if(Database::isConnected() === false)
-			$this->unavailable();
+
+// todo this belongs in db handler		
+//		Loader::loadInstance('utility', 'Database');
+//		if(Database::isConnected() === false)
+//			$this->unavailable();
 	}
 
 	protected function get_domain_container()

public/site/index.php

@@ -4,29 +4,47 @@
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-// sets up specific logger
-use Monolog\Formatter\LineFormatter;
-use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
+// sets up loggers
+$logger = new Monolog\Logger('site');
 
-$formatter = new LineFormatter('[%datetime%] %channel%.%level_name%: %message%');
-
-$handler = new StreamHandler(
-    __DIR__ . '/../../logs/site.log',
-    Logger::DEBUG
+$streamHandler = new Monolog\Handler\StreamHandler(__DIR__ . '/../../logs/site.log', Monolog\Logger::INFO);
+$streamHandler->setFormatter(
+    new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n")
 );
-$handler->setFormatter($formatter);
-
-$logger = new Logger('web');
-$logger->pushHandler($handler);
+$logger->pushHandler($streamHandler);
 
-$container['logger'] = $logger;
-$container['logger']->addInfo('Bootstrapping is complete - moving onto routing');
+$pqpHandler = new Jacobemerick\MonologPqp\PqpHandler($container['console']);
+$logger->pushHandler($pqpHandler);
 
-// old setup
-Loader::loadInstance('utility', 'Debugger');
+Monolog\ErrorHandler::register($logger);
 
-set_error_handler(array('Debugger', 'internal_error'));
-register_shutdown_function(array('Debugger', 'shutdown'));
+$container['logger'] = $logger;
+$container['logger']->addDebug('Bootstrapping is complete - moving onto routing');
+$container['console']->logMemory(null, 'Bootstrapping done');
 
+// route
 Loader::loadInstance('router', 'Router');
+
+$container['logger']->addDebug('Routing is complete - moving onto shutdown');
+$container['console']->logMemory(null, 'Routing is done');
+
+// shutdown - note, this should be in a shutdown function
+if ($_COOKIE['debugger'] == 'display') {
+    $dbProfiles = $container['db_connection_locator']
+        ->getRead()
+        ->getProfiler()
+        ->getProfiles();
+    $dbProfiles = array_filter($dbProfiles, function ($profile) {
+        return $profile['function'] == 'perform';
+    });
+    $dbProfiles = array_map(function ($profile) {
+        return [
+            'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
+            'parameters' => $profile['bind_values'],
+            'time' => $profile['duration'],
+        ];
+    }, $dbProfiles);
+    $container['profiler']->setProfiledQueries($dbProfiles);
+    $container['profiler']->setDisplay(new Particletree\Pqp\Display());
+    $container['profiler']->display($container['db_connection_locator']->getRead());
+}

router/Router.class.inc.php

@@ -46,7 +46,7 @@ private static function get_router_name()
 			break;
 		}
 
-		Debugger::logMessage("The router for " . URLDecode::getSite() . " was not loaded.");
+		// Debugger::logMessage("The router for " . URLDecode::getSite() . " was not loaded.");
 		Loader::loadNew('controller', '/Error404Controller')->activate();
 	}
 

utility/Loader.class.inc.php

@@ -110,8 +110,8 @@ public static function load($type, $files, $data = array())
 			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
 				continue;
 
-			if(!file_exists($file_path))
-				Debugger::logMessage("Requested file does not exist: {$type}, {$file}");
+			// if(!file_exists($file_path))
+			// 	Debugger::logMessage("Requested file does not exist: {$type}, {$file}");
 
 			self::instance()->add_included_file($file_path);