dev 2020-11

src/App/Middlewares/DebugBar.php

@@ -29,11 +29,12 @@ class DebugBar
 			$debugbar = new StandardDebugBar();
 			App::setData('debugbar', $debugbar);
 			
-			$debugbar->addCollector(new KarmaFwCollector);
 			$debugbar->addCollector(new ConfigCollector);
+			$debugbar->addCollector(new KarmaFwCollector);
 			$debugbar->addCollector(new SqlDbCollector);
 			$debugbar->addCollector(new SqlDbTimelineCollector);
 			$debugbar->addCollector(new KarmaMessagesCollector('templates'));
+			$debugbar->addCollector(new ConfigCollector([], 'templates_vars'));
 			$debugbar->addCollector(new SEOCollector);
 
 			$debugbarRenderer = $debugbar->getJavascriptRenderer('/assets/vendor/debugbar'); // symlink to ${APP_DIR}/vendor/maximebf/debugbar/src/DebugBar/Resources

src/App/Tools.php

@@ -24,20 +24,19 @@ class Tools
 
     public static function getCaller($excludeFiles = [], $formatted = true, $traceOffset = 2)
     {
-        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 4);
+        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 10);
         $backtrace = array_slice($backtrace, $traceOffset);
 
-        $excludeFiles[] = VENDOR_DIR . '/karmasolutions/karmafw/src/App/Pipe.php';
         $excludeFiles[] = VENDOR_DIR . '/karmasolutions/karmafw/src/Database/Sql/SqlTable.php';
         $excludeFiles[] = VENDOR_DIR . '/karmasolutions/karmafw/src/Database/Sql/SqlTableModel.php';
-        $excludeFiles[] = VENDOR_DIR . '/karmasolutions/karmafw/src/Database/Sql/SqlQuery.php';
+        //$excludeFiles[] = VENDOR_DIR . '/karmasolutions/karmafw/src/Database/Sql/SqlQuery.php';
+        //$excludeFiles[] = VENDOR_DIR . '/karmasolutions/karmafw/src/App/Middlewares/DebugBar.php';
+        //$excludeFiles[] = VENDOR_DIR . '/karmasolutions/karmafw/src/Routing/Router.php';
+        //$excludeFiles[] = VENDOR_DIR . '/karmasolutions/karmafw/src/App/Pipe.php';
 
         foreach ($backtrace as $index => $context) {
-        	if (isset($context['file'])) {
-        		//pre($context['file']); exit;
-        	}
-            if (isset($context['file']) && in_array($context['file'], $excludeFiles)) {
-                continue;
+            if (isset($context['file']) && ! in_array($context['file'], $excludeFiles)) {
+                break;
             }
         }
 

src/Database/Sql/SqlQuery.php

@@ -145,6 +145,13 @@ class SqlQuery
 		$this->recordset = $rs;
 		$this->db->setLastQuery($this);
 
+		/*
+		if (strpos($query, 'from utilisateurs')) {
+			$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 10);
+			//pre(Tools::getCaller([__FILE__])); exit;
+			pre($backtrace); exit;
+		}
+		*/
 
 		// debugbar
 		$debugbar = App::getData('debugbar');

src/Templates/LightweightTemplate.php

@@ -65,6 +65,15 @@ class LightweightTemplate {
 	public static function view($file, $data = array()) {
 		$cached_file = self::cache($file);
 	    extract($data, EXTR_SKIP);
+
+		$debugbar = App::getData('debugbar');
+		if ($debugbar) {
+			if (isset($debugbar['templates_vars'])) {
+				$debugbar['templates_vars']->setData($data);
+			}
+		}
+		unset($debugbar);
+
 	   	require $cached_file;
 	}