Merge branch 'develop' into rework-addon-class

.github/workflows/code-quality.yml

@@ -76,6 +76,38 @@ jobs:
       - name: Run PHPStan
         run: composer run phpstan
 
+  phpstan-addons:
+    name: PHPStan in addons (PHP ${{ matrix.php }})
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: ['ubuntu-latest']
+        php: ['8.4']
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+
+      - name: Setup PHP with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+          tools: none
+
+      - name: Clone addon repository
+        run: git clone -b develop --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon
+
+      - name: Install Composer dependencies
+        uses: "ramsey/composer-install@v2"
+
+      - name: Run PHPStan in addons
+        run: composer run phpstan-addons
+
   phpmd:
     name: PHPMD (PHP ${{ matrix.php }})
     runs-on: ubuntu-latest

.phpstan-addons.neon

@@ -0,0 +1,52 @@
+# SPDX-FileCopyrightText: 2010 - 2024 the Friendica project
+#
+# SPDX-License-Identifier: CC0-1.0
+
+parameters:
+    level: 3
+
+    paths:
+        - addon/
+
+    excludePaths:
+        analyse:
+            - addon/*/lang/*
+            - addon/*/vendor/*
+            - addon/convert/UnitConvertor.php
+            - addon/pumpio/oauth/*
+
+    scanDirectories:
+        - mod
+        - src
+        - static
+        - vendor
+        - view
+
+    dynamicConstantNames:
+        - DB_UPDATE_VERSION
+
+    ignoreErrors:
+
+        -
+            # Ignore missing SMTP class in PHPMailer 5.2.21
+            # see https://github.com/PHPMailer/PHPMailer/blob/v5.2.21/class.smtp.php
+            message: '(^.+ an unknown class SMTP\.$)'
+            path: addon/mailstream/phpmailer
+
+        -
+            # Ignore missing SMTP class in PHPMailer 5.2.21
+            # see https://github.com/PHPMailer/PHPMailer/blob/v5.2.21/class.smtp.php
+            message: '(^Property .+ has unknown class SMTP as its type\.$)'
+            path: addon/mailstream/phpmailer
+
+        -
+            # Ignore missing SMTP class in PHPMailer 5.2.21
+            # see https://github.com/PHPMailer/PHPMailer/blob/v5.2.21/class.smtp.php
+            message: '(^Method .+ has invalid return type SMTP\.$)'
+            path: addon/mailstream/phpmailer
+
+        -
+            # Ignore missing SMTP class in PHPMailer 5.2.21
+            # see https://github.com/PHPMailer/PHPMailer/blob/v5.2.21/class.smtp.php
+            message: '(^Instantiated class SMTP not found\.$)'
+            path: addon/mailstream/phpmailer

.phpstan.neon

@@ -3,10 +3,9 @@
 # SPDX-License-Identifier: CC0-1.0
 
 parameters:
-    level: 2
+    level: 3
 
     paths:
-        - addon/
         - bin/auth_ejabberd.php
         - bin/console.php
         - bin/daemon.php
@@ -15,13 +14,6 @@ parameters:
         - index.php
         - src/
 
-    excludePaths:
-        analyse:
-            - addon/*/lang/*
-            - addon/*/vendor/*
-            - addon/convert/UnitConvertor.php
-            - addon/pumpio/oauth/*
-
     scanDirectories:
         - mod
         - static
@@ -46,27 +38,3 @@ parameters:
             # Ignore missing IMAP\Connection class in PHP <= 8.0
             message: '(^Parameter .+ has invalid type IMAP\\Connection\.$)'
             path: src
-
-        -
-            # Ignore missing SMTP class in PHPMailer 5.2.21
-            # see https://github.com/PHPMailer/PHPMailer/blob/v5.2.21/class.smtp.php
-            message: '(^.+ an unknown class SMTP\.$)'
-            path: addon/mailstream/phpmailer
-
-        -
-            # Ignore missing SMTP class in PHPMailer 5.2.21
-            # see https://github.com/PHPMailer/PHPMailer/blob/v5.2.21/class.smtp.php
-            message: '(^Property .+ has unknown class SMTP as its type\.$)'
-            path: addon/mailstream/phpmailer
-
-        -
-            # Ignore missing SMTP class in PHPMailer 5.2.21
-            # see https://github.com/PHPMailer/PHPMailer/blob/v5.2.21/class.smtp.php
-            message: '(^Method .+ has invalid return type SMTP\.$)'
-            path: addon/mailstream/phpmailer
-
-        -
-            # Ignore missing SMTP class in PHPMailer 5.2.21
-            # see https://github.com/PHPMailer/PHPMailer/blob/v5.2.21/class.smtp.php
-            message: '(^Instantiated class SMTP not found\.$)'
-            path: addon/mailstream/phpmailer

.woodpecker/.phpunit.yml

@@ -78,9 +78,16 @@ steps:
     image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
     when:
       matrix:
-        PHP_MAJOR_VERSION: 8.2
+        PHP_MAJOR_VERSION: 8.3
     commands:
       - bin/composer.phar run phpstan;
+  phpstan-addons:
+    image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
+    when:
+      matrix:
+        PHP_MAJOR_VERSION: 8.3
+    commands:
+      - bin/composer.phar run phpstan-addons;
   test:
     image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
     environment:

composer.json

@@ -164,6 +164,7 @@
 		"test:unit": "phpunit -c tests/phpunit.xml --testsuite unit",
 		"phpmd": "phpmd src/ text .phpmd-ruleset.xml --color --cache",
 		"phpstan": "phpstan analyze --memory-limit 1024M --configuration .phpstan.neon",
+		"phpstan-addons": "phpstan analyze --memory-limit 1024M --configuration .phpstan-addons.neon",
 		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l",
 		"docker:translate": "docker run --rm -v $PWD:/data -w /data friendicaci/transifex bin/run_xgettext.sh",
 		"lang:recreate": "bin/run_xgettext.sh",

mod/item.php

@@ -46,7 +46,7 @@ function item_post()
 	$eventDispatcher = DI::eventDispatcher();
 
 	$_REQUEST = $eventDispatcher->dispatch(
-		new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL_START, $_REQUEST)
+		new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL_START, $_REQUEST)
 	)->getArray();
 
 	$return_path = $_REQUEST['return'] ?? '';
@@ -281,10 +281,16 @@ function item_process(array $post, array $request, bool $preview, string $return
 
 	$eventDispatcher = DI::eventDispatcher();
 
-	$post = $eventDispatcher->dispatch(
-		new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL, $post)
+	$hook_data = [
+		'item' => $post,
+	];
+
+	$hook_data = $eventDispatcher->dispatch(
+		new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL, $hook_data)
 	)->getArray();
 
+	$post = $hook_data['item'] ?? $post;
+
 	unset($post['edit']);
 	unset($post['self']);
 	unset($post['api_source']);

src/BaseCollection.php

@@ -24,7 +24,7 @@ class BaseCollection extends \ArrayIterator
 	 * @param BaseEntity[] $entities
 	 * @param int|null     $totalCount
 	 */
