aboutsummaryrefslogtreecommitdiffstats
path: root/tests/controller/ext
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-10-22 00:29:20 -0700
committerNils Adermann <naderman@naderman.de>2013-10-22 00:29:20 -0700
commita7e41b23fd7e7f39b1e37796eca618a59e0cb9be (patch)
treef6f1ab691dce3e59204271a7e4c4463f406ac27d /tests/controller/ext
parentba5b53521a186dc23d6d4b849c7f76196c783d43 (diff)
parent96317b2c4518976c683dd67f38a8a6f8faabdf15 (diff)
downloadforums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar
forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar.gz
forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar.bz2
forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar.xz
forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.zip
Merge pull request #1801 from nickvergessen/ticket/11948
Ticket/11948 Extensions should be allowed to have more then 1 routing file
Diffstat (limited to 'tests/controller/ext')
-rw-r--r--tests/controller/ext/foo/config/routing.yml4
-rw-r--r--tests/controller/ext/foo/config/routing_2.yml3
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/controller/ext/foo/config/routing.yml b/tests/controller/ext/foo/config/routing.yml
index 4799fec37d..6cc275d96d 100644
--- a/tests/controller/ext/foo/config/routing.yml
+++ b/tests/controller/ext/foo/config/routing.yml
@@ -1,3 +1,7 @@
controller1:
pattern: /foo
defaults: { _controller: foo.controller:handle }
+
+include_controller2:
+ resource: "routing_2.yml"
+ prefix: /foo
diff --git a/tests/controller/ext/foo/config/routing_2.yml b/tests/controller/ext/foo/config/routing_2.yml
new file mode 100644
index 0000000000..35fff27037
--- /dev/null
+++ b/tests/controller/ext/foo/config/routing_2.yml
@@ -0,0 +1,3 @@
+controller2:
+ pattern: /bar
+ defaults: { _controller: foo.controller:handle }