From 32b435b7e62b65174386fed9a07cf45b81fab4d9 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 11 Apr 2019 16:45:31 -0600 Subject: [PATCH] Revert attempted fixes --- .../Processors/DebuggerAssetsProcessor.php | 8 +------- .../Common/Processors/RenderProcessor.php | 20 +------------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php index 5fc152bcb..11a39e894 100644 --- a/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php +++ b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php @@ -19,14 +19,8 @@ class DebuggerAssetsProcessor extends ProcessorBase public $id = 'debugger_assets'; public $title = 'Debugger Assets'; - public function process(ServerRequestInterface $request = null, RequestHandlerInterface $handler = null) : ResponseInterface + public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface { - // Backwards compatibility - if (is_null($request) && is_null($handler)) { - $this->container['debugger']->addAssets(); - return new Response(); - } - $this->startTimer(); $this->container['debugger']->addAssets(); $this->stopTimer(); diff --git a/system/src/Grav/Common/Processors/RenderProcessor.php b/system/src/Grav/Common/Processors/RenderProcessor.php index 33ca9066c..06a6c79f3 100644 --- a/system/src/Grav/Common/Processors/RenderProcessor.php +++ b/system/src/Grav/Common/Processors/RenderProcessor.php @@ -20,26 +20,8 @@ class RenderProcessor extends ProcessorBase public $id = 'render'; public $title = 'Render'; - public function process(ServerRequestInterface $request = null, RequestHandlerInterface $handler = null) : ResponseInterface + public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface { - // Backwards compatibility - if (is_null($request) && is_null($handler)) { - $container = $this->container; - $output = $container['output']; - - $container->output = $output; - $container->fireEvent('onOutputGenerated'); - - // Set the header type - $container->header(); - echo $container->output; - - // remove any output - $container->output = ''; - $this->container->fireEvent('onOutputRendered'); - return new Response(); - } - $this->startTimer(); $container = $this->container;