1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

Merge pull request #3185 from Nicofuma/ticket/13389

[ticket/13389] Replace pattern with path
This commit is contained in:
Marc Alexander 2014-11-26 13:30:03 +01:00
commit 51f46a8f91
8 changed files with 18 additions and 18 deletions

View File

@ -1,7 +1,7 @@
# Structure: # Structure:
# #
# foo_controller: # foo_controller:
# pattern: /foo # path: /foo
# defaults: { _controller: foo_sevice:method } # defaults: { _controller: foo_sevice:method }
# #
# The above will be accessed via app.php?controller=foo and it will # The above will be accessed via app.php?controller=foo and it will

View File

@ -1,3 +1,3 @@
core_controller: core_controller:
pattern: /core_foo path: /core_foo
defaults: { _controller: core_foo.controller:bar } defaults: { _controller: core_foo.controller:bar }

View File

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

View File

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

View File

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

View File

@ -1,35 +1,35 @@
foo_bar_controller: foo_bar_controller:
pattern: /foo/bar path: /foo/bar
defaults: { _controller: foo_bar.controller:handle } defaults: { _controller: foo_bar.controller:handle }
foo_baz_controller: foo_baz_controller:
pattern: /foo/baz path: /foo/baz
defaults: { _controller: foo_bar.controller:baz } defaults: { _controller: foo_bar.controller:baz }
foo_template_controller: foo_template_controller:
pattern: /foo/template path: /foo/template
defaults: { _controller: foo_bar.controller:template } defaults: { _controller: foo_bar.controller:template }
foo_exception_controller: foo_exception_controller:
pattern: /foo/exception path: /foo/exception
defaults: { _controller: foo_bar.controller:exception } defaults: { _controller: foo_bar.controller:exception }
foo_login_redirect_controller: foo_login_redirect_controller:
pattern: /foo/login_redirect path: /foo/login_redirect
defaults: { _controller: foo_bar.controller:login_redirect } defaults: { _controller: foo_bar.controller:login_redirect }
foo_redirect_controller: foo_redirect_controller:
pattern: /foo/redirect path: /foo/redirect
defaults: { _controller: foo_bar.controller:redirect } defaults: { _controller: foo_bar.controller:redirect }
foo_index_controller: foo_index_controller:
pattern: /index path: /index
defaults: { _controller: foo_bar.controller:redirect } defaults: { _controller: foo_bar.controller:redirect }
foo_tests_index_controller: foo_tests_index_controller:
pattern: /tests/index path: /tests/index
defaults: { _controller: foo_bar.controller:redirect } defaults: { _controller: foo_bar.controller:redirect }
foo_tests_dotdot_index_controller: foo_tests_dotdot_index_controller:
pattern: /tests/../index path: /tests/../index
defaults: { _controller: foo_bar.controller:redirect } defaults: { _controller: foo_bar.controller:redirect }

View File

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

View File

@ -1,6 +1,6 @@
core_controller: core_controller:
pattern: /test path: /test
defaults: { _controller: core_foo.controller:bar, page: 1} defaults: { _controller: core_foo.controller:bar, page: 1}
core_page_controller: core_page_controller:
pattern: /test/page/{page} path: /test/page/{page}
defaults: { _controller: core_foo.controller:bar} defaults: { _controller: core_foo.controller:bar}