Refactored the Grav classes load and process methods to follow clean coding standards

system/src/Grav/Common/Processors/AssetsProcessor.php

@@ -0,0 +1,14 @@
+<?php
+namespace Grav\Common\Processors;
+
+class AssetsProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'assets';
+    public $title = 'Assets';
+
+    public function process() {
+      $this->container['assets']->init();
+      $this->container->fireEvent('onAssetsInitialized');
+    }
+
+}

system/src/Grav/Common/Processors/ConfigurationProcessor.php

@@ -0,0 +1,14 @@
+<?php
+namespace Grav\Common\Processors;
+
+class ConfigurationProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = '_config';
+    public $title = 'Configuration';
+
+    public function process() {
+      $this->container['config']->init();
+      return $this->container['plugins']->setup();
+    }
+
+}

system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php

@@ -0,0 +1,13 @@
+<?php
+namespace Grav\Common\Processors;
+
+class DebuggerAssetsProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'debugger_assets';
+    public $title = 'Debugger Assets';
+
+    public function process() {
+      $this->container['debugger']->addAssets();
+    }
+
+}

system/src/Grav/Common/Processors/DebuggerInitProcessor.php

@@ -0,0 +1,13 @@
+<?php
+namespace Grav\Common\Processors;
+
+class DebuggerInitProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = '_debugger';
+    public $title = 'Init Debugger';
+
+    public function process() {
+      $this->container['debugger']->init();
+    }
+
+}

system/src/Grav/Common/Processors/ErrorsProcessor.php

@@ -0,0 +1,13 @@
+<?php
+namespace Grav\Common\Processors;
+
+class ErrorsProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = '_errors';
+    public $title = 'Error Handlers Reset';
+
+    public function process() {
+      $this->container['errors']->resetHandlers();
+    }
+
+}

system/src/Grav/Common/Processors/InitializeProcessor.php

@@ -0,0 +1,33 @@
+<?php
+namespace Grav\Common\Processors;
+
+class InitializeProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'init';
+    public $title = 'Initialize';
+
+    public function process() {
+      $this->container['config']->debug();
+
+      // Use output buffering to prevent headers from being sent too early.
+      ob_start();
+      if ($this->container['config']->get('system.cache.gzip')) {
+          // Enable zip/deflate with a fallback in case of if browser does not support compressing.
+          if (!ob_start("ob_gzhandler")) {
+              ob_start();
+          }
+      }
+
+      // Initialize the timezone.
+      if ($this->container['config']->get('system.timezone')) {
+          date_default_timezone_set($this->container['config']->get('system.timezone'));
+      }
+
+      // Initialize uri, session.
+      $this->container['uri']->init();
+      $this->container['session']->init();
+
+      $this->container->setLocale();
+    }
+
+}

system/src/Grav/Common/Processors/PagesProcessor.php

@@ -0,0 +1,15 @@
+<?php
+namespace Grav\Common\Processors;
+
+class PagesProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'pages';
+    public $title = 'Pages';
+
+    public function process() {
+      $this->container['pages']->init();
+      $this->container->fireEvent('onPagesInitialized');
+      $this->container->fireEvent('onPageInitialized');
+    }
+
+}

system/src/Grav/Common/Processors/PluginsProcessor.php

@@ -0,0 +1,14 @@
+<?php
+namespace Grav\Common\Processors;
+
+class PluginsProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'plugins';
+    public $title = 'Plugins';
+
+    public function process() {
+      $this->container['plugins']->init();
+      $this->container->fireEvent('onPluginsInitialized');
+    }
+
+}

system/src/Grav/Common/Processors/ProcessorBase.php

@@ -0,0 +1,10 @@
+<?php
+namespace Grav\Common\Processors;
+
+class ProcessorBase {
+
+  public function __construct($container) {
+    $this->container = $container;
+  }
+
+}

system/src/Grav/Common/Processors/ProcessorInterface.php

@@ -0,0 +1,6 @@
+<?php
+namespace Grav\Common\Processors;
+
+interface ProcessorInterface {
+  public function process();
+}

system/src/Grav/Common/Processors/RenderProcessor.php

@@ -0,0 +1,14 @@
+<?php
+namespace Grav\Common\Processors;
+
+class RenderProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'render';
+    public $title = 'Render';
+
+    public function process() {
+      $this->container->output = $this->container['output'];
+      $this->container->fireEvent('onOutputGenerated');
+    }
+
+}

