Class finalization part 2.

src/Acl.php

@@ -17,17 +17,17 @@ use Psr\Http\Message\ServerRequestInterface;
 use function in_array;
 use function is_array;
 
-class Acl
+final class Acl
 {
     use RequestAwareTrait;
 
-    protected array $permissions;
+    private array $permissions;
 
-    protected ?array $actions;
+    private ?array $actions;
 
     public function __construct(
-        protected EntityManagerInterface $em,
-        protected EventDispatcherInterface $dispatcher
+        private readonly EntityManagerInterface $em,
+        private readonly EventDispatcherInterface $dispatcher
     ) {
         $this->reload();
     }

src/AppFactory.php

@@ -18,7 +18,7 @@ use Slim\App;
 use Slim\Factory\ServerRequestCreatorFactory;
 use Slim\Handlers\Strategies\RequestResponseNamedArgs;
 
-class AppFactory
+final class AppFactory
 {
     public static function createApp(
         array $appEnvironment = [],

src/Assets.php

@@ -21,30 +21,30 @@ use function random_bytes;
  * Inspired by Asseter by Adam Banaszkiewicz: https://github.com/requtize
  * @link      https://github.com/requtize/assetter
  */
-class Assets
+final class Assets
 {
     use RequestAwareTrait;
 
     /** @var array<string, array> Known libraries loaded in initialization. */
-    protected array $libraries = [];
+    private array $libraries = [];
 
     /** @var array<string, string> An optional array lookup for versioned files. */
-    protected array $versioned_files = [];
+    private array $versioned_files = [];
 
     /** @var array<string, array> Loaded libraries. */
-    protected array $loaded = [];
+    private array $loaded = [];
 
     /** @var bool Whether the current loaded libraries have been sorted by order. */
-    protected bool $is_sorted = true;
+    private bool $is_sorted = true;
 
     /** @var string A randomly generated number-used-once (nonce) for inline CSP. */
-    protected string $csp_nonce;
+    private string $csp_nonce;
 
     /** @var array The loaded domains that should be included in the CSP header. */
-    protected array $csp_domains;
+    private array $csp_domains;
 
     public function __construct(
-        protected Environment $environment,
+        private readonly Environment $environment,
         array $libraries,
     ) {
         foreach ($libraries as $library_name => $library) {
@@ -61,7 +61,7 @@ class Assets
         $this->csp_domains = [];
     }
 
-    protected function addVueComponents(array $vueComponents = []): void
+    private function addVueComponents(array $vueComponents = []): void
     {
         if (!empty($vueComponents['entrypoints'])) {
             foreach ($vueComponents['entrypoints'] as $componentName => $componentDeps) {
@@ -417,7 +417,7 @@ class Assets
     /**
      * Sort the list of loaded libraries.
      */
-    protected function sort(): void
+    private function sort(): void
     {
         if (!$this->is_sorted) {
             uasort(
@@ -431,7 +431,7 @@ class Assets
         }
     }
 
-    protected function resolveAttributes(array $file, array $defaults): array
+    private function resolveAttributes(array $file, array $defaults): array
     {
         if (isset($file['src'])) {
             $defaults['src'] = $this->getUrl($file['src']);
@@ -457,7 +457,7 @@ class Assets
      *
      * @return string[]
      */
-    protected function compileAttributes(array $attributes): array
+    private function compileAttributes(array $attributes): array
     {
         $compiled_attributes = [];
         foreach ($attributes as $attr_key => $attr_val) {
@@ -531,7 +531,7 @@ class Assets
      *
      * @param string $src
      */
-    protected function addDomainToCsp(string $src): void
+    private function addDomainToCsp(string $src): void
     {
         $uri = new Uri($src);
 

src/Auth.php

@@ -9,7 +9,7 @@ use App\Entity\User;
 use App\Exception\NotLoggedInException;
 use Mezzio\Session\SessionInterface;
 
-class Auth
+final class Auth
 {
     public const SESSION_IS_LOGIN_COMPLETE_KEY = 'is_login_complete';
     public const SESSION_USER_ID_KEY = 'user_id';
@@ -18,14 +18,14 @@ class Auth
     /** @var int The window of valid one-time passwords outside the current timestamp. */
     public const TOTP_WINDOW = 5;
 
-    protected bool|User|null $user = null;
+    private bool|User|null $user = null;
 
-    protected bool|User|null $masqueraded_user = null;
+    private bool|User|null $masqueraded_user = null;
 
     public function __construct(
-        protected UserRepository $userRepo,
-        protected SessionInterface $session,
-        protected Environment $environment
+        private readonly UserRepository $userRepo,
+        private readonly SessionInterface $session,
+        private readonly Environment $environment
     ) {
     }
 

src/Controller/Api/Stations/LogsAction.php

@@ -129,6 +129,10 @@ final class LogsAction
                     'tail' => false,
                 ];
                 break;
+
+            case FrontendAdapters::Remote:
+                // Noop
+                break;
         }
 
         return $logPaths;

src/Customization.php

@@ -12,22 +12,22 @@ use App\Enums\SupportedThemes;
 use App\Http\ServerRequest;
 use Psr\Http\Message\ServerRequestInterface;
 
-class Customization
+final class Customization
 {
-    protected ?Entity\User $user = null;
+    private ?Entity\User $user = null;
 
-    protected Entity\Settings $settings;
+    private Entity\Settings $settings;
 
-    protected SupportedLocales $locale;
+    private SupportedLocales $locale;
 
-    protected SupportedThemes $theme;
+    private SupportedThemes $theme;
 
-    protected SupportedThemes $publicTheme;
+    private SupportedThemes $publicTheme;
 
-    protected string $instanceName = '';
+    private string $instanceName = '';
 
     public function __construct(
-        protected Environment $environment,
+        private readonly Environment $environment,
         Entity\Repository\SettingsRepository $settingsRepo,
         ServerRequestInterface $request
     ) {
@@ -46,7 +46,7 @@ class Customization
         $this->locale = SupportedLocales::createFromRequest($this->environment, $request);
     }
 
-    protected function determineTheme(
+    private function determineTheme(
         ServerRequestInterface $request,
         bool $isPublicTheme = false
     ): SupportedThemes {
@@ -186,8 +186,4 @@ class Customization
     {
         return $this->settings->getEnableWebsockets();
     }
-
-    public function registerLocale(SupportedLocales $locale): void
-    {
-    }
 }

src/Nginx/HlsListeners.php

@@ -6,6 +6,7 @@ namespace App\Nginx;
 
 use App\Entity\Station;
 use Doctrine\ORM\EntityManagerInterface;
+use JsonException;
 use NowPlaying\Result\Client;
 use NowPlaying\Result\Result;
 use Psr\Log\LoggerInterface;
@@ -102,7 +103,7 @@ final class HlsListeners
     ): ?Client {
         try {
             $rowJson = json_decode($row, true, 512, JSON_THROW_ON_ERROR);
-        } catch (\JsonException) {
+        } catch (JsonException) {
             return null;
         }
 

src/OpenApi.php

@@ -104,7 +104,7 @@ use OpenApi\Attributes as OA;
         in: "header"
     )
 ]
-class OpenApi
+final class OpenApi
 {
     public const SAMPLE_TIMESTAMP = 1609480800;
 

src/Paginator.php

@@ -25,30 +25,30 @@ use Traversable;
  * @template T of mixed
  * @implements IteratorAggregate<TKey, T>
  */
-class Paginator implements IteratorAggregate, Countable
+final class Paginator implements IteratorAggregate, Countable
 {
-    protected RouterInterface $router;
+    private RouterInterface $router;
 
     /** @var int<1,max> The maximum number of records that can be viewed per page for unauthenticated users. */
-    protected int $maxPerPage = 25;
+    private int $maxPerPage = 25;
 
     /** @var bool Whether the current request is from jQuery Bootgrid */
-    protected bool $isBootgrid = false;
+    private bool $isBootgrid = false;
 
     /** @var bool Whether the user is currently authenticated on this request. */
-    protected bool $isAuthenticated = false;
+    private bool $isAuthenticated = false;
 
     /** @var bool Whether to show pagination controls. */
-    protected bool $isDisabled = true;
+    private bool $isDisabled = true;
 
     /** @var callable|null A callable postprocessor that can be run on each result. */
-    protected $postprocessor;
+    private $postprocessor;
 
     /**
      * @param Pagerfanta<T> $paginator
      */
     public function __construct(
-        protected Pagerfanta $paginator,
+        private readonly Pagerfanta $paginator,
         ServerRequestInterface $request
     ) {
         $this->router = $request->getAttribute(ServerRequest::ATTR_ROUTER);

src/Plugins.php

@@ -10,12 +10,12 @@ use Doctrine\Inflector\InflectorFactory;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
 
-class Plugins
+final class Plugins
 {
     /** @var array An array of all plugins and their capabilities. */
-    protected array $plugins = [];
+    private array $plugins = [];
 
-    protected Inflector $inflector;
+    private Inflector $inflector;
 
     public function __construct(string $baseDir)
     {

src/Radio/Frontend/Icecast.php

@@ -30,7 +30,7 @@ final class Icecast extends AbstractFrontend
             try {
                 $this->supervisor->signalProcess($program_name, 'HUP');
                 $this->logger->info(
-                    'Adapter "' . static::class . '" reloaded.',
+                    'Adapter "' . self::class . '" reloaded.',
                     ['station_id' => $station->getId(), 'station_name' => $station->getName()]
                 );
             } catch (SupervisorLibException $e) {

src/Radio/StereoTool.php

@@ -6,6 +6,7 @@ namespace App\Radio;
 
 use App\Entity;
 use App\Environment;
+use RuntimeException;
 use Symfony\Component\Process\Process;
 
 final class StereoTool
@@ -45,7 +46,7 @@ final class StereoTool
 
         try {
             $process->run();
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException) {
             return null;
         }
 

src/RateLimit.php

@@ -11,13 +11,13 @@ use Symfony\Component\Cache\Adapter\ProxyAdapter;
 use Symfony\Component\RateLimiter\RateLimiterFactory;
 use Symfony\Component\RateLimiter\Storage\CacheStorage;
 
-class RateLimit
+final class RateLimit
 {
-    protected CacheItemPoolInterface $psr6Cache;
+    private CacheItemPoolInterface $psr6Cache;
 
     public function __construct(
-        protected LockFactory $lockFactory,
-        protected Environment $environment,
+        private readonly LockFactory $lockFactory,
+        private readonly Environment $environment,
         CacheItemPoolInterface $cacheItemPool
     ) {
         $this->psr6Cache = new ProxyAdapter($cacheItemPool, 'ratelimit.');

src/Sync/NowPlaying/Task/BuildQueueTask.php

@@ -7,10 +7,10 @@ namespace App\Sync\NowPlaying\Task;
 use App\Entity\Station;
 use App\Radio\AutoDJ;
 
-class BuildQueueTask implements NowPlayingTaskInterface
+final class BuildQueueTask implements NowPlayingTaskInterface
 {
     public function __construct(
-        protected AutoDJ\Queue $queue
+        private readonly AutoDJ\Queue $queue
     ) {
     }
 

src/Sync/NowPlaying/Task/NowPlayingTask.php

@@ -23,20 +23,20 @@ use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Messenger\MessageBus;
 
-class NowPlayingTask implements NowPlayingTaskInterface, EventSubscriberInterface
+final class NowPlayingTask implements NowPlayingTaskInterface, EventSubscriberInterface
 {
     public function __construct(
-        protected Adapters $adapters,
-        protected CacheInterface $cache,
-        protected EventDispatcherInterface $eventDispatcher,
-        protected MessageBus $messageBus,
-        protected RouterInterface $router,
-        protected Entity\Repository\ListenerRepository $listenerRepo,
-        protected Entity\Repository\SettingsRepository $settingsRepo,
-        protected Entity\ApiGenerator\NowPlayingApiGenerator $nowPlayingApiGenerator,
-        protected ReloadableEntityManagerInterface $em,
-        protected LoggerInterface $logger,
-        protected HlsListeners $hlsListeners,
+        private readonly Adapters $adapters,
+        private readonly CacheInterface $cache,
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly MessageBus $messageBus,
+        private readonly RouterInterface $router,
+        private readonly Entity\Repository\ListenerRepository $listenerRepo,
+        private readonly Entity\Repository\SettingsRepository $settingsRepo,
+        private readonly Entity\ApiGenerator\NowPlayingApiGenerator $nowPlayingApiGenerator,
+        private readonly ReloadableEntityManagerInterface $em,
+        private readonly LoggerInterface $logger,
+        private readonly HlsListeners $hlsListeners,
     ) {
     }
 

src/Sync/Task/CheckFolderPlaylistsTask.php

@@ -11,11 +11,10 @@ use Azura\Files\ExtendedFilesystemInterface;
 use Doctrine\ORM\Query;
 use Psr\Log\LoggerInterface;
 
-class CheckFolderPlaylistsTask extends AbstractTask
+final class CheckFolderPlaylistsTask extends AbstractTask
 {
     public function __construct(
-        protected Entity\Repository\StationPlaylistMediaRepository $spmRepo,
-        protected Entity\Repository\StationPlaylistFolderRepository $folderRepo,
+        private readonly Entity\Repository\StationPlaylistMediaRepository $spmRepo,
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger,
     ) {

src/Sync/Task/CheckMediaTask.php

@@ -19,14 +19,13 @@ use League\Flysystem\UnableToRetrieveMetadata;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\MessageBus;
 
-class CheckMediaTask extends AbstractTask
+final class CheckMediaTask extends AbstractTask
 {
     public function __construct(
-        protected Entity\Repository\StationMediaRepository $mediaRepo,
-        protected Entity\Repository\StorageLocationRepository $storageLocationRepo,
-        protected Entity\Repository\UnprocessableMediaRepository $unprocessableMediaRepo,
-        protected MessageBus $messageBus,
-        protected QueueManagerInterface $queueManager,
+        private readonly Entity\Repository\StationMediaRepository $mediaRepo,
+        private readonly Entity\Repository\UnprocessableMediaRepository $unprocessableMediaRepo,
+        private readonly MessageBus $messageBus,
+        private readonly QueueManagerInterface $queueManager,
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger
     ) {

src/Sync/Task/CheckRequestsTask.php

@@ -13,12 +13,12 @@ use App\Radio\Enums\LiquidsoapQueues;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
-class CheckRequestsTask extends AbstractTask
+final class CheckRequestsTask extends AbstractTask
 {
     public function __construct(
-        protected Entity\Repository\StationRequestRepository $requestRepo,
-        protected Adapters $adapters,
-        protected EventDispatcherInterface $dispatcher,
+        private readonly Entity\Repository\StationRequestRepository $requestRepo,
+        private readonly Adapters $adapters,
+        private readonly EventDispatcherInterface $dispatcher,
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger
     ) {

src/Sync/Task/CheckUpdatesTask.php

@@ -11,13 +11,13 @@ use App\Service\AzuraCastCentral;
 use GuzzleHttp\Exception\TransferException;
 use Psr\Log\LoggerInterface;
 
-class CheckUpdatesTask extends AbstractTask
+final class CheckUpdatesTask extends AbstractTask
 {
-    protected const UPDATE_THRESHOLD = 3780;
+    private const UPDATE_THRESHOLD = 3780;
 
     public function __construct(
-        protected Entity\Repository\SettingsRepository $settingsRepo,
-        protected AzuraCastCentral $azuracastCentral,
+        private readonly Entity\Repository\SettingsRepository $settingsRepo,
+        private readonly AzuraCastCentral $azuracastCentral,
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger
     ) {

src/Sync/Task/CleanupHistoryTask.php

@@ -8,13 +8,13 @@ use App\Doctrine\ReloadableEntityManagerInterface;
 use App\Entity;
 use Psr\Log\LoggerInterface;
 
-class CleanupHistoryTask extends AbstractTask
+final class CleanupHistoryTask extends AbstractTask
 {
     public function __construct(
-        protected Entity\Repository\SettingsRepository $settingsRepo,
-        protected Entity\Repository\SongHistoryRepository $historyRepo,
-        protected Entity\Repository\StationQueueRepository $queueRepo,
-        protected Entity\Repository\ListenerRepository $listenerRepo,
+        private readonly Entity\Repository\SettingsRepository $settingsRepo,
+        private readonly Entity\Repository\SongHistoryRepository $historyRepo,
+        private readonly Entity\Repository\StationQueueRepository $queueRepo,
+        private readonly Entity\Repository\ListenerRepository $listenerRepo,
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger
     ) {

src/Sync/Task/CleanupLoginTokensTask.php

@@ -8,10 +8,10 @@ use App\Doctrine\ReloadableEntityManagerInterface;
 use App\Entity;
 use Psr\Log\LoggerInterface;
 
-class CleanupLoginTokensTask extends AbstractTask
+final class CleanupLoginTokensTask extends AbstractTask
 {
     public function __construct(
-        protected Entity\Repository\UserLoginTokenRepository $loginTokenRepo,
+        private readonly Entity\Repository\UserLoginTokenRepository $loginTokenRepo,
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger
     ) {

src/Sync/Task/CleanupRelaysTask.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Sync\Task;
 
-class CleanupRelaysTask extends AbstractTask
+final class CleanupRelaysTask extends AbstractTask
 {
     public static function getSchedulePattern(): string
     {

src/Sync/Task/CleanupStorageTask.php

@@ -10,7 +10,7 @@ use League\Flysystem\StorageAttributes;
 use Symfony\Component\Finder\Finder;
 use Throwable;
 
-class CleanupStorageTask extends AbstractTask
+final class CleanupStorageTask extends AbstractTask
 {
     public static function getSchedulePattern(): string
     {

src/Sync/Task/MoveBroadcastsTask.php

@@ -10,7 +10,7 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\Finder\Finder;
 use Throwable;
 
-class MoveBroadcastsTask extends AbstractTask
+final class MoveBroadcastsTask extends AbstractTask
 {
     public static function getSchedulePattern(): string
     {
@@ -20,8 +20,8 @@ class MoveBroadcastsTask extends AbstractTask
     public function __construct(
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger,
-        protected Entity\Repository\StationStreamerBroadcastRepository $broadcastRepo,
-        protected Entity\Repository\StorageLocationRepository $storageLocationRepo,
+        private readonly Entity\Repository\StationStreamerBroadcastRepository $broadcastRepo,
+        private readonly Entity\Repository\StorageLocationRepository $storageLocationRepo,
     ) {
         parent::__construct($em, $logger);
     }

src/Sync/Task/QueueInterruptingTracks.php

@@ -15,13 +15,13 @@ use Monolog\Logger;
 use Monolog\LogRecord;
 use Psr\EventDispatcher\EventDispatcherInterface;
 
-class QueueInterruptingTracks extends AbstractTask
+final class QueueInterruptingTracks extends AbstractTask
 {
     public function __construct(
-        protected Queue $queue,
-        protected Adapters $adapters,
-        protected EventDispatcherInterface $eventDispatcher,
-        protected Logger $monolog,
+        private readonly Queue $queue,
+        private readonly Adapters $adapters,
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly Logger $monolog,
         ReloadableEntityManagerInterface $em,
     ) {
         parent::__construct($em, $monolog);

src/Sync/Task/ReactivateStreamerTask.php

@@ -4,20 +4,8 @@ declare(strict_types=1);
 
 namespace App\Sync\Task;
 
-use App\Doctrine\ReloadableEntityManagerInterface;
-use App\Entity;
-use Psr\Log\LoggerInterface;
-
-class ReactivateStreamerTask extends AbstractTask
+final class ReactivateStreamerTask extends AbstractTask
 {
-    public function __construct(
-        protected Entity\Repository\StationStreamerRepository $streamerRepo,
-        ReloadableEntityManagerInterface $em,
-        LoggerInterface $logger
-    ) {
-        parent::__construct($em, $logger);
-    }
-
     public static function getSchedulePattern(): string
     {
         return self::SCHEDULE_EVERY_MINUTE;

src/Sync/Task/RotateLogsTask.php

@@ -6,28 +6,22 @@ namespace App\Sync\Task;
 
 use App\Doctrine\ReloadableEntityManagerInterface;
 use App\Entity;
-use App\Environment;
 use App\Nginx\ConfigWriter;
 use App\Nginx\Nginx;
-use App\Radio\Adapters;
 use League\Flysystem\StorageAttributes;
 use Psr\Log\LoggerInterface;
-use Supervisor\SupervisorInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Throwable;
 
-class RotateLogsTask extends AbstractTask
+final class RotateLogsTask extends AbstractTask
 {
     public function __construct(
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger,
-        protected Environment $environment,
-        protected Adapters $adapters,
-        protected SupervisorInterface $supervisor,
-        protected Entity\Repository\SettingsRepository $settingsRepo,
-        protected Entity\Repository\StorageLocationRepository $storageLocationRepo,
-        protected Nginx $nginx,
+        private readonly Entity\Repository\SettingsRepository $settingsRepo,
+        private readonly Entity\Repository\StorageLocationRepository $storageLocationRepo,
+        private readonly Nginx $nginx,
     ) {
         parent::__construct($em, $logger);
     }
@@ -85,7 +79,7 @@ class RotateLogsTask extends AbstractTask
         }
     }
 
-    protected function rotateBackupStorage(
+    private function rotateBackupStorage(
         Entity\StorageLocation $storageLocation,
         int $copiesToKeep
     ): void {
@@ -115,7 +109,7 @@ class RotateLogsTask extends AbstractTask
         }
     }
 
-    protected function cleanUpIcecastLog(Entity\Station $station): void
+    private function cleanUpIcecastLog(Entity\Station $station): void
     {
         $config_path = $station->getRadioConfigDir();
 
@@ -135,7 +129,7 @@ class RotateLogsTask extends AbstractTask
         }
     }
 
-    protected function rotateHlsLog(Entity\Station $station): bool
+    private function rotateHlsLog(Entity\Station $station): bool
     {
         $hlsLogFile = ConfigWriter::getHlsLogFile($station);
         $hlsLogBackup = $hlsLogFile . '.1';

src/Sync/Task/RunAnalyticsTask.php

@@ -9,13 +9,13 @@ use App\Entity;
 use Carbon\CarbonImmutable;
 use Psr\Log\LoggerInterface;
 
-class RunAnalyticsTask extends AbstractTask
+final class RunAnalyticsTask extends AbstractTask
 {
     public function __construct(
-        protected Entity\Repository\SettingsRepository $settingsRepo,
-        protected Entity\Repository\AnalyticsRepository $analyticsRepo,
-        protected Entity\Repository\ListenerRepository $listenerRepo,
-        protected Entity\Repository\SongHistoryRepository $historyRepo,
+        private readonly Entity\Repository\SettingsRepository $settingsRepo,
+        private readonly Entity\Repository\AnalyticsRepository $analyticsRepo,
+        private readonly Entity\Repository\ListenerRepository $listenerRepo,
+        private readonly Entity\Repository\SongHistoryRepository $historyRepo,
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger
     ) {

src/Sync/Task/RunBackupTask.php

@@ -13,12 +13,12 @@ use Carbon\CarbonInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\MessageBus;
 
-class RunBackupTask extends AbstractTask
+final class RunBackupTask extends AbstractTask
 {
     public function __construct(
-        protected MessageBus $messageBus,
-        protected Application $console,
-        protected Entity\Repository\SettingsRepository $settingsRepo,
+        private readonly MessageBus $messageBus,
+        private readonly Application $console,
+        private readonly Entity\Repository\SettingsRepository $settingsRepo,
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger
     ) {

src/Sync/Task/UpdateGeoLiteTask.php

@@ -6,7 +6,6 @@ namespace App\Sync\Task;
 
 use App\Doctrine\ReloadableEntityManagerInterface;
 use App\Entity;
-use App\Service\IpGeolocation;
 use App\Service\IpGeolocator\GeoLite;
 use Exception;
 use GuzzleHttp\Client;
@@ -15,14 +14,13 @@ use Psr\Log\LoggerInterface;
 use RuntimeException;
 use Symfony\Component\Process\Process;
 
-class UpdateGeoLiteTask extends AbstractTask
+final class UpdateGeoLiteTask extends AbstractTask
 {
-    protected const UPDATE_THRESHOLD = 86000;
+    private const UPDATE_THRESHOLD = 86000;
 
     public function __construct(
-        protected Client $httpClient,
-        protected IpGeolocation $geoLite,
-        protected Entity\Repository\SettingsRepository $settingsRepo,
+        private readonly Client $httpClient,
+        private readonly Entity\Repository\SettingsRepository $settingsRepo,
         ReloadableEntityManagerInterface $em,
         LoggerInterface $logger,
     ) {

src/Sync/Task/UpdateStorageLocationSizesTask.php

@@ -12,7 +12,7 @@ use Exception;
 use League\Flysystem\FileAttributes;
 use League\Flysystem\StorageAttributes;
 
-class UpdateStorageLocationSizesTask extends AbstractTask
+final class UpdateStorageLocationSizesTask extends AbstractTask
 {
     public static function getSchedulePattern(): string
     {
@@ -70,7 +70,7 @@ class UpdateStorageLocationSizesTask extends AbstractTask
 
         $this->logger->info('Storage location size updated.', [
             'storageLocation' => (string)$storageLocation,
-            'size'            => Quota::getReadableSize($used),
+            'size' => Quota::getReadableSize($used),
         ]);
     }
 }

src/Utilities/Arrays.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Utilities;
 
-class Arrays
+final class Arrays
 {
     /**
      * Flatten an array from format:

src/Utilities/File.php

@@ -13,7 +13,7 @@ use function stripos;
 /**
  * Static class that facilitates the uploading, reading and deletion of files in a controlled directory.
  */
-class File
+final class File
 {
     /**
      * @param string $path

src/Utilities/Json.php

@@ -7,7 +7,7 @@ namespace App\Utilities;
 use JsonException;
 use RuntimeException;
 
-class Json
+final class Json
 {
     public static function loadFromFile(
         string $path,

src/Utilities/Strings.php

@@ -6,7 +6,7 @@ namespace App\Utilities;
 
 use RuntimeException;
 
-class Strings
+final class Strings
 {
     /**
      * Truncate text (adding "..." if needed)

src/Utilities/Time.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Utilities;
 
-class Time
+final class Time
 {
     public static function displayTimeToSeconds(string|float|int $seconds = null): ?float
     {

src/Utilities/Urls.php

@@ -10,7 +10,7 @@ use GuzzleHttp\Psr7\Uri;
 use LogicException;
 use Psr\Http\Message\UriInterface;
 
-class Urls
+final class Urls
 {
     public static function getUri(?string $url): ?UriInterface
     {

src/Validator/Constraints/StationPortChecker.php

@@ -8,7 +8,7 @@ use Attribute;
 use Symfony\Component\Validator\Constraint;
 
 #[Attribute(Attribute::TARGET_CLASS)]
-class StationPortChecker extends Constraint
+final class StationPortChecker extends Constraint
 {
     public function getTargets(): string
     {

src/Validator/Constraints/StationPortCheckerValidator.php

@@ -10,13 +10,11 @@ use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
-class StationPortCheckerValidator extends ConstraintValidator
+final class StationPortCheckerValidator extends ConstraintValidator
 {
-    protected Configuration $configuration;
-
-    public function __construct(Configuration $configuration)
-    {
-        $this->configuration = $configuration;
+    public function __construct(
+        private readonly Configuration $configuration
+    ) {
     }
 
     public function validate(mixed $value, Constraint $constraint): void

src/Validator/Constraints/StorageLocation.php

@@ -8,7 +8,7 @@ use Attribute;
 use Symfony\Component\Validator\Constraint;
 
 #[Attribute(Attribute::TARGET_CLASS)]
-class StorageLocation extends Constraint
+final class StorageLocation extends Constraint
 {
     public function getTargets(): string
     {

src/Validator/Constraints/StorageLocationValidator.php

@@ -5,18 +5,16 @@ declare(strict_types=1);
 namespace App\Validator\Constraints;
 
 use App\Entity;
-use App\Radio\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
-class StorageLocationValidator extends ConstraintValidator
+final class StorageLocationValidator extends ConstraintValidator
 {
     public function __construct(
-        protected Configuration $configuration,
-        protected EntityManagerInterface $em,
+        private readonly EntityManagerInterface $em,
     ) {
     }
 

src/Validator/Constraints/UniqueEntity.php

@@ -25,7 +25,7 @@ use function is_string;
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
 #[Attribute(Attribute::TARGET_CLASS)]
-class UniqueEntity extends Constraint
+final class UniqueEntity extends Constraint
 {
     /** @var class-string|null */
     public ?string $entityClass = null;

src/Validator/Constraints/UniqueEntityValidator.php

@@ -35,10 +35,10 @@ use function is_string;
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
-class UniqueEntityValidator extends ConstraintValidator
+final class UniqueEntityValidator extends ConstraintValidator
 {
     public function __construct(
-        protected EntityManagerInterface $em
+        private readonly EntityManagerInterface $em
     ) {
     }
 

src/Version.php

@@ -13,24 +13,19 @@ use Symfony\Component\Process\Process;
 /**
  * App Core Framework Version
  */
-class Version
+final class Version
 {
     /** @var string Version that is displayed if no Git repository information is present. */
     public const FALLBACK_VERSION = '0.17.1';
 
-    // phpcs:disable Generic.Files.LineLength
-    public const LATEST_COMPOSE_REVISION = 12;
-    public const LATEST_COMPOSE_URL = 'https://raw.githubusercontent.com/AzuraCast/AzuraCast/main/docker-compose.sample.yml';
-
     public const UPDATE_URL = 'https://docs.azuracast.com/en/getting-started/updates';
     public const CHANGELOG_URL = 'https://github.com/AzuraCast/AzuraCast/blob/main/CHANGELOG.md';
-    // phpcs:enable
 
-    protected string $repoDir;
+    private string $repoDir;
 
     public function __construct(
-        protected CacheInterface $cache,
-        protected Environment $environment
+        private readonly CacheInterface $cache,
+        private readonly Environment $environment
     ) {
         $this->repoDir = $environment->getBaseDirectory();
     }
@@ -84,7 +79,7 @@ class Version
      *
      * @return mixed[]
      */
-    protected function getRawDetails(): array
+    private function getRawDetails(): array
     {
         if (!is_dir($this->repoDir . '/.git')) {
             return [];
@@ -127,7 +122,7 @@ class Version
     /**
      * Run the specified process and return its output.
      */
-    protected function runProcess(array $proc, string $default = ''): string
+    private function runProcess(array $proc, string $default = ''): string
     {
         $process = new Process($proc);
         $process->setWorkingDirectory($this->repoDir);
@@ -183,18 +178,4 @@ class Version
         $details = $this->getDetails();
         return $details['commit_short'] ?? null;
     }
-
-    /**
-     * Check if the installation has been modified by the user from the release build.
-     */
-    public function isInstallationModified(): bool
-    {
-        // We can't detect if release builds are changed, so always return true.
-        if (!is_dir($this->repoDir . '/.git')) {
-            return true;
-        }
-
-        $changed_files = $this->runProcess(['git', 'status', '-s']);
-        return !empty($changed_files);
-    }
 }

src/View.php

@@ -17,7 +17,7 @@ use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
 
-class View extends Engine
+final class View extends Engine
 {
     use RequestAwareTrait;
 
@@ -26,7 +26,7 @@ class View extends Engine
         EventDispatcherInterface $dispatcher,
         Version $version,
         RouterInterface $router,
-        protected Assets $assets
+        private Assets $assets
     ) {
         parent::__construct($environment->getViewsDirectory(), 'phtml');
 

src/VueComponent/StationFormComponent.php

@@ -14,11 +14,11 @@ use DateTime;
 use DateTimeZone;
 use Symfony\Component\Intl\Countries;
 
-class StationFormComponent implements VueComponentInterface
+final class StationFormComponent implements VueComponentInterface
 {
     public function __construct(
-        protected Adapters $adapters,
-        protected SettingsRepository $settingsRepo
+        private readonly Adapters $adapters,
+        private readonly SettingsRepository $settingsRepo
     ) {
     }
 
@@ -39,7 +39,7 @@ class StationFormComponent implements VueComponentInterface
         ];
     }
 
-    protected function getTimezones(): array
+    private function getTimezones(): array
     {
         $tzSelect = [
             'UTC' => [

src/Webhook/Connector/Discord.php

@@ -60,7 +60,7 @@ use Monolog\Level;
  * inline	bool	whether or not this field should display inline
  */
 
-class Discord extends AbstractConnector
+final class Discord extends AbstractConnector
 {
     public const NAME = 'discord';
 

src/Webhook/Connector/Email.php

@@ -10,14 +10,14 @@ use GuzzleHttp\Client;
 use Monolog\Logger;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 
-class Email extends AbstractConnector
+final class Email extends AbstractConnector
 {
     public const NAME = 'email';
 
     public function __construct(
         Logger $logger,
         Client $httpClient,
-        protected Mail $mail
+        private readonly Mail $mail
     ) {
         parent::__construct($logger, $httpClient);
     }

src/Webhook/Connector/Generic.php

@@ -7,7 +7,7 @@ namespace App\Webhook\Connector;
 use App\Entity;
 use GuzzleHttp\Exception\TransferException;
 
-class Generic extends AbstractConnector
+final class Generic extends AbstractConnector
 {
     public const NAME = 'generic';
 

src/Webhook/Connector/GoogleAnalytics.php

@@ -5,24 +5,20 @@ declare(strict_types=1);
 namespace App\Webhook\Connector;
 
 use App\Entity;
-use App\Radio\Adapters;
-use Doctrine\ORM\EntityManagerInterface;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Uri;
 use Monolog\Logger;
 use TheIconic\Tracking\GoogleAnalytics\Analytics;
 use TheIconic\Tracking\GoogleAnalytics\Network\HttpClient;
 
-class GoogleAnalytics extends AbstractConnector
+final class GoogleAnalytics extends AbstractConnector
 {
     public const NAME = 'google_analytics';
 
     public function __construct(
         Logger $logger,
         Client $httpClient,
-        protected EntityManagerInterface $em,
-        protected Adapters $adapters,
-        protected Entity\Repository\ListenerRepository $listenerRepo
+        private readonly Entity\Repository\ListenerRepository $listenerRepo
     ) {
         parent::__construct($logger, $httpClient);
     }

src/Webhook/Connector/MatomoAnalytics.php

@@ -6,25 +6,21 @@ namespace App\Webhook\Connector;
 
 use App\Entity;
 use App\Http\RouterInterface;
-use App\Radio\Adapters;
 use App\Utilities\Urls;
-use Doctrine\ORM\EntityManagerInterface;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\TransferException;
 use Monolog\Logger;
 use Psr\Http\Message\UriInterface;
 
-class MatomoAnalytics extends AbstractConnector
+final class MatomoAnalytics extends AbstractConnector
 {
     public const NAME = 'matomo_analytics';
 
     public function __construct(
         Logger $logger,
         Client $httpClient,
-        protected RouterInterface $router,
-        protected EntityManagerInterface $em,
-        protected Adapters $adapters,
-        protected Entity\Repository\ListenerRepository $listenerRepo
+        private readonly RouterInterface $router,
+        private readonly Entity\Repository\ListenerRepository $listenerRepo
     ) {
         parent::__construct($logger, $httpClient);
     }

src/Webhook/Connector/Telegram.php

@@ -12,7 +12,7 @@ use GuzzleHttp\Exception\TransferException;
  *
  * @package App\Webhook\Connector
  */
-class Telegram extends AbstractConnector
+final class Telegram extends AbstractConnector
 {
     public const NAME = 'telegram';
 

src/Webhook/Connector/TuneIn.php

@@ -7,7 +7,7 @@ namespace App\Webhook\Connector;
 use App\Entity;
 use GuzzleHttp\Exception\TransferException;
 
-class TuneIn extends AbstractConnector
+final class TuneIn extends AbstractConnector
 {
     public const NAME = 'tunein';
 

src/Webhook/Connector/Twitter.php

@@ -5,22 +5,20 @@ declare(strict_types=1);
 namespace App\Webhook\Connector;
 
 use App\Entity;
-use Doctrine\ORM\EntityManagerInterface;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\TransferException;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Subscriber\Oauth\Oauth1;
 use Monolog\Logger;
 
-class Twitter extends AbstractConnector
+final class Twitter extends AbstractConnector
 {
     public const NAME = 'twitter';
 
     public function __construct(
         Logger $logger,
         Client $httpClient,
-        protected EntityManagerInterface $em,
-        protected HandlerStack $handlerStack,
+        private readonly HandlerStack $handlerStack,
     ) {
         parent::__construct($logger, $httpClient);
     }

src/Webhook/Dispatcher.php

@@ -14,19 +14,17 @@ use Monolog\Handler\StreamHandler;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use Psr\Log\LogLevel;
-use Symfony\Component\Messenger\MessageBus;
 
-class Dispatcher
+final class Dispatcher
 {
     public function __construct(
-        protected Environment $environment,
-        protected Logger $logger,
-        protected EntityManagerInterface $em,
-        protected MessageBus $messageBus,
-        protected RouterInterface $router,
-        protected LocalWebhookHandler $localHandler,
-        protected ConnectorLocator $connectors,
-        protected Entity\ApiGenerator\NowPlayingApiGenerator $nowPlayingApiGen
+        private readonly Environment $environment,
+        private readonly Logger $logger,
+        private readonly EntityManagerInterface $em,
+        private readonly RouterInterface $router,
+        private readonly LocalWebhookHandler $localHandler,
+        private readonly ConnectorLocator $connectors,
+        private readonly Entity\ApiGenerator\NowPlayingApiGenerator $nowPlayingApiGen
     ) {
     }
 

src/Webhook/LocalWebhookHandler.php

@@ -8,21 +8,18 @@ use App\Entity;
 use App\Environment;
 use GuzzleHttp\Client;
 use Monolog\Logger;
-use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Filesystem\Filesystem;
 
 use const JSON_PRETTY_PRINT;
 
-class LocalWebhookHandler
+final class LocalWebhookHandler
 {
     public const NAME = 'local';
 
     public function __construct(
-        protected Logger $logger,
-        protected Client $httpClient,
-        protected CacheInterface $cache,
-        protected Entity\Repository\SettingsRepository $settingsRepo,
-        protected Environment $environment,
+        private readonly Logger $logger,
+        private readonly Client $httpClient,
+        private readonly Environment $environment,
     ) {
     }
 

src/Xml/Reader.php

@@ -16,12 +16,12 @@ use const LIBXML_XINCLUDE;
 /**
  * XML config reader.
  */
-class Reader
+final class Reader
 {
     /**
      * Nodes to handle as plain text.
      */
-    protected static array $textNodes = [
+    private static array $textNodes = [
         XMLReader::TEXT,
         XMLReader::CDATA,
         XMLReader::WHITESPACE,
@@ -58,7 +58,7 @@ class Reader
         return $return;
     }
 
-    protected static function processNextElement(XMLReader $reader): string|array
+    private static function processNextElement(XMLReader $reader): string|array
     {
         $children = [];
         $text = '';
@@ -114,7 +114,7 @@ class Reader
      *
      * @return string[]
      */
-    protected static function getAttributes(XMLReader $reader): array
+    private static function getAttributes(XMLReader $reader): array
     {
         $attributes = [];
 

src/Xml/Writer.php

@@ -11,7 +11,7 @@ namespace App\Xml;
 use RuntimeException;
 use XMLWriter;
 
-class Writer
+final class Writer
 {
     public static function toString(
         array $config,
@@ -20,7 +20,7 @@ class Writer
         return self::processConfig($config, $baseElement);
     }
 
-    protected static function processConfig(
+    private static function processConfig(
         array $config,
         string $baseElement = 'xml-config'
     ): string {
@@ -53,7 +53,7 @@ class Writer
         return $writer->outputMemory();
     }
 
-    protected static function addBranch(
+    private static function addBranch(
         mixed $branchName,
         array $config,
         XMLWriter $writer
@@ -98,7 +98,7 @@ class Writer
         }
     }
 
-    protected static function attributesFirst(mixed $a, mixed $b): int
+    private static function attributesFirst(mixed $a, mixed $b): int
     {
         if (str_starts_with((string)$a, '@')) {
             return -1;