diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 6d197333a78f451f7c79d1e37cad3b23f0e4777b..359fd1bb6026fef83e5f28a23a61c000315356b5 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -2540,11 +2540,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
 
-		-
-			message: "#^Parameter \\#2 \\$arguments of method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Repository\\:\\:__call\\(\\) expects string, array given\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$key of method TYPO3\\\\CMS\\\\Extbase\\\\Property\\\\PropertyMappingConfiguration\\:\\:getConfigurationValue\\(\\) expects string, int given\\.$#"
 			count: 2
diff --git a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php
index 62e2b334b4f8615bde8d2cc1eef64b688faa1c09..66d6fa2534e51646d8f667bcfcfd5070ea80e964 100644
--- a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php
+++ b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php
@@ -24,9 +24,6 @@ use TYPO3\CMS\Extbase\Persistence\Repository;
  */
 class BackendUserGroupRepository extends Repository
 {
-    /**
-     * @var array Default order is by title ascending
-     */
     protected $defaultOrderings = [
         'title' => QueryInterface::ORDER_ASCENDING,
     ];
diff --git a/typo3/sysext/core/Classes/Utility/ClassNamingUtility.php b/typo3/sysext/core/Classes/Utility/ClassNamingUtility.php
index 3d45889abf45cc20e196b41f721487ebc47f6d5a..a377a52848f08dd57944be935203ab649da1cbb1 100644
--- a/typo3/sysext/core/Classes/Utility/ClassNamingUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ClassNamingUtility.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
 
 namespace TYPO3\CMS\Core\Utility;
 
+use TYPO3\CMS\Extbase\Persistence\RepositoryInterface;
+
 /**
  * Several functions related to naming and conversions of names
  * such as translation between Repository and Model names or
@@ -42,6 +44,10 @@ class ClassNamingUtility
      * Translates a repository name to an appropriate model name
      * e.g. Tx_Extbase_Domain_Repository_FooRepository to Tx_Extbase_Domain_Model_Foo
      * or \TYPO3\CMS\Extbase\Domain\Repository\FooRepository to \TYPO3\CMS\Extbase\Domain\Model\Foo
+     *
+     * @param class-string<RepositoryInterface> $repositoryName
+     *
+     * @return class-string
      */
     public static function translateRepositoryNameToModelName(string $repositoryName): string
     {
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Repository/ContentRepository.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Repository/ContentRepository.php
index 8f9f20129dca7589afbf3d32a79e44ef2c5dc9a2..285b143926107bb0cf029010a2beb1a3431fe76a 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Repository/ContentRepository.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Repository/ContentRepository.php
@@ -25,9 +25,6 @@ use TYPO3\CMS\Extbase\Persistence\Repository;
  */
 class ContentRepository extends Repository
 {
-    /**
-     * @var array
-     */
     protected $defaultOrderings = [
         'sorting' => QueryInterface::ORDER_ASCENDING,
     ];
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Repository/ContentRepository.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Repository/ContentRepository.php
index add89b9e4b5d70812ed998f275fcc0e9bd8747e9..af630b166d4f62d5bd3ebdd810db30f0ad11a662 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Repository/ContentRepository.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Repository/ContentRepository.php
@@ -25,9 +25,6 @@ use TYPO3\CMS\Extbase\Persistence\Repository;
  */
 class ContentRepository extends Repository
 {
-    /**
-     * @var array
-     */
     protected $defaultOrderings = [
         'sorting' => QueryInterface::ORDER_ASCENDING,
     ];
diff --git a/typo3/sysext/extbase/Classes/Persistence/Repository.php b/typo3/sysext/extbase/Classes/Persistence/Repository.php
index 7dc18b79e4f9a775d03897d69eff9d33d3e9c532..1a6e72f99bb4c269f588e2e6c9ce2a7d58833f02 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Repository.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Repository.php
@@ -32,18 +32,18 @@ class Repository implements RepositoryInterface, SingletonInterface
     protected $persistenceManager;
 
     /**
-     * @var string
+     * @var class-string
      */
     protected $objectType;
 
     /**
-     * @var array
+     * @var array<non-empty-string, QueryInterface::ORDER_*>
      */
     protected $defaultOrderings = [];
 
     /**
      * Override query settings created by extbase natively.
-     * Be careful if using this, see the comment on setDefaultQuerySettings() for more insights.
+     * Be careful if using this, see the comment on `setDefaultQuerySettings()` for more insights.
      *
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface
      */
@@ -169,7 +169,7 @@ class Repository implements RepositoryInterface, SingletonInterface
      * 'bar' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING
      * )
      *
-     * @param array<string,string> $defaultOrderings The property names to order by
+     * @param array<non-empty-string, QueryInterface::ORDER_*> $defaultOrderings The property names to order by
      */
     public function setDefaultOrderings(array $defaultOrderings)
     {
@@ -212,8 +212,8 @@ class Repository implements RepositoryInterface, SingletonInterface
     /**
      * Dispatches magic methods (findBy[Property]())
      *
-     * @param string $methodName The name of the magic method
-     * @param string $arguments The arguments of the magic method
+     * @param non-empty-string $methodName The name of the magic method
+     * @param array<int, mixed> $arguments The arguments of the magic method
      * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnsupportedMethodException
      * @return mixed
      */
@@ -248,7 +248,7 @@ class Repository implements RepositoryInterface, SingletonInterface
     /**
      * Returns the class name of this class.
      *
-     * @return string Class name of the repository.
+     * @return class-string<RepositoryInterface> Class name of the repository.
      */
     protected function getRepositoryClassName()
     {