Increase to Psalm level 5

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

Diff for: app/Contracts/WineHandler.php

@@ -21,12 +21,12 @@
 namespace App\Contracts;
 
 use App\Exceptions\InvalidCompetitionStateException;
+use App\Exceptions\ValidationException;
 use App\MasterData\Competition;
 use App\MasterData\User;
 use App\Wine;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Pagination\Paginator;
-use Illuminate\Validation\ValidationException;
 
 interface WineHandler
 {
@@ -66,6 +66,10 @@ public function importKdb(UploadedFile $file, Competition $competition);
     public function importExcluded(UploadedFile $file, Competition $competition);
 
     /**
+     * @param Wine $wine
+     * @param array $data
+     * @throws ValidationException
+     */
     public function updateSosi(Wine $wine, array $data);
 
     /**

Diff for: app/Http/Controllers/CatalogueController.php

@@ -22,6 +22,7 @@
 
 use App\Contracts\WineHandler;
 use App\MasterData\Competition;
+use App\MasterData\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Response;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -87,6 +88,7 @@ public function tastingCatalogue(Competition $competition, WineHandler $wineHand
     {
         $this->authorize('create-tasting-catalogue', $competition);
 
+        /** @var User $user */
         $user = Auth::user();
         if ($user->isAdmin()) {
             $wines = $competition

Diff for: app/Http/Controllers/CompetitionController.php

@@ -26,6 +26,7 @@
 use App\MasterData\Association;
 use App\MasterData\Competition;
 use App\MasterData\CompetitionState;
+use App\MasterData\User;
 use App\Tasting\TastingStage;
 use App\WinesChosenSignedOff;
 use function array_map;
@@ -255,6 +256,7 @@ public function showSignChosen(Competition $competition)
     {
         $this->authorize('sign-chosen', $competition);
 
+        /** @var User $user */
         $user = Auth::user();
         if ($user->isAdmin()) {
             $associations = Association::all();

Diff for: app/Http/Controllers/WineController.php

@@ -27,6 +27,7 @@
 use App\MasterData\Applicant;
 use App\MasterData\Competition;
 use App\MasterData\CompetitionState;
+use App\MasterData\User;
 use App\MasterData\WineSort;
 use App\Wine;
 use App\Wine\EnrollmentForm;
@@ -236,6 +237,7 @@ public function store(Competition $competition, Request $request): RedirectRespo
                 unset($data['winequality_id']);
             }
 
+            /** @var User $user */
             $user = Auth::user();
             if (! $competition->administrates($user)) {
                 //TODO: move to validation
@@ -335,6 +337,7 @@ public function update(Wine $wine, Request $request): RedirectResponse
                 $data['winequality_id'] = null;
             }
 
+            /** @var User $user */
             $user = Auth::user();
             if (! $wine->competition->administrates($user)) {
                 // TODO: move to validation
@@ -364,13 +367,15 @@ public function update(Wine $wine, Request $request): RedirectResponse
      * Show confirmation dialog for deleting the wine.
      *
      * @param Wine $wine
-     * @return Resp
+     * @return View
      */
     public function delete(Wine $wine)
     {
         $this->authorize('delete-wine', $wine);
 
-        return $this->viewFactory->make('competition/wines/delete')->withWine($wine);
+        return $this->viewFactory
+            ->make('competition/wines/delete')
+            ->with('wine', $wine);
     }
 
     /**

Diff for: app/MasterData/CompetitionState.php

@@ -87,6 +87,7 @@ public function getDescription()
             default:
                 Log::error('unknown competition state '.$this->description);
                 App::abort(500);
+                return 'IMPOSSIBLE';
         }
     }
 }

Diff for: app/MasterData/User.php

@@ -239,15 +239,15 @@ public function getEmailForPasswordReset()
             // User is assoc admin -> only check assocs
             $first = $this->associations()->whereNotNull('email')->first();
             if (is_null($first)) {
-                return null;
+                throw new \Exception("No email set for association");
             }
 
             return $first->email;
         } else {
             // User might be applicant admin -> check those
             $first = $this->applicants()->whereNotNull('email')->first();
             if (is_null($first)) {
-                return null;
+                throw new \Exception("No email set for applicant");
             }
 
             return $first->email;

Diff for: app/Validation/FileValidator.php

@@ -87,7 +87,7 @@ public function validate()
         ];
         $validator = BaseValidator::make($data, $rules, $this->getErrorMessages(), $names);
         if ($validator->fails()) {
-            throw new ValidationException($validator->messages());
+            throw new ValidationException($validator->errors());
         }
     }
 }

Diff for: app/Wine/Handler.php

@@ -73,7 +73,9 @@ public function create(array $data, Competition $competition)
 
         $validator = new WineValidator($data);
         $validator->setCompetition($competition);
-        $validator->setUser(Auth::user());
+        /** @var User $user */
+        $user = Auth::user();
+        $validator->setUser($user);
         $validator->validateCreate();
         $wine = new Wine($data);
 
@@ -117,7 +119,9 @@ public function update(Wine $wine, array $data)
 
         $validator = $this->validatorFactory->newWineValidator($wine, $data);
         $validator->setCompetition($wine->competition);
-        $validator->setUser(Auth::user());
+        /** @var User $user */
+        $user = Auth::user();
+        $validator->setUser($user);
         $validator->validateUpdate();
 
         if (isset($data['kdb']) && $wine->kdb !== $data['kdb'] && $competitionState->id !== CompetitionState::STATE_KDB) {
@@ -142,10 +146,10 @@ public function update(Wine $wine, array $data)
         ]);
         if ($wine->isDirty($enrollmentAttributes)) {
             // These attributes may only be changed via enrollment while 'nr' is not set or by an admin
-            if ($competitionState->id !== CompetitionState::STATE_ENROLLMENT && ! Auth::user()->isAdmin()) {
+            if ($competitionState->id !== CompetitionState::STATE_ENROLLMENT && ! $user->isAdmin()) {
                 throw new WineLockedException();
             }
-            if ($competitionState->id === CompetitionState::STATE_ENROLLMENT && ! is_null($wine->nr) && ! Auth::user()->isAdmin()) {
+            if ($competitionState->id === CompetitionState::STATE_ENROLLMENT && ! is_null($wine->nr) && ! $user->isAdmin()) {
                 throw new WineLockedException();
             }
         }
@@ -186,7 +190,7 @@ public function updateKdb(Wine $wine, array $data)
     {
         $validator = Validator::make($data, ['value' => 'required|boolean']);
         if ($validator->fails()) {
-            throw new ValidationException($validator->messages());
+            throw new ValidationException($validator->errors());
         }
 
         $this->wineRepository->update($wine, [
@@ -314,7 +318,7 @@ public function updateSosi(Wine $wine, array $data)
     {
         $validator = \Validator::make($data, ['value' => 'required|boolean']);
         if ($validator->fails()) {
-            throw new ValidationException($validator->messages());
+            throw new ValidationException($validator->errors());
         }
 
         $this->wineRepository->update($wine, [

Diff for: psalm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="6"
+    errorLevel="5"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"