-	public function __construct(array $entities = [], int $totalCount = null)
+	public function __construct(array $entities = [], ?int $totalCount = null)
 	{
 		parent::__construct($entities);
 
@@ -102,7 +102,7 @@ class BaseCollection extends \ArrayIterator
 	 * @return BaseCollection
 	 * @see array_filter()
 	 */
-	public function filter(callable $callback = null, int $flag = 0): BaseCollection
+	public function filter(?callable $callback = null, int $flag = 0): BaseCollection
 	{
 		$class = get_class($this);
 
@@ -111,8 +111,6 @@ class BaseCollection extends \ArrayIterator
 
 	/**
 	 * Reverse the orders of the elements in the collection
-	 *
-	 * @return $this
 	 */
 	public function reverse(): BaseCollection
 	{
@@ -125,7 +123,6 @@ class BaseCollection extends \ArrayIterator
 	 * Split the collection in smaller collections no bigger than the provided length
 	 *
 	 * @param int $length
-	 * @return static[]
 	 */
 	public function chunk(int $length): array
 	{
@@ -133,11 +130,14 @@ class BaseCollection extends \ArrayIterator
 			throw new \RangeException('BaseCollection->chunk(): Size parameter expected to be greater than 0');
 		}
 
-		return array_map(function ($array) {
+		return array_map(
+			function ($array) {
 				$class = get_class($this);
 
 				return new $class($array);
-		}, array_chunk($this->getArrayCopy(), $length));
+			},
+			array_chunk($this->getArrayCopy(), $length)
+		);
 	}
 
 

src/BaseRepository.php

@@ -130,17 +130,33 @@ abstract class BaseRepository
 	}
 
 	/**
-	 * @param array $condition
-	 * @param array $params
-	 * @return BaseEntity
+	 * Selects the fields of the first row as array
+	 *
+	 * @throws NotFoundException
+	 *
+	 * @return array The resulted fields as array
+	 */
+	final protected function _selectFirstRowAsArray(array $condition, array $params = []): array
+	{
+		$fields = $this->db->selectFirst(static::$table_name, [], $condition, $params);
+
+		if (!$this->db->isResult($fields)) {
+			throw new NotFoundException();
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * @deprecated 2025.05 Use `\Friendica\BaseRepository::_selectFirstRowAsArray()` instead
+	 *
 	 * @throws NotFoundException
 	 */
 	protected function _selectOne(array $condition, array $params = []): BaseEntity
 	{
-		$fields = $this->db->selectFirst(static::$table_name, [], $condition, $params);
-		if (!$this->db->isResult($fields)) {
-			throw new NotFoundException();
-		}
+		@trigger_error('`' . __METHOD__ . '()` is deprecated since 2025.05 and will be removed after 5 months, use `\Friendica\BaseRepository::_selectFirstRowAsArray()` instead.', E_USER_DEPRECATED);
+
+		$fields = $this->_selectFirstRowAsArray( $condition, $params);
 
 		return $this->factory->createFromTableRow($fields);
 	}

src/Console/Contact.php

@@ -56,7 +56,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(Mode $appMode, array $argv = null)
+	public function __construct(Mode $appMode, ?array $argv = null)
 	{
 		parent::__construct($argv);
 
@@ -84,13 +84,13 @@ HELP;
 
 		switch ($command) {
 			case 'add':
-				return $this->addContact();
+				return ($this->addContact()) ? 0 : 1;
 			case 'remove':
-				return $this->removeContact();
+				return ($this->removeContact()) ? 0 : 1;
 			case 'search':
-				return $this->searchContact();
+				return ($this->searchContact()) ? 0 : 1;
 			case 'terminate':
-				return $this->terminateContact();
+				return ($this->terminateContact()) ? 0 : 1;
 			default:
 				throw new \Asika\SimpleConsole\CommandArgsException('Wrong command.');
 		}
@@ -206,7 +206,7 @@ HELP;
 	/**
 	 * Marks a contact for removal
 	 */
-	private function removeContact()
+	private function removeContact(): bool
 	{
 		$cid = $this->getArgument(1);
 		if (empty($cid)) {
@@ -218,6 +218,8 @@ HELP;
 		}
 
 		ContactModel::remove($cid);
+
+		return true;
 	}
 
 	/**

src/Console/PoToPhp.php

@@ -175,11 +175,11 @@ HELP;
 	 * @param string $string
 	 * @param array|string $node
 	 */
-	private static function parse(string $string, &$node = [])
+	private static function parse(string $string, &$node)
 	{
 		// Removes extra outward parentheses
 		if (strpos($string, '(') === 0 && strrpos($string, ')') === strlen($string) - 1) {
-			$string = substr($string, 1, -1);
+			$string = (string) substr($string, 1, -1);
 		}
 
 		$q = strpos($string, '?');

src/Console/User.php

@@ -106,21 +106,21 @@ HELP;
 			case 'password':
 				return $this->password();
 			case 'add':
-				return $this->addUser();
+				return ($this->addUser()) ? 0 : 1;
 			case 'allow':
-				return $this->pendingUser(true);
+				return ($this->pendingUser(true)) ? 0 : 1;
 			case 'deny':
-				return $this->pendingUser(false);
+				return ($this->pendingUser(false)) ? 0 : 1;
 			case 'block':
-				return $this->blockUser(true);
+				return ($this->blockUser(true)) ? 0 : 1;
 			case 'unblock':
-				return $this->blockUser(false);
+				return ($this->blockUser(false)) ? 0 : 1;
 			case 'delete':
-				return $this->deleteUser();
+				return ($this->deleteUser()) ? 0 : 1;
 			case 'list':
-				return $this->listUser();
+				return ($this->listUser()) ? 0 : 1;
 			case 'search':
-				return $this->searchUser();
+				return ($this->searchUser()) ? 0 : 1;
 			case 'config':
 				return ($this->configUser()) ? 0 : 1;
 			default:
@@ -178,7 +178,7 @@ HELP;
 	 *
 	 * @throws \Exception
 	 */
-	private function password()
+	private function password(): int
 	{
 		$user = $this->getUserByNick(1);
 
@@ -212,7 +212,7 @@ HELP;
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private function addUser()
+	private function addUser(): bool
 	{
 		$name   = $this->getArgument(1);
 		$nick   = $this->getArgument(2);

src/Contact/FriendSuggest/Repository/FriendSuggest.php

@@ -8,11 +8,11 @@
 namespace Friendica\Contact\FriendSuggest\Repository;
 
 use Friendica\BaseRepository;
-use Friendica\Contact\FriendSuggest\Collection;
+use Friendica\Contact\FriendSuggest\Collection\FriendSuggests as FriendSuggestsCollection;
 use Friendica\Contact\FriendSuggest\Entity\FriendSuggest as FriendSuggestEntity;
 use Friendica\Contact\FriendSuggest\Exception\FriendSuggestNotFoundException;
 use Friendica\Contact\FriendSuggest\Exception\FriendSuggestPersistenceException;
-use Friendica\Contact\FriendSuggest\Factory;
+use Friendica\Contact\FriendSuggest\Factory\FriendSuggest as FriendSuggestFactory;
 use Friendica\Database\Database;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Util\DateTimeFormat;
@@ -20,12 +20,12 @@ use Psr\Log\LoggerInterface;
 
 class FriendSuggest extends BaseRepository
 {
-	/** @var Factory\FriendSuggest */
+	/** @var FriendSuggestFactory */
 	protected $factory;
 
 	protected static $table_name = 'fsuggest';
 
-	public function __construct(Database $database, LoggerInterface $logger, Factory\FriendSuggest $factory)
+	public function __construct(Database $database, LoggerInterface $logger, FriendSuggestFactory $factory)
 	{
 		parent::__construct($database, $logger, $factory);
 	}
@@ -49,20 +49,17 @@ class FriendSuggest extends BaseRepository
 	 */
 	private function selectOne(array $condition, array $params = []): FriendSuggestEntity
 	{
-		return parent::_selectOne($condition, $params);
+		$fields = $this->_selectFirstRowAsArray($condition, $params);
+
+		return $this->factory->createFromTableRow($fields);
 	}
 
 	/**
-	 * @param array $condition
-	 * @param array $params
-	 *
-	 * @return Collection\FriendSuggests
-	 *
 	 * @throws \Exception
 	 */
-	private function select(array $condition, array $params = []): Collection\FriendSuggests
+	private function select(array $condition, array $params = []): FriendSuggestsCollection
 	{
-		return new Collection\FriendSuggests(parent::_select($condition, $params)->getArrayCopy());
+		return new FriendSuggestsCollection(parent::_select($condition, $params)->getArrayCopy());
 	}
 
 	/**
@@ -78,13 +75,9 @@ class FriendSuggest extends BaseRepository
 	}
 
 	/**
-	 * @param int $cid
-	 *
-	 * @return Collection\FriendSuggests
-	 *
 	 * @throws FriendSuggestPersistenceException In case the underlying storage cannot select the suggestion
 	 */
-	public function selectForContact(int $cid): Collection\FriendSuggests
+	public function selectForContact(int $cid): FriendSuggestsCollection
 	{
 		try {
 			return $this->select(['cid' => $cid]);
@@ -114,13 +107,9 @@ class FriendSuggest extends BaseRepository
 	}
 
 	/**
-	 * @param Collection\FriendSuggests $fsuggests
-	 *
-	 * @return bool
-	 *
 	 * @throws FriendSuggestNotFoundException in case the underlying storage cannot delete the suggestion
 	 */
-	public function delete(Collection\FriendSuggests $fsuggests): bool
+	public function delete(FriendSuggestsCollection $fsuggests): bool
 	{
 		try {
 			$ids = $fsuggests->column('id');

src/Contact/Introduction/Repository/Introduction.php

@@ -10,9 +10,9 @@ namespace Friendica\Contact\Introduction\Repository;
 use Friendica\BaseRepository;
 use Friendica\Contact\Introduction\Exception\IntroductionNotFoundException;
 use Friendica\Contact\Introduction\Exception\IntroductionPersistenceException;
-use Friendica\Contact\Introduction\Collection;
-use Friendica\Contact\Introduction\Entity;
-use Friendica\Contact\Introduction\Factory;
+use Friendica\Contact\Introduction\Collection\Introductions as IntroductionsCollection;
+use Friendica\Contact\Introduction\Entity\Introduction as IntroductionEntity;
+use Friendica\Contact\Introduction\Factory\Introduction as IntroductionFactory;
 use Friendica\Database\Database;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Util\DateTimeFormat;
@@ -20,37 +20,30 @@ use Psr\Log\LoggerInterface;
 
 class Introduction extends BaseRepository
 {
-	/** @var Factory\Introduction */
+	/** @var IntroductionFactory */
 	protected $factory;
 
 	protected static $table_name = 'intro';
 
-	public function __construct(Database $database, LoggerInterface $logger, Factory\Introduction $factory)
+	public function __construct(Database $database, LoggerInterface $logger, IntroductionFactory $factory)
 	{
 		parent::__construct($database, $logger, $factory);
 	}
 
 	/**
-	 * @param array $condition
-	 * @param array $params
-	 *
-	 * @return Entity\Introduction
-	 *
 	 * @throws NotFoundException the underlying exception if there's no Introduction with the given conditions
 	 */
-	private function selectOne(array $condition, array $params = []): Entity\Introduction
+	private function selectOne(array $condition, array $params = []): IntroductionEntity
 	{
-		return parent::_selectOne($condition, $params);
+		$fields = $this->_selectFirstRowAsArray( $condition, $params);
+
+		return $this->factory->createFromTableRow($fields);
 	}
 
 	/**
 	 * Converts a given Introduction into a DB compatible row array
-	 *
-	 * @param Entity\Introduction $introduction
-	 *
-	 * @return array
 	 */
-	protected function convertToTableRow(Entity\Introduction $introduction): array
+	protected function convertToTableRow(IntroductionEntity $introduction): array
 	{
 		return [
 			'uid'         => $introduction->uid,
@@ -65,14 +58,9 @@ class Introduction extends BaseRepository
 	}
 
 	/**
-	 * @param int $id
-	 * @param int $uid
-	 *
-	 * @return Entity\Introduction
-	 *
 	 * @throws IntroductionNotFoundException in case there is no Introduction with this id
 	 */
-	public function selectOneById(int $id, int $uid): Entity\Introduction
+	public function selectOneById(int $id, int $uid): IntroductionEntity
 	{
 		try {
 			return $this->selectOne(['id' => $id, 'uid' => $uid]);
@@ -88,33 +76,30 @@ class Introduction extends BaseRepository
 	 * @param int|null $min_id
 	 * @param int|null $max_id
 	 * @param int      $limit
-	 *
-	 * @return Collection\Introductions
 	 */
-	public function selectForUser(int $uid, int $min_id = null, int $max_id = null, int $limit = self::LIMIT): Collection\Introductions
+	public function selectForUser(int $uid, ?int $min_id = null, ?int $max_id = null, int $limit = self::LIMIT): IntroductionsCollection
 	{
 		try {
 			$BaseCollection = parent::_selectByBoundaries(
 				['`uid` = ? AND NOT `ignore`',$uid],
 				['order' => ['id' => 'DESC']],
-				$min_id, $max_id, $limit);
+				$min_id,
+				$max_id,
+				$limit
+			);
 		} catch (\Exception $e) {
 			throw new IntroductionPersistenceException(sprintf('Cannot select Introductions for used %d', $uid), $e);
 		}
 
-		return new Collection\Introductions($BaseCollection->getArrayCopy(), $BaseCollection->getTotalCount());
+		return new IntroductionsCollection($BaseCollection->getArrayCopy(), $BaseCollection->getTotalCount());
 	}
 
 	/**
 	 * Selects the introduction for a given contact
 	 *
-	 * @param int $cid
-	 *
-	 * @return Entity\Introduction
-	 *
 	 * @throws IntroductionNotFoundException in case there is not Introduction for this contact
 	 */
-	public function selectForContact(int $cid): Entity\Introduction
+	public function selectForContact(int $cid): IntroductionEntity
 	{
 		try {
 			return $this->selectOne(['contact-id' => $cid]);
@@ -150,13 +135,9 @@ class Introduction extends BaseRepository
 	}
 
 	/**
-	 * @param Entity\Introduction $introduction
-	 *
-	 * @return bool
-	 *
 	 * @throws IntroductionPersistenceException in case the underlying storage cannot delete the Introduction
 	 */
-	public function delete(Entity\Introduction $introduction): bool
+	public function delete(IntroductionEntity $introduction): bool
 	{
 		if (!$introduction->id) {
 			return false;
@@ -170,13 +151,9 @@ class Introduction extends BaseRepository
 	}
 
 	/**
-	 * @param Entity\Introduction $introduction
-	 *
-	 * @return Entity\Introduction
-	 *
 	 * @throws IntroductionPersistenceException In case the underlying storage cannot save the Introduction
 	 */
-	public function save(Entity\Introduction $introduction): Entity\Introduction
+	public function save(IntroductionEntity $introduction): IntroductionEntity
 	{
 		try {
 			$fields = $this->convertToTableRow($introduction);

src/Contact/LocalRelationship/Repository/LocalRelationship.php

@@ -7,59 +7,54 @@
 
 namespace Friendica\Contact\LocalRelationship\Repository;
 
-use Friendica\Contact\LocalRelationship\Entity;
-use Friendica\Contact\LocalRelationship\Exception;
-use Friendica\Contact\LocalRelationship\Factory;
+use Exception;
+use Friendica\BaseRepository;
+use Friendica\Contact\LocalRelationship\Entity\LocalRelationship as LocalRelationshipEntity;
+use Friendica\Contact\LocalRelationship\Exception\LocalRelationshipPersistenceException;
+use Friendica\Contact\LocalRelationship\Factory\LocalRelationship as LocalRelationshipFactory;
 use Friendica\Database\Database;
-use Friendica\Network\HTTPException;
+use Friendica\Network\HTTPException\NotFoundException;
 use Psr\Log\LoggerInterface;
 
-class LocalRelationship extends \Friendica\BaseRepository
+class LocalRelationship extends BaseRepository
 {
 	protected static $table_name = 'user-contact';
 
-	/** @var Factory\LocalRelationship */
+	/** @var LocalRelationshipFactory */
 	protected $factory;
 
-	public function __construct(Database $database, LoggerInterface $logger, Factory\LocalRelationship $factory)
+	public function __construct(Database $database, LoggerInterface $logger, LocalRelationshipFactory $factory)
 	{
 		parent::__construct($database, $logger, $factory);
 	}
 
 	/**
-	 * @param int $uid
-	 * @param int $cid
-	 * @return Entity\LocalRelationship
-	 * @throws HTTPException\NotFoundException
+	 * @throws NotFoundException
 	 */
-	public function selectForUserContact(int $uid, int $cid): Entity\LocalRelationship
+	public function selectForUserContact(int $uid, int $cid): LocalRelationshipEntity
 	{
-		return $this->_selectOne(['uid' => $uid, 'cid' => $cid]);
+		$fields = $this->_selectFirstRowAsArray(['uid' => $uid, 'cid' => $cid]);
+
+		return $this->factory->createFromTableRow($fields);
 	}
 
 	/**
 	 * Returns the existing local relationship between a user and a public contact or a default
 	 * relationship if it doesn't.
 	 *
-	 * @param int $uid
-	 * @param int $cid
-	 * @return Entity\LocalRelationship
-	 * @throws HTTPException\NotFoundException
+	 * @throws NotFoundException
 	 */
-	public function getForUserContact(int $uid, int $cid): Entity\LocalRelationship
+	public function getForUserContact(int $uid, int $cid): LocalRelationshipEntity
 	{
 		try {
 			return $this->selectForUserContact($uid, $cid);
-		} catch (HTTPException\NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return $this->factory->createFromTableRow(['uid' => $uid, 'cid' => $cid]);
 		}
 	}
 
 	/**
-	 * @param int $uid
-	 * @param int $cid
-	 * @return bool
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function existsForUserContact(int $uid, int $cid): bool
 	{
@@ -68,12 +63,8 @@ class LocalRelationship extends \Friendica\BaseRepository
 
 	/**
 	 * Converts a given local relationship into a DB compatible row array
-	 *
-	 * @param Entity\LocalRelationship $localRelationship
-	 *
-	 * @return array
 	 */
-	protected function convertToTableRow(Entity\LocalRelationship $localRelationship): array
+	protected function convertToTableRow(LocalRelationshipEntity $localRelationship): array
 	{
 		return [
 			'uid'                       => $localRelationship->userId,
@@ -97,13 +88,9 @@ class LocalRelationship extends \Friendica\BaseRepository
 	}
 
 	/**
-	 * @param Entity\LocalRelationship $localRelationship
-	 *
-	 * @return Entity\LocalRelationship
-	 *
-	 * @throws Exception\LocalRelationshipPersistenceException In case the underlying storage cannot save the LocalRelationship
+	 * @throws LocalRelationshipPersistenceException In case the underlying storage cannot save the LocalRelationship
 	 */
-	public function save(Entity\LocalRelationship $localRelationship): Entity\LocalRelationship
+	public function save(LocalRelationshipEntity $localRelationship): LocalRelationshipEntity
 	{
 		try {
 			$fields = $this->convertToTableRow($localRelationship);
@@ -111,8 +98,8 @@ class LocalRelationship extends \Friendica\BaseRepository
 			$this->db->insert(self::$table_name, $fields, Database::INSERT_UPDATE);
 
 			return $localRelationship;
-		} catch (\Exception $exception) {
-			throw new Exception\LocalRelationshipPersistenceException(sprintf('Cannot insert/update the local relationship %d for user %d', $localRelationship->contactId, $localRelationship->userId), $exception);
+		} catch (Exception $exception) {
+			throw new LocalRelationshipPersistenceException(sprintf('Cannot insert/update the local relationship %d for user %d', $localRelationship->contactId, $localRelationship->userId), $exception);
 		}
 	}
 }

src/Content/Conversation/Repository/UserDefinedChannel.php

@@ -7,10 +7,10 @@
 
 namespace Friendica\Content\Conversation\Repository;
 
-use Friendica\BaseCollection;
+use Friendica\BaseRepository;
 use Friendica\Content\Conversation\Collection\UserDefinedChannels;
-use Friendica\Content\Conversation\Entity;
-use Friendica\Content\Conversation\Factory;
+use Friendica\Content\Conversation\Entity\UserDefinedChannel as UserDefinedChannelEntity;
+use Friendica\Content\Conversation\Factory\UserDefinedChannel as UserDefinedChannelFactory;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -21,13 +21,16 @@ use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Psr\Log\LoggerInterface;
 
-class UserDefinedChannel extends \Friendica\BaseRepository
+class UserDefinedChannel extends BaseRepository
 {
 	protected static $table_name = 'channel';
 
+	/** @var UserDefinedChannelFactory */
+	protected $factory;
+
 	private IManageConfigValues $config;
 
-	public function __construct(Database $database, LoggerInterface $logger, Factory\UserDefinedChannel $factory, IManageConfigValues $config)
+	public function __construct(Database $database, LoggerInterface $logger, UserDefinedChannelFactory $factory, IManageConfigValues $config)
 	{
 		parent::__construct($database, $logger, $factory);
 
@@ -40,7 +43,7 @@ class UserDefinedChannel extends \Friendica\BaseRepository
 	 * @return UserDefinedChannels
 	 * @throws \Exception
 	 */
-	protected function _select(array $condition, array $params = []): BaseCollection
+	protected function _select(array $condition, array $params = []): UserDefinedChannels
 	{
 		$rows = $this->db->selectToArray(static::$table_name, [], $condition, $params);
 
@@ -62,12 +65,13 @@ class UserDefinedChannel extends \Friendica\BaseRepository
 	 *
 	 * @param int $id  The id of the user defined channel
 	 * @param int $uid The user that this channel belongs to. (Not part of the primary key)
-	 * @return Entity\UserDefinedChannel
 	 * @throws \Friendica\Network\HTTPException\NotFoundException
 	 */
-	public function selectById(int $id, int $uid): Entity\UserDefinedChannel
+	public function selectById(int $id, int $uid): UserDefinedChannelEntity
 	{
-		return $this->_selectOne(['id' => $id, 'uid' => $uid]);
+		$fields = $this->_selectFirstRowAsArray(['id' => $id, 'uid' => $uid]);
+
+		return $this->factory->createFromTableRow($fields);
 	}
 
 	/**
@@ -106,7 +110,7 @@ class UserDefinedChannel extends \Friendica\BaseRepository
 		return $this->_select(['uid' => $uid]);
 	}
 
-	public function save(Entity\UserDefinedChannel $Channel): Entity\UserDefinedChannel
+	public function save(UserDefinedChannelEntity $Channel): UserDefinedChannelEntity
 	{
 		$fields = [
 			'label'            => $Channel->label,
@@ -210,7 +214,7 @@ class UserDefinedChannel extends \Friendica\BaseRepository
 		$disposableFullTextSearch = new DisposableFullTextSearch($this->db, $searchtext);
 
 		$filteredChannels = $this->select(['uid' => array_column($users, 'uid'), 'publish' => true, 'valid' => true])->filter(
-			function (Entity\UserDefinedChannel $channel) use ($owner_id, $reshare_id, $language, $tags, $media_type, $disposableFullTextSearch, $searchtext) {
+			function (UserDefinedChannelEntity $channel) use ($owner_id, $reshare_id, $language, $tags, $media_type, $disposableFullTextSearch, $searchtext) {
 				static $uids = [];
 
 				// Filter out channels from already picked users

src/Content/Item.php

@@ -1011,10 +1011,16 @@ class Item
 			Tag::createImplicitMentions($post['uri-id'], $post['thr-parent-id']);
 		}
 
-		$post = $this->eventDispatcher->dispatch(
-			new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL_END, $post)
+		$hook_data = [
+			'item' => $post,
+		];
+
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL_END, $hook_data)
 		)->getArray();
 
+		$post = $hook_data['item'] ?? $post;
+
 		$author = DBA::selectFirst('contact', ['thumb'], ['uid' => $post['uid'], 'self' => true]);
 
 		foreach ($recipients as $recipient) {

src/Content/PageInfo.php

@@ -92,6 +92,7 @@ class PageInfo
 	{
 		$eventDispatcher = DI::eventDispatcher();
 
+		/** @var array<string,mixed> */
 		$data = $eventDispatcher->dispatch(
 			new ArrayFilterEvent(ArrayFilterEvent::PAGE_INFO, $data),
 		)->getArray();

src/Content/Post/Entity/PostMedia.php

@@ -13,7 +13,6 @@ use Friendica\Util\Images;
 use Friendica\Util\Proxy;
 use Psr\Http\Message\UriInterface;
 
-
 /**
  * @property-read int $id
  * @property-read int $uriId
@@ -122,8 +121,7 @@ class PostMedia extends BaseEntity
 		?UriInterface $publisherImage = null,
 		?string $blurhash = null,
 		int $id = null
-	)
-	{
+	) {
 		$this->uriId          = $uriId;
 		$this->url            = $url;
 		$this->type           = $type;
@@ -210,7 +208,7 @@ class PostMedia extends BaseEntity
 	 *
 	 * @param \GuzzleHttp\Psr7\Uri $preview
 	 * @param string               $size
-	 * @return $this
+	 * @return self
 	 */
 	public function withPreview(\GuzzleHttp\Psr7\Uri $preview, string $size = ''): self
 	{

src/Content/Post/Factory/PostMedia.php

@@ -9,8 +9,9 @@ namespace Friendica\Content\Post\Factory;
 
 use Friendica\BaseFactory;
 use Friendica\Capabilities\ICanCreateFromTableRow;
-use Friendica\Content\Post\Entity;
-use Friendica\Network;
+use Friendica\Content\Post\Entity\PostMedia as PostMediaEntity;
+use Friendica\Network\Entity\MimeType as MimeTypeEntity;
+use Friendica\Network\Factory\MimeType as MimeTypeFactory;
 use Friendica\Util\Network as UtilNetwork;
 use GuzzleHttp\Psr7\Uri;
 use Psr\Log\LoggerInterface;
@@ -18,10 +19,10 @@ use stdClass;
 
 class PostMedia extends BaseFactory implements ICanCreateFromTableRow
 {
-	/** @var Network\Factory\MimeType */
+	/** @var MimeTypeFactory */
 	private $mimeTypeFactory;
 
-	public function __construct(Network\Factory\MimeType $mimeTypeFactory, LoggerInterface $logger)
+	public function __construct(MimeTypeFactory $mimeTypeFactory, LoggerInterface $logger)
 	{
 		parent::__construct($logger);
 
@@ -31,9 +32,9 @@ class PostMedia extends BaseFactory implements ICanCreateFromTableRow
 	/**
 	 * @inheritDoc
 	 */
-	public function createFromTableRow(array $row)
+	public function createFromTableRow(array $row): PostMediaEntity
 	{
-		return new Entity\PostMedia(
+		return new PostMediaEntity(
 			$row['uri-id'],
 			UtilNetwork::createUriFromString($row['url']),
 			$row['type'],
@@ -58,13 +59,13 @@ class PostMedia extends BaseFactory implements ICanCreateFromTableRow
 		);
 	}
 
-	public function createFromBlueskyImageEmbed(int $uriId, stdClass $image): Entity\PostMedia
+	public function createFromBlueskyImageEmbed(int $uriId, stdClass $image): PostMediaEntity
 	{
-		return new Entity\PostMedia(
+		return new PostMediaEntity(
 			$uriId,
 			new Uri($image->fullsize),
-			Entity\PostMedia::TYPE_IMAGE,
-			new Network\Entity\MimeType('unkn', 'unkn'),
+			PostMediaEntity::TYPE_IMAGE,
+			new MimeTypeEntity('unkn', 'unkn'),
 			null,
 			null,
 			null,
@@ -77,13 +78,13 @@ class PostMedia extends BaseFactory implements ICanCreateFromTableRow
 	}
 
 
-	public function createFromBlueskyExternalEmbed(int $uriId, stdClass $external): Entity\PostMedia
+	public function createFromBlueskyExternalEmbed(int $uriId, stdClass $external): PostMediaEntity
 	{
-		return new Entity\PostMedia(
+		return new PostMediaEntity(
 			$uriId,
 			new Uri($external->uri),
-			Entity\PostMedia::TYPE_HTML,
-			new Network\Entity\MimeType('text', 'html'),
+			PostMediaEntity::TYPE_HTML,
+			new MimeTypeEntity('text', 'html'),
 			null,
 			null,
 			null,

src/Content/Post/Repository/PostMedia.php

@@ -7,11 +7,10 @@
 
 namespace Friendica\Content\Post\Repository;
 
-use Friendica\BaseCollection;
 use Friendica\BaseRepository;
-use Friendica\Content\Post\Collection;
-use Friendica\Content\Post\Entity;
-use Friendica\Content\Post\Factory;
+use Friendica\Content\Post\Collection\PostMedias as PostMediasCollection;
+use Friendica\Content\Post\Entity\PostMedia as PostMediaEntity;
+use Friendica\Content\Post\Factory\PostMedia as PostMediaFactory;
 use Friendica\Database\Database;
 use Friendica\Model\Post;
 use Friendica\Util\Strings;
@@ -21,16 +20,19 @@ class PostMedia extends BaseRepository
 {
 	protected static $table_name = 'post-media';
 
-	public function __construct(Database $database, LoggerInterface $logger, Factory\PostMedia $factory)
+	/** @var PostMediaFactory */
+	protected $factory;
+
+	public function __construct(Database $database, LoggerInterface $logger, PostMediaFactory $factory)
 	{
 		parent::__construct($database, $logger, $factory);
 	}
 
-	protected function _select(array $condition, array $params = []): BaseCollection
+	protected function _select(array $condition, array $params = []): PostMediasCollection
 	{
 		$rows = $this->db->selectToArray(static::$table_name, [], $condition, $params);
 
-		$Entities = new Collection\PostMedias();
+		$Entities = new PostMediasCollection();
 		foreach ($rows as $fields) {
 			try {
 				$Entities[] = $this->factory->createFromTableRow($fields);
@@ -42,17 +44,19 @@ class PostMedia extends BaseRepository
 		return $Entities;
 	}
 
-	public function selectOneById(int $postMediaId): Entity\PostMedia
+	public function selectOneById(int $postMediaId): PostMediaEntity
 	{
-		return $this->_selectOne(['id' => $postMediaId]);
+		$fields = $this->_selectFirstRowAsArray(['id' => $postMediaId]);
+
+		return $this->factory->createFromTableRow($fields);
 	}
 
-	public function selectByUriId(int $uriId): Collection\PostMedias
+	public function selectByUriId(int $uriId): PostMediasCollection
 	{
 		return $this->_select(["`uri-id` = ? AND `type` != ?", $uriId, Post\Media::UNKNOWN]);
 	}
 
-	public function save(Entity\PostMedia $PostMedia): Entity\PostMedia
+	public function save(PostMediaEntity $PostMedia): PostMediaEntity
 	{
 		$fields = [
 			'uri-id'          => $PostMedia->uriId,
@@ -97,14 +101,14 @@ class PostMedia extends BaseRepository
 	 * @param int    $uri_id URI id
 	 * @param array  $links list of links that shouldn't be added
 	 * @param bool   $has_media
-	 * @return Collection\PostMedias[] Three collections in "visual", "link" and "additional" keys
+	 * @return PostMediasCollection[] Three collections in "visual", "link" and "additional" keys
 	 */
 	public function splitAttachments(int $uri_id, array $links = [], bool $has_media = true): array
 	{
 		$attachments = [
-			'visual'     => new Collection\PostMedias(),
-			'link'       => new Collection\PostMedias(),
-			'additional' => new Collection\PostMedias(),
+			'visual'     => new PostMediasCollection(),
+			'link'       => new PostMediasCollection(),
+			'additional' => new PostMediasCollection(),
 		];
 
 		if (!$has_media) {
@@ -137,7 +141,7 @@ class PostMedia extends BaseRepository
 
 			// Currently these two types are ignored here.
 			// Posts are added differently and contacts are not displayed as attachments.
-			if (in_array($PostMedia->type, [Entity\PostMedia::TYPE_ACCOUNT, Entity\PostMedia::TYPE_ACTIVITY])) {
+			if (in_array($PostMedia->type, [PostMediaEntity::TYPE_ACCOUNT, PostMediaEntity::TYPE_ACTIVITY])) {
 				continue;
 			}
 
@@ -148,17 +152,17 @@ class PostMedia extends BaseRepository
 			//$PostMedia->filetype = $filetype;
 			//$PostMedia->subtype = $subtype;
 
-			if ($PostMedia->type == Entity\PostMedia::TYPE_HTML || ($PostMedia->mimetype->type == 'text' && $PostMedia->mimetype->subtype == 'html')) {
+			if ($PostMedia->type == PostMediaEntity::TYPE_HTML || ($PostMedia->mimetype->type == 'text' && $PostMedia->mimetype->subtype == 'html')) {
 				$attachments['link'][] = $PostMedia;
 				continue;
 			}
 
 			if (
-				in_array($PostMedia->type, [Entity\PostMedia::TYPE_AUDIO, Entity\PostMedia::TYPE_IMAGE, Entity\PostMedia::TYPE_HLS]) ||
+				in_array($PostMedia->type, [PostMediaEntity::TYPE_AUDIO, PostMediaEntity::TYPE_IMAGE, PostMediaEntity::TYPE_HLS]) ||
 				in_array($PostMedia->mimetype->type, ['audio', 'image'])
 			) {
 				$attachments['visual'][] = $PostMedia;
-			} elseif (($PostMedia->type == Entity\PostMedia::TYPE_VIDEO) || ($PostMedia->mimetype->type == 'video')) {
+			} elseif (($PostMedia->type == PostMediaEntity::TYPE_VIDEO) || ($PostMedia->mimetype->type == 'video')) {
 				if (!empty($PostMedia->height)) {
 					// Peertube videos are delivered in many different resolutions. We pick a moderate one.
 					// Since only Peertube provides a "height" parameter, this wouldn't be executed

src/Core/Config/Util/ConfigFileManager.php

@@ -257,6 +257,7 @@ class ConfigFileManager
 
 		// map the legacy configuration structure to the current structure
 		foreach ($htConfigCategories as $htConfigCategory) {
+			/** @phpstan-ignore-next-line $a->config could be modified after `include $fullName` */
 			if (is_array($a->config[$htConfigCategory])) {
 				$keys = array_keys($a->config[$htConfigCategory]);
 

src/Core/Hook.php

@@ -172,7 +172,7 @@ class Hook
 	 * the provided data.
 	 *
 	 * @param string                $name of the hook to call
-	 * @param string|array &$data to transmit to the callback handler
+	 * @param int|string|array|null $data to transmit to the callback handler
 	 * @return void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */

src/Core/Hooks/HookEventBridge.php

@@ -43,15 +43,45 @@ final class HookEventBridge
 		ArrayFilterEvent::NAV_INFO                        => 'nav_info',
 		ArrayFilterEvent::FEATURE_ENABLED                 => 'isEnabled',
 		ArrayFilterEvent::FEATURE_GET                     => 'get',
-		ArrayFilterEvent::POST_LOCAL_START                => 'post_local_start',
-		ArrayFilterEvent::POST_LOCAL                      => 'post_local',
-		ArrayFilterEvent::POST_LOCAL_END                  => 'post_local_end',
+		ArrayFilterEvent::PERMISSION_TOOLTIP_CONTENT      => 'lockview_content',
+		ArrayFilterEvent::INSERT_POST_LOCAL_START         => 'post_local_start',
+		ArrayFilterEvent::INSERT_POST_LOCAL               => 'post_local',
+		ArrayFilterEvent::INSERT_POST_LOCAL_END           => 'post_local_end',
+		ArrayFilterEvent::INSERT_POST_REMOTE              => 'post_remote',
+		ArrayFilterEvent::INSERT_POST_REMOTE_END          => 'post_remote_end',
+		ArrayFilterEvent::PREPARE_POST_START              => 'prepare_body_init',
+		ArrayFilterEvent::PREPARE_POST_FILTER_CONTENT     => 'prepare_body_content_filter',
+		ArrayFilterEvent::PREPARE_POST                    => 'prepare_body',
+		ArrayFilterEvent::PREPARE_POST_END                => 'prepare_body_final',
 		ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'photo_upload_form',
+		ArrayFilterEvent::PHOTO_UPLOAD_START              => 'photo_post_init',
+		ArrayFilterEvent::PHOTO_UPLOAD                    => 'photo_post_file',
+		ArrayFilterEvent::PHOTO_UPLOAD_END                => 'photo_post_end',
 		ArrayFilterEvent::NETWORK_TO_NAME                 => 'network_to_name',
+		ArrayFilterEvent::NETWORK_CONTENT_START           => 'network_content_init',
+		ArrayFilterEvent::NETWORK_CONTENT_TABS            => 'network_tabs',
+		ArrayFilterEvent::PARSE_LINK                      => 'parse_link',
 		ArrayFilterEvent::CONVERSATION_START              => 'conversation_start',
+		ArrayFilterEvent::FETCH_ITEM_BY_LINK              => 'item_by_link',
+		ArrayFilterEvent::ITEM_TAGGED                     => 'tagged',
 		ArrayFilterEvent::DISPLAY_ITEM                    => 'display_item',
+		ArrayFilterEvent::CACHE_ITEM                      => 'put_item_in_cache',
+		ArrayFilterEvent::CHECK_ITEM_NOTIFICATION         => 'check_item_notification',
+		ArrayFilterEvent::ENOTIFY                         => 'enotify',
+		ArrayFilterEvent::ENOTIFY_STORE                   => 'enotify_store',
+		ArrayFilterEvent::ENOTIFY_MAIL                    => 'enotify_mail',
+		ArrayFilterEvent::DETECT_LANGUAGES                => 'detect_languages',
 		ArrayFilterEvent::RENDER_LOCATION                 => 'render_location',
 		ArrayFilterEvent::ITEM_PHOTO_MENU                 => 'item_photo_menu',
+		ArrayFilterEvent::DIRECTORY_ITEM                  => 'directory_item',
+		ArrayFilterEvent::CONTACT_PHOTO_MENU              => 'contact_photo_menu',
+		ArrayFilterEvent::PROFILE_SIDEBAR_ENTRY           => 'profile_sidebar_enter',
+		ArrayFilterEvent::PROFILE_SIDEBAR                 => 'profile_sidebar',
+		ArrayFilterEvent::PROFILE_TABS                    => 'profile_tabs',
+		ArrayFilterEvent::PROFILE_SETTINGS_FORM           => 'profile_edit',
+		ArrayFilterEvent::PROFILE_SETTINGS_POST           => 'profile_post',
+		ArrayFilterEvent::MODERATION_USERS_TABS           => 'moderation_users_tabs',
+		ArrayFilterEvent::ACL_LOOKUP_END                  => 'acl_lookup_end',
 		ArrayFilterEvent::OEMBED_FETCH_END                => 'oembed_fetch_url',
 		ArrayFilterEvent::PAGE_INFO                       => 'page_info_data',
 		ArrayFilterEvent::SMILEY_LIST                     => 'smilie',
@@ -62,11 +92,34 @@ final class HookEventBridge
 		ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW        => 'support_follow',
 		ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'support_revoke_follow',
 		ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE         => 'support_probe',
+		ArrayFilterEvent::FOLLOW_CONTACT                  => 'follow',
+		ArrayFilterEvent::UNFOLLOW_CONTACT                => 'unfollow',
+		ArrayFilterEvent::REVOKE_FOLLOW_CONTACT           => 'revoke_follow',
+		ArrayFilterEvent::BLOCK_CONTACT                   => 'block',
+		ArrayFilterEvent::UNBLOCK_CONTACT                 => 'unblock',
+		ArrayFilterEvent::EDIT_CONTACT_FORM               => 'contact_edit',
+		ArrayFilterEvent::EDIT_CONTACT_POST               => 'contact_edit_post',
+		ArrayFilterEvent::AVATAR_LOOKUP                   => 'avatar_lookup',
+		ArrayFilterEvent::ACCOUNT_AUTHENTICATE            => 'authenticate',
+		ArrayFilterEvent::ACCOUNT_REGISTER_FORM           => 'register_form',
+		ArrayFilterEvent::ACCOUNT_REGISTER_POST           => 'register_post',
+		ArrayFilterEvent::ACCOUNT_REGISTER                => 'register_account',
+		ArrayFilterEvent::ACCOUNT_REMOVE                  => 'remove_user',
+		ArrayFilterEvent::EVENT_CREATED                   => 'event_created',
+		ArrayFilterEvent::EVENT_UPDATED                   => 'event_updated',
+		ArrayFilterEvent::ADD_WORKER_TASK                 => 'proc_run',
+		ArrayFilterEvent::STORAGE_CONFIG                  => 'storage_config',
+		ArrayFilterEvent::STORAGE_INSTANCE                => 'storage_instance',
+		ArrayFilterEvent::DB_STRUCTURE_DEFINITION         => 'dbstructure_definition',
+		ArrayFilterEvent::DB_VIEW_DEFINITION              => 'dbview_definition',
 		HtmlFilterEvent::HEAD                             => 'head',
 		HtmlFilterEvent::FOOTER                           => 'footer',
 		HtmlFilterEvent::PAGE_HEADER                      => 'page_header',
 		HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'page_content_top',
 		HtmlFilterEvent::PAGE_END                         => 'page_end',
+		HtmlFilterEvent::MOD_HOME_CONTENT                 => 'home_content',
+		HtmlFilterEvent::MOD_ABOUT_CONTENT                => 'about_hook',
+		HtmlFilterEvent::MOD_PROFILE_CONTENT              => 'profile_advanced',
 		HtmlFilterEvent::JOT_TOOL                         => 'jot_tool',
 		HtmlFilterEvent::CONTACT_BLOCK_END                => 'contact_block_end',
 	];
@@ -85,15 +138,45 @@ final class HookEventBridge
 			ArrayFilterEvent::NAV_INFO                        => 'onArrayFilterEvent',
 			ArrayFilterEvent::FEATURE_ENABLED                 => 'onArrayFilterEvent',
 			ArrayFilterEvent::FEATURE_GET                     => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START                => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL                      => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END                  => 'onArrayFilterEvent',
+			ArrayFilterEvent::PERMISSION_TOOLTIP_CONTENT      => 'onPermissionTooltipContentEvent',
+			ArrayFilterEvent::INSERT_POST_LOCAL_START         => 'onArrayFilterEvent',
+			ArrayFilterEvent::INSERT_POST_LOCAL               => 'onInsertPostLocalEvent',
+			ArrayFilterEvent::INSERT_POST_LOCAL_END           => 'onInsertPostLocalEndEvent',
+			ArrayFilterEvent::INSERT_POST_REMOTE              => 'onArrayFilterEvent',
+			ArrayFilterEvent::INSERT_POST_REMOTE_END          => 'onArrayFilterEvent',
+			ArrayFilterEvent::PREPARE_POST_START              => 'onPreparePostStartEvent',
+			ArrayFilterEvent::PREPARE_POST_FILTER_CONTENT     => 'onArrayFilterEvent',
+			ArrayFilterEvent::PREPARE_POST                    => 'onArrayFilterEvent',
+			ArrayFilterEvent::PREPARE_POST_END                => 'onArrayFilterEvent',
 			ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_START              => 'onPhotoUploadStartEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD                    => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_END                => 'onPhotoUploadEndEvent',
 			ArrayFilterEvent::NETWORK_TO_NAME                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_CONTENT_START           => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_CONTENT_TABS            => 'onArrayFilterEvent',
+			ArrayFilterEvent::PARSE_LINK                      => 'onArrayFilterEvent',
 			ArrayFilterEvent::CONVERSATION_START              => 'onArrayFilterEvent',
+			ArrayFilterEvent::FETCH_ITEM_BY_LINK              => 'onArrayFilterEvent',
+			ArrayFilterEvent::ITEM_TAGGED                     => 'onArrayFilterEvent',
 			ArrayFilterEvent::DISPLAY_ITEM                    => 'onArrayFilterEvent',
+			ArrayFilterEvent::CACHE_ITEM                      => 'onArrayFilterEvent',
+			ArrayFilterEvent::CHECK_ITEM_NOTIFICATION         => 'onArrayFilterEvent',
+			ArrayFilterEvent::ENOTIFY                         => 'onArrayFilterEvent',
+			ArrayFilterEvent::ENOTIFY_STORE                   => 'onArrayFilterEvent',
+			ArrayFilterEvent::ENOTIFY_MAIL                    => 'onArrayFilterEvent',
+			ArrayFilterEvent::DETECT_LANGUAGES                => 'onArrayFilterEvent',
 			ArrayFilterEvent::RENDER_LOCATION                 => 'onArrayFilterEvent',
 			ArrayFilterEvent::ITEM_PHOTO_MENU                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::DIRECTORY_ITEM                  => 'onArrayFilterEvent',
+			ArrayFilterEvent::CONTACT_PHOTO_MENU              => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROFILE_SIDEBAR_ENTRY           => 'onProfileSidebarEntryEvent',
+			ArrayFilterEvent::PROFILE_SIDEBAR                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROFILE_TABS                    => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROFILE_SETTINGS_FORM           => 'onArrayFilterEvent',
+			ArrayFilterEvent::PROFILE_SETTINGS_POST           => 'onArrayFilterEvent',
+			ArrayFilterEvent::MODERATION_USERS_TABS           => 'onArrayFilterEvent',
+			ArrayFilterEvent::ACL_LOOKUP_END                  => 'onArrayFilterEvent',
 			ArrayFilterEvent::OEMBED_FETCH_END                => 'onOembedFetchEndEvent',
 			ArrayFilterEvent::PAGE_INFO                       => 'onArrayFilterEvent',
 			ArrayFilterEvent::SMILEY_LIST                     => 'onArrayFilterEvent',
@@ -104,11 +187,34 @@ final class HookEventBridge
 			ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW        => 'onArrayFilterEvent',
 			ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'onArrayFilterEvent',
 			ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE         => 'onArrayFilterEvent',
+			ArrayFilterEvent::FOLLOW_CONTACT                  => 'onArrayFilterEvent',
+			ArrayFilterEvent::UNFOLLOW_CONTACT                => 'onArrayFilterEvent',
+			ArrayFilterEvent::REVOKE_FOLLOW_CONTACT           => 'onArrayFilterEvent',
+			ArrayFilterEvent::BLOCK_CONTACT                   => 'onArrayFilterEvent',
+			ArrayFilterEvent::UNBLOCK_CONTACT                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::EDIT_CONTACT_FORM               => 'onArrayFilterEvent',
+			ArrayFilterEvent::EDIT_CONTACT_POST               => 'onArrayFilterEvent',
+			ArrayFilterEvent::AVATAR_LOOKUP                   => 'onArrayFilterEvent',
+			ArrayFilterEvent::ACCOUNT_AUTHENTICATE            => 'onArrayFilterEvent',
+			ArrayFilterEvent::ACCOUNT_REGISTER_FORM           => 'onArrayFilterEvent',
+			ArrayFilterEvent::ACCOUNT_REGISTER_POST           => 'onArrayFilterEvent',
+			ArrayFilterEvent::ACCOUNT_REGISTER                => 'onAccountRegisterEvent',
+			ArrayFilterEvent::ACCOUNT_REMOVE                  => 'onAccountRemoveEvent',
+			ArrayFilterEvent::EVENT_CREATED                   => 'onEventCreatedEvent',
+			ArrayFilterEvent::EVENT_UPDATED                   => 'onEventUpdatedEvent',
+			ArrayFilterEvent::ADD_WORKER_TASK                 => 'onArrayFilterEvent',
+			ArrayFilterEvent::STORAGE_CONFIG                  => 'onArrayFilterEvent',
+			ArrayFilterEvent::STORAGE_INSTANCE                => 'onArrayFilterEvent',
+			ArrayFilterEvent::DB_STRUCTURE_DEFINITION         => 'onArrayFilterEvent',
+			ArrayFilterEvent::DB_VIEW_DEFINITION              => 'onArrayFilterEvent',
 			HtmlFilterEvent::HEAD                             => 'onHtmlFilterEvent',
 			HtmlFilterEvent::FOOTER                           => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_HEADER                      => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'onHtmlFilterEvent',
 			HtmlFilterEvent::PAGE_END                         => 'onHtmlFilterEvent',
+			HtmlFilterEvent::MOD_HOME_CONTENT                 => 'onHtmlFilterEvent',
+			HtmlFilterEvent::MOD_ABOUT_CONTENT                => 'onHtmlFilterEvent',
+			HtmlFilterEvent::MOD_PROFILE_CONTENT              => 'onHtmlFilterEvent',
 			HtmlFilterEvent::JOT_TOOL                         => 'onHtmlFilterEvent',
 			HtmlFilterEvent::CONTACT_BLOCK_END                => 'onHtmlFilterEvent',
 		];
@@ -131,6 +237,103 @@ final class HookEventBridge
 		);
 	}
 
+	/**
+	 * Map the PERMISSION_TOOLTIP_CONTENT event to `lockview_content` hook
+	 */
+	public static function onPermissionTooltipContentEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$model = (array) $data['model'] ?? [];
+
+		$data['model'] = static::callHook($event->getName(), $model);
+
+		$event->setArray($data);
+	}
+
+	/**
+	 * Map the INSERT_POST_LOCAL event to `post_local` hook
+	 */
+	public static function onInsertPostLocalEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$item = (array) $data['item'] ?? [];
+
+		$data['item'] = static::callHook($event->getName(), $item);
+
+		$event->setArray($data);
+	}
+
+	/**
+	 * Map the INSERT_POST_LOCAL_END event to `post_local_end` hook
+	 */
+	public static function onInsertPostLocalEndEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$item = (array) $data['item'] ?? [];
+
+		$data['item'] = static::callHook($event->getName(), $item);
+
+		$event->setArray($data);
+	}
+
+	/**
+	 * Map the PREPARE_POST_START event to `prepare_body_init` hook
+	 */
+	public static function onPreparePostStartEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$item = (array) $data['item'] ?? [];
+
+		$data['item'] = static::callHook($event->getName(), $item);
+
+		$event->setArray($data);
+	}
+
+	/**
+	 * Map the PHOTO_UPLOAD_START event to `photo_post_init` hook
+	 */
+	public static function onPhotoUploadStartEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$request = (array) $data['request'] ?? [];
+
+		$data['request'] = static::callHook($event->getName(), $request);
+
+		$event->setArray($data);
+	}
+
+	/**
+	 * Map the PHOTO_UPLOAD_END event to `photo_post_end` hook
+	 */
+	public static function onPhotoUploadEndEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$id = (int) $data['id'] ?? 0;
+
+		// one-way-event: we don't care about the returned value
+		static::callHook($event->getName(), $id);
+	}
+
+	/**
+	 * Map the PROFILE_SIDEBAR_ENTRY event to `profile_sidebar_enter` hook
+	 */
+	public static function onProfileSidebarEntryEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$profile = (array) $data['profile'] ?? [];
+
+		$data['profile'] = static::callHook($event->getName(), $profile);
+
+		$event->setArray($data);
+	}
+
 	/**
 	 * Map the OEMBED_FETCH_END event to `oembed_fetch_url` hook
 	 */
@@ -187,6 +390,60 @@ final class HookEventBridge
 		$event->setArray($data);
 	}
 
+	/**
+	 * Map the ACCOUNT_REGISTER event to `register_account` hook
+	 */
+	public static function onAccountRegisterEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$uid = (int) $data['uid'] ?? 0;
+
+		$data['uid'] = static::callHook($event->getName(), $uid);
+
+		$event->setArray($data);
+	}
+
+	/**
+	 * Map the ACCOUNT_REMOVE event to `remove_account` hook
+	 */
+	public static function onAccountRemoveEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$user = (array) $data['user'] ?? [];
+
+		$data['user'] = static::callHook($event->getName(), $user);
+
+		$event->setArray($data);
+	}
+
+	/**
+	 * Map the EVENT_CREATED event to `event_created` hook
+	 */
+	public static function onEventCreatedEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$id = (int) $data['event']['id'] ?? 0;
+
+		// one-way-event: we don't care about the returned value
+		static::callHook($event->getName(), $id);
+	}
+
+	/**
+	 * Map the EVENT_UPDATED event to `event_updated` hook
+	 */
+	public static function onEventUpdatedEvent(ArrayFilterEvent $event): void
+	{
+		$data = $event->getArray();
+
+		$id = (int) $data['event']['id'] ?? 0;
+
+		// one-way-event: we don't care about the returned value
+		static::callHook($event->getName(), $id);
+	}
+
 	public static function onArrayFilterEvent(ArrayFilterEvent $event): void
 	{
 		$event->setArray(
@@ -202,9 +459,9 @@ final class HookEventBridge
 	}
 
 	/**
-	 * @param string|array|object $data
+	 * @param int|string|array|object $data
 	 *
-	 * @return string|array|object
+	 * @return int|string|array|object
 	 */
 	private static function callHook(string $name, $data)
 	{

src/Core/Logger/Factory/SyslogLoggerFactory.php

@@ -48,8 +48,8 @@ final class SyslogLoggerFactory implements LoggerFactory
 	 */
 	public function createLogger(string $logLevel, string $logChannel): LoggerInterface
 	{
-		$logOpts     = (string) $this->config->get('system', 'syslog_flags')    ?? SyslogLogger::DEFAULT_FLAGS;
-		$logFacility = (string) $this->config->get('system', 'syslog_facility') ?? SyslogLogger::DEFAULT_FACILITY;
+		$logOpts     = (int) $this->config->get('system', 'syslog_flags')    ?? SyslogLogger::DEFAULT_FLAGS;
+		$logFacility = (int) $this->config->get('system', 'syslog_facility') ?? SyslogLogger::DEFAULT_FACILITY;
 
 		if (!array_key_exists($logLevel, SyslogLogger::logLevels)) {
 			throw new LogLevelException(sprintf('The log level "%s" is not supported by "%s".', $logLevel, SyslogLogger::class));
@@ -58,7 +58,7 @@ final class SyslogLoggerFactory implements LoggerFactory
 		return new SyslogLogger(
 			$logChannel,
 			$this->introspection,
-			(string) SyslogLogger::logLevels[$logLevel],
+			SyslogLogger::logLevels[$logLevel],
 			$logOpts,
 			$logFacility
 		);

src/Core/Logger/Type/StreamLogger.php

@@ -22,21 +22,19 @@ class StreamLogger extends AbstractLogger
 
 	/**
 	 * The minimum loglevel at which this logger will be triggered
-	 * @var string
 	 */
-	private $logLevel;
+	private int $logLevel;
 
 	/**
 	 * The stream, where the current logger is writing into
-	 * @var resource
+	 * @var resource|null
 	 */
 	private $stream;
 
 	/**
 	 * The current process ID
-	 * @var int
 	 */
-	private $pid;
+	private int $pid;
 
 	/**
 	 * Translates LogLevel log levels to integer values

src/Core/Logger/Type/SyslogLogger.php

@@ -29,7 +29,7 @@ class SyslogLogger extends AbstractLogger
 
 	/**
 	 * Translates LogLevel log levels to syslog log priorities.
-	 * @var array
+	 * @var array<string,int>
 	 */
 	public const logLevels = [
 		LogLevel::DEBUG     => LOG_DEBUG,
@@ -60,39 +60,33 @@ class SyslogLogger extends AbstractLogger
 	/**
 	 * Indicates what logging options will be used when generating a log message
 	 * @see http://php.net/manual/en/function.openlog.php#refsect1-function.openlog-parameters
-	 *
-	 * @var int
 	 */
-	private $logOpts;
+	private int $logOpts;
 
 	/**
 	 * Used to specify what type of program is logging the message
 	 * @see http://php.net/manual/en/function.openlog.php#refsect1-function.openlog-parameters
-	 *
-	 * @var int
 	 */
-	private $logFacility;
+	private int $logFacility;
 
 	/**
 	 * The minimum loglevel at which this logger will be triggered
-	 * @var int
 	 */
-	private $logLevel;
+	private int $logLevel;
 
 	/**
 	 * A error message of the current operation
-	 * @var string
 	 */
-	private $errorMessage;
+	private string $errorMessage;
 
 	/**
 	 * {@inheritdoc}
 	 *
-	 * @param string $logLevel    The minimum loglevel at which this logger will be triggered
-	 * @param string $logOptions
-	 * @param string $logFacility
+	 * @param int $logLevel    The minimum loglevel at which this logger will be triggered
+	 * @param int $logOptions
+	 * @param int $logFacility
 	 */
-	public function __construct(string $channel, IHaveCallIntrospections $introspection, string $logLevel, string $logOptions, string $logFacility)
+	public function __construct(string $channel, IHaveCallIntrospections $introspection, int $logLevel, int $logOptions, int $logFacility)
 	{
 		parent::__construct($channel, $introspection);
 
@@ -166,7 +160,7 @@ class SyslogLogger extends AbstractLogger
 		restore_error_handler();
 
 		if (!$opened) {
-			throw new LoggerException(sprintf('Can\'t open syslog for ident "%s" and facility "%s": ' . $this->errorMessage, $this->channel, $this->logFacility));
+			throw new LoggerException(sprintf('Can\'t open syslog for ident "%s" and facility "%s": ' . $this->errorMessage, $this->channel, (string) $this->logFacility));
 		}
 
 		$this->syslogWrapper($priority, $message);
@@ -215,7 +209,7 @@ class SyslogLogger extends AbstractLogger
 		restore_error_handler();
 
 		if (!$written) {
-			throw new LoggerException(sprintf('Can\'t write into syslog for ident "%s" and facility "%s": ' . $this->errorMessage, $this->channel, $this->logFacility));
+			throw new LoggerException(sprintf('Can\'t write into syslog for ident "%s" and facility "%s": ' . $this->errorMessage, $this->channel, (string) $this->logFacility));
 		}
 	}
 }

src/Core/PConfig/Repository/PConfig.php

@@ -37,7 +37,7 @@ class PConfig
 	 */
 	public function isConnected(): bool
 	{
-		return $this->db->isConnected() & !$this->mode->isInstall();
+		return $this->db->isConnected() && !$this->mode->isInstall();
 	}
 
 	/**

src/Core/Protocol.php

@@ -183,7 +183,12 @@ class Protocol
 			'uid'     => $owner['uid'],
 			'result'  => null,
 		];
-		Hook::callAll('unfollow', $hook_data);
+
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::UNFOLLOW_CONTACT, $hook_data),
+		)->getArray();
 
 		return $hook_data['result'];
 	}
@@ -218,7 +223,12 @@ class Protocol
 			'uid'     => $owner['uid'],
 			'result'  => null,
 		];
-		Hook::callAll('revoke_follow', $hook_data);
+
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::REVOKE_FOLLOW_CONTACT, $hook_data),
+		)->getArray();
 
 		return $hook_data['result'];
 	}
@@ -256,7 +266,12 @@ class Protocol
 			'uid'     => $uid,
 			'result'  => null,
 		];
-		Hook::callAll('block', $hook_data);
+
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::BLOCK_CONTACT, $hook_data),
+		)->getArray();
 
 		return $hook_data['result'];
 	}
@@ -295,7 +310,12 @@ class Protocol
 			'uid'     => $uid,
 			'result'  => null,
 		];
-		Hook::callAll('unblock', $hook_data);
+
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::UNBLOCK_CONTACT, $hook_data),
+		)->getArray();
 
 		return $hook_data['result'];
 	}

src/Core/Session/Model/UserSession.php

@@ -101,7 +101,7 @@ class UserSession implements IHandleUserSessions
 	public function getUserIDForVisitorContactID(int $cid): int
 	{
 		if (empty($this->session->get('remote'))) {
-			return false;
+			return 0;
 		}
 
 		return array_search($cid, $this->session->get('remote'));

src/Core/Storage/Repository/StorageManager.php

@@ -20,7 +20,9 @@ use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Database\Database;
 use Friendica\Core\Storage\Type;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Network\HTTPException\InternalServerErrorException;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -55,6 +57,7 @@ class StorageManager
 	private $config;
 	/** @var LoggerInterface */
 	private $logger;
+	private EventDispatcherInterface $eventDispatcher;
 	/** @var L10n */
 	private $l10n;
 
@@ -71,11 +74,12 @@ class StorageManager
 	 * @throws InvalidClassStorageException in case the active backend class is invalid
 	 * @throws StorageException in case of unexpected errors during the active backend class loading
 	 */
-	public function __construct(Database $dba, IManageConfigValues $config, LoggerInterface $logger, L10n $l10n, bool $includeAddon = true)
+	public function __construct(Database $dba, IManageConfigValues $config, LoggerInterface $logger, EventDispatcherInterface $eventDispatcher, L10n $l10n, bool $includeAddon = true)
 	{
 		$this->dba             = $dba;
 		$this->config          = $config;
 		$this->logger          = $logger;
+		$this->eventDispatcher = $eventDispatcher;
 		$this->l10n            = $l10n;
 		$this->validBackends   = $config->get('storage', 'backends', self::DEFAULT_BACKENDS);
 
@@ -146,8 +150,12 @@ class StorageManager
 					'name'           => $name,
 					'storage_config' => null,
 				];
+
 				try {
-					Hook::callAll('storage_config', $data);
+					$data = $this->eventDispatcher->dispatch(
+						new ArrayFilterEvent(ArrayFilterEvent::STORAGE_CONFIG, $data),
+					)->getArray();
+
 					if (!($data['storage_config'] ?? null) instanceof ICanConfigureStorage) {
 						throw new InvalidClassStorageException(sprintf('Configuration for backend %s was not found', $name));
 					}
@@ -201,8 +209,12 @@ class StorageManager
 						'name'    => $name,
 						'storage' => null,
 					];
+
 					try {
-						Hook::callAll('storage_instance', $data);
+						$data = $this->eventDispatcher->dispatch(
+							new ArrayFilterEvent(ArrayFilterEvent::STORAGE_INSTANCE, $data),
+						)->getArray();
+
 						if (!($data['storage'] ?? null) instanceof ICanReadFromStorage) {
 							throw new InvalidClassStorageException(sprintf('Backend %s was not found', $name));
 						}

src/Core/Storage/Type/Database.php

@@ -80,7 +80,7 @@ class Database implements ICanWriteToStorage
 				throw new StorageException(sprintf('Database storage failed to update %s', $reference), 500, new Exception($this->dba->errorMessage(), $this->dba->errorNo()));
 			}
 
-			return $this->dba->lastInsertId();
+			return (string) $this->dba->lastInsertId();
 		}
 	}
 

src/Core/System.php

@@ -452,19 +452,17 @@ class System
 
 	/**
 	 * Returns the current Load of the System
-	 *
-	 * @return integer
 	 */
-	public static function currentLoad()
+	public static function currentLoad(): float
 	{
 		if (!function_exists('sys_getloadavg')) {
-			return false;
+			return (float) 0;
 		}
 
 		$load_arr = sys_getloadavg();
 
 		if (!is_array($load_arr)) {
-			return false;
+			return (float) 0;
 		}
 
 		return round(max($load_arr[0], $load_arr[1]), 2);

src/Core/Update.php

@@ -217,7 +217,7 @@ class Update
 										->set('system', 'maintenance', false)
 										->delete('system', 'maintenance_reason')
 										->commit();
-							return $r;
+							return 'Pre update failed';
 						} else {
 							DI::logger()->notice('Pre update executed.', ['version' => $version]);
 						}
@@ -262,7 +262,7 @@ class Update
 										->set('system', 'maintenance', false)
 										->delete('system', 'maintenance_reason')
 										->commit();
-							return $r;
+							return 'Post update failed';
 						} else {
 							DI::config()->set('system', 'build', $version);
 							DI::logger()->notice('Post update executed.', ['version' => $version]);

src/Core/Worker.php

@@ -13,6 +13,7 @@ use Friendica\Core\Logger\Type\WorkerLogger;
 use Friendica\Core\Worker\Entity\Process;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Util\DateTimeFormat;
 
 /**
@@ -271,12 +272,13 @@ class Worker
 	 *
 	 * @param integer $priority The priority that should be checked
 	 *
-	 * @return integer Is there a process running with that priority?
+	 * @return bool Is there a process running with that priority?
 	 * @throws \Exception
 	 */
-	private static function processWithPriorityActive(int $priority): int
+	private static function processWithPriorityActive(int $priority): bool
 	{
 		$condition = ["`priority` <= ? AND `pid` != 0 AND NOT `done`", $priority];
+
 		return DBA::exists('workerqueue', $condition);
 	}
 
@@ -955,7 +957,7 @@ class Worker
 	/**
 	 * Returns the priority of the next workerqueue job
 	 *
-	 * @return string|bool priority or FALSE on failure
+	 * @return int|false priority or FALSE on failure
 	 * @throws \Exception
 	 */
 	private static function nextPriority()
@@ -1237,10 +1239,6 @@ class Worker
 	 * @return int '0' if worker queue entry already existed or there had been an error, otherwise the ID of the worker task
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @note $cmd and string args are surrounded with ''
-	 *
-	 * @hooks 'proc_run'
-	 *    array $arr
-	 *
 	 */
 	public static function add(...$args)
 	{
@@ -1250,7 +1248,12 @@ class Worker
 
 		$arr = ['args' => $args, 'run_cmd' => true];
 
-		Hook::callAll('proc_run', $arr);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$arr = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::ADD_WORKER_TASK, $arr),
+		)->getArray();
+
 		if (!$arr['run_cmd'] || !count($args)) {
 			return 1;
 		}

src/Core/Worker/Repository/Process.php

@@ -8,11 +8,11 @@
 namespace Friendica\Core\Worker\Repository;
 
 use Friendica\BaseRepository;
+use Friendica\Core\Worker\Entity\Process as ProcessEntity;
 use Friendica\Core\Worker\Exception\ProcessPersistenceException;
+use Friendica\Core\Worker\Factory\Process as ProcessFactory;
 use Friendica\Database\Database;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Core\Worker\Factory;
-use Friendica\Core\Worker\Entity;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -24,13 +24,13 @@ class Process extends BaseRepository
 
 	protected static $table_name = 'process';
 
-	/** @var Factory\Process */
+	/** @var ProcessFactory */
 	protected $factory;
 
 	/** @var string */
 	private $currentHost;
 
-	public function __construct(Database $database, LoggerInterface $logger, Factory\Process $factory, array $server)
+	public function __construct(Database $database, LoggerInterface $logger, ProcessFactory $factory, array $server)
 	{
 		parent::__construct($database, $logger, $factory);
 
@@ -39,13 +39,8 @@ class Process extends BaseRepository
 
 	/**
 	 * Starts and Returns the process for a given PID at the current host
-	 *
-	 * @param int    $pid
-	 * @param string $command
-	 *
-	 * @return Entity\Process
 	 */
-	public function create(int $pid, string $command): Entity\Process
+	public function create(int $pid, string $command): ProcessEntity
 	{
 		// Cleanup inactive process
 		$this->deleteInactive();
@@ -64,7 +59,9 @@ class Process extends BaseRepository
 				}
 			}
 
-			$result = $this->_selectOne(['pid' => $pid, 'hostname' => $this->currentHost]);
+			$fields = $this->_selectFirstRowAsArray(['pid' => $pid, 'hostname' => $this->currentHost]);
+
+			$result = $this->factory->createFromTableRow($fields);
 
 			$this->db->commit();
 
@@ -74,7 +71,7 @@ class Process extends BaseRepository
 		}
 	}
 
-	public function delete(Entity\Process $process)
+	public function delete(ProcessEntity $process)
 	{
 		try {
 			if (!$this->db->delete(static::$table_name, [

src/Database/Database.php

@@ -60,7 +60,7 @@ class Database
 	protected $syslock = null;
 
 	protected $server_info = '';
-	/** @var PDO|mysqli */
+	/** @var PDO|mysqli|null */
 	protected $connection;
 	protected $driver               = '';
 	protected $pdo_emulate_prepares = false;
@@ -253,7 +253,7 @@ class Database
 	/**
 	 * Return the database object.
 	 *
-	 * @return PDO|mysqli
+	 * @return PDO|mysqli|null
 	 */
 	public function getConnection()
 	{
@@ -474,7 +474,7 @@ class Database
 	 *
 	 * @param string $sql SQL statement
 	 *
-	 * @return bool|object statement object or result object
+	 * @return bool|mysqli_result|mysqli_stmt|object|PDOStatement statement object or result object
 	 * @throws \Exception
 	 */
 	public function p(string $sql)

src/Database/Definition/DbaDefinition.php

@@ -8,9 +8,8 @@
 namespace Friendica\Database\Definition;
 
 use Exception;
-use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 
 /**
  * Stores the whole database definition
@@ -109,12 +108,16 @@ class DbaDefinition
 	{
 		$definition = require $this->configFile;
 
-		if (!$definition) {
+		if (!is_array($definition)) {
 			throw new Exception('Corrupted database structure config file static/dbstructure.config.php');
 		}
 
 		if ($withAddonStructure) {
-			Hook::callAll('dbstructure_definition', $definition);
+			$eventDispatcher = DI::eventDispatcher();
+
+			$definition = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::DB_STRUCTURE_DEFINITION, $definition),
+			)->getArray();
 		}
 
 		$this->definition = $definition;

src/Database/Definition/ViewDefinition.php

@@ -8,7 +8,8 @@
 namespace Friendica\Database\Definition;
 
 use Exception;
-use Friendica\Core\Hook;
+use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 
 /**
  * Stores the whole View definitions
@@ -62,12 +63,16 @@ class ViewDefinition
 	{
 		$definition = require $this->configFile;
 
-		if (!$definition) {
+		if (!is_array($definition)) {
 			throw new Exception('Corrupted database structure config file static/dbstructure.config.php');
 		}
 
 		if ($withAddonStructure) {
-			Hook::callAll('dbview_definition', $definition);
+			$eventDispatcher = DI::eventDispatcher();
+
+			$definition = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::DB_VIEW_DEFINITION, $definition),
+			)->getArray();
 		}
 
 		$this->definition = $definition;

src/Event/ArrayFilterEvent.php

@@ -24,24 +24,96 @@ final class ArrayFilterEvent extends Event
 
 	public const FEATURE_GET = 'friendica.data.feature_get';
 
-	public const POST_LOCAL_START = 'friendica.data.post_local_start';
+	public const PERMISSION_TOOLTIP_CONTENT = 'friendica.data.permission_tooltip_content';
 
-	public const POST_LOCAL = 'friendica.data.post_local';
+	public const INSERT_POST_LOCAL_START = 'friendica.data.insert_post_local_start';
 
-	public const POST_LOCAL_END = 'friendica.data.post_local_end';
+	public const INSERT_POST_LOCAL = 'friendica.data.insert_post_local';
+
+	public const INSERT_POST_LOCAL_END = 'friendica.data.insert_post_local_end';
+
+	public const INSERT_POST_REMOTE = 'friendica.data.insert_post_remote';
+
+	public const INSERT_POST_REMOTE_END = 'friendica.data.insert_post_remote_end';
+
+	/**
+	 * item array before any work
+	 */
+	public const PREPARE_POST_START = 'friendica.data.prepare_post_start';
+
+	/**
+	 * before first bbcode to html
+	 */
+	public const PREPARE_POST_FILTER_CONTENT = 'friendica.data.prepare_post_filter_content';
+
+	/**
+	 * after first bbcode to html
+	 */
+	public const PREPARE_POST = 'friendica.data.prepare_post';
+
+	/**
+	 * after attach icons and blockquote special case handling (spoiler, author)
+	 */
+	public const PREPARE_POST_END = 'friendica.data.prepare_post_end';
 
 	public const PHOTO_UPLOAD_FORM = 'friendica.data.photo_upload_form';
 
+	public const PHOTO_UPLOAD_START = 'friendica.data.photo_upload_start';
+
+	public const PHOTO_UPLOAD = 'friendica.data.photo_upload';
+
+	public const PHOTO_UPLOAD_END = 'friendica.data.photo_upload_end';
+
 	public const NETWORK_TO_NAME = 'friendica.data.network_to_name';
 
+	public const NETWORK_CONTENT_START = 'friendica.data.network_content_start';
+
+	public const NETWORK_CONTENT_TABS = 'friendica.data.network_content_tabs';
+
+	public const PARSE_LINK = 'friendica.data.parse_link';
+
 	public const CONVERSATION_START = 'friendica.data.conversation_start';
 
+	public const FETCH_ITEM_BY_LINK = 'friendica.data.fetch_item_by_link';
+
+	public const ITEM_TAGGED = 'friendica.data.item_tagged';
+
 	public const DISPLAY_ITEM = 'friendica.data.display_item';
 
+	public const CACHE_ITEM = 'friendica.data.cache_item';
+
+	public const CHECK_ITEM_NOTIFICATION = 'friendica.data.check_item_notification';
+
+	public const ENOTIFY = 'friendica.data.enotify';
+
+	public const ENOTIFY_STORE = 'friendica.data.enotify_store';
+
+	public const ENOTIFY_MAIL = 'friendica.data.enotify_mail';
+
+	public const DETECT_LANGUAGES = 'friendica.data.detect_languages';
+
 	public const RENDER_LOCATION = 'friendica.data.render_location';
 
 	public const ITEM_PHOTO_MENU = 'friendica.data.item_photo_menu';
 
+	public const DIRECTORY_ITEM = 'friendica.data.directory_item';
+
+	public const CONTACT_PHOTO_MENU = 'friendica.data.contact_photo_menu';
+
+	public const PROFILE_SIDEBAR_ENTRY = 'friendica.data.profile_sidebar_entry';
+
+	public const PROFILE_SIDEBAR = 'friendica.data.profile_sidebar';
+
+	public const PROFILE_TABS = 'friendica.data.profile_tabs';
+
+	public const PROFILE_SETTINGS_FORM = 'friendica.data.profile_settings_form';
+
+	public const PROFILE_SETTINGS_POST = 'friendica.data.profile_settings_post';
+
+	public const MODERATION_USERS_TABS = 'friendica.data.moderation_users_tabs';
+
+	public const ACL_LOOKUP_END = 'friendica.data.acl_lookup_end';
+
 	public const OEMBED_FETCH_END = 'friendica.data.oembed_fetch_end';
 
 	public const PAGE_INFO = 'friendica.data.page_info';
@@ -62,6 +134,46 @@ final class ArrayFilterEvent extends Event
 
 	public const PROTOCOL_SUPPORTS_PROBE = 'friendica.data.protocol_supports_probe';
 
+	public const FOLLOW_CONTACT = 'friendica.data.follow_contact';
+
+	public const UNFOLLOW_CONTACT = 'friendica.data.unfollow_contact';
+
+	public const REVOKE_FOLLOW_CONTACT = 'friendica.data.revoke_follow_contact';
+
+	public const BLOCK_CONTACT = 'friendica.data.block_contact';
+
+	public const UNBLOCK_CONTACT = 'friendica.data.unblock_contact';
+
+	public const EDIT_CONTACT_FORM = 'friendica.data.edit_contact_form';
+
+	public const EDIT_CONTACT_POST = 'friendica.data.edit_contact_post';
+
+	public const AVATAR_LOOKUP = 'friendica.data.avatar_lookup';
+
+	public const ACCOUNT_AUTHENTICATE = 'friendica.data.account_authenticate';
+
+	public const ACCOUNT_REGISTER_FORM = 'friendica.data.account_register_form';
+
+	public const ACCOUNT_REGISTER_POST = 'friendica.data.account_register_post';
+
+	public const ACCOUNT_REGISTER = 'friendica.data.account_register';
+
+	public const ACCOUNT_REMOVE = 'friendica.data.account_remove';
+
+	public const EVENT_CREATED = 'friendica.data.event_created';
+
+	public const EVENT_UPDATED = 'friendica.data.event_updated';
+
+	public const ADD_WORKER_TASK = 'friendica.data.add_worker_task';
+
+	public const STORAGE_CONFIG = 'friendica.data.storage_config';
+
+	public const STORAGE_INSTANCE = 'friendica.data.storage_instance';
+
+	public const DB_STRUCTURE_DEFINITION = 'friendica.data.db_structure_definition';
+
+	public const DB_VIEW_DEFINITION = 'friendica.data.db_view_definition';
+
 	private array $array;
 
 	public function __construct(string $name, array $array)

src/Event/HtmlFilterEvent.php

@@ -26,6 +26,12 @@ final class HtmlFilterEvent extends Event
 
 	public const PAGE_END = 'friendica.html.page_end';
 
+	public const MOD_HOME_CONTENT = 'friendica.html.mod_home_content';
+
+	public const MOD_ABOUT_CONTENT = 'friendica.html.mod_about_content';
+
+	public const MOD_PROFILE_CONTENT = 'friendica.html.mod_profile_content';
+
 	public const JOT_TOOL = 'friendica.html.jot_tool';
 
 	public const CONTACT_BLOCK_END = 'friendica.html.contact_block_end';

src/Factory/Api/Friendica/Photo.php

@@ -41,7 +41,6 @@ class Photo extends BaseFactory
 	 * @param int    $scale
 	 * @param int    $uid
 	 * @param string $type
-	 * @return Array
 	 */
 	public function createFromId(string $photo_id, int $scale = null, int $uid, string $type = 'json', bool $with_posts = true): array
 	{
@@ -66,7 +65,7 @@ class Photo extends BaseFactory
 		$data['id']       = $data['resource-id'];
 
 		if (is_int($scale)) {
-			$data['data'] = base64_encode(ModelPhoto::getImageDataForPhoto($data));
+			$data['data'] = base64_encode(ModelPhoto::getImageDataForPhoto($data) ?? '');
 		}
 
 		if ($type == 'xml') {

src/Factory/Api/Mastodon/Attachment.php

@@ -11,7 +11,7 @@ use Friendica\App\BaseURL;
 use Friendica\BaseFactory;
 use Friendica\Model\Attach;
 use Friendica\Model\Photo;
-use Friendica\Network\HTTPException;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Model\Post;
 use Friendica\Util\Images;
 use Friendica\Util\Proxy;
@@ -32,7 +32,7 @@ class Attachment extends BaseFactory
 	/**
 	 * @param int $uriId Uri-ID of the attachments
 	 * @return array
-	 * @throws HTTPException\InternalServerErrorException
+	 * @throws InternalServerErrorException
 	 */
 	public function createFromUriId(int $uriId): array
 	{
@@ -47,21 +47,23 @@ class Attachment extends BaseFactory
 	/**
 	 * @param int $id id of the media
 	 * @return \Friendica\Object\Api\Mastodon\Attachment
-	 * @throws HTTPException\InternalServerErrorException
+	 * @throws InternalServerErrorException
 	 */
 	public function createFromId(int $id): \Friendica\Object\Api\Mastodon\Attachment
 	{
 		$attachment = Post\Media::getById($id);
+
 		if (empty($attachment)) {
-			return [];
+			throw new InternalServerErrorException();
 		}
+
 		return $this->createFromMediaArray($attachment);
 	}
 
 	/**
 	 * @param array $attachment
 	 * @return \Friendica\Object\Api\Mastodon\Attachment
-	 * @throws HTTPException\InternalServerErrorException
+	 * @throws InternalServerErrorException
 	 */
 	private function createFromMediaArray(array $attachment): \Friendica\Object\Api\Mastodon\Attachment
 	{
@@ -100,7 +102,7 @@ class Attachment extends BaseFactory
 	 * @param int $id id of the photo
 	 *
 	 * @return array
-	 * @throws HTTPException\InternalServerErrorException
+	 * @throws InternalServerErrorException
 	 */
 	public function createFromPhoto(int $id): array
 	{
@@ -136,7 +138,7 @@ class Attachment extends BaseFactory
 	 * @param int $id id of the attachment
 	 *
 	 * @return array
-	 * @throws HTTPException\InternalServerErrorException
+	 * @throws InternalServerErrorException
 	 */
 	public function createFromAttach(int $id): array
 	{

src/Factory/Api/Twitter/Status.php

@@ -39,7 +39,7 @@ class Status extends BaseFactory
 	private $mention;
 	/** @var Activities entity */
 	private $activities;
-	/** @var Activities entity */
+	/** @var Attachment entity */
 	private $attachment;
 	/** @var ContentItem */
 	private $contentItem;
@@ -165,7 +165,7 @@ class Status extends BaseFactory
 			$urls     = $this->url->createFromUriId($item['uri-id']);
 			$mentions = $this->mention->createFromUriId($item['uri-id']);
 		} else {
-			$attachments = $this->attachment->createFromUriId($item['uri-id'], $text);
+			$attachments = $this->attachment->createFromUriId($item['uri-id']);
 		}
 
 		$friendica_activities = $this->activities->createFromUriId($item['uri-id'], $uid);
@@ -180,7 +180,7 @@ class Status extends BaseFactory
 				$urls     = array_merge($urls, $this->url->createFromUriId($shared_uri_id));
 				$mentions = array_merge($mentions, $this->mention->createFromUriId($shared_uri_id));
 			} else {
-				$attachments = array_merge($attachments, $this->attachment->createFromUriId($shared_uri_id, $text));
+				$attachments = array_merge($attachments, $this->attachment->createFromUriId($shared_uri_id));
 			}
 		}
 

src/Federation/Repository/GServer.php

@@ -8,26 +8,37 @@
 namespace Friendica\Federation\Repository;
 
 use Friendica\Database\Database;
-use Friendica\Federation\Factory;
-use Friendica\Federation\Entity;
-use Psr\Log\LoggerInterface;
+use Friendica\Federation\Entity\GServer as GServerEntity;
+use Friendica\Federation\Factory\GServer as GServerFactory;
+use Friendica\Network\HTTPException\NotFoundException;
 
-class GServer extends \Friendica\BaseRepository
+final class GServer
 {
-	protected static $table_name = 'gserver';
+	private string $table_name = 'gserver';
 
-	public function __construct(Database $database, LoggerInterface $logger, Factory\GServer $factory)
+	private Database $db;
+
+	private GServerFactory $factory;
+
+	public function __construct(Database $database, GServerFactory $factory)
 	{
-		parent::__construct($database, $logger, $factory);
+		$this->db      = $database;
+		$this->factory = $factory;
 	}
 
 	/**
 	 * @param int $gsid
-	 * @return Entity\GServer
+	 *
 	 * @throws \Friendica\Network\HTTPException\NotFoundException
 	 */
-	public function selectOneById(int $gsid): Entity\GServer
+	public function selectOneById(int $gsid): GServerEntity
 	{
-		return $this->_selectOne(['id' => $gsid]);
+		$fields = $this->db->selectFirst($this->table_name, [], ['id' => $gsid], []);
+
+		if (!$this->db->isResult($fields)) {
+			throw new NotFoundException();
+		}
+
+		return $this->factory->createFromTableRow($fields);
 	}
 }

src/Model/Contact.php

@@ -14,7 +14,6 @@ use Friendica\Contact\Introduction\Exception\IntroductionNotFoundException;
 use Friendica\Content\Conversation as ConversationContent;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
@@ -22,6 +21,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Network\HTTPException\NotFoundException;
@@ -1311,9 +1311,17 @@ class Contact
 			}
 		}
 
-		$args = ['contact' => $contact, 'menu' => &$menu];
+		$args = ['contact' => $contact, 'menu' => $menu];
 
-		Hook::callAll('contact_photo_menu', $args);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$args = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::CONTACT_PHOTO_MENU, $args),
+		)->getArray();
+
+		if (is_array($args['menu'])) {
+			$menu = $args['menu'];
+		}
 
 		$menucondensed = [];
 
@@ -2196,7 +2204,11 @@ class Contact
 		$avatar['url']     = '';
 		$avatar['success'] = false;
 
-		Hook::callAll('avatar_lookup', $avatar);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$avatar = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::AVATAR_LOOKUP, $avatar),
+		)->getArray();
 
 		if ($avatar['success'] && !empty($avatar['url'])) {
 			return $avatar['url'];
@@ -3144,7 +3156,11 @@ class Contact
 
 		$arr = ['url' => $url, 'uid' => $uid, 'contact' => []];
 
-		Hook::callAll('follow', $arr);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$arr = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::FOLLOW_CONTACT, $arr),
+		)->getArray();
 
 		if (empty($arr)) {
 			$result['message'] = DI::l10n()->t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.');

src/Model/Contact/User.php

@@ -30,9 +30,8 @@ class User
 	 * Insert a user-contact for a given contact array
 	 *
 	 * @param array $contact
-	 * @return void
 	 */
-	public static function insertForContactArray(array $contact)
+	public static function insertForContactArray(array $contact): bool
 	{
 		if (empty($contact['uid'])) {
 			// We don't create entries for the public user - by now
@@ -339,7 +338,7 @@ class User
 	{
 		$pcid = Contact::getPublicContactId($cid, $uid);
 		if (!$pcid) {
-			return false;
+			return self::FREQUENCY_DEFAULT;
 		}
 
 		$public_contact = DBA::selectFirst('user-contact', ['channel-frequency'], ['cid' => $pcid, 'uid' => $uid]);

src/Model/Event.php

@@ -9,11 +9,11 @@ namespace Friendica\Model;
 
 use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Network\HTTPException\UnauthorizedException;
@@ -255,6 +255,7 @@ class Event
 			'finish'    => DateTimeFormat::utc(($arr['finish'] ?? '') ?: DBA::NULL_DATETIME),
 		];
 
+		$eventDispatcher = DI::eventDispatcher();
 
 		if ($event['finish'] < DBA::NULL_DATETIME) {
 			$event['finish'] = DBA::NULL_DATETIME;
@@ -295,17 +296,21 @@ class Event
 				Item::update($fields, ['id' => $item['id']]);
 			}
 
-			Hook::callAll('event_updated', $event['id']);
+			$eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::EVENT_UPDATED, ['event' => $event]),
+			);
 		} else {
 			// New event. Store it.
 			DBA::insert('event', $event);
 
 			$event['id'] = DBA::lastInsertId();
 
-			Hook::callAll("event_created", $event['id']);
+			$eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::EVENT_CREATED, ['event' => $event]),
+			);
 		}
 
-		return $event['id'];
+		return (int) $event['id'];
 	}
 
 	public static function getItemArrayForId(int $event_id, array $item = []): array

src/Model/GServer.php

@@ -2200,8 +2200,6 @@ class GServer
 	 * Converts input value to a boolean value
 	 *
 	 * @param string|integer $val
-	 *
-	 * @return boolean
 	 */
 	private static function toBoolean($val): bool
 	{
@@ -2211,7 +2209,7 @@ class GServer
 			return false;
 		}
 
-		return $val;
+		return (bool) $val;
 	}
 
 	/**

src/Model/Item.php

@@ -14,7 +14,6 @@ use Friendica\Content\Post\Collection\PostMedias;
 use Friendica\Content\Post\Entity\PostMedia;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -672,7 +671,7 @@ class Item
 	/**
 	 * Inserts item record
 	 *
-	 * @param array $item Item array to be inserted
+	 * @param array<string,mixed> $item Item array to be inserted
 	 * @param int   $notify Notification (type?)
 	 * @param bool  $post_local (???)
 	 * @return int Zero means error, otherwise primary key (id) is being returned
@@ -695,6 +694,7 @@ class Item
 
 		// If it is a posting where users should get notifications, then define it as wall posting
 		if ($notify) {
+			/** @var array<string,mixed> */
 			$item = $itemHelper->prepareOriginPost($item);
 
 			if (is_int($notify) && in_array($notify, Worker::PRIORITIES)) {
@@ -708,6 +708,7 @@ class Item
 			$item['network'] = trim(($item['network'] ?? '') ?: Protocol::PHANTOM);
 		}
 
+		/** @var array<string,mixed> */
 		$item = $itemHelper->prepareItemData($item, (bool) $notify);
 
 		// Store conversation data
@@ -749,6 +750,7 @@ class Item
 			}
 		}
 
+		/** @var array<string,mixed> */
 		$item = $itemHelper->validateItemData($item);
 
 		// Ensure that there is an avatar cache
@@ -846,16 +848,26 @@ class Item
 				$dummy_session = false;
 			}
 
-			$item = $eventDispatcher->dispatch(
-				new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL, $item)
+			$hook_data = [
+				'item' => $item,
+			];
+
+			$hook_data = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL, $hook_data)
 			)->getArray();
 
+			/** @var array<string,mixed> */
+			$item = $hook_data['item'] ?? $item;
+
 			if ($dummy_session) {
 				unset($_SESSION['authenticated']);
 				unset($_SESSION['uid']);
 			}
 		} elseif (!$notify) {
-			Hook::callAll('post_remote', $item);
+			/** @var array<string,mixed> */
+			$item = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_REMOTE, $item)
+			)->getArray();
 		}
 
 		if (!empty($item['cancel'])) {
@@ -1112,7 +1124,11 @@ class Item
 				DI::contentItem()->copyPermissions($posted_item['thr-parent-id'], $posted_item['uri-id'], $posted_item['parent-uri-id']);
 			}
 		} else {
-			Hook::callAll('post_remote_end', $posted_item);
+			$eventDispatcher = DI::eventDispatcher();
+
+			$posted_item = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_REMOTE_END, $posted_item)
+			)->getArray();
 		}
 
 		if ($posted_item['gravity'] === self::GRAVITY_PARENT) {
@@ -1897,18 +1913,23 @@ class Item
 
 		$result = [];
 
+		$eventDispatcher = DI::eventDispatcher();
+
 		foreach (self::splitByBlocks($searchtext) as $block) {
 			$languages = $ld->detect($block)->close() ?: [];
 
-			$data = [
+			$hook_data = [
 				'text'      => $block,
 				'detected'  => $languages,
 				'uri-id'    => $uri_id,
 				'author-id' => $author_id,
 			];
-			Hook::callAll('detect_languages', $data);
 
-			foreach ($data['detected'] as $language => $quality) {
+			$hook_data = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::DETECT_LANGUAGES, $hook_data),
+			)->getArray();
+
+			foreach ($hook_data['detected'] as $language => $quality) {
 				$result[$language] = max($result[$language] ?? 0, $quality * (strlen($block) / strlen($searchtext)));
 			}
 		}
@@ -2274,9 +2295,16 @@ class Item
 				return true;
 			}
 
-			$arr = ['item' => $item, 'user' => $owner];
+			$eventDispatcher = DI::eventDispatcher();
 
-			Hook::callAll('tagged', $arr);
+			$arr = [
+				'item' => $item,
+				'user' => $owner,
+			];
+
+			$eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::ITEM_TAGGED, $arr),
+			);
 		} else {
 			if (Tag::isMentioned($item['parent-uri-id'], $owner['url'])) {
 				DI::logger()->info('Mention found in parent tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
@@ -3020,8 +3048,18 @@ class Item
 			$item['rendered-html'] = BBCode::convertForUriId($item['uri-id'], $item['body']);
 			$item['rendered-hash'] = hash('md5', BBCode::VERSION . '::' . $body);
 
-			$hook_data = ['item' => $item, 'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']];
-			Hook::callAll('put_item_in_cache', $hook_data);
+			$hook_data = [
+				'rendered-html' => $item['rendered-html'],
+				'rendered-hash' => $item['rendered-hash'],
+				'item'          => $item,
+			];
+
+			$eventDispatcher = DI::eventDispatcher();
+
+			$hook_data = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::CACHE_ITEM, $hook_data),
+			)->getArray();
+
 			$item['rendered-html'] = $hook_data['rendered-html'];
 			$item['rendered-hash'] = $hook_data['rendered-hash'];
 			unset($hook_data);
@@ -3052,16 +3090,22 @@ class Item
 	 * @return string item body html
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
-	 * @hook  prepare_body_init item array before any work
-	 * @hook  prepare_body_content_filter ('item'=>item array, 'filter_reasons'=>string array) before first bbcode to html
-	 * @hook  prepare_body ('item'=>item array, 'html'=>body string, 'is_preview'=>boolean, 'filter_reasons'=>string array) after first bbcode to html
-	 * @hook  prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author)
 	 */
 	public static function prepareBody(array &$item, bool $attach = false, bool $is_preview = false, bool $only_cache = false): string
 	{
 		$appHelper       = DI::appHelper();
 		$uid             = DI::userSession()->getLocalUserId();
-		Hook::callAll('prepare_body_init', $item);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = [
+			'item' => $item,
+		];
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PREPARE_POST_START, $hook_data),
+		)->getArray();
+
+		$item = $hook_data['item'] ?? $item;
 
 		// In order to provide theme developers more possibilities, event items
 		// are treated differently.
@@ -3180,7 +3224,11 @@ class Item
 				'item'           => $item,
 				'filter_reasons' => $filter_reasons
 			];
-			Hook::callAll('prepare_body_content_filter', $hook_data);
+
+			$hook_data = $eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::PREPARE_POST_FILTER_CONTENT, $hook_data),
+			)->getArray();
+
 			$filter_reasons = $hook_data['filter_reasons'];
 			unset($hook_data);
 		}
@@ -3199,7 +3247,11 @@ class Item
 			'preview'        => $is_preview,
 			'filter_reasons' => $filter_reasons
 		];
-		Hook::callAll('prepare_body', $hook_data);
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PREPARE_POST, $hook_data),
+		)->getArray();
+
 		$s = $hook_data['html'];
 
 		unset($hook_data);
@@ -3251,9 +3303,16 @@ class Item
 
 		$s = HTML::applyContentFilter($s, $filter_reasons);
 
-		$hook_data = ['item' => $item, 'html' => $s];
-		Hook::callAll('prepare_body_final', $hook_data);
-		return $hook_data['html'];
+		$hook_data = [
+			'item' => $item,
+			'html' => $s,
+		];
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PREPARE_POST_END, $hook_data),
+		)->getArray();
+
+		return (string) $hook_data['html'] ?? $s;
 	}
 
 	/**
@@ -3902,17 +3961,21 @@ class Item
 			return 0;
 		}
 
-		$hookData = [
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = [
 			'uri'     => $uri,
 			'uid'     => $uid,
 			'item_id' => null,
 		];
 
-		Hook::callAll('item_by_link', $hookData);
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::FETCH_ITEM_BY_LINK, $hook_data)
+		)->getArray();
 
-		if (isset($hookData['item_id'])) {
-			DI::logger()->info('Hook link fetched', ['uid' => $uid, 'uri' => $uri, 'id' => $hookData['item_id']]);
-			return is_numeric($hookData['item_id']) ? $hookData['item_id'] : 0;
+		if (isset($hook_data['item_id'])) {
+			DI::logger()->info('Hook link fetched', ['uid' => $uid, 'uri' => $uri, 'id' => $hook_data['item_id']]);
+			return is_numeric($hook_data['item_id']) ? $hook_data['item_id'] : 0;
 		}
 
 		if (!$mimetype) {

src/Model/Log/ParsedLogIterator.php

@@ -21,7 +21,7 @@ class ParsedLogIterator implements \Iterator
 	/** @var ReversedFileReader */
 	private $reader;
 
