4 files changed, 10 insertions, 43 deletions
diff --git a/phpBB/phpbb/controller/exception.php b/phpBB/phpbb/controller/exception.php
index e8694b8bcf..06ece8d1d5 100644
--- a/phpBB/phpbb/controller/exception.php
+++ b/phpBB/phpbb/controller/exception.php
@@ -10,14 +10,6 @@
 namespace phpbb\controller;
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * Controller exception class
 * @package phpBB3
 */
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 07483a91eb..05a05d1e57 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\controller;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 use Symfony\Component\HttpFoundation\Response;
 
 /**
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index 3aad08e3aa..fde51696e8 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\controller;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Loader\YamlFileLoader;
 use Symfony\Component\Config\FileLocator;
@@ -31,17 +23,17 @@ class provider
 	* YAML file(s) containing route information
 	* @var array
 	*/
-	protected $routing_paths;
+	protected $routing_files;
 
 	/**
 	* Construct method
 	*
-	* @param array() $routing_paths Array of strings containing paths
+	* @param array() $routing_files Array of strings containing paths
 	*							to YAML files holding route information
 	*/
-	public function __construct($routing_paths = array())
+	public function __construct($routing_files = array())
 	{
-		$this->routing_paths = $routing_paths;
+		$this->routing_files = $routing_files;
 	}
 
 	/**
@@ -54,12 +46,11 @@ class provider
 	{
 		// We hardcode the path to the core config directory
 		// because the finder cannot find it
-		$this->routing_paths = array_merge(array('config'), array_map('dirname', array_keys($finder
+		$this->routing_files = array_merge(array('config/routing.yml'), array_keys($finder
 			->directory('config')
-			->prefix('routing')
-			->suffix('yml')
+			->suffix('routing.yml')
 			->find()
-		)));
+		));
 
 		return $this;
 	}
@@ -73,10 +64,10 @@ class provider
 	public function find($base_path = '')
 	{
 		$routes = new RouteCollection;
-		foreach ($this->routing_paths as $path)
+		foreach ($this->routing_files as $file_path)
 		{
-			$loader = new YamlFileLoader(new FileLocator($base_path . $path));
-			$routes->addCollection($loader->load('routing.yml'));
+			$loader = new YamlFileLoader(new FileLocator($base_path));
+			$routes->addCollection($loader->load($file_path));
 		}
 
 		return $routes;
diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php
index 1cc8981105..233179e343 100644
--- a/phpBB/phpbb/controller/resolver.php
+++ b/phpBB/phpbb/controller/resolver.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\controller;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;