diff --git a/src/AppFactory.php b/src/AppFactory.php index 793bc083a..585d2e23e 100644 --- a/src/AppFactory.php +++ b/src/AppFactory.php @@ -9,13 +9,13 @@ use App\Enums\SupportedLocales; use App\Http\Factory\ResponseFactory; use App\Http\Factory\ServerRequestFactory; use DI; -use Invoker\Invoker; use Monolog\ErrorHandler; use Monolog\Registry; use Psr\EventDispatcher\EventDispatcherInterface; use Psr\Log\LoggerInterface; use Slim\App; use Slim\Factory\ServerRequestCreatorFactory; +use Slim\Handlers\Strategies\RequestResponseNamedArgs; class AppFactory { @@ -54,7 +54,7 @@ class AppFactory $routeCollector = $app->getRouteCollector(); - $routeCollector->setDefaultInvocationStrategy(new ControllerInvoker(new Invoker())); + $routeCollector->setDefaultInvocationStrategy(new RequestResponseNamedArgs()); $environment = $container->get(Environment::class); if ($environment->isProduction()) { diff --git a/src/Controller/Admin/Debug/ClearStationQueueAction.php b/src/Controller/Admin/Debug/ClearStationQueueAction.php index 04f223cde..8f32ed4be 100644 --- a/src/Controller/Admin/Debug/ClearStationQueueAction.php +++ b/src/Controller/Admin/Debug/ClearStationQueueAction.php @@ -25,7 +25,7 @@ final class ClearStationQueueAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $testHandler = new TestHandler(Level::Debug, false); $this->logger->pushHandler($testHandler); diff --git a/src/Controller/Admin/Debug/NextSongAction.php b/src/Controller/Admin/Debug/NextSongAction.php index 65959f518..8708228d7 100644 --- a/src/Controller/Admin/Debug/NextSongAction.php +++ b/src/Controller/Admin/Debug/NextSongAction.php @@ -23,7 +23,7 @@ final class NextSongAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $testHandler = new TestHandler(Level::Debug, false); $this->logger->pushHandler($testHandler); diff --git a/src/Controller/Admin/Debug/NowPlayingAction.php b/src/Controller/Admin/Debug/NowPlayingAction.php index d515dde8e..e3c7c164c 100644 --- a/src/Controller/Admin/Debug/NowPlayingAction.php +++ b/src/Controller/Admin/Debug/NowPlayingAction.php @@ -23,7 +23,7 @@ final class NowPlayingAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $testHandler = new TestHandler(Level::Debug, false); $this->logger->pushHandler($testHandler); diff --git a/src/Controller/Admin/Debug/TelnetAction.php b/src/Controller/Admin/Debug/TelnetAction.php index 37921e451..d0d38aed8 100644 --- a/src/Controller/Admin/Debug/TelnetAction.php +++ b/src/Controller/Admin/Debug/TelnetAction.php @@ -22,7 +22,7 @@ final class TelnetAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $testHandler = new TestHandler(Level::Debug, false); $this->logger->pushHandler($testHandler); diff --git a/src/Controller/Api/Admin/AbstractAdminApiCrudController.php b/src/Controller/Api/Admin/AbstractAdminApiCrudController.php index e6e6058c0..2cd4f175f 100644 --- a/src/Controller/Api/Admin/AbstractAdminApiCrudController.php +++ b/src/Controller/Api/Admin/AbstractAdminApiCrudController.php @@ -47,7 +47,7 @@ abstract class AbstractAdminApiCrudController extends AbstractApiCrudController public function getAction( ServerRequest $request, Response $response, - mixed $id + string $id ): ResponseInterface { $record = $this->getRecord($id); @@ -61,11 +61,11 @@ abstract class AbstractAdminApiCrudController extends AbstractApiCrudController } /** - * @param mixed $id + * @param string $id * * @return TEntity|null */ - protected function getRecord(mixed $id): ?object + protected function getRecord(string $id): ?object { return $this->em->find($this->entityClass, $id); } @@ -73,7 +73,7 @@ abstract class AbstractAdminApiCrudController extends AbstractApiCrudController public function editAction( ServerRequest $request, Response $response, - mixed $id + string $id ): ResponseInterface { $record = $this->getRecord($id); @@ -90,7 +90,7 @@ abstract class AbstractAdminApiCrudController extends AbstractApiCrudController public function deleteAction( ServerRequest $request, Response $response, - mixed $id + string $id ): ResponseInterface { $record = $this->getRecord($id); diff --git a/src/Controller/Api/Admin/Stations/CloneAction.php b/src/Controller/Api/Admin/Stations/CloneAction.php index d0a8f129f..e123f3b37 100644 --- a/src/Controller/Api/Admin/Stations/CloneAction.php +++ b/src/Controller/Api/Admin/Stations/CloneAction.php @@ -58,7 +58,7 @@ final class CloneAction extends StationsController public function __invoke( ServerRequest $request, Response $response, - int|string $id + string $id ): ResponseInterface { $record = $this->getRecord($id); $data = (array)$request->getParsedBody(); diff --git a/src/Controller/Api/Admin/UsersController.php b/src/Controller/Api/Admin/UsersController.php index c43657f4b..847887fd0 100644 --- a/src/Controller/Api/Admin/UsersController.php +++ b/src/Controller/Api/Admin/UsersController.php @@ -198,7 +198,7 @@ class UsersController extends AbstractAdminApiCrudController public function editAction( ServerRequest $request, Response $response, - mixed $id + string $id ): ResponseInterface { $record = $this->getRecord($id); @@ -221,7 +221,7 @@ class UsersController extends AbstractAdminApiCrudController public function deleteAction( ServerRequest $request, Response $response, - mixed $id + string $id ): ResponseInterface { $record = $this->getRecord($id); diff --git a/src/Controller/Api/Frontend/Account/ApiKeysController.php b/src/Controller/Api/Frontend/Account/ApiKeysController.php index 05b51e1fe..6430bd2d7 100644 --- a/src/Controller/Api/Frontend/Account/ApiKeysController.php +++ b/src/Controller/Api/Frontend/Account/ApiKeysController.php @@ -57,7 +57,7 @@ final class ApiKeysController extends AbstractApiCrudController public function getAction( ServerRequest $request, Response $response, - mixed $id + string $id ): ResponseInterface { $record = $this->getRecord($request->getUser(), $id); @@ -73,7 +73,7 @@ final class ApiKeysController extends AbstractApiCrudController public function deleteAction( ServerRequest $request, Response $response, - mixed $id + string $id ): ResponseInterface { $record = $this->getRecord($request->getUser(), $id); diff --git a/src/Controller/Api/Frontend/Account/DeleteTwoFactorAction.php b/src/Controller/Api/Frontend/Account/DeleteTwoFactorAction.php index 4ff42cb1d..d68cf4b96 100644 --- a/src/Controller/Api/Frontend/Account/DeleteTwoFactorAction.php +++ b/src/Controller/Api/Frontend/Account/DeleteTwoFactorAction.php @@ -17,7 +17,6 @@ final class DeleteTwoFactorAction ) { } - public function __invoke( ServerRequest $request, Response $response diff --git a/src/Controller/Api/Internal/LiquidsoapAction.php b/src/Controller/Api/Internal/LiquidsoapAction.php index 6e675bf7f..eefcbe961 100644 --- a/src/Controller/Api/Internal/LiquidsoapAction.php +++ b/src/Controller/Api/Internal/LiquidsoapAction.php @@ -27,7 +27,7 @@ final class LiquidsoapAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $action ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Internal/ListenerAuthAction.php b/src/Controller/Api/Internal/ListenerAuthAction.php index 3ddac17dc..acbefe513 100644 --- a/src/Controller/Api/Internal/ListenerAuthAction.php +++ b/src/Controller/Api/Internal/ListenerAuthAction.php @@ -23,7 +23,7 @@ final class ListenerAuthAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/NowPlayingAction.php b/src/Controller/Api/NowPlayingAction.php index d8bee878a..3ba98b554 100644 --- a/src/Controller/Api/NowPlayingAction.php +++ b/src/Controller/Api/NowPlayingAction.php @@ -60,7 +60,7 @@ final class NowPlayingAction public function __invoke( ServerRequest $request, Response $response, - int|string|null $station_id = null + ?string $station_id = null ): ResponseInterface { $router = $request->getRouter(); @@ -84,7 +84,7 @@ final class NowPlayingAction } private function getForStation( - string|int $station, + string $station, RouterInterface $router ): ?Entity\Api\NowPlaying\NowPlaying { // Check cache first. diff --git a/src/Controller/Api/Stations/AbstractStationApiCrudController.php b/src/Controller/Api/Stations/AbstractStationApiCrudController.php index c70008d7e..536cb3097 100644 --- a/src/Controller/Api/Stations/AbstractStationApiCrudController.php +++ b/src/Controller/Api/Stations/AbstractStationApiCrudController.php @@ -20,7 +20,7 @@ abstract class AbstractStationApiCrudController extends AbstractApiCrudControlle public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $this->getStation($request); @@ -48,7 +48,7 @@ abstract class AbstractStationApiCrudController extends AbstractApiCrudControlle public function createAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $this->getStation($request); $row = $this->createRecord((array)$request->getParsedBody(), $station); @@ -82,8 +82,8 @@ abstract class AbstractStationApiCrudController extends AbstractApiCrudControlle public function getAction( ServerRequest $request, Response $response, - int|string $station_id, - mixed $id + string $station_id, + string $id ): ResponseInterface { $station = $this->getStation($request); $record = $this->getRecord($station, $id); @@ -116,8 +116,8 @@ abstract class AbstractStationApiCrudController extends AbstractApiCrudControlle public function editAction( ServerRequest $request, Response $response, - int|string $station_id, - mixed $id + string $station_id, + string $id ): ResponseInterface { $record = $this->getRecord($this->getStation($request), $id); @@ -134,8 +134,8 @@ abstract class AbstractStationApiCrudController extends AbstractApiCrudControlle public function deleteAction( ServerRequest $request, Response $response, - int|string $station_id, - mixed $id + string $station_id, + string $id ): ResponseInterface { $record = $this->getRecord($this->getStation($request), $id); diff --git a/src/Controller/Api/Stations/Art/DeleteArtAction.php b/src/Controller/Api/Stations/Art/DeleteArtAction.php index 9fef9cb46..1ec0e00be 100644 --- a/src/Controller/Api/Stations/Art/DeleteArtAction.php +++ b/src/Controller/Api/Stations/Art/DeleteArtAction.php @@ -48,8 +48,8 @@ final class DeleteArtAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int|string $media_id + string $station_id, + string $media_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Art/GetArtAction.php b/src/Controller/Api/Stations/Art/GetArtAction.php index db7374ce9..f88600097 100644 --- a/src/Controller/Api/Stations/Art/GetArtAction.php +++ b/src/Controller/Api/Stations/Art/GetArtAction.php @@ -48,7 +48,7 @@ final class GetArtAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $media_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Art/PostArtAction.php b/src/Controller/Api/Stations/Art/PostArtAction.php index ed1109fdf..a2fec1a1a 100644 --- a/src/Controller/Api/Stations/Art/PostArtAction.php +++ b/src/Controller/Api/Stations/Art/PostArtAction.php @@ -51,8 +51,8 @@ final class PostArtAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int|string $media_id + string $station_id, + string $media_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Automation/GetSettingsAction.php b/src/Controller/Api/Stations/Automation/GetSettingsAction.php index 9f252131a..339cb32dc 100644 --- a/src/Controller/Api/Stations/Automation/GetSettingsAction.php +++ b/src/Controller/Api/Stations/Automation/GetSettingsAction.php @@ -13,7 +13,7 @@ final class GetSettingsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Automation/PutSettingsAction.php b/src/Controller/Api/Stations/Automation/PutSettingsAction.php index 9e3341f16..954c427d8 100644 --- a/src/Controller/Api/Stations/Automation/PutSettingsAction.php +++ b/src/Controller/Api/Stations/Automation/PutSettingsAction.php @@ -20,7 +20,7 @@ final class PutSettingsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Automation/RunAction.php b/src/Controller/Api/Stations/Automation/RunAction.php index d1478bd60..deafa5078 100644 --- a/src/Controller/Api/Stations/Automation/RunAction.php +++ b/src/Controller/Api/Stations/Automation/RunAction.php @@ -38,7 +38,7 @@ final class RunAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/BulkMedia/DownloadAction.php b/src/Controller/Api/Stations/BulkMedia/DownloadAction.php index 015de90bd..09b5cac2a 100644 --- a/src/Controller/Api/Stations/BulkMedia/DownloadAction.php +++ b/src/Controller/Api/Stations/BulkMedia/DownloadAction.php @@ -24,7 +24,7 @@ final class DownloadAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/BulkMedia/UploadAction.php b/src/Controller/Api/Stations/BulkMedia/UploadAction.php index a7922fb92..ad1df82a6 100644 --- a/src/Controller/Api/Stations/BulkMedia/UploadAction.php +++ b/src/Controller/Api/Stations/BulkMedia/UploadAction.php @@ -50,7 +50,7 @@ final class UploadAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Fallback/DeleteFallbackAction.php b/src/Controller/Api/Stations/Fallback/DeleteFallbackAction.php index 8e33cc4d7..d3542e294 100644 --- a/src/Controller/Api/Stations/Fallback/DeleteFallbackAction.php +++ b/src/Controller/Api/Stations/Fallback/DeleteFallbackAction.php @@ -36,7 +36,7 @@ final class DeleteFallbackAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $this->stationRepo->clearFallback($station); diff --git a/src/Controller/Api/Stations/Fallback/GetFallbackAction.php b/src/Controller/Api/Stations/Fallback/GetFallbackAction.php index b536fe503..817392e14 100644 --- a/src/Controller/Api/Stations/Fallback/GetFallbackAction.php +++ b/src/Controller/Api/Stations/Fallback/GetFallbackAction.php @@ -35,7 +35,7 @@ final class GetFallbackAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { set_time_limit(600); diff --git a/src/Controller/Api/Stations/Fallback/PostFallbackAction.php b/src/Controller/Api/Stations/Fallback/PostFallbackAction.php index deda4f398..ec0d3c98d 100644 --- a/src/Controller/Api/Stations/Fallback/PostFallbackAction.php +++ b/src/Controller/Api/Stations/Fallback/PostFallbackAction.php @@ -37,7 +37,7 @@ final class PostFallbackAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Files/BatchAction.php b/src/Controller/Api/Stations/Files/BatchAction.php index 1fe611155..beed49408 100644 --- a/src/Controller/Api/Stations/Files/BatchAction.php +++ b/src/Controller/Api/Stations/Files/BatchAction.php @@ -46,7 +46,7 @@ final class BatchAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $storageLocation = $station->getMediaStorageLocation(); diff --git a/src/Controller/Api/Stations/Files/DownloadAction.php b/src/Controller/Api/Stations/Files/DownloadAction.php index 5db7f8dcc..267ca4946 100644 --- a/src/Controller/Api/Stations/Files/DownloadAction.php +++ b/src/Controller/Api/Stations/Files/DownloadAction.php @@ -15,7 +15,7 @@ final class DownloadAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { set_time_limit(600); diff --git a/src/Controller/Api/Stations/Files/FlowUploadAction.php b/src/Controller/Api/Stations/Files/FlowUploadAction.php index d5cf93494..d6c6916d1 100644 --- a/src/Controller/Api/Stations/Files/FlowUploadAction.php +++ b/src/Controller/Api/Stations/Files/FlowUploadAction.php @@ -27,7 +27,7 @@ final class FlowUploadAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $allParams = $request->getParams(); $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Files/ListAction.php b/src/Controller/Api/Stations/Files/ListAction.php index 54e0e31a9..d7d3345d7 100644 --- a/src/Controller/Api/Stations/Files/ListAction.php +++ b/src/Controller/Api/Stations/Files/ListAction.php @@ -33,7 +33,7 @@ final class ListAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); diff --git a/src/Controller/Api/Stations/Files/ListDirectoriesAction.php b/src/Controller/Api/Stations/Files/ListDirectoriesAction.php index 001c47ef2..5c9d594df 100644 --- a/src/Controller/Api/Stations/Files/ListDirectoriesAction.php +++ b/src/Controller/Api/Stations/Files/ListDirectoriesAction.php @@ -16,7 +16,7 @@ final class ListDirectoriesAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Files/MakeDirectoryAction.php b/src/Controller/Api/Stations/Files/MakeDirectoryAction.php index f30565cf3..763967259 100644 --- a/src/Controller/Api/Stations/Files/MakeDirectoryAction.php +++ b/src/Controller/Api/Stations/Files/MakeDirectoryAction.php @@ -16,7 +16,7 @@ final class MakeDirectoryAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $currentDir = $request->getParam('currentDirectory', ''); $newDirName = $request->getParam('name', ''); diff --git a/src/Controller/Api/Stations/Files/PlayAction.php b/src/Controller/Api/Stations/Files/PlayAction.php index c480ea2e8..5aafaa6e4 100644 --- a/src/Controller/Api/Stations/Files/PlayAction.php +++ b/src/Controller/Api/Stations/Files/PlayAction.php @@ -20,8 +20,8 @@ final class PlayAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int|string $id + string $station_id, + string $id ): ResponseInterface { set_time_limit(600); diff --git a/src/Controller/Api/Stations/Files/RenameAction.php b/src/Controller/Api/Stations/Files/RenameAction.php index bef97e7bd..ed1eb9845 100644 --- a/src/Controller/Api/Stations/Files/RenameAction.php +++ b/src/Controller/Api/Stations/Files/RenameAction.php @@ -21,7 +21,7 @@ final class RenameAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $from = $request->getParam('file'); if (empty($from)) { diff --git a/src/Controller/Api/Stations/FilesController.php b/src/Controller/Api/Stations/FilesController.php index 618285616..15b6d21d0 100644 --- a/src/Controller/Api/Stations/FilesController.php +++ b/src/Controller/Api/Stations/FilesController.php @@ -166,7 +166,7 @@ final class FilesController extends AbstractStationApiCrudController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $storageLocation = $this->getStation($request)->getMediaStorageLocation(); @@ -183,7 +183,7 @@ final class FilesController extends AbstractStationApiCrudController public function createAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $this->getStation($request); @@ -220,8 +220,8 @@ final class FilesController extends AbstractStationApiCrudController public function editAction( ServerRequest $request, Response $response, - int|string $station_id, - mixed $id + string $station_id, + string $id ): ResponseInterface { $station = $this->getStation($request); $record = $this->getRecord($station, $id); diff --git a/src/Controller/Api/Stations/GetQuotaAction.php b/src/Controller/Api/Stations/GetQuotaAction.php index 404a46342..d1962c1a9 100644 --- a/src/Controller/Api/Stations/GetQuotaAction.php +++ b/src/Controller/Api/Stations/GetQuotaAction.php @@ -20,7 +20,7 @@ final class GetQuotaAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $type = null ): ResponseInterface { $typeEnum = Entity\Enums\StorageLocationTypes::tryFrom($type ?? '') diff --git a/src/Controller/Api/Stations/GetRestartStatusAction.php b/src/Controller/Api/Stations/GetRestartStatusAction.php index 7af8b1574..fce3e9742 100644 --- a/src/Controller/Api/Stations/GetRestartStatusAction.php +++ b/src/Controller/Api/Stations/GetRestartStatusAction.php @@ -13,7 +13,7 @@ final class GetRestartStatusAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); return $response->withJson([ diff --git a/src/Controller/Api/Stations/HistoryController.php b/src/Controller/Api/Stations/HistoryController.php index 3f9ca362d..da3e9f6c3 100644 --- a/src/Controller/Api/Stations/HistoryController.php +++ b/src/Controller/Api/Stations/HistoryController.php @@ -69,7 +69,7 @@ final class HistoryController public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { set_time_limit($this->environment->getSyncLongExecutionTime()); diff --git a/src/Controller/Api/Stations/IndexController.php b/src/Controller/Api/Stations/IndexController.php index e8fdde08d..e69540b7a 100644 --- a/src/Controller/Api/Stations/IndexController.php +++ b/src/Controller/Api/Stations/IndexController.php @@ -59,7 +59,7 @@ final class IndexController public function indexAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/LiquidsoapConfig/GetAction.php b/src/Controller/Api/Stations/LiquidsoapConfig/GetAction.php index ca31b3ca6..51a42b4f3 100644 --- a/src/Controller/Api/Stations/LiquidsoapConfig/GetAction.php +++ b/src/Controller/Api/Stations/LiquidsoapConfig/GetAction.php @@ -14,7 +14,7 @@ final class GetAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $backendConfig = $request->getStation()->getBackendConfig(); diff --git a/src/Controller/Api/Stations/LiquidsoapConfig/PutAction.php b/src/Controller/Api/Stations/LiquidsoapConfig/PutAction.php index e1f21cdcb..970356902 100644 --- a/src/Controller/Api/Stations/LiquidsoapConfig/PutAction.php +++ b/src/Controller/Api/Stations/LiquidsoapConfig/PutAction.php @@ -27,7 +27,7 @@ final class PutAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $body = (array)$request->getParsedBody(); diff --git a/src/Controller/Api/Stations/ListenersAction.php b/src/Controller/Api/Stations/ListenersAction.php index 0189629f6..593ce6ce8 100644 --- a/src/Controller/Api/Stations/ListenersAction.php +++ b/src/Controller/Api/Stations/ListenersAction.php @@ -53,7 +53,7 @@ final class ListenersAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $stationTz = $station->getTimezoneObject(); diff --git a/src/Controller/Api/Stations/Mounts/Intro/DeleteIntroAction.php b/src/Controller/Api/Stations/Mounts/Intro/DeleteIntroAction.php index b574cc5f8..db9061e71 100644 --- a/src/Controller/Api/Stations/Mounts/Intro/DeleteIntroAction.php +++ b/src/Controller/Api/Stations/Mounts/Intro/DeleteIntroAction.php @@ -43,8 +43,8 @@ final class DeleteIntroAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $station = $request->getStation(); $mount = $this->mountRepo->find($station, $id); diff --git a/src/Controller/Api/Stations/Mounts/Intro/GetIntroAction.php b/src/Controller/Api/Stations/Mounts/Intro/GetIntroAction.php index 859e6246e..7f6b3b95b 100644 --- a/src/Controller/Api/Stations/Mounts/Intro/GetIntroAction.php +++ b/src/Controller/Api/Stations/Mounts/Intro/GetIntroAction.php @@ -47,8 +47,8 @@ final class GetIntroAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { set_time_limit(600); diff --git a/src/Controller/Api/Stations/Mounts/Intro/PostIntroAction.php b/src/Controller/Api/Stations/Mounts/Intro/PostIntroAction.php index d1bcad056..5b11d2f49 100644 --- a/src/Controller/Api/Stations/Mounts/Intro/PostIntroAction.php +++ b/src/Controller/Api/Stations/Mounts/Intro/PostIntroAction.php @@ -44,8 +44,8 @@ final class PostIntroAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - ?int $id = null + string $station_id, + ?string $id = null ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/MountsController.php b/src/Controller/Api/Stations/MountsController.php index 0493e03f1..8824abad4 100644 --- a/src/Controller/Api/Stations/MountsController.php +++ b/src/Controller/Api/Stations/MountsController.php @@ -160,7 +160,7 @@ final class MountsController extends AbstractStationApiCrudController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -216,7 +216,7 @@ final class MountsController extends AbstractStationApiCrudController public function createAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -237,8 +237,8 @@ final class MountsController extends AbstractStationApiCrudController public function deleteAction( ServerRequest $request, Response $response, - int|string $station_id, - mixed $id, + string $station_id, + string $id, ): ResponseInterface { $record = $this->getRecord($this->getStation($request), $id); diff --git a/src/Controller/Api/Stations/OnDemand/DownloadAction.php b/src/Controller/Api/Stations/OnDemand/DownloadAction.php index 654f6d0a3..d80a194b4 100644 --- a/src/Controller/Api/Stations/OnDemand/DownloadAction.php +++ b/src/Controller/Api/Stations/OnDemand/DownloadAction.php @@ -20,7 +20,7 @@ final class DownloadAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $media_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/OnDemand/ListAction.php b/src/Controller/Api/Stations/OnDemand/ListAction.php index 7990331fb..f359727be 100644 --- a/src/Controller/Api/Stations/OnDemand/ListAction.php +++ b/src/Controller/Api/Stations/OnDemand/ListAction.php @@ -31,7 +31,7 @@ final class ListAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Playlists/AbstractPlaylistsAction.php b/src/Controller/Api/Stations/Playlists/AbstractPlaylistsAction.php index 939ec2af9..8479bbec8 100644 --- a/src/Controller/Api/Stations/Playlists/AbstractPlaylistsAction.php +++ b/src/Controller/Api/Stations/Playlists/AbstractPlaylistsAction.php @@ -15,12 +15,12 @@ abstract class AbstractPlaylistsAction ) { } - protected function requireRecord(Entity\Station $station, int $id): Entity\StationPlaylist + protected function requireRecord(Entity\Station $station, int|string $id): Entity\StationPlaylist { $record = $this->em->getRepository(Entity\StationPlaylist::class)->findOneBy( [ 'station' => $station, - 'id' => $id, + 'id' => (int)$id, ] ); diff --git a/src/Controller/Api/Stations/Playlists/CloneAction.php b/src/Controller/Api/Stations/Playlists/CloneAction.php index 19aea4d2f..2231d1968 100644 --- a/src/Controller/Api/Stations/Playlists/CloneAction.php +++ b/src/Controller/Api/Stations/Playlists/CloneAction.php @@ -16,8 +16,8 @@ final class CloneAction extends AbstractPlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $record = $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/Playlists/DeleteQueueAction.php b/src/Controller/Api/Stations/Playlists/DeleteQueueAction.php index 7b26abdaa..4e66f5fd8 100644 --- a/src/Controller/Api/Stations/Playlists/DeleteQueueAction.php +++ b/src/Controller/Api/Stations/Playlists/DeleteQueueAction.php @@ -22,8 +22,8 @@ final class DeleteQueueAction extends AbstractPlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $record = $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/Playlists/ExportAction.php b/src/Controller/Api/Stations/Playlists/ExportAction.php index 9ce4ff57a..5d354f252 100644 --- a/src/Controller/Api/Stations/Playlists/ExportAction.php +++ b/src/Controller/Api/Stations/Playlists/ExportAction.php @@ -14,8 +14,8 @@ final class ExportAction extends AbstractPlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id, + string $station_id, + string $id, string $format = 'pls' ): ResponseInterface { $record = $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/Playlists/GetOrderAction.php b/src/Controller/Api/Stations/Playlists/GetOrderAction.php index af8709b3f..4c3620707 100644 --- a/src/Controller/Api/Stations/Playlists/GetOrderAction.php +++ b/src/Controller/Api/Stations/Playlists/GetOrderAction.php @@ -15,8 +15,8 @@ final class GetOrderAction extends AbstractPlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $station = $request->getStation(); $record = $this->requireRecord($station, $id); diff --git a/src/Controller/Api/Stations/Playlists/GetQueueAction.php b/src/Controller/Api/Stations/Playlists/GetQueueAction.php index 417bce01e..422f4d0e3 100644 --- a/src/Controller/Api/Stations/Playlists/GetQueueAction.php +++ b/src/Controller/Api/Stations/Playlists/GetQueueAction.php @@ -24,8 +24,8 @@ final class GetQueueAction extends AbstractPlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $record = $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/Playlists/ImportAction.php b/src/Controller/Api/Stations/Playlists/ImportAction.php index 307d42549..9d8ebc1ce 100644 --- a/src/Controller/Api/Stations/Playlists/ImportAction.php +++ b/src/Controller/Api/Stations/Playlists/ImportAction.php @@ -25,8 +25,8 @@ final class ImportAction extends AbstractPlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $playlist = $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/Playlists/PutOrderAction.php b/src/Controller/Api/Stations/Playlists/PutOrderAction.php index c83171456..150cd56d2 100644 --- a/src/Controller/Api/Stations/Playlists/PutOrderAction.php +++ b/src/Controller/Api/Stations/Playlists/PutOrderAction.php @@ -23,8 +23,8 @@ final class PutOrderAction extends AbstractPlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $record = $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/Playlists/ReshuffleAction.php b/src/Controller/Api/Stations/Playlists/ReshuffleAction.php index a0d70c5e6..65c024746 100644 --- a/src/Controller/Api/Stations/Playlists/ReshuffleAction.php +++ b/src/Controller/Api/Stations/Playlists/ReshuffleAction.php @@ -22,8 +22,8 @@ final class ReshuffleAction extends AbstractPlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $record = $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/Playlists/ToggleAction.php b/src/Controller/Api/Stations/Playlists/ToggleAction.php index a18a5864b..32b148c7f 100644 --- a/src/Controller/Api/Stations/Playlists/ToggleAction.php +++ b/src/Controller/Api/Stations/Playlists/ToggleAction.php @@ -14,8 +14,8 @@ final class ToggleAction extends AbstractPlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $record = $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/PlaylistsController.php b/src/Controller/Api/Stations/PlaylistsController.php index 69c978605..453486972 100644 --- a/src/Controller/Api/Stations/PlaylistsController.php +++ b/src/Controller/Api/Stations/PlaylistsController.php @@ -148,7 +148,7 @@ final class PlaylistsController extends AbstractScheduledEntityController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -186,7 +186,7 @@ final class PlaylistsController extends AbstractScheduledEntityController public function scheduleAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/PodcastEpisodesController.php b/src/Controller/Api/Stations/PodcastEpisodesController.php index f8da9c4ca..0d7403e2e 100644 --- a/src/Controller/Api/Stations/PodcastEpisodesController.php +++ b/src/Controller/Api/Stations/PodcastEpisodesController.php @@ -198,7 +198,7 @@ final class PodcastEpisodesController extends AbstractApiCrudController public function listAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id ): ResponseInterface { $station = $request->getStation(); @@ -226,7 +226,7 @@ final class PodcastEpisodesController extends AbstractApiCrudController public function getAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, string $episode_id ): ResponseInterface { @@ -245,7 +245,7 @@ final class PodcastEpisodesController extends AbstractApiCrudController public function createAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id ): ResponseInterface { $station = $request->getStation(); @@ -289,7 +289,7 @@ final class PodcastEpisodesController extends AbstractApiCrudController public function editAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, string $episode_id ): ResponseInterface { @@ -308,7 +308,7 @@ final class PodcastEpisodesController extends AbstractApiCrudController public function deleteAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, string $episode_id ): ResponseInterface { diff --git a/src/Controller/Api/Stations/Podcasts/Art/DeleteArtAction.php b/src/Controller/Api/Stations/Podcasts/Art/DeleteArtAction.php index 9af0fc293..08db7007e 100644 --- a/src/Controller/Api/Stations/Podcasts/Art/DeleteArtAction.php +++ b/src/Controller/Api/Stations/Podcasts/Art/DeleteArtAction.php @@ -45,7 +45,7 @@ final class DeleteArtAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Podcasts/Art/GetArtAction.php b/src/Controller/Api/Stations/Podcasts/Art/GetArtAction.php index af701dd15..a534783dc 100644 --- a/src/Controller/Api/Stations/Podcasts/Art/GetArtAction.php +++ b/src/Controller/Api/Stations/Podcasts/Art/GetArtAction.php @@ -47,7 +47,7 @@ final class GetArtAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Podcasts/Art/PostArtAction.php b/src/Controller/Api/Stations/Podcasts/Art/PostArtAction.php index 189cf51cb..6f1bfc23c 100644 --- a/src/Controller/Api/Stations/Podcasts/Art/PostArtAction.php +++ b/src/Controller/Api/Stations/Podcasts/Art/PostArtAction.php @@ -46,7 +46,7 @@ final class PostArtAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, ?string $podcast_id = null ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Podcasts/Episodes/Art/DeleteArtAction.php b/src/Controller/Api/Stations/Podcasts/Episodes/Art/DeleteArtAction.php index ae3696894..92c18e4be 100644 --- a/src/Controller/Api/Stations/Podcasts/Episodes/Art/DeleteArtAction.php +++ b/src/Controller/Api/Stations/Podcasts/Episodes/Art/DeleteArtAction.php @@ -63,7 +63,7 @@ final class DeleteArtAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, string $episode_id ): ResponseInterface { diff --git a/src/Controller/Api/Stations/Podcasts/Episodes/Art/GetArtAction.php b/src/Controller/Api/Stations/Podcasts/Episodes/Art/GetArtAction.php index 1ff47d2d2..bb91a97b8 100644 --- a/src/Controller/Api/Stations/Podcasts/Episodes/Art/GetArtAction.php +++ b/src/Controller/Api/Stations/Podcasts/Episodes/Art/GetArtAction.php @@ -54,7 +54,7 @@ final class GetArtAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, string $episode_id ): ResponseInterface { diff --git a/src/Controller/Api/Stations/Podcasts/Episodes/Art/PostArtAction.php b/src/Controller/Api/Stations/Podcasts/Episodes/Art/PostArtAction.php index 5cc18cc32..206ef1b53 100644 --- a/src/Controller/Api/Stations/Podcasts/Episodes/Art/PostArtAction.php +++ b/src/Controller/Api/Stations/Podcasts/Episodes/Art/PostArtAction.php @@ -53,7 +53,7 @@ final class PostArtAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, ?string $episode_id = null ): ResponseInterface { diff --git a/src/Controller/Api/Stations/Podcasts/Episodes/Media/DeleteMediaAction.php b/src/Controller/Api/Stations/Podcasts/Episodes/Media/DeleteMediaAction.php index afeefb41f..48f86bc30 100644 --- a/src/Controller/Api/Stations/Podcasts/Episodes/Media/DeleteMediaAction.php +++ b/src/Controller/Api/Stations/Podcasts/Episodes/Media/DeleteMediaAction.php @@ -50,7 +50,7 @@ final class DeleteMediaAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, string $episode_id ): ResponseInterface { diff --git a/src/Controller/Api/Stations/Podcasts/Episodes/Media/GetMediaAction.php b/src/Controller/Api/Stations/Podcasts/Episodes/Media/GetMediaAction.php index 24e65ce34..2b77fbf7b 100644 --- a/src/Controller/Api/Stations/Podcasts/Episodes/Media/GetMediaAction.php +++ b/src/Controller/Api/Stations/Podcasts/Episodes/Media/GetMediaAction.php @@ -54,7 +54,7 @@ final class GetMediaAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, string $episode_id ): ResponseInterface { diff --git a/src/Controller/Api/Stations/Podcasts/Episodes/Media/PostMediaAction.php b/src/Controller/Api/Stations/Podcasts/Episodes/Media/PostMediaAction.php index e804fd1e8..185d91eb1 100644 --- a/src/Controller/Api/Stations/Podcasts/Episodes/Media/PostMediaAction.php +++ b/src/Controller/Api/Stations/Podcasts/Episodes/Media/PostMediaAction.php @@ -52,7 +52,7 @@ final class PostMediaAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, ?string $episode_id = null ): ResponseInterface { diff --git a/src/Controller/Api/Stations/PodcastsController.php b/src/Controller/Api/Stations/PodcastsController.php index 2076db67d..e0d29ef5f 100644 --- a/src/Controller/Api/Stations/PodcastsController.php +++ b/src/Controller/Api/Stations/PodcastsController.php @@ -162,7 +162,7 @@ final class PodcastsController extends AbstractApiCrudController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -186,7 +186,7 @@ final class PodcastsController extends AbstractApiCrudController public function getAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, ): ResponseInterface { $station = $request->getStation(); @@ -204,7 +204,7 @@ final class PodcastsController extends AbstractApiCrudController public function createAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -233,7 +233,7 @@ final class PodcastsController extends AbstractApiCrudController public function editAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id ): ResponseInterface { $podcast = $this->getRecord($request->getStation(), $podcast_id); @@ -251,7 +251,7 @@ final class PodcastsController extends AbstractApiCrudController public function deleteAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/ProfileAction.php b/src/Controller/Api/Stations/ProfileAction.php index b2739ed0f..bebb15833 100644 --- a/src/Controller/Api/Stations/ProfileAction.php +++ b/src/Controller/Api/Stations/ProfileAction.php @@ -22,7 +22,7 @@ final class ProfileAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $backend = $request->getStationBackend(); diff --git a/src/Controller/Api/Stations/ProfileEditController.php b/src/Controller/Api/Stations/ProfileEditController.php index bb4ad6e8f..1df650201 100644 --- a/src/Controller/Api/Stations/ProfileEditController.php +++ b/src/Controller/Api/Stations/ProfileEditController.php @@ -22,7 +22,7 @@ final class ProfileEditController extends StationsController public function getProfileAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -34,7 +34,7 @@ final class ProfileEditController extends StationsController public function putProfileAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/QueueController.php b/src/Controller/Api/Stations/QueueController.php index a300e4955..46505eaf5 100644 --- a/src/Controller/Api/Stations/QueueController.php +++ b/src/Controller/Api/Stations/QueueController.php @@ -111,7 +111,7 @@ final class QueueController extends AbstractStationApiCrudController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $query = $this->queueRepo->getUnplayedQuery($station); @@ -159,7 +159,7 @@ final class QueueController extends AbstractStationApiCrudController public function clearAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $this->queueRepo->clearUpcomingQueue($station); diff --git a/src/Controller/Api/Stations/RemotesController.php b/src/Controller/Api/Stations/RemotesController.php index 169abf9e1..1723bdba1 100644 --- a/src/Controller/Api/Stations/RemotesController.php +++ b/src/Controller/Api/Stations/RemotesController.php @@ -149,7 +149,7 @@ final class RemotesController extends AbstractStationApiCrudController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Reports/Overview/BestAndWorstAction.php b/src/Controller/Api/Stations/Reports/Overview/BestAndWorstAction.php index 805cd7fe5..1e3625aa9 100644 --- a/src/Controller/Api/Stations/Reports/Overview/BestAndWorstAction.php +++ b/src/Controller/Api/Stations/Reports/Overview/BestAndWorstAction.php @@ -23,7 +23,7 @@ final class BestAndWorstAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $station_tz = $station->getTimezoneObject(); diff --git a/src/Controller/Api/Stations/Reports/Overview/ChartsAction.php b/src/Controller/Api/Stations/Reports/Overview/ChartsAction.php index f1e3b736b..bbcd7c7f0 100644 --- a/src/Controller/Api/Stations/Reports/Overview/ChartsAction.php +++ b/src/Controller/Api/Stations/Reports/Overview/ChartsAction.php @@ -22,7 +22,7 @@ final class ChartsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $station_tz = $station->getTimezoneObject(); diff --git a/src/Controller/Api/Stations/Reports/Overview/MostPlayedAction.php b/src/Controller/Api/Stations/Reports/Overview/MostPlayedAction.php index ff0bb2ca6..f79b84129 100644 --- a/src/Controller/Api/Stations/Reports/Overview/MostPlayedAction.php +++ b/src/Controller/Api/Stations/Reports/Overview/MostPlayedAction.php @@ -23,7 +23,7 @@ final class MostPlayedAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $station_tz = $station->getTimezoneObject(); diff --git a/src/Controller/Api/Stations/Reports/PerformanceAction.php b/src/Controller/Api/Stations/Reports/PerformanceAction.php index d2a0c4495..1e08790eb 100644 --- a/src/Controller/Api/Stations/Reports/PerformanceAction.php +++ b/src/Controller/Api/Stations/Reports/PerformanceAction.php @@ -21,7 +21,7 @@ final class PerformanceAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Reports/RequestsController.php b/src/Controller/Api/Stations/Reports/RequestsController.php index be4705ee6..39ecef857 100644 --- a/src/Controller/Api/Stations/Reports/RequestsController.php +++ b/src/Controller/Api/Stations/Reports/RequestsController.php @@ -23,7 +23,7 @@ final class RequestsController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -66,7 +66,7 @@ final class RequestsController public function deleteAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, int $request_id ): ResponseInterface { $station = $request->getStation(); @@ -83,7 +83,7 @@ final class RequestsController public function clearAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $this->requestRepo->clearPendingRequests($station); diff --git a/src/Controller/Api/Stations/Reports/SoundExchangeAction.php b/src/Controller/Api/Stations/Reports/SoundExchangeAction.php index dea9c1fb2..526e04dce 100644 --- a/src/Controller/Api/Stations/Reports/SoundExchangeAction.php +++ b/src/Controller/Api/Stations/Reports/SoundExchangeAction.php @@ -27,7 +27,7 @@ final class SoundExchangeAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $tzObject = $station->getTimezoneObject(); diff --git a/src/Controller/Api/Stations/RequestsController.php b/src/Controller/Api/Stations/RequestsController.php index 2159d9bf7..c5c11e11c 100644 --- a/src/Controller/Api/Stations/RequestsController.php +++ b/src/Controller/Api/Stations/RequestsController.php @@ -76,7 +76,7 @@ final class RequestsController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -184,7 +184,7 @@ final class RequestsController public function submitAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $media_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/ScheduleAction.php b/src/Controller/Api/Stations/ScheduleAction.php index eab1f9145..fe39f90e6 100644 --- a/src/Controller/Api/Stations/ScheduleAction.php +++ b/src/Controller/Api/Stations/ScheduleAction.php @@ -66,7 +66,7 @@ final class ScheduleAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $tz = $station->getTimezoneObject(); diff --git a/src/Controller/Api/Stations/ServicesController.php b/src/Controller/Api/Stations/ServicesController.php index 3df0ee528..a909613dc 100644 --- a/src/Controller/Api/Stations/ServicesController.php +++ b/src/Controller/Api/Stations/ServicesController.php @@ -111,7 +111,7 @@ final class ServicesController public function statusAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -131,7 +131,7 @@ final class ServicesController public function reloadAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { // Reloading attempts to update configuration without restarting broadcasting, if possible and supported. $station = $request->getStation(); @@ -156,7 +156,7 @@ final class ServicesController public function restartAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { // Restarting will always shut down and restart any services. $station = $request->getStation(); @@ -182,7 +182,7 @@ final class ServicesController public function frontendAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $do = 'restart' ): ResponseInterface { $station = $request->getStation(); @@ -222,7 +222,7 @@ final class ServicesController public function backendAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $do = 'restart' ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/StereoTool/DeleteStereoToolConfigurationAction.php b/src/Controller/Api/Stations/StereoTool/DeleteStereoToolConfigurationAction.php index 910f93654..df89df154 100644 --- a/src/Controller/Api/Stations/StereoTool/DeleteStereoToolConfigurationAction.php +++ b/src/Controller/Api/Stations/StereoTool/DeleteStereoToolConfigurationAction.php @@ -36,7 +36,7 @@ final class DeleteStereoToolConfigurationAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/StereoTool/GetStereoToolConfigurationAction.php b/src/Controller/Api/Stations/StereoTool/GetStereoToolConfigurationAction.php index 5204e863d..a5a853fec 100644 --- a/src/Controller/Api/Stations/StereoTool/GetStereoToolConfigurationAction.php +++ b/src/Controller/Api/Stations/StereoTool/GetStereoToolConfigurationAction.php @@ -35,7 +35,7 @@ final class GetStereoToolConfigurationAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { set_time_limit(600); diff --git a/src/Controller/Api/Stations/StereoTool/PostStereoToolConfigurationAction.php b/src/Controller/Api/Stations/StereoTool/PostStereoToolConfigurationAction.php index a1b9bf07b..0ac90a3ab 100644 --- a/src/Controller/Api/Stations/StereoTool/PostStereoToolConfigurationAction.php +++ b/src/Controller/Api/Stations/StereoTool/PostStereoToolConfigurationAction.php @@ -37,7 +37,7 @@ final class PostStereoToolConfigurationAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/Streamers/BroadcastsController.php b/src/Controller/Api/Stations/Streamers/BroadcastsController.php index 8a904484a..5d43e91e6 100644 --- a/src/Controller/Api/Stations/Streamers/BroadcastsController.php +++ b/src/Controller/Api/Stations/Streamers/BroadcastsController.php @@ -24,8 +24,8 @@ final class BroadcastsController extends AbstractApiCrudController public function listAction( ServerRequest $request, Response $response, - int|string $station_id, - ?int $id = null + string $station_id, + ?string $id = null ): ResponseInterface { $station = $request->getStation(); @@ -125,7 +125,7 @@ final class BroadcastsController extends AbstractApiCrudController public function downloadAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, int $broadcast_id ): ResponseInterface { $station = $request->getStation(); @@ -157,7 +157,7 @@ final class BroadcastsController extends AbstractApiCrudController public function deleteAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, int $broadcast_id ): ResponseInterface { $station = $request->getStation(); @@ -183,24 +183,24 @@ final class BroadcastsController extends AbstractApiCrudController return $response->withJson(Entity\Api\Status::deleted()); } - private function getRecord(Entity\Station $station, int $id): ?Entity\StationStreamerBroadcast + private function getRecord(Entity\Station $station, int|string $id): ?Entity\StationStreamerBroadcast { /** @var Entity\StationStreamerBroadcast|null $broadcast */ $broadcast = $this->em->getRepository(Entity\StationStreamerBroadcast::class)->findOneBy( [ - 'id' => $id, + 'id' => (int)$id, 'station' => $station, ] ); return $broadcast; } - private function getStreamer(Entity\Station $station, int $id): ?Entity\StationStreamer + private function getStreamer(Entity\Station $station, int|string $id): ?Entity\StationStreamer { /** @var Entity\StationStreamer|null $streamer */ $streamer = $this->em->getRepository(Entity\StationStreamer::class)->findOneBy( [ - 'id' => $id, + 'id' => (int)$id, 'station' => $station, ] ); diff --git a/src/Controller/Api/Stations/StreamersController.php b/src/Controller/Api/Stations/StreamersController.php index bfe1e3ba8..dc9f9922c 100644 --- a/src/Controller/Api/Stations/StreamersController.php +++ b/src/Controller/Api/Stations/StreamersController.php @@ -149,7 +149,7 @@ final class StreamersController extends AbstractScheduledEntityController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -181,7 +181,7 @@ final class StreamersController extends AbstractScheduledEntityController public function scheduleAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Api/Stations/UpdateMetadataAction.php b/src/Controller/Api/Stations/UpdateMetadataAction.php index cc3791e3b..c93609976 100644 --- a/src/Controller/Api/Stations/UpdateMetadataAction.php +++ b/src/Controller/Api/Stations/UpdateMetadataAction.php @@ -16,7 +16,7 @@ final class UpdateMetadataAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $backend = $request->getStationBackend(); diff --git a/src/Controller/Api/Stations/Waveform/GetWaveformAction.php b/src/Controller/Api/Stations/Waveform/GetWaveformAction.php index a6b82086d..034197150 100644 --- a/src/Controller/Api/Stations/Waveform/GetWaveformAction.php +++ b/src/Controller/Api/Stations/Waveform/GetWaveformAction.php @@ -22,7 +22,7 @@ final class GetWaveformAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $media_id ): ResponseInterface { $response = $response->withCacheLifetime(Response::CACHE_ONE_YEAR); diff --git a/src/Controller/Api/Stations/Webhooks/AbstractWebhooksAction.php b/src/Controller/Api/Stations/Webhooks/AbstractWebhooksAction.php index 67a77e47f..619d7203d 100644 --- a/src/Controller/Api/Stations/Webhooks/AbstractWebhooksAction.php +++ b/src/Controller/Api/Stations/Webhooks/AbstractWebhooksAction.php @@ -15,12 +15,12 @@ abstract class AbstractWebhooksAction ) { } - protected function requireRecord(Entity\Station $station, int $id): Entity\StationWebhook + protected function requireRecord(Entity\Station $station, int|string $id): Entity\StationWebhook { $record = $this->em->getRepository(Entity\StationWebhook::class)->findOneBy( [ 'station' => $station, - 'id' => $id, + 'id' => (int)$id, ] ); diff --git a/src/Controller/Api/Stations/Webhooks/TestAction.php b/src/Controller/Api/Stations/Webhooks/TestAction.php index 514e4fef2..9c4d4a7fc 100644 --- a/src/Controller/Api/Stations/Webhooks/TestAction.php +++ b/src/Controller/Api/Stations/Webhooks/TestAction.php @@ -24,16 +24,16 @@ final class TestAction extends AbstractWebhooksAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { - $this->requireRecord($request->getStation(), $id); + $webhook = $this->requireRecord($request->getStation(), $id); $tempFile = File::generateTempPath('webhook_test_' . $id . '.log'); touch($tempFile); $message = new TestWebhookMessage(); - $message->webhookId = $id; + $message->webhookId = $webhook->getIdRequired(); $message->outputPath = $tempFile; $this->messageBus->dispatch($message); diff --git a/src/Controller/Api/Stations/Webhooks/TestLogAction.php b/src/Controller/Api/Stations/Webhooks/TestLogAction.php index 2ad1e2acd..8c12bfe91 100644 --- a/src/Controller/Api/Stations/Webhooks/TestLogAction.php +++ b/src/Controller/Api/Stations/Webhooks/TestLogAction.php @@ -18,8 +18,8 @@ final class TestLogAction extends AbstractWebhooksAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id, + string $station_id, + string $id, string $path ): ResponseInterface { $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/Webhooks/ToggleAction.php b/src/Controller/Api/Stations/Webhooks/ToggleAction.php index 900399a32..9a08c8224 100644 --- a/src/Controller/Api/Stations/Webhooks/ToggleAction.php +++ b/src/Controller/Api/Stations/Webhooks/ToggleAction.php @@ -14,8 +14,8 @@ final class ToggleAction extends AbstractWebhooksAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - int $id + string $station_id, + string $id ): ResponseInterface { $record = $this->requireRecord($request->getStation(), $id); diff --git a/src/Controller/Api/Stations/WebhooksController.php b/src/Controller/Api/Stations/WebhooksController.php index 5671b3dfe..6ff8a1e0d 100644 --- a/src/Controller/Api/Stations/WebhooksController.php +++ b/src/Controller/Api/Stations/WebhooksController.php @@ -152,7 +152,7 @@ final class WebhooksController extends AbstractStationApiCrudController public function listAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Frontend/Account/MasqueradeAction.php b/src/Controller/Frontend/Account/MasqueradeAction.php index ec9fe2293..30e7d0489 100644 --- a/src/Controller/Frontend/Account/MasqueradeAction.php +++ b/src/Controller/Frontend/Account/MasqueradeAction.php @@ -23,7 +23,7 @@ final class MasqueradeAction public function __invoke( ServerRequest $request, Response $response, - int $id, + string $id, string $csrf ): ResponseInterface { $request->getCsrf()->verify($csrf, self::CSRF_NAMESPACE); diff --git a/src/Controller/Frontend/PWA/AppManifestAction.php b/src/Controller/Frontend/PWA/AppManifestAction.php index f664e6811..5871885b2 100644 --- a/src/Controller/Frontend/PWA/AppManifestAction.php +++ b/src/Controller/Frontend/PWA/AppManifestAction.php @@ -14,7 +14,8 @@ final class AppManifestAction { public function __invoke( ServerRequest $request, - Response $response + Response $response, + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Frontend/PublicPages/HistoryAction.php b/src/Controller/Frontend/PublicPages/HistoryAction.php index a0fd2270b..db3a8f54c 100644 --- a/src/Controller/Frontend/PublicPages/HistoryAction.php +++ b/src/Controller/Frontend/PublicPages/HistoryAction.php @@ -20,7 +20,7 @@ final class HistoryAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Frontend/PublicPages/OnDemandAction.php b/src/Controller/Frontend/PublicPages/OnDemandAction.php index 9022c0a8f..f3d75ea3f 100644 --- a/src/Controller/Frontend/PublicPages/OnDemandAction.php +++ b/src/Controller/Frontend/PublicPages/OnDemandAction.php @@ -21,8 +21,8 @@ final class OnDemandAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - bool $embed = false + string $station_id, + ?string $embed = null ): ResponseInterface { $station = $request->getStation(); @@ -54,7 +54,7 @@ final class OnDemandAction $router = $request->getRouter(); $pageClass = 'ondemand station-' . $station->getShortName(); - if ($embed) { + if (null !== $embed) { $pageClass .= ' embed'; } diff --git a/src/Controller/Frontend/PublicPages/PlayerAction.php b/src/Controller/Frontend/PublicPages/PlayerAction.php index fedb88710..c5b6b77af 100644 --- a/src/Controller/Frontend/PublicPages/PlayerAction.php +++ b/src/Controller/Frontend/PublicPages/PlayerAction.php @@ -23,7 +23,7 @@ final class PlayerAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, ?string $embed = null, ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Frontend/PublicPages/PlaylistAction.php b/src/Controller/Frontend/PublicPages/PlaylistAction.php index 23fc3749e..f45c742bd 100644 --- a/src/Controller/Frontend/PublicPages/PlaylistAction.php +++ b/src/Controller/Frontend/PublicPages/PlaylistAction.php @@ -14,7 +14,7 @@ final class PlaylistAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $format = 'pls' ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Frontend/PublicPages/PodcastEpisodeAction.php b/src/Controller/Frontend/PublicPages/PodcastEpisodeAction.php index c6625e641..7f838581f 100644 --- a/src/Controller/Frontend/PublicPages/PodcastEpisodeAction.php +++ b/src/Controller/Frontend/PublicPages/PodcastEpisodeAction.php @@ -25,7 +25,7 @@ final class PodcastEpisodeAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id, string $episode_id ): ResponseInterface { diff --git a/src/Controller/Frontend/PublicPages/PodcastEpisodesAction.php b/src/Controller/Frontend/PublicPages/PodcastEpisodesAction.php index 80c045098..5a1c55b80 100644 --- a/src/Controller/Frontend/PublicPages/PodcastEpisodesAction.php +++ b/src/Controller/Frontend/PublicPages/PodcastEpisodesAction.php @@ -25,7 +25,7 @@ final class PodcastEpisodesAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id ): ResponseInterface { $router = $request->getRouter(); diff --git a/src/Controller/Frontend/PublicPages/PodcastFeedAction.php b/src/Controller/Frontend/PublicPages/PodcastFeedAction.php index 3e72f0b36..828a0a65f 100644 --- a/src/Controller/Frontend/PublicPages/PodcastFeedAction.php +++ b/src/Controller/Frontend/PublicPages/PodcastFeedAction.php @@ -53,7 +53,7 @@ final class PodcastFeedAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $podcast_id ): ResponseInterface { $this->router = $request->getRouter(); diff --git a/src/Controller/Frontend/PublicPages/PodcastsController.php b/src/Controller/Frontend/PublicPages/PodcastsController.php index 920886fff..d1eb4e44e 100644 --- a/src/Controller/Frontend/PublicPages/PodcastsController.php +++ b/src/Controller/Frontend/PublicPages/PodcastsController.php @@ -20,7 +20,7 @@ final class PodcastsController public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Frontend/PublicPages/RequestsAction.php b/src/Controller/Frontend/PublicPages/RequestsAction.php index d55b5fc12..66f3a4bb7 100644 --- a/src/Controller/Frontend/PublicPages/RequestsAction.php +++ b/src/Controller/Frontend/PublicPages/RequestsAction.php @@ -20,7 +20,7 @@ final class RequestsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Frontend/PublicPages/ScheduleAction.php b/src/Controller/Frontend/PublicPages/ScheduleAction.php index ce29baab2..299dc6ff3 100644 --- a/src/Controller/Frontend/PublicPages/ScheduleAction.php +++ b/src/Controller/Frontend/PublicPages/ScheduleAction.php @@ -14,8 +14,8 @@ final class ScheduleAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id, - bool $embed = false + string $station_id, + ?string $embed = null ): ResponseInterface { $station = $request->getStation(); @@ -26,7 +26,7 @@ final class ScheduleAction $router = $request->getRouter(); $pageClass = 'schedule station-' . $station->getShortName(); - if ($embed) { + if (null !== $embed) { $pageClass .= ' embed'; } diff --git a/src/Controller/Frontend/PublicPages/WebDjAction.php b/src/Controller/Frontend/PublicPages/WebDjAction.php index 2de4550e3..7861652b7 100644 --- a/src/Controller/Frontend/PublicPages/WebDjAction.php +++ b/src/Controller/Frontend/PublicPages/WebDjAction.php @@ -22,7 +22,7 @@ final class WebDjAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Stations/AutomationAction.php b/src/Controller/Stations/AutomationAction.php index 3412674b4..5d169cb04 100644 --- a/src/Controller/Stations/AutomationAction.php +++ b/src/Controller/Stations/AutomationAction.php @@ -13,7 +13,7 @@ final class AutomationAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); diff --git a/src/Controller/Stations/BulkMediaAction.php b/src/Controller/Stations/BulkMediaAction.php index 690a8f7dc..e85e85f01 100644 --- a/src/Controller/Stations/BulkMediaAction.php +++ b/src/Controller/Stations/BulkMediaAction.php @@ -13,7 +13,7 @@ final class BulkMediaAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); diff --git a/src/Controller/Stations/EditLiquidsoapConfigAction.php b/src/Controller/Stations/EditLiquidsoapConfigAction.php index 511abdea4..373903f89 100644 --- a/src/Controller/Stations/EditLiquidsoapConfigAction.php +++ b/src/Controller/Stations/EditLiquidsoapConfigAction.php @@ -22,7 +22,7 @@ final class EditLiquidsoapConfigAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Stations/FallbackAction.php b/src/Controller/Stations/FallbackAction.php index 56a27ced4..43b6d3550 100644 --- a/src/Controller/Stations/FallbackAction.php +++ b/src/Controller/Stations/FallbackAction.php @@ -13,7 +13,7 @@ final class FallbackAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); diff --git a/src/Controller/Stations/FilesAction.php b/src/Controller/Stations/FilesAction.php index 1ebec8aaf..999b71349 100644 --- a/src/Controller/Stations/FilesAction.php +++ b/src/Controller/Stations/FilesAction.php @@ -23,7 +23,7 @@ final class FilesAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Stations/LogsController.php b/src/Controller/Stations/LogsController.php index 983222dc6..5581bf2b2 100644 --- a/src/Controller/Stations/LogsController.php +++ b/src/Controller/Stations/LogsController.php @@ -15,7 +15,7 @@ final class LogsController extends AbstractLogViewerController public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); @@ -27,7 +27,7 @@ final class LogsController extends AbstractLogViewerController public function viewAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $log, ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Stations/MountsAction.php b/src/Controller/Stations/MountsAction.php index 1ff81b07b..1a1afff31 100644 --- a/src/Controller/Stations/MountsAction.php +++ b/src/Controller/Stations/MountsAction.php @@ -19,7 +19,7 @@ final class MountsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); $station = $request->getStation(); diff --git a/src/Controller/Stations/PlaylistsAction.php b/src/Controller/Stations/PlaylistsAction.php index 099589007..a170c93ed 100644 --- a/src/Controller/Stations/PlaylistsAction.php +++ b/src/Controller/Stations/PlaylistsAction.php @@ -20,7 +20,7 @@ final class PlaylistsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Stations/PodcastsAction.php b/src/Controller/Stations/PodcastsAction.php index bbdd8eef6..793933dce 100644 --- a/src/Controller/Stations/PodcastsAction.php +++ b/src/Controller/Stations/PodcastsAction.php @@ -15,7 +15,7 @@ final class PodcastsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); $station = $request->getStation(); diff --git a/src/Controller/Stations/ProfileController.php b/src/Controller/Stations/ProfileController.php index da4511345..a372d6f9f 100644 --- a/src/Controller/Stations/ProfileController.php +++ b/src/Controller/Stations/ProfileController.php @@ -24,7 +24,7 @@ final class ProfileController public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $view = $request->getView(); @@ -198,7 +198,7 @@ final class ProfileController public function editAction( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); @@ -220,7 +220,7 @@ final class ProfileController public function toggleAction( ServerRequest $request, Response $response, - int|string $station_id, + string $station_id, string $feature, string $csrf ): ResponseInterface { diff --git a/src/Controller/Stations/QueueAction.php b/src/Controller/Stations/QueueAction.php index b3026b42f..1eba3d238 100644 --- a/src/Controller/Stations/QueueAction.php +++ b/src/Controller/Stations/QueueAction.php @@ -13,7 +13,7 @@ final class QueueAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); $station = $request->getStation(); diff --git a/src/Controller/Stations/RemotesAction.php b/src/Controller/Stations/RemotesAction.php index 553679f22..301a76ddd 100644 --- a/src/Controller/Stations/RemotesAction.php +++ b/src/Controller/Stations/RemotesAction.php @@ -13,7 +13,7 @@ final class RemotesAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); diff --git a/src/Controller/Stations/Reports/ListenersAction.php b/src/Controller/Stations/Reports/ListenersAction.php index 0c69117d6..c14e5e7c7 100644 --- a/src/Controller/Stations/Reports/ListenersAction.php +++ b/src/Controller/Stations/Reports/ListenersAction.php @@ -13,7 +13,7 @@ final class ListenersAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $router = $request->getRouter(); diff --git a/src/Controller/Stations/Reports/OverviewAction.php b/src/Controller/Stations/Reports/OverviewAction.php index b47662cb2..9abe36635 100644 --- a/src/Controller/Stations/Reports/OverviewAction.php +++ b/src/Controller/Stations/Reports/OverviewAction.php @@ -19,7 +19,7 @@ final class OverviewAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { // Get current analytics level. if (!$this->settingsRepo->readSettings()->isAnalyticsEnabled()) { diff --git a/src/Controller/Stations/Reports/PerformanceAction.php b/src/Controller/Stations/Reports/PerformanceAction.php index 44c0afeae..f77d4efd6 100644 --- a/src/Controller/Stations/Reports/PerformanceAction.php +++ b/src/Controller/Stations/Reports/PerformanceAction.php @@ -13,7 +13,7 @@ final class PerformanceAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); diff --git a/src/Controller/Stations/Reports/RequestsAction.php b/src/Controller/Stations/Reports/RequestsAction.php index cb5b40e67..bccfe02c4 100644 --- a/src/Controller/Stations/Reports/RequestsAction.php +++ b/src/Controller/Stations/Reports/RequestsAction.php @@ -13,7 +13,7 @@ final class RequestsAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); $station = $request->getStation(); diff --git a/src/Controller/Stations/Reports/SoundExchangeAction.php b/src/Controller/Stations/Reports/SoundExchangeAction.php index 0b000c851..b4a911a28 100644 --- a/src/Controller/Stations/Reports/SoundExchangeAction.php +++ b/src/Controller/Stations/Reports/SoundExchangeAction.php @@ -14,7 +14,7 @@ final class SoundExchangeAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $tzObject = $request->getStation()->getTimezoneObject(); diff --git a/src/Controller/Stations/Reports/TimelineAction.php b/src/Controller/Stations/Reports/TimelineAction.php index 4cc0e9f91..b1e77e52a 100644 --- a/src/Controller/Stations/Reports/TimelineAction.php +++ b/src/Controller/Stations/Reports/TimelineAction.php @@ -13,7 +13,7 @@ final class TimelineAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); $station = $request->getStation(); diff --git a/src/Controller/Stations/SftpUsersAction.php b/src/Controller/Stations/SftpUsersAction.php index 84bc5942f..7715c1cda 100644 --- a/src/Controller/Stations/SftpUsersAction.php +++ b/src/Controller/Stations/SftpUsersAction.php @@ -23,7 +23,7 @@ final class SftpUsersAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); diff --git a/src/Controller/Stations/StreamersAction.php b/src/Controller/Stations/StreamersAction.php index 800afa16a..2627dc597 100644 --- a/src/Controller/Stations/StreamersAction.php +++ b/src/Controller/Stations/StreamersAction.php @@ -25,7 +25,7 @@ final class StreamersAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $station = $request->getStation(); $backend = $request->getStationBackend(); diff --git a/src/Controller/Stations/UploadStereoToolConfigAction.php b/src/Controller/Stations/UploadStereoToolConfigAction.php index c7f9f1ef8..b897f8d9e 100644 --- a/src/Controller/Stations/UploadStereoToolConfigAction.php +++ b/src/Controller/Stations/UploadStereoToolConfigAction.php @@ -13,7 +13,7 @@ final class UploadStereoToolConfigAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $backendConfig = $request->getStation()->getBackendConfig(); $router = $request->getRouter(); diff --git a/src/Controller/Stations/WebhooksAction.php b/src/Controller/Stations/WebhooksAction.php index 848a29533..956a1753d 100644 --- a/src/Controller/Stations/WebhooksAction.php +++ b/src/Controller/Stations/WebhooksAction.php @@ -21,7 +21,7 @@ final class WebhooksAction public function __invoke( ServerRequest $request, Response $response, - int|string $station_id + string $station_id ): ResponseInterface { $router = $request->getRouter(); diff --git a/src/ControllerInvoker.php b/src/ControllerInvoker.php deleted file mode 100644 index 5796f4f43..000000000 --- a/src/ControllerInvoker.php +++ /dev/null @@ -1,33 +0,0 @@ - $request, - 'response' => $response, - ]; - $parameters += $routeArguments; - - return $this->invoker->call($callable, $parameters); - } -} diff --git a/src/Entity/Repository/StationMediaRepository.php b/src/Entity/Repository/StationMediaRepository.php index e0028ea73..57e37654a 100644 --- a/src/Entity/Repository/StationMediaRepository.php +++ b/src/Entity/Repository/StationMediaRepository.php @@ -47,13 +47,13 @@ class StationMediaRepository extends Repository } /** - * @param mixed $id + * @param int|string $id * @param Entity\Station|Entity\StorageLocation $source * */ - public function find(mixed $id, Entity\Station|Entity\StorageLocation $source): ?Entity\StationMedia + public function find(int|string $id, Entity\Station|Entity\StorageLocation $source): ?Entity\StationMedia { - if (is_string($id) && Entity\StationMedia::UNIQUE_ID_LENGTH === strlen($id)) { + if (!is_numeric($id) && Entity\StationMedia::UNIQUE_ID_LENGTH === strlen($id)) { $media = $this->findByUniqueId($id, $source); if ($media instanceof Entity\StationMedia) { return $media; @@ -66,7 +66,7 @@ class StationMediaRepository extends Repository $media = $this->repository->findOneBy( [ 'storage_location' => $storageLocation, - 'id' => $id, + 'id' => $id, ] ); @@ -86,7 +86,7 @@ class StationMediaRepository extends Repository $media = $this->repository->findOneBy( [ 'storage_location' => $storageLocation, - 'path' => $path, + 'path' => $path, ] ); @@ -120,7 +120,7 @@ class StationMediaRepository extends Repository $media = $this->repository->findOneBy( [ 'storage_location' => $storageLocation, - 'unique_id' => $uniqueId, + 'unique_id' => $uniqueId, ] ); diff --git a/src/Entity/Repository/StationMountRepository.php b/src/Entity/Repository/StationMountRepository.php index 54e7c9b6e..41c45baf3 100644 --- a/src/Entity/Repository/StationMountRepository.php +++ b/src/Entity/Repository/StationMountRepository.php @@ -15,12 +15,12 @@ use Azura\Files\ExtendedFilesystemInterface; */ class StationMountRepository extends Repository { - public function find(Entity\Station $station, int $id): ?Entity\StationMount + public function find(Entity\Station $station, int|string $id): ?Entity\StationMount { return $this->repository->findOneBy( [ 'station' => $station, - 'id' => $id, + 'id' => (int)$id, ] ); } diff --git a/src/Entity/Repository/UserRepository.php b/src/Entity/Repository/UserRepository.php index eb7e992cb..331ed8634 100644 --- a/src/Entity/Repository/UserRepository.php +++ b/src/Entity/Repository/UserRepository.php @@ -12,9 +12,9 @@ use App\Entity; */ class UserRepository extends Repository { - public function find(int $id): ?Entity\User + public function find(int|string $id): ?Entity\User { - return $this->repository->find($id); + return $this->repository->find((int)$id); } public function findByEmail(string $email): ?Entity\User