Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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.
  • Loading branch information...
commit a5cee8dff2da47db5a9b547f5793e44c13401b16 2 parents 5d769cf + a800e69
@fabpot fabpot authored
View
16 Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/config/routing.yml
@@ -1,30 +1,30 @@
form_login:
- pattern: /login
+ path: /login
defaults: { _controller: CsrfFormLoginBundle:Login:login }
form_login_check:
- pattern: /login_check
+ path: /login_check
defaults: { _controller: CsrfFormLoginBundle:Login:loginCheck }
form_login_homepage:
- pattern: /
+ path: /
defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
form_login_custom_target_path:
- pattern: /foo
+ path: /foo
defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
form_login_default_target_path:
- pattern: /profile
+ path: /profile
defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
form_login_redirect_to_protected_resource_after_login:
- pattern: /protected-resource
+ path: /protected-resource
defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
form_logout:
- pattern: /logout_path
+ path: /logout_path
form_secure_action:
- pattern: /secure-but-not-covered-by-access-control
+ path: /secure-but-not-covered-by-access-control
defaults: { _controller: CsrfFormLoginBundle:Login:secure }
View
12 Tests/Functional/Bundle/FormLoginBundle/Resources/config/localized_routing.yml
@@ -1,29 +1,29 @@
localized_login_path:
- pattern: /{_locale}/login
+ path: /{_locale}/login
defaults: { _controller: FormLoginBundle:Localized:login }
requirements: { _locale: "^[a-z]{2}$" }
localized_check_path:
- pattern: /{_locale}/login_check
+ path: /{_locale}/login_check
defaults: { _controller: FormLoginBundle:Localized:loginCheck }
requirements: { _locale: "^[a-z]{2}$" }
localized_default_target_path:
- pattern: /{_locale}/profile
+ path: /{_locale}/profile
defaults: { _controller: FormLoginBundle:Localized:profile }
requirements: { _locale: "^[a-z]{2}$" }
localized_logout_path:
- pattern: /{_locale}/logout
+ path: /{_locale}/logout
defaults: { _controller: FormLoginBundle:Localized:logout }
requirements: { _locale: "^[a-z]{2}$" }
localized_logout_target_path:
- pattern: /{_locale}/
+ path: /{_locale}/
defaults: { _controller: FormLoginBundle:Localized:homepage }
requirements: { _locale: "^[a-z]{2}$" }
localized_secure_path:
- pattern: /{_locale}/secure/
+ path: /{_locale}/secure/
defaults: { _controller: FormLoginBundle:Localized:secure }
requirements: { _locale: "^[a-z]{2}$" }
View
18 Tests/Functional/Bundle/FormLoginBundle/Resources/config/routing.yml
@@ -1,33 +1,33 @@
form_login:
- pattern: /login
+ path: /login
defaults: { _controller: FormLoginBundle:Login:login }
form_login_check:
- pattern: /login_check
+ path: /login_check
defaults: { _controller: FormLoginBundle:Login:loginCheck }
form_login_homepage:
- pattern: /
+ path: /
defaults: { _controller: FormLoginBundle:Login:afterLogin }
form_login_custom_target_path:
- pattern: /foo
+ path: /foo
defaults: { _controller: FormLoginBundle:Login:afterLogin }
form_login_default_target_path:
- pattern: /profile
+ path: /profile
defaults: { _controller: FormLoginBundle:Login:afterLogin }
form_login_redirect_to_protected_resource_after_login:
- pattern: /protected_resource
+ path: /protected_resource
defaults: { _controller: FormLoginBundle:Login:afterLogin }
highly_protected_resource:
- pattern: /highly_protected_resource
+ path: /highly_protected_resource
form_logout:
- pattern: /logout_path
+ path: /logout_path
form_secure_action:
- pattern: /secure-but-not-covered-by-access-control
+ path: /secure-but-not-covered-by-access-control
defaults: { _controller: FormLoginBundle:Login:secure }
Please sign in to comment.
Something went wrong with that request. Please try again.