From 10b23612e3df9b9efe901c6362b221e432c14791 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 2 May 2014 22:35:36 +0200 Subject: [PATCH 1/3] [ticket/12480] Only load config/routing.yml from extensions route PHPBB3-12480 --- phpBB/phpbb/controller/provider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index 9df8130210..2c7493f64c 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -46,7 +46,7 @@ class provider // We hardcode the path to the core config directory // because the finder cannot find it $this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder - ->directory('config') + ->directory('/config') ->suffix('routing.yml') ->find() )); From a470b6c519065b932b2e41e021df52cde7eaa848 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 2 May 2014 22:48:28 +0200 Subject: [PATCH 2/3] [ticket/12480] Add subfolder/config/routing.yml which should not be found PHPBB3-12480 --- tests/controller/controller_test.php | 2 ++ tests/controller/ext/vendor2/foo/subfolder/config/routing.yml | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 tests/controller/ext/vendor2/foo/subfolder/config/routing.yml diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 550679ff07..998730589b 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -43,6 +43,8 @@ class phpbb_controller_controller_test extends phpbb_test_case $this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('controller2')); $this->assertEquals('/foo/bar', $routes->get('controller2')->getPath()); + + $this->assertNull($routes->get('controller_noroute')); } public function test_controller_resolver() diff --git a/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml b/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml new file mode 100644 index 0000000000..b4d8d19107 --- /dev/null +++ b/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml @@ -0,0 +1,3 @@ +controller_noroute: + pattern: /donotfindthis + defaults: { _controller: foo.controller:handle } From ed089f4b5fa072c9298bd1a2bffae97da4a2616c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 2 May 2014 22:52:20 +0200 Subject: [PATCH 3/3] [ticket/12480] Remove unused use statements PHPBB3-12480 --- tests/controller/controller_test.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 998730589b..7d9fe652eb 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -8,8 +8,6 @@ */ use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Route; -use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;