[ticket/11700] Move all recent code to namespaces

PHPBB3-11700
author: Nils Adermann <naderman@naderman.de> 2013-09-10 14:01:09 +0200
committer: Nils Adermann <naderman@naderman.de> 2013-09-16 00:25:27 +0200
commit: b95fdacdd378877d277e261465da73deb06e50da (patch)
tree: 01d55340b37f412cecd2d898c302e101b8a0ed19 /phpBB/phpbb/event
parent: 196e1813cd37c47965eb6f254ce6a55210a1b751 (diff)
download: forums-b95fdacdd378877d277e261465da73deb06e50da.tar
forums-b95fdacdd378877d277e261465da73deb06e50da.tar.gz
forums-b95fdacdd378877d277e261465da73deb06e50da.tar.bz2
forums-b95fdacdd378877d277e261465da73deb06e50da.tar.xz
forums-b95fdacdd378877d277e261465da73deb06e50da.zip
6 files changed, 34 insertions, 22 deletions
diff --git a/phpBB/phpbb/event/data.php b/phpBB/phpbb/event/data.php
index 70718ff0ae..3481023b74 100644
--- a/phpBB/phpbb/event/data.php
+++ b/phpBB/phpbb/event/data.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\event;
+
 /**
 * @ignore
 */
@@ -17,7 +19,7 @@ if (!defined('IN_PHPBB'))
 
 use Symfony\Component\EventDispatcher\Event;
 
