Merge pull request #243 from Art4/phpstan

Add PHPStan and fix 61 errors

.gitignore

@@ -55,4 +55,7 @@ yarn-error.log
 docker.conf
 
 /documentation_jitsi_admin/node_modules/
-/secretStorage/.Halite*
+/secretStorage/.Halite*
+###> phpstan/phpstan ###
+phpstan.neon
+###< phpstan/phpstan ###

composer.json

@@ -60,6 +60,7 @@
     "vich/uploader-bundle": "^1.13"
   },
   "require-dev": {
+    "phpstan/phpstan": "^1.10",
     "phpunit/phpunit": "^9.5",
     "symfony/browser-kit": "6.2.*",
     "symfony/css-selector": "6.2.*",
@@ -102,6 +103,7 @@
       "cache:clear": "symfony-cmd",
       "assets:install %PUBLIC_DIR%": "symfony-cmd"
     },
+    "phpstan": "php vendor/bin/phpstan analyze -c phpstan.dist.neon",
     "post-install-cmd": [
       "@auto-scripts"
     ],

config/services.yaml

@@ -36,6 +36,11 @@ services:
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
 
+    App\Service\CronService:
+        arguments:
+            $cronIPAdress: '%cronIPAdress%'
+            $cronToken: '%cronToken%'
+
     app.menu.service:
         class: App\Service\MenuService
         arguments: [ "@knp_menu.factory" ]

phpstan.dist.neon

@@ -0,0 +1,8 @@
+parameters:
+    level: 0
+    paths:
+        - bin/
+        - config/
+        - public/
+        - src/
+        - tests/

src/Controller/FormsController.php

