From 4b6d538b062a56f55ba221ac8437b4bfc712a475 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 13 Nov 2012 09:28:56 -0500
Subject: [feature/controller] Rename kernel pass class properly

PHPBB3-10864
---
 phpBB/common.php                       |  2 +-
 phpBB/download/file.php                |  2 +-
 phpBB/includes/di/pass/kernel.php      | 69 ----------------------------------
 phpBB/includes/di/pass/kernel_pass.php | 69 ++++++++++++++++++++++++++++++++++
 phpBB/install/database_update.php      |  2 +-
 5 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 phpBB/includes/di/pass/kernel.php
 create mode 100644 phpBB/includes/di/pass/kernel_pass.php

diff --git a/phpBB/common.php b/phpBB/common.php
index b0bc281b45..a5ffcea8e4 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -93,7 +93,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
 	),
 	array(
 		new phpbb_di_pass_collection_pass(),
-		new phpbb_di_pass_kernel(),
+		new phpbb_di_pass_kernel_pass(),
 	),
 	$phpbb_root_path,
 	$phpEx
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index eed713b891..73b9e0a9f2 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -64,7 +64,7 @@ if (isset($_GET['avatar']))
 		),
 		array(
 			new phpbb_di_pass_collection_pass(),
-			new phpbb_di_pass_kernel(),
+			new phpbb_di_pass_kernel_pass(),
 		),
 		$phpbb_root_path,
 		$phpEx
diff --git a/phpBB/includes/di/pass/kernel.php b/phpBB/includes/di/pass/kernel.php
deleted file mode 100644
index 7b190a6236..0000000000
--- a/phpBB/includes/di/pass/kernel.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-class phpbb_di_pass_kernel implements CompilerPassInterface
-{
-	/**
-	* Modify the container before it is passed to the rest of the code
-	*
-	* @param ContainerBuilder $container ContainerBuilder object
-	* @return null
-	*/
-	public function process(ContainerBuilder $container)
-	{
-		$definition = $container->getDefinition('dispatcher');
-		$user = $container->get('user');
-
-		foreach ($container->findTaggedServiceIds('kernel.event_listener') as $id => $events)
-		{
-			foreach ($events as $event)
-			{
-				$priority = isset($event['priority']) ? $event['priority'] : 0;
-
-				if (!isset($event['event']))
-				{
-					throw new InvalidArgumentException($user->lang('NO_EVENT_ATTRIBUTE', $id));
-				}
-
-				if (!isset($event['method']))
-				{
-					throw new InvalidArgumentException($user->lang('NO_METHOD_ATTRIBUTE', $id));
-				}
-
-				$definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority));
-			}
-		}
-
-		foreach ($container->findTaggedServiceIds('kernel.event_subscriber') as $id => $attributes)
-		{
-			// We must assume that the class value has been correctly filled, even if the service is created by a factory
-			$class = $container->getDefinition($id)->getClass();
-
-			$refClass = new ReflectionClass($class);
-			$interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
-			if (!$refClass->implementsInterface($interface))
-			{
-				throw new InvalidArgumentException($user->lang('SUBSCRIBER_WRONG_TYPE', $id, $interface));
-			}
-
-			$definition->addMethodCall('addSubscriberService', array($id, $class));
-		}
-	}
-}
diff --git a/phpBB/includes/di/pass/kernel_pass.php b/phpBB/includes/di/pass/kernel_pass.php
new file mode 100644
index 0000000000..d186ff2767
--- /dev/null
+++ b/phpBB/includes/di/pass/kernel_pass.php
@@ -0,0 +1,69 @@
+<?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\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+class phpbb_di_pass_kernel_pass implements CompilerPassInterface
+{
+	/**
+	* Modify the container before it is passed to the rest of the code
+	*
+	* @param ContainerBuilder $container ContainerBuilder object
+	* @return null
+	*/
+	public function process(ContainerBuilder $container)
+	{
+		$definition = $container->getDefinition('dispatcher');
+		$user = $container->get('user');
+
+		foreach ($container->findTaggedServiceIds('kernel.event_listener') as $id => $events)
+		{
+			foreach ($events as $event)
+			{
+				$priority = isset($event['priority']) ? $event['priority'] : 0;
+
+				if (!isset($event['event']))
+				{
+					throw new InvalidArgumentException($user->lang('NO_EVENT_ATTRIBUTE', $id));
+				}
+
+				if (!isset($event['method']))
+				{
+					throw new InvalidArgumentException($user->lang('NO_METHOD_ATTRIBUTE', $id));
+				}
+
+				$definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority));
+			}
+		}
+
+		foreach ($container->findTaggedServiceIds('kernel.event_subscriber') as $id => $attributes)
+		{
+			// We must assume that the class value has been correctly filled, even if the service is created by a factory
+			$class = $container->getDefinition($id)->getClass();
+
+			$refClass = new ReflectionClass($class);
+			$interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
+			if (!$refClass->implementsInterface($interface))
+			{
+				throw new InvalidArgumentException($user->lang('SUBSCRIBER_WRONG_TYPE', $id, $interface));
+			}
+
+			$definition->addMethodCall('addSubscriberService', array($id, $class));
+		}
+	}
+}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b8f5021dfd..377e38c423 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -113,7 +113,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
 	),
 	array(
 		new phpbb_di_pass_collection_pass(),
-		new phpbb_di_pass_kernel(),
+		new phpbb_di_pass_kernel_pass(),
 	),
 	$phpbb_root_path,
 	$phpEx
-- 
cgit v1.2.1