-class phpbb_event_data extends Event implements ArrayAccess
+class data extends Event implements \ArrayAccess
 {
     private $data;
 
diff --git a/phpBB/phpbb/event/dispatcher.php b/phpBB/phpbb/event/dispatcher.php
index 4f637ce3bb..cc3733692e 100644
--- a/phpBB/phpbb/event/dispatcher.php
+++ b/phpBB/phpbb/event/dispatcher.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\event;
+
 /**
 * @ignore
 */
@@ -31,11 +33,11 @@ use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
 *     extract($phpbb_dispatcher->trigger_event('core.index', compact($vars)));
 *
 */
-class phpbb_event_dispatcher extends ContainerAwareEventDispatcher
+class dispatcher extends ContainerAwareEventDispatcher
 {
 	public function trigger_event($eventName, $data = array())
 	{
-		$event = new phpbb_event_data($data);
+		$event = new \phpbb\event\data($data);
 		$this->dispatch($eventName, $event);
 		return $event->get_data_filtered(array_keys($data));
 	}
diff --git a/phpBB/phpbb/event/extension_subscriber_loader.php b/phpBB/phpbb/event/extension_subscriber_loader.php
index d933b943d7..6bc23be176 100644
--- a/phpBB/phpbb/event/extension_subscriber_loader.php
+++ b/phpBB/phpbb/event/extension_subscriber_loader.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\event;
+
 /**
 * @ignore
 */
@@ -17,12 +19,12 @@ if (!defined('IN_PHPBB'))
 
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-class phpbb_event_extension_subscriber_loader
+class extension_subscriber_loader
 {
 	private $dispatcher;
 	private $extension_manager;
 
-	public function __construct(EventDispatcherInterface $dispatcher, phpbb_extension_manager $extension_manager)
+	public function __construct(EventDispatcherInterface $dispatcher, \phpbb\extension\manager $extension_manager)
 	{
 		$this->dispatcher = $dispatcher;
 		$this->extension_manager = $extension_manager;
diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php
index f90989a74c..7199f47ae8 100644
--- a/phpBB/phpbb/event/kernel_exception_subscriber.php
+++ b/phpBB/phpbb/event/kernel_exception_subscriber.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\event;
+
 /**
 * @ignore
 */
@@ -21,27 +23,27 @@ use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpFoundation\Response;
 
-class phpbb_event_kernel_exception_subscriber implements EventSubscriberInterface
+class kernel_exception_subscriber implements EventSubscriberInterface
 {
 	/**
 	* Template object
-	* @var phpbb_template
+	* @var \phpbb\template\template
 	*/
 	protected $template;
 
 	/**
 	* User object
-	* @var phpbb_user
+	* @var \phpbb\user
 	*/
 	protected $user;
 
 	/**
 	* Construct method
 	*
-	* @param phpbb_template $template Template object
-	* @param phpbb_user $user User object
+	* @param \phpbb\template\template $template Template object
+	* @param \phpbb\user $user User object
 	*/
-	public function __construct(phpbb_template $template, phpbb_user $user)
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->template = $template;
 		$this->user = $user;
@@ -53,7 +55,7 @@ class phpbb_event_kernel_exception_subscriber implements EventSubscriberInterfac
 	* @param GetResponseForExceptionEvent $event
 	* @return null
 	*/
-	public function on_kernel_exception(GetResponseForExceptionEvent $event)
+	public function on_kernel_exception(\GetResponseForExceptionEvent $event)
 	{
 		page_header($this->user->lang('INFORMATION'));
 
@@ -72,7 +74,7 @@ class phpbb_event_kernel_exception_subscriber implements EventSubscriberInterfac
 
 
 		$status_code = $exception instanceof HttpException ? $exception->getStatusCode() : 500;
-		$response = new Response($this->template->assign_display('body'), $status_code);
+		$response = new \Response($this->template->assign_display('body'), $status_code);
 		$event->setResponse($response);
 	}
 
diff --git a/phpBB/phpbb/event/kernel_request_subscriber.php b/phpBB/phpbb/event/kernel_request_subscriber.php
index afb8464f80..9691be7ca5 100644
--- a/phpBB/phpbb/event/kernel_request_subscriber.php
+++ b/phpBB/phpbb/event/kernel_request_subscriber.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\event;
+
 /**
 * @ignore
 */
@@ -21,11 +23,11 @@ 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
+class kernel_request_subscriber implements EventSubscriberInterface
 {
 	/**
 	* Extension finder object
-	* @var phpbb_extension_finder
+	* @var \phpbb\extension\finder
 	*/
 	protected $finder;
 
@@ -44,11 +46,11 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface
 	/**
 	* Construct method
 	*
-	* @param phpbb_extension_finder $finder Extension finder object
+	* @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)
+	public function __construct(\phpbb\extension\finder $finder, $root_path, $php_ext)
 	{
 		$this->finder = $finder;
 		$this->root_path = $root_path;
@@ -63,14 +65,14 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface
 	* @param GetResponseEvent $event
 	* @return null
 	*/
-	public function on_kernel_request(GetResponseEvent $event)
+	public function on_kernel_request(\GetResponseEvent $event)
 	{
 		$request = $event->getRequest();
-		$context = new RequestContext();
+		$context = new \RequestContext();
 		$context->fromRequest($request);
 
 		$matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext);
-		$router_listener = new RouterListener($matcher, $context);
+		$router_listener = new \RouterListener($matcher, $context);
 		$router_listener->onKernelRequest($event);
 	}
 
diff --git a/phpBB/phpbb/event/kernel_terminate_subscriber.php b/phpBB/phpbb/event/kernel_terminate_subscriber.php
index 1eaf890e42..aea9d7cc44 100644
--- a/phpBB/phpbb/event/kernel_terminate_subscriber.php
+++ b/phpBB/phpbb/event/kernel_terminate_subscriber.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\event;
+
 /**
 * @ignore
 */
@@ -19,7 +21,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 
-class phpbb_event_kernel_terminate_subscriber implements EventSubscriberInterface
+class kernel_terminate_subscriber implements EventSubscriberInterface
 {
 	/**
 	* This listener is run when the KernelEvents::TERMINATE event is triggered
@@ -29,7 +31,7 @@ class phpbb_event_kernel_terminate_subscriber implements EventSubscriberInterfac
 	* @param PostResponseEvent $event
 	* @return null
 	*/
-	public function on_kernel_terminate(PostResponseEvent $event)
+	public function on_kernel_terminate(\PostResponseEvent $event)
 	{
 		exit_handler();
 	}
author	Nils Adermann <naderman@naderman.de>	2013-09-10 14:01:09 +0200
committer	Nils Adermann <naderman@naderman.de>	2013-09-16 00:25:27 +0200
commit	b95fdacdd378877d277e261465da73deb06e50da (patch)
tree	01d55340b37f412cecd2d898c302e101b8a0ed19 /phpBB/phpbb/event
parent	196e1813cd37c47965eb6f254ce6a55210a1b751 (diff)
download	forums-b95fdacdd378877d277e261465da73deb06e50da.tar forums-b95fdacdd378877d277e261465da73deb06e50da.tar.gz forums-b95fdacdd378877d277e261465da73deb06e50da.tar.bz2 forums-b95fdacdd378877d277e261465da73deb06e50da.tar.xz forums-b95fdacdd378877d277e261465da73deb06e50da.zip