fix: try to load all the classes we need if query monitor is active

ymirapp · Sep 18, 2021 · 78ffa11 · 78ffa11
1 parent 30861a9
commit 78ffa11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/Configuration/QueryMonitorConfiguration.php b/src/Configuration/QueryMonitorConfiguration.php
@@ -33,6 +33,8 @@ public function modify(Container $container)
 
             if ($isActive) {
                 require_once WP_CONTENT_DIR.'/plugins/query-monitor/classes/Collector.php';
+                require_once WP_CONTENT_DIR.'/plugins/query-monitor/classes/Collectors.php';
+                require_once WP_CONTENT_DIR.'/plugins/query-monitor/output/Html.php';
             }
 
             return $isActive;

diff --git a/src/Subscriber/QueryMonitorSubscriber.php b/src/Subscriber/QueryMonitorSubscriber.php
@@ -69,10 +69,6 @@ public static function getSubscribedEvents(): array
      */
     public function addCollectors()
     {
-        if (!is_plugin_active('query-monitor/query-monitor.php') || !class_exists(\QM_Collector::class)) {
-            return;
-        }
-
         foreach ($this->collectors as $collector) {
             \QM_Collectors::add($collector);
         }
@@ -83,10 +79,6 @@ public function addCollectors()
      */
     public function addPanels(array $panels, \QM_Collectors $collectors): array
     {
-        if (!class_exists(\QM_Output_Html::class)) {
-            return $panels;
-        }
-
         $this->panels = array_map(function (string $panel) use ($collectors) {
             return $panel::createFromCollectors($collectors, $this->viewsDirectory);
         }, $this->panels);