-	/** @var ParsedLogLine current iterator value*/
+	/** @var ParsedLogLine|null current iterator value*/
 	private $value = null;
 
 	/** @var int max number of lines to read */

src/Model/Photo.php

@@ -244,7 +244,7 @@ class Photo
 	 *
 	 * @param array $photo Photo data. Needs at least 'id', 'type', 'backend-class', 'backend-ref'
 	 *
-	 * @return \Friendica\Object\Image|null Image object or null on error
+	 * @return string|null Image data as string or null on error
 	 */
 	public static function getImageDataForPhoto(array $photo)
 	{
@@ -254,7 +254,7 @@ class Photo
 
 		try {
 			$backendClass = DI::storageManager()->getByName($photo['backend-class'] ?? '');
-			/// @todo refactoring this returning, because the storage returns a "string" which is casted in different ways - a check "instanceof Image" will fail!
+
 			return $backendClass->get($photo['backend-ref'] ?? '');
 		} catch (InvalidClassStorageException $storageException) {
 			try {
@@ -834,10 +834,9 @@ class Photo
 	 * - Sharing a post with a group will create a photo that only the group can see.
 	 * - Sharing a photo again that been shared non public before doesn't alter the permissions.
 	 *
-	 * @return string
 	 * @throws \Exception
 	 */
-	public static function setPermissionFromBody($body, $uid, $original_contact_id, $str_contact_allow, $str_circle_allow, $str_contact_deny, $str_circle_deny)
+	public static function setPermissionFromBody($body, $uid, $original_contact_id, $str_contact_allow, $str_circle_allow, $str_contact_deny, $str_circle_deny): bool
 	{
 		// Simplify image codes
 		$img_body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);

src/Model/Post/Delayed.php

@@ -170,9 +170,8 @@ class Delayed
 	 * @param array  $attachments
 	 * @param int    $preparation_mode
 	 * @param string $uri
-	 * @return bool
 	 */
-	public static function publish(array $item, int $notify = 0, array $taglist = [], array $attachments = [], int $preparation_mode = self::PREPARED, string $uri = '')
+	public static function publish(array $item, int $notify = 0, array $taglist = [], array $attachments = [], int $preparation_mode = self::PREPARED, string $uri = ''): int
 	{
 		if (!empty($attachments)) {
 			$item['attachments'] = $attachments;

src/Model/Post/UserNotification.php

@@ -9,10 +9,10 @@ namespace Friendica\Model\Post;
 
 use BadMethodCallException;
 use Exception;
-use Friendica\Core\Hook;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
@@ -396,7 +396,12 @@ class UserNotification
 		$profiles = [$owner['nurl']];
 
 		$notification_data = ['uid' => $uid, 'profiles' => []];
-		Hook::callAll('check_item_notification', $notification_data);
+
+		$eventDispatcher = DI::eventDispatcher();
+
+		$notification_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::CHECK_ITEM_NOTIFICATION, $notification_data),
+		)->getArray();
 
 		// Normalize the connector profiles
 		foreach ($notification_data['profiles'] as $profile) {

src/Model/Profile.php

@@ -12,13 +12,13 @@ use Friendica\AppHelper;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Cache\Enum\Duration;
-use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\Diaspora;
@@ -258,11 +258,6 @@ class Profile
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 * @note  Returns empty string if passed $profile is wrong type or not populated
-	 *
-	 * @hooks 'profile_sidebar_enter'
-	 *      array $profile - profile data
-	 * @hooks 'profile_sidebar'
-	 *      array $arr
 	 */
 	public static function getVCardHtml(array $profile, bool $block, bool $show_contacts): string
 	{
@@ -282,7 +277,17 @@ class Profile
 
 		$profile['network_link'] = '';
 
-		Hook::callAll('profile_sidebar_enter', $profile);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = [
+			'profile' => $profile,
+		];
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PROFILE_SIDEBAR_ENTRY, $hook_data),
+		)->getArray();
+
+		$profile = $hook_data['profile'] ?? $profile;
 
 		$profile_url = $profile['url'];
 
@@ -473,9 +478,17 @@ class Profile
 			'$network_url'         => $network_url,
 		]);
 
-		$arr = ['profile' => &$profile, 'entry' => &$o];
+		$hook_data = [
+			'profile' => &$profile,
+			'entry'   => &$o,
+		];
 
-		Hook::callAll('profile_sidebar', $arr);
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PROFILE_SIDEBAR, $hook_data),
+		)->getArray();
+
+		$profile = $hook_data['profile'] ?? $profile;
+		$o       = $hook_data['entry']   ?? $o;
 
 		return $o;
 	}

