Reorder fields

Cleanup

diff --git a/Resources/config/routes/rapsys_user.yaml b/Resources/config/routes/rapsys_user.yaml
index e2af83c8747bf5348300bc0890e62990422296bd..b67c83feaa1e9c7543852dfc2f8c963a0b3a7be1 100644 (file)
--- a/Resources/config/routes/rapsys_user.yaml
+++ b/Resources/config/routes/rapsys_user.yaml
@@ -2,19 +2,19 @@ rapsys_user_confirm:
     path: /confirm/{hash}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::registerMail
     requirements:
     path: /confirm/{hash}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::registerMail
     requirements:

-        mail: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'

+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
 rapsys_user_login:
     path: /login/{hash}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::login
     defaults:
     methods: GET|POST
 
 rapsys_user_login:
     path: /login/{hash}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::login
     defaults:

-        mail: ~

         hash: ~
         hash: ~

+        mail: ~

     requirements:
     requirements:

-        mail: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'

+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
 rapsys_user_logout:
     methods: GET|POST
 
 rapsys_user_logout:


@@ -25,34 +25,34 @@ rapsys_user_recover:
     path: /recover/{hash}/{pass}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::recover
     defaults:
     path: /recover/{hash}/{pass}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::recover
     defaults:

-        mail: ~
-        pass: ~

         hash: ~
         hash: ~

+        pass: ~
+        mail: ~

     requirements:
     requirements:

-        mail: '[a-zA-Z0-9=_-]+'
-        pass: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'

+        pass: '[a-zA-Z0-9=_-]+'
+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
 rapsys_user_register:
     path: /register/{hash}/{field}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::register
     defaults:
     methods: GET|POST
 
 rapsys_user_register:
     path: /register/{hash}/{field}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::register
     defaults:

-        mail: ~
-        field: ~

         hash: ~
         hash: ~

+        field: ~
+        mail: ~

     requirements:
     requirements:

-        mail: '[a-zA-Z0-9=_-]+'
-        field: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'

+        field: '[a-zA-Z0-9=_-]+'
+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
 rapsys_user_edit:
     path: /user/{hash}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::edit
     requirements:
     methods: GET|POST
 
 rapsys_user_edit:
     path: /user/{hash}/{mail}
     controller: Rapsys\UserBundle\Controller\DefaultController::edit
     requirements:

-        mail: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'

+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
 rapsys_user_index:
     methods: GET|POST
 
 rapsys_user_index: