aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional/fixtures
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-11-26 13:30:03 +0100
committerMarc Alexander <admin@m-a-styles.de>2014-11-26 13:30:03 +0100
commit51f46a8f91995e8a21cb0a38eacbe56d59578b14 (patch)
tree03094534df1dfb82d87cb0faffdfaf34a791de3f /tests/functional/fixtures
parent6ac088ea2f17c7a003250511049a725c7e3decae (diff)
parent90012c86e8a75c768eb8621a9b6cc2595dadc6f9 (diff)
downloadforums-51f46a8f91995e8a21cb0a38eacbe56d59578b14.tar
forums-51f46a8f91995e8a21cb0a38eacbe56d59578b14.tar.gz
forums-51f46a8f91995e8a21cb0a38eacbe56d59578b14.tar.bz2
forums-51f46a8f91995e8a21cb0a38eacbe56d59578b14.tar.xz
forums-51f46a8f91995e8a21cb0a38eacbe56d59578b14.zip
Merge pull request #3185 from Nicofuma/ticket/13389
[ticket/13389] Replace pattern with path
Diffstat (limited to 'tests/functional/fixtures')
-rw-r--r--tests/functional/fixtures/ext/foo/bar/config/routing.yml18
-rw-r--r--tests/functional/fixtures/ext/foo/foo/config/resource.yml2
2 files changed, 10 insertions, 10 deletions
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 }