From 4cb9ec522c7007b99eb5ef44cb1bfdb369478aff Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 14 Nov 2012 16:06:12 -0500
Subject: [feature/controller] Separate Kernel listeners into their own classes

PHPBB3-10864
---
 phpBB/includes/event/kernel_request_subscriber.php | 90 ++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 phpBB/includes/event/kernel_request_subscriber.php

(limited to 'phpBB/includes/event/kernel_request_subscriber.php')

diff --git a/phpBB/includes/event/kernel_request_subscriber.php b/phpBB/includes/event/kernel_request_subscriber.php
new file mode 100644
index 0000000000..98079acabb
--- /dev/null
+++ b/phpBB/includes/event/kernel_request_subscriber.php
@@ -0,0 +1,90 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\RouterListener;
+use Symfony\Component\Routing\RequestContext;
+
+class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface
+{
+	/**
+	* Extension finder object
+	* @var phpbb_extension_finder
+	*/
+	protected $finder;
+
+	/**
+	* PHP extension
+	* @var string
+	*/
+	protected $php_ext;
+
+	/**
+	* Root path
+	* @var string
+	*/
+	protected $root_path;
+
+	/**
+	* Construct method
+	*
+	* @param phpbb_extension_finder $finder Extension finder object
+	* @param string $root_path Root path
+	* @param string $php_ext PHP extension
+	*/
+	public function __construct(phpbb_extension_finder $finder, $root_path, $php_ext)
+	{
+		$this->template = $template;
+		$this->user = $user;
+		$this->finder = $finder;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	* This listener is run when the KernelEvents::REQUEST event is triggered
+	*
+	* This is responsible for setting up the routing information
+	*
+	* @param GetResponseEvent $event
+	* @return null
+	*/
+	public function on_kernel_request(GetResponseEvent $event)
+	{
+		$request = $event->getRequest();
+		$context = new RequestContext();
+		$context->fromRequest($request);
+
+		if (!function_exists('phpbb_create_url_matcher'))
+		{
+			include($this->root_path . 'includes/functions_url_matcher' . $this->php_ext);
+		}
+		$matcher = phpbb_create_url_matcher($this->finder, $context, $this->root_path, $this->php_ext);
+
+		$router_listener = new RouterListener($matcher, $context);
+		$router_listener->onKernelRequest($event);
+	}
+
+	public static function getSubscribedEvents()
+	{
+		return array(
+			KernelEvents::REQUEST		=> 'on_kernel_request',
+		);
+	}
+}
-- 
cgit v1.2.1


From fa43edd8778dffd21146350f1749fad5c0755fb7 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 14 Nov 2012 16:42:52 -0500
Subject: [feature/controller] Further separate url matcher functionality

PHPBB3-10864
---
 phpBB/includes/event/kernel_request_subscriber.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/event/kernel_request_subscriber.php')

diff --git a/phpBB/includes/event/kernel_request_subscriber.php b/phpBB/includes/event/kernel_request_subscriber.php
index 98079acabb..85c8c5b173 100644
--- a/phpBB/includes/event/kernel_request_subscriber.php
+++ b/phpBB/includes/event/kernel_request_subscriber.php
@@ -50,8 +50,6 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface
 	*/
 	public function __construct(phpbb_extension_finder $finder, $root_path, $php_ext)
 	{
-		$this->template = $template;
-		$this->user = $user;
 		$this->finder = $finder;
 		$this->root_path = $root_path;
 		$this->php_ext = $php_ext;
@@ -71,11 +69,11 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface
 		$context = new RequestContext();
 		$context->fromRequest($request);
 
-		if (!function_exists('phpbb_create_url_matcher'))
+		if (!function_exists('phpbb_load_url_matcher'))
 		{
 			include($this->root_path . 'includes/functions_url_matcher' . $this->php_ext);
 		}
-		$matcher = phpbb_create_url_matcher($this->finder, $context, $this->root_path, $this->php_ext);
+		$matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext);
 
 		$router_listener = new RouterListener($matcher, $context);
 		$router_listener->onKernelRequest($event);
-- 
cgit v1.2.1


From 8e480a87253fd2e42af3fc4daaed2f49b9ae65c5 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Nov 2012 14:48:45 -0500
Subject: [feature/controller] Move include to app.php

PHPBB3-10864
---
 phpBB/includes/event/kernel_request_subscriber.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/includes/event/kernel_request_subscriber.php')

diff --git a/phpBB/includes/event/kernel_request_subscriber.php b/phpBB/includes/event/kernel_request_subscriber.php
index 85c8c5b173..afb8464f80 100644
--- a/phpBB/includes/event/kernel_request_subscriber.php
+++ b/phpBB/includes/event/kernel_request_subscriber.php
@@ -69,12 +69,7 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface
 		$context = new RequestContext();
 		$context->fromRequest($request);
 
-		if (!function_exists('phpbb_load_url_matcher'))
-		{
-			include($this->root_path . 'includes/functions_url_matcher' . $this->php_ext);
-		}
 		$matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext);
-
 		$router_listener = new RouterListener($matcher, $context);
 		$router_listener->onKernelRequest($event);
 	}
-- 
cgit v1.2.1