From bc5501eecb41ebdda94ce2b4b3bfde09380671d6 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Fri, 31 Jan 2020 12:23:27 +0200
Subject: [PATCH] Moved PluginsLoadedEvent into Plugins::init() call for better
 backwards compatibility

---
 system/src/Grav/Common/Plugins.php                         | 5 +++++
 system/src/Grav/Common/Processors/InitializeProcessor.php  | 5 -----
 system/src/Grav/Console/Cli/PageSystemValidatorCommand.php | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/system/src/Grav/Common/Plugins.php b/system/src/Grav/Common/Plugins.php
index 06e2cae27..7f514e61c 100644
--- a/system/src/Grav/Common/Plugins.php
+++ b/system/src/Grav/Common/Plugins.php
@@ -13,6 +13,7 @@ use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Data\Data;
 use Grav\Common\File\CompiledYamlFile;
+use Grav\Events\PluginsLoadedEvent;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
@@ -112,6 +113,10 @@ class Plugins extends Iterator
             }
         }
 
+        // Plugins Loaded Event
+        $event = new PluginsLoadedEvent($grav, $this);
+        $grav->dispatchEvent($event);
+
         return $this->items;
     }
 
diff --git a/system/src/Grav/Common/Processors/InitializeProcessor.php b/system/src/Grav/Common/Processors/InitializeProcessor.php
index fda562124..bf6b20629 100644
--- a/system/src/Grav/Common/Processors/InitializeProcessor.php
+++ b/system/src/Grav/Common/Processors/InitializeProcessor.php
@@ -15,7 +15,6 @@ use Grav\Common\Page\Pages;
 use Grav\Common\Plugins;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
-use Grav\Events\PluginsLoadedEvent;
 use Grav\Framework\Psr7\Response;
 use Grav\Framework\Session\Exceptions\SessionException;
 use Grav\Framework\Session\SessionInterface;
@@ -171,10 +170,6 @@ class InitializeProcessor extends ProcessorBase
         $plugins = $grav['plugins'];
         $plugins->init();
 
-        // Plugins Loaded Event
-        $event = new PluginsLoadedEvent($grav, $plugins);
-        $grav->dispatchEvent($event);
-
         $this->stopTimer('_plugins_load');
     }
 
diff --git a/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php b/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php
index ef7fa2540..b4e83d4ce 100644
--- a/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php
+++ b/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php
@@ -149,7 +149,8 @@ class PageSystemValidatorCommand extends ConsoleCommand
         $config->init();
         $grav['plugins']->setup();
         $grav['debugger']->init();
-                // Initialize the timezone.
+
+        // Initialize the timezone.
         $timezone = $config->get('system.timezone');
         if ($timezone) {
             date_default_timezone_set($timezone);