phpstan fixes (partial level 3) (#1091)

src/Controllers/Metrics/MetricsEngine.php

@@ -60,7 +60,7 @@ class MetricsEngine implements EngineInterface
     }
 
     /**
-     * @return array[]
+     * @return string[]
      */
     protected function formatHistogram(array $row, string $name): array
     {

src/Controllers/Metrics/Stats.php

@@ -174,9 +174,6 @@ class Stats
             ->get();
     }
 
-    /**
-     * @param string|null $vehicle
-     */
     public function licenses(string $vehicle): int
     {
         $mapping = [

src/Exceptions/Handlers/Whoops.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Engelsystem\Exceptions\Handlers;
 
 use Engelsystem\Application;
-use Engelsystem\Container\Container;
 use Engelsystem\Helpers\Authenticator;
 use Engelsystem\Http\Request;
 use Throwable;
@@ -15,14 +14,11 @@ use Whoops\Run as WhoopsRunner;
 
 class Whoops extends Legacy implements HandlerInterface
 {
-    protected Application $app;
-
     /**
      * Whoops constructor.
      */
-    public function __construct(Container $app)
+    public function __construct(protected Application $app)
     {
-        $this->app = $app;
     }
 
     public function render(Request $request, Throwable $e): void

src/Helpers/BarChart.php

@@ -89,7 +89,7 @@ class BarChart
 
     /**
      * @param int $max Max Y value
-     * @return array<array{label: string, bottom: string}>
+     * @return array<int, array{label: string, bottom: string}>
      */
     private static function calculateYLabels(int $max): array
     {
@@ -98,7 +98,7 @@ class BarChart
 
         for ($y = 0; $y <= $max; $y += $step) {
             $yLabels[] = [
-                'label' => $y,
+                'label' => (string) $y,
                 'bottom' => $max === 0 ? '0%' : ($y / $max * 100) . '%',
             ];
         }
@@ -148,7 +148,7 @@ class BarChart
                 'count' => $step,
                 'sum' => $step * $count,
             ];
-            $current = $current->addDay(1);
+            $current = $current->addDay();
             $count++;
         }
 

src/Helpers/Schedule/CalculatesTime.php

@@ -12,7 +12,7 @@ trait CalculatesTime
         $duration = explode(':', $time);
 
         foreach (array_slice($duration, 0, 2) as $key => $times) {
-            $seconds += [60 * 60, 60][$key] * $times;
+            $seconds += [60 * 60, 60][$key] * (int) $times;
         }
 
         return $seconds;

src/Helpers/Schedule/Event.php

@@ -42,7 +42,7 @@ class Event
         protected array $persons = [],
         protected ?string $language = null,
         protected ?string $description = null,
-        protected string $recording = '',
+        protected ?string $recording = '',
         protected array $links = [],
         protected array $attachments = [],
         protected ?string $url = null,

tests/Unit/Controllers/OAuthControllerTest.php

@@ -116,7 +116,7 @@ class OAuthControllerTest extends TestCase
         );
         $this->setExpects($provider, 'getResourceOwner', [$accessToken], $resourceOwner, $this->atLeastOnce());
 
-        /** @var EventDispatcher|MockObject $event */
+        /** @var EventDispatcher|MockObject $dispatcher */
         $dispatcher = $this->createMock(EventDispatcher::class);
         $this->app->instance('events.dispatcher', $dispatcher);
         $this->setExpects($dispatcher, 'dispatch', ['oauth2.login'], $dispatcher, 4);

tests/Unit/Controllers/SettingsControllerTest.php

@@ -375,8 +375,6 @@ class SettingsControllerTest extends ControllerTest
     /**
      * @covers \Engelsystem\Controllers\SettingsController::savePassword
      * @dataProvider savePasswordValidationProvider
-     * @param string $new_password
-     * @param string $new_password2
      */
     public function testSavePasswordValidation(
         ?string $password,

tests/Unit/Controllers/Stub/ControllerImplementation.php

@@ -8,7 +8,7 @@ use Engelsystem\Controllers\BaseController;
 
 class ControllerImplementation extends BaseController
 {
-    /** @var array */
+    /** @var string[]|string[][] */
     protected array $permissions = [
         'foo',
         'lorem' => [

tests/Unit/Helpers/ShiftsTest.php

@@ -32,7 +32,7 @@ class ShiftsTest extends TestCase
     }
 
     /**
-     * @return array[][]
+     * @return array{0: Carbon, 1: Carbon, 2: boolean}[]
      */
     public function nightShiftData(): array
     {

tests/Unit/Models/Stub/BaseModelImplementation.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Engelsystem\Test\Unit\Models\Stub;
-
-use Engelsystem\Models\BaseModel;
-use Illuminate\Database\Eloquent\Builder as QueryBuilder;
-
-/**
- * @property string foo
- */
-class BaseModelImplementation extends BaseModel
-{
-    /** @var array<string> */
-    protected $fillable = ['foo']; // phpcs:ignore
-
-    public int $saveCount = 0;
-
-    public static ?QueryBuilder $queryBuilder = null;
-
-    public function save(array $options = []): bool
-    {
-        $this->saveCount++;
-        return true;
-    }
-
-    public static function query(): QueryBuilder
-    {
-        return self::$queryBuilder;
-    }
-}

tests/Unit/Renderer/TwigServiceProviderTest.php

@@ -111,7 +111,7 @@ class TwigServiceProviderTest extends ServiceProviderTest
      */
     public function testRegisterTwigEngine(): void
     {
-        /** @var TwigEngine|MockObject $htmlEngine */
+        /** @var TwigEngine|MockObject $twigEngine */
         $twigEngine = $this->createMock(TwigEngine::class);
         /** @var TwigLoader|MockObject $twigLoader */
         $twigLoader = $this->createMock(TwigLoader::class);