diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php index 613d7da88..777c1d9e5 100644 --- a/system/src/Grav/Common/Grav.php +++ b/system/src/Grav/Common/Grav.php @@ -118,8 +118,8 @@ class Grav extends Container // process all processors (e.g. config, initialize, assets, ..., render) foreach ($this->processors as $processor) { $processor = $this[$processor]; - $this->measureTime($processor->id, $processor->title, function($debugger) use ($processor) { - $processor->process($debugger); + $this->measureTime($processor->id, $processor->title, function() use ($processor) { + $processor->process(); }); } @@ -381,7 +381,7 @@ class Grav extends Container // then to get it from the container all time. $container->measureTime = function($timerId, $timerTitle, $callback) use ($debugger) { $debugger->startTimer($timerId, $timerTitle); - $callback($debugger); + $callback(); $debugger->stopTimer($timerId); }; diff --git a/system/src/Grav/Common/Processors/AssetsProcessor.php b/system/src/Grav/Common/Processors/AssetsProcessor.php index a795591d6..3bacc2e68 100644 --- a/system/src/Grav/Common/Processors/AssetsProcessor.php +++ b/system/src/Grav/Common/Processors/AssetsProcessor.php @@ -6,7 +6,7 @@ class AssetsProcessor extends ProcessorBase implements ProcessorInterface { public $id = 'assets'; public $title = 'Assets'; - public function process($debugger) { + public function process() { $this->container['assets']->init(); $this->container->fireEvent('onAssetsInitialized'); } diff --git a/system/src/Grav/Common/Processors/ConfigurationProcessor.php b/system/src/Grav/Common/Processors/ConfigurationProcessor.php index 3804af865..f1bcb4327 100644 --- a/system/src/Grav/Common/Processors/ConfigurationProcessor.php +++ b/system/src/Grav/Common/Processors/ConfigurationProcessor.php @@ -6,7 +6,7 @@ class ConfigurationProcessor extends ProcessorBase implements ProcessorInterface public $id = '_config'; public $title = 'Configuration'; - public function process($debugger) { + public function process() { $this->container['config']->init(); return $this->container['plugins']->setup(); } diff --git a/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php index 2bacdf76b..2d4f05c11 100644 --- a/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php +++ b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php @@ -6,8 +6,8 @@ class DebuggerAssetsProcessor extends ProcessorBase implements ProcessorInterfac public $id = 'debugger_assets'; public $title = 'Debugger Assets'; - public function process($debugger) { - $debugger->addAssets(); + public function process() { + $this->container['debugger']->addAssets(); } } diff --git a/system/src/Grav/Common/Processors/DebuggerInitProcessor.php b/system/src/Grav/Common/Processors/DebuggerInitProcessor.php index 1e2af2177..bc302b62b 100644 --- a/system/src/Grav/Common/Processors/DebuggerInitProcessor.php +++ b/system/src/Grav/Common/Processors/DebuggerInitProcessor.php @@ -6,8 +6,8 @@ class DebuggerInitProcessor extends ProcessorBase implements ProcessorInterface public $id = '_debugger'; public $title = 'Init Debugger'; - public function process($debugger) { - $debugger->init(); + public function process() { + $this->container['debugger']->init(); } } diff --git a/system/src/Grav/Common/Processors/ErrorsProcessor.php b/system/src/Grav/Common/Processors/ErrorsProcessor.php index 894f03486..fa7fb746f 100644 --- a/system/src/Grav/Common/Processors/ErrorsProcessor.php +++ b/system/src/Grav/Common/Processors/ErrorsProcessor.php @@ -6,7 +6,7 @@ class ErrorsProcessor extends ProcessorBase implements ProcessorInterface { public $id = '_errors'; public $title = 'Error Handlers Reset'; - public function process($debugger) { + public function process() { $this->container['errors']->resetHandlers(); } diff --git a/system/src/Grav/Common/Processors/InitializeProcessor.php b/system/src/Grav/Common/Processors/InitializeProcessor.php index 7e173ca9a..67020c817 100644 --- a/system/src/Grav/Common/Processors/InitializeProcessor.php +++ b/system/src/Grav/Common/Processors/InitializeProcessor.php @@ -6,7 +6,7 @@ class InitializeProcessor extends ProcessorBase implements ProcessorInterface { public $id = 'init'; public $title = 'Initialize'; - public function process($debugger) { + public function process() { $this->container['config']->debug(); // Use output buffering to prevent headers from being sent too early. diff --git a/system/src/Grav/Common/Processors/PagesProcessor.php b/system/src/Grav/Common/Processors/PagesProcessor.php index 046159185..54da24dcb 100644 --- a/system/src/Grav/Common/Processors/PagesProcessor.php +++ b/system/src/Grav/Common/Processors/PagesProcessor.php @@ -6,7 +6,7 @@ class PagesProcessor extends ProcessorBase implements ProcessorInterface { public $id = 'pages'; public $title = 'Pages'; - public function process($debugger) { + public function process() { $this->container['pages']->init(); $this->container->fireEvent('onPagesInitialized'); $this->container->fireEvent('onPageInitialized'); diff --git a/system/src/Grav/Common/Processors/PluginsProcessor.php b/system/src/Grav/Common/Processors/PluginsProcessor.php index b0d0107f3..2d83656eb 100644 --- a/system/src/Grav/Common/Processors/PluginsProcessor.php +++ b/system/src/Grav/Common/Processors/PluginsProcessor.php @@ -6,7 +6,7 @@ class PluginsProcessor extends ProcessorBase implements ProcessorInterface { public $id = 'plugins'; public $title = 'Plugins'; - public function process($debugger) { + public function process() { $this->container['plugins']->init(); $this->container->fireEvent('onPluginsInitialized'); } diff --git a/system/src/Grav/Common/Processors/ProcessorBase.php b/system/src/Grav/Common/Processors/ProcessorBase.php index 4b6581668..9fe4ee83b 100644 --- a/system/src/Grav/Common/Processors/ProcessorBase.php +++ b/system/src/Grav/Common/Processors/ProcessorBase.php @@ -6,5 +6,5 @@ class ProcessorBase { public function __construct($container) { $this->container = $container; } - + } diff --git a/system/src/Grav/Common/Processors/ProcessorInterface.php b/system/src/Grav/Common/Processors/ProcessorInterface.php index 6f5316ce1..7753de922 100644 --- a/system/src/Grav/Common/Processors/ProcessorInterface.php +++ b/system/src/Grav/Common/Processors/ProcessorInterface.php @@ -2,5 +2,5 @@ namespace Grav\Common\Processors; interface ProcessorInterface { - public function process($debugger); + public function process(); } diff --git a/system/src/Grav/Common/Processors/RenderProcessor.php b/system/src/Grav/Common/Processors/RenderProcessor.php index f2f36206c..d18a33a07 100644 --- a/system/src/Grav/Common/Processors/RenderProcessor.php +++ b/system/src/Grav/Common/Processors/RenderProcessor.php @@ -6,7 +6,7 @@ class RenderProcessor extends ProcessorBase implements ProcessorInterface { public $id = 'render'; public $title = 'Render'; - public function process($debugger) { + public function process() { $this->container->output = $this->container['output']; $this->container->fireEvent('onOutputGenerated'); } diff --git a/system/src/Grav/Common/Processors/SiteSetupProcessor.php b/system/src/Grav/Common/Processors/SiteSetupProcessor.php index d808859b3..405a388a9 100644 --- a/system/src/Grav/Common/Processors/SiteSetupProcessor.php +++ b/system/src/Grav/Common/Processors/SiteSetupProcessor.php @@ -6,7 +6,7 @@ class SiteSetupProcessor extends ProcessorBase implements ProcessorInterface { public $id = '_setup'; public $title = 'Site Setup'; - public function process($debugger) { + public function process() { $this->container['setup']->init(); $this->container['streams']; } diff --git a/system/src/Grav/Common/Processors/TasksProcessor.php b/system/src/Grav/Common/Processors/TasksProcessor.php index 9aa25cfd2..bf2988047 100644 --- a/system/src/Grav/Common/Processors/TasksProcessor.php +++ b/system/src/Grav/Common/Processors/TasksProcessor.php @@ -6,7 +6,7 @@ class TasksProcessor extends ProcessorBase implements ProcessorInterface { public $id = 'tasks'; public $title = 'Tasks'; - public function process($debugger) { + public function process() { $task = $this->container['task']; if ($task) { $this->container->fireEvent('onTask.' . $task); diff --git a/system/src/Grav/Common/Processors/ThemesProcessor.php b/system/src/Grav/Common/Processors/ThemesProcessor.php index a70c9094b..6d7764802 100644 --- a/system/src/Grav/Common/Processors/ThemesProcessor.php +++ b/system/src/Grav/Common/Processors/ThemesProcessor.php @@ -6,7 +6,7 @@ class ThemesProcessor extends ProcessorBase implements ProcessorInterface { public $id = 'themes'; public $title = 'Themes'; - public function process($debugger) { + public function process() { $this->container['themes']->init(); } diff --git a/system/src/Grav/Common/Processors/TwigProcessor.php b/system/src/Grav/Common/Processors/TwigProcessor.php index d436eabd7..eacc8e25c 100644 --- a/system/src/Grav/Common/Processors/TwigProcessor.php +++ b/system/src/Grav/Common/Processors/TwigProcessor.php @@ -6,7 +6,7 @@ class TwigProcessor extends ProcessorBase implements ProcessorInterface { public $id = 'twig'; public $title = 'Twig'; - public function process($debugger) { + public function process() { $this->container['twig']->init(); }