diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-26 13:30:24 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-26 13:30:24 +0100 |
| commit | 4c88c579b8cded6754476f08d6d268670e9f8dd9 (patch) | |
| tree | 2bb43d71bc9aec21d02c6c7f15d6b758f2153fd5 /tests/controller/ext | |
| parent | 630e7077e00b6c1c8023436351f777ef76165642 (diff) | |
| parent | 51f46a8f91995e8a21cb0a38eacbe56d59578b14 (diff) | |
| download | forums-4c88c579b8cded6754476f08d6d268670e9f8dd9.tar forums-4c88c579b8cded6754476f08d6d268670e9f8dd9.tar.gz forums-4c88c579b8cded6754476f08d6d268670e9f8dd9.tar.bz2 forums-4c88c579b8cded6754476f08d6d268670e9f8dd9.tar.xz forums-4c88c579b8cded6754476f08d6d268670e9f8dd9.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'tests/controller/ext')
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/controller/ext/vendor2/foo/config/routing.yml b/tests/controller/ext/vendor2/foo/config/routing.yml index 6cc275d96d..e3e8ee5f98 100644 --- a/tests/controller/ext/vendor2/foo/config/routing.yml +++ b/tests/controller/ext/vendor2/foo/config/routing.yml @@ -1,5 +1,5 @@ controller1: - pattern: /foo + path: /foo defaults: { _controller: foo.controller:handle } include_controller2: diff --git a/tests/controller/ext/vendor2/foo/config/routing_2.yml b/tests/controller/ext/vendor2/foo/config/routing_2.yml index d987a65aea..ee05898c66 100644 --- a/tests/controller/ext/vendor2/foo/config/routing_2.yml +++ b/tests/controller/ext/vendor2/foo/config/routing_2.yml @@ -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 } diff --git a/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml b/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml index b4d8d19107..20810a8f25 100644 --- a/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml +++ b/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml @@ -1,3 +1,3 @@ controller_noroute: - pattern: /donotfindthis + path: /donotfindthis defaults: { _controller: foo.controller:handle } |