Commit 2dec350a authored by Crell's avatar Crell
Browse files

Add a listener to handle path resolution. For now we hack ['q'] still so that...

Add a listener to handle path resolution. For now we hack ['q'] still so that legacy code still works, but that will go away soon.
parent 2924b656
......@@ -16,6 +16,7 @@
use Drupal\Core\EventSubscriber\HtmlSubscriber;
use Drupal\Core\EventSubscriber\AccessSubscriber;
use Drupal\Core\EventSubscriber\PathSubscriber;
use Exception;
......@@ -45,6 +46,7 @@ function execute(Request $request) {
$matcher = $this->getMatcher($request);
$dispatcher->addSubscriber(new RouterListener($matcher));
$dispatcher->addSubscriber(new AccessSubscriber());
$dispatcher->addSubscriber(new PathSubscriber());
$resolver = new ControllerResolver();
......
<?php
namespace Drupal\Core\EventSubscriber;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
* @file
*
* Definition of Drupal\Core\EventSubscriber\AccessSubscriber
*/
/**
* Access subscriber for controller requests.
*/
class PathSubscriber implements EventSubscriberInterface {
/**
* Resolve the system path.
*
* @todo The path system should be objectified to remove the function calls
* in this method.
*
* @todo We're writing back to $_GET['q'] for temporary BC. All instances of
* $_GET['q'] should be removed and then this code eliminated.
*
* @param GetResponseEvent $event
* The Event to process.
*/
public function onKernelRequestPathResolve(GetResponseEvent $event) {
$request = $event->getRequest();
$path = ltrim($request->getPathInfo(), '/');
if (empty($path)) {
// @todo Temporary hack. Fix when configuration is injectable.
$path = variable_get('site_frontpage', 'user');
}
$system_path = drupal_get_normal_path($path);
$request->attributes->set('system_path', $system_path);
// @todo Remove this line.
// Drupal uses $_GET['q'] directly in over 100 places at present,
// including writing back to it at times. Those are all critical bugs,
// even by Drupal 7 standards, but as many of the places that it does so
// are slated to be rewritten anyway we will save time and include this
// temporary hack. Removal of this line is a critical, Drupal-release
// blocking bug.
$_GET['q'] = $system_path;
}
/**
* Registers the methods in this class that should be listeners.
*
* @return array
* An array of event listener definitions.
*/
static function getSubscribedEvents() {
$events[KernelEvents::REQUEST][] = array('onKernelRequestPathResolve', 100);
return $events;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment