Merge branch 'develop' into feature/2927-fixes

Author: tuj

CHANGELOG.md

@@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file.
 
 - [#235](https://github.com/os2display/display-api-service/pull/234)
   - Fixed Eventdatabasen v2 subscription data order by using occurrences endpoint.
+- [#236](https://github.com/os2display/display-api-service/pull/236)
+  - Fixed bug where no media url made Notified feed crash.
 - [#231](https://github.com/os2display/display-api-service/pull/231)
   - Adds new feed source: Eventdatabasen v2.
 - [#233](https://github.com/os2display/display-api-service/pull/233)

src/Feed/NotifiedFeedType.php

@@ -54,13 +54,19 @@ public function getData(Feed $feed): array
 
             $result = [];
 
-            // Check that image is accessible, otherwise leave out the feed element.
+            // Check that image is available and accessible, otherwise leave out the feed element.
             foreach ($feedItems as $feedItem) {
-                $response = $this->client->request(Request::METHOD_HEAD, $feedItem['mediaUrl']);
-                $statusCode = $response->getStatusCode();
-
-                if (200 == $statusCode) {
-                    $result[] = $feedItem;
+                if (!empty($feedItem['mediaUrl'])) {
+                    try {
+                        $response = $this->client->request(Request::METHOD_HEAD, $feedItem['mediaUrl']);
+                        $statusCode = $response->getStatusCode();
+
+                        if (200 === $statusCode) {
+                            $result[] = $feedItem;
+                        }
+                    } catch (\Exception) {
+                        // Ignore item if request fails.
+                    }
                 }
             }