2533: Fixed merge issues

tuj · tuj · commit 779a9fa5e4e9 · 2025-04-04T18:23:28.000+02:00
diff --git a/src/Feed/EventDatabaseApiV2FeedType.php b/src/Feed/EventDatabaseApiV2FeedType.php
@@ -22,7 +22,7 @@
  */
 class EventDatabaseApiV2FeedType implements FeedTypeInterface
 {
-    final public const string SUPPORTED_FEED_TYPE = SupportedFeedOutputs::POSTER_OUTPUT;
+    final public const string SUPPORTED_FEED_TYPE = FeedOutputModels::POSTER_OUTPUT;
 
     private const string CACHE_OPTIONS_PREFIX = 'options_';
     private const string CACHE_EXPIRE_SUFFIX = '_expire';
diff --git a/tests/Feed/CalendarApiFeedTypeData.php b/tests/Feed/CalendarApiFeedTypeData.php
@@ -4,7 +4,7 @@
 
 namespace App\Tests\Feed;
 
-use App\Model\CalendarEvent;
+use App\Feed\OutputModel\Calendar\CalendarEvent;
 
 class CalendarApiFeedTypeData
 {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*/`
`23`	`23`	`class EventDatabaseApiV2FeedType implements FeedTypeInterface`
`24`	`24`	`{`
`25`		`- final public const string SUPPORTED_FEED_TYPE = SupportedFeedOutputs::POSTER_OUTPUT;`
	`25`	`+ final public const string SUPPORTED_FEED_TYPE = FeedOutputModels::POSTER_OUTPUT;`
`26`	`26`
`27`	`27`	`private const string CACHE_OPTIONS_PREFIX = 'options_';`
`28`	`28`	`private const string CACHE_EXPIRE_SUFFIX = '_expire';`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace App\Tests\Feed;`
`6`	`6`
`7`		`-use App\Model\CalendarEvent;`
	`7`	`+use App\Feed\OutputModel\Calendar\CalendarEvent;`
`8`	`8`
`9`	`9`	`class CalendarApiFeedTypeData`
`10`	`10`	`{`