src/Model/User.php

@@ -13,7 +13,6 @@ use ErrorException;
 use Exception;
 use Friendica\App;
 use Friendica\Content\Pager;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Search;
@@ -21,6 +20,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Module;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
@@ -758,12 +758,16 @@ class User
 			'user_record'   => null
 		];
 
-		/*
+		$eventDispatcher = DI::eventDispatcher();
+
+		/**
 		 * An addon indicates successful login by setting 'authenticated' to non-zero value and returning a user record
 		 * Addons should never set 'authenticated' except to indicate success - as hooks may be chained
 		 * and later addons should not interfere with an earlier one that succeeded.
 		 */
-		Hook::callAll('authenticate', $addon_auth);
+		$addon_auth = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::ACCOUNT_AUTHENTICATE, $addon_auth),
+		)->getArray();
 
 		if ($addon_auth['authenticated'] && $addon_auth['user_record']) {
 			return $addon_auth['user_record']['uid'];
@@ -1460,11 +1464,20 @@ class User
 			Contact::updateSelfFromUserID($uid, true);
 		}
 
-		Hook::callAll('register_account', $uid);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = [
+			'uid' => $uid,
+		];
+
+		$eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::ACCOUNT_REGISTER, $hook_data),
+		);
 
 		self::setRegisterMethodByUserCount();
 
 		$return['user'] = $user;
