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 | |
| 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
8 files changed, 18 insertions, 18 deletions
diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml index d8e890d063..94146e1ec2 100644 --- a/phpBB/config/default/routing/routing.yml +++ b/phpBB/config/default/routing/routing.yml @@ -1,7 +1,7 @@ # Structure: # # foo_controller: -# pattern: /foo +# path: /foo # defaults: { _controller: foo_sevice:method } # # The above will be accessed via app.php?controller=foo and it will diff --git a/tests/controller/config/test/routing/environment.yml b/tests/controller/config/test/routing/environment.yml index 175b11f130..1e7df02684 100644 --- a/tests/controller/config/test/routing/environment.yml +++ b/tests/controller/config/test/routing/environment.yml @@ -1,3 +1,3 @@ core_controller: - pattern: /core_foo + path: /core_foo defaults: { _controller: core_foo.controller:bar } 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 } diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml index 08bc73038f..374a58046d 100644 --- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml +++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml @@ -1,35 +1,35 @@ foo_bar_controller: - pattern: /foo/bar + path: /foo/bar defaults: { _controller: foo_bar.controller:handle } foo_baz_controller: - pattern: /foo/baz + path: /foo/baz defaults: { _controller: foo_bar.controller:baz } foo_template_controller: - pattern: /foo/template + path: /foo/template defaults: { _controller: foo_bar.controller:template } foo_exception_controller: - pattern: /foo/exception + path: /foo/exception defaults: { _controller: foo_bar.controller:exception } foo_login_redirect_controller: - pattern: /foo/login_redirect + path: /foo/login_redirect defaults: { _controller: foo_bar.controller:login_redirect } foo_redirect_controller: - pattern: /foo/redirect + path: /foo/redirect defaults: { _controller: foo_bar.controller:redirect } foo_index_controller: - pattern: /index + path: /index defaults: { _controller: foo_bar.controller:redirect } foo_tests_index_controller: - pattern: /tests/index + path: /tests/index defaults: { _controller: foo_bar.controller:redirect } foo_tests_dotdot_index_controller: - pattern: /tests/../index + path: /tests/../index defaults: { _controller: foo_bar.controller:redirect } diff --git a/tests/functional/fixtures/ext/foo/foo/config/resource.yml b/tests/functional/fixtures/ext/foo/foo/config/resource.yml index ed1d018016..4f2b9cce70 100644 --- a/tests/functional/fixtures/ext/foo/foo/config/resource.yml +++ b/tests/functional/fixtures/ext/foo/foo/config/resource.yml @@ -1,3 +1,3 @@ foo_foo_controller: - pattern: /foo + path: /foo defaults: { _controller: foo_foo.controller:handle } diff --git a/tests/pagination/config/test/routing/environment.yml b/tests/pagination/config/test/routing/environment.yml index dd667274cd..2ce082c9d1 100644 --- a/tests/pagination/config/test/routing/environment.yml +++ b/tests/pagination/config/test/routing/environment.yml @@ -1,6 +1,6 @@ core_controller: - pattern: /test + path: /test defaults: { _controller: core_foo.controller:bar, page: 1} core_page_controller: - pattern: /test/page/{page} + path: /test/page/{page} defaults: { _controller: core_foo.controller:bar} |