FuzeWorks/WebComponent
FuzeWorks
/
WebComponent
1
0
Fork 0
Code Issues 4 Pull Requests Releases 1 Activity

Release 1.2.0-RC5

This commit is contained in:
Abel Hoogeveen 2019-09-18 00:21:03 +02:00
parent a04293d8b4
commit 35df988200
No known key found for this signature in database
GPG Key ID: 96C2234920BF4292
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -14,8 +14,8 @@
], ],
"require": { "require": {
"php": ">=7.1.0", "php": ">=7.1.0",
"fuzeworks/mvcr": "1.2.0-RC4", "fuzeworks/mvcr": "1.2.0-RC5",
"fuzeworks/core": "1.2.0-RC4" "fuzeworks/core": "1.2.0-RC5"
}, },
"minimum-stability": "RC", "minimum-stability": "RC",
"prefer-stable": true, "prefer-stable": true,

29
src/FuzeWorks/WebComponent.php
View File

@ -39,11 +39,12 @@ namespace FuzeWorks;
use FuzeWorks\Event\HaltExecutionEvent; use FuzeWorks\Event\HaltExecutionEvent;
use FuzeWorks\Event\LayoutLoadEvent; use FuzeWorks\Event\LayoutLoadEvent;
use FuzeWorks\Event\RouterCallViewEvent; use FuzeWorks\Event\RouterCallViewEvent;
use FuzeWorks\Event\RouterLoadViewAndControllerEvent;
use FuzeWorks\Event\RouteWebRequestEvent; use FuzeWorks\Event\RouteWebRequestEvent;
use FuzeWorks\Exception\ConfigException; use FuzeWorks\Exception\ConfigException;
use FuzeWorks\Exception\CSRFException;
use FuzeWorks\Exception\EventException; use FuzeWorks\Exception\EventException;
use FuzeWorks\Exception\Exception; use FuzeWorks\Exception\Exception;
use FuzeWorks\Exception\FactoryException;
use FuzeWorks\Exception\HaltException; use FuzeWorks\Exception\HaltException;
use FuzeWorks\Exception\NotFoundException; use FuzeWorks\Exception\NotFoundException;
use FuzeWorks\Exception\OutputException; use FuzeWorks\Exception\OutputException;
@ -140,6 +141,7 @@ class WebComponent implements iComponent
* @throws RouterException * @throws RouterException
* @throws WebException * @throws WebException
* @throws EventException * @throws EventException
* @throws FactoryException
*/ */
public function routeWebRequest(): bool public function routeWebRequest(): bool
{ {
@ -156,6 +158,17 @@ class WebComponent implements iComponent
return $event; return $event;
}, 'coreShutdownEvent', Priority::NORMAL); }, 'coreShutdownEvent', Priority::NORMAL);
// Add HTTP method prefix to requests to views
Events::addListener(function($event){
/** @var Input $input */
/** @var RouterLoadViewAndControllerEvent $event */
$input = Factory::getInstance('input');
$methods = $event->viewMethods[Priority::NORMAL];
foreach ($methods as $method)
$event->addMethod(strtolower($input->method()) . '_' . $method);
return $event;
}, 'routerLoadViewAndControllerEvent', Priority::NORMAL);
// Create an error 500 page when a haltEvent is fired // Create an error 500 page when a haltEvent is fired
Events::addListener([$this, 'haltEventListener'], 'haltExecutionEvent', Priority::NORMAL); Events::addListener([$this, 'haltEventListener'], 'haltExecutionEvent', Priority::NORMAL);
} catch (EventException $e) { } catch (EventException $e) {
@ -170,11 +183,11 @@ class WebComponent implements iComponent
/** @var Output $output */ /** @var Output $output */
/** @var Security $security */ /** @var Security $security */
/** @var Resources $resources */ /** @var Resources $resources */
$router = Factory::getInstance()->router; $router = Factory::getInstance('router');
$uri = Factory::getInstance()->uri; $uri = Factory::getInstance('uri');
$output = Factory::getInstance()->output; $output = Factory::getInstance('output');
$security = Factory::getInstance()->security; $security = Factory::getInstance('security');
$resources = Factory::getInstance()->resources; $resources = Factory::getInstance('resources');
// And start logging the request // And start logging the request
Logger::newLevel("Routing web request..."); Logger::newLevel("Routing web request...");
@ -207,7 +220,7 @@ class WebComponent implements iComponent
// Attempt to load the requested page // Attempt to load the requested page
try { try {
$viewOutput = $router->route($uriString); $viewOutput = $router->route($event->uriString);
} catch (NotFoundException $e) { } catch (NotFoundException $e) {
Logger::logWarning("Requested page not found. Requesting Error/error404 View"); Logger::logWarning("Requested page not found. Requesting Error/error404 View");
$output->setStatusHeader(404); $output->setStatusHeader(404);
@ -280,6 +293,7 @@ class WebComponent implements iComponent
* *
* @param $event * @param $event
* @throws EventException * @throws EventException
* @throws FactoryException
* @TODO remove FuzeWorks\Layout dependency * @TODO remove FuzeWorks\Layout dependency
*/ */
public function haltEventListener(HaltExecutionEvent $event) public function haltEventListener(HaltExecutionEvent $event)
@ -323,6 +337,7 @@ class WebComponent implements iComponent
* *
* @param LayoutLoadEvent $event * @param LayoutLoadEvent $event
* @throws ConfigException * @throws ConfigException
* @throws FactoryException
*/ */
public function layoutLoadEventListener($event) public function layoutLoadEventListener($event)
{ {