+
 		return $return;
 	}
 
@@ -1787,7 +1800,17 @@ class User
 			throw new \RuntimeException(DI::l10n()->t("User with delegates can't be removed, please remove delegate users first"));
 		}
 
-		Hook::callAll('remove_user', $user);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = [
+			'user' => $user,
+		];
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::ACCOUNT_REMOVE, $hook_data),
+		)->getArray();
+
+		$user = $hook_data['user'] ?? $user;
 
 		// save username (actually the nickname as it is guaranteed
 		// unique), so it cannot be re-registered in the future.

src/Moderation/Repository/Report.php

@@ -7,12 +7,14 @@
 
 namespace Friendica\Moderation\Repository;
 
-use Friendica\BaseEntity;
 use Friendica\Database\Database;
-use Friendica\DI;
 use Friendica\Model\Post;
-use Friendica\Moderation\Factory;
-use Friendica\Moderation\Collection;
+use Friendica\Moderation\Collection\Report\Posts as PostsCollection;
+use Friendica\Moderation\Collection\Report\Rules as RulesCollection;
+use Friendica\Moderation\Entity\Report as ReportEntity;
+use Friendica\Moderation\Factory\Report as ReportFactory;
+use Friendica\Moderation\Factory\Report\Post as PostFactory;
+use Friendica\Moderation\Factory\Report\Rule as RuleFactory;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Util\DateTimeFormat;
 use Psr\Log\LoggerInterface;
@@ -21,14 +23,14 @@ final class Report extends \Friendica\BaseRepository
 {
 	protected static $table_name = 'report';
 
-	/** @var Factory\Report */
+	/** @var ReportFactory */
 	protected $factory;
-	/** @var Factory\Report\Post */
+	/** @var PostFactory */
 	protected $postFactory;
-	/** @var Factory\Report\Rule */
+	/** @var RuleFactory */
 	protected $ruleFactory;
 
-	public function __construct(Database $database, LoggerInterface $logger, Factory\Report $factory, Factory\Report\Post $postFactory, Factory\Report\Rule $ruleFactory)
+	public function __construct(Database $database, LoggerInterface $logger, ReportFactory $factory, PostFactory $postFactory, RuleFactory $ruleFactory)
 	{
 		parent::__construct($database, $logger, $factory);
 
@@ -37,12 +39,12 @@ final class Report extends \Friendica\BaseRepository
 		$this->ruleFactory = $ruleFactory;
 	}
 
-	public function selectOneById(int $lastInsertId): \Friendica\Moderation\Entity\Report
+	public function selectOneById(int $lastInsertId): ReportEntity
 	{
 		return $this->_selectOne(['id' => $lastInsertId]);
 	}
 
-	public function save(\Friendica\Moderation\Entity\Report $Report): \Friendica\Moderation\Entity\Report
+	public function save(ReportEntity $Report): ReportEntity
 	{
 		$fields = [
 			'reporter-id'     => $Report->reporterCid,
@@ -73,7 +75,7 @@ final class Report extends \Friendica\BaseRepository
 				if (Post::exists(['uri-id' => $post->uriId])) {
 					$this->db->insert('report-post', ['rid' => $newReportId, 'uri-id' => $post->uriId, 'status' => $post->status]);
 				} else {
-					DI::logger()->notice('Post does not exist', ['uri-id' => $post->uriId, 'report' => $Report]);
+					$this->logger->notice('Post does not exist', ['uri-id' => $post->uriId, 'report' => $Report]);
 				}
 			}
 
@@ -87,15 +89,18 @@ final class Report extends \Friendica\BaseRepository
 		return $Report;
 	}
 
-	protected function _selectOne(array $condition, array $params = []): BaseEntity
+	/**
+	 * @throws NotFoundException
+	 */
+	protected function _selectOne(array $condition, array $params = []): ReportEntity
 	{
 		$fields = $this->db->selectFirst(self::$table_name, [], $condition, $params);
 		if (!$this->db->isResult($fields)) {
 			throw new NotFoundException();
 		}
 
-		$reportPosts = new Collection\Report\Posts(array_map([$this->postFactory, 'createFromTableRow'], $this->db->selectToArray('report-post', ['uri-id', 'status'], ['rid' => $condition['id'] ?? 0])));
-		$reportRules = new Collection\Report\Rules(array_map([$this->ruleFactory, 'createFromTableRow'], $this->db->selectToArray('report-rule', ['line-id', 'text'], ['rid' => $condition['id'] ?? 0])));
+		$reportPosts = new PostsCollection(array_map([$this->postFactory, 'createFromTableRow'], $this->db->selectToArray('report-post', ['uri-id', 'status'], ['rid' => $condition['id'] ?? 0])));
+		$reportRules = new RulesCollection(array_map([$this->ruleFactory, 'createFromTableRow'], $this->db->selectToArray('report-rule', ['line-id', 'text'], ['rid' => $condition['id'] ?? 0])));
 
 		return $this->factory->createFromTableRow($fields, $reportPosts, $reportRules);
 	}

src/Module/Api/Mastodon/Lists/Accounts.php

@@ -31,7 +31,7 @@ class Accounts extends BaseApi
 			$this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity());
 		}
 
-		return Circle::removeMembers($this->parameters['id'], $request['account_ids']);
+		Circle::removeMembers($this->parameters['id'], $request['account_ids']);
 	}
 
 	protected function post(array $request = [])

src/Module/Api/Mastodon/Media.php

@@ -13,6 +13,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Module\BaseApi;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Strings;
 
 /**
@@ -43,12 +44,13 @@ class Media extends BaseApi
 
 		if (in_array($type, [Post\Media::IMAGE, Post\Media::UNKNOWN, Post\Media::APPLICATION])) {
 			$media = Photo::upload($uid, $request['file'], '', null, null, '', '', $request['description']);
-			if (!empty($media)) {
+
+			if (empty($media)) {
+				$this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity('Error while uploading media.'));
+			}
+
 			$this->logger->info('Uploaded photo', ['media' => $media]);
 			$this->jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id']));
-			} elseif ($type == Post\Media::IMAGE) {
-				$this->jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id']));
-			}
 		}
 
 		$tempFileName = $request['file']['tmp_name'];
@@ -97,14 +99,24 @@ class Media extends BaseApi
 		$photo = Photo::selectFirst(['resource-id'], ['id' => $this->parameters['id'], 'uid' => $uid]);
 		if (empty($photo['resource-id'])) {
 			$media = Post\Media::getById($this->parameters['id']);
+
 			if (empty($media['uri-id'])) {
 				$this->logAndJsonError(404, $this->errorFactory->RecordNotFound());
 			}
+
 			if (!Post::exists(['uri-id' => $media['uri-id'], 'uid' => $uid, 'origin' => true])) {
 				$this->logAndJsonError(404, $this->errorFactory->RecordNotFound());
 			}
+
 			Post\Media::updateById(['description' => $request['description']], $this->parameters['id']);
-			$this->jsonExit(DI::mstdnAttachment()->createFromId($this->parameters['id']));
+
+			try {
+				$attachment = DI::mstdnAttachment()->createFromId($this->parameters['id'] . '1');
+			} catch (InternalServerErrorException $th) {
+				$this->logAndJsonError(404, $this->errorFactory->RecordNotFound());
+			}
+
+			$this->jsonExit($attachment);
 		}
 
 		Photo::update(['desc' => $request['description']], ['resource-id' => $photo['resource-id']]);

src/Module/Api/Mastodon/Search.php

@@ -219,9 +219,10 @@ class Search extends BaseApi
 
 		$condition = ["`id` IN (SELECT `tid` FROM `post-tag` WHERE `type` = ?) AND `name` LIKE ?", Tag::HASHTAG, $q . '%'];
 
-		$tags = DBA::select('tag', ['name'], $condition, $params);
+		$tags = DBA::selectToArray('tag', ['name'], $condition, $params);
 
 		$hashtags = [];
+
 		foreach ($tags as $tag) {
 			if ($version == 1) {
 				$hashtags[] = $tag['name'];

src/Module/Api/Twitter/Lists/Ownership.php

@@ -44,10 +44,11 @@ class Ownership extends BaseApi
 		$this->checkAllowedScope(BaseApi::SCOPE_READ);
 		$uid = BaseApi::getCurrentUserID();
 
-		$circles = $this->dba->select('group', [], ['deleted' => false, 'uid' => $uid, 'cid' => null]);
+		$circles = $this->dba->selectToArray('group', [], ['deleted' => false, 'uid' => $uid, 'cid' => null]);
 
 		// loop through all circles
 		$lists = [];
+
 		foreach ($circles as $circle) {
 			$lists[] = $this->friendicaCircle->createFromId($circle['id']);
 		}

src/Module/BaseProfile.php

@@ -9,9 +9,9 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
-use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\User;
 
 class BaseProfile extends BaseModule
@@ -128,12 +128,16 @@ class BaseProfile extends BaseModule
 			];
 		}
 
-		$arr = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $current, 'tabs' => $tabs];
+		$hook_data = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $current, 'tabs' => $tabs];
 
-		Hook::callAll('profile_tabs', $arr);
+		$eventDispatcher = DI::eventDispatcher();
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PROFILE_TABS, $hook_data),
+		)->getArray();
 
 		$tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
 
-		return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs'], '$more' => DI::l10n()->t('More')]);
+		return Renderer::replaceMacros($tpl, ['$tabs' => $hook_data['tabs'], '$more' => DI::l10n()->t('More')]);
 	}
 }

src/Module/Contact/Profile.php

@@ -7,31 +7,37 @@
 
 namespace Friendica\Module\Contact;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
 use Friendica\BaseModule;
-use Friendica\Contact\LocalRelationship;
 use Friendica\Contact\LocalRelationship\Entity\LocalRelationship as LocalRelationshipEntity;
+use Friendica\Contact\LocalRelationship\Repository\LocalRelationship as LocalRelationshipRepository;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Circle;
-use Friendica\Model\Contact;
-use Friendica\Module;
+use Friendica\Model\Contact as ContactModel;
+use Friendica\Model\Contact\User as UserContact;
+use Friendica\Module\Contact as ContactModule;
 use Friendica\Module\Response;
+use Friendica\Module\Security\Login;
 use Friendica\Navigation\SystemMessages;
-use Friendica\Network\HTTPException;
-use Friendica\User\Settings;
+use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\User\Settings\Repository\UserGServer as UserGServerRepository;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -39,9 +45,9 @@ use Psr\Log\LoggerInterface;
  */
 class Profile extends BaseModule
 {
-	/** @var LocalRelationship\Repository\LocalRelationship */
+	/** @var LocalRelationshipRepository */
 	private $localRelationship;
-	/** @var App\Page */
+	/** @var Page */
 	private $page;
 	/** @var IManageConfigValues */
 	private $config;
@@ -51,11 +57,28 @@ class Profile extends BaseModule
 	private $systemMessages;
 	/** @var Database */
 	private $db;
-	/** @var Settings\Repository\UserGServer */
+	/** @var UserGServerRepository */
 	private $userGServer;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(Settings\Repository\UserGServer $userGServer, Database $db, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, LocalRelationship\Repository\LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, App\Page $page, IManageConfigValues $config, array $server, array $parameters = [])
-	{
+	public function __construct(
+		UserGServerRepository $userGServer,
+		EventDispatcherInterface $eventDispatcher,
+		Database $db,
+		SystemMessages $systemMessages,
+		IHandleUserSessions $session,
+		L10n $l10n,
+		LocalRelationshipRepository $localRelationship,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		Page $page,
+		IManageConfigValues $config,
+		array $server,
+		array $parameters = []
+	) {
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->localRelationship = $localRelationship;
@@ -65,6 +88,7 @@ class Profile extends BaseModule
 		$this->systemMessages    = $systemMessages;
 		$this->db                = $db;
 		$this->userGServer       = $userGServer;
+		$this->eventDispatcher   = $eventDispatcher;
 	}
 
 	protected function post(array $request = [])
@@ -77,12 +101,14 @@ class Profile extends BaseModule
 
 		// Backward compatibility: The update still needs a user-specific contact ID
 		// Change to user-contact table check by version 2022.03
-		$ucid = Contact::getUserContactId($contact_id, $this->session->getLocalUserId());
+		$ucid = ContactModel::getUserContactId($contact_id, $this->session->getLocalUserId());
 		if (!$ucid || !$this->db->exists('contact', ['id' => $ucid, 'deleted' => false])) {
 			return;
 		}
 
-		Hook::callAll('contact_edit_post', $request);
+		$request = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::EDIT_CONTACT_POST, $request),
+		)->getArray();
 
 		$fields = [];
 
@@ -120,14 +146,14 @@ class Profile extends BaseModule
 		}
 
 		if (isset($request['channel_frequency'])) {
-			Contact\User::setChannelFrequency($ucid, $this->session->getLocalUserId(), $request['channel_frequency']);
+			UserContact::setChannelFrequency($ucid, $this->session->getLocalUserId(), $request['channel_frequency']);
 		}
 
 		if (isset($request['channel_only'])) {
-			Contact\User::setChannelOnly($ucid, $this->session->getLocalUserId(), $request['channel_only']);
+			UserContact::setChannelOnly($ucid, $this->session->getLocalUserId(), $request['channel_only']);
 		}
 
-		if (!Contact::update($fields, ['id' => $ucid, 'uid' => $this->session->getLocalUserId()])) {
+		if (!ContactModel::update($fields, ['id' => $ucid, 'uid' => $this->session->getLocalUserId()])) {
 			$this->systemMessages->addNotice($this->t('Failed to update contact record.'));
 		}
 		$this->baseUrl->redirect('contact/' . $contact_id);
@@ -136,43 +162,43 @@ class Profile extends BaseModule
 	protected function content(array $request = []): string
 	{
 		if (!$this->session->getLocalUserId()) {
-			return Module\Security\Login::form($_SERVER['REQUEST_URI']);
+			return Login::form($_SERVER['REQUEST_URI']);
 		}
 
 		// Backward compatibility: Ensure to use the public contact when the user contact is provided
 		// Remove by version 2022.03
-		$data = Contact::getPublicAndUserContactID(intval($this->parameters['id']), $this->session->getLocalUserId());
+		$data = ContactModel::getPublicAndUserContactID(intval($this->parameters['id']), $this->session->getLocalUserId());
 		if (empty($data)) {
-			throw new HTTPException\NotFoundException($this->t('Contact not found.'));
+			throw new NotFoundException($this->t('Contact not found.'));
 		}
 
-		$contact = Contact::getById($data['public']);
+		$contact = ContactModel::getById($data['public']);
 		if (!$this->db->isResult($contact)) {
-			throw new HTTPException\NotFoundException($this->t('Contact not found.'));
+			throw new NotFoundException($this->t('Contact not found.'));
 		}
 
 		// Fetch the protocol from the user's contact.
 		if ($data['user']) {
-			$usercontact = Contact::getById($data['user'], ['network', 'protocol']);
+			$usercontact = ContactModel::getById($data['user'], ['network', 'protocol']);
 			if ($this->db->isResult($usercontact)) {
 				$contact['network']  = $usercontact['network'];
 				$contact['protocol'] = $usercontact['protocol'];
 			}
 		}
 
-		if (empty($contact['network']) && Contact::isLocal($contact['url']) ) {
+		if (empty($contact['network']) && ContactModel::isLocal($contact['url']) ) {
 			$contact['network']  = Protocol::DFRN;
 			$contact['protocol'] = Protocol::ACTIVITYPUB;
 		}
 
 		// Don't display contacts that are about to be deleted
 		if ($contact['deleted'] || $contact['network'] == Protocol::PHANTOM) {
-			throw new HTTPException\NotFoundException($this->t('Contact not found.'));
+			throw new NotFoundException($this->t('Contact not found.'));
 		}
 
 		$localRelationship = $this->localRelationship->getForUserContact($this->session->getLocalUserId(), $contact['id']);
 
-		if ($localRelationship->rel === Contact::SELF) {
+		if ($localRelationship->rel === ContactModel::SELF) {
 			$this->baseUrl->redirect('profile/' . $contact['nick'] . '/profile');
 		}
 
@@ -180,8 +206,8 @@ class Profile extends BaseModule
 			self::checkFormSecurityTokenRedirectOnError('contact/' . $contact['id'], 'contact_action', 't');
 
 			$cmd = $this->parameters['action'];
-			if ($cmd === 'update' && $localRelationship->rel !== Contact::NOTHING) {
-				Module\Contact::updateContactFromPoll($contact['id']);
+			if ($cmd === 'update' && $localRelationship->rel !== ContactModel::NOTHING) {
+				ContactModule::updateContactFromPoll($contact['id']);
 			}
 
 			if ($cmd === 'updateprofile') {
@@ -191,12 +217,12 @@ class Profile extends BaseModule
 			if ($cmd === 'block') {
 				if ($localRelationship->blocked) {
 					// @TODO Backward compatibility, replace with $localRelationship->unblock()
-					Contact\User::setBlocked($contact['id'], $this->session->getLocalUserId(), false);
+					UserContact::setBlocked($contact['id'], $this->session->getLocalUserId(), false);
 
 					$message = $this->t('Contact has been unblocked');
 				} else {
 					// @TODO Backward compatibility, replace with $localRelationship->block()
-					Contact\User::setBlocked($contact['id'], $this->session->getLocalUserId(), true);
+					UserContact::setBlocked($contact['id'], $this->session->getLocalUserId(), true);
 					$message = $this->t('Contact has been blocked');
 				}
 
@@ -207,12 +233,12 @@ class Profile extends BaseModule
 			if ($cmd === 'ignore') {
 				if ($localRelationship->ignored) {
 					// @TODO Backward compatibility, replace with $localRelationship->unblock()
-					Contact\User::setIgnored($contact['id'], $this->session->getLocalUserId(), false);
+					UserContact::setIgnored($contact['id'], $this->session->getLocalUserId(), false);
 
 					$message = $this->t('Contact has been unignored');
 				} else {
 					// @TODO Backward compatibility, replace with $localRelationship->block()
-					Contact\User::setIgnored($contact['id'], $this->session->getLocalUserId(), true);
+					UserContact::setIgnored($contact['id'], $this->session->getLocalUserId(), true);
 					$message = $this->t('Contact has been ignored');
 				}
 
@@ -223,12 +249,12 @@ class Profile extends BaseModule
 			if ($cmd === 'collapse') {
 				if ($localRelationship->collapsed) {
 					// @TODO Backward compatibility, replace with $localRelationship->unblock()
-					Contact\User::setCollapsed($contact['id'], $this->session->getLocalUserId(), false);
+					UserContact::setCollapsed($contact['id'], $this->session->getLocalUserId(), false);
 
 					$message = $this->t('Contact has been uncollapsed');
 				} else {
 					// @TODO Backward compatibility, replace with $localRelationship->block()
-					Contact\User::setCollapsed($contact['id'], $this->session->getLocalUserId(), true);
+					UserContact::setCollapsed($contact['id'], $this->session->getLocalUserId(), true);
 					$message = $this->t('Contact has been collapsed');
 				}
 
@@ -242,7 +268,7 @@ class Profile extends BaseModule
 		$vcard_widget   = Widget\VCard::getHTML($contact);
 		$circles_widget = '';
 
-		if (!in_array($localRelationship->rel, [Contact::NOTHING, Contact::SELF])) {
+		if (!in_array($localRelationship->rel, [ContactModel::NOTHING, ContactModel::SELF])) {
 			$circles_widget = Circle::sidebarWidget('contact', 'circle', 'full', 'everyone', $data['user']);
 		}
 
@@ -257,9 +283,15 @@ class Profile extends BaseModule
 		]);
 
 		switch ($localRelationship->rel) {
-			case Contact::FRIEND:   $relation_text = $this->t('You are mutual friends with %s', $contact['name']); break;
-			case Contact::FOLLOWER:	$relation_text = $this->t('You are sharing with %s', $contact['name']); break;
-			case Contact::SHARING:  $relation_text = $this->t('%s is sharing with you', $contact['name']); break;
+			case ContactModel::FRIEND:
+				$relation_text = $this->t('You are mutual friends with %s', $contact['name']);
+				break;
+			case ContactModel::FOLLOWER:
+				$relation_text = $this->t('You are sharing with %s', $contact['name']);
+				break;
+			case ContactModel::SHARING:
+				$relation_text = $this->t('%s is sharing with you', $contact['name']);
+				break;
 			default:
 				$relation_text = '';
 		}
@@ -268,7 +300,7 @@ class Profile extends BaseModule
 			$relation_text = '';
 		}
 
-		$url = Contact::magicLinkByContact($contact);
+		$url = ContactModel::magicLinkByContact($contact);
 		if (strpos($url, 'contact/redir/') === 0) {
 			$sparkle = ' class="sparkle" ';
 		} else {
@@ -282,8 +314,7 @@ class Profile extends BaseModule
 			$this->logger->notice('Empty gsid for contact', ['contact' => $contact]);
 		}
 
-		$serverIgnored =
-			$contact['gsid'] &&
+		$serverIgnored = $contact['gsid'] &&
 			$this->userGServer->isIgnoredByUser($this->session->getLocalUserId(), $contact['gsid']) ?
 				$this->t('This contact is on a server you ignored.')
 				: '';
@@ -300,7 +331,7 @@ class Profile extends BaseModule
 		$nettype = $this->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['protocol'], $contact['gsid']));
 
 		// tabs
-		$tab_str = Module\Contact::getTabsHTML($contact, Module\Contact::TAB_PROFILE);
+		$tab_str = ContactModule::getTabsHTML($contact, ContactModule::TAB_PROFILE);
 
 		$lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? $this->t('Communications lost with this contact!') : '');
 
@@ -312,10 +343,10 @@ class Profile extends BaseModule
 				$localRelationship->fetchFurtherInformation,
 				$this->t('Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn\'t contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags.'),
 				[
-					LocalRelationship\Entity\LocalRelationship::FFI_NONE        => $this->t('Disabled'),
-					LocalRelationship\Entity\LocalRelationship::FFI_INFORMATION => $this->t('Fetch information'),
-					LocalRelationship\Entity\LocalRelationship::FFI_KEYWORD     => $this->t('Fetch keywords'),
-					LocalRelationship\Entity\LocalRelationship::FFI_BOTH        => $this->t('Fetch information and keywords')
+					LocalRelationshipEntity::FFI_NONE        => $this->t('Disabled'),
+					LocalRelationshipEntity::FFI_INFORMATION => $this->t('Fetch information'),
+					LocalRelationshipEntity::FFI_KEYWORD     => $this->t('Fetch keywords'),
+					LocalRelationshipEntity::FFI_BOTH        => $this->t('Fetch information and keywords')
 				]
 			];
 		}
@@ -346,8 +377,8 @@ class Profile extends BaseModule
 			];
 		}
 
