From fe3dd94e75b26cbd22667a368e050821991fcf73 Mon Sep 17 00:00:00 2001
From: "Buster \"Silver Eagle\" Neece" <buster@busterneece.com>
Date: Sun, 12 Dec 2021 09:18:07 -0600
Subject: [PATCH] PhpStan fixes.

---
 phpstan.neon                                       | 3 +++
 src/Console/Command/GenerateApiDocsCommand.php     | 7 +++----
 src/Controller/Api/OpenApiAction.php               | 4 ++--
 src/Controller/Api/Stations/ServicesController.php | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/phpstan.neon b/phpstan.neon
index 4eb9b357c..583608043 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -16,6 +16,9 @@ parameters:
     bootstrapFiles:
         - ./util/phpstan.php
 
+    scanDirectories:
+       - ./vendor/zircote/swagger-php/src/Annotations
+
     universalObjectCratesClasses:
         - App\Session\NamespaceInterface
         - App\View
diff --git a/src/Console/Command/GenerateApiDocsCommand.php b/src/Console/Command/GenerateApiDocsCommand.php
index 112420274..583452b9f 100644
--- a/src/Console/Command/GenerateApiDocsCommand.php
+++ b/src/Console/Command/GenerateApiDocsCommand.php
@@ -7,7 +7,6 @@ namespace App\Console\Command;
 use App\Console\Application;
 use App\Environment;
 use App\Version;
-use Monolog\Logger;
 use OpenApi\Annotations\OpenApi;
 use OpenApi\Generator;
 use OpenApi\Util;
@@ -27,7 +26,7 @@ class GenerateApiDocsCommand extends CommandAbstract
 
     public function __invoke(SymfonyStyle $io): int
     {
-        $yaml = $this->generate()->toYaml();
+        $yaml = $this->generate()?->toYaml();
         $yaml_path = $this->environment->getBaseDirectory() . '/web/static/api/openapi.yml';
 
         file_put_contents($yaml_path, $yaml);
@@ -39,7 +38,7 @@ class GenerateApiDocsCommand extends CommandAbstract
     public function generate(
         bool $useCurrentVersion = false,
         string $apiBaseUrl = 'https://demo.azuracast.com/api'
-    ): OpenApi {
+    ): ?OpenApi {
         define('AZURACAST_API_URL', $apiBaseUrl);
         define('AZURACAST_API_NAME', 'AzuraCast Public Demo Server');
         define(
@@ -61,7 +60,7 @@ class GenerateApiDocsCommand extends CommandAbstract
         );
 
         return Generator::scan($finder, [
-            'logger' => $this->logger
+            'logger' => $this->logger,
         ]);
     }
 }
diff --git a/src/Controller/Api/OpenApiAction.php b/src/Controller/Api/OpenApiAction.php
index ceef482ed..47c9b6ac1 100644
--- a/src/Controller/Api/OpenApiAction.php
+++ b/src/Controller/Api/OpenApiAction.php
@@ -22,9 +22,9 @@ class OpenApiAction
             (string)$request->getRouter()->fromHere(absolute: true)
         );
 
-        $yaml = $apiDocsCommand->generate(true, $apiBaseUrl)->toYaml();
+        $yaml = $apiDocsCommand->generate(true, $apiBaseUrl)?->toYaml();
 
-        $response->getBody()->write($yaml);
+        $response->getBody()->write($yaml ?? '');
         return $response->withHeader('Content-Type', 'text/x-yaml');
     }
 }
diff --git a/src/Controller/Api/Stations/ServicesController.php b/src/Controller/Api/Stations/ServicesController.php
index c6a2a0be3..8f6589c89 100644
--- a/src/Controller/Api/Stations/ServicesController.php
+++ b/src/Controller/Api/Stations/ServicesController.php
@@ -116,7 +116,7 @@ class ServicesController
     public function frontendAction(
         ServerRequest $request,
         Response $response,
-        $do = 'restart'
+        string $do = 'restart'
     ): ResponseInterface {
         $station = $request->getStation();
         $frontend = $request->getStationFrontend();
@@ -156,7 +156,7 @@ class ServicesController
         ServerRequest $request,
         Response $response,
         AutoDJ $autodj,
-        $do = 'restart'
+        string $do = 'restart'
     ): ResponseInterface {
         $station = $request->getStation();
         $backend = $request->getStationBackend();