mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source
This commit is contained in:
Marc Alexander
2014-11-26 13:30:24 +01:00
parent 630e7077e0 51f46a8f91
commit 4c88c579b8
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/controller/ext/vendor2/foo/config/routing.yml
View File

@@ -1,5 +1,5 @@
controller1:
pattern: /foo
path: /foo
defaults: { _controller: foo.controller:handle }
include_controller2:

4
tests/controller/ext/vendor2/foo/config/routing_2.yml
View File

@@ -1,6 +1,6 @@
controller2:
pattern: /bar
path: /bar
defaults: { _controller: foo.controller:handle }
controller3:
pattern: /bar/p-{p}
path: /bar/p-{p}
defaults: { _controller: foo.controller:handle }

2
tests/controller/ext/vendor2/foo/subfolder/config/routing.yml
View File

@@ -1,3 +1,3 @@
controller_noroute:
pattern: /donotfindthis
path: /donotfindthis
defaults: { _controller: foo.controller:handle }