Skip to content

Commit a5cee8d

Browse files
committed
merged branch fabpot/pattern-fix (PR #6998)
This PR was merged into the 2.2 branch. Commits ------- 73aa7d1 replaced usage of the deprecated pattern routing key (replaced with path) Discussion ---------- replaced usage of the deprecated pattern routing key (replaced with path) | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a --------------------------------------------------------------------------- by lsmith77 at 2013-02-07T13:35:54Z do we have tests to cover the BC behavior? --------------------------------------------------------------------------- by fabpot at 2013-02-07T16:30:31Z I've just added some tests for the legacy way.
2 parents 5d769cf + a800e69 commit a5cee8d

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
form_login:
2-
pattern: /login
2+
path: /login
33
defaults: { _controller: CsrfFormLoginBundle:Login:login }
44

55
form_login_check:
6-
pattern: /login_check
6+
path: /login_check
77
defaults: { _controller: CsrfFormLoginBundle:Login:loginCheck }
88

99
form_login_homepage:
10-
pattern: /
10+
path: /
1111
defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
1212

1313
form_login_custom_target_path:
14-
pattern: /foo
14+
path: /foo
1515
defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
1616

1717
form_login_default_target_path:
18-
pattern: /profile
18+
path: /profile
1919
defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
2020

2121
form_login_redirect_to_protected_resource_after_login:
22-
pattern: /protected-resource
22+
path: /protected-resource
2323
defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
2424

2525
form_logout:
26-
pattern: /logout_path
26+
path: /logout_path
2727

2828
form_secure_action:
29-
pattern: /secure-but-not-covered-by-access-control
29+
path: /secure-but-not-covered-by-access-control
3030
defaults: { _controller: CsrfFormLoginBundle:Login:secure }
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
localized_login_path:
2-
pattern: /{_locale}/login
2+
path: /{_locale}/login
33
defaults: { _controller: FormLoginBundle:Localized:login }
44
requirements: { _locale: "^[a-z]{2}$" }
55

66
localized_check_path:
7-
pattern: /{_locale}/login_check
7+
path: /{_locale}/login_check
88
defaults: { _controller: FormLoginBundle:Localized:loginCheck }
99
requirements: { _locale: "^[a-z]{2}$" }
1010

1111
localized_default_target_path:
12-
pattern: /{_locale}/profile
12+
path: /{_locale}/profile
1313
defaults: { _controller: FormLoginBundle:Localized:profile }
1414
requirements: { _locale: "^[a-z]{2}$" }
1515

1616
localized_logout_path:
17-
pattern: /{_locale}/logout
17+
path: /{_locale}/logout
1818
defaults: { _controller: FormLoginBundle:Localized:logout }
1919
requirements: { _locale: "^[a-z]{2}$" }
2020

2121
localized_logout_target_path:
22-
pattern: /{_locale}/
22+
path: /{_locale}/
2323
defaults: { _controller: FormLoginBundle:Localized:homepage }
2424
requirements: { _locale: "^[a-z]{2}$" }
2525

2626
localized_secure_path:
27-
pattern: /{_locale}/secure/
27+
path: /{_locale}/secure/
2828
defaults: { _controller: FormLoginBundle:Localized:secure }
2929
requirements: { _locale: "^[a-z]{2}$" }
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
form_login:
2-
pattern: /login
2+
path: /login
33
defaults: { _controller: FormLoginBundle:Login:login }
44

55
form_login_check:
6-
pattern: /login_check
6+
path: /login_check
77
defaults: { _controller: FormLoginBundle:Login:loginCheck }
88

99
form_login_homepage:
10-
pattern: /
10+
path: /
1111
defaults: { _controller: FormLoginBundle:Login:afterLogin }
1212

1313
form_login_custom_target_path:
14-
pattern: /foo
14+
path: /foo
1515
defaults: { _controller: FormLoginBundle:Login:afterLogin }
1616

1717
form_login_default_target_path:
18-
pattern: /profile
18+
path: /profile
1919
defaults: { _controller: FormLoginBundle:Login:afterLogin }
2020

2121
form_login_redirect_to_protected_resource_after_login:
22-
pattern: /protected_resource
22+
path: /protected_resource
2323
defaults: { _controller: FormLoginBundle:Login:afterLogin }
2424

2525
highly_protected_resource:
26-
pattern: /highly_protected_resource
26+
path: /highly_protected_resource
2727

2828
form_logout:
29-
pattern: /logout_path
29+
path: /logout_path
3030

3131
form_secure_action:
32-
pattern: /secure-but-not-covered-by-access-control
32+
path: /secure-but-not-covered-by-access-control
3333
defaults: { _controller: FormLoginBundle:Login:secure }

0 commit comments

Comments
 (0)