Phpstan level 2

composer.json

@@ -61,6 +61,7 @@
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan-doctrine": "^1.3",
     "phpunit/phpunit": "^9.5",
     "symfony/browser-kit": "6.2.*",
     "symfony/css-selector": "6.2.*",

phpstan.dist.neon

@@ -1,8 +1,10 @@
 parameters:
-    level: 1
+    level: 2
     paths:
         - bin/
         - config/
         - public/
         - src/
         - tests/
+includes:
+    - vendor/phpstan/phpstan-doctrine/extension.neon

src/Command/ConnectDefaultToTeamsCommand.php

@@ -5,11 +5,13 @@
 use App\Entity\Team;
 use App\Service\ConnectDefaultToTeamsService;
 use Doctrine\ORM\EntityManagerInterface;
+use LogicException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
@@ -36,6 +38,10 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
+        if (!$output instanceof ConsoleOutputInterface) {
+            throw new LogicException('This command accepts only an instance of "ConsoleOutputInterface".');
+        }
+
         $io = new SymfonyStyle($input, $output);
         $teams = $this->em->getRepository(Team::class)->findAll();
         $io->success(sprintf('We will connect %d Teams', sizeof($teams)));

src/Command/TeamNewCommand.php

@@ -6,6 +6,7 @@
 use App\Service\ConnectDefaultToTeamsService;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -36,6 +37,7 @@ public function __construct(EntityManagerInterface $entityManager, ConnectDefaul
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
+        /** @var QuestionHelper $helper */
         $helper = $this->getHelper('question');
         $team = new Team();
         $question = new Question('Team name (identical to keycloak group name if keycloak groups are used): ', 'TestCompany');

src/Controller/AkademieController.php

@@ -2,9 +2,8 @@
 
 namespace App\Controller;
 
-use App\DataTypes\ParticipationStateTypes;
 use App\Entity\AkademieBuchungen;
-use App\Entity\Participation;
+use App\Entity\User;
 use App\Repository\AkademieBuchungenRepository;
 use App\Service\SecurityService;
 use DateTime;
@@ -19,8 +18,6 @@
 #[Route(path: '/akademie', name: 'akademie')]
 class AkademieController extends BaseController
 {
-
-
     public function __construct(
         private readonly TranslatorInterface $translator,
         private EntityManagerInterface       $em,
@@ -35,11 +32,13 @@ public function academyLesson(
         AkademieBuchungenRepository $academyBillingRepository,
     ): Response
     {
-        $team = $this->getUser()->getAkademieUser();
+        /** @var User $user */
+        $user = $this->getUser();
+        $team = $user->getAkademieUser();
         $today = new DateTime();
         $buchung = $academyBillingRepository->find($request->get('kurs'));
 
-        if (!$securityService->teamCheck($team) || $buchung->getUser() !== $this->getUser()) {
+        if (!$securityService->teamCheck($team) || $buchung->getUser() !== $user) {
             return $this->redirectToRoute('akademie');
         }
 
@@ -68,7 +67,10 @@ public function academyLessonCertificate(
         DompdfWrapper     $wrapper,
     ): Response
     {
-        if ($billing->getUser() !== $this->getUser()) {
+        /** @var User $user */
+        $user = $this->getUser();
+
+        if ($billing->getUser() !== $user) {
             return $this->redirectToRoute('akademie');
         }
 
@@ -77,8 +79,8 @@ public function academyLessonCertificate(
             // Retrieve the HTML generated in our twig file
             $html = $this->renderView('bericht/zertifikatAkademie.html.twig', [
                 'daten' => $billing,
-                'team' => $this->getUser()->getAkademieUser(),
-                'user' => $this->getUser(),
+                'team' => $user->getAkademieUser(),
+                'user' => $user,
             ]);
 
             //Generate PDF File for Download
@@ -98,12 +100,15 @@ public function academyLessonFinish(
         AkademieBuchungenRepository $academyBillingRepository,
     ): Response
     {
-        $team = $this->getUser()->getAkademieUser();
+        /** @var User $user */
+        $user = $this->getUser();
+
+        $team = $user->getAkademieUser();
 
         $today = new DateTime();
         $buchung = $academyBillingRepository->findOneBy(['finishedID' => $request->get('id')]);
 
-        if (!$securityService->teamCheck($team) || $buchung->getUser() !== $this->getUser()) {
+        if (!$securityService->teamCheck($team) || $buchung->getUser() !== $user) {
             return $this->redirectToRoute('akademie');
         }
 
@@ -134,13 +139,16 @@ public function index(
         AkademieBuchungenRepository $bookingRepository
     ): Response
     {
-        $team = $this->getUser()->getAkademieUser();
+        /** @var User $user */
+        $user = $this->getUser();
+
+        $team = $user->getAkademieUser();
 
         if (!$securityService->teamCheck($team)) {
             return $this->redirectToRoute('dashboard');
         }
 
-        $bookings = $bookingRepository->findMyBuchungenByUser($this->getUser());
+        $bookings = $bookingRepository->findMyBuchungenByUser($user);
         return $this->render('akademie/index.html.twig', [
             'buchungen' => $bookings,
             'currentTeam' => $team,

src/Controller/BerichtController.php

@@ -14,6 +14,7 @@
 
 namespace App\Controller;
 
+use App\Entity\User;
 use App\Form\Type\ReportExportType;
 use App\Repository\AkademieBuchungenRepository;
 use App\Repository\AuditTomRepository;
@@ -148,6 +149,7 @@ public function reportAcademy(
         SecurityService             $securityService,
     ): Response
     {
+        /** @var User $user */
         $user = $this->getUser();
         $team = $user->getAkademieUser();
 
@@ -159,7 +161,7 @@ public function reportAcademy(
 
         return $this->render('bericht/akademie.html.twig', [
             'daten' => $daten,
-            'team' => $this->getUser()->getAkademieUser()
+            'team' => $user->getAkademieUser()
         ]);
     }
 
@@ -172,7 +174,6 @@ public function reportAudit(
         SecurityService    $securityService,
     )
     {
-
         $req = $request->get('id');
 
         $team = $currentTeamService->getCurrentTeam($this->getUser());
@@ -530,29 +531,31 @@ public function reportRequest(
         SecurityService         $securityService,
     )
     {
-
         $id = $request->get('id');
         $team = $currentTeamService->getCurrentTeam($this->getUser());
+        $clientRequests = [];
 
         if ($id) {
-            $clientRequest = $clientRequestRepository->findBy(['id'=>$id]);
-            $title = $this->translator->trans(id: 'report.about.clientRequestBy', domain: 'bericht') . ' ' . $clientRequest->getName();
+            $clientRequests = $clientRequestRepository->findBy(['id'=>$id]);
+
+            $requestName = (count($clientRequests) > 0) ? $clientRequests[0]->getName() : '';
+            $title = $this->translator->trans(id: 'report.about.clientRequestBy', domain: 'bericht') . ' ' . $requestName;
         } else {
-            $clientRequest = $clientRequestRepository->findBy(['team' => $team, 'activ' => true], ['createdAt' => 'DESC']);
+            $clientRequests = $clientRequestRepository->findBy(['team' => $team, 'activ' => true], ['createdAt' => 'DESC']);
             $title = $this->translator->trans(id: 'report.about.clientRequest', domain: 'bericht');
         }
 
-        if (count($clientRequest) < 1) {
+        if (count($clientRequests) === 0) {
             return $this->redirectNoReport();
         }
 
-        if (!$securityService->checkTeamAccessToData($team, $clientRequest[0])) {
+        if (!$securityService->checkTeamAccessToData($team, $clientRequests[0])) {
             return $this->redirectToRoute('dashboard');
         }
 
         // Retrieve the HTML generated in our twig file
         $html = $this->renderView('bericht/request.html.twig', [
-            'daten' => $clientRequest,
+            'daten' => $clientRequests,
             'titel' => $title,
             'team' => $team,
             'all' => $request->get('all'),

src/Controller/ClientRequestController.php

@@ -3,9 +3,9 @@
 namespace App\Controller;
 
 use App\Entity\Team;
+use App\Entity\User;
 use App\Form\Type\ClientRequesCommentType;
 use App\Form\Type\ClientRequestInternalNoteType;
-use App\Form\Type\ClientRequestInternalType;
 use App\Form\Type\ClientRequestType;
 use App\Form\Type\ClientRequestViewType;
 use App\Repository\ClientRequestRepository;
@@ -24,13 +24,10 @@
 
 class ClientRequestController extends BaseController
 {
-
-
     public function __construct(
         private readonly TranslatorInterface $translator,
         private EntityManagerInterface       $em,
-    )
-    {
+    ) {
     }
 
     #[Route(path: '/client-requests', name: 'client_requests')]
@@ -83,8 +80,10 @@ public function clientRequestComment(
         ClientRequestRepository $clientRequestRepository,
     ): Response
     {
+        /** @var User $user */
+        $user = $this->getUser();
         $clientRequest = $clientRequestRepository->find($request->get('clientRequest'));
-        $team = $currentTeamService->getCurrentTeam($this->getUser());
+        $team = $currentTeamService->getCurrentTeam($user);
         if ($securityService->teamDataCheck($clientRequest, $team) === false) {
             return $this->redirectToRoute('client_requests');
         }
@@ -93,7 +92,7 @@ public function clientRequestComment(
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $clientRequestService->newComment($clientRequest, $form->getData()['comment'], $team->getKeycloakGroup() . ' > ' . $this->getUser()->getUsername(), 1);
+            $clientRequestService->newComment($clientRequest, $form->getData()['comment'], $team->getKeycloakGroup() . ' > ' . $user->getUsername(), 1);
             $this->addSuccessMessage($this->translator->trans(id: 'save.comment', domain: 'general'));
         }
 
@@ -110,11 +109,13 @@ public function closeRequest(
     ): Response
     {
         $clientRequest = $clientRequestRepository->find($request->get('id'));
+
+        /** @var User $user */
         $user = $this->getUser();
         $team = $currentTeamService->getCurrentTeam($user);
 
         if ($securityService->teamDataCheck($clientRequest, $team) && $securityService->adminCheck($user, $team)) {
-            $clientRequestService->closeRequest($clientRequest, $this->getUser());
+            $clientRequestService->closeRequest($clientRequest, $user);
 
             return $this->redirectToRoute('client_requests_show', ['id' => $clientRequest->getId()]);
         }
@@ -133,6 +134,7 @@ public function editClientRequests(
         ClientRequestRepository $clientRequestRepository,
     )
     {
+        /** @var User $user */
         $user = $this->getUser();
         $team = $currentTeamService->getCurrentTeam($user);
         $clientRequest = $clientRequestRepository->find($request->get('id'));
@@ -161,7 +163,7 @@ public function editClientRequests(
                     $this->em->persist($clientRequest);
                     $this->em->flush();
 
-                    $clientRequestService->newComment($clientRequest, $content, $team->getKeycloakGroup() . ' > ' . $this->getUser()->getUsername(), 1);
+                    $clientRequestService->newComment($clientRequest, $content, $team->getKeycloakGroup() . ' > ' . $user->getUsername(), 1);
 
                     $this->addSuccessMessage($this->translator->trans(id: 'save.changeSuccessful', domain: 'general'));
                     return $this->redirectToRoute('client_requests_show', ['id' => $clientRequest->getId()]);