system/src/Grav/Common/Processors/SiteSetupProcessor.php

@@ -0,0 +1,14 @@
+<?php
+namespace Grav\Common\Processors;
+
+class SiteSetupProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = '_setup';
+    public $title = 'Site Setup';
+
+    public function process() {
+      $this->container['setup']->init();
+      $this->container['streams'];
+    }
+
+}

system/src/Grav/Common/Processors/TasksProcessor.php

@@ -0,0 +1,16 @@
+<?php
+namespace Grav\Common\Processors;
+
+class TasksProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'tasks';
+    public $title = 'Tasks';
+
+    public function process() {
+      $task = $this->container['task'];
+      if ($task) {
+          $this->container->fireEvent('onTask.' . $task);
+      }
+    }
+
+}

system/src/Grav/Common/Processors/ThemesProcessor.php

@@ -0,0 +1,13 @@
+<?php
+namespace Grav\Common\Processors;
+
+class ThemesProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'themes';
+    public $title = 'Themes';
+
+    public function process() {
+      $this->container['themes']->init();
+    }
+
+}

system/src/Grav/Common/Processors/TwigProcessor.php

@@ -0,0 +1,13 @@
+<?php
+namespace Grav\Common\Processors;
+
+class TwigProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'twig';
+    public $title = 'Twig';
+
+    public function process() {
+      $this->container['twig']->init();
+    }
+
+}

system/src/Grav/Common/Service/AssetsServiceProvider.php

@@ -0,0 +1,13 @@
+<?php
+namespace Grav\Common\Service;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+use Grav\Common\Assets;
+
+class AssetsServiceProvider implements ServiceProviderInterface
+{
+    public function register(Container $container) {
+        $container['assets'] = new Assets();
+    }
+}

system/src/Grav/Common/Service/OutputServiceProvider.php

@@ -0,0 +1,15 @@
+<?php
+namespace Grav\Common\Service;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+class OutputServiceProvider implements ServiceProviderInterface
+{
+    public function register(Container $container) {
+        $container['output'] = function ($c) {
+            /** @var Grav $c */
+            return $c['twig']->processSite($c['uri']->extension());
+        };
+    }
+}

system/src/Grav/Common/Service/PageServiceProvider.php

@@ -0,0 +1,63 @@
+<?php
+namespace Grav\Common\Service;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+class PageServiceProvider implements ServiceProviderInterface
+{
+    public function register(Container $container) {
+
+        $container['page'] = function ($c) {
+            /** @var Grav $c */
+
+            /** @var Pages $pages */
+            $pages = $c['pages'];
+            /** @var Language $language */
+            $language = $c['language'];
+
+            /** @var Uri $uri */
+            $uri = $c['uri'];
+
+            $path = $uri->path(); // Don't trim to support trailing slash default routes
+            $path = $path ?: '/';
+
+            $page = $pages->dispatch($path);
+
+            // Redirection tests
+            if ($page) {
+                // Language-specific redirection scenarios
+                if ($language->enabled()) {
+                    if ($language->isLanguageInUrl() && !$language->isIncludeDefaultLanguage()) {
+                        $c->redirect($page->route());
+                    }
+                    if (!$language->isLanguageInUrl() && $language->isIncludeDefaultLanguage()) {
+                        $c->redirectLangSafe($page->route());
+                    }
+                }
+                // Default route test and redirect
+                if ($c['config']->get('system.pages.redirect_default_route') && $page->route() != $path) {
+                    $c->redirectLangSafe($page->route());
+                }
+            }
+
+            // if page is not found, try some fallback stuff
+            if (!$page || !$page->routable()) {
+
+                // Try fallback URL stuff...
+                $c->fallbackUrl($path);
+
+                // If no page found, fire event
+                $event = $c->fireEvent('onPageNotFound');
+
+                if (isset($event->page)) {
+                    $page = $event->page;
+                } else {
+                    throw new \RuntimeException('Page Not Found', 404);
+                }
+            }
+
+            return $page;
+        };
+    }
+}

system/src/Grav/Common/Service/TaskServiceProvider.php

@@ -0,0 +1,15 @@
+<?php
+namespace Grav\Common\Service;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+class TaskServiceProvider implements ServiceProviderInterface
+{
+    public function register(Container $container) {
+        $container['task'] = function ($c) {
+            /** @var Grav $c */
+            return !empty($_POST['task']) ? $_POST['task'] : $c['uri']->param('task');
+        };
+    }
+}