aboutsummaryrefslogtreecommitdiffstats
path: root/tests/controller
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-02 22:48:28 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-02 22:48:28 +0200
commita470b6c519065b932b2e41e021df52cde7eaa848 (patch)
tree14af44a8f1957ad524a530185aed29fd2ea23000 /tests/controller
parent10b23612e3df9b9efe901c6362b221e432c14791 (diff)
downloadforums-a470b6c519065b932b2e41e021df52cde7eaa848.tar
forums-a470b6c519065b932b2e41e021df52cde7eaa848.tar.gz
forums-a470b6c519065b932b2e41e021df52cde7eaa848.tar.bz2
forums-a470b6c519065b932b2e41e021df52cde7eaa848.tar.xz
forums-a470b6c519065b932b2e41e021df52cde7eaa848.zip
[ticket/12480] Add subfolder/config/routing.yml which should not be found
PHPBB3-12480
Diffstat (limited to 'tests/controller')
-rw-r--r--tests/controller/controller_test.php2
-rw-r--r--tests/controller/ext/vendor2/foo/subfolder/config/routing.yml3
2 files changed, 5 insertions, 0 deletions
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 }