Create basic Event class, create NamedEvent interface

src/Event/Event.php

@@ -0,0 +1,33 @@
+<?php
+
+// Copyright (C) 2010-2024, the Friendica project
+// SPDX-FileCopyrightText: 2010-2024 the Friendica project
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+declare(strict_types=1);
+
+namespace Friendica\Event;
+
+/**
+ * One-way Event to inform listener about something happend.
+ */
+final class Event implements NamedEvent
+{
+	/**
+	 * Friendica is initialized.
+	 */
+	public const INIT = 'friendica.init';
+
+	private string $name;
+
+	public function __construct(string $name)
+	{
+		$this->name = $name;
+	}
+
+	public function getName(): string
+	{
+		return $this->name;
+	}
+}

src/Event/HtmlFilterEvent.php

@@ -12,7 +12,7 @@ namespace Friendica\Event;
 /**
  * Allow Event listener to modify HTML.
  */
-final class HtmlFilterEvent
+final class HtmlFilterEvent implements NamedEvent
 {
 	public const HEAD = 'friendica.html.head';
 

src/Event/NamedEvent.php

@@ -10,24 +10,9 @@ declare(strict_types=1);
 namespace Friendica\Event;
 
 /**
- * One-way Event to inform listener about something happend.
+ * Interface for named events.
  */
-final class NamedEvent
+interface NamedEvent
 {
-	/**
+	public function getName(): string;
-	 * Friendica is initialized.
-	 */
-	public const INIT = 'friendica.init';
-
-	private string $name;
-
-	public function __construct(string $name)
-	{
-		$this->name = $name;
-	}
-
-	public function getName(): string
-	{
-		return $this->name;
-	}
 }

src/EventSubscriber/HookEventBridge.php

@@ -10,6 +10,7 @@ declare(strict_types=1);
 namespace Friendica\EventSubscriber;
 
 use Friendica\Core\Hook;
+use Friendica\Event\Event;
 use Friendica\Event\HtmlFilterEvent;
 use Friendica\Event\NamedEvent;
 
@@ -29,7 +30,7 @@ final class HookEventBridge implements StaticEventSubscriber
 	 * This maps the new event names to the legacy Hook names.
 	 */
 	private static array $eventMapper = [
-		NamedEvent::INIT => 'init_1',
+		Event::INIT => 'init_1',
 		HtmlFilterEvent::HEAD => 'head',
 		HtmlFilterEvent::FOOTER => 'footer',
 		HtmlFilterEvent::PAGE_CONTENT_TOP => 'page_content_top',
@@ -42,7 +43,7 @@ final class HookEventBridge implements StaticEventSubscriber
 	public static function getStaticSubscribedEvents(): array
 	{
 		return [
-			NamedEvent::class => 'onNamedEvent',
+			Event::class => 'onNamedEvent',
 			HtmlFilterEvent::class => 'onHtmlFilterEvent',
 		];
 	}

tests/Unit/Event/EventTest.php

@@ -9,15 +9,23 @@ declare(strict_types=1);
 
 namespace Friendica\Test\Unit\Event;
 
+use Friendica\Event\Event;
 use Friendica\Event\NamedEvent;
 use PHPUnit\Framework\TestCase;
 
-class NamedEventTest extends TestCase
+class EventTest extends TestCase
 {
+	public function testImplementationOfInstances(): void
+	{
+		$event = new Event('test');
+
+		$this->assertInstanceOf(NamedEvent::class, $event);
+	}
+
 	public static function getPublicConstants(): array
 	{
 		return [
-			[NamedEvent::INIT, 'friendica.init'],
+			[Event::INIT, 'friendica.init'],
 		];
 	}
 
@@ -31,7 +39,7 @@ class NamedEventTest extends TestCase
 
 	public function testGetNameReturnsName(): void
 	{
-		$event = new NamedEvent('test');
+		$event = new Event('test');
 
 		$this->assertSame('test', $event->getName());
 	}

tests/Unit/Event/HtmlFilterEventTest.php

@@ -10,10 +10,18 @@ declare(strict_types=1);
 namespace Friendica\Test\Unit\Event;
 
 use Friendica\Event\HtmlFilterEvent;
+use Friendica\Event\NamedEvent;
 use PHPUnit\Framework\TestCase;
 
 class HtmlFilterEventTest extends TestCase
 {
+	public function testImplementationOfInstances(): void
+	{
+		$event = new HtmlFilterEvent('test', 'original');
+
+		$this->assertInstanceOf(NamedEvent::class, $event);
+	}
+
 	public static function getPublicConstants(): array
 	{
 		return [

tests/Unit/EventSubscriber/HookEventBridgeTest.php

@@ -9,8 +9,8 @@ declare(strict_types=1);
 
 namespace Friendica\Test\Unit\EventSubscriber;
 
+use Friendica\Event\Event;
 use Friendica\Event\HtmlFilterEvent;
-use Friendica\Event\NamedEvent;
 use Friendica\EventSubscriber\HookEventBridge;
 use Friendica\EventSubscriber\StaticEventSubscriber;
 use PHPUnit\Framework\TestCase;
@@ -28,7 +28,7 @@ class HookEventBridgeTest extends TestCase
 	public function testGetStaticSubscribedEventsReturnsStaticMethods(): void
 	{
 		$expected = [
-			NamedEvent::class => 'onNamedEvent',
+			Event::class => 'onNamedEvent',
 			HtmlFilterEvent::class => 'onHtmlFilterEvent',
 		];
 
@@ -54,7 +54,7 @@ class HookEventBridgeTest extends TestCase
 	{
 		return [
 			['test', 'test'],
-			[NamedEvent::INIT, 'init_1'],
+			[Event::INIT, 'init_1'],
 		];
 	}
 
@@ -63,7 +63,7 @@ class HookEventBridgeTest extends TestCase
 	 */
 	public function testOnNamedEventCallsHook($name, $expected): void
 	{
-		$event = new NamedEvent($name);
+		$event = new Event($name);
 
 		$reflectionProperty = new \ReflectionProperty(HookEventBridge::class, 'mockedCallHook');
 		$reflectionProperty->setAccessible(true);