#534 Condtionally wire our exception handling to Joomla 4

joomlatools · Dec 7, 2021 · cb43da9 · johanjanssens · Dec 10, 2021 · amazeika
1 parent 2535b7e
commit cb43da9
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/code/plugins/system/joomlatools/joomlatools.php b/code/plugins/system/joomlatools/joomlatools.php
@@ -46,7 +46,12 @@ public function __construct($subject, $config = array())
         }
 
         //Bootstrap the Koowa Framework
-        $this->bootstrap();
+        if ($this->bootstrap())
+        {
+            if (version_compare(JVERSION, '4', '>=') && Koowa::isDebug()) {
+                $subject->addListener('onError', array($this, 'onJ4Error'), Joomla\Event\Priority::ABOVE_NORMAL);
+            }
+        }
 
         $this->onAfterKoowaBootstrap();
 
@@ -239,8 +244,10 @@ public function onBeforeRender()
      * @see: https://github.com/joomla/joomla-cms/blob/4.0-dev/libraries/src/Application/CMSApplication.php#L296
      * @return void
      */
-    public function onError($exception)
+    public function onJ4Error($event)
     {
+        $exception = $event->getError();
+
         if ($exception instanceof \Throwable) {
             $this->_proxyEvent('onException', ['exception' => $exception]);
         }