jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Symfony update 4.1.4 (#290)

Browse Source
This commit is contained in:
Kevin Papst
2018-09-01 14:23:38 +02:00
committed by GitHub
parent 62f91f4d38
commit 55b7e192aa
29 changed files with 307 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Controller/ProfileController.php
View File

@@ -18,17 +18,16 @@ use App\Form\UserPreferencesForm;
use App\Form\UserRolesType;
use App\Repository\TimesheetRepository;
use App\Voter\UserVoter;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\Form\Form;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
/**
* User profile controller
*
* @Route("/profile")
* @Route(path="/profile")
* @Security("is_granted('ROLE_USER')")
*/
class ProfileController extends AbstractController
@@ -47,8 +46,7 @@ class ProfileController extends AbstractController
}
/**
* @Route("/{username}", name="user_profile")
* @Method("GET")
* @Route(path="/{username}", name="user_profile", methods={"GET"})
* @Security("is_granted('view', profile)")
*/
public function indexAction(User $profile)
@@ -57,8 +55,7 @@ class ProfileController extends AbstractController
}
/**
* @Route("/{username}/edit", name="user_profile_edit")
* @Method({"GET", "POST"})
* @Route(path="/{username}/edit", name="user_profile_edit", methods={"GET", "POST"})
* @Security("is_granted('edit', profile)")
*/
public function editAction(User $profile, Request $request)
@@ -80,8 +77,7 @@ class ProfileController extends AbstractController
}
/**
* @Route("/{username}/password", name="user_profile_password")
* @Method({"GET", "POST"})
* @Route(path="/{username}/password", name="user_profile_password", methods={"GET", "POST"})
* @Security("is_granted('password', profile)")
*/
public function passwordAction(User $profile, Request $request)
@@ -106,8 +102,7 @@ class ProfileController extends AbstractController
}
/**
* @Route("/{username}/api-token", name="user_profile_api_token")
* @Method({"GET", "POST"})
* @Route(path="/{username}/api-token", name="user_profile_api_token", methods={"GET", "POST"})
* @Security("is_granted('api-token', profile)")
*/
public function apiTokenAction(User $profile, Request $request)
@@ -132,8 +127,7 @@ class ProfileController extends AbstractController
}
/**
* @Route("/{username}/roles", name="user_profile_roles")
* @Method({"GET", "POST"})
* @Route(path="/{username}/roles", name="user_profile_roles", methods={"GET", "POST"})
* @Security("is_granted('roles', profile)")
*/
public function rolesAction(User $profile, Request $request)
@@ -155,8 +149,7 @@ class ProfileController extends AbstractController
}
/**
* @Route("/{username}/prefs", name="user_profile_preferences")
* @Method({"GET", "POST"})
* @Route(path="/{username}/prefs", name="user_profile_preferences", methods={"GET", "POST"})
* @Security("is_granted('preferences', profile)")
*/
public function savePreferencesAction(User $profile, Request $request)