@@ -202,7 +202,7 @@ public function editFormulare(
                 $this->em->persist($newForms);
                 $this->em->persist($forms);
                 $this->em->flush();
-                $this->addSuccess($this->translator->trans(id: 'save.successful', domain: 'general'));
+                $this->addSuccessMessage($this->translator->trans(id: 'save.successful', domain: 'general'));
 
                 return $this->redirectToRoute(
                     'forms_edit',

src/Controller/KursController.php

@@ -90,7 +90,7 @@ public function editKurs(
         $team = $currentTeamService->getCurrentTeam($user);
         $kurs = $academyLessonRepository->find($request->get('id'));
 
-        if ($securityService->teamArrayDataCheck($kurs, $team) === false) {
+        if ($securityService->teamArrayDataCheck($kurs, $team, $user) === false) {
             return $this->redirectToRoute('akademie_admin');
         }
 
@@ -136,7 +136,7 @@ public function kursAnmelden(
         $team = $currentTeamService->getCurrentTeam($user);
         $kurs = $academyLessonRepository->find($request->get('id'));
 
-        if ($securityService->teamArrayDataCheck($kurs, $team) === false) {
+        if ($securityService->teamArrayDataCheck($kurs, $team, $user) === false) {
             return $this->redirectToRoute('akademie_admin');
         }
 
@@ -171,7 +171,7 @@ public function kursDeaktivieren(
         $team = $currentTeamService->getCurrentTeam($user);
         $kurs = $academyLessonRepository->find($request->get('id'));
 
-        if (!$securityService->teamArrayDataCheck($kurs, $team)) {
+        if (!$securityService->teamArrayDataCheck($kurs, $team, $user)) {
             return $this->redirectToRoute('akademie_admin');
         }
 

src/Controller/LoginController.php

@@ -5,6 +5,7 @@
 
 use KnpU\OAuth2ClientBundle\Client\ClientRegistry;
 use KnpU\OAuth2ClientBundle\Client\Provider\Auth0Client;
+use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use Stevenmaguire\OAuth2\Client\Provider\Keycloak;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

src/Controller/SoftwareController.php

@@ -192,7 +192,7 @@ public function deleteConfig(
         if ($securityService->teamDataCheck($config->getSoftware(), $team) && $securityService->adminCheck($user, $team)) {
             $this->em->remove($config);
             $this->em->flush();
-            $this->addSuccess($this->translator->trans(id: 'config.delete', domain: 'software'));
+            $this->addSuccessMessage($this->translator->trans(id: 'config.delete', domain: 'software'));
             return $this->redirectToRoute(
                 'software_edit',
                 [

src/Controller/TeamController.php

@@ -123,6 +123,7 @@ public function create(
         Request                $request,
         SecurityService        $securityService,
         TeamRepository         $teamRepository,
+        CurrentTeamService     $currentTeamService,
     ): Response
     {
         $user = $this->getUser();
@@ -157,7 +158,7 @@ public function create(
                 $this->addSuccessMessage($this->translator->trans(id: 'team.created', domain: 'team'));
 
                 if ($_ENV['APP_DEMO']) {
-                    $teamService->switchToTeam((string) $nTeam->getId());
+                    $currentTeamService->switchToTeam((string) $nTeam->getId());
                     return $this->redirectToRoute('dashboard');
                 }
 

src/Entity/Preset.php

@@ -12,6 +12,8 @@ abstract class Preset
     #[ORM\Column(type: 'boolean')]
     protected $inherited = false;
 
+    protected $ignoredInTeams;
+
     public function isInherited(): bool
     {
         return $this->inherited;

src/Entity/VVT.php

@@ -524,13 +524,16 @@ public function getActivDsfa()
     /**
      * @return Collection|VVTDsfa[]
      */
+    // TODO: Move method into App\Repository\VVTRepository
+    /*
     public function getLatestDsfa()
     {
         return $this->createQueryBuilder('d')
             ->orderBy('d.createdAt', 'DESC')
             ->getQuery()
             ->getResult();
     }
+    */
 
     public function getUser(): ?User
     {

src/Repository/FileRepository.php

@@ -2,9 +2,9 @@
 
 namespace App\Repository;
 
-use App\Entity\File;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
+use Symfony\Component\HttpFoundation\File\File;
 
 /**
  * @method File|null find($id, $lockMode = null, $lockVersion = null)

src/Repository/VVTDatenkategorieRepository.php

@@ -12,7 +12,6 @@
 use App\Entity\VVTDatenkategorie;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
-use function Doctrine\ORM\QueryBuilder;
 
 /**
  * @method VVTDatenkategorie|null find($id, $lockMode = null, $lockVersion = null)

src/Security/KeycloakAuthenticator.php

@@ -123,13 +123,16 @@ private function getTeamsFromKeycloakGroups(ResourceOwnerInterface $keycloakUser
 
     private function getEmailForKeycloakUser(ResourceOwnerInterface $keycloakUser): string {
         try {
+            // FIXME: ResourceOwnerInterface cannot have method getEmail()
             return $keycloakUser->getEmail();
         } catch (\Exception $e) {
             try {
                 return $keycloakUser->toArray()['preferred_username'];
             } catch (\Exception $e) {
             }
         }
+
+        return '';
     }
 
     private function getRolesForKeycloakUser(ResourceOwnerInterface $keycloakUser): array

src/Service/AkademieService.php

@@ -18,7 +18,7 @@
 
 class AkademieService
 {
-
+    private EntityManagerInterface $em;
     private CurrentTeamService $currentTeamService;
     private NotificationService $notificationService;
     private Environment $twig;

src/Service/AssignService.php

@@ -29,7 +29,7 @@
 
 class AssignService
 {
-
+    private EntityManagerInterface $em;
     private FormFactoryInterface $formBuilder;
     private NotificationService $notificationService;
     private Environment $twig;

src/Service/CronService.php

@@ -26,6 +26,8 @@ public function __construct(
         private TranslatorInterface    $translator,
         private NotificationService    $notificationService,
         private Environment            $environment,
+        private string                 $cronIPAdress,
+        private string                 $cronToken,
     )
     {
     }
@@ -34,7 +36,7 @@ function check($request)
     {
         $message = false;
 
-        if ($request->get('token') !== $this->getParameter('cronToken')) {
+        if ($request->get('token') !== $this->cronToken) {
             $message =
                 [
                     'error' => true,
@@ -45,7 +47,7 @@ function check($request)
             $this->logger->error($message['hinweis'], $message);
         }
 
-        if ($this->getParameter('cronIPAdress') !== $request->getClientIp()) {
+        if ($this->cronIPAdress !== $request->getClientIp()) {
             $message = [
                 'error' => true,
                 'hinweis' => $this->translator->trans(id: 'cron.ip.unauthorized', domain: 'service'),
@@ -71,7 +73,7 @@ public function sendEmailsForAcademy()
             if (!$buchung->getInvitation()) {
                 $content = $this->environment->render('email/neuerKurs.html.twig', ['buchung' => $buchung, 'team' => $buchung->getUser()->getTeams()->get(0)]);
                 $buchung->setInvitation(true);
-                $em->persist($buchung);
+                $this->em->persist($buchung);
                 ++$countNeu;
             } else {
                 $content = $this->environment->render('email/errinnerungKurs.html.twig', ['buchung' => $buchung, 'team' => $buchung->getUser()->getTeams()->get(0)]);

src/Service/SecurityService.php

@@ -84,7 +84,7 @@ public function superAdminCheck(User $user): bool
         return false;
     }
 
-    public function teamArrayDataCheck($data, $team): bool
+    public function teamArrayDataCheck($data, $team, $user): bool
     {
         if (!$this->teamCheck($team)) {
             return false;
@@ -96,7 +96,7 @@ public function teamArrayDataCheck($data, $team): bool
                 'typ' => 'LOGIN',
                 'error' => true,
                 'hinweis' => $this->translator->trans(id: 'error.userNotFoundInArray', domain: 'general'),
-                'user' => $this->getUser()->getUsername()];
+                'user' => $user->getUsername()];
             $this->logger->error($message['typ'], $message);
             return false;
         }

src/Service/TeamService.php

@@ -10,6 +10,7 @@
 
 
 use App\Entity\AuditTomZiele;
+use App\Entity\DatenweitergabeGrundlagen;
 use App\Entity\DatenweitergabeStand;
 use App\Entity\Produkte;
 use App\Entity\Team;
@@ -27,7 +28,6 @@
 use App\Repository\VVTRisikenRepository;
 use App\Repository\VVTStatusRepository;
 use Doctrine\ORM\EntityManagerInterface;
-use Proxies\__CG__\App\Entity\DatenweitergabeGrundlagen;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 

src/Service/VVTDatenkategorieService.php

@@ -88,6 +88,7 @@ function findLatestKategorie(VVTDatenkategorie $VVTDatenkategorie): ?VVTDatenkat
             $act = $next;
         }
 
+        return null;
     }
 
     function newVVTDatenkategorie(Team $team, User $user)

symfony.lock

@@ -219,6 +219,18 @@
     "phpstan/phpdoc-parser": {
         "version": "1.2.0"
     },
+    "phpstan/phpstan": {
+        "version": "1.10",
+        "recipe": {
+            "repo": "github.com/symfony/recipes-contrib",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "5e490cc197fb6bb1ae22e5abbc531ddc633b6767"
+        },
+        "files": [
+            "phpstan.dist.neon"
+        ]
+    },
     "phpunit/php-code-coverage": {
         "version": "9.2.10"
     },