Merge commit 'cfb190ba1390bb3ce41ca989354ac3f906771a4e' into feature/playlist-driven-podcasts

composer.json

@@ -176,13 +176,17 @@
       "@phpcbf",
       "@dev-test"
     ],
+    "cleanup-and-test-full": [
+      "@phpcbf",
+      "@dev-test",
+      "@codeception-no-coverage"
+    ],
     "codeception": "codecept run --no-interaction --coverage --coverage-xml --fail-fast",
     "codeception-no-coverage": "codecept run --no-interaction",
     "dev-test": [
       "@phplint",
       "@phpstan",
-      "@phpcs",
-      "@codeception-no-coverage"
+      "@phpcs"
     ],
     "phpcbf": "phpcbf",
     "phpcs": "phpcs",

frontend/src/components/Public/WebDJ.vue

@@ -7,7 +7,7 @@
         <div class="container pt-5">
             <div class="row g-3">
                 <div class="col-md-4 mb-sm-4">
-                    <settings-panel :station-name="stationName" />
+                    <settings-panel />
                 </div>
 
                 <div class="col-md-8">
@@ -47,11 +47,7 @@ import {useProvideMixer} from "~/components/Public/WebDJ/useMixerValue";
 import {useProvidePassthroughSync} from "~/components/Public/WebDJ/usePassthroughSync";
 
 const props = defineProps({
-    ...webcasterProps,
-    stationName: {
-        type: String,
-        required: true
-    },
+    ...webcasterProps
 });
 
 const webcaster = useProvideWebcaster(props);

frontend/src/components/Public/WebDJ/SettingsPanel.vue

@@ -260,13 +260,9 @@ import {useTranslate} from "~/vendor/gettext";
 import {useInjectWebDjNode} from "~/components/Public/WebDJ/useWebDjNode";
 import {usePassthroughSync} from "~/components/Public/WebDJ/usePassthroughSync";
 import {useInjectWebcaster} from "~/components/Public/WebDJ/useWebcaster";
+import {useAzuraCastStation} from "~/vendor/azuracast.ts";
 
-const props = defineProps({
-    stationName: {
-        type: String,
-        required: true
-    }
-});
+const {name: stationName} = useAzuraCastStation();
 
 const djUsername = ref(null);
 const djPassword = ref(null);

src/Cache/NowPlayingCache.php

@@ -157,7 +157,9 @@ final class NowPlayingCache
         }
 
         return $this->cache->getItem(
-            'now_playing.station_' . $identifier
+            urlencode(
+                'now_playing.station_' . $identifier
+            )
         );
     }
 }

src/Console/Command/Sync/SingleTaskCommand.php

@@ -106,7 +106,7 @@ final class SingleTaskCommand extends AbstractSyncCommand
      */
     public static function getCacheKey(string $taskClass): string
     {
-        return 'sync_last_run.' . self::getClassShortName($taskClass);
+        return urlencode('sync_last_run.' . self::getClassShortName($taskClass));
     }
 
     /**

src/Controller/Api/Stations/OnDemand/ListAction.php

@@ -65,7 +65,11 @@ final class ListAction extends AbstractSearchableListAction
     private function getPlaylists(
         Station $station
     ): array {
-        $item = $this->psr6Cache->getItem('station_' . $station->getIdRequired() . '_on_demand_playlists');
+        $item = $this->psr6Cache->getItem(
+            urlencode(
+                'station_' . $station->getIdRequired() . '_on_demand_playlists'
+            )
+        );
 
         if (!$item->isHit()) {
             $playlistIds = $this->em->createQuery(

src/Controller/Api/Stations/ScheduleAction.php

@@ -81,7 +81,7 @@ final class ScheduleAction implements SingleActionInterface
                 . $dateRange->getStart()->format('Ymd') . '-'
                 . $dateRange->getEnd()->format('Ymd');
 
-            $cacheItem = $this->psr6Cache->getItem($cacheKey);
+            $cacheItem = $this->psr6Cache->getItem(urlencode($cacheKey));
 
             if (!$cacheItem->isHit()) {
                 $nowTz = CarbonImmutable::now($station->getTimezoneObject());
@@ -113,7 +113,7 @@ final class ScheduleAction implements SingleActionInterface
                 $cacheKey = 'api_station_' . $station->getId() . '_schedule_upcoming';
             }
 
-            $cacheItem = $this->psr6Cache->getItem($cacheKey);
+            $cacheItem = $this->psr6Cache->getItem(urlencode($cacheKey));
 
             if (!$cacheItem->isHit()) {
                 $cacheItem->set($this->scheduleRepo->getUpcomingSchedule($station, $now));

src/Controller/Frontend/PublicPages/WebDjAction.php

@@ -66,7 +66,7 @@ final class WebDjAction implements SingleActionInterface
                 'hide_footer' => true,
             ],
             props: [
-                'wss_url' => $wssUrl,
+                'baseUri' => $wssUrl,
             ],
         );
     }

src/Installer/Command/InstallCommand.php

@@ -228,18 +228,18 @@ final class InstallCommand extends Command
                             $envConfig[$port]['name'],
                             $envConfig[$port]['description'] ?? ''
                         ),
-                        $env[$port]
+                        Types::stringOrNull($env[$port])
                     );
                 }
 
                 $azuracastEnv[Environment::AUTO_ASSIGN_PORT_MIN] = $io->ask(
                     $azuracastEnvConfig[Environment::AUTO_ASSIGN_PORT_MIN]['name'],
-                    $azuracastEnv[Environment::AUTO_ASSIGN_PORT_MIN]
+                    Types::stringOrNull($azuracastEnv[Environment::AUTO_ASSIGN_PORT_MIN])
                 );
 
                 $azuracastEnv[Environment::AUTO_ASSIGN_PORT_MAX] = $io->ask(
                     $azuracastEnvConfig[Environment::AUTO_ASSIGN_PORT_MAX]['name'],
-                    $azuracastEnv[Environment::AUTO_ASSIGN_PORT_MAX]
+                    Types::stringOrNull($azuracastEnv[Environment::AUTO_ASSIGN_PORT_MAX])
                 );
 
                 $stationPorts = Configuration::enumerateDefaultPorts(

util/docker/redis/redis/redis.conf

@@ -1,6 +1,8 @@
 unixsocket /run/redis/redis.sock
 unixsocketperm 666
 
+protected-mode no
+
 bind 0.0.0.0
 port 6379