-		$channel_frequency = Contact\User::getChannelFrequency($contact['id'], $this->session->getLocalUserId());
-		$channel_only      = Contact\User::getChannelOnly($contact['id'], $this->session->getLocalUserId());
+		$channel_frequency = UserContact::getChannelFrequency($contact['id'], $this->session->getLocalUserId());
+		$channel_only      = UserContact::getChannelOnly($contact['id'], $this->session->getLocalUserId());
 
 		$poll_interval = null;
 		if ((($contact['network'] == Protocol::FEED) && !$this->config->get('system', 'adjust_poll_frequency')) || ($contact['network'] == Protocol::MAIL)) {
@@ -356,12 +387,12 @@ class Profile extends BaseModule
 
 		$contact_actions = $this->getContactActions($contact, $localRelationship);
 
-		if (Contact\User::isIsBlocked($contact['id'], $this->session->getLocalUserId())) {
+		if (UserContact::isIsBlocked($contact['id'], $this->session->getLocalUserId())) {
 			$relation_text = $this->t('%s has blocked you', $contact['name'] ?: $contact['nick']);
 			unset($contact_actions['follow']);
 		}
 
-		if ($localRelationship->rel !== Contact::NOTHING) {
+		if ($localRelationship->rel !== ContactModel::NOTHING) {
 			$lbl_info1              = $this->t('Contact Information / Notes');
 			$contact_settings_label = $this->t('Contact Settings');
 		} else {
@@ -407,13 +438,13 @@ class Profile extends BaseModule
 			'$notify_new_posts'          => ['notify_new_posts', $this->t('Notification for new posts'), ($localRelationship->notifyNewPosts), $this->t('Send a notification of every new post of this contact')],
 			'$fetch_further_information' => $fetch_further_information,
 			'$ffi_keyword_denylist'      => ['ffi_keyword_denylist', $this->t('Keyword Deny List'), $localRelationship->ffiKeywordDenylist, $this->t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')],
-			'$photo'                     => Contact::getPhoto($contact),
+			'$photo'                     => ContactModel::getPhoto($contact),
 			'$name'                      => $contact['name'],
 			'$sparkle'                   => $sparkle,
 			'$url'                       => $url,
 			'$profileurllabel'           => $this->t('Profile URL'),
 			'$profileurl'                => $contact['url'],
-			'$account_type'              => Contact::getAccountType($contact['contact-type']),
+			'$account_type'              => ContactModel::getAccountType($contact['contact-type']),
 			'$location'                  => BBCode::convertForUriId($contact['uri-id'] ?? 0, $contact['location']),
 			'$location_label'            => $this->t('Location:'),
 			'$xmpp'                      => BBCode::convertForUriId($contact['uri-id'] ?? 0, $contact['xmpp']),
@@ -440,18 +471,23 @@ class Profile extends BaseModule
 			'$channel_settings_label' => $this->t('Channel Settings'),
 			'$frequency_label'        => $this->t('Frequency of this contact in relevant channels'),
 			'$frequency_description'  => $this->t("Depending on the type of the channel not all posts from this contact are displayed. By default, posts need to have a minimum amount of interactions (comments, likes) to show in your channels. On the other hand there can be contacts who flood the channel, so you might want to see only some of their posts. Or you don't want to see their content at all, but you don't want to block or hide the contact completely."),
-			'$frequency_default'      => ['channel_frequency', $this->t('Default frequency'), Contact\User::FREQUENCY_DEFAULT, $this->t('Posts by this contact are displayed in the "for you" channel if you interact often with this contact or if a post reached some level of interaction.'), $channel_frequency == Contact\User::FREQUENCY_DEFAULT],
-			'$frequency_always'       => ['channel_frequency', $this->t('Display all posts of this contact'), Contact\User::FREQUENCY_ALWAYS, $this->t('All posts from this contact will appear on the "for you" channel'), $channel_frequency == Contact\User::FREQUENCY_ALWAYS],
-			'$frequency_reduced'      => ['channel_frequency', $this->t('Display only few posts'), Contact\User::FREQUENCY_REDUCED, $this->t('When a contact creates a lot of posts in a short period, this setting reduces the number of displayed posts in every channel.'), $channel_frequency == Contact\User::FREQUENCY_REDUCED],
-			'$frequency_never'        => ['channel_frequency', $this->t('Never display posts'), Contact\User::FREQUENCY_NEVER, $this->t('Posts from this contact will never be displayed in any channel'), $channel_frequency == Contact\User::FREQUENCY_NEVER],
+			'$frequency_default'      => ['channel_frequency', $this->t('Default frequency'), UserContact::FREQUENCY_DEFAULT, $this->t('Posts by this contact are displayed in the "for you" channel if you interact often with this contact or if a post reached some level of interaction.'), $channel_frequency == UserContact::FREQUENCY_DEFAULT],
+			'$frequency_always'       => ['channel_frequency', $this->t('Display all posts of this contact'), UserContact::FREQUENCY_ALWAYS, $this->t('All posts from this contact will appear on the "for you" channel'), $channel_frequency == UserContact::FREQUENCY_ALWAYS],
+			'$frequency_reduced'      => ['channel_frequency', $this->t('Display only few posts'), UserContact::FREQUENCY_REDUCED, $this->t('When a contact creates a lot of posts in a short period, this setting reduces the number of displayed posts in every channel.'), $channel_frequency == UserContact::FREQUENCY_REDUCED],
+			'$frequency_never'        => ['channel_frequency', $this->t('Never display posts'), UserContact::FREQUENCY_NEVER, $this->t('Posts from this contact will never be displayed in any channel'), $channel_frequency == UserContact::FREQUENCY_NEVER],
 			'$channel_only'           => ['channel_only', $this->t('Channel Only'), $channel_only, $this->t('If enabled, posts from this contact will only appear in channels and network streams in circles, but not in the general network stream.')],
 		]);
 
-		$arr = ['contact' => $contact, 'output' => $o];
+		$hook_data = [
+			'contact' => $contact,
+			'output'  => $o,
+		];
 
-		Hook::callAll('contact_edit', $arr);
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::EDIT_CONTACT_FORM, $hook_data),
+		)->getArray();
 
-		return $arr['output'];
+		return $hook_data['output'] ?? $o;
 	}
 
 	/**
@@ -460,18 +496,18 @@ class Profile extends BaseModule
 	 * This includes actions like e.g. 'block', 'hide', 'delete' and others
 	 *
 	 * @param array                    $contact           Public contact row
-	 * @param LocalRelationship\Entity\LocalRelationship $localRelationship
+	 *
 	 * @return array with contact related actions
-	 * @throws HTTPException\InternalServerErrorException
+	 * @throws InternalServerErrorException
 	 */
-	private function getContactActions(array $contact, LocalRelationship\Entity\LocalRelationship $localRelationship): array
+	private function getContactActions(array $contact, LocalRelationshipEntity $localRelationship): array
 	{
 		$poll_enabled    = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::FEED, Protocol::MAIL]);
 		$contact_actions = [];
 
 		$formSecurityToken = self::getFormSecurityToken('contact_action');
 
-		if ($localRelationship->rel & Contact::SHARING) {
+		if ($localRelationship->rel & ContactModel::SHARING) {
 			$contact_actions['unfollow'] = [
 				'label' => $this->t('Unfollow'),
 				'url'   => 'contact/unfollow?url=' . urlencode($contact['url']) . '&auto=1',
@@ -544,7 +580,7 @@ class Profile extends BaseModule
 			'id'    => 'toggle-collapse',
 		];
 
-		if (Protocol::supportsRevokeFollow($contact['network']) && in_array($localRelationship->rel, [Contact::FOLLOWER, Contact::FRIEND])) {
+		if (Protocol::supportsRevokeFollow($contact['network']) && in_array($localRelationship->rel, [ContactModel::FOLLOWER, ContactModel::FRIEND])) {
 			$contact_actions['revoke_follow'] = [
 				'label' => $this->t('Revoke Follow'),
 				'url'   => 'contact/' . $contact['id'] . '/revoke',
@@ -562,7 +598,7 @@ class Profile extends BaseModule
 	 *
 	 * @param int $contact_id Id of the contact with uid != 0
 	 * @return void
-	 * @throws HTTPException\InternalServerErrorException
+	 * @throws InternalServerErrorException
 	 * @throws \ImagickException
 	 */
 	private function updateContactFromProbe(int $contact_id)
@@ -572,6 +608,6 @@ class Profile extends BaseModule
 		}
 
 		// Update the entry in the contact table
-		Contact::updateFromProbe($contact_id);
+		ContactModel::updateFromProbe($contact_id);
 	}
 }

src/Module/Conversation/Network.php

@@ -31,7 +31,6 @@ use Friendica\Content\Widget\TrendingTags;
 use Friendica\Core\ACL;
 use Friendica\Core\Cache\Capability\ICanCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Renderer;
@@ -39,6 +38,7 @@ use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Database\Database;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Circle;
 use Friendica\Model\Post;
@@ -49,6 +49,7 @@ use Friendica\Network\HTTPException;
 use Friendica\Navigation\SystemMessages;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 class Network extends Timeline
@@ -59,9 +60,9 @@ class Network extends Timeline
 	protected $dateFrom;
 	/** @var string */
 	protected $dateTo;
-	/** @var int */
+	/** @var bool */
 	protected $star;
-	/** @var int */
+	/** @var bool */
 	protected $mention;
 
 	/** @var AppHelper */
@@ -90,12 +91,55 @@ class Network extends Timeline
 	protected $community;
 	/** @var NetworkFactory */
 	protected $networkFactory;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(UserDefinedChannelFactory $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channelFactory, UserDefinedChannel $channel, AppHelper $appHelper, TimelineFactory $timeline, SystemMessages $systemMessages, Mode $mode, Conversation $conversation, Page $page, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-	{
-		parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+	public function __construct(
+		UserDefinedChannelFactory $userDefinedChannel,
+		NetworkFactory $network,
+		CommunityFactory $community,
+		ChannelFactory $channelFactory,
+		UserDefinedChannel $channel,
+		AppHelper $appHelper,
+		EventDispatcherInterface $eventDispatcher,
+		TimelineFactory $timeline,
+		SystemMessages $systemMessages,
+		Mode $mode,
+		Conversation $conversation,
+		Page $page,
+		IHandleUserSessions $session,
+		Database $database,
+		IManagePersonalConfigValues $pConfig,
+		IManageConfigValues $config,
+		ICanCache $cache,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		array $server,
+		array $parameters = []
+	) {
+		parent::__construct(
+			$channel,
+			$mode,
+			$session,
+			$database,
+			$pConfig,
+			$config,
+			$cache,
+			$l10n,
+			$baseUrl,
+			$args,
+			$logger,
+			$profiler,
+			$response,
+			$server,
+			$parameters,
+		);
 
 		$this->appHelper          = $appHelper;
+		$this->eventDispatcher    = $eventDispatcher;
 		$this->timeline           = $timeline;
 		$this->systemMessages     = $systemMessages;
 		$this->conversation       = $conversation;
@@ -116,8 +160,13 @@ class Network extends Timeline
 
 		$module = 'network';
 
-		$arr = ['query' => $this->args->getQueryString()];
-		Hook::callAll('network_content_init', $arr);
+		$hook_data = [
+			'query' => $this->args->getQueryString(),
+		];
+
+		$this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::NETWORK_CONTENT_START, $hook_data)
+		);
 
 		$o = '';
 
@@ -275,19 +324,24 @@ class Network extends Timeline
 			$tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'network', 'channel'));
 		}
 
-		$arr = ['tabs' => $tabs];
-		Hook::callAll('network_tabs', $arr);
+		$hook_data = [
+			'tabs' => $tabs,
+		];
+
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::NETWORK_CONTENT_TABS, $hook_data)
+		)->getArray();
 
 		if (!empty($network_timelines)) {
 			$tabs = [];
 
-			foreach ($arr['tabs'] as $tab) {
+			foreach ($hook_data['tabs'] as $tab) {
 				if (in_array($tab['code'], $network_timelines)) {
 					$tabs[] = $tab;
 				}
 			}
 		} else {
-			$tabs = $arr['tabs'];
+			$tabs = $hook_data['tabs'];
 		}
 
 		$tpl = Renderer::getMarkupTemplate('common_tabs.tpl');

src/Module/Directory.php

@@ -11,10 +11,10 @@ use Friendica\BaseModule;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
-use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model;
 use Friendica\Model\Profile;
 use Friendica\Network\HTTPException;
@@ -161,13 +161,22 @@ class Directory extends BaseModule
 
 		];
 
-		$hook = ['contact' => $contact, 'entry' => $entry];
+		$eventDispatcher = DI::eventDispatcher();
 
-		Hook::callAll('directory_item', $hook);
+		$hook_data = [
+			'contact' => $contact,
+			'entry'   => $entry,
+		];
+
+		$hook_data = $eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::DIRECTORY_ITEM, $hook_data),
+		)->getArray();
+
+		$entry = $hook_data['entry'] ?? $entry;
 
 		unset($profile);
 		unset($location);
 
-		return $hook['entry'];
+		return $entry;
 	}
 }

src/Module/Filer/RemoveTag.php

@@ -11,7 +11,6 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Post;
 use Friendica\Module\Response;
@@ -60,14 +59,14 @@ class RemoveTag extends BaseModule
 
 	/**
 	 * @param array           $request The $_REQUEST array
-	 * @param string|null $type    Output parameter with the computed type
+	 * @param string|int|null $type    Output parameter with the computed type
 	 * @param string|null     $term    Output parameter with the computed term
 	 *
 	 * @return int The relevant HTTP code
 	 *
 	 * @throws \Exception
 	 */
-	private function removeTag(array $request, string &$type = null, string &$term = null): int
+	private function removeTag(array $request, &$type = null, string &$term = null): int
 	{
 		$item_id = $this->parameters['id'] ?? 0;
 

src/Module/Friendica.php

@@ -13,16 +13,17 @@ use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Core\Addon\AddonHelper;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\PostUpdate;
+use Friendica\Event\HtmlFilterEvent;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Profiler;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -32,6 +33,7 @@ use Psr\Log\LoggerInterface;
 class Friendica extends BaseModule
 {
 	private AddonHelper $addonHelper;
+	private EventDispatcherInterface $eventDispatcher;
 	/** @var IManageConfigValues */
 	private $config;
 	/** @var IManageKeyValuePairs */
@@ -39,13 +41,27 @@ class Friendica extends BaseModule
 	/** @var IHandleUserSessions */
 	private $session;
 
-	public function __construct(AddonHelper $addonHelper, IHandleUserSessions $session, IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-	{
+	public function __construct(
+		AddonHelper $addonHelper,
+		EventDispatcherInterface $eventDispatcher,
+		IHandleUserSessions $session,
+		IManageKeyValuePairs $keyValue,
+		IManageConfigValues $config,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		array $server,
+		array $parameters = []
+	) {
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->config          = $config;
 		$this->keyValue        = $keyValue;
 		$this->session         = $session;
+		$this->eventDispatcher = $eventDispatcher;
 		$this->addonHelper     = $addonHelper;
 	}
 
@@ -99,7 +115,9 @@ class Friendica extends BaseModule
 
 		$hooked = '';
 
-		Hook::callAll('about_hook', $hooked);
+		$hooked = $this->eventDispatcher->dispatch(
+			new HtmlFilterEvent(HtmlFilterEvent::MOD_ABOUT_CONTENT, $hooked),
+		)->getHtml();
 
 		$tpl = Renderer::getMarkupTemplate('friendica.tpl');
 

src/Module/Home.php

@@ -8,10 +8,10 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Event\Event;
+use Friendica\Event\HtmlFilterEvent;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
 use Friendica\Protocol\ActivityPub;
@@ -66,7 +66,10 @@ class Home extends BaseModule
 		$login = Login::form(DI::args()->getQueryString(), Register::getPolicy() !== Register::CLOSED);
 
 		$content = '';
-		Hook::callAll('home_content', $content);
+
+		$content = $eventDispatcher->dispatch(
+			new HtmlFilterEvent(HtmlFilterEvent::MOD_HOME_CONTENT, $content),
+		)->getHtml();
 
 		$tpl = Renderer::getMarkupTemplate('home.tpl');
 		return Renderer::replaceMacros($tpl, [

src/Module/Moderation/BaseUsers.php

@@ -11,11 +11,11 @@ use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\App\Page;
 use Friendica\AppHelper;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\Database;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Register;
 use Friendica\Model\User;
 use Friendica\Module\BaseModeration;
@@ -24,6 +24,7 @@ use Friendica\Navigation\SystemMessages;
 use Friendica\Network\HTTPException\ServiceUnavailableException;
 use Friendica\Util\Profiler;
 use Friendica\Util\Temporal;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 abstract class BaseUsers extends BaseModeration
@@ -31,11 +32,28 @@ abstract class BaseUsers extends BaseModeration
 	/** @var Database */
 	protected $database;
 
-	public function __construct(Database $database, Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-	{
+	private EventDispatcherInterface $eventDispatcher;
+
+	public function __construct(
+		Database $database,
+		EventDispatcherInterface $eventDispatcher,
+		Page $page,
+		AppHelper $appHelper,
+		SystemMessages $systemMessages,
+		IHandleUserSessions $session,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		array $server,
+		array $parameters = []
+	) {
 		parent::__construct($page, $appHelper, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->database        = $database;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	/**
@@ -95,11 +113,21 @@ abstract class BaseUsers extends BaseModeration
 				'accesskey' => 'd',
 			],
 		];
-		$tabs_arr = ['tabs' => $tabs, 'selectedTab' => $selectedTab];
-		Hook::callAll('moderation_users_tabs', $tabs_arr);
+
+		$hook_data = [
+			'tabs'        => $tabs,
+			'selectedTab' => $selectedTab,
+		];
+
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::MODERATION_USERS_TABS, $hook_data),
+		)->getArray();
+
+		$tabs = $hook_data['tabs'] ?? $tabs;
 
 		$tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
-		return Renderer::replaceMacros($tpl, ['$tabs' => $tabs_arr['tabs'], '$more' => $this->t('More')]);
+
+		return Renderer::replaceMacros($tpl, ['$tabs' => $tabs, '$more' => $this->t('More')]);
 	}
 
 	protected function setupUserCallback(): \Closure

src/Module/ParseUrl.php

@@ -11,12 +11,13 @@ use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Util;
 use Friendica\Util\Profiler;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 class ParseUrl extends BaseModule
@@ -24,11 +25,14 @@ class ParseUrl extends BaseModule
 	/** @var IHandleUserSessions */
 	protected $userSession;
 
-	public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $userSession, $server, array $parameters = [])
+	private EventDispatcherInterface $eventDispatcher;
+
+	public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $userSession, EventDispatcherInterface $eventDispatcher, $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->userSession     = $userSession;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	protected function rawContent(array $request = [])
@@ -80,15 +84,21 @@ class ParseUrl extends BaseModule
 			}
 		}
 
-		$arr = ['url' => $url, 'format' => $format, 'text' => null];
+		$hook_data = [
+			'url'    => $url,
+			'format' => $format,
+			'text'   => null,
+		];
 
-		Hook::callAll('parse_link', $arr);
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PARSE_LINK, $hook_data),
+		)->getArray();
 
-		if ($arr['text']) {
+		if ($hook_data['text']) {
 			if ($format == 'json') {
-				$this->jsonExit($arr['text']);
+				$this->jsonExit($hook_data['text']);
 			} else {
-				$this->httpExit($arr['text']);
+				$this->httpExit($hook_data['text']);
 			}
 		}
 

src/Module/Photo.php

@@ -308,7 +308,9 @@ class Photo extends BaseApi
 
 				// For local users directly use the photo record that is marked as the profile
 				if (DI::baseUrl()->isLocalUrl($contact['url'])) {
-					$contact = Contact::selectFirst($fields, ['nurl' => $contact['nurl'], 'self' => true]);
+					$nurl    = $contact['nurl'];
+					$contact = Contact::selectFirst($fields, ['nurl' => $nurl, 'self' => true]);
+
 					if (!empty($contact)) {
 						if ($customsize <= Proxy::PIXEL_MICRO) {
 							$scale = 6;
@@ -324,7 +326,7 @@ class Photo extends BaseApi
 							$this->logger->notice('Profile photo was not loaded', ['scale' => $scale, 'uid' => $contact['uid']]);
 						}
 					} else {
-						$this->logger->notice('Local Contact was not found', ['url' => $contact['nurl']]);
+						$this->logger->notice('Local Contact was not found', ['url' => $nurl]);
 					}
 				}
 

src/Module/Ping/Network.php

@@ -31,6 +31,7 @@ use Friendica\Module\Conversation\Network as NetworkModule;
 use Friendica\Module\Response;
 use Friendica\Navigation\SystemMessages;
 use Friendica\Util\Profiler;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 class Network extends NetworkModule
@@ -40,9 +41,61 @@ class Network extends NetworkModule
 	 */
 	private $lock;
 
-	public function __construct(ICanLock $lock, UserDefinedChannelFactory $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channelFactory, UserDefinedChannel $channel, AppHelper $appHelper, TimelineFactory $timeline, SystemMessages $systemMessages, Mode $mode, Conversation $conversation, Page $page, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-	{
-		parent::__construct($userDefinedChannel, $network, $community, $channelFactory, $channel, $appHelper, $timeline, $systemMessages, $mode, $conversation, $page, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+	public function __construct(
+		ICanLock $lock,
+		UserDefinedChannelFactory $userDefinedChannel,
+		NetworkFactory $network,
+		CommunityFactory $community,
+		ChannelFactory $channelFactory,
+		UserDefinedChannel $channel,
+		AppHelper $appHelper,
+		EventDispatcherInterface $eventDispatcher,
+		TimelineFactory $timeline,
+		SystemMessages $systemMessages,
+		Mode $mode,
+		Conversation $conversation,
+		Page $page,
+		IHandleUserSessions $session,
+		Database $database,
+		IManagePersonalConfigValues $pConfig,
+		IManageConfigValues $config,
+		ICanCache $cache,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		array $server,
+		array $parameters = []
+	) {
+		parent::__construct(
+			$userDefinedChannel,
+			$network,
+			$community,
+			$channelFactory,
+			$channel,
+			$appHelper,
+			$eventDispatcher,
+			$timeline,
+			$systemMessages,
+			$mode,
+			$conversation,
+			$page,
+			$session,
+			$database,
+			$pConfig,
+			$config,
+			$cache,
+			$l10n,
+			$baseUrl,
+			$args,
+			$logger,
+			$profiler,
+			$response,
+			$server,
+			$parameters
+		);
 
 		$this->lock = $lock;
 	}

src/Module/Post/Tag/Add.php

@@ -153,10 +153,16 @@ EOT;
 
 		$post['id'] = $post_id;
 
-		$post = $this->eventDispatcher->dispatch(
-			new ArrayFilterEvent(ArrayFilterEvent::POST_LOCAL_END, $post)
+		$hook_data = [
+			'item' => $post,
+		];
+
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::INSERT_POST_LOCAL_END, $hook_data)
 		)->getArray();
 
+		$post = $hook_data['item'] ?? $post;
+
 		$post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]);
 
 		Worker::add(Worker::PRIORITY_HIGH, 'Notifier', Delivery::POST, $post['uri-id'], $post['uid']);

src/Module/Privacy/PermissionTooltip.php

@@ -7,14 +7,16 @@
 
 namespace Friendica\Module\Privacy;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\BaseModule;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\Database;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model;
 use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
@@ -23,21 +25,37 @@ use Friendica\Privacy\Entity;
 use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\Profiler;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
  * Outputs the permission tooltip HTML content for the provided item, photo or event id.
  */
-class PermissionTooltip extends \Friendica\BaseModule
+class PermissionTooltip extends BaseModule
 {
 	private Database $dba;
 	private ACLFormatter $aclFormatter;
 	private IHandleUserSessions $session;
 	private IManageConfigValues $config;
 	private PermissionSet $permissionSet;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(PermissionSet $permissionSet, IManageConfigValues $config, IHandleUserSessions $session, ACLFormatter $aclFormatter, Database $dba, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-	{
+	public function __construct(
+		PermissionSet $permissionSet,
+		IManageConfigValues $config,
+		IHandleUserSessions $session,
+		ACLFormatter $aclFormatter,
+		Database $dba,
+		EventDispatcherInterface $eventDispatcher,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		array $server,
+		array $parameters = []
+	) {
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->dba             = $dba;
@@ -45,6 +63,7 @@ class PermissionTooltip extends \Friendica\BaseModule
 		$this->session         = $session;
 		$this->config          = $config;
 		$this->permissionSet   = $permissionSet;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	protected function rawContent(array $request = [])
@@ -87,8 +106,15 @@ class PermissionTooltip extends \Friendica\BaseModule
 			throw new HttpException\NotFoundException($this->t('Model not found'));
 		}
 
-		// Kept for backwards compatibility
-		Hook::callAll('lockview_content', $model);
+		$hook_data = [
+			'model' => $model,
+		];
+
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PERMISSION_TOOLTIP_CONTENT, $hook_data),
+		)->getArray();
+
+		$model = $hook_data['model'] ?? $model;
 
 		$aclReceivers       = new Entity\AclReceivers();
 		$addressedReceivers = new Entity\AddressedReceivers();
@@ -100,13 +126,18 @@ class PermissionTooltip extends \Friendica\BaseModule
 
 		$privacy = '';
 		switch ($model['private'] ?? null) {
-			case Model\Item::PUBLIC:   $privacy = $this->t('Public'); break;
-			case Model\Item::UNLISTED: $privacy = $this->t('Unlisted'); break;
-			case Model\Item::PRIVATE:  $privacy = $this->t('Limited/Private'); break;
+			case Model\Item::PUBLIC:
+				$privacy = $this->t('Public');
+				break;
+			case Model\Item::UNLISTED:
+				$privacy = $this->t('Unlisted');
+				break;
+			case Model\Item::PRIVATE:
+				$privacy = $this->t('Limited/Private');
+				break;
 		}
 
-		if ($aclReceivers->isEmpty() && $addressedReceivers->isEmpty() && empty($privacy))
-		{
+		if ($aclReceivers->isEmpty() && $addressedReceivers->isEmpty() && empty($privacy)) {
 			echo $this->t('Remote privacy information not available.');
 			exit;
 		}

src/Module/Profile/Photos.php

@@ -14,12 +14,12 @@ use Friendica\AppHelper;
 use Friendica\Content\Feature;
 use Friendica\Content\Pager;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Database\Database;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
@@ -34,6 +34,7 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 class Photos extends \Friendica\Module\BaseProfile
@@ -52,11 +53,28 @@ class Photos extends \Friendica\Module\BaseProfile
 	private $systemMessages;
 	/** @var ACLFormatter */
 	private $aclFormatter;
+	private EventDispatcherInterface $eventDispatcher;
 	/** @var array owner-view record */
 	private $owner;
 
-	public function __construct(ACLFormatter $aclFormatter, SystemMessages $systemMessages, Database $database, AppHelper $appHelper, IManageConfigValues $config, Page $page, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-	{
+	public function __construct(
+		ACLFormatter $aclFormatter,
+		SystemMessages $systemMessages,
+		Database $database,
+		AppHelper $appHelper,
+		IManageConfigValues $config,
+		Page $page,
+		IHandleUserSessions $session,
+		EventDispatcherInterface $eventDispatcher,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		array $server,
+		array $parameters = []
+	) {
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->session         = $session;
@@ -66,6 +84,7 @@ class Photos extends \Friendica\Module\BaseProfile
 		$this->database        = $database;
 		$this->systemMessages  = $systemMessages;
 		$this->aclFormatter    = $aclFormatter;
+		$this->eventDispatcher = $eventDispatcher;
 
 		$owner = Profile::load($this->appHelper, $this->parameters['nickname'] ?? '', false);
 		if (!$owner || $owner['account_removed'] || $owner['account_expired']) {
@@ -90,15 +109,23 @@ class Photos extends \Friendica\Module\BaseProfile
 		if ($visibility === 'public') {
 			// The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected
 			$str_contact_allow = $str_circle_allow = $str_contact_deny = $str_circle_deny = '';
-		} else if ($visibility === 'custom') {
+		} elseif ($visibility === 'custom') {
 			// Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL
 			// case that would make it public. So we always append the author's contact id to the allowed contacts.
 			// See https://github.com/friendica/friendica/issues/9672
 			$str_contact_allow .= $this->aclFormatter->toString(Contact::getPublicIdByUserId($this->owner['uid']));
 		}
 
+		$hook_data = [
+			'request' => $request,
+		];
+
 		// default post action - upload a photo
-		Hook::callAll('photo_post_init', $request);
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PHOTO_UPLOAD_START, $hook_data),
+		)->getArray();
+
+		$request = $hook_data['request'] ?? $request;
 
 		// Determine the album to use
 		$album    = trim($request['album'] ?? '');
@@ -127,19 +154,27 @@ class Photos extends \Friendica\Module\BaseProfile
 			$visible = 0;
 		}
 
-		$ret      = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''];
+		$hook_data = [
+			'src'      => '',
+			'filename' => '',
+			'filesize' => 0,
+			'type'     => '',
+		];
+
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PHOTO_UPLOAD, $hook_data),
+		)->getArray();
+
 		$src      = null;
 		$filename = '';
 		$filesize = 0;
 		$type     = '';
 
-		Hook::callAll('photo_post_file', $ret);
-
-		if (!empty($ret['src']) && !empty($ret['filesize'])) {
-			$src      = $ret['src'];
-			$filename = $ret['filename'];
-			$filesize = $ret['filesize'];
-			$type     = $ret['type'];
+		if (!empty($hook_data['src']) && !empty($hook_data['filesize'])) {
+			$src      = $hook_data['src'];
+			$filename = $hook_data['filename'];
+			$filesize = $hook_data['filesize'];
+			$type     = $hook_data['type'];
 			$error    = UPLOAD_ERR_OK;
 		} elseif (!empty($_FILES['userfile'])) {
 			$src      = $_FILES['userfile']['tmp_name'];
@@ -176,8 +211,10 @@ class Photos extends \Friendica\Module\BaseProfile
 				@unlink($src);
 			}
 
-			$foo = 0;
-			Hook::callAll('photo_post_end', $foo);
+			$this->eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::PHOTO_UPLOAD_END, ['id' => 0]),
+			);
+
 			return;
 		}
 
@@ -188,16 +225,22 @@ class Photos extends \Friendica\Module\BaseProfile
 		if ($maximagesize && ($filesize > $maximagesize)) {
 			$this->systemMessages->addNotice($this->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
 			@unlink($src);
-			$foo = 0;
-			Hook::callAll('photo_post_end', $foo);
+
+			$this->eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::PHOTO_UPLOAD_END, ['id' => 0]),
+			);
+
 			return;
 		}
 
 		if (!$filesize) {
 			$this->systemMessages->addNotice($this->t('Image file is empty.'));
 			@unlink($src);
-			$foo = 0;
-			Hook::callAll('photo_post_end', $foo);
+
+			$this->eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::PHOTO_UPLOAD_END, ['id' => 0]),
+			);
+
 			return;
 		}
 
@@ -211,8 +254,11 @@ class Photos extends \Friendica\Module\BaseProfile
 			$this->logger->notice('unable to process image');
 			$this->systemMessages->addNotice($this->t('Unable to process image.'));
 			@unlink($src);
-			$foo = 0;
-			Hook::callAll('photo_post_end',$foo);
+
+			$this->eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::PHOTO_UPLOAD_END, ['id' => 0]),
+			);
+
 			return;
 		}
 
@@ -274,10 +320,11 @@ class Photos extends \Friendica\Module\BaseProfile
 		// Update the photo albums cache
 		Photo::clearAlbumCache($this->owner['uid']);
 
-		Hook::callAll('photo_post_end', $item_id);
-
-		// addon uploaders should call "exit()" within the photo_post_end hook
+		// addon uploaders should call "exit()" within the PHOTO_UPLOAD_END event
 		// if they do not wish to be redirected
+		$this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PHOTO_UPLOAD_END, ['id' => $item_id]),
+		);
 
 		$this->baseUrl->redirect($this->session->get('photo_return') ?? 'profile/' . $this->owner['nickname'] . '/photos');
 	}
@@ -336,7 +383,7 @@ class Photos extends \Friendica\Module\BaseProfile
 			$pager->getItemsPerPage()
 		));
 
-		$photos = array_map(function ($photo){
+		$photos = array_map(function ($photo) {
 			return [
 				'id'    => $photo['id'],
 				'link'  => 'photos/' . $this->owner['nickname'] . '/image/' . $photo['resource-id'],

src/Module/Profile/Profile.php

@@ -17,13 +17,13 @@ use Friendica\Content\Nav;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
+use Friendica\Event\HtmlFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile as ProfileModel;
 use Friendica\Model\Tag;
@@ -40,6 +40,7 @@ use Friendica\Util\Network;
 use Friendica\Util\Profiler;
 use Friendica\Util\Temporal;
 use GuzzleHttp\Psr7\Uri;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 class Profile extends BaseProfile
@@ -56,9 +57,25 @@ class Profile extends BaseProfile
 	private $page;
 	/** @var ProfileField */
 	private $profileField;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(ProfileField $profileField, Page $page, IManageConfigValues $config, IHandleUserSessions $session, AppHelper $appHelper, Database $database, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-	{
+	public function __construct(
+		ProfileField $profileField,
+		Page $page,
+		IManageConfigValues $config,
+		IHandleUserSessions $session,
+		AppHelper $appHelper,
+		Database $database,
+		EventDispatcherInterface $eventDispatcher,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		array $server,
+		array $parameters = []
+	) {
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->database        = $database;
@@ -67,6 +84,7 @@ class Profile extends BaseProfile
 		$this->config          = $config;
 		$this->page            = $page;
 		$this->profileField    = $profileField;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	protected function rawContent(array $request = [])
@@ -282,7 +300,9 @@ class Profile extends BaseProfile
 			],
 		]);
 
-		Hook::callAll('profile_advanced', $o);
+		$o = $this->eventDispatcher->dispatch(
+			new HTmlFilterEvent(HtmlFilterEvent::MOD_PROFILE_CONTENT, $o),
+		)->getHtml();
 
 		return $o;
 	}

src/Module/Register.php

@@ -12,18 +12,19 @@ use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
 use Friendica\Util\Proxy;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -41,13 +42,16 @@ class Register extends BaseModule
 	/** @var IHandleUserSessions */
 	private $session;
 
-	public function __construct(IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
+	private EventDispatcherInterface $eventDispatcher;
+
+	public function __construct(IHandleUserSessions $session, EventDispatcherInterface $eventDispatcher, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->tos = new Tos($l10n, $baseUrl, $args, $logger, $profiler, $response, $config, $server, $parameters);
 
 		$this->session         = $session;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	/**
@@ -129,11 +133,15 @@ class Register extends BaseModule
 
 		$tpl = Renderer::getMarkupTemplate('register.tpl');
 
-		$arr = ['template' => $tpl];
+		$hook_data = [
+			'template' => $tpl,
+		];
 
-		Hook::callAll('register_form', $arr);
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::ACCOUNT_REGISTER_FORM, $hook_data),
+		)->getArray();
 
-		$tpl = $arr['template'];
+		$tpl = $hook_data['template'] ?? $tpl;
 
 		$o = Renderer::replaceMacros($tpl, [
 			'$invitations'           => DI::config()->get('system', 'invitation_only'),
@@ -190,8 +198,13 @@ class Register extends BaseModule
 	{
 		BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
 
-		$arr = ['post' => $_POST];
-		Hook::callAll('register_post', $arr);
+		$arr = [
+			'post' => $_POST,
+		];
+
+		$arr = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::ACCOUNT_REGISTER_POST, $arr),
+		)->getArray();
 
 		$additional_account = false;
 

src/Module/Search/Acl.php

@@ -7,22 +7,23 @@
 
 namespace Friendica\Module\Search;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Widget;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Search;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
-use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Post;
 use Friendica\Module\Response;
-use Friendica\Network\HTTPException;
+use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Util\Profiler;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -44,13 +45,26 @@ class Acl extends BaseModule
 	private $session;
 	/** @var Database */
 	private $database;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(Database $database, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-	{
+	public function __construct(
+		Database $database,
+		IHandleUserSessions $session,
+		EventDispatcherInterface $eventDispatcher,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		array $server,
+		array $parameters = []
+	) {
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->session         = $session;
 		$this->database        = $database;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	protected function post(array $request = [])
@@ -61,7 +75,7 @@ class Acl extends BaseModule
 	protected function rawContent(array $request = [])
 	{
 		if (!$this->session->getLocalUserId()) {
-			throw new HTTPException\UnauthorizedException($this->t('You must be logged in to use this module.'));
+			throw new UnauthorizedException($this->t('You must be logged in to use this module.'));
 		}
 
 		$type = $request['type'] ?? self::TYPE_MENTION_CONTACT_CIRCLE;
@@ -142,21 +156,27 @@ class Acl extends BaseModule
 		switch ($type) {
 			case self::TYPE_MENTION_CONTACT_CIRCLE:
 			case self::TYPE_MENTION_CONTACT:
-				$condition = DBA::mergeConditions($condition,
+				$condition = DBA::mergeConditions(
+					$condition,
 					["NOT `self` AND NOT `blocked`",
-					]);
+					]
+				);
 				break;
 
 			case self::TYPE_MENTION_GROUP:
-				$condition = DBA::mergeConditions($condition,
+				$condition = DBA::mergeConditions(
+					$condition,
 					["NOT `self` AND NOT `blocked` AND (NOT `ap-posting-restricted` OR `ap-posting-restricted` IS NULL) AND `contact-type` = ?", Contact::TYPE_COMMUNITY
-					]);
+					]
+				);
 				break;
 
 			case self::TYPE_PRIVATE_MESSAGE:
-				$condition = DBA::mergeConditions($condition,
+				$condition = DBA::mergeConditions(
+					$condition,
 					["NOT `self` AND NOT `blocked` AND `network` IN (?, ?, ?)", Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA
-					]);
+					]
+				);
 				break;
 		}
 
@@ -170,7 +190,8 @@ class Acl extends BaseModule
 		if ($type == self::TYPE_MENTION_CONTACT_CIRCLE || $type == self::TYPE_MENTION_CIRCLE) {
 			/// @todo We should cache this query.
 			// This can be done when we can delete cache entries via wildcard
-			$circles = $this->database->toArray($this->database->p("SELECT `circle`.`id`, `circle`.`name`, GROUP_CONCAT(DISTINCT `circle_member`.`contact-id` SEPARATOR ',') AS uids
+			$circles = $this->database->toArray($this->database->p(
+				"SELECT `circle`.`id`, `circle`.`name`, GROUP_CONCAT(DISTINCT `circle_member`.`contact-id` SEPARATOR ',') AS uids
 				FROM `group` AS `circle`
 				INNER JOIN `group_member` AS `circle_member` ON `circle_member`.`gid` = `circle`.`id`
 				WHERE NOT `circle`.`deleted` AND `circle`.`uid` = ?
@@ -280,7 +301,7 @@ class Acl extends BaseModule
 			$resultTotal += count($unknown_contacts);
 		}
 
-		$results = [
+		$hook_data = [
 			'tot'      => $resultTotal,
 			'start'    => $start,
 			'count'    => $count,
@@ -291,13 +312,15 @@ class Acl extends BaseModule
 			'search'   => $search,
 		];
 
-		Hook::callAll('acl_lookup_end', $results);
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::ACL_LOOKUP_END, $hook_data),
+		)->getArray();
 
 		$o = [
-			'tot'   => $results['tot'],
-			'start' => $results['start'],
-			'count' => $results['count'],
-			'items' => $results['items'],
+			'tot'   => $hook_data['tot'],
+			'start' => $hook_data['start'],
+			'count' => $hook_data['count'],
+			'items' => $hook_data['items'],
 		];
 
 		$this->logger->info('ACL {action} - {subaction} - done', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]);

src/Module/Settings/Profile/Index.php

@@ -7,30 +7,33 @@
 
 namespace Friendica\Module\Settings\Profile;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
 use Friendica\Core\ACL;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Theme;
+use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Module\Response;
-use Friendica\Navigation\SystemMessages;
-use Friendica\Profile\ProfileField;
 use Friendica\Model\User;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Security\Login;
+use Friendica\Navigation\SystemMessages;
 use Friendica\Network\HTTPException;
+use Friendica\Profile\ProfileField;
 use Friendica\Security\PermissionSet;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
 use Friendica\Util\Temporal;
-use Friendica\Core\Worker;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 class Index extends BaseSettings
@@ -47,9 +50,27 @@ class Index extends BaseSettings
 	private $permissionSetFactory;
 	/** @var ACLFormatter */
 	private $aclFormatter;
+	private EventDispatcherInterface $eventDispatcher;
 
-	public function __construct(ACLFormatter $aclFormatter, PermissionSet\Factory\PermissionSet $permissionSetFactory, PermissionSet\Repository\PermissionSet $permissionSetRepo, SystemMessages $systemMessages, ProfileField\Factory\ProfileField $profileFieldFactory, ProfileField\Repository\ProfileField $profileFieldRepo, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
-	{
+	public function __construct(
+		ACLFormatter $aclFormatter,
+		PermissionSet\Factory\PermissionSet $permissionSetFactory,
+		PermissionSet\Repository\PermissionSet $permissionSetRepo,
+		SystemMessages $systemMessages,
+		ProfileField\Factory\ProfileField $profileFieldFactory,
+		ProfileField\Repository\ProfileField $profileFieldRepo,
+		EventDispatcherInterface $eventDispatcher,
+		IHandleUserSessions $session,
+		Page $page,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		Arguments $args,
+		LoggerInterface $logger,
+		Profiler $profiler,
+		Response $response,
+		array $server,
+		array $parameters = []
+	) {
 		parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->profileFieldRepo     = $profileFieldRepo;
@@ -58,6 +79,7 @@ class Index extends BaseSettings
 		$this->permissionSetRepo    = $permissionSetRepo;
 		$this->permissionSetFactory = $permissionSetFactory;
 		$this->aclFormatter         = $aclFormatter;
+		$this->eventDispatcher      = $eventDispatcher;
 	}
 
 	protected function post(array $request = [])
@@ -73,7 +95,9 @@ class Index extends BaseSettings
 
 		self::checkFormSecurityTokenRedirectOnError('/settings/profile', 'settings_profile');
 
-		Hook::callAll('profile_post', $request);
+		$request = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PROFILE_SETTINGS_POST, $request),
+		)->getArray();
 
 		$dob = trim($request['dob'] ?? '');
 
@@ -254,7 +278,8 @@ class Index extends BaseSettings
 				'miscellaneous_section'     => $this->t('Miscellaneous'),
 				'custom_fields_section'     => $this->t('Custom Profile Fields'),
 				'profile_photo'             => $this->t('Upload Profile Photo'),
-				'custom_fields_description' => $this->t('<p>Custom fields appear on <a href="%s">your profile page</a>.</p>
+				'custom_fields_description' => $this->t(
+					'<p>Custom fields appear on <a href="%s">your profile page</a>.</p>
 				<p>You can use BBCodes in the field values.</p>
 				<p>Reorder by dragging the field title.</p>
 				<p>Empty the label field to remove a custom field.</p>
@@ -288,8 +313,16 @@ class Index extends BaseSettings
 			'$custom_fields' => $custom_fields,
 		]);
 
-		$arr = ['profile' => $owner, 'entry' => $o];
-		Hook::callAll('profile_edit', $arr);
+		$hook_data = [
+			'profile' => $owner,
+			'entry'   => $o,
+		];
+
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::PROFILE_SETTINGS_FORM, $hook_data),
+		)->getArray();
+
+		$o = $hook_data['entry'] ?? $o;
 
 		return $o;
 	}

src/Navigation/Notifications/Collection/Notifications.php

@@ -8,36 +8,55 @@
 namespace Friendica\Navigation\Notifications\Collection;
 
 use Friendica\BaseCollection;
-use Friendica\Navigation\Notifications\Entity;
+use Friendica\Navigation\Notifications\Entity\Notification as NotificationEntity;
 
 class Notifications extends BaseCollection
 {
-	/**
-	 * @return Entity\Notification
-	 */
-	public function current(): Entity\Notification
+	public function current(): NotificationEntity
 	{
 		return parent::current();
 	}
 
 	public function setSeen(): Notifications
 	{
-		return $this->map(function (Entity\Notification $Notification) {
-			$Notification->setSeen();
+		$notifications = $this->map(function (NotificationEntity $notification) {
+			$notification->setSeen();
 		});
+
+		if (!$notifications instanceof Notifications) {
+			// Show the possible error explicitly
+			throw new \Exception(sprintf(
+				'BaseCollection::map() should return instance of %s, but returns %s instead.',
+				Notifications::class,
+				get_class($notifications),
+			));
+		}
+
+		return $notifications;
 	}
 
 	public function setDismissed(): Notifications
 	{
-		return $this->map(function (Entity\Notification $Notification) {
-			$Notification->setDismissed();
+		$notifications = $this->map(function (NotificationEntity $notification) {
+			$notification->setDismissed();
 		});
+
+		if (!$notifications instanceof Notifications) {
+			// Show the possible error explicitly
+			throw new \Exception(sprintf(
+				'BaseCollection::map() should return instance of %s, but returns %s instead.',
+				Notifications::class,
+				get_class($notifications),
+			));
+		}
+
+		return $notifications;
 	}
 
 	public function countUnseen(): int
 	{
-		return array_reduce($this->getArrayCopy(), function (int $carry, Entity\Notification $Notification) {
-			return $carry + ($Notification->seen ? 0 : 1);
+		return array_reduce($this->getArrayCopy(), function (int $carry, NotificationEntity $notification) {
+			return $carry + ($notification->seen ? 0 : 1);
 		}, 0);
 	}
 }

src/Navigation/Notifications/Collection/Notifies.php

@@ -8,22 +8,30 @@
 namespace Friendica\Navigation\Notifications\Collection;
 
 use Friendica\BaseCollection;
-use Friendica\Navigation\Notifications\Entity;
+use Friendica\Navigation\Notifications\Entity\Notify as NotifyEntity;
 
 class Notifies extends BaseCollection
 {
-	/**
-	 * @return Entity\Notify
-	 */
-	public function current(): Entity\Notify
+	public function current(): NotifyEntity
 	{
 		return parent::current();
 	}
 
 	public function setSeen(): Notifies
 	{
-		return $this->map(function (Entity\Notify $Notify) {
-			$Notify->setSeen();
+		$notifies = $this->map(function (NotifyEntity $notify) {
+			$notify->setSeen();
 		});
+
+		if (!$notifies instanceof Notifies) {
+			// Show the possible error explicitly
+			throw new \Exception(sprintf(
+				'BaseCollection::map() should return instance of %s, but returns %s instead.',
+				Notifies::class,
+				get_class($notifies),
+			));
+		}
+
+		return $notifies;
 	}
 }

src/Navigation/Notifications/Entity/Notify.php

@@ -14,7 +14,7 @@ use Friendica\Core\Renderer;
 use Psr\Http\Message\UriInterface;
 
 /**
- * @property-read string $type
+ * @property-read int $type
  * @property-read string $name
  * @property-read UriInterface $url
  * @property-read UriInterface $photo
@@ -33,7 +33,8 @@ use Psr\Http\Message\UriInterface;
  * @property-read int|null $parentUriId
  * @property-read int|null $id
  *
- * @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\Entity\Notification instead
+ * @deprecated 2022.05 Use \Friendica\Navigation\Notifications\Entity\Notification instead
+ * @see \Friendica\Navigation\Notifications\Entity\Notification
  */
 class Notify extends BaseEntity
 {

src/Navigation/Notifications/Repository/Notification.php

@@ -15,8 +15,8 @@ use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\Model\Post\UserNotification;
 use Friendica\Model\Verb;
-use Friendica\Navigation\Notifications\Collection;
-use Friendica\Navigation\Notifications\Entity;
+use Friendica\Navigation\Notifications\Collection\Notifications as NotificationsCollection;
+use Friendica\Navigation\Notifications\Entity\Notification as NotificationEntity;
 use Friendica\Navigation\Notifications\Factory;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Protocol\Activity;
@@ -41,19 +41,18 @@ class Notification extends BaseRepository
 	}
 
 	/**
-	 * @param array $condition
-	 * @param array $params
-	 * @return Entity\Notification
 	 * @throws NotFoundException
 	 */
-	private function selectOne(array $condition, array $params = []): Entity\Notification
+	private function selectOne(array $condition, array $params = []): NotificationEntity
 	{
-		return parent::_selectOne($condition, $params);
+		$fields = $this->_selectFirstRowAsArray( $condition, $params);
+
+		return $this->factory->createFromTableRow($fields);
 	}
 
-	private function select(array $condition, array $params = []): Collection\Notifications
+	private function select(array $condition, array $params = []): NotificationsCollection
 	{
-		return new Collection\Notifications(parent::_select($condition, $params)->getArrayCopy());
+		return new NotificationsCollection(parent::_select($condition, $params)->getArrayCopy());
 	}
 
 	public function countForUser($uid, array $condition, array $params = []): int
@@ -71,23 +70,21 @@ class Notification extends BaseRepository
 	}
 
 	/**
-	 * @param int $id
-	 * @return Entity\Notification
 	 * @throws NotFoundException
 	 */
-	public function selectOneById(int $id): Entity\Notification
+	public function selectOneById(int $id): NotificationEntity
 	{
 		return $this->selectOne(['id' => $id]);
 	}
 
-	public function selectOneForUser(int $uid, array $condition, array $params = []): Entity\Notification
+	public function selectOneForUser(int $uid, array $condition, array $params = []): NotificationEntity
 	{
 		$condition = DBA::mergeConditions($condition, ['uid' => $uid]);
 
 		return $this->selectOne($condition, $params);
 	}
 
-	public function selectForUser(int $uid, array $condition = [], array $params = []): Collection\Notifications
+	public function selectForUser(int $uid, array $condition = [], array $params = []): NotificationsCollection
 	{
 		$condition = DBA::mergeConditions($condition, ['uid' => $uid]);
 
@@ -98,12 +95,9 @@ class Notification extends BaseRepository
 	/**
 	 * Returns only the most recent notifications for the same conversation or contact
 	 *
-	 * @param int $uid
-	 *
-	 * @return Collection\Notifications
 	 * @throws Exception
 	 */
-	public function selectDetailedForUser(int $uid): Collection\Notifications
+	public function selectDetailedForUser(int $uid): NotificationsCollection
 	{
 		$notify_type = $this->pconfig->get($uid, 'system', 'notify_type');
 		if (!is_null($notify_type)) {
@@ -113,11 +107,11 @@ class Notification extends BaseRepository
 		}
 
 		if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
-			$condition = DBA::mergeConditions($condition, ['NOT `vid` IN (?, ?)', Verb::getID(\Friendica\Protocol\Activity::LIKE), Verb::getID(\Friendica\Protocol\Activity::DISLIKE)]);
+			$condition = DBA::mergeConditions($condition, ['NOT `vid` IN (?, ?)', Verb::getID(Activity::LIKE), Verb::getID(Activity::DISLIKE)]);
 		}
 
 		if (!$this->pconfig->get($uid, 'system', 'notify_announce')) {
-			$condition = DBA::mergeConditions($condition, ['`vid` != ?', Verb::getID(\Friendica\Protocol\Activity::ANNOUNCE)]);
+			$condition = DBA::mergeConditions($condition, ['`vid` != ?', Verb::getID(Activity::ANNOUNCE)]);
 		}
 
 		return $this->selectForUser($uid, $condition, ['limit' => 50, 'order' => ['id' => true]]);
@@ -126,12 +120,9 @@ class Notification extends BaseRepository
 	/**
 	 * Returns only the most recent notifications for the same conversation or contact
 	 *
-	 * @param int $uid
-	 *
-	 * @return Collection\Notifications
 	 * @throws Exception
 	 */
-	public function selectDigestForUser(int $uid): Collection\Notifications
+	public function selectDigestForUser(int $uid): NotificationsCollection
 	{
 		$values = [$uid];
 
@@ -145,14 +136,14 @@ class Notification extends BaseRepository
 		$like_condition = '';
 		if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
 			$like_condition = 'AND NOT `vid` IN (?, ?)';
-			$values[] = Verb::getID(\Friendica\Protocol\Activity::LIKE);
-			$values[] = Verb::getID(\Friendica\Protocol\Activity::DISLIKE);
+			$values[]       = Verb::getID(Activity::LIKE);
+			$values[]       = Verb::getID(Activity::DISLIKE);
 		}
 
 		$announce_condition = '';
 		if (!$this->pconfig->get($uid, 'system', 'notify_announce')) {
 			$announce_condition = 'AND vid != ?';
-			$values[] = Verb::getID(\Friendica\Protocol\Activity::ANNOUNCE);
+			$values[]           = Verb::getID(Activity::ANNOUNCE);
 		}
 
 		$rows = $this->db->p("
@@ -171,15 +162,20 @@ class Notification extends BaseRepository
 		LIMIT 50
 		", ...$values);
 
-		$Entities = new Collection\Notifications();
+		$entities = new NotificationsCollection();
+
+		if (!is_iterable($rows)) {
+			return $entities;
+		}
+
 		foreach ($rows as $fields) {
-			$Entities[] = $this->factory->createFromTableRow($fields);
+			$entities[] = $this->factory->createFromTableRow($fields);
 		}
 
-		return $Entities;
+		return $entities;
 	}
 
-	public function selectAllForUser(int $uid): Collection\Notifications
+	public function selectAllForUser(int $uid): NotificationsCollection
 	{
 		return $this->selectForUser($uid);
 	}
@@ -199,7 +195,7 @@ class Notification extends BaseRepository
 	{
 		$BaseCollection = parent::_selectByBoundaries($condition, $params, $min_id, $max_id, $limit);
 
-		return new Collection\Notifications($BaseCollection->getArrayCopy(), $BaseCollection->getTotalCount());
+		return new NotificationsCollection($BaseCollection->getArrayCopy(), $BaseCollection->getTotalCount());
 	}
 
 	public function setAllSeenForUser(int $uid, array $condition = []): bool
@@ -217,11 +213,9 @@ class Notification extends BaseRepository
 	}
 
 	/**
-	 * @param Entity\Notification $Notification
-	 * @return Entity\Notification
 	 * @throws Exception
 	 */
-	public function save(Entity\Notification $Notification): Entity\Notification
+	public function save(NotificationEntity $Notification): NotificationEntity
 	{
 		$fields = [
 			'uid'           => $Notification->uid,

src/Navigation/Notifications/Repository/Notify.php

@@ -13,14 +13,15 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
-use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
+use Friendica\Event\ArrayFilterEvent;
 use Friendica\Factory\Api\Mastodon\Notification as NotificationFactory;
 use Friendica\Model;
 use Friendica\Navigation\Notifications\Collection;
-use Friendica\Navigation\Notifications\Entity;
+use Friendica\Navigation\Notifications\Entity\Notification as NotificationEntity;
+use Friendica\Navigation\Notifications\Entity\Notify as NotifyEntity;
 use Friendica\Navigation\Notifications\Exception;
 use Friendica\Navigation\Notifications\Factory;
 use Friendica\Network\HTTPException;
@@ -28,10 +29,11 @@ use Friendica\Object\Api\Mastodon\Notification;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
- * @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\Repository\Notification instead
+ * @deprecated 2022.05 Use `\Friendica\Navigation\Notifications\Repository\Notification` instead
  */
 class Notify extends BaseRepository
 {
@@ -56,30 +58,41 @@ class Notify extends BaseRepository
 	/** @var Factory\Notification */
 	protected $notification;
 
+	private EventDispatcherInterface $eventDispatcher;
+
 	protected static $table_name = 'notify';
 
-	public function __construct(Database $database, LoggerInterface $logger, L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Emailer $emailer, Factory\Notification $notification, Factory\Notify $factory = null)
-	{
+	public function __construct(
+		Database $database,
+		LoggerInterface $logger,
+		L10n $l10n,
+		BaseURL $baseUrl,
+		IManageConfigValues $config,
+		IManagePersonalConfigValues $pConfig,
+		Emailer $emailer,
+		Factory\Notification $notification,
+		EventDispatcherInterface $eventDispatcher,
+		Factory\Notify $factory = null
+	) {
 		$this->l10n            = $l10n;
 		$this->baseUrl         = $baseUrl;
 		$this->config          = $config;
 		$this->pConfig         = $pConfig;
 		$this->emailer         = $emailer;
 		$this->notification    = $notification;
+		$this->eventDispatcher = $eventDispatcher;
 
 		parent::__construct($database, $logger, $factory ?? new Factory\Notify($logger));
 	}
 
 	/**
-	 * @param array $condition
-	 * @param array $params
-	 *
-	 * @return Entity\Notify
 	 * @throws HTTPException\NotFoundException
 	 */
-	private function selectOne(array $condition, array $params = []): Entity\Notify
+	private function selectOne(array $condition, array $params = []): NotifyEntity
 	{
-		return parent::_selectOne($condition, $params);
+		$fields = $this->_selectFirstRowAsArray( $condition, $params);
+
+		return $this->factory->createFromTableRow($fields);
 	}
 
 	private function select(array $condition, array $params = []): Collection\Notifies
@@ -104,10 +117,9 @@ class Notify extends BaseRepository
 	/**
 	 * @param int $id
 	 *
-	 * @return Entity\Notify
 	 * @throws HTTPException\NotFoundException
 	 */
-	public function selectOneById(int $id): Entity\Notify
+	public function selectOneById(int $id): NotifyEntity
 	{
 		return $this->selectOne(['id' => $id]);
 	}
@@ -139,14 +151,11 @@ class Notify extends BaseRepository
 	}
 
 	/**
-	 * @param Entity\Notify $Notify
-	 *
-	 * @return Entity\Notify
 	 * @throws HTTPException\NotFoundException
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws Exception\NotificationCreationInterceptedException
 	 */
-	public function save(Entity\Notify $Notify): Entity\Notify
+	public function save(NotifyEntity $Notify): NotifyEntity
 	{
 		$fields = [
 			'type'          => $Notify->type,
@@ -171,7 +180,10 @@ class Notify extends BaseRepository
 			$this->db->update(self::$table_name, $fields, ['id' => $Notify->id]);
 		} else {
 			$fields['date'] = DateTimeFormat::utcNow();
-			Hook::callAll('enotify_store', $fields);
+
+			$fields = $this->eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::ENOTIFY_STORE, $fields),
+			)->getArray();
 
 			$this->db->insert(self::$table_name, $fields);
 
@@ -181,7 +193,7 @@ class Notify extends BaseRepository
 		return $Notify;
 	}
 
-	public function setAllSeenForRelatedNotify(Entity\Notify $Notify): bool
+	public function setAllSeenForRelatedNotify(NotifyEntity $Notify): bool
 	{
 		$condition = [
 			'(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?',
@@ -549,7 +561,7 @@ class Notify extends BaseRepository
 
 		$subject .= " (".$nickname."@".$hostname.")";
 
-		$h = [
+		$hook_data = [
 			'params'    => $params,
 			'subject'   => $subject,
 			'preamble'  => $preamble,
@@ -561,18 +573,20 @@ class Notify extends BaseRepository
 			'itemlink'  => $itemlink
 		];
 
-		Hook::callAll('enotify', $h);
+		$hook_data = $this->eventDispatcher->dispatch(
+			new ArrayFilterEvent(ArrayFilterEvent::ENOTIFY, $hook_data),
+		)->getArray();
 
-		$subject = $h['subject'];
+		$subject = $hook_data['subject'];
 
-		$preamble  = $h['preamble'];
-		$epreamble = $h['epreamble'];
+		$preamble  = $hook_data['preamble'];
+		$epreamble = $hook_data['epreamble'];
 
-		$body = $h['body'];
+		$body = $hook_data['body'];
 
-		$tsitelink = $h['tsitelink'];
-		$hsitelink = $h['hsitelink'];
-		$itemlink  = $h['itemlink'];
+		$tsitelink = $hook_data['tsitelink'];
+		$hsitelink = $hook_data['hsitelink'];
+		$itemlink  = $hook_data['itemlink'];
 
 		$notify_id = 0;
 
@@ -620,7 +634,7 @@ class Notify extends BaseRepository
 				}
 			}
 
-			$datarray = [
+			$hook_data = [
 				'preamble'     => $preamble,
 				'type'         => $params['type'],
 				'parent'       => $parent_id,
@@ -637,31 +651,33 @@ class Notify extends BaseRepository
 				'headers'      => $emailBuilder->getHeaders(),
 			];
 
-			Hook::callAll('enotify_mail', $datarray);
+			$hook_data = $this->eventDispatcher->dispatch(
+				new ArrayFilterEvent(ArrayFilterEvent::ENOTIFY_MAIL, $hook_data),
+			)->getArray();
 
 			$emailBuilder
-				->withHeaders($datarray['headers'])
+				->withHeaders($hook_data['headers'])
 				->withRecipient($params['to_email'])
 				->forUser([
-					'uid'      => $datarray['uid'],
+					'uid'      => $hook_data['uid'],
 					'language' => $params['language'],
 				])
-				->withNotification($datarray['subject'], $datarray['preamble'], $datarray['title'], $datarray['body'])
-				->withSiteLink($datarray['tsitelink'], $datarray['hsitelink'])
-				->withItemLink($datarray['itemlink']);
+				->withNotification($hook_data['subject'], $hook_data['preamble'], $hook_data['title'], $hook_data['body'])
+				->withSiteLink($hook_data['tsitelink'], $hook_data['hsitelink'])
+				->withItemLink($hook_data['itemlink']);
 
 			// If a photo is present, add it to the email
-			if (!empty($datarray['source_photo'])) {
+			if (!empty($hook_data['source_photo'])) {
 				$emailBuilder->withPhoto(
-					$datarray['source_photo'],
-					$datarray['source_link'] ?? $sitelink,
-					$datarray['source_name'] ?? $sitename
+					$hook_data['source_photo'],
+					$hook_data['source_link'] ?? $sitelink,
+					$hook_data['source_name'] ?? $sitename
 				);
 			}
 
 			$email = $emailBuilder->build();
 
-			$this->logger->debug('Send mail', $datarray);
+			$this->logger->debug('Send mail', $hook_data);
 
 			// use the Emailer class to send the message
 			return $this->emailer->send($email);
@@ -670,7 +686,7 @@ class Notify extends BaseRepository
 		return false;
 	}
 
-	public function shouldShowOnDesktop(Entity\Notification $Notification, string $type = null): bool
+	public function shouldShowOnDesktop(NotificationEntity $Notification, string $type = null): bool
 	{
 		if (is_null($type)) {
 			$type = NotificationFactory::getType($Notification);
@@ -702,7 +718,7 @@ class Notify extends BaseRepository
 		return false;
 	}
 
-	public function createFromNotification(Entity\Notification $Notification): bool
+	public function createFromNotification(NotificationEntity $Notification): bool
 	{
 		$this->logger->info('Start', ['uid' => $Notification->uid, 'id' => $Notification->id, 'type' => $Notification->type]);
 

src/Navigation/Notifications/ValueObject/Introduction.php

@@ -61,6 +61,34 @@ class Introduction implements \JsonSerializable
 	/** @var string */
 	private $about;
 
+	public function __construct(array $data = [])
+	{
+		$this->label         = $data['label']         ?? '';
+		$this->type          = $data['str_type']      ?? '';
+		$this->intro_id      = $data['intro_id']      ?? -1;
+		$this->madeBy        = $data['madeBy']        ?? '';
+		$this->madeByUrl     = $data['madeByUrl']     ?? '';
+		$this->madeByZrl     = $data['madeByZrl']     ?? '';
+		$this->madeByAddr    = $data['madeByAddr']    ?? '';
+		$this->contactId     = $data['contactId']     ?? -1;
+		$this->photo         = $data['photo']         ?? '';
+		$this->name          = $data['name']          ?? '';
+		$this->url           = $data['url']           ?? '';
+		$this->zrl           = $data['zrl']           ?? '';
+		$this->hidden        = $data['hidden']        ?? false;
+		$this->postNewFriend = $data['postNewFriend'] ?? '';
+		$this->knowYou       = $data['knowYou']       ?? false;
+		$this->note          = $data['note']          ?? '';
+		$this->request       = $data['request']       ?? '';
+		$this->dfrnId        = -1;
+		$this->addr          = $data['addr']     ?? '';
+		$this->network       = $data['network']  ?? '';
+		$this->uid           = $data['uid']      ?? -1;
+		$this->keywords      = $data['keywords'] ?? '';
+		$this->location      = $data['location'] ?? '';
+		$this->about         = $data['about']    ?? '';
+	}
+
 	public function getLabel(): string
 	{
 		return $this->label;
@@ -131,7 +159,7 @@ class Introduction implements \JsonSerializable
 		return $this->postNewFriend;
 	}
 
-	public function getKnowYou(): string
+	public function getKnowYou(): bool
 	{
 		return $this->knowYou;
 	}
@@ -181,34 +209,6 @@ class Introduction implements \JsonSerializable
 		return $this->about;
 	}
 
-	public function __construct(array $data = [])
-	{
-		$this->label         = $data['label'] ?? '';
-		$this->type          = $data['str_type'] ?? '';
-		$this->intro_id      = $data['intro_id'] ?? -1;
-		$this->madeBy        = $data['madeBy'] ?? '';
-		$this->madeByUrl     = $data['madeByUrl'] ?? '';
-		$this->madeByZrl     = $data['madeByZrl'] ?? '';
-		$this->madeByAddr    = $data['madeByAddr'] ?? '';
-		$this->contactId     = $data['contactId'] ?? -1;
-		$this->photo         = $data['photo'] ?? '';
-		$this->name          = $data['name'] ?? '';
-		$this->url           = $data['url'] ?? '';
-		$this->zrl           = $data['zrl'] ?? '';
-		$this->hidden        = $data['hidden'] ?? false;
-		$this->postNewFriend = $data['postNewFriend'] ?? '';
-		$this->knowYou       = $data['knowYou'] ?? false;
-		$this->note          = $data['note'] ?? '';
-		$this->request       = $data['request'] ?? '';
-		$this->dfrnId        = -1;
-		$this->addr          = $data['addr'] ?? '';
-		$this->network       = $data['network'] ?? '';
-		$this->uid           = $data['uid'] ?? -1;
-		$this->keywords      = $data['keywords'] ?? '';
-		$this->location      = $data['location'] ?? '';
-		$this->about         = $data['about'] ?? '';
-	}
-
 	/**
 	 * @inheritDoc
 	 */

src/Network/HTTPClient/Response/CurlResult.php

@@ -246,7 +246,7 @@ class CurlResult implements ICanHandleHttpResponses
 	/** {@inheritDoc} */
 	public function getReturnCode(): string
 	{
-		return $this->returnCode;
+		return (string) $this->returnCode;
 	}
 
 	/** {@inheritDoc} */

src/Network/HTTPClient/Response/GuzzleResponse.php

@@ -100,7 +100,7 @@ class GuzzleResponse extends Response implements ICanHandleHttpResponses, Respon
 	/** {@inheritDoc} */
 	public function getReturnCode(): string
 	{
-		return $this->getStatusCode();
+		return (string) $this->getStatusCode();
 	}
 
 	/** {@inheritDoc} */

src/Object/Api/Friendica/Notification.php

@@ -62,29 +62,29 @@ class Notification extends BaseDataTransferObject
 	/** @var string Message (Plaintext) */
 	protected $msg_plain;
 
-	public function __construct(Notify $Notify)
+	public function __construct(Notify $notify)
 	{
-		$this->id         = $Notify->id;
-		$this->type       = $Notify->type;
-		$this->name       = $Notify->name;
-		$this->url        = $Notify->url->__toString();
-		$this->photo      = $Notify->photo->__toString();
-		$this->date       = DateTimeFormat::local($Notify->date->format(DateTimeFormat::MYSQL));
-		$this->msg        = $Notify->msg;
-		$this->uid        = $Notify->uid;
-		$this->link       = $Notify->link->__toString();
-		$this->iid        = $Notify->itemId;
-		$this->parent     = $Notify->parent;
-		$this->seen       = $Notify->seen;
-		$this->verb       = $Notify->verb;
-		$this->otype      = $Notify->otype;
-		$this->name_cache = $Notify->name_cache;
-		$this->msg_cache  = $Notify->msg_cache;
-		$this->timestamp  = $Notify->date->format('U');
+		$this->id         = $notify->id;
+		$this->type       = $notify->type;
+		$this->name       = $notify->name;
+		$this->url        = $notify->url->__toString();
+		$this->photo      = $notify->photo->__toString();
+		$this->date       = DateTimeFormat::local($notify->date->format(DateTimeFormat::MYSQL));
+		$this->msg        = $notify->msg;
+		$this->uid        = $notify->uid;
+		$this->link       = $notify->link->__toString();
+		$this->iid        = $notify->itemId;
+		$this->parent     = $notify->parent;
+		$this->seen       = $notify->seen;
+		$this->verb       = $notify->verb;
+		$this->otype      = $notify->otype;
+		$this->name_cache = $notify->name_cache;
+		$this->msg_cache  = $notify->msg_cache;
+		$this->timestamp  = (int) $notify->date->format('U');
 		$this->date_rel   = Temporal::getRelativeDate($this->date);
 
 		try {
-			$this->msg_html  = BBCode::convertForUriId($Notify->uriId, $this->msg, BBCode::EXTERNAL);
+			$this->msg_html = BBCode::convertForUriId($notify->uriId, $this->msg, BBCode::EXTERNAL);
 		} catch (\Exception $e) {
 			$this->msg_html = '';
 		}

src/Object/Api/Mastodon/Field.php

@@ -20,7 +20,7 @@ class Field extends BaseDataTransferObject
 	protected $name;
 	/** @var string (HTML) */
 	protected $value;
-	/** @var string (Datetime)*/
+	/** @var string|null (Datetime)*/
 	protected $verified_at;
 
 	public function __construct(string $name, string $value)

src/Object/Api/Mastodon/Notification.php

@@ -44,9 +44,9 @@ class Notification extends BaseDataTransferObject
 	protected $created_at;
 	/** @var bool */
 	protected $dismissed;
-	/** @var Account */
+	/** @var array */
 	protected $account;
-	/** @var Status|null */
+	/** @var array|null */
 	protected $status = null;
 
 	/**

src/Object/Api/Mastodon/Poll.php

@@ -32,7 +32,7 @@ class Poll extends BaseDataTransferObject
 	/** @var bool|null */
 	protected $voted = false;
 	/** @var array|null */
-	protected $own_votes = false;
+	protected $own_votes = null;
 	/** @var array */
 	protected $options = [];
 	/** @var Emoji[] */

src/Object/Api/Mastodon/Relationship.php

@@ -18,7 +18,7 @@ use Friendica\Util\Network;
  */
 class Relationship extends BaseDataTransferObject
 {
-	/** @var int */
+	/** @var string */
 	protected $id;
 	/** @var bool */
 	protected $following = false;
@@ -93,7 +93,5 @@ class Relationship extends BaseDataTransferObject
 			$this->blocked_by  = $isBlocked;
 			$this->note        = $contactRecord['info'];
 		}
-
-		return $this;
 	}
 }

src/Object/Api/Mastodon/ScheduledStatus.php

@@ -35,7 +35,7 @@ class ScheduledStatus extends BaseDataTransferObject
 		'in_reply_to_id' => null,
 		'application_id' => ''
 	];
-	/** @var Attachment */
+	/** @var array */
 	protected $media_attachments = [];
 
 	/**

src/Object/Api/Mastodon/Status.php

@@ -30,7 +30,7 @@ class Status extends BaseDataTransferObject
 	protected $edited_at;
 	/** @var string|null */
 	protected $in_reply_to_id = null;
-	/** @var Status|null - Fedilab extension, see issue https://github.com/friendica/friendica/issues/12672 */
+	/** @var Status[]|null - Fedilab extension, see issue https://github.com/friendica/friendica/issues/12672 */
 	protected $in_reply_to_status = null;
 	/** @var string|null */
 	protected $in_reply_to_account_id = null;
@@ -66,25 +66,25 @@ class Status extends BaseDataTransferObject
 	protected $content;
 	/** @var array */
 	protected $filtered = [];
-	/** @var Status|null */
+	/** @var Status[]|null */
 	protected $reblog = null;
-	/** @var Status|null - Akkoma extension, see issue https://github.com/friendica/friendica/issues/12603 */
+	/** @var Status[]|null - Akkoma extension, see issue https://github.com/friendica/friendica/issues/12603 */
 	protected $quote = null;
-	/** @var Application */
+	/** @var array */
 	protected $application = null;
-	/** @var Account */
+	/** @var array */
 	protected $account;
-	/** @var Attachment */
+	/** @var Attachment[] */
 	protected $media_attachments = [];
-	/** @var Mention */
+	/** @var Mention[] */
 	protected $mentions = [];
-	/** @var Tag */
+	/** @var Tag[] */
 	protected $tags = [];
 	/** @var Emoji[] */
 	protected $emojis = [];
-	/** @var Card|null */
+	/** @var array|null */
 	protected $card = null;
-	/** @var Poll|null */
+	/** @var array|null */
 	protected $poll = null;
 	/** @var FriendicaExtension */
 	protected $friendica;

src/Object/Api/Twitter/DirectMessage.php

@@ -29,9 +29,9 @@ class DirectMessage extends BaseDataTransferObject
 	protected $sender_screen_name = null;
 	/** @var string */
 	protected $recipient_screen_name = null;
-	/** @var User */
+	/** @var array */
 	protected $sender;
-	/** @var User */
+	/** @var array */
 	protected $recipient;
 	/** @var string|null */
 	protected $title;

src/Object/Api/Twitter/Media.php

@@ -31,7 +31,7 @@ class Media extends BaseDataTransferObject
 	protected $media_url;
 	/** @var string */
 	protected $media_url_https;
-	/** @var string */
+	/** @var array<string, array<string, mixed>> */
 	protected $sizes;
 	/** @var string */
 	protected $type;

src/Object/Api/Twitter/Mention.php

@@ -7,7 +7,6 @@
 
 namespace Friendica\Object\Api\Twitter;
 
-use Friendica\App\BaseURL;
 use Friendica\BaseDataTransferObject;
 
 /**
@@ -37,7 +36,7 @@ class Mention extends BaseDataTransferObject
 	 */
 	public function __construct(array $tag, array $contact, array $indices)
 	{
-		$this->id          = (string)($contact['id'] ?? 0);
+		$this->id          = (int)($contact['id'] ?? 0);
 		$this->id_str      = (string)($contact['id'] ?? 0);
 		$this->indices     = $indices;
 		$this->name        = $tag['name'];

src/Object/Api/Twitter/Status.php

@@ -45,11 +45,11 @@ class Status extends BaseDataTransferObject
 	protected $geo;
 	/** @var bool */
 	protected $favorited = false;
-	/** @var User */
+	/** @var array */
 	protected $user;
-	/** @var User */
+	/** @var array */
 	protected $friendica_author;
-	/** @var User */
+	/** @var array */
 	protected $friendica_owner;
 	/** @var bool */
 	protected $friendica_private;
@@ -67,9 +67,9 @@ class Status extends BaseDataTransferObject
 	protected $friendica_html;
 	/** @var int */
 	protected $friendica_comments;
-	/** @var Status|null */
+	/** @var array|null */
 	protected $retweeted_status = null;
-	/** @var Status|null */
+	/** @var array|null */
 	protected $quoted_status = null;
 	/** @var array */
 	protected $attachments;

src/Object/Log/ParsedLogLine.php

@@ -29,7 +29,7 @@ class ParsedLogLine
 	/** @var string */
 	public $message = null;
 
-	/** @var string */
+	/** @var string|null */
 	public $data = null;
 
 	/** @var string */

src/Object/Post.php

@@ -48,7 +48,7 @@ class Post
 	private $parent   = null;
 
 	/**
-	 * @var Thread
+	 * @var Thread|null
 	 */
 	private $thread       = null;
 	private $redirect_url = null;
@@ -70,7 +70,7 @@ class Post
 		$this->setTemplate('wall');
 		$this->toplevel = $this->getId() == $this->getDataValue('parent');
 
-		if (!empty(DI::userSession()->getUserIDForVisitorContactID($this->getDataValue('contact-id')))) {
+		if (DI::userSession()->getUserIDForVisitorContactID($this->getDataValue('contact-id')) !== 0) {
 			$this->visiting = true;
 		}
 
@@ -824,7 +824,7 @@ class Post
 	 * Get a child by its ID
 	 *
 	 * @param integer $id The child id
-	 * @return Thread|null Thread or NULL if not found
+	 * @return Post|null Post or NULL if not found
 	 */
 	public function getChild(int $id)
 	{

src/Object/Thread.php

@@ -77,8 +77,7 @@ class Thread
 				break;
 			default:
 				DI::logger()->info('[ERROR] Conversation::setMode : Unhandled mode ('. $mode .').');
-				return false;
-				break;
+				return;
 		}
 		$this->mode = $mode;
 	}