checks if collectors are available

lekoala · Mar 7, 2021 · f254adf · f254adf
1 parent 2a25756
commit f254adf
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 18 deletions.
diff --git a/code/Collector/DatabaseCollector.php b/code/Collector/DatabaseCollector.php
@@ -33,13 +33,15 @@ public function collect()
         if ($dbQueryWarningLevel && $data['nb_statements'] > $dbQueryWarningLevel) {
             $helpLink = DebugBar::config()->get('performance_guide_link');
             $messages = DebugBar::getMessageCollector();
-            $messages->addMessage(
-                "This page ran more than $dbQueryWarningLevel database queries." .
-                    "\nYou could reduce this by implementing caching." .
-                    "\nYou can find more info here: $helpLink",
-                'warning',
-                true
-            );
+            if ($messages) {
+                $messages->addMessage(
+                    "This page ran more than $dbQueryWarningLevel database queries." .
+                        "\nYou could reduce this by implementing caching." .
+                        "\nYou can find more info here: $helpLink",
+                    'warning',
+                    true
+                );
+            }
         }
 
         return $data;

diff --git a/code/DebugBar.php b/code/DebugBar.php
@@ -564,19 +564,27 @@ public static function getRequest()
     }
 
     /**
-     * @return TimeDataCollector
+     * @return TimeDataCollector|false
      */
     public static function getTimeCollector()
     {
-        return self::getDebugBar()->getCollector('time');
+        $debugbar = self::getDebugBar();
+        if (!$debugbar) {
+            return false;
+        }
+        return $debugbar->getCollector('time');
     }
 
     /**
-     * @return MessagesCollector
+     * @return MessagesCollector|false
      */
     public static function getMessageCollector()
     {
-        return self::getDebugBar()->getCollector('messages');
+        $debugbar = self::getDebugBar();
+        if (!$debugbar) {
+            return false;
+        }
+        return  $debugbar->getCollector('messages');
     }
 
     /**

diff --git a/code/Proxy/SSViewerProxy.php b/code/Proxy/SSViewerProxy.php
@@ -69,13 +69,15 @@ public function process($item, $arguments = null, $inheritedScope = null)
         if ($templateRenderWarningLevel && $totalTime > $templateRenderWarningLevel) {
             $sourceFile = $this->getCacheFile($this->chosen);
             $messages = DebugBar::getMessageCollector();
-            $messages->addMessage(
-                "The template $templateName needed $totalTime seconds to render." .
-                    "\nYou could reduce this by implementing partial caching." .
-                    "\nYou can also check the cache file : $sourceFile",
-                'warning',
-                true
-            );
+            if ($messages) {
+                $messages->addMessage(
+                    "The template $templateName needed $totalTime seconds to render." .
+                        "\nYou could reduce this by implementing partial caching." .
+                        "\nYou can also check the cache file : $sourceFile",
+                    'warning',
+                    true
+                );
+            }
         }
 
         return $result;