update to Symfony 4.4 (#1275)

src/API/BaseApiController.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace App\API;
 
-use App\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 
@@ -19,12 +18,4 @@ abstract class BaseApiController extends AbstractController
 {
     public const DATE_FORMAT = DateTimeType::HTML5_FORMAT;
     public const DATE_FORMAT_PHP = 'Y-m-d\TH:m:s';
-
-    /**
-     * @return User|null
-     */
-    protected function getUser()
-    {
-        return parent::getUser();
-    }
 }

src/API/CustomerController.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace App\API;
 
 use App\Entity\Customer;
+use App\Entity\User;
 use App\Event\CustomerMetaDefinitionEvent;
 use App\Form\API\CustomerApiEditForm;
 use App\Repository\CustomerRepository;
@@ -78,8 +79,11 @@ class CustomerController extends BaseApiController
      */
     public function cgetAction(ParamFetcherInterface $paramFetcher): Response
     {
+        /** @var User $user */
+        $user = $this->getUser();
+
         $query = new CustomerQuery();
-        $query->setCurrentUser($this->getUser());
+        $query->setCurrentUser($user);
 
         if (null !== ($order = $paramFetcher->get('order'))) {
             $query->setOrder($order);

src/API/ProjectController.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace App\API;
 
 use App\Entity\Project;
+use App\Entity\User;
 use App\Event\ProjectMetaDefinitionEvent;
 use App\Form\API\ProjectApiEditForm;
 use App\Repository\ProjectRepository;
@@ -89,8 +90,11 @@ class ProjectController extends BaseApiController
      */
     public function cgetAction(ParamFetcherInterface $paramFetcher): Response
     {
+        /** @var User $user */
+        $user = $this->getUser();
+
         $query = new ProjectQuery();
-        $query->setCurrentUser($this->getUser());
+        $query->setCurrentUser($user);
 
         if (null !== ($order = $paramFetcher->get('order'))) {
             $query->setOrder($order);

src/API/TeamController.php

@@ -170,8 +170,11 @@ final class TeamController extends BaseApiController
      */
     public function postAction(Request $request): Response
     {
+        /** @var User $user */
+        $user = $this->getUser();
+
         $team = new Team();
-        $team->setTeamLead($this->getUser());
+        $team->setTeamLead($user);
 
         $form = $this->createForm(TeamApiEditForm::class, $team);
 

src/API/TimesheetController.php

@@ -302,7 +302,10 @@ class TimesheetController extends BaseApiController
      */
     public function postAction(Request $request): Response
     {
-        $timesheet = $this->service->createNewTimesheet($this->getUser(), $request);
+        /** @var User $user */
+        $user = $this->getUser();
+
+        $timesheet = $this->service->createNewTimesheet($user, $request);
 
         $mode = $this->getTrackingMode();
 
@@ -520,7 +523,10 @@ class TimesheetController extends BaseApiController
      */
     public function activeAction(): Response
     {
-        $data = $this->repository->getActiveEntries($this->getUser());
+        /** @var User $user */
+        $user = $this->getUser();
+
+        $data = $this->repository->getActiveEntries($user);
 
         $view = new View($data, 200);
         $view->getContext()->setGroups(['Default', 'Subresource', 'Timesheet']);
@@ -600,7 +606,10 @@ class TimesheetController extends BaseApiController
             throw new AccessDeniedHttpException('You are not allowed to re-start this timesheet');
         }
 
-        $copyTimesheet = $this->service->createNewTimesheet($this->getUser());
+        /** @var User $user */
+        $user = $this->getUser();
+
+        $copyTimesheet = $this->service->createNewTimesheet($user);
 
         $copyTimesheet
             ->setBegin($this->dateTime->createDateTime())