diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 02e2f04ee25..b14b6d21783 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -58,6 +58,7 @@
     'no_leading_namespace_whitespace'     => true,
     'no_short_bool_cast'                  => true,
     'no_spaces_around_offset'             => true,
+    'no_superfluous_phpdoc_tags'          => ['allow_mixed' => true, 'remove_inheritdoc' => true],
     'no_unneeded_control_parentheses'     => true,
     'no_unused_imports'                   => true,
     'no_whitespace_before_comma_in_array' => true,
diff --git a/bundles/ApplicationLoggerBundle/src/ApplicationLogger.php b/bundles/ApplicationLoggerBundle/src/ApplicationLogger.php
index 874d5f16749..e71d7fce5fe 100644
--- a/bundles/ApplicationLoggerBundle/src/ApplicationLogger.php
+++ b/bundles/ApplicationLoggerBundle/src/ApplicationLogger.php
@@ -78,7 +78,6 @@ public function setComponent(string $component): void
     }
 
     /**
-     * @param FileObject|string $fileObject
      *
      * @deprecated
      *
@@ -89,7 +88,6 @@ public function setFileObject(FileObject|string $fileObject): void
     }
 
     /**
-     * @param \Pimcore\Model\Asset|int|\Pimcore\Model\Document|\Pimcore\Model\DataObject\AbstractObject $relatedObject
      *
      * @deprecated
      */
@@ -108,11 +106,6 @@ public function setRelatedObject(\Pimcore\Model\Asset|int|\Pimcore\Model\Documen
         }
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
     public function log($level, $message, array $context = []): void
     {
         if (!isset($context['component'])) {
@@ -165,7 +158,6 @@ public function log($level, $message, array $context = []): void
     /**
      * Resolve logging source
      *
-     * @return string
      */
     protected function resolveLoggingSource(): string
     {
@@ -229,81 +221,41 @@ protected function resolveLoggingSource(): string
         return $source;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
     public function emergency($message, array $context = []): void
     {
         $this->handleLog('emergency', $message, func_get_args());
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
     public function critical($message, array $context = []): void
     {
         $this->handleLog('critical', $message, func_get_args());
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
     public function error($message, array $context = []): void
     {
         $this->handleLog('error', $message, func_get_args());
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
     public function alert($message, array $context = []): void
     {
         $this->handleLog('alert', $message, func_get_args());
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
     public function warning($message, array $context = []): void
     {
         $this->handleLog('warning', $message, func_get_args());
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
     public function notice($message, array $context = []): void
     {
         $this->handleLog('notice', $message, func_get_args());
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
     public function info($message, array $context = []): void
     {
         $this->handleLog('info', $message, func_get_args());
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
     public function debug($message, array $context = []): void
     {
         $this->handleLog('debug', $message, func_get_args());
@@ -337,13 +289,6 @@ protected function handleLog(mixed $level, string $message, array $params): void
         $this->log($level, $message, $context);
     }
 
-    /**
-     * @param string $message
-     * @param \Throwable $exceptionObject
-     * @param string|null $priority
-     * @param \Pimcore\Model\DataObject\AbstractObject|null $relatedObject
-     * @param string|null $component
-     */
     public function logException(string $message, \Throwable $exceptionObject, ?string $priority = 'alert', \Pimcore\Model\DataObject\AbstractObject $relatedObject = null, string $component = null): void
     {
         if (is_null($priority)) {
diff --git a/bundles/ApplicationLoggerBundle/src/Controller/LogController.php b/bundles/ApplicationLoggerBundle/src/Controller/LogController.php
index 09d0de82a74..18dc3451f23 100644
--- a/bundles/ApplicationLoggerBundle/src/Controller/LogController.php
+++ b/bundles/ApplicationLoggerBundle/src/Controller/LogController.php
@@ -171,9 +171,7 @@ private function parseDateObject(?string $date, ?string $time): ?\DateTime
     /**
      * @Route("/log/priority-json", name="pimcore_admin_bundle_applicationlogger_log_priorityjson", methods={"GET"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function priorityJsonAction(Request $request): JsonResponse
     {
@@ -190,9 +188,7 @@ public function priorityJsonAction(Request $request): JsonResponse
     /**
      * @Route("/log/component-json", name="pimcore_admin_bundle_applicationlogger_log_componentjson", methods={"GET"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function componentJsonAction(Request $request): JsonResponse
     {
diff --git a/bundles/ApplicationLoggerBundle/src/FileObject.php b/bundles/ApplicationLoggerBundle/src/FileObject.php
index 9343b9d42c8..d467ebb53a2 100644
--- a/bundles/ApplicationLoggerBundle/src/FileObject.php
+++ b/bundles/ApplicationLoggerBundle/src/FileObject.php
@@ -27,10 +27,6 @@ final class FileObject
 
     protected string $data;
 
-    /**
-     * @param string $data
-     * @param string|null $filename
-     */
     public function __construct(string $data, string $filename = null)
     {
         $this->data = $data;
diff --git a/bundles/ApplicationLoggerBundle/src/Maintenance/LogArchiveTask.php b/bundles/ApplicationLoggerBundle/src/Maintenance/LogArchiveTask.php
index 4a94d9d147e..374b1e92918 100644
--- a/bundles/ApplicationLoggerBundle/src/Maintenance/LogArchiveTask.php
+++ b/bundles/ApplicationLoggerBundle/src/Maintenance/LogArchiveTask.php
@@ -43,9 +43,6 @@ public function __construct(Connection $db, Config $config, LoggerInterface $log
         $this->logger = $logger;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $db = $this->db;
diff --git a/bundles/ApplicationLoggerBundle/src/Maintenance/LogMailMaintenanceTask.php b/bundles/ApplicationLoggerBundle/src/Maintenance/LogMailMaintenanceTask.php
index fc99cd55c22..4bab5322f27 100644
--- a/bundles/ApplicationLoggerBundle/src/Maintenance/LogMailMaintenanceTask.php
+++ b/bundles/ApplicationLoggerBundle/src/Maintenance/LogMailMaintenanceTask.php
@@ -37,9 +37,6 @@ public function __construct(Connection $db, Config $config)
         $this->config = $config;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $db = $this->db;
diff --git a/bundles/CoreBundle/src/Command/Asset/GenerateChecksumCommand.php b/bundles/CoreBundle/src/Command/Asset/GenerateChecksumCommand.php
index 04e038039d0..ee88b250a6f 100644
--- a/bundles/CoreBundle/src/Command/Asset/GenerateChecksumCommand.php
+++ b/bundles/CoreBundle/src/Command/Asset/GenerateChecksumCommand.php
@@ -59,9 +59,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $conditionVariables = [];
diff --git a/bundles/CoreBundle/src/Command/Asset/RemoveCustomSettingCommand.php b/bundles/CoreBundle/src/Command/Asset/RemoveCustomSettingCommand.php
index 1f754848c9b..e502984bca1 100644
--- a/bundles/CoreBundle/src/Command/Asset/RemoveCustomSettingCommand.php
+++ b/bundles/CoreBundle/src/Command/Asset/RemoveCustomSettingCommand.php
@@ -54,9 +54,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $conditions = ['customSettings LIKE ?'];
diff --git a/bundles/CoreBundle/src/Command/Bundle/InstallCommand.php b/bundles/CoreBundle/src/Command/Bundle/InstallCommand.php
index 730182918d9..5117343ae6e 100644
--- a/bundles/CoreBundle/src/Command/Bundle/InstallCommand.php
+++ b/bundles/CoreBundle/src/Command/Bundle/InstallCommand.php
@@ -45,9 +45,6 @@ protected function configure(): void
         PostStateChange::configureStateChangeCommandOptions($this);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $bundle = $this->getBundle();
diff --git a/bundles/CoreBundle/src/Command/Bundle/ListCommand.php b/bundles/CoreBundle/src/Command/Bundle/ListCommand.php
index 48cf1d03f1f..0db20a3a60e 100644
--- a/bundles/CoreBundle/src/Command/Bundle/ListCommand.php
+++ b/bundles/CoreBundle/src/Command/Bundle/ListCommand.php
@@ -49,9 +49,6 @@ protected function configure(): void
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $details = $input->getOption('details');
diff --git a/bundles/CoreBundle/src/Command/Bundle/UninstallCommand.php b/bundles/CoreBundle/src/Command/Bundle/UninstallCommand.php
index 34349748d28..9b86ca383f8 100644
--- a/bundles/CoreBundle/src/Command/Bundle/UninstallCommand.php
+++ b/bundles/CoreBundle/src/Command/Bundle/UninstallCommand.php
@@ -44,9 +44,6 @@ protected function configure(): void
         PostStateChange::configureStateChangeCommandOptions($this);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $bundle = $this->getBundle();
diff --git a/bundles/CoreBundle/src/Command/CacheClearCommand.php b/bundles/CoreBundle/src/Command/CacheClearCommand.php
index e7d2aedbe46..bf78b4b2214 100644
--- a/bundles/CoreBundle/src/Command/CacheClearCommand.php
+++ b/bundles/CoreBundle/src/Command/CacheClearCommand.php
@@ -63,9 +63,6 @@ protected function configure(): void
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
diff --git a/bundles/CoreBundle/src/Command/CacheWarmingCommand.php b/bundles/CoreBundle/src/Command/CacheWarmingCommand.php
index 10e4f70e748..88a0989756e 100644
--- a/bundles/CoreBundle/src/Command/CacheWarmingCommand.php
+++ b/bundles/CoreBundle/src/Command/CacheWarmingCommand.php
@@ -100,9 +100,6 @@ protected function configure(): void
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('maintenance-mode')) {
@@ -162,11 +159,7 @@ protected function writeWarmingMessage(string $type, array $types, string $extra
     /**
      * A,B,C -> A, B or C (with an optional template for each item)
      *
-     * @param array $list
-     * @param string $glue
-     * @param string|null $template
      *
-     * @return string
      */
     protected function humanList(array $list, string $glue = 'or', string $template = null): string
     {
@@ -189,12 +182,7 @@ protected function humanList(array $list, string $glue = 'or', string $template
      * Get one of types, document, asset or object types, handle "all" value
      * and list input validation.
      *
-     * @param string $option
-     * @param string $property
-     * @param string $singular
-     * @param bool $fallback
      *
-     * @return mixed
      */
     protected function getArrayOption(string $option, string $property, string $singular, bool $fallback = false): mixed
     {
diff --git a/bundles/CoreBundle/src/Command/ClassesDefinitionsBuildCommand.php b/bundles/CoreBundle/src/Command/ClassesDefinitionsBuildCommand.php
index ddc0f937ba7..e7127d88071 100644
--- a/bundles/CoreBundle/src/Command/ClassesDefinitionsBuildCommand.php
+++ b/bundles/CoreBundle/src/Command/ClassesDefinitionsBuildCommand.php
@@ -48,9 +48,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $objectClassesFolders = array_unique([PIMCORE_CLASS_DEFINITION_DIRECTORY, PIMCORE_CUSTOM_CONFIGURATION_CLASS_DEFINITION_DIRECTORY]);
diff --git a/bundles/CoreBundle/src/Command/ClassesRebuildCommand.php b/bundles/CoreBundle/src/Command/ClassesRebuildCommand.php
index 39bed14f14c..15c843ddbe6 100644
--- a/bundles/CoreBundle/src/Command/ClassesRebuildCommand.php
+++ b/bundles/CoreBundle/src/Command/ClassesRebuildCommand.php
@@ -58,9 +58,6 @@ public function setClassDefinitionManager(ClassDefinitionManager $classDefinitio
         $this->classDefinitionManager = $classDefinitionManager;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('delete-classes')) {
diff --git a/bundles/CoreBundle/src/Command/Definition/Import/AbstractStructureImportCommand.php b/bundles/CoreBundle/src/Command/Definition/Import/AbstractStructureImportCommand.php
index 6dc8711892b..6d12288b59e 100644
--- a/bundles/CoreBundle/src/Command/Definition/Import/AbstractStructureImportCommand.php
+++ b/bundles/CoreBundle/src/Command/Definition/Import/AbstractStructureImportCommand.php
@@ -56,9 +56,6 @@ protected function configure(): void
         $this->configureDryRunOption();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $path = $this->getPath();
@@ -117,7 +114,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     /**
      * Validate and return path to JSON file
      *
-     * @return string
      */
     protected function getPath(): string
     {
@@ -132,7 +128,6 @@ protected function getPath(): string
     /**
      * Load JSON data from file
      *
-     * @param string $path
      *
      * @return string|false
      */
@@ -154,9 +149,7 @@ protected function getJson(string $path): bool|string
     /**
      * Ask for confirmation before overwriting
      *
-     * @param string $name
      *
-     * @return bool
      */
     protected function askConfirmation(string $name): bool
     {
@@ -177,44 +170,34 @@ protected function askConfirmation(string $name): bool
     /**
      * Get type
      *
-     * @return string
      */
     abstract protected function getType(): string;
 
     /**
      * Get definition name from filename (e.g. class_Customer_export.json -> Customer)
      *
-     * @param string $filename
      *
-     * @return string|null
      */
     abstract protected function getDefinitionName(string $filename): ?string;
 
     /**
      * Try to load definition by name
      *
-     * @param string $name
      *
-     * @return AbstractModel|null
      */
     abstract protected function loadDefinition(string $name): ?AbstractModel;
 
     /**
      * Create a new definition
      *
-     * @param string $name
      *
-     * @return AbstractModel|null
      */
     abstract protected function createDefinition(string $name): ?AbstractModel;
 
     /**
      * Process import
      *
-     * @param AbstractModel $definition
-     * @param string $json
      *
-     * @return bool
      */
     abstract protected function import(AbstractModel $definition, string $json): bool;
 }
diff --git a/bundles/CoreBundle/src/Command/Definition/Import/ClassCommand.php b/bundles/CoreBundle/src/Command/Definition/Import/ClassCommand.php
index 6faad855476..d7aeeef3c31 100644
--- a/bundles/CoreBundle/src/Command/Definition/Import/ClassCommand.php
+++ b/bundles/CoreBundle/src/Command/Definition/Import/ClassCommand.php
@@ -28,7 +28,6 @@ class ClassCommand extends AbstractStructureImportCommand
     /**
      * Get type
      *
-     * @return string
      */
     protected function getType(): string
     {
@@ -38,9 +37,7 @@ protected function getType(): string
     /**
      * Get definition name from filename (e.g. class_Customer_export.json -> Customer)
      *
-     * @param string $filename
      *
-     * @return string|null
      */
     protected function getDefinitionName(string $filename): ?string
     {
@@ -55,9 +52,7 @@ protected function getDefinitionName(string $filename): ?string
     /**
      * Try to load definition by name
      *
-     * @param string $name
      *
-     * @return AbstractModel|null
      */
     protected function loadDefinition(string $name): ?AbstractModel
     {
@@ -67,9 +62,7 @@ protected function loadDefinition(string $name): ?AbstractModel
     /**
      * Create a new definition
      *
-     * @param string $name
      *
-     * @return ClassDefinition
      */
     protected function createDefinition(string $name): ClassDefinition
     {
@@ -82,10 +75,7 @@ protected function createDefinition(string $name): ClassDefinition
     /**
      * Process import
      *
-     * @param AbstractModel $definition
-     * @param string $json
      *
-     * @return bool
      */
     protected function import(AbstractModel $definition, string $json): bool
     {
diff --git a/bundles/CoreBundle/src/Command/Definition/Import/CustomLayoutCommand.php b/bundles/CoreBundle/src/Command/Definition/Import/CustomLayoutCommand.php
index a8024665480..c75465b80ef 100644
--- a/bundles/CoreBundle/src/Command/Definition/Import/CustomLayoutCommand.php
+++ b/bundles/CoreBundle/src/Command/Definition/Import/CustomLayoutCommand.php
@@ -42,7 +42,6 @@ protected function configure(): void
     /**
      * Get type.
      *
-     * @return string
      */
     protected function getType(): string
     {
@@ -52,9 +51,7 @@ protected function getType(): string
     /**
      * Get definition name from filename (e.g. custom_definition_Customer_export.json -> Customer).
      *
-     * @param string $filename
      *
-     * @return string|null
      */
     protected function getDefinitionName(string $filename): ?string
     {
@@ -69,9 +66,7 @@ protected function getDefinitionName(string $filename): ?string
     /**
      * Try to load definition by name.
      *
-     * @param string $name
      *
-     * @return null|AbstractModel
      *
      * @throws \Exception
      */
@@ -98,12 +93,6 @@ protected function createDefinition(string $name): ?AbstractModel
         return null;
     }
 
-    /**
-     * @param AbstractModel $definition
-     * @param string|null $json
-     *
-     * @return bool
-     */
     protected function import(AbstractModel $definition, string $json = null): bool
     {
         if (!$definition instanceof CustomLayout) {
diff --git a/bundles/CoreBundle/src/Command/Definition/Import/FieldCollectionCommand.php b/bundles/CoreBundle/src/Command/Definition/Import/FieldCollectionCommand.php
index 46e57b1d619..c611d0048ab 100644
--- a/bundles/CoreBundle/src/Command/Definition/Import/FieldCollectionCommand.php
+++ b/bundles/CoreBundle/src/Command/Definition/Import/FieldCollectionCommand.php
@@ -28,7 +28,6 @@ class FieldCollectionCommand extends AbstractStructureImportCommand
     /**
      * Get type
      *
-     * @return string
      */
     protected function getType(): string
     {
@@ -38,9 +37,7 @@ protected function getType(): string
     /**
      * Get definition name from filename (e.g. class_Customer_export.json -> Customer)
      *
-     * @param string $filename
      *
-     * @return string|null
      */
     protected function getDefinitionName(string $filename): ?string
     {
@@ -55,9 +52,7 @@ protected function getDefinitionName(string $filename): ?string
     /**
      * Try to load definition by name
      *
-     * @param string $name
      *
-     * @return AbstractModel|null
      */
     protected function loadDefinition(string $name): ?AbstractModel
     {
@@ -67,9 +62,7 @@ protected function loadDefinition(string $name): ?AbstractModel
     /**
      * Create a new definition
      *
-     * @param string $name
      *
-     * @return Definition
      */
     protected function createDefinition(string $name): Definition
     {
@@ -82,10 +75,7 @@ protected function createDefinition(string $name): Definition
     /**
      * Process import
      *
-     * @param AbstractModel $definition
-     * @param string $json
      *
-     * @return bool
      */
     protected function import(AbstractModel $definition, string $json): bool
     {
diff --git a/bundles/CoreBundle/src/Command/Definition/Import/ObjectBrickCommand.php b/bundles/CoreBundle/src/Command/Definition/Import/ObjectBrickCommand.php
index 05a084a6f31..cb49ccad759 100644
--- a/bundles/CoreBundle/src/Command/Definition/Import/ObjectBrickCommand.php
+++ b/bundles/CoreBundle/src/Command/Definition/Import/ObjectBrickCommand.php
@@ -28,7 +28,6 @@ class ObjectBrickCommand extends AbstractStructureImportCommand
     /**
      * Get type
      *
-     * @return string
      */
     protected function getType(): string
     {
@@ -38,9 +37,7 @@ protected function getType(): string
     /**
      * Get definition name from filename (e.g. class_Customer_export.json -> Customer)
      *
-     * @param string $filename
      *
-     * @return string|null
      */
     protected function getDefinitionName(string $filename): ?string
     {
@@ -55,9 +52,7 @@ protected function getDefinitionName(string $filename): ?string
     /**
      * Try to load definition by name
      *
-     * @param string $name
      *
-     * @return AbstractModel|null
      */
     protected function loadDefinition(string $name): ?AbstractModel
     {
@@ -67,9 +62,7 @@ protected function loadDefinition(string $name): ?AbstractModel
     /**
      * Create a new definition
      *
-     * @param string $name
      *
-     * @return Definition
      */
     protected function createDefinition(string $name): Definition
     {
@@ -82,10 +75,7 @@ protected function createDefinition(string $name): Definition
     /**
      * Process import
      *
-     * @param AbstractModel $definition
-     * @param string $json
      *
-     * @return bool
      */
     protected function import(AbstractModel $definition, string $json): bool
     {
diff --git a/bundles/CoreBundle/src/Command/DeleteClassificationStoreCommand.php b/bundles/CoreBundle/src/Command/DeleteClassificationStoreCommand.php
index d9f7f05d553..0996b8fd627 100644
--- a/bundles/CoreBundle/src/Command/DeleteClassificationStoreCommand.php
+++ b/bundles/CoreBundle/src/Command/DeleteClassificationStoreCommand.php
@@ -38,9 +38,6 @@ protected function configure(): void
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $storeId = $input->getArgument('storeId');
diff --git a/bundles/CoreBundle/src/Command/DeleteUnusedLocaleDataCommand.php b/bundles/CoreBundle/src/Command/DeleteUnusedLocaleDataCommand.php
index efe7110e361..870abc628da 100644
--- a/bundles/CoreBundle/src/Command/DeleteUnusedLocaleDataCommand.php
+++ b/bundles/CoreBundle/src/Command/DeleteUnusedLocaleDataCommand.php
@@ -47,9 +47,6 @@ protected function configure(): void
         $this->configureDryRunOption('Just output the delete localized queries to be executed.');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $db = Db::get();
diff --git a/bundles/CoreBundle/src/Command/Document/GeneratePagePreviews.php b/bundles/CoreBundle/src/Command/Document/GeneratePagePreviews.php
index 4cb261cd711..f8c36bbb647 100644
--- a/bundles/CoreBundle/src/Command/Document/GeneratePagePreviews.php
+++ b/bundles/CoreBundle/src/Command/Document/GeneratePagePreviews.php
@@ -30,9 +30,6 @@
  */
 class GeneratePagePreviews extends AbstractCommand
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function configure(): void
     {
         $this
@@ -94,9 +91,6 @@ protected function fetchItems(InputInterface $input): Document\Listing
         return $docs;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $hostUrl = $input->getOption('urlPrefix');
diff --git a/bundles/CoreBundle/src/Command/EmailLogsCleanupCommand.php b/bundles/CoreBundle/src/Command/EmailLogsCleanupCommand.php
index 34a9b4d2e67..089fd301634 100644
--- a/bundles/CoreBundle/src/Command/EmailLogsCleanupCommand.php
+++ b/bundles/CoreBundle/src/Command/EmailLogsCleanupCommand.php
@@ -41,9 +41,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $daysAgo = $input->getOption('older-than-days');
diff --git a/bundles/CoreBundle/src/Command/GenerateStaticPagesCommand.php b/bundles/CoreBundle/src/Command/GenerateStaticPagesCommand.php
index ac8ddbb35b3..3289dcd7b4b 100644
--- a/bundles/CoreBundle/src/Command/GenerateStaticPagesCommand.php
+++ b/bundles/CoreBundle/src/Command/GenerateStaticPagesCommand.php
@@ -48,9 +48,6 @@ protected function configure(): void
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $path = $input->getOption('path');
diff --git a/bundles/CoreBundle/src/Command/InternalMigrationHelpersCommand.php b/bundles/CoreBundle/src/Command/InternalMigrationHelpersCommand.php
index 563c4552d74..a7844970f5a 100644
--- a/bundles/CoreBundle/src/Command/InternalMigrationHelpersCommand.php
+++ b/bundles/CoreBundle/src/Command/InternalMigrationHelpersCommand.php
@@ -47,9 +47,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('is-installed')) {
diff --git a/bundles/CoreBundle/src/Command/InternalModelDaoMappingGeneratorCommand.php b/bundles/CoreBundle/src/Command/InternalModelDaoMappingGeneratorCommand.php
index 291c9b853fa..dc13d8ae04f 100644
--- a/bundles/CoreBundle/src/Command/InternalModelDaoMappingGeneratorCommand.php
+++ b/bundles/CoreBundle/src/Command/InternalModelDaoMappingGeneratorCommand.php
@@ -36,9 +36,6 @@ protected function configure(): void
             ->setDescription('For internal use only');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $finder = new Finder();
diff --git a/bundles/CoreBundle/src/Command/InternalUnicodeCldrLanguageTerritoryGeneratorCommand.php b/bundles/CoreBundle/src/Command/InternalUnicodeCldrLanguageTerritoryGeneratorCommand.php
index 603ea7301cb..2ee2cecb3af 100644
--- a/bundles/CoreBundle/src/Command/InternalUnicodeCldrLanguageTerritoryGeneratorCommand.php
+++ b/bundles/CoreBundle/src/Command/InternalUnicodeCldrLanguageTerritoryGeneratorCommand.php
@@ -40,9 +40,6 @@ protected function configure(): void
             ->setDescription('For internal use only');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $source = 'https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/supplementalData.xml';
diff --git a/bundles/CoreBundle/src/Command/LowQualityImagePreviewCommand.php b/bundles/CoreBundle/src/Command/LowQualityImagePreviewCommand.php
index b82ce679e8d..4ed1bbd0e28 100644
--- a/bundles/CoreBundle/src/Command/LowQualityImagePreviewCommand.php
+++ b/bundles/CoreBundle/src/Command/LowQualityImagePreviewCommand.php
@@ -62,9 +62,6 @@ protected function configure(): void
             ->addOption('generator', 'g', InputOption::VALUE_OPTIONAL, 'Force a generator, either `svg` or `imagick`');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $conditionVariables = [];
diff --git a/bundles/CoreBundle/src/Command/MaintenanceCommand.php b/bundles/CoreBundle/src/Command/MaintenanceCommand.php
index 4f32f5aa2bd..78dead0ff02 100644
--- a/bundles/CoreBundle/src/Command/MaintenanceCommand.php
+++ b/bundles/CoreBundle/src/Command/MaintenanceCommand.php
@@ -63,9 +63,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $validJobs = $this->getArrayOptionValue($input, 'job');
diff --git a/bundles/CoreBundle/src/Command/MaintenanceModeCommand.php b/bundles/CoreBundle/src/Command/MaintenanceModeCommand.php
index 4863ef070cb..a06148fec5d 100644
--- a/bundles/CoreBundle/src/Command/MaintenanceModeCommand.php
+++ b/bundles/CoreBundle/src/Command/MaintenanceModeCommand.php
@@ -28,9 +28,6 @@
  */
 class MaintenanceModeCommand extends AbstractCommand
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function configure(): void
     {
         $this
@@ -41,9 +38,6 @@ protected function configure(): void
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function initialize(InputInterface $input, OutputInterface $output): void
     {
         $input->setOption('ignore-maintenance-mode', true);
@@ -51,7 +45,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @throws Exception
      */
diff --git a/bundles/CoreBundle/src/Command/Migrate/StorageCommand.php b/bundles/CoreBundle/src/Command/Migrate/StorageCommand.php
index b2467e0b324..93eab6966ff 100644
--- a/bundles/CoreBundle/src/Command/Migrate/StorageCommand.php
+++ b/bundles/CoreBundle/src/Command/Migrate/StorageCommand.php
@@ -46,9 +46,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $storages = $input->getArgument('storage');
diff --git a/bundles/CoreBundle/src/Command/Migrate/ThumbnailsFolderStructureCommand.php b/bundles/CoreBundle/src/Command/Migrate/ThumbnailsFolderStructureCommand.php
index d758e0dfac5..8a8e5b454be 100644
--- a/bundles/CoreBundle/src/Command/Migrate/ThumbnailsFolderStructureCommand.php
+++ b/bundles/CoreBundle/src/Command/Migrate/ThumbnailsFolderStructureCommand.php
@@ -36,9 +36,6 @@ protected function configure(): void
             ->setDescription('Change thumbnail folder structure to <asset storage>/<path to asset>/<asset id>/image-thumb__<asset id>__<thumbnail name>/<asset filename> instead of <asset storage>/<path to asset>/image-thumb__<asset id>__<thumbnail name>/<asset filename>');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $thumbnailStorage = Storage::get('thumbnail');
diff --git a/bundles/CoreBundle/src/Command/MysqlToolsCommand.php b/bundles/CoreBundle/src/Command/MysqlToolsCommand.php
index f1e67f2f616..2458d3f0e65 100644
--- a/bundles/CoreBundle/src/Command/MysqlToolsCommand.php
+++ b/bundles/CoreBundle/src/Command/MysqlToolsCommand.php
@@ -41,9 +41,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         // display error message
diff --git a/bundles/CoreBundle/src/Command/OptimizeImageThumbnailsCommand.php b/bundles/CoreBundle/src/Command/OptimizeImageThumbnailsCommand.php
index 4e931d46f69..34f3cd80e61 100644
--- a/bundles/CoreBundle/src/Command/OptimizeImageThumbnailsCommand.php
+++ b/bundles/CoreBundle/src/Command/OptimizeImageThumbnailsCommand.php
@@ -41,9 +41,6 @@ protected function configure(): void
             ->setDescription('Optimize filesize of all thumbnails');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $storage = Storage::get('thumbnail');
diff --git a/bundles/CoreBundle/src/Command/RecyclebinCleanupCommand.php b/bundles/CoreBundle/src/Command/RecyclebinCleanupCommand.php
index 7b6b15abe3e..c1034d74ee3 100644
--- a/bundles/CoreBundle/src/Command/RecyclebinCleanupCommand.php
+++ b/bundles/CoreBundle/src/Command/RecyclebinCleanupCommand.php
@@ -41,9 +41,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $daysAgo = $input->getOption('older-than-days');
diff --git a/bundles/CoreBundle/src/Command/RequirementsCheckCommand.php b/bundles/CoreBundle/src/Command/RequirementsCheckCommand.php
index 8436af3359c..0c65bea4cf8 100644
--- a/bundles/CoreBundle/src/Command/RequirementsCheckCommand.php
+++ b/bundles/CoreBundle/src/Command/RequirementsCheckCommand.php
@@ -31,9 +31,6 @@ class RequirementsCheckCommand extends AbstractCommand
     /** @var int[] $levelsToDisplay */
     protected array $levelsToDisplay = [];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function configure(): void
     {
         $this
@@ -43,9 +40,6 @@ protected function configure(): void
             ->addOption('min-level', 'l', InputOption::VALUE_OPTIONAL, "Minimum status level to report: 'warning' or 'error'");
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         switch ($input->getOption('min-level')) {
diff --git a/bundles/CoreBundle/src/Command/ResetPasswordCommand.php b/bundles/CoreBundle/src/Command/ResetPasswordCommand.php
index 7ea5e72c03c..b2df10ba3e7 100644
--- a/bundles/CoreBundle/src/Command/ResetPasswordCommand.php
+++ b/bundles/CoreBundle/src/Command/ResetPasswordCommand.php
@@ -50,9 +50,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $userArgument = $input->getArgument('user');
diff --git a/bundles/CoreBundle/src/Command/ThumbnailsClearCommand.php b/bundles/CoreBundle/src/Command/ThumbnailsClearCommand.php
index b7b4d979af6..606384ff3a8 100644
--- a/bundles/CoreBundle/src/Command/ThumbnailsClearCommand.php
+++ b/bundles/CoreBundle/src/Command/ThumbnailsClearCommand.php
@@ -46,9 +46,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $possibleOptions = ['image', 'video'];
diff --git a/bundles/CoreBundle/src/Command/WorkflowDumpCommand.php b/bundles/CoreBundle/src/Command/WorkflowDumpCommand.php
index 28971de54ac..758e7070027 100644
--- a/bundles/CoreBundle/src/Command/WorkflowDumpCommand.php
+++ b/bundles/CoreBundle/src/Command/WorkflowDumpCommand.php
@@ -32,9 +32,6 @@ class WorkflowDumpCommand extends AbstractCommand
 {
     protected static $defaultName = 'pimcore:workflow:dump';
 
-    /**
-     * {@inheritdoc}
-     */
     protected function configure(): void
     {
         $this
@@ -54,9 +51,6 @@ protected function configure(): void
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $container = $this->getApplication()->getKernel()->getContainer();
diff --git a/bundles/CoreBundle/src/DependencyInjection/Compiler/AreabrickPass.php b/bundles/CoreBundle/src/DependencyInjection/Compiler/AreabrickPass.php
index 9e3d6f8f96b..c5d257a68ad 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Compiler/AreabrickPass.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Compiler/AreabrickPass.php
@@ -43,9 +43,6 @@ public function __construct()
         $this->inflector = InflectorFactory::create()->build();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container): void
     {
         $config = $container->getParameter('pimcore.config');
@@ -104,12 +101,7 @@ public function process(ContainerBuilder $container): void
      *  - MyBundle\Document\Areabrick\Foo
      *  - MyBundle\Document\Areabrick\Foo\Bar\Baz
      *
-     * @param ContainerBuilder $container
-     * @param Definition $areaManagerDefinition
-     * @param array $locatorMapping
-     * @param array $excludedClasses
      *
-     * @return array
      */
     protected function autoloadAreabricks(
         ContainerBuilder $container,
@@ -172,9 +164,6 @@ private function handleEditableRendererCall(Definition $definition): void
     /**
      * Adds setContainer() call to bricks implementing ContainerAwareInterface
      *
-     * @param ContainerBuilder $container
-     * @param Definition $definition
-     * @param \ReflectionClass|null $reflector
      */
     protected function handleContainerAwareDefinition(ContainerBuilder $container, Definition $definition, \ReflectionClass $reflector = null): void
     {
@@ -190,12 +179,7 @@ protected function handleContainerAwareDefinition(ContainerBuilder $container, D
     /**
      * Look for classes implementing AreabrickInterface in each bundle's Document\Areabrick sub-namespace
      *
-     * @param ContainerBuilder $container
-     * @param string $name
-     * @param array $metadata
-     * @param array $excludedClasses
      *
-     * @return array
      */
     protected function findBundleBricks(ContainerBuilder $container, string $name, array $metadata, array $excludedClasses = []): array
     {
@@ -262,9 +246,7 @@ protected function findBundleBricks(ContainerBuilder $container, string $name, a
     /**
      * GalleryTeaserRow -> gallery-teaser-row
      *
-     * @param \ReflectionClass $reflector
      *
-     * @return string
      */
     protected function generateBrickId(\ReflectionClass $reflector): string
     {
@@ -280,11 +262,7 @@ protected function generateBrickId(\ReflectionClass $reflector): string
      *  - MyBundle\Document\Areabrick\Foo         -> my.area.brick.foo
      *  - MyBundle\Document\Areabrick\Foo\Bar\Baz -> my.area.brick.foo.bar.baz
      *
-     * @param string $bundleName
-     * @param string $subNamespace
-     * @param string $className
      *
-     * @return string
      */
     protected function generateServiceId(string $bundleName, string $subNamespace, string $className): string
     {
diff --git a/bundles/CoreBundle/src/DependencyInjection/Compiler/LongRunningHelperPass.php b/bundles/CoreBundle/src/DependencyInjection/Compiler/LongRunningHelperPass.php
index e6ebbf96fbb..c135c1c4ab6 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Compiler/LongRunningHelperPass.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Compiler/LongRunningHelperPass.php
@@ -29,9 +29,6 @@
  */
 final class LongRunningHelperPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container): void
     {
         $helperDefinition = $container->getDefinition(LongRunningHelper::class);
diff --git a/bundles/CoreBundle/src/DependencyInjection/Compiler/NavigationRendererPass.php b/bundles/CoreBundle/src/DependencyInjection/Compiler/NavigationRendererPass.php
index 4848f8afdab..04c0aa9a975 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Compiler/NavigationRendererPass.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Compiler/NavigationRendererPass.php
@@ -29,9 +29,6 @@
  */
 final class NavigationRendererPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container): void
     {
         $taggedServices = $container->findTaggedServiceIds('pimcore.navigation.renderer');
diff --git a/bundles/CoreBundle/src/DependencyInjection/Compiler/ProfilerAliasPass.php b/bundles/CoreBundle/src/DependencyInjection/Compiler/ProfilerAliasPass.php
index c01924aebb7..babf8cad49a 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Compiler/ProfilerAliasPass.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Compiler/ProfilerAliasPass.php
@@ -25,9 +25,6 @@
  */
 final class ProfilerAliasPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('profiler')) {
diff --git a/bundles/CoreBundle/src/DependencyInjection/Compiler/RegisterImageOptimizersPass.php b/bundles/CoreBundle/src/DependencyInjection/Compiler/RegisterImageOptimizersPass.php
index 393022ba630..78cd096e210 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Compiler/RegisterImageOptimizersPass.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Compiler/RegisterImageOptimizersPass.php
@@ -26,9 +26,6 @@
  */
 final class RegisterImageOptimizersPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition(Optimizer::class)) {
diff --git a/bundles/CoreBundle/src/DependencyInjection/Compiler/RegisterMaintenanceTaskPass.php b/bundles/CoreBundle/src/DependencyInjection/Compiler/RegisterMaintenanceTaskPass.php
index 59e4d178cf0..82b7d29cf94 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Compiler/RegisterMaintenanceTaskPass.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Compiler/RegisterMaintenanceTaskPass.php
@@ -26,9 +26,6 @@
  */
 final class RegisterMaintenanceTaskPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition(Executor::class)) {
diff --git a/bundles/CoreBundle/src/DependencyInjection/Compiler/RoutingLoaderPass.php b/bundles/CoreBundle/src/DependencyInjection/Compiler/RoutingLoaderPass.php
index 627b8b89554..67ed77c3eba 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Compiler/RoutingLoaderPass.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Compiler/RoutingLoaderPass.php
@@ -30,8 +30,6 @@ final class RoutingLoaderPass implements CompilerPassInterface
 {
     /**
      * Replace Annotated Routing loader with your implementation to normalizes autogenerated admin routes
-     *
-     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container): void
     {
diff --git a/bundles/CoreBundle/src/DependencyInjection/Compiler/WorkflowPass.php b/bundles/CoreBundle/src/DependencyInjection/Compiler/WorkflowPass.php
index bf7f85a568f..d5b6b5db7d1 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Compiler/WorkflowPass.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Compiler/WorkflowPass.php
@@ -36,9 +36,6 @@
  */
 final class WorkflowPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader(
diff --git a/bundles/CoreBundle/src/DependencyInjection/Configuration.php b/bundles/CoreBundle/src/DependencyInjection/Configuration.php
index 8fa52b3c63c..ebaae3c705f 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Configuration.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Configuration.php
@@ -41,9 +41,6 @@ public function __construct()
         $this->placeholders = [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('pimcore');
diff --git a/bundles/CoreBundle/src/DependencyInjection/PimcoreCoreExtension.php b/bundles/CoreBundle/src/DependencyInjection/PimcoreCoreExtension.php
index fdd9192e222..8942e3e1214 100644
--- a/bundles/CoreBundle/src/DependencyInjection/PimcoreCoreExtension.php
+++ b/bundles/CoreBundle/src/DependencyInjection/PimcoreCoreExtension.php
@@ -41,9 +41,6 @@ public function getAlias(): string
         return 'pimcore';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function loadInternal(array $config, ContainerBuilder $container): void
     {
         // on container build the shutdown handler shouldn't be called
@@ -251,8 +248,6 @@ private function addContextRoutes(ContainerBuilder $container, array $config): v
 
     /**
      * Allows us to prepend/modify configurations of different extensions
-     *
-     * {@inheritdoc}
      */
     public function prepend(ContainerBuilder $container): void
     {
diff --git a/bundles/CoreBundle/src/EventListener/DumpTranslationEntriesListener.php b/bundles/CoreBundle/src/EventListener/DumpTranslationEntriesListener.php
index 1abaf1cfd9d..0fb8385b7df 100644
--- a/bundles/CoreBundle/src/EventListener/DumpTranslationEntriesListener.php
+++ b/bundles/CoreBundle/src/EventListener/DumpTranslationEntriesListener.php
@@ -36,9 +36,6 @@ public function __construct(TranslationEntriesDumper $dumper)
         $this->dumper = $dumper;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/ElementTagsListener.php b/bundles/CoreBundle/src/EventListener/ElementTagsListener.php
index 09b64e84652..91bb69a318b 100644
--- a/bundles/CoreBundle/src/EventListener/ElementTagsListener.php
+++ b/bundles/CoreBundle/src/EventListener/ElementTagsListener.php
@@ -29,9 +29,6 @@
  */
 class ElementTagsListener implements EventSubscriberInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/EventedControllerListener.php b/bundles/CoreBundle/src/EventListener/EventedControllerListener.php
index 713f1837395..ca77e61513a 100644
--- a/bundles/CoreBundle/src/EventListener/EventedControllerListener.php
+++ b/bundles/CoreBundle/src/EventListener/EventedControllerListener.php
@@ -28,9 +28,6 @@
  */
 class EventedControllerListener implements EventSubscriberInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/BlockStateListener.php b/bundles/CoreBundle/src/EventListener/Frontend/BlockStateListener.php
index 3489838f0bc..2b523ad5241 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/BlockStateListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/BlockStateListener.php
@@ -40,9 +40,6 @@ public function __construct(protected BlockStateStack $blockStateStack)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/ContentTemplateListener.php b/bundles/CoreBundle/src/EventListener/Frontend/ContentTemplateListener.php
index 8701aa86e6d..6198a38dd75 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/ContentTemplateListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/ContentTemplateListener.php
@@ -42,9 +42,6 @@ public function __construct(protected TemplateResolver $templateResolver, protec
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -57,7 +54,6 @@ public static function getSubscribedEvents(): array
      * the router or from the sub-action renderer and takes precedence over the auto-resolved and manually configured
      * template.
      *
-     * @param ViewEvent $event
      */
     public function onKernelView(ViewEvent $event): void
     {
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/DocumentFallbackListener.php b/bundles/CoreBundle/src/EventListener/Frontend/DocumentFallbackListener.php
index 51e0fb33cd2..3ef7e83ec7c 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/DocumentFallbackListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/DocumentFallbackListener.php
@@ -68,9 +68,6 @@ protected function configureOptions(OptionsResolver $optionsResolver): void
         $optionsResolver->setAllowedTypes('nearestDocumentTypes', 'array');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -85,7 +82,6 @@ public static function getSubscribedEvents(): array
     /**
      * Finds the nearest document for the current request if the routing/document router didn't find one (e.g. static routes)
      *
-     * @param RequestEvent $event
      */
     public function onKernelRequest(RequestEvent $event): void
     {
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/DocumentRendererListener.php b/bundles/CoreBundle/src/EventListener/Frontend/DocumentRendererListener.php
index 8a28f2c8006..9e1005f9407 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/DocumentRendererListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/DocumentRendererListener.php
@@ -31,9 +31,6 @@ public function __construct(protected ContainerService $containerService)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/EditmodeListener.php b/bundles/CoreBundle/src/EventListener/Frontend/EditmodeListener.php
index 36390ab9a2b..6c080330854 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/EditmodeListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/EditmodeListener.php
@@ -57,9 +57,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -141,8 +138,6 @@ protected function contentTypeMatches(Response $response): bool
     /**
      * Inject editmode assets into response HTML
      *
-     * @param Document $document
-     * @param Response $response
      */
     protected function addEditmodeAssets(Document $document, Response $response): void
     {
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/ElementListener.php b/bundles/CoreBundle/src/EventListener/Frontend/ElementListener.php
index 523ca489286..bb695609727 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/ElementListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/ElementListener.php
@@ -53,9 +53,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/FullPageCacheListener.php b/bundles/CoreBundle/src/EventListener/Frontend/FullPageCacheListener.php
index 4655d7c51af..5c49b656ece 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/FullPageCacheListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/FullPageCacheListener.php
@@ -59,11 +59,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @param string|null $reason
-     *
-     * @return bool
-     */
     public function disable(string $reason = null): bool
     {
         if ($reason) {
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/GlobalTemplateVariablesListener.php b/bundles/CoreBundle/src/EventListener/Frontend/GlobalTemplateVariablesListener.php
index 3fc915f35cc..dde7fcb9012 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/GlobalTemplateVariablesListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/GlobalTemplateVariablesListener.php
@@ -46,9 +46,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/HardlinkCanonicalListener.php b/bundles/CoreBundle/src/EventListener/Frontend/HardlinkCanonicalListener.php
index e20031a537a..274032ffc0b 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/HardlinkCanonicalListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/HardlinkCanonicalListener.php
@@ -43,9 +43,6 @@ public function __construct(protected DocumentResolver $documentResolver)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/LocaleListener.php b/bundles/CoreBundle/src/EventListener/Frontend/LocaleListener.php
index eee1f2e77a2..35c2aca543d 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/LocaleListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/LocaleListener.php
@@ -31,9 +31,6 @@ class LocaleListener implements EventSubscriberInterface
 
     protected ?string $lastLocale = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/OutputTimestampListener.php b/bundles/CoreBundle/src/EventListener/Frontend/OutputTimestampListener.php
index 26a1643b8f3..51e78da61a1 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/OutputTimestampListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/OutputTimestampListener.php
@@ -34,9 +34,6 @@ public function __construct(protected OutputTimestampResolver $outputTimestampRe
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/RoutingListener.php b/bundles/CoreBundle/src/EventListener/Frontend/RoutingListener.php
index 90cf755a6b1..fef929cb252 100644
--- a/bundles/CoreBundle/src/EventListener/Frontend/RoutingListener.php
+++ b/bundles/CoreBundle/src/EventListener/Frontend/RoutingListener.php
@@ -50,9 +50,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -101,10 +98,7 @@ public function onKernelRequest(RequestEvent $event): void
     /**
      * Initialize Site
      *
-     * @param Request $request
-     * @param string $path
      *
-     * @return string
      */
     protected function resolveSite(Request $request, string $path): string
     {
@@ -152,8 +146,6 @@ protected function handleFrontControllerRedirect(RequestEvent $event, string $pa
     /**
      * Redirect to the main domain if specified
      *
-     * @param RequestEvent $event
-     * @param bool $adminContext
      */
     protected function handleMainDomainRedirect(RequestEvent $event, bool $adminContext = false): void
     {
diff --git a/bundles/CoreBundle/src/EventListener/MessengerClearRuntimeCacheListener.php b/bundles/CoreBundle/src/EventListener/MessengerClearRuntimeCacheListener.php
index d2ed8782c10..4da69a7d221 100644
--- a/bundles/CoreBundle/src/EventListener/MessengerClearRuntimeCacheListener.php
+++ b/bundles/CoreBundle/src/EventListener/MessengerClearRuntimeCacheListener.php
@@ -26,9 +26,6 @@
  */
 class MessengerClearRuntimeCacheListener implements EventSubscriberInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/PimcoreContextListener.php b/bundles/CoreBundle/src/EventListener/PimcoreContextListener.php
index 5871ba9cb8c..0e93ac91438 100644
--- a/bundles/CoreBundle/src/EventListener/PimcoreContextListener.php
+++ b/bundles/CoreBundle/src/EventListener/PimcoreContextListener.php
@@ -42,9 +42,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -79,8 +76,6 @@ public function onKernelRequest(RequestEvent $event): void
     /**
      * Do context specific initialization
      *
-     * @param string $context
-     * @param Request $request
      */
     protected function initializeContext(string $context, Request $request): void
     {
diff --git a/bundles/CoreBundle/src/EventListener/ResponseExceptionListener.php b/bundles/CoreBundle/src/EventListener/ResponseExceptionListener.php
index abff9046f69..47e2a1d6274 100644
--- a/bundles/CoreBundle/src/EventListener/ResponseExceptionListener.php
+++ b/bundles/CoreBundle/src/EventListener/ResponseExceptionListener.php
@@ -50,9 +50,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/ResponseHeaderListener.php b/bundles/CoreBundle/src/EventListener/ResponseHeaderListener.php
index 5ce13055019..891808cb032 100644
--- a/bundles/CoreBundle/src/EventListener/ResponseHeaderListener.php
+++ b/bundles/CoreBundle/src/EventListener/ResponseHeaderListener.php
@@ -33,9 +33,6 @@ public function __construct(private ResponseHeaderResolver $responseHeaderResolv
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/ResponseStackListener.php b/bundles/CoreBundle/src/EventListener/ResponseStackListener.php
index fec83d0e761..42ad3d7054e 100644
--- a/bundles/CoreBundle/src/EventListener/ResponseStackListener.php
+++ b/bundles/CoreBundle/src/EventListener/ResponseStackListener.php
@@ -31,9 +31,6 @@ public function __construct(private ResponseStack $responseStack)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/Traits/PimcoreContextAwareTrait.php b/bundles/CoreBundle/src/EventListener/Traits/PimcoreContextAwareTrait.php
index 9691ae30052..428d204ba38 100644
--- a/bundles/CoreBundle/src/EventListener/Traits/PimcoreContextAwareTrait.php
+++ b/bundles/CoreBundle/src/EventListener/Traits/PimcoreContextAwareTrait.php
@@ -37,10 +37,7 @@ public function setPimcoreContextResolver(PimcoreContextResolver $contextResolve
     /**
      * Check if the request matches the given pimcore context (e.g. admin)
      *
-     * @param Request $request
-     * @param array|string $context
      *
-     * @return bool
      */
     protected function matchesPimcoreContext(Request $request, array|string $context): bool
     {
diff --git a/bundles/CoreBundle/src/EventListener/Traits/StaticPageContextAwareTrait.php b/bundles/CoreBundle/src/EventListener/Traits/StaticPageContextAwareTrait.php
index 691dfd91b66..2bbe11f549c 100644
--- a/bundles/CoreBundle/src/EventListener/Traits/StaticPageContextAwareTrait.php
+++ b/bundles/CoreBundle/src/EventListener/Traits/StaticPageContextAwareTrait.php
@@ -36,9 +36,7 @@ public function setStaticPageResolver(StaticPageResolver $staticPageResolver): v
     /**
      * Check if the request has static page context
      *
-     * @param Request $request
      *
-     * @return bool
      */
     protected function matchesStaticPageContext(Request $request): bool
     {
diff --git a/bundles/CoreBundle/src/EventListener/TranslationDebugListener.php b/bundles/CoreBundle/src/EventListener/TranslationDebugListener.php
index abb9023562c..7e23f4d1836 100644
--- a/bundles/CoreBundle/src/EventListener/TranslationDebugListener.php
+++ b/bundles/CoreBundle/src/EventListener/TranslationDebugListener.php
@@ -34,9 +34,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/WebDebugToolbarListener.php b/bundles/CoreBundle/src/EventListener/WebDebugToolbarListener.php
index e0f9d9a943c..6862542c566 100644
--- a/bundles/CoreBundle/src/EventListener/WebDebugToolbarListener.php
+++ b/bundles/CoreBundle/src/EventListener/WebDebugToolbarListener.php
@@ -43,9 +43,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/CoreBundle/src/EventListener/WorkflowManagementListener.php b/bundles/CoreBundle/src/EventListener/WorkflowManagementListener.php
index 0c9d9b2a75f..18ca9688ca0 100644
--- a/bundles/CoreBundle/src/EventListener/WorkflowManagementListener.php
+++ b/bundles/CoreBundle/src/EventListener/WorkflowManagementListener.php
@@ -43,9 +43,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -85,7 +82,6 @@ public function onElementPostAdd(ElementEventInterface $e): void
     /**
      * Cleanup status information on element delete
      *
-     * @param ElementEventInterface $e
      */
     public function onElementPostDelete(ElementEventInterface $e): void
     {
diff --git a/bundles/CoreBundle/src/PimcoreCoreBundle.php b/bundles/CoreBundle/src/PimcoreCoreBundle.php
index 185337bbaa1..e0795eb7dec 100644
--- a/bundles/CoreBundle/src/PimcoreCoreBundle.php
+++ b/bundles/CoreBundle/src/PimcoreCoreBundle.php
@@ -65,9 +65,6 @@ public function getContainerExtension(): ?ExtensionInterface
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new AreabrickPass());
diff --git a/bundles/CoreBundle/src/Request/ParamResolver/DataObjectParamResolver.php b/bundles/CoreBundle/src/Request/ParamResolver/DataObjectParamResolver.php
index 61ae96c26a1..51cb35f94a4 100644
--- a/bundles/CoreBundle/src/Request/ParamResolver/DataObjectParamResolver.php
+++ b/bundles/CoreBundle/src/Request/ParamResolver/DataObjectParamResolver.php
@@ -31,7 +31,7 @@
 class DataObjectParamResolver implements ValueResolverInterface
 {
     /**
-     * {@inheritdoc}
+     *
      *
      * @throws NotFoundHttpException When invalid data object ID given
      */
diff --git a/bundles/CustomReportsBundle/src/Controller/Reports/CustomReportController.php b/bundles/CustomReportsBundle/src/Controller/Reports/CustomReportController.php
index 1752f260ce7..70499ac7d3b 100644
--- a/bundles/CustomReportsBundle/src/Controller/Reports/CustomReportController.php
+++ b/bundles/CustomReportsBundle/src/Controller/Reports/CustomReportController.php
@@ -42,9 +42,7 @@ class CustomReportController extends UserAwareController
     /**
      * @Route("/tree", name="pimcore_bundle_customreports_customreport_tree", methods={"GET", "POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function treeAction(Request $request): JsonResponse
     {
@@ -57,9 +55,7 @@ public function treeAction(Request $request): JsonResponse
     /**
      * @Route("/portlet-report-list", name="pimcore_bundle_customreports_customreport_portletreportlist", methods={"GET", "POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function portletReportListAction(Request $request): JsonResponse
     {
@@ -72,9 +68,7 @@ public function portletReportListAction(Request $request): JsonResponse
     /**
      * @Route("/add", name="pimcore_bundle_customreports_customreport_add", methods={"POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function addAction(Request $request): JsonResponse
     {
@@ -104,9 +98,7 @@ public function addAction(Request $request): JsonResponse
     /**
      * @Route("/delete", name="pimcore_bundle_customreports_customreport_delete", methods={"DELETE"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function deleteAction(Request $request): JsonResponse
     {
@@ -128,9 +120,7 @@ public function deleteAction(Request $request): JsonResponse
     /**
      * @Route("/clone", name="pimcore_bundle_customreports_customreport_clone", methods={"POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function cloneAction(Request $request): JsonResponse
     {
@@ -168,9 +158,7 @@ public function cloneAction(Request $request): JsonResponse
     /**
      * @Route("/get", name="pimcore_bundle_customreports_customreport_get", methods={"GET"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function getAction(Request $request): JsonResponse
     {
@@ -189,9 +177,7 @@ public function getAction(Request $request): JsonResponse
     /**
      * @Route("/update", name="pimcore_bundle_customreports_customreport_update", methods={"PUT"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function updateAction(Request $request): JsonResponse
     {
@@ -226,9 +212,7 @@ public function updateAction(Request $request): JsonResponse
     /**
      * @Route("/column-config", name="pimcore_bundle_customreports_customreport_columnconfig", methods={"POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function columnConfigAction(Request $request): JsonResponse
     {
@@ -284,9 +268,7 @@ public function columnConfigAction(Request $request): JsonResponse
     /**
      * @Route("/get-report-config", name="pimcore_bundle_customreports_customreport_getreportconfig", methods={"GET"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function getReportConfigAction(Request $request): JsonResponse
     {
@@ -318,9 +300,7 @@ public function getReportConfigAction(Request $request): JsonResponse
     /**
      * @Route("/data", name="pimcore_bundle_customreports_customreport_data", methods={"GET", "POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function dataAction(Request $request): JsonResponse
     {
@@ -364,9 +344,7 @@ public function dataAction(Request $request): JsonResponse
     /**
      * @Route("/drill-down-options", name="pimcore_bundle_customreports_customreport_drilldownoptions", methods={"GET", "POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function drillDownOptionsAction(Request $request): JsonResponse
     {
@@ -394,9 +372,7 @@ public function drillDownOptionsAction(Request $request): JsonResponse
     /**
      * @Route("/chart", name="pimcore_bundle_customreports_customreport_chart", methods={"GET", "POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function chartAction(Request $request): JsonResponse
     {
@@ -437,9 +413,7 @@ protected function getTemporaryFileFromFileName(string $exportFileName): string
     /**
      * @Route("/create-csv", name="pimcore_bundle_customreports_customreport_createcsv", methods={"GET"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function createCsvAction(Request $request): JsonResponse
     {
@@ -513,9 +487,7 @@ public function createCsvAction(Request $request): JsonResponse
     /**
      * @Route("/download-csv", name="pimcore_bundle_customreports_customreport_downloadcsv", methods={"GET"})
      *
-     * @param Request $request
      *
-     * @return BinaryFileResponse
      */
     public function downloadCsvAction(Request $request): BinaryFileResponse
     {
diff --git a/bundles/CustomReportsBundle/src/DependencyInjection/Configuration.php b/bundles/CustomReportsBundle/src/DependencyInjection/Configuration.php
index 46edd2e644e..13995d22ff9 100644
--- a/bundles/CustomReportsBundle/src/DependencyInjection/Configuration.php
+++ b/bundles/CustomReportsBundle/src/DependencyInjection/Configuration.php
@@ -22,9 +22,6 @@
 
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('pimcore_custom_reports');
diff --git a/bundles/CustomReportsBundle/src/Tool/Adapter/AbstractAdapter.php b/bundles/CustomReportsBundle/src/Tool/Adapter/AbstractAdapter.php
index 7475684b482..752b668509a 100644
--- a/bundles/CustomReportsBundle/src/Tool/Adapter/AbstractAdapter.php
+++ b/bundles/CustomReportsBundle/src/Tool/Adapter/AbstractAdapter.php
@@ -24,28 +24,15 @@ abstract class AbstractAdapter implements CustomReportAdapterInterface
 
     protected ?Config $fullConfig = null;
 
-    /**
-     * @param \stdClass $config
-     * @param Config|null $fullConfig
-     */
     public function __construct(\stdClass $config, Config $fullConfig = null)
     {
         $this->config = $config;
         $this->fullConfig = $fullConfig;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     abstract public function getData(?array $filters, ?string $sort, ?string $dir, ?int $offset, ?int $limit, array $fields = null, array $drillDownFilters = null): array;
 
-    /**
-     * {@inheritdoc}
-     */
     abstract public function getColumns(?\stdClass $configuration): array;
 
-    /**
-     * {@inheritdoc}
-     */
     abstract public function getAvailableOptions(array $filters, string $field, array $drillDownFilters): array;
 }
diff --git a/bundles/CustomReportsBundle/src/Tool/Adapter/CustomReportAdapterFactoryInterface.php b/bundles/CustomReportsBundle/src/Tool/Adapter/CustomReportAdapterFactoryInterface.php
index 1269d47c364..70385116f18 100644
--- a/bundles/CustomReportsBundle/src/Tool/Adapter/CustomReportAdapterFactoryInterface.php
+++ b/bundles/CustomReportsBundle/src/Tool/Adapter/CustomReportAdapterFactoryInterface.php
@@ -23,10 +23,7 @@ interface CustomReportAdapterFactoryInterface
     /**
      * Create a CustomReport Adapter
      *
-     * @param \stdClass $config
-     * @param Config|null $fullConfig
      *
-     * @return CustomReportAdapterInterface
      */
     public function create(\stdClass $config, Config $fullConfig = null): CustomReportAdapterInterface;
 }
diff --git a/bundles/CustomReportsBundle/src/Tool/Adapter/CustomReportAdapterInterface.php b/bundles/CustomReportsBundle/src/Tool/Adapter/CustomReportAdapterInterface.php
index 1e1910282a2..8a29d146465 100644
--- a/bundles/CustomReportsBundle/src/Tool/Adapter/CustomReportAdapterInterface.php
+++ b/bundles/CustomReportsBundle/src/Tool/Adapter/CustomReportAdapterInterface.php
@@ -21,35 +21,23 @@ interface CustomReportAdapterInterface
     /**
      * returns data for given parameters
      *
-     * @param array|null $filters
-     * @param string|null $sort
-     * @param string|null $dir
-     * @param int|null $offset
-     * @param int|null $limit
      * @param array|null $fields - if set, only in fields specified columns are returned
      * @param array|null $drillDownFilters - if set, additional filters are set
      *
-     * @return array
      */
     public function getData(?array $filters, ?string $sort, ?string $dir, ?int $offset, ?int $limit, array $fields = null, array $drillDownFilters = null): array;
 
     /**
      * returns available columns for given configuration
      *
-     * @param \stdClass|null $configuration
      *
-     * @return array
      */
     public function getColumns(?\stdClass $configuration): array;
 
     /**
      * returns all available values for given field with given filters and drillDownFilters
      *
-     * @param array $filters
-     * @param string $field
-     * @param array $drillDownFilters
      *
-     * @return array
      */
     public function getAvailableOptions(array $filters, string $field, array $drillDownFilters): array;
 }
diff --git a/bundles/CustomReportsBundle/src/Tool/Adapter/DefaultCustomReportAdapterFactory.php b/bundles/CustomReportsBundle/src/Tool/Adapter/DefaultCustomReportAdapterFactory.php
index e8cd6c6baa6..12717d58146 100644
--- a/bundles/CustomReportsBundle/src/Tool/Adapter/DefaultCustomReportAdapterFactory.php
+++ b/bundles/CustomReportsBundle/src/Tool/Adapter/DefaultCustomReportAdapterFactory.php
@@ -27,9 +27,6 @@ public function __construct(string $className)
         $this->className = $className;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(\stdClass $config, Config $fullConfig = null): CustomReportAdapterInterface
     {
         return new $this->className($config, $fullConfig);
diff --git a/bundles/CustomReportsBundle/src/Tool/Adapter/Sql.php b/bundles/CustomReportsBundle/src/Tool/Adapter/Sql.php
index 7eb5e4ab51d..cc48eb36d58 100644
--- a/bundles/CustomReportsBundle/src/Tool/Adapter/Sql.php
+++ b/bundles/CustomReportsBundle/src/Tool/Adapter/Sql.php
@@ -23,9 +23,6 @@
  */
 class Sql extends AbstractAdapter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getData(?array $filters, ?string $sort, ?string $dir, ?int $offset, ?int $limit, array $fields = null, array $drillDownFilters = null): array
     {
         $db = Db::get();
@@ -54,9 +51,6 @@ public function getData(?array $filters, ?string $sort, ?string $dir, ?int $offs
         return ['data' => $data, 'total' => $total];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getColumns(?\stdClass $configuration): array
     {
         $sql = '';
@@ -78,14 +72,6 @@ public function getColumns(?\stdClass $configuration): array
         throw new \Exception("Only 'SELECT' statements are allowed! You've used '" . $matches[0] . "'");
     }
 
-    /**
-     * @param \stdClass $config
-     * @param bool $ignoreSelectAndGroupBy
-     * @param array|null $drillDownFilters
-     * @param string|null $selectField
-     *
-     * @return string
-     */
     protected function buildQueryString(\stdClass $config, bool $ignoreSelectAndGroupBy = false, array $drillDownFilters = null, string $selectField = null): string
     {
         $config = (array)$config;
@@ -139,15 +125,6 @@ protected function buildQueryString(\stdClass $config, bool $ignoreSelectAndGrou
         return $sql;
     }
 
-    /**
-     * @param array $filters
-     * @param array $fields
-     * @param bool $ignoreSelectAndGroupBy
-     * @param array|null $drillDownFilters
-     * @param string|null $selectField
-     *
-     * @return array|null
-     */
     protected function getBaseQuery(array $filters, array $fields, bool $ignoreSelectAndGroupBy = false, array $drillDownFilters = null, string $selectField = null): ?array
     {
         $db = Db::get();
@@ -227,9 +204,6 @@ protected function getBaseQuery(array $filters, array $fields, bool $ignoreSelec
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getAvailableOptions(array $filters, string $field, array $drillDownFilters): array
     {
         $db = Db::get();
diff --git a/bundles/CustomReportsBundle/src/Tool/Config.php b/bundles/CustomReportsBundle/src/Tool/Config.php
index e18dea71c97..6b9a6b15e72 100644
--- a/bundles/CustomReportsBundle/src/Tool/Config.php
+++ b/bundles/CustomReportsBundle/src/Tool/Config.php
@@ -75,9 +75,7 @@ class Config extends Model\AbstractModel implements \JsonSerializable
     protected array $sharedRoleNames = [];
 
     /**
-     * @param string $name
      *
-     * @return null|Config
      *
      * @throws \Exception
      */
@@ -96,11 +94,6 @@ public static function getByName(string $name): ?Config
         }
     }
 
-    /**
-     * @param Model\User|null $user
-     *
-     * @return array
-     */
     public static function getReportsList(Model\User $user = null): array
     {
         $reports = [];
diff --git a/bundles/CustomReportsBundle/src/Tool/Config/Dao.php b/bundles/CustomReportsBundle/src/Tool/Config/Dao.php
index 8e4f42cfa44..ed50f34cf1c 100644
--- a/bundles/CustomReportsBundle/src/Tool/Config/Dao.php
+++ b/bundles/CustomReportsBundle/src/Tool/Config/Dao.php
@@ -42,7 +42,6 @@ public function configure(): void
     }
 
     /**
-     * @param string|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -102,9 +101,6 @@ public function delete(): void
         $this->deleteData($this->model->getName());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataStructureForYaml(string $id, mixed $data): mixed
     {
         return [
diff --git a/bundles/CustomReportsBundle/src/Tool/Config/Listing/Dao.php b/bundles/CustomReportsBundle/src/Tool/Config/Listing/Dao.php
index 6d443233e11..59e230c4900 100644
--- a/bundles/CustomReportsBundle/src/Tool/Config/Listing/Dao.php
+++ b/bundles/CustomReportsBundle/src/Tool/Config/Listing/Dao.php
@@ -41,7 +41,6 @@ public function loadList(): array
     }
 
     /**
-     * @param Model\User $user
      *
      * @return Config[]
      */
diff --git a/bundles/GlossaryBundle/src/Controller/SettingsController.php b/bundles/GlossaryBundle/src/Controller/SettingsController.php
index 73466dbd10e..6be474fc72b 100644
--- a/bundles/GlossaryBundle/src/Controller/SettingsController.php
+++ b/bundles/GlossaryBundle/src/Controller/SettingsController.php
@@ -38,9 +38,7 @@ class SettingsController extends UserAwareController
     /**
      * @Route("/glossary", name="pimcore_bundle_glossary_settings_glossary", methods={"POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function glossaryAction(Request $request): JsonResponse
     {
diff --git a/bundles/GlossaryBundle/src/DependencyInjection/Configuration.php b/bundles/GlossaryBundle/src/DependencyInjection/Configuration.php
index af065a47f0e..c9c430ee309 100644
--- a/bundles/GlossaryBundle/src/DependencyInjection/Configuration.php
+++ b/bundles/GlossaryBundle/src/DependencyInjection/Configuration.php
@@ -21,9 +21,6 @@
 
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('pimcore_glossary');
diff --git a/bundles/GlossaryBundle/src/Model/Glossary.php b/bundles/GlossaryBundle/src/Model/Glossary.php
index 5ee50c075fa..3156c778038 100644
--- a/bundles/GlossaryBundle/src/Model/Glossary.php
+++ b/bundles/GlossaryBundle/src/Model/Glossary.php
@@ -31,70 +31,60 @@ class Glossary extends AbstractModel
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $id = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $text = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $link = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $abbr = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $language = null;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $casesensitive = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $exactmatch = false;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $site = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $creationDate = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $modificationDate = null;
 
diff --git a/bundles/GlossaryBundle/src/Model/Glossary/Dao.php b/bundles/GlossaryBundle/src/Model/Glossary/Dao.php
index 7bfa60fc1df..3f3584fe07b 100644
--- a/bundles/GlossaryBundle/src/Model/Glossary/Dao.php
+++ b/bundles/GlossaryBundle/src/Model/Glossary/Dao.php
@@ -29,7 +29,6 @@ class Dao extends AbstractDao
     /**
      * Get the data for the object from database for the given id, or from the ID which is set in the object
      *
-     * @param int|null $id
      *
      * @throws NotFoundException
      */
diff --git a/bundles/GlossaryBundle/src/Model/Glossary/Listing/Dao.php b/bundles/GlossaryBundle/src/Model/Glossary/Listing/Dao.php
index fa2c139f032..6365e7efd1c 100644
--- a/bundles/GlossaryBundle/src/Model/Glossary/Listing/Dao.php
+++ b/bundles/GlossaryBundle/src/Model/Glossary/Listing/Dao.php
@@ -56,7 +56,6 @@ public function getDataArray(): array
     }
 
     /**
-     * @return int
      *
      * @todo: $amount could not be defined, so this could cause an issue
      */
diff --git a/bundles/GlossaryBundle/src/Tool/Processor.php b/bundles/GlossaryBundle/src/Tool/Processor.php
index e69407a2047..961fe765cb4 100644
--- a/bundles/GlossaryBundle/src/Tool/Processor.php
+++ b/bundles/GlossaryBundle/src/Tool/Processor.php
@@ -53,10 +53,7 @@ public function __construct(
     /**
      * Process glossary entries in content string
      *
-     * @param string $content
-     * @param array $options
      *
-     * @return string
      */
     public function process(string $content, array $options): string
     {
diff --git a/bundles/GlossaryBundle/src/Twig/Extension/GlossaryExtension.php b/bundles/GlossaryBundle/src/Twig/Extension/GlossaryExtension.php
index ea621036e26..690a98aa220 100644
--- a/bundles/GlossaryBundle/src/Twig/Extension/GlossaryExtension.php
+++ b/bundles/GlossaryBundle/src/Twig/Extension/GlossaryExtension.php
@@ -33,9 +33,6 @@ public function __construct(Processor $glossaryProcessor)
         $this->glossaryProcessor = $glossaryProcessor;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getFilters(): array
     {
         return [
diff --git a/bundles/InstallBundle/src/Command/InstallCommand.php b/bundles/InstallBundle/src/Command/InstallCommand.php
index 404cfc5b52b..9a0742fbf78 100644
--- a/bundles/InstallBundle/src/Command/InstallCommand.php
+++ b/bundles/InstallBundle/src/Command/InstallCommand.php
@@ -128,9 +128,6 @@ private function getOptions(): array
         return $options;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function configure(): void
     {
         $options = $this->getOptions();
@@ -182,9 +179,6 @@ protected function configure(): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function initialize(InputInterface $input, OutputInterface $output): void
     {
         if ($input->getOption('skip-database-config')) {
@@ -304,9 +298,6 @@ private function installerNeedsOption(array $config): bool
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         // dispatch a bundle config event here to manually add/remove bundles/recommendations
diff --git a/bundles/InstallBundle/src/Installer.php b/bundles/InstallBundle/src/Installer.php
index bd149ffe574..c9ea2e49769 100644
--- a/bundles/InstallBundle/src/Installer.php
+++ b/bundles/InstallBundle/src/Installer.php
@@ -82,7 +82,6 @@ class Installer
     /**
      * Predefined DB credentials from config
      *
-     * @var array
      */
     private array $dbCredentials;
 
@@ -91,14 +90,12 @@ class Installer
     /**
      * When false, skips creating database structure during install
      *
-     * @var bool
      */
     private bool $createDatabaseStructure = true;
 
     /**
      * When false, skips importing all database data during install
      *
-     * @var bool
      */
     private bool $importDatabaseData = true;
 
@@ -106,21 +103,18 @@ class Installer
      * When false, skips importing database data dump files (if available) during install
      * only imports needed base data
      *
-     * @var bool
      */
     private bool $importDatabaseDataDump = true;
 
     /**
      * skip writing database.yaml file
      *
-     * @var bool
      */
     private bool $skipDatabaseConfig = false;
 
     /**
      * Bundles that will be installed
      *
-     * @var array
      */
     private array $bundlesToInstall =  [];
 
@@ -226,9 +220,7 @@ public function checkPrerequisites(Connection $db = null): array
 
     /**
      * @param Check[] $checks
-     * @param array $filterStates
      *
-     * @return array
      */
     public function formatPrerequisiteMessages(array $checks, array $filterStates = [Check::STATE_ERROR]): array
     {
@@ -274,7 +266,6 @@ private function dispatchStepEvent(string $type, string $message = null): Instal
     }
 
     /**
-     * @param array $params
      *
      * @return array Array of errors
      */
@@ -731,7 +722,6 @@ protected function createOrUpdateUser(array $config = []): void
     }
 
     /**
-     * @param string $file
      *
      * @throws \Exception
      */
diff --git a/bundles/InstallBundle/src/InstallerKernel.php b/bundles/InstallBundle/src/InstallerKernel.php
index c133b1615ce..d3a98f076ac 100644
--- a/bundles/InstallBundle/src/InstallerKernel.php
+++ b/bundles/InstallBundle/src/InstallerKernel.php
@@ -41,33 +41,21 @@ public function __construct(string $projectRoot, string $environment, bool $debu
         parent::__construct($environment, $debug);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getProjectDir(): string
     {
         return $this->projectRoot;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getLogDir(): string
     {
         return $this->projectRoot . '/var/log';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCacheDir(): string
     {
         return $this->projectRoot . '/var/installer/cache';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function registerBundles(): array
     {
         $bundles = [
diff --git a/bundles/SeoBundle/src/Controller/Document/DocumentController.php b/bundles/SeoBundle/src/Controller/Document/DocumentController.php
index ce80380c37c..9f677a28d15 100644
--- a/bundles/SeoBundle/src/Controller/Document/DocumentController.php
+++ b/bundles/SeoBundle/src/Controller/Document/DocumentController.php
@@ -44,9 +44,7 @@ class DocumentController extends UserAwareController
     /**
      * @Route("/seopanel-tree-root", name="pimcore_bundle_seo_document_document_seopaneltreeroot", methods={"GET"})
      *
-     * @param DocumentRouteHandler $documentRouteHandler
      *
-     * @return JsonResponse
      */
     public function seopanelTreeRootAction(DocumentRouteHandler $documentRouteHandler): JsonResponse
     {
@@ -69,11 +67,7 @@ public function seopanelTreeRootAction(DocumentRouteHandler $documentRouteHandle
     /**
      * @Route("/seopanel-tree", name="pimcore_bundle_seo_document_document_seopaneltree", methods={"GET"})
      *
-     * @param Request $request
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param DocumentRouteHandler $documentRouteHandler
      *
-     * @return JsonResponse
      */
     public function seopanelTreeAction(
         Request $request,
diff --git a/bundles/SeoBundle/src/Controller/MiscController.php b/bundles/SeoBundle/src/Controller/MiscController.php
index d713584b06a..342385eba66 100644
--- a/bundles/SeoBundle/src/Controller/MiscController.php
+++ b/bundles/SeoBundle/src/Controller/MiscController.php
@@ -31,9 +31,7 @@ class MiscController extends UserAwareController
     /**
      * @Route("/http-error-log", name="pimcore_bundle_seo_misc_httperrorlog", methods={"POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function httpErrorLogAction(Request $request): JsonResponse
     {
@@ -84,10 +82,7 @@ public function httpErrorLogAction(Request $request): JsonResponse
     /**
      * @Route("/http-error-log-detail", name="pimcore_bundle_seo_misc_httperrorlogdetail", methods={"GET"})
      *
-     * @param Request $request
-     * @param Profiler|null $profiler
      *
-     * @return Response
      */
     public function httpErrorLogDetailAction(Request $request, ?Profiler $profiler): Response
     {
@@ -112,9 +107,7 @@ public function httpErrorLogDetailAction(Request $request, ?Profiler $profiler):
     /**
      * @Route("/http-error-log-flush", name="pimcore_bundle_seo_misc_httperrorlogflush", methods={"DELETE"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function httpErrorLogFlushAction(Request $request): JsonResponse
     {
diff --git a/bundles/SeoBundle/src/Controller/RedirectsController.php b/bundles/SeoBundle/src/Controller/RedirectsController.php
index 44b9ccc20c9..3114766e90a 100644
--- a/bundles/SeoBundle/src/Controller/RedirectsController.php
+++ b/bundles/SeoBundle/src/Controller/RedirectsController.php
@@ -47,10 +47,7 @@ class RedirectsController extends UserAwareController
     /**
      * @Route("/list", name="pimcore_bundle_seo_redirects_redirects", methods={"POST"})
      *
-     * @param Request $request
-     * @param RedirectHandler $redirectHandler
      *
-     * @return JsonResponse
      */
     public function redirectsAction(Request $request, RedirectHandler $redirectHandler): JsonResponse
     {
@@ -191,9 +188,7 @@ public function redirectsAction(Request $request, RedirectHandler $redirectHandl
     /**
      * @Route("/csv-export", name="pimcore_bundle_seo_redirects_csvexport", methods={"GET"})
      *
-     * @param Csv $csv
      *
-     * @return Response
      */
     public function csvExportAction(Csv $csv): Response
     {
@@ -222,10 +217,7 @@ public function csvExportAction(Csv $csv): Response
     /**
      * @Route("/csv-import", name="pimcore_bundle_seo_redirects_csvimport", methods={"POST"})
      *
-     * @param Request $request
-     * @param Csv $csv
      *
-     * @return Response
      */
     public function csvImportAction(Request $request, Csv $csv): Response
     {
@@ -249,7 +241,6 @@ public function csvImportAction(Request $request, Csv $csv): Response
     /**
      * @Route("/cleanup", name="pimcore_bundle_seo_redirects_cleanup", methods={"DELETE"})
      *
-     * @return JsonResponse
      */
     public function cleanupAction(): JsonResponse
     {
@@ -276,7 +267,6 @@ public function cleanupAction(): JsonResponse
     /**
      * @Route("/get-statuscodes", name="pimcore_bundle_seo_redirects_statuscodes", methods={"GET"})
      *
-     * @return JsonResponse
      */
     public function statusCodesAction(): JsonResponse
     {
diff --git a/bundles/SeoBundle/src/Controller/SettingsController.php b/bundles/SeoBundle/src/Controller/SettingsController.php
index 63be3b56f82..6b24d44e6a9 100644
--- a/bundles/SeoBundle/src/Controller/SettingsController.php
+++ b/bundles/SeoBundle/src/Controller/SettingsController.php
@@ -31,7 +31,6 @@ class SettingsController extends UserAwareController
     /**
      * @Route("/robots-txt", name="pimcore_bundle_seo_settings_robotstxtget", methods={"GET"})
      *
-     * @return JsonResponse
      */
     public function robotsTxtGetAction(): JsonResponse
     {
@@ -49,9 +48,7 @@ public function robotsTxtGetAction(): JsonResponse
     /**
      * @Route("/robots-txt", name="pimcore_bundle_seo_settings_robotstxtput", methods={"PUT"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function robotsTxtPutAction(Request $request): JsonResponse
     {
diff --git a/bundles/SeoBundle/src/DependencyInjection/Configuration.php b/bundles/SeoBundle/src/DependencyInjection/Configuration.php
index 20a9c2304ec..ac72aeef066 100644
--- a/bundles/SeoBundle/src/DependencyInjection/Configuration.php
+++ b/bundles/SeoBundle/src/DependencyInjection/Configuration.php
@@ -23,9 +23,6 @@
 
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * @inheritDoc
-     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('pimcore_seo');
diff --git a/bundles/SeoBundle/src/Event/Model/RedirectEvent.php b/bundles/SeoBundle/src/Event/Model/RedirectEvent.php
index dfa7f4bcb9e..9476bebc3f8 100644
--- a/bundles/SeoBundle/src/Event/Model/RedirectEvent.php
+++ b/bundles/SeoBundle/src/Event/Model/RedirectEvent.php
@@ -27,7 +27,6 @@ class RedirectEvent extends Event
     protected Redirect $redirect;
 
     /**
-     * @param Redirect $redirect
      * @param array $arguments additional parameters (e.g. "versionNote" for the version note)
      */
     public function __construct(Redirect $redirect, array $arguments = [])
diff --git a/bundles/SeoBundle/src/EventListener/DocumentListener.php b/bundles/SeoBundle/src/EventListener/DocumentListener.php
index d18e1a19af7..e2cb1ae0a63 100644
--- a/bundles/SeoBundle/src/EventListener/DocumentListener.php
+++ b/bundles/SeoBundle/src/EventListener/DocumentListener.php
@@ -31,9 +31,6 @@
 
 class DocumentListener implements EventSubscriberInterface
 {
-    /**
-     * @inheritDoc
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/SeoBundle/src/EventListener/ResponseExceptionListener.php b/bundles/SeoBundle/src/EventListener/ResponseExceptionListener.php
index a4161bba627..6de6bdef3ce 100644
--- a/bundles/SeoBundle/src/EventListener/ResponseExceptionListener.php
+++ b/bundles/SeoBundle/src/EventListener/ResponseExceptionListener.php
@@ -39,9 +39,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/SeoBundle/src/EventListener/RoutingListener.php b/bundles/SeoBundle/src/EventListener/RoutingListener.php
index 1cbc91c0391..50d4d2e05c3 100644
--- a/bundles/SeoBundle/src/EventListener/RoutingListener.php
+++ b/bundles/SeoBundle/src/EventListener/RoutingListener.php
@@ -34,9 +34,6 @@ public function __construct(protected RedirectHandler $redirectHandler)
     {
     }
 
-    /**
-     * @inheritDoc
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/SeoBundle/src/EventListener/UrlSlugUpdateListener.php b/bundles/SeoBundle/src/EventListener/UrlSlugUpdateListener.php
index 97b7fb681c6..4e7e71ff72a 100644
--- a/bundles/SeoBundle/src/EventListener/UrlSlugUpdateListener.php
+++ b/bundles/SeoBundle/src/EventListener/UrlSlugUpdateListener.php
@@ -27,9 +27,6 @@
 
 class UrlSlugUpdateListener implements EventSubscriberInterface
 {
-    /**
-     * @inheritDoc
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/SeoBundle/src/Maintenance/LogErrorCleanupTask.php b/bundles/SeoBundle/src/Maintenance/LogErrorCleanupTask.php
index d045d2c64a5..ee43a520fbc 100644
--- a/bundles/SeoBundle/src/Maintenance/LogErrorCleanupTask.php
+++ b/bundles/SeoBundle/src/Maintenance/LogErrorCleanupTask.php
@@ -31,9 +31,6 @@ public function __construct(Connection $db)
         $this->db = $db;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         // keep the history for max. 7 days (=> exactly 144h), according to the privacy policy (EU/German Law)
diff --git a/bundles/SeoBundle/src/Maintenance/RedirectCleanupTask.php b/bundles/SeoBundle/src/Maintenance/RedirectCleanupTask.php
index fb7f6b0548e..3a90f4919bc 100644
--- a/bundles/SeoBundle/src/Maintenance/RedirectCleanupTask.php
+++ b/bundles/SeoBundle/src/Maintenance/RedirectCleanupTask.php
@@ -24,9 +24,6 @@
  */
 class RedirectCleanupTask implements TaskInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $list = new Redirect\Listing();
diff --git a/bundles/SeoBundle/src/Model/Redirect.php b/bundles/SeoBundle/src/Model/Redirect.php
index d80f42b8dae..9cc54f3db5a 100644
--- a/bundles/SeoBundle/src/Model/Redirect.php
+++ b/bundles/SeoBundle/src/Model/Redirect.php
@@ -84,7 +84,6 @@ final class Redirect extends AbstractModel
     /**
      * ID of the user who make the latest changes
      *
-     * @var int|null
      */
     protected ?int $userModification = null;
 
@@ -103,11 +102,7 @@ public static function getById(int $id): ?Redirect
     /**
      * @internal
      *
-     * @param Request $request
-     * @param Site|null $site
-     * @param bool $override
      *
-     * @return self|null
      */
     public static function getByExactMatch(Request $request, ?Site $site = null, bool $override = false): ?self
     {
@@ -154,7 +149,6 @@ public function setId(int $id): static
     /**
      * enum('entire_uri','path_query','path','auto_create')
      *
-     * @return string
      */
     public function getType(): string
     {
@@ -164,7 +158,6 @@ public function getType(): string
     /**
      * enum('entire_uri','path_query','path','auto_create')
      *
-     * @param string $type
      */
     public function setType(string $type): void
     {
diff --git a/bundles/SeoBundle/src/Model/Redirect/Dao.php b/bundles/SeoBundle/src/Model/Redirect/Dao.php
index d1c216b8543..437d4479df5 100644
--- a/bundles/SeoBundle/src/Model/Redirect/Dao.php
+++ b/bundles/SeoBundle/src/Model/Redirect/Dao.php
@@ -30,7 +30,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int|null $id
      *
      * @throws NotFoundException
      */
@@ -49,9 +48,6 @@ public function getById(int $id = null): void
     }
 
     /**
-     * @param Request $request
-     * @param Site|null $site
-     * @param bool $override
      *
      * @throws NotFoundException
      */
diff --git a/bundles/SeoBundle/src/Model/Redirect/Listing/Dao.php b/bundles/SeoBundle/src/Model/Redirect/Listing/Dao.php
index 0ab4f4de90e..50e60ed0c39 100644
--- a/bundles/SeoBundle/src/Model/Redirect/Listing/Dao.php
+++ b/bundles/SeoBundle/src/Model/Redirect/Listing/Dao.php
@@ -29,7 +29,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of static routes for the specicifies parameters, returns an array of Redirect elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/bundles/SeoBundle/src/Redirect/Csv.php b/bundles/SeoBundle/src/Redirect/Csv.php
index cda1e5ee3a0..2392abfb678 100644
--- a/bundles/SeoBundle/src/Redirect/Csv.php
+++ b/bundles/SeoBundle/src/Redirect/Csv.php
@@ -54,9 +54,7 @@ class Csv
     private ?OptionsResolver $importResolver = null;
 
     /**
-     * @param Redirect\Listing $list
      *
-     * @return Writer
      *
      * @throws \League\Csv\CannotInsertRecord
      * @throws \League\Csv\Exception
@@ -111,9 +109,7 @@ public function createExportWriter(Redirect\Listing $list): Writer
     }
 
     /**
-     * @param string $filename
      *
-     * @return array
      *
      * @throws \League\Csv\Exception
      */
diff --git a/bundles/SeoBundle/src/Redirect/RedirectHandler.php b/bundles/SeoBundle/src/Redirect/RedirectHandler.php
index b4ff947ecec..c732bdaf3da 100644
--- a/bundles/SeoBundle/src/Redirect/RedirectHandler.php
+++ b/bundles/SeoBundle/src/Redirect/RedirectHandler.php
@@ -71,11 +71,7 @@ public function __construct(RequestHelper $requestHelper, SiteResolver $siteReso
     }
 
     /**
-     * @param Request $request
-     * @param bool $override
-     * @param Site|null $sourceSite
      *
-     * @return RedirectResponse|null
      *
      * @throws \Exception
      */
@@ -146,11 +142,7 @@ private function matchRegexRedirect(
     }
 
     /**
-     * @param Redirect $redirect
-     * @param Request $request
-     * @param array $matches
      *
-     * @return RedirectResponse|null
      *
      * @throws \Exception
      */
diff --git a/bundles/SeoBundle/src/Redirect/RedirectUrlPartResolver.php b/bundles/SeoBundle/src/Redirect/RedirectUrlPartResolver.php
index 8d8decfac3b..5715189ce1e 100644
--- a/bundles/SeoBundle/src/Redirect/RedirectUrlPartResolver.php
+++ b/bundles/SeoBundle/src/Redirect/RedirectUrlPartResolver.php
@@ -32,7 +32,6 @@ class RedirectUrlPartResolver
     /**
      * RedirectUrlPartResolver constructor.
      *
-     * @param Request $request
      */
     public function __construct(Request $request)
     {
diff --git a/bundles/SeoBundle/src/Sitemap/Element/AbstractElementGenerator.php b/bundles/SeoBundle/src/Sitemap/Element/AbstractElementGenerator.php
index 565b8fd95fb..375a83d0988 100644
--- a/bundles/SeoBundle/src/Sitemap/Element/AbstractElementGenerator.php
+++ b/bundles/SeoBundle/src/Sitemap/Element/AbstractElementGenerator.php
@@ -76,10 +76,7 @@ public function getProcessors(): array
     /**
      * Determines if the element can be added.
      *
-     * @param ElementInterface $element
-     * @param GeneratorContextInterface $context
      *
-     * @return bool
      */
     protected function canBeAdded(ElementInterface $element, GeneratorContextInterface $context): bool
     {
@@ -96,10 +93,7 @@ protected function canBeAdded(ElementInterface $element, GeneratorContextInterfa
      * Determines if the element handles children (only used from generators
      * supporting tree structures).
      *
-     * @param ElementInterface $element
-     * @param GeneratorContextInterface $context
      *
-     * @return bool
      */
     protected function handlesChildren(ElementInterface $element, GeneratorContextInterface $context): bool
     {
@@ -116,11 +110,7 @@ protected function handlesChildren(ElementInterface $element, GeneratorContextIn
      * Processes a URL about to be added to the sitemap. Can either return an Url instance
      * or null to exclude the Url.
      *
-     * @param Url $url
-     * @param ElementInterface $element
-     * @param GeneratorContextInterface $context
      *
-     * @return null|Url
      */
     protected function process(Url $url, ElementInterface $element, GeneratorContextInterface $context): ?Url
     {
diff --git a/bundles/SeoBundle/src/Sitemap/Element/Processor/ModificationDateProcessor.php b/bundles/SeoBundle/src/Sitemap/Element/Processor/ModificationDateProcessor.php
index b531260f1d2..c6dd4db201a 100644
--- a/bundles/SeoBundle/src/Sitemap/Element/Processor/ModificationDateProcessor.php
+++ b/bundles/SeoBundle/src/Sitemap/Element/Processor/ModificationDateProcessor.php
@@ -28,9 +28,6 @@
  */
 class ModificationDateProcessor implements ProcessorInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(Url $url, ElementInterface $element, GeneratorContextInterface $context): Url|UrlConcrete|null
     {
         if (!$url instanceof UrlConcrete) {
diff --git a/bundles/SeoBundle/src/Sitemap/Element/Processor/PropertiesProcessor.php b/bundles/SeoBundle/src/Sitemap/Element/Processor/PropertiesProcessor.php
index b9652696b85..3eca62c7a87 100644
--- a/bundles/SeoBundle/src/Sitemap/Element/Processor/PropertiesProcessor.php
+++ b/bundles/SeoBundle/src/Sitemap/Element/Processor/PropertiesProcessor.php
@@ -32,9 +32,6 @@ class PropertiesProcessor implements ProcessorInterface
 
     const PROPERTY_PRIORITY = 'sitemaps_priority';
 
-    /**
-     * {@inheritdoc}
-     */
     public function process(Url $url, ElementInterface $element, GeneratorContextInterface $context): Url|UrlConcrete|null
     {
         if (!$url instanceof UrlConcrete) {
diff --git a/bundles/SeoBundle/src/Sitemap/Element/ProcessorInterface.php b/bundles/SeoBundle/src/Sitemap/Element/ProcessorInterface.php
index 9105ec1e16b..65f5d596c4c 100644
--- a/bundles/SeoBundle/src/Sitemap/Element/ProcessorInterface.php
+++ b/bundles/SeoBundle/src/Sitemap/Element/ProcessorInterface.php
@@ -25,11 +25,7 @@ interface ProcessorInterface
     /**
      * Processes an URL. The processor is expected to return the same or a new URL instance or null
      *
-     * @param Url $url
-     * @param ElementInterface $element
-     * @param GeneratorContextInterface $context
      *
-     * @return Url|null
      */
     public function process(Url $url, ElementInterface $element, GeneratorContextInterface $context): ?Url;
 }
diff --git a/bundles/SimpleBackendSearchBundle/src/Command/SearchBackendReindexCommand.php b/bundles/SimpleBackendSearchBundle/src/Command/SearchBackendReindexCommand.php
index b7628e7ccfe..68116e9a9c6 100644
--- a/bundles/SimpleBackendSearchBundle/src/Command/SearchBackendReindexCommand.php
+++ b/bundles/SimpleBackendSearchBundle/src/Command/SearchBackendReindexCommand.php
@@ -39,9 +39,6 @@ protected function configure(): void
             ->setDescription('Re-indexes the backend search of pimcore');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         // clear all data
diff --git a/bundles/SimpleBackendSearchBundle/src/Controller/SearchController.php b/bundles/SimpleBackendSearchBundle/src/Controller/SearchController.php
index d56c6ef79e5..ca662319725 100644
--- a/bundles/SimpleBackendSearchBundle/src/Controller/SearchController.php
+++ b/bundles/SimpleBackendSearchBundle/src/Controller/SearchController.php
@@ -382,9 +382,7 @@ protected function extractSortingSettings(array $params): array
     }
 
     /**
-     * @param array $types
      *
-     * @return string
      *
      * @internal
      */
@@ -471,10 +469,7 @@ protected function filterQueryParam(string $query): string
     /**
      * @Route("/quicksearch", name="pimcore_bundle_search_search_quicksearch", methods={"GET"})
      *
-     * @param Request $request
-     * @param EventDispatcherInterface $eventDispatcher
      *
-     * @return JsonResponse
      */
     public function quickSearchAction(Request $request, EventDispatcherInterface $eventDispatcher): JsonResponse
     {
@@ -546,10 +541,7 @@ public function quickSearchAction(Request $request, EventDispatcherInterface $ev
     /**
      * @Route("/quicksearch-get-by-id", name="pimcore_bundle_search_search_quicksearch_by_id", methods={"GET"})
      *
-     * @param Request $request
-     * @param Config $config
      *
-     * @return JsonResponse
      */
     public function quickSearchByIdAction(Request $request, Config $config): JsonResponse
     {
@@ -618,9 +610,6 @@ protected function shortenPath(string $path): string
     }
 
     /**
-     * @param ElementInterface $element
-     * @param int|null $context
-     * @param array $data
      *
      * @throws \Exception
      */
diff --git a/bundles/SimpleBackendSearchBundle/src/DataProvider/GDPR/Assets.php b/bundles/SimpleBackendSearchBundle/src/DataProvider/GDPR/Assets.php
index eecb8f73322..f3343276bac 100644
--- a/bundles/SimpleBackendSearchBundle/src/DataProvider/GDPR/Assets.php
+++ b/bundles/SimpleBackendSearchBundle/src/DataProvider/GDPR/Assets.php
@@ -24,17 +24,6 @@
 
 class Assets extends DataProvider\Assets
 {
-    /**
-     * @param int $id
-     * @param string $firstname
-     * @param string $lastname
-     * @param string $email
-     * @param int $start
-     * @param int $limit
-     * @param string|null $sort
-     *
-     * @return array
-     */
     public function searchData(int $id, string $firstname, string $lastname, string $email, int $start, int $limit, string $sort = null): array
     {
         if (empty($id) && empty($firstname) && empty($lastname) && empty($email)) {
diff --git a/bundles/SimpleBackendSearchBundle/src/DataProvider/GDPR/DataObjects.php b/bundles/SimpleBackendSearchBundle/src/DataProvider/GDPR/DataObjects.php
index 2e47411bcd9..606f85031ad 100644
--- a/bundles/SimpleBackendSearchBundle/src/DataProvider/GDPR/DataObjects.php
+++ b/bundles/SimpleBackendSearchBundle/src/DataProvider/GDPR/DataObjects.php
@@ -25,17 +25,6 @@
 
 class DataObjects extends DataProvider\DataObjects
 {
-    /**
-     * @param int $id
-     * @param string $firstname
-     * @param string $lastname
-     * @param string $email
-     * @param int $start
-     * @param int $limit
-     * @param string|null $sort
-     *
-     * @return array
-     */
     public function searchData(int $id, string $firstname, string $lastname, string $email, int $start, int $limit, string $sort = null): array
     {
         if (empty($id) && empty($firstname) && empty($lastname) && empty($email)) {
diff --git a/bundles/SimpleBackendSearchBundle/src/Event/Model/SearchBackendEvent.php b/bundles/SimpleBackendSearchBundle/src/Event/Model/SearchBackendEvent.php
index 2019f1ca92c..ac9f15c4b41 100644
--- a/bundles/SimpleBackendSearchBundle/src/Event/Model/SearchBackendEvent.php
+++ b/bundles/SimpleBackendSearchBundle/src/Event/Model/SearchBackendEvent.php
@@ -26,7 +26,6 @@ class SearchBackendEvent extends Event
     /**
      * Data constructor.
      *
-     * @param Data $data
      */
     public function __construct(Data $data)
     {
diff --git a/bundles/SimpleBackendSearchBundle/src/EventListener/SearchBackendListener.php b/bundles/SimpleBackendSearchBundle/src/EventListener/SearchBackendListener.php
index 0e4766453e7..b167cc5239a 100644
--- a/bundles/SimpleBackendSearchBundle/src/EventListener/SearchBackendListener.php
+++ b/bundles/SimpleBackendSearchBundle/src/EventListener/SearchBackendListener.php
@@ -37,9 +37,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/SimpleBackendSearchBundle/src/Model/Search/Backend/Data.php b/bundles/SimpleBackendSearchBundle/src/Model/Search/Backend/Data.php
index d37b1585814..5d5e96d2e78 100644
--- a/bundles/SimpleBackendSearchBundle/src/Model/Search/Backend/Data.php
+++ b/bundles/SimpleBackendSearchBundle/src/Model/Search/Backend/Data.php
@@ -53,56 +53,48 @@ class Data extends AbstractModel
     /**
      * document | object | asset
      *
-     * @var string
      */
     protected string $maintype;
 
     /**
      * webresource type (e.g. page, snippet ...)
      *
-     * @var string
      */
     protected string $type;
 
     /**
      * currently only relevant for objects where it portrays the class name
      *
-     * @var string
      */
     protected string $subtype;
 
     /**
      * published or not
      *
-     * @var bool
      */
     protected bool $published;
 
     /**
      * timestamp of creation date
      *
-     * @var int|null
      */
     protected ?int $creationDate = null;
 
     /**
      * timestamp of modification date
      *
-     * @var int|null
      */
     protected ?int $modificationDate = null;
 
     /**
      * User-ID of the owner
      *
-     * @var int
      */
     protected int $userOwner;
 
     /**
      * User-ID of the user last modified the element
      *
-     * @var int|null
      */
     protected ?int $userModification = null;
 
@@ -110,9 +102,6 @@ class Data extends AbstractModel
 
     protected string $properties;
 
-    /**
-     * @param Element\ElementInterface|null $element
-     */
     public function __construct(Element\ElementInterface $element = null)
     {
         if ($element instanceof Element\ElementInterface) {
diff --git a/bundles/SimpleBackendSearchBundle/src/Model/Search/Backend/Data/Listing/Dao.php b/bundles/SimpleBackendSearchBundle/src/Model/Search/Backend/Data/Listing/Dao.php
index aff09f94394..86e4dc06f78 100644
--- a/bundles/SimpleBackendSearchBundle/src/Model/Search/Backend/Data/Listing/Dao.php
+++ b/bundles/SimpleBackendSearchBundle/src/Model/Search/Backend/Data/Listing/Dao.php
@@ -32,7 +32,6 @@ class Dao extends AbstractDao
     /**
      * Loads a list of entries for the specicifies parameters, returns an array of Search\Backend\Data
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/bundles/SimpleBackendSearchBundle/src/Task/Maintenance/FullTextIndexOptimizeTask.php b/bundles/SimpleBackendSearchBundle/src/Task/Maintenance/FullTextIndexOptimizeTask.php
index eaa2d60ca4c..50be4349bb7 100644
--- a/bundles/SimpleBackendSearchBundle/src/Task/Maintenance/FullTextIndexOptimizeTask.php
+++ b/bundles/SimpleBackendSearchBundle/src/Task/Maintenance/FullTextIndexOptimizeTask.php
@@ -35,7 +35,7 @@ public function __construct(LockFactory $lockFactory)
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @throws Exception
      */
diff --git a/bundles/StaticRoutesBundle/src/Controller/SettingsController.php b/bundles/StaticRoutesBundle/src/Controller/SettingsController.php
index 9733a52fdd0..c049340524e 100644
--- a/bundles/StaticRoutesBundle/src/Controller/SettingsController.php
+++ b/bundles/StaticRoutesBundle/src/Controller/SettingsController.php
@@ -31,9 +31,7 @@ class SettingsController extends UserAwareController
     /**
      * @Route("/staticroutes", name="pimcore_bundle_staticroutes_settings_staticroutes", methods={"POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function staticroutesAction(Request $request): JsonResponse
     {
diff --git a/bundles/StaticRoutesBundle/src/Model/Staticroute.php b/bundles/StaticRoutesBundle/src/Model/Staticroute.php
index fbff8214f13..bc3c8ebfc06 100644
--- a/bundles/StaticRoutesBundle/src/Model/Staticroute.php
+++ b/bundles/StaticRoutesBundle/src/Model/Staticroute.php
@@ -65,28 +65,24 @@ final class Staticroute extends AbstractModel
      * Associative array filled on match() that holds matched path values
      * for given variable names.
      *
-     * @var array
      */
     protected array $_values = [];
 
     /**
      * this is a small per request cache to know which route is which is, this info is used in self::getByName()
      *
-     * @var array
      */
     protected static array $nameIdMappingCache = [];
 
     /**
      * contains the static route which the current request matches (it he does), this is used in the view to get the current route
      *
-     * @var Staticroute|null
      */
     protected static ?Staticroute $_currentRoute = null;
 
     /**
      * @static
      *
-     * @param Staticroute|null $route
      */
     public static function setCurrentRoute(?Staticroute $route): void
     {
@@ -96,7 +92,6 @@ public static function setCurrentRoute(?Staticroute $route): void
     /**
      * @static
      *
-     * @return Staticroute|null
      */
     public static function getCurrentRoute(): ?Staticroute
     {
@@ -106,9 +101,7 @@ public static function getCurrentRoute(): ?Staticroute
     /**
      * Static helper to retrieve an instance of Staticroute by the given ID
      *
-     * @param string $id
      *
-     * @return self|null
      */
     public static function getById(string $id): ?Staticroute
     {
@@ -134,10 +127,7 @@ public static function getById(string $id): ?Staticroute
     }
 
     /**
-     * @param string $name
-     * @param int|null $siteId
      *
-     * @return self|null
      *
      * @throws \Exception
      */
@@ -367,12 +357,6 @@ public function getSiteId(): array
 
     /**
      * @internal
-     *
-     * @param array $urlOptions
-     * @param bool $encode
-     *
-     * @return string
-     *
      * @internal
      */
     public function assemble(array $urlOptions = [], bool $encode = true): string
@@ -468,11 +452,6 @@ public function assemble(array $urlOptions = [], bool $encode = true): string
     /**
      * @internal
      *
-     * @param string $path
-     * @param array $params
-     *
-     * @return array|bool
-     *
      * @throws \Exception
      */
     public function match(string $path, array $params = []): bool|array
diff --git a/bundles/StaticRoutesBundle/src/Model/Staticroute/Dao.php b/bundles/StaticRoutesBundle/src/Model/Staticroute/Dao.php
index 7a5f11a265b..d62b69186c7 100644
--- a/bundles/StaticRoutesBundle/src/Model/Staticroute/Dao.php
+++ b/bundles/StaticRoutesBundle/src/Model/Staticroute/Dao.php
@@ -54,7 +54,6 @@ public function delete(): void
     /**
      * Get the data for the object from database for the given id
      *
-     * @param string|null $id
      *
      * @throws NotFoundException
      */
@@ -81,8 +80,6 @@ public function getById(string $id = null): void
     }
 
     /**
-     * @param string|null $name
-     * @param int|null $siteId
      *
      * @throws NotFoundException
      */
@@ -125,9 +122,6 @@ public function getByName(string $name = null, int $siteId = null): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataStructureForYaml(string $id, mixed $data): mixed
     {
         return [
diff --git a/bundles/StaticRoutesBundle/src/Routing/Staticroute/Router.php b/bundles/StaticRoutesBundle/src/Routing/Staticroute/Router.php
index 3c796e2763e..0005a5409e0 100644
--- a/bundles/StaticRoutesBundle/src/Routing/Staticroute/Router.php
+++ b/bundles/StaticRoutesBundle/src/Routing/Staticroute/Router.php
@@ -55,7 +55,6 @@ final class Router implements RouterInterface, RequestMatcherInterface, Versatil
     /**
      * Params which are treated as _locale if no _locale attribute is set
      *
-     * @var array
      */
     protected array $localeParams = [];
 
@@ -67,17 +66,11 @@ public function __construct(RequestContext $context, Config $config)
         $this->config = $config;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setContext(RequestContext $context): void
     {
         $this->context = $context;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getContext(): RequestContext
     {
         return $this->context;
@@ -93,25 +86,16 @@ public function setLocaleParams(array $localeParams): void
         $this->localeParams = $localeParams;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteCollection(): RouteCollection
     {
         return new RouteCollection();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteDebugMessage(string $name, array $parameters = []): string
     {
         return $name;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generate(string $name, array $parameters = [], int $referenceType = self::ABSOLUTE_PATH): string
     {
         if (!in_array($name, $this->getSupportedNames())) {
@@ -193,17 +177,11 @@ public function generate(string $name, array $parameters = [], int $referenceTyp
         ));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function matchRequest(Request $request): array
     {
         return $this->doMatch($request->getPathInfo(), $request);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function match(string $pathinfo): array
     {
         return $this->doMatch($pathinfo);
diff --git a/bundles/TinymceBundle/src/DependencyInjection/Configuration.php b/bundles/TinymceBundle/src/DependencyInjection/Configuration.php
index 4978ce6e9b8..bb47b33ea2f 100644
--- a/bundles/TinymceBundle/src/DependencyInjection/Configuration.php
+++ b/bundles/TinymceBundle/src/DependencyInjection/Configuration.php
@@ -21,9 +21,6 @@
 
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('pimcore_tinymce');
diff --git a/bundles/UuidBundle/src/EventListener/UUIDListener.php b/bundles/UuidBundle/src/EventListener/UUIDListener.php
index 2264113222b..a8d82881fe6 100644
--- a/bundles/UuidBundle/src/EventListener/UUIDListener.php
+++ b/bundles/UuidBundle/src/EventListener/UUIDListener.php
@@ -34,9 +34,6 @@
  */
 class UUIDListener implements EventSubscriberInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundles/UuidBundle/src/Model/Tool/UUID.php b/bundles/UuidBundle/src/Model/Tool/UUID.php
index d9354cf1e90..04e28ba1f50 100644
--- a/bundles/UuidBundle/src/Model/Tool/UUID.php
+++ b/bundles/UuidBundle/src/Model/Tool/UUID.php
@@ -31,35 +31,30 @@ final class UUID extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var int|string
      */
     protected int|string $itemId;
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $type;
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $uuid;
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $instanceIdentifier;
 
     /**
      * @internal
      *
-     * @var mixed
      */
     protected mixed $item = null;
 
@@ -129,8 +124,6 @@ public function getType(): string
     /**
      * @internal
      *
-     * @return string
-     *
      * @throws Exception
      */
     public function createUuid(): string
@@ -180,9 +173,7 @@ public function setItem(mixed $item): static
     }
 
     /**
-     * @param mixed $item
      *
-     * @return UUID
      *
      * @throws Exception
      */
@@ -203,9 +194,7 @@ public static function getByUuid(string $uuid): UUID
     }
 
     /**
-     * @param mixed $item
      *
-     * @return static
      *
      * @throws Exception
      */
diff --git a/bundles/UuidBundle/src/Model/Tool/UUID/Listing/Dao.php b/bundles/UuidBundle/src/Model/Tool/UUID/Listing/Dao.php
index c12f58624ef..7898b991d43 100644
--- a/bundles/UuidBundle/src/Model/Tool/UUID/Listing/Dao.php
+++ b/bundles/UuidBundle/src/Model/Tool/UUID/Listing/Dao.php
@@ -30,7 +30,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of UUID for the specified parameters, returns an array of UUID elements
      *
-     * @return array
      */
     public function load(): array
     {
@@ -46,7 +45,6 @@ public function load(): array
     /**
      * Returns the total amount of UUID entries
      *
-     * @return int
      */
     public function getTotalCount(): int
     {
diff --git a/bundles/WordExportBundle/src/Controller/TranslationController.php b/bundles/WordExportBundle/src/Controller/TranslationController.php
index c5d2f07cd5b..e8c107f1ddd 100644
--- a/bundles/WordExportBundle/src/Controller/TranslationController.php
+++ b/bundles/WordExportBundle/src/Controller/TranslationController.php
@@ -44,9 +44,7 @@ class TranslationController extends UserAwareController
     /**
      * @Route("/word-export", name="pimcore_bundle_wordexport_translation_wordexport", methods={"POST"})
      *
-     * @param Request $request
      *
-     * @return JsonResponse
      */
     public function wordExportAction(Request $request, Filesystem $filesystem): JsonResponse
     {
@@ -251,9 +249,7 @@ public function wordExportAction(Request $request, Filesystem $filesystem): Json
     /**
      * @Route("/word-export-download", name="pimcore_bundle_wordexport_translation_wordexportdownload", methods={"GET"})
      *
-     * @param Request $request
      *
-     * @return Response
      */
     public function wordExportDownloadAction(Request $request): Response
     {
diff --git a/bundles/XliffBundle/src/AttributeSet/Attribute.php b/bundles/XliffBundle/src/AttributeSet/Attribute.php
index 889fd706bdf..2c68327d1a3 100644
--- a/bundles/XliffBundle/src/AttributeSet/Attribute.php
+++ b/bundles/XliffBundle/src/AttributeSet/Attribute.php
@@ -52,10 +52,6 @@ class Attribute
     /**
      * DataExtractorResultAttribute constructor.
      *
-     * @param string $type
-     * @param string $name
-     * @param string $content
-     * @param bool $isReadonly
      * @param string[] $targetContent
      */
     public function __construct(string $type, string $name, string $content, bool $isReadonly = false, array $targetContent = [])
@@ -93,7 +89,6 @@ public function getTargetContent(): array
     /**
      * Readonly attributes should not be translated - relevant for information purposes only.
      *
-     * @return bool
      */
     public function isReadonly(): bool
     {
diff --git a/bundles/XliffBundle/src/AttributeSet/AttributeSet.php b/bundles/XliffBundle/src/AttributeSet/AttributeSet.php
index 36789ee60de..849964a3b64 100644
--- a/bundles/XliffBundle/src/AttributeSet/AttributeSet.php
+++ b/bundles/XliffBundle/src/AttributeSet/AttributeSet.php
@@ -37,7 +37,6 @@ class AttributeSet
     /**
      * DataExtractorResult constructor.
      *
-     * @param TranslationItem $translationItem
      */
     public function __construct(TranslationItem $translationItem)
     {
@@ -79,7 +78,6 @@ public function getTargetLanguages(): array
     /**
      * @param string[] $targetLanguages
      *
-     * @return AttributeSet
      */
     public function setTargetLanguages(array $targetLanguages): AttributeSet
     {
@@ -112,13 +110,8 @@ public function isEmpty(): bool
     }
 
     /**
-     * @param string $type
-     * @param string $name
-     * @param string $content
-     * @param bool $isReadonly
      * @param string[] $targetContent
      *
-     * @return AttributeSet
      */
     public function addAttribute(string $type, string $name, string $content, bool $isReadonly = false, array $targetContent = []): AttributeSet
     {
diff --git a/bundles/XliffBundle/src/Controller/XliffTranslationController.php b/bundles/XliffBundle/src/Controller/XliffTranslationController.php
index a71f3ed3d61..4bdf0ee8675 100644
--- a/bundles/XliffBundle/src/Controller/XliffTranslationController.php
+++ b/bundles/XliffBundle/src/Controller/XliffTranslationController.php
@@ -42,11 +42,6 @@ class XliffTranslationController extends UserAwareController
     /**
      * @Route("/xliff-export", name="pimcore_bundle_xliff_translation_xliffexport", methods={"POST"})
      *
-     * @param Request $request
-     * @param ExportServiceInterface $exportService
-     *
-     * @return JsonResponse
-     *
      * @throws \Exception
      */
     public function xliffExportAction(Request $request, ExportServiceInterface $exportService): JsonResponse
@@ -95,11 +90,6 @@ public function xliffExportDownloadAction(Request $request, ExporterInterface $t
     /**
      * @Route("/xliff-import-upload", name="pimcore_bundle_xliff_translation_xliffimportupload", methods={"POST"})
      *
-     * @param Request $request
-     * @param ImportDataExtractorInterface $importDataExtractor
-     *
-     * @return JsonResponse
-     *
      * @throws \Exception
      */
     public function xliffImportUploadAction(Request $request, ImportDataExtractorInterface $importDataExtractor): JsonResponse
@@ -139,12 +129,6 @@ public function xliffImportUploadAction(Request $request, ImportDataExtractorInt
     /**
      * @Route("/xliff-import-element", name="pimcore_bundle_xliff_translation_xliffimportelement", methods={"POST"})
      *
-     * @param Request $request
-     * @param ImportDataExtractorInterface $importDataExtractor
-     * @param ImporterServiceInterface $importerService
-     *
-     * @return JsonResponse
-     *
      * @throws \Exception
      */
     public function xliffImportElementAction(Request $request, ImportDataExtractorInterface $importDataExtractor, ImporterServiceInterface $importerService): JsonResponse
diff --git a/bundles/XliffBundle/src/DependencyInjection/Compiler/TranslationServicesPass.php b/bundles/XliffBundle/src/DependencyInjection/Compiler/TranslationServicesPass.php
index 8a30398810a..da44591fff8 100644
--- a/bundles/XliffBundle/src/DependencyInjection/Compiler/TranslationServicesPass.php
+++ b/bundles/XliffBundle/src/DependencyInjection/Compiler/TranslationServicesPass.php
@@ -32,7 +32,6 @@ final class TranslationServicesPass implements CompilerPassInterface
      * Registers each service with tag pimcore.translation.data-extractor as data extractor for the translations export data extractor service.
      * Registers each service with tag pimcore.translation.importer as importer for the translations importer service.
      *
-     * @param ContainerBuilder $container
      */
     public function process(ContainerBuilder $container): void
     {
diff --git a/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/AbstractElementDataExtractor.php b/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/AbstractElementDataExtractor.php
index b1cc49132ae..d980d13fc7d 100644
--- a/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/AbstractElementDataExtractor.php
+++ b/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/AbstractElementDataExtractor.php
@@ -30,12 +30,8 @@ protected function createResultInstance(TranslationItem $translationItem): Attri
     }
 
     /**
-     * @param TranslationItem $translationItem
-     * @param string $sourceLanguage
      * @param string[] $targetLanguages
      *
-     * @return AttributeSet
-     *
      * @throws \Exception
      */
     public function extract(TranslationItem $translationItem, string $sourceLanguage, array $targetLanguages): AttributeSet
diff --git a/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DataExtractorInterface.php b/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DataExtractorInterface.php
index 0e518149637..c30f0a9f848 100644
--- a/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DataExtractorInterface.php
+++ b/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DataExtractorInterface.php
@@ -22,12 +22,8 @@
 interface DataExtractorInterface
 {
     /**
-     * @param TranslationItem $translationItem
-     * @param string $sourceLanguage
      * @param string[] $targetLanguages
      *
-     * @return AttributeSet
-     *
      * @throws \Exception
      */
     public function extract(TranslationItem $translationItem, string $sourceLanguage, array $targetLanguages): AttributeSet;
diff --git a/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DataObjectDataExtractor.php b/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DataObjectDataExtractor.php
index d661db8a465..c47de9dd155 100644
--- a/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DataObjectDataExtractor.php
+++ b/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DataObjectDataExtractor.php
@@ -42,12 +42,7 @@ public function __construct(array $exportAttributes = [])
     }
 
     /**
-     * @param TranslationItem $translationItem
-     * @param string $sourceLanguage
      * @param string[] $targetLanguages
-     * @param array|null $exportAttributes
-     *
-     * @return AttributeSet
      *
      * @throws \Exception
      */
@@ -108,11 +103,7 @@ private function isAttributeIncluded(AttributeSet $attributeSet, Attribute $attr
     }
 
     /**
-     * @param DataObject\Concrete $object
-     * @param AttributeSet $result
-     * @param array|null $exportAttributes
      *
-     * @return DataObjectDataExtractor
      *
      * @throws \Exception
      */
@@ -155,13 +146,6 @@ protected function addLocalizedFields(DataObject\Concrete $object, AttributeSet
         return $this;
     }
 
-    /**
-     * @param Localizedfields $fd
-     * @param Data $definition
-     * @param DataObject\Concrete $object
-     * @param AttributeSet $result
-     * @param array|null $exportAttributes
-     */
     protected function addBlocksInLocalizedfields(Localizedfields $fd, Data $definition, DataObject\Concrete $object, AttributeSet $result, array $exportAttributes = null): void
     {
         $locale = str_replace('-', '_', $result->getSourceLanguage());
@@ -206,11 +190,7 @@ protected function addBlocksInLocalizedfields(Localizedfields $fd, Data $definit
     }
 
     /**
-     * @param DataObject\Concrete $object
-     * @param AttributeSet $result
-     * @param array|null $exportAttributes
      *
-     * @return DataObjectDataExtractor
      *
      * @throws \Exception
      */
@@ -288,11 +268,7 @@ protected function addBlocks(
     }
 
     /**
-     * @param DataObject\Concrete $object
-     * @param AttributeSet $result
-     * @param array|null $exportAttributes
      *
-     * @return DataObjectDataExtractor
      *
      * @throws \Exception
      */
@@ -370,13 +346,6 @@ protected function addLocalizedFieldsInBricks(
         return $this;
     }
 
-    /**
-     * @param DataObject\Concrete $object
-     * @param AttributeSet $result
-     * @param array|null $exportAttributes
-     *
-     * @return DataObjectDataExtractor
-     */
     protected function addLocalizedFieldsInFieldCollections(
         DataObject\Concrete $object,
         AttributeSet $result,
diff --git a/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DocumentDataExtractor.php b/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DocumentDataExtractor.php
index 8ef37672ee5..2e2bd0d01bd 100644
--- a/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DocumentDataExtractor.php
+++ b/bundles/XliffBundle/src/ExportDataExtractorService/DataExtractor/DocumentDataExtractor.php
@@ -35,12 +35,8 @@ public function __construct(EditableUsageResolver $EditableUsageResolver)
     }
 
     /**
-     * @param TranslationItem $translationItem
-     * @param string $sourceLanguage
      * @param string[] $targetLanguages
      *
-     * @return AttributeSet
-     *
      * @throws \Exception
      */
     public function extract(TranslationItem $translationItem, string $sourceLanguage, array $targetLanguages): AttributeSet
@@ -61,10 +57,7 @@ public function extract(TranslationItem $translationItem, string $sourceLanguage
     }
 
     /**
-     * @param Document $document
-     * @param AttributeSet $result
      *
-     * @return DocumentDataExtractor
      *
      * @throws \Exception
      */
diff --git a/bundles/XliffBundle/src/ExportDataExtractorService/ExportDataExtractorService.php b/bundles/XliffBundle/src/ExportDataExtractorService/ExportDataExtractorService.php
index e27df27fff2..1c2479d7ebf 100644
--- a/bundles/XliffBundle/src/ExportDataExtractorService/ExportDataExtractorService.php
+++ b/bundles/XliffBundle/src/ExportDataExtractorService/ExportDataExtractorService.php
@@ -28,11 +28,7 @@ class ExportDataExtractorService implements ExportDataExtractorServiceInterface
     private array $dataExtractors;
 
     /**
-     * @param TranslationItem $translationItem
-     * @param string $sourceLanguage
-     * @param array $targetLanguages
      *
-     * @return AttributeSet
      *
      * @throws \Exception
      */
@@ -42,8 +38,6 @@ public function extract(TranslationItem $translationItem, string $sourceLanguage
     }
 
     /**
-     * @param string $type
-     * @param DataExtractorInterface $dataExtractor
      *
      * @return $this
      */
@@ -55,9 +49,7 @@ public function registerDataExtractor(string $type, DataExtractorInterface $data
     }
 
     /**
-     * @param string $type
      *
-     * @return DataExtractorInterface
      *
      * @throws \Exception
      */
diff --git a/bundles/XliffBundle/src/ExportDataExtractorService/ExportDataExtractorServiceInterface.php b/bundles/XliffBundle/src/ExportDataExtractorService/ExportDataExtractorServiceInterface.php
index 297afc3b8fe..9d402a6008c 100644
--- a/bundles/XliffBundle/src/ExportDataExtractorService/ExportDataExtractorServiceInterface.php
+++ b/bundles/XliffBundle/src/ExportDataExtractorService/ExportDataExtractorServiceInterface.php
@@ -23,12 +23,8 @@
 interface ExportDataExtractorServiceInterface
 {
     /**
-     * @param TranslationItem $translationItem
-     * @param string $sourceLanguage
      * @param string[] $targetLanguages
      *
-     * @return AttributeSet
-     *
      * @throws \Exception
      */
     public function extract(TranslationItem $translationItem, string $sourceLanguage, array $targetLanguages): AttributeSet;
@@ -36,9 +32,7 @@ public function extract(TranslationItem $translationItem, string $sourceLanguage
     public function registerDataExtractor(string $type, DataExtractorInterface $dataExtractor): ExportDataExtractorServiceInterface;
 
     /**
-     * @param string $type
      *
-     * @return DataExtractorInterface
      *
      * @throws \Exception
      */
diff --git a/bundles/XliffBundle/src/ExportService/ExportService.php b/bundles/XliffBundle/src/ExportService/ExportService.php
index d02bdafe575..5732059ab29 100644
--- a/bundles/XliffBundle/src/ExportService/ExportService.php
+++ b/bundles/XliffBundle/src/ExportService/ExportService.php
@@ -29,8 +29,6 @@ class ExportService implements ExportServiceInterface
     /**
      * ExportService constructor.
      *
-     * @param ExportDataExtractorServiceInterface $exportDataExtractorService
-     * @param ExporterInterface $translationExporter
      */
     public function __construct(
         ExportDataExtractorServiceInterface $exportDataExtractorService,
@@ -40,9 +38,6 @@ public function __construct(
         $this->translationExporter = $translationExporter;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function exportTranslationItems(TranslationItemCollection $translationItems, string $sourceLanguage, array $targetLanguages, string $exportId = null): string
     {
         $exportId = empty($exportId) ? uniqid() : $exportId;
diff --git a/bundles/XliffBundle/src/ExportService/ExportServiceInterface.php b/bundles/XliffBundle/src/ExportService/ExportServiceInterface.php
index b3a29617a76..87e1af180a6 100644
--- a/bundles/XliffBundle/src/ExportService/ExportServiceInterface.php
+++ b/bundles/XliffBundle/src/ExportService/ExportServiceInterface.php
@@ -22,12 +22,7 @@
 interface ExportServiceInterface
 {
     /**
-     * @param TranslationItemCollection $translationItems
-     * @param string $sourceLanguage
-     * @param array $targetLanguages
-     * @param string|null $exportId
      *
-     * @return string
      *
      * @throws \Exception
      */
diff --git a/bundles/XliffBundle/src/ExportService/Exporter/ExporterInterface.php b/bundles/XliffBundle/src/ExportService/Exporter/ExporterInterface.php
index 0f827787681..c3029484417 100644
--- a/bundles/XliffBundle/src/ExportService/Exporter/ExporterInterface.php
+++ b/bundles/XliffBundle/src/ExportService/Exporter/ExporterInterface.php
@@ -20,12 +20,6 @@
 
 interface ExporterInterface
 {
-    /**
-     * @param AttributeSet $attributeSet
-     * @param string|null $exportId
-     *
-     * @return string
-     */
     public function export(AttributeSet $attributeSet, string $exportId = null): string;
 
     public function getExportFilePath(string $exportId): string;
diff --git a/bundles/XliffBundle/src/ExportService/Exporter/Xliff12Exporter.php b/bundles/XliffBundle/src/ExportService/Exporter/Xliff12Exporter.php
index ab00766444f..14c09190aee 100644
--- a/bundles/XliffBundle/src/ExportService/Exporter/Xliff12Exporter.php
+++ b/bundles/XliffBundle/src/ExportService/Exporter/Xliff12Exporter.php
@@ -37,9 +37,6 @@ public function __construct(
         $this->xliffEscaper = $xliffEscaper;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function export(AttributeSet $attributeSet, string $exportId = null): string
     {
         $exportId = $exportId ?: uniqid();
diff --git a/bundles/XliffBundle/src/ImportDataExtractor/ImportDataExtractorInterface.php b/bundles/XliffBundle/src/ImportDataExtractor/ImportDataExtractorInterface.php
index 06f6a442b3a..205e3071ca4 100644
--- a/bundles/XliffBundle/src/ImportDataExtractor/ImportDataExtractorInterface.php
+++ b/bundles/XliffBundle/src/ImportDataExtractor/ImportDataExtractorInterface.php
@@ -21,10 +21,7 @@
 interface ImportDataExtractorInterface
 {
     /**
-     * @param string $importId
-     * @param int $stepId
      *
-     * @return AttributeSet|null
      *
      * @throws \Exception
      */
@@ -33,9 +30,7 @@ public function extractElement(string $importId, int $stepId): ?AttributeSet;
     public function getImportFilePath(string $importId): string;
 
     /**
-     * @param string $importId
      *
-     * @return int
      *
      * @throws \Exception
      */
diff --git a/bundles/XliffBundle/src/ImportDataExtractor/Xliff12DataExtractor.php b/bundles/XliffBundle/src/ImportDataExtractor/Xliff12DataExtractor.php
index 8f6716d52e1..0e56e244e3d 100644
--- a/bundles/XliffBundle/src/ImportDataExtractor/Xliff12DataExtractor.php
+++ b/bundles/XliffBundle/src/ImportDataExtractor/Xliff12DataExtractor.php
@@ -34,9 +34,6 @@ public function __construct(Xliff12Escaper $xliffEscaper, TranslationItemResolve
         $this->translationItemResolver = $translationItemResolver;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function extractElement(string $importId, int $stepId): ?AttributeSet
     {
         $xliff = $this->loadFile($importId);
@@ -89,9 +86,6 @@ public function getImportFilePath(string $importId): string
         return PIMCORE_SYSTEM_TEMP_DIRECTORY . '/' . $importId . '.xliff';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function countSteps(string $importId): int
     {
         $xliff = $this->loadFile($importId);
diff --git a/bundles/XliffBundle/src/ImporterService/Importer/AbstractElementImporter.php b/bundles/XliffBundle/src/ImporterService/Importer/AbstractElementImporter.php
index 6cb806ceee4..db73d0e3d9d 100644
--- a/bundles/XliffBundle/src/ImporterService/Importer/AbstractElementImporter.php
+++ b/bundles/XliffBundle/src/ImporterService/Importer/AbstractElementImporter.php
@@ -24,9 +24,6 @@
 
 class AbstractElementImporter implements ImporterInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function import(AttributeSet $attributeSet, bool $saveElement = true): void
     {
         $translationItem = $attributeSet->getTranslationItem();
diff --git a/bundles/XliffBundle/src/ImporterService/Importer/DataObjectImporter.php b/bundles/XliffBundle/src/ImporterService/Importer/DataObjectImporter.php
index da99e738df4..dafae9b5ea1 100644
--- a/bundles/XliffBundle/src/ImporterService/Importer/DataObjectImporter.php
+++ b/bundles/XliffBundle/src/ImporterService/Importer/DataObjectImporter.php
@@ -23,9 +23,6 @@
 
 class DataObjectImporter extends AbstractElementImporter
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function importAttribute(Element\ElementInterface $element, string $targetLanguage, Attribute $attribute): void
     {
         parent::importAttribute($element, $targetLanguage, $attribute);
@@ -109,9 +106,6 @@ protected function importAttribute(Element\ElementInterface $element, string $ta
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function saveElement(Element\ElementInterface $element): void
     {
         if ($element instanceof DataObject\Concrete) {
diff --git a/bundles/XliffBundle/src/ImporterService/Importer/DocumentImporter.php b/bundles/XliffBundle/src/ImporterService/Importer/DocumentImporter.php
index 3cc665f6739..b7cd7d1d0ff 100644
--- a/bundles/XliffBundle/src/ImporterService/Importer/DocumentImporter.php
+++ b/bundles/XliffBundle/src/ImporterService/Importer/DocumentImporter.php
@@ -22,9 +22,6 @@
 
 class DocumentImporter extends AbstractElementImporter
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function importAttribute(Element\ElementInterface $element, string $targetLanguage, Attribute $attribute): void
     {
         if ($targetLanguage != $element->getProperty('language')) {
diff --git a/bundles/XliffBundle/src/ImporterService/Importer/ImporterInterface.php b/bundles/XliffBundle/src/ImporterService/Importer/ImporterInterface.php
index 0c31a1c4836..ff268f9ab9a 100644
--- a/bundles/XliffBundle/src/ImporterService/Importer/ImporterInterface.php
+++ b/bundles/XliffBundle/src/ImporterService/Importer/ImporterInterface.php
@@ -21,10 +21,7 @@
 interface ImporterInterface
 {
     /**
-     * @param AttributeSet $attributeSet
-     * @param bool $saveElement
      *
-     * @return void
      *
      * @throws \Exception
      */
diff --git a/bundles/XliffBundle/src/ImporterService/ImporterService.php b/bundles/XliffBundle/src/ImporterService/ImporterService.php
index 32a6dcb4dc2..3af0c289002 100644
--- a/bundles/XliffBundle/src/ImporterService/ImporterService.php
+++ b/bundles/XliffBundle/src/ImporterService/ImporterService.php
@@ -26,9 +26,6 @@ class ImporterService implements ImporterServiceInterface
      */
     private array $importers = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public function import(AttributeSet $attributeSet, bool $saveElement = true): void
     {
         $this->getImporter($attributeSet->getTranslationItem()->getType())->import($attributeSet, $saveElement);
@@ -41,9 +38,6 @@ public function registerImporter(string $type, ImporterInterface $importer): Imp
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getImporter(string $type): ImporterInterface
     {
         if (isset($this->importers[$type])) {
diff --git a/bundles/XliffBundle/src/ImporterService/ImporterServiceInterface.php b/bundles/XliffBundle/src/ImporterService/ImporterServiceInterface.php
index 140c55c4ae0..4545890be03 100644
--- a/bundles/XliffBundle/src/ImporterService/ImporterServiceInterface.php
+++ b/bundles/XliffBundle/src/ImporterService/ImporterServiceInterface.php
@@ -22,10 +22,7 @@
 interface ImporterServiceInterface
 {
     /**
-     * @param AttributeSet $attributeSet
-     * @param bool $saveElement
      *
-     * @return void
      *
      * @throws \Exception
      */
@@ -34,9 +31,7 @@ public function import(AttributeSet $attributeSet, bool $saveElement = true): vo
     public function registerImporter(string $type, ImporterInterface $importer): ImporterServiceInterface;
 
     /**
-     * @param string $type
      *
-     * @return ImporterInterface
      *
      * @throws \Exception
      */
diff --git a/bundles/XliffBundle/src/TranslationItemCollection/TranslationItem.php b/bundles/XliffBundle/src/TranslationItemCollection/TranslationItem.php
index de215126f50..c27c42e3b49 100644
--- a/bundles/XliffBundle/src/TranslationItemCollection/TranslationItem.php
+++ b/bundles/XliffBundle/src/TranslationItemCollection/TranslationItem.php
@@ -29,9 +29,6 @@ class TranslationItem
     /**
      * TranslationItem constructor.
      *
-     * @param string $type
-     * @param string $id
-     * @param ElementInterface $element
      */
     public function __construct(string $type, string $id, ElementInterface $element)
     {
diff --git a/doc/03_Documents/01_Editables/02_Areablock/02_Bricks.md b/doc/03_Documents/01_Editables/02_Areablock/02_Bricks.md
index 61af5819355..56d2bf163aa 100644
--- a/doc/03_Documents/01_Editables/02_Areablock/02_Bricks.md
+++ b/doc/03_Documents/01_Editables/02_Areablock/02_Bricks.md
@@ -250,9 +250,6 @@ use Pimcore\Model\Document\Editable\Area\Info;
 
 class WysiwygWithImages extends AbstractAreabrick implements EditableDialogBoxInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return 'WYSIWYG w. Images';
@@ -301,9 +298,6 @@ use Pimcore\Model\Document\Editable\Area\Info;
 
 class WysiwygWithImages extends AbstractAreabrick implements EditableDialogBoxInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return 'WYSIWYG w. Images';
diff --git a/doc/18_Tools_and_Features/02_Custom_Icons.md b/doc/18_Tools_and_Features/02_Custom_Icons.md
index 4901a6cb491..050ea80a8db 100644
--- a/doc/18_Tools_and_Features/02_Custom_Icons.md
+++ b/doc/18_Tools_and_Features/02_Custom_Icons.md
@@ -90,9 +90,6 @@ It is possible to define custom tooltips which are shown while hovering over the
 The example outlines how to provide a custom tooltip for `Car` objects.
 
 ```php
-    /**
-     * {@inheritdoc}
-     */
     public function getElementQtipConfig(): ?array
     {
         if ($this->element instanceof \App\Model\Product\Car) {
diff --git a/doc/19_Development_Tools_and_Details/10_Security_Authentication/01_Authenticate_Pimcore_Objects.md b/doc/19_Development_Tools_and_Details/10_Security_Authentication/01_Authenticate_Pimcore_Objects.md
index f9e609c019f..b04c7e684cf 100644
--- a/doc/19_Development_Tools_and_Details/10_Security_Authentication/01_Authenticate_Pimcore_Objects.md
+++ b/doc/19_Development_Tools_and_Details/10_Security_Authentication/01_Authenticate_Pimcore_Objects.md
@@ -29,10 +29,9 @@ use Symfony\Component\Security\Core\User\UserInterface;
 class User extends BaseUser implements UserInterface
 {
     /**
-     * Trigger the hash calculation to remove the plain text password from the instance. This
-     * is necessary to make sure no plain text passwords are serialized.
-     *
-     * {@inheritdoc}
+     * Trigger the hash calculation to remove the plain text password from the instance. 
+     * 
+     * This is necessary to make sure no plain text passwords are serialized.
      */
     public function eraseCredentials(): void
     {
diff --git a/doc/26_Best_Practice/40_Integrating_Commerce_Data_with_Content.md b/doc/26_Best_Practice/40_Integrating_Commerce_Data_with_Content.md
index b510e919067..94c898def20 100644
--- a/doc/26_Best_Practice/40_Integrating_Commerce_Data_with_Content.md
+++ b/doc/26_Best_Practice/40_Integrating_Commerce_Data_with_Content.md
@@ -22,9 +22,6 @@ namespace App\Document\Areabrick;
 
 class MyProductTeaser extends AbstractAreabrick
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return 'My Product Teaser';
diff --git a/lib/Cache.php b/lib/Cache.php
index d051a14a5a0..6b62a24e9ea 100644
--- a/lib/Cache.php
+++ b/lib/Cache.php
@@ -32,7 +32,6 @@ class Cache
      *
      * @internal
      *
-     * @return CoreCacheHandler
      */
     public static function getHandler(): CoreCacheHandler
     {
@@ -64,9 +63,7 @@ public static function init(): void
     /**
      * Returns the content of the requested cache entry
      *
-     * @param string $key
      *
-     * @return mixed
      */
     public static function load(string $key): mixed
     {
@@ -76,14 +73,7 @@ public static function load(string $key): mixed
     /**
      * Save an item to the cache (deferred to shutdown if force is false and forceImmediateWrite is not set)
      *
-     * @param mixed $data
-     * @param string $key
-     * @param array $tags
-     * @param \DateInterval|int|null $lifetime
-     * @param int $priority
-     * @param bool $force
      *
-     * @return bool
      */
     public static function save(mixed $data, string $key, array $tags = [], \DateInterval|int $lifetime = null, int $priority = 0, bool $force = false): bool
     {
@@ -93,9 +83,7 @@ public static function save(mixed $data, string $key, array $tags = [], \DateInt
     /**
      * Remove an item from the cache
      *
-     * @param string $key
      *
-     * @return bool
      */
     public static function remove(string $key): bool
     {
@@ -105,7 +93,6 @@ public static function remove(string $key): bool
     /**
      * Empty the cache
      *
-     * @return bool
      */
     public static function clearAll(): bool
     {
@@ -115,9 +102,7 @@ public static function clearAll(): bool
     /**
      * Removes entries from the cache matching the given tag
      *
-     * @param string $tag
      *
-     * @return bool
      */
     public static function clearTag(string $tag): bool
     {
@@ -127,9 +112,7 @@ public static function clearTag(string $tag): bool
     /**
      * Removes entries from the cache matching the given tags
      *
-     * @param array $tags
      *
-     * @return bool
      */
     public static function clearTags(array $tags = []): bool
     {
@@ -139,7 +122,6 @@ public static function clearTags(array $tags = []): bool
     /**
      * Adds a tag to the shutdown queue
      *
-     * @param string $tag
      */
     public static function addClearTagOnShutdown(string $tag): void
     {
@@ -149,7 +131,6 @@ public static function addClearTagOnShutdown(string $tag): void
     /**
      * Add tag to the list ignored on save. Items with this tag won't be saved to cache.
      *
-     * @param string $tag
      */
     public static function addIgnoredTagOnSave(string $tag): void
     {
@@ -159,7 +140,6 @@ public static function addIgnoredTagOnSave(string $tag): void
     /**
      * Remove tag from the list ignored on save
      *
-     * @param string $tag
      */
     public static function removeIgnoredTagOnSave(string $tag): void
     {
@@ -169,7 +149,6 @@ public static function removeIgnoredTagOnSave(string $tag): void
     /**
      * Add tag to the list ignored on clear. Tags in this list won't be cleared via clearTags()
      *
-     * @param string $tag
      */
     public static function addIgnoredTagOnClear(string $tag): void
     {
@@ -179,7 +158,6 @@ public static function addIgnoredTagOnClear(string $tag): void
     /**
      * Remove tag from the list ignored on clear
      *
-     * @param string $tag
      */
     public static function removeIgnoredTagOnClear(string $tag): void
     {
@@ -189,7 +167,6 @@ public static function removeIgnoredTagOnClear(string $tag): void
     /**
      * Write and clean up cache
      *
-     * @param bool $forceWrite
      *
      * @internal
      */
diff --git a/lib/Cache/Core/CoreCacheHandler.php b/lib/Cache/Core/CoreCacheHandler.php
index 374ef45eae9..611af392dd0 100644
--- a/lib/Cache/Core/CoreCacheHandler.php
+++ b/lib/Cache/Core/CoreCacheHandler.php
@@ -53,14 +53,12 @@ class CoreCacheHandler implements LoggerAwareInterface
     /**
      * Actually write/load to/from cache?
      *
-     * @var bool
      */
     protected bool $enabled = true;
 
     /**
      * Is the cache handled in CLI mode?
      *
-     * @var bool
      */
     protected bool $handleCli = false;
 
@@ -74,28 +72,24 @@ class CoreCacheHandler implements LoggerAwareInterface
     /**
      * Tags which were already cleared
      *
-     * @var array
      */
     protected array $clearedTags = [];
 
     /**
      * Items having one of the tags in this list are not saved
      *
-     * @var array
      */
     protected array $tagsIgnoredOnSave = [];
 
     /**
      * Items having one of the tags in this list are not cleared when calling clearTags
      *
-     * @var array
      */
     protected array $tagsIgnoredOnClear = [];
 
     /**
      * Items having tags which are in this array are cleared on shutdown. This is especially for the output-cache.
      *
-     * @var array
      */
     protected array $tagsClearedOnShutdown = [];
 
@@ -103,7 +97,6 @@ class CoreCacheHandler implements LoggerAwareInterface
      * State variable which is set to true after the cache was cleared - prevent new items being
      * written to cache after a clear.
      *
-     * @var bool
      */
     protected bool $cacheCleared = false;
 
@@ -111,21 +104,18 @@ class CoreCacheHandler implements LoggerAwareInterface
      * Tags in this list are shifted to the clearTagsOnShutdown list when scheduled via clearTags. See comment on normalizeClearTags
      * method why this exists.
      *
-     * @var array
      */
     protected array $shutdownTags = ['output'];
 
     /**
      * If set to true items are directly written into the cache, and do not get into the queue
      *
-     * @var bool
      */
     protected bool $forceImmediateWrite = false;
 
     /**
      * How many items should stored to the cache within one process
      *
-     * @var int
      */
     protected int $maxWriteToCacheItems = 50;
 
@@ -143,7 +133,6 @@ public function __construct(TagAwareAdapterInterface $adapter, WriteLock $writeL
     /**
      * @internal
      *
-     * @param TagAwareAdapterInterface $pool
      */
     public function setPool(TagAwareAdapterInterface $pool): void
     {
@@ -158,7 +147,6 @@ public function getWriteLock(): WriteLock
     /**
      * @codeCoverageIgnore
      *
-     * @return LoggerInterface
      */
     public function getLogger(): LoggerInterface
     {
@@ -198,7 +186,6 @@ protected function dispatchStatusEvent(): void
     /**
      * @codeCoverageIgnore
      *
-     * @return bool
      */
     public function getHandleCli(): bool
     {
@@ -208,8 +195,6 @@ public function getHandleCli(): bool
     /**
      * @codeCoverageIgnore
      *
-     * @param bool $handleCli
-     *
      * @return $this
      */
     public function setHandleCli(bool $handleCli): static
@@ -222,7 +207,6 @@ public function setHandleCli(bool $handleCli): static
     /**
      * @codeCoverageIgnore
      *
-     * @return bool
      */
     public function getForceImmediateWrite(): bool
     {
@@ -232,8 +216,6 @@ public function getForceImmediateWrite(): bool
     /**
      * @codeCoverageIgnore
      *
-     * @param bool $forceImmediateWrite
-     *
      * @return $this
      */
     public function setForceImmediateWrite(bool $forceImmediateWrite): static
@@ -253,9 +235,7 @@ public function setMaxWriteToCacheItems(int $maxWriteToCacheItems): static
     /**
      * Load data from cache (retrieves data from cache item)
      *
-     * @param string $key
      *
-     * @return mixed
      */
     public function load(string $key): mixed
     {
@@ -279,9 +259,7 @@ public function load(string $key): mixed
     /**
      * Get PSR-6 cache item
      *
-     * @param string $key
      *
-     * @return CacheItem
      */
     public function getItem(string $key): CacheItem
     {
@@ -298,14 +276,7 @@ public function getItem(string $key): CacheItem
     /**
      * Save data to cache
      *
-     * @param string $key
-     * @param mixed $data
-     * @param array $tags
-     * @param \DateInterval|int|null $lifetime
-     * @param int|null $priority
-     * @param bool $force
      *
-     * @return bool
      */
     public function save(string $key, mixed $data, array $tags = [], \DateInterval|int $lifetime = null, ?int $priority = 0, bool $force = false): bool
     {
@@ -356,9 +327,7 @@ public function save(string $key, mixed $data, array $tags = [], \DateInterval|i
     /**
      * Add item to save queue, respecting maxWriteToCacheItems setting
      *
-     * @param CacheQueueItem $item
      *
-     * @return bool
      */
     protected function addToSaveQueue(CacheQueueItem $item): bool
     {
@@ -393,9 +362,7 @@ public function cleanupQueue(): void
     /**
      * Prepare data for cache item and handle items we don't want to save (e.g. hardlinks)
      *
-     * @param mixed $data
      *
-     * @return mixed
      */
     protected function prepareCacheData(mixed $data): mixed
     {
@@ -469,15 +436,6 @@ protected function prepareCacheTags(string $key, mixed $data, array $tags = []):
         return $tags;
     }
 
-    /**
-     * @param string $key
-     * @param mixed $data
-     * @param array $tags
-     * @param \DateInterval|int|null $lifetime
-     * @param bool $force
-     *
-     * @return bool
-     */
     protected function storeCacheData(string $key, mixed $data, array $tags = [], \DateInterval|int $lifetime = null, bool $force = false): bool
     {
         if ($this->writeInProgress) {
@@ -576,9 +534,7 @@ function ($currentValue) {
     /**
      * Remove a cache item
      *
-     * @param string $key
      *
-     * @return bool
      */
     public function remove(string $key): bool
     {
@@ -592,7 +548,6 @@ public function remove(string $key): bool
     /**
      * Empty the cache
      *
-     * @return bool
      */
     public function clearAll(): bool
     {
@@ -619,7 +574,6 @@ public function clearTag(string $tag): bool
     /**
      * @param string[] $tags
      *
-     * @return bool
      */
     public function clearTags(array $tags): bool
     {
@@ -654,7 +608,6 @@ public function clearTags(array $tags): bool
     /**
      * Clears all tags stored in tagsClearedOnShutdown, this function is executed during Pimcore shutdown
      *
-     * @return bool
      */
     public function clearTagsOnShutdown(): bool
     {
@@ -708,7 +661,6 @@ protected function normalizeClearTags(array $tags): array
     /**
      * Add tag to list of cleared tags (internal use only)
      *
-     * @param array|string $tags
      *
      * @return $this
      */
@@ -728,7 +680,6 @@ protected function addClearedTags(array|string $tags): static
     /**
      * Adds a tag to the shutdown queue, see clearTagsOnShutdown
      *
-     * @param string $tag
      *
      * @return $this
      *
@@ -745,7 +696,6 @@ public function addTagClearedOnShutdown(string $tag): static
     }
 
     /**
-     * @param string $tag
      *
      * @return $this
      *
@@ -760,7 +710,6 @@ public function addTagIgnoredOnSave(string $tag): static
     }
 
     /**
-     * @param string $tag
      *
      * @return $this
      *
@@ -776,7 +725,6 @@ public function removeTagIgnoredOnSave(string $tag): static
     }
 
     /**
-     * @param string $tag
      *
      * @return $this
      *
@@ -791,7 +739,6 @@ public function addTagIgnoredOnClear(string $tag): static
     }
 
     /**
-     * @param string $tag
      *
      * @return $this
      *
@@ -809,8 +756,6 @@ public function removeTagIgnoredOnClear(string $tag): static
     /**
      * @internal
      *
-     * @param array $tags
-     *
      * @return $this
      */
     public function removeClearedTags(array $tags): static
@@ -827,7 +772,6 @@ public function removeClearedTags(array $tags): static
      *
      * @internal
      *
-     * @return bool
      */
     public function writeSaveQueue(): bool
     {
@@ -878,7 +822,6 @@ public function writeSaveQueue(): bool
     /**
      * Shut down pimcore - write cache entries and clean up
      *
-     * @param bool $forceWrite
      *
      * @return $this
      *
@@ -922,7 +865,6 @@ public function shutdown(bool $forceWrite = false): static
     /**
      * @codeCoverageIgnore
      *
-     * @return bool
      */
     protected function isCli(): bool
     {
diff --git a/lib/Cache/Core/WriteLock.php b/lib/Cache/Core/WriteLock.php
index 9ad326539df..32be171b27d 100644
--- a/lib/Cache/Core/WriteLock.php
+++ b/lib/Cache/Core/WriteLock.php
@@ -41,7 +41,6 @@ class WriteLock implements LoggerAwareInterface
      * This is to recheck when removing the write lock (if the value is different -> higher) do not remove the lock
      * because then another process has acquired a lock.
      *
-     * @var int|null
      */
     protected ?int $timestamp = null;
 
@@ -91,9 +90,7 @@ protected function initializeLock(): void
     /**
      * Set a write lock (prevents items being written to cache)
      *
-     * @param bool $force
      *
-     * @return bool
      */
     public function lock(bool $force = false): bool
     {
@@ -124,7 +121,6 @@ public function lock(bool $force = false): bool
     /**
      * Check if a write lock is active
      *
-     * @return bool
      */
     public function hasLock(): bool
     {
@@ -161,7 +157,6 @@ protected function isLockValid(int $lockTime): bool
     /**
      * Remove write lock from instance and from cache
      *
-     * @return bool
      */
     public function removeLock(): bool
     {
diff --git a/lib/Cache/RuntimeCache.php b/lib/Cache/RuntimeCache.php
index f93536b703a..e17716fd31e 100644
--- a/lib/Cache/RuntimeCache.php
+++ b/lib/Cache/RuntimeCache.php
@@ -27,7 +27,6 @@ class RuntimeCache extends \ArrayObject
     /**
      * Retrieves the default registry instance.
      *
-     * @return self
      */
     public static function getInstance(): self
     {
@@ -80,8 +79,6 @@ public static function getInstance(): self
      *
      * @param string $index - get the value associated with $index
      *
-     * @return mixed
-     *
      * @throws \Exception if no entry is registered for $index.
      */
     public static function get(string $index): mixed
@@ -106,7 +103,6 @@ public static function get(string $index): mixed
      *   the value.
      * @param mixed $value The object to store in the ArrayObject.
      *
-     * @return void
      */
     public static function set(string $index, mixed $value): void
     {
@@ -118,9 +114,7 @@ public static function set(string $index, mixed $value): void
      * Returns TRUE if the $index is a named value in the registry,
      * or FALSE if $index was not found in the registry.
      *
-     * @param string $index
      *
-     * @return bool
      */
     public static function isRegistered(string $index): bool
     {
@@ -141,9 +135,6 @@ public function __construct($array = [], int $flags = parent::ARRAY_AS_PROPS)
         parent::__construct($array, $flags);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function offsetSet($index, $value): void
     {
         parent::offsetSet($index, $value);
@@ -152,8 +143,6 @@ public function offsetSet($index, $value): void
     /**
      * Alias of self::set() to be compatible with Pimcore\Cache
      *
-     * @param mixed $data
-     * @param string $id
      */
     public static function save(mixed $data, string $id): void
     {
@@ -163,9 +152,7 @@ public static function save(mixed $data, string $id): void
     /**
      * Alias of self::get() to be compatible with Pimcore\Cache
      *
-     * @param string $id
      *
-     * @return mixed
      */
     public static function load(string $id): mixed
     {
diff --git a/lib/Cache/Symfony/CacheClearer.php b/lib/Cache/Symfony/CacheClearer.php
index 874915f5613..833832ef7b6 100644
--- a/lib/Cache/Symfony/CacheClearer.php
+++ b/lib/Cache/Symfony/CacheClearer.php
@@ -86,9 +86,6 @@ public function warmup(string $environment, array $options = []): Process
         return $this->runCommand('cache:warmup', $resolver->resolve($options));
     }
 
-    /**
-     * @param \Closure|null $runCallback
-     */
     public function setRunCallback(\Closure $runCallback = null): void
     {
         $this->runCallback = $runCallback;
diff --git a/lib/Cache/Tool/Warming.php b/lib/Cache/Tool/Warming.php
index 2b9602f49fd..684af5ebf1a 100644
--- a/lib/Cache/Tool/Warming.php
+++ b/lib/Cache/Tool/Warming.php
@@ -35,7 +35,6 @@ class Warming
     /**
      * @static
      *
-     * @param array|null $types
      */
     public static function documents(array $types = null): void
     {
@@ -52,8 +51,6 @@ public static function documents(array $types = null): void
     /**
      * @static
      *
-     * @param array|null $types
-     * @param array|null $classes
      */
     public static function objects(array $types = null, array $classes = null): void
     {
@@ -75,7 +72,6 @@ public static function objects(array $types = null, array $classes = null): void
     /**
      * @static
      *
-     * @param array|null $types
      */
     public static function assets(array $types = null): void
     {
@@ -92,7 +88,6 @@ public static function assets(array $types = null): void
     /**
      * Adds a Pimcore Object/Asset/Document to the cache
      *
-     * @param Element\ElementInterface $element
      */
     public static function loadElementToCache(Element\ElementInterface $element): void
     {
diff --git a/lib/Composer.php b/lib/Composer.php
index 386287b3852..6428987b9b7 100644
--- a/lib/Composer.php
+++ b/lib/Composer.php
@@ -73,7 +73,6 @@ public static function clearDataCache(Event $event, string $consoleDir): void
     }
 
     /**
-     * @param string $rootPath
      *
      * @internal
      */
@@ -241,7 +240,6 @@ private static function removeDecoration(string $string): string
      * strict user permission checks (which can be done on Windows 7 but not on Windows
      * Vista).
      *
-     * @param Event $event
      */
     public static function installAssets(Event $event): void
     {
@@ -277,7 +275,6 @@ public static function installAssets(Event $event): void
      *
      * Clears the Symfony cache.
      *
-     * @param Event $event
      */
     public static function clearCache(Event $event): void
     {
diff --git a/lib/Composer/PackageInfo.php b/lib/Composer/PackageInfo.php
index 2c551f8ff03..a426f33d3cb 100644
--- a/lib/Composer/PackageInfo.php
+++ b/lib/Composer/PackageInfo.php
@@ -27,9 +27,7 @@ class PackageInfo
     /**
      * Gets installed packages, optionally filtered by type
      *
-     * @param array|string|null $type
      *
-     * @return array
      */
     public function getInstalledPackages(array|string $type = null): array
     {
diff --git a/lib/Config.php b/lib/Config.php
index 8a60c85f855..56f5eec993c 100644
--- a/lib/Config.php
+++ b/lib/Config.php
@@ -42,32 +42,23 @@ final class Config implements ArrayAccess
      */
     protected static ?array $systemConfig = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function offsetExists($offset): bool
     {
         return self::getSystemConfiguration($offset) !== null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function offsetSet($offset, $value): void
     {
         throw new Exception("modifying the config isn't allowed");
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function offsetUnset($offset): void
     {
         throw new Exception("modifying the config isn't allowed");
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @return array<string, mixed>|null
      */
@@ -81,7 +72,6 @@ public function offsetGet($offset): ?array
      *
      * @param string $name - name of configuration file. slash is allowed for subdirectories.
      *
-     * @return string
      */
     public static function locateConfigFile(string $name): string
     {
@@ -174,9 +164,7 @@ public static function getSystemConfiguration(string $offset = null): ?array
     }
 
     /**
-     * @param string|null $languange
      *
-     * @return string
      *
      * @internal
      */
@@ -301,7 +289,6 @@ public static function getWebsiteConfig(string $language = null): array
 
     /**
      * @param array<string, mixed>|null $config
-     * @param string|null $language
      *
      * @internal
      */
@@ -315,9 +302,7 @@ public static function setWebsiteConfig(?array $config, string $language = null)
      *
      * @param string|null $key  Config key to directly load. If null, the whole config will be returned
      * @param mixed $default    Default value to use if the key is not set
-     * @param string|null $language
      *
-     * @return mixed
      */
     public static function getWebsiteConfigValue(string $key = null, mixed $default = null, string $language = null): mixed
     {
diff --git a/lib/Config/BundleConfigLocator.php b/lib/Config/BundleConfigLocator.php
index 4b296c155ee..7de75859c05 100644
--- a/lib/Config/BundleConfigLocator.php
+++ b/lib/Config/BundleConfigLocator.php
@@ -53,9 +53,7 @@ public function __construct(KernelInterface $kernel)
     /**
      * Find config files for the given name (e.g. config)
      *
-     * @param string $name
      *
-     * @return array
      */
     public function locate(string $name): array
     {
diff --git a/lib/Config/LocationAwareConfigRepository.php b/lib/Config/LocationAwareConfigRepository.php
index af9761ee4f0..8bb7a7405f5 100644
--- a/lib/Config/LocationAwareConfigRepository.php
+++ b/lib/Config/LocationAwareConfigRepository.php
@@ -114,10 +114,7 @@ private function getDataFromSettingsStore(string $key, ?string &$dataSource): mi
     }
 
     /**
-     * @param string|null $key
-     * @param string|null $dataSource
      *
-     * @return bool
      *
      * @throws \Exception
      */
@@ -171,9 +168,6 @@ public function getReadTargets(): array
     }
 
     /**
-     * @param string $key
-     * @param mixed $data
-     * @param callable|null $yamlStructureCallback
      *
      * @throws \Exception
      */
@@ -244,8 +238,6 @@ private function getVarConfigFile(string $key): string
     }
 
     /**
-     * @param string $key
-     * @param string|null $dataSource
      *
      * @throws \Exception
      */
diff --git a/lib/Console/Application.php b/lib/Console/Application.php
index 9c91e739935..5632f754ab8 100644
--- a/lib/Console/Application.php
+++ b/lib/Console/Application.php
@@ -41,7 +41,6 @@ final class Application extends \Symfony\Bundle\FrameworkBundle\Console\Applicat
     /**
      * Constructor.
      *
-     * @param KernelInterface $kernel
      *
      * @internal param string $name The name of the application
      * @internal param string $version The version of the application
diff --git a/lib/Console/Style/PimcoreStyle.php b/lib/Console/Style/PimcoreStyle.php
index b941696509e..18ea4e3bc9f 100644
--- a/lib/Console/Style/PimcoreStyle.php
+++ b/lib/Console/Style/PimcoreStyle.php
@@ -52,9 +52,6 @@ public function getOutput(): OutputInterface
     /**
      * Prints an underlined title without prepending block and/or formatting output
      *
-     * @param string $message
-     * @param string $underlineChar
-     * @param string|null $style
      */
     public function simpleSection(string $message, string $underlineChar = '-', string $style = null): void
     {
diff --git a/lib/Console/Traits/DryRun.php b/lib/Console/Traits/DryRun.php
index 0b8c7671194..71d2e3540ad 100644
--- a/lib/Console/Traits/DryRun.php
+++ b/lib/Console/Traits/DryRun.php
@@ -28,7 +28,6 @@ trait DryRun
     /**
      * Configure --dry-run
      *
-     * @param string|null $description
      *
      * @return $this
      */
@@ -62,10 +61,7 @@ protected function isDryRun(): bool
     /**
      * Prefix message with DRY-RUN
      *
-     * @param string $message
-     * @param string $prefix
      *
-     * @return string
      */
     protected function prefixDryRun(string $message, string $prefix = 'DRY-RUN'): string
     {
@@ -79,10 +75,7 @@ protected function prefixDryRun(string $message, string $prefix = 'DRY-RUN'): st
     /**
      * Prefix message with dry run if in dry-run mode
      *
-     * @param string $message
-     * @param string $prefix
      *
-     * @return string
      */
     protected function dryRunMessage(string $message, string $prefix = 'DRY-RUN'): string
     {
diff --git a/lib/Console/Traits/ParallelizationBase.php b/lib/Console/Traits/ParallelizationBase.php
index c5d415ff22e..4099e8dd541 100644
--- a/lib/Console/Traits/ParallelizationBase.php
+++ b/lib/Console/Traits/ParallelizationBase.php
@@ -37,9 +37,6 @@ protected static function configureCommand(Command $command): void
 } else {
     trait ParallelizationBase
     {
-        /**
-         * {@inheritdoc}
-         */
         public function execute(InputInterface $input, OutputInterface $output): int
         {
             $this->runBeforeFirstCommand($input, $output);
diff --git a/lib/Console/Traits/Timeout.php b/lib/Console/Traits/Timeout.php
index e480917d3dd..caf6e9748cf 100644
--- a/lib/Console/Traits/Timeout.php
+++ b/lib/Console/Traits/Timeout.php
@@ -38,7 +38,6 @@ trait Timeout
     /**
      * Add timeout option to command.
      *
-     * @param Command $command
      */
     protected static function configureTimeout(Command $command): void
     {
@@ -48,7 +47,6 @@ protected static function configureTimeout(Command $command): void
     /**
      * Init the timeout. Should be called in the beginning of a command or process.
      *
-     * @param InputInterface $input
      */
     protected function initTimeout(InputInterface $input): void
     {
@@ -101,7 +99,6 @@ protected function handleTimeout(?\Closure $abortClosure = null): void
     /**
      * Get the timeout in minutes. If <= 0 then no timeout is given.
      *
-     * @return int
      */
     public function getTimeout(): int
     {
@@ -111,7 +108,6 @@ public function getTimeout(): int
     /**
      * Set the timeout in minutes. If not set, no timeout happens
      *
-     * @param int $timeout
      *
      * @return $this
      */
@@ -125,7 +121,6 @@ public function setTimeout(int $timeout): static
     /**
      * Get the start time of the current step in seconds (unixtime).
      *
-     * @return int|null
      */
     public function getStartTimeCurrentStep(): ?int
     {
@@ -135,7 +130,6 @@ public function getStartTimeCurrentStep(): ?int
     /**
      * Get the start time of the current (overall) process in seconds (unixtime).
      *
-     * @return int|null
      */
     public function getStartTime(): ?int
     {
diff --git a/lib/Controller/Config/ControllerDataProvider.php b/lib/Controller/Config/ControllerDataProvider.php
index 0b91d8ad33b..ecea6330be4 100644
--- a/lib/Controller/Config/ControllerDataProvider.php
+++ b/lib/Controller/Config/ControllerDataProvider.php
@@ -34,7 +34,6 @@ class ControllerDataProvider
     /**
      * id -> class mapping array of controllers defined as services
      *
-     * @var array
      */
     private array $serviceControllers;
 
@@ -74,7 +73,6 @@ private function getBundles(): array
     }
 
     /**
-     * @return array
      *
      * @throws \ReflectionException
      */
@@ -137,7 +135,6 @@ public function getControllerReferences(): array
     /**
      * Builds a list of all available templates in bundles, in app/Resources/views, and Symfony locations
      *
-     * @return array
      */
     public function getTemplates(): array
     {
@@ -193,9 +190,7 @@ private function findTemplates(string $path, string $bundleName = null): array
     /**
      * Checks if bundle/controller namespace is not excluded (all core bundles should be excluded here)
      *
-     * @param string $namespace
      *
-     * @return bool
      */
     protected function isValidNamespace(string $namespace): bool
     {
diff --git a/lib/Controller/Controller.php b/lib/Controller/Controller.php
index 19371bab561..894475a9a99 100644
--- a/lib/Controller/Controller.php
+++ b/lib/Controller/Controller.php
@@ -23,10 +23,6 @@
 
 abstract class Controller extends AbstractController
 {
-    /**
-     * {@inheritdoc}
-     *
-     */
     protected function render(string $view, array $parameters = [], Response $response = null): Response
     {
         $templatingEngine = $this->container->get('pimcore.templating');
@@ -44,10 +40,6 @@ protected function render(string $view, array $parameters = [], Response $respon
         return parent::render($view, $parameters, $response);
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     */
     protected function stream(string $view, array $parameters = [], StreamedResponse $response = null): StreamedResponse
     {
         $templatingEngine = $this->container->get('pimcore.templating');
@@ -68,10 +60,6 @@ protected function stream(string $view, array $parameters = [], StreamedResponse
         return parent::stream($view, $parameters, $response);
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     */
     protected function renderView(string $view, array $parameters = []): string
     {
         $templatingEngine = $this->container->get('pimcore.templating');
diff --git a/lib/Controller/FrontendController.php b/lib/Controller/FrontendController.php
index bb0cb0c7d64..c99e9a848fe 100644
--- a/lib/Controller/FrontendController.php
+++ b/lib/Controller/FrontendController.php
@@ -48,7 +48,6 @@ public static function getSubscribedServices(): array
      * document and editmode as properties and proxy them to request attributes through
      * their resolvers.
      *
-     * @param string $name
      *
      * @return mixed
      */
@@ -82,10 +81,6 @@ public function __set(string $name, mixed $value): void
      * We don't have a response object at this point, but we can add headers here which will be
      * set by the ResponseHeaderListener which reads and adds this headers in the kernel.response event.
      *
-     * @param string $key
-     * @param array|string $values
-     * @param bool $replace
-     * @param Request|null $request
      */
     protected function addResponseHeader(string $key, array|string $values, bool $replace = false, Request $request = null): void
     {
@@ -101,12 +96,7 @@ protected function addResponseHeader(string $key, array|string $values, bool $re
      *
      * e.g. `$this->getDocumentEditable('input', 'foobar')`
      *
-     * @param string $type
-     * @param string $inputName
-     * @param array $options
-     * @param Document\PageSnippet|null $document
      *
-     * @return Document\Editable\EditableInterface
      *
      * @throws \Exception
      */
@@ -119,13 +109,6 @@ public function getDocumentEditable(string $type, string $inputName, array $opti
         return $this->container->get(EditableRenderer::class)->getEditable($document, $type, $inputName, $options);
     }
 
-    /**
-     * @param string $view
-     * @param array $parameters
-     * @param Response|null $response
-     *
-     * @return Response
-     */
     protected function renderTemplate(string $view, array $parameters = [], Response $response = null): Response
     {
         return $this->render($view, $parameters, $response);
diff --git a/lib/Controller/Traits/JsonHelperTrait.php b/lib/Controller/Traits/JsonHelperTrait.php
index ecda85bf496..791eca76bbe 100644
--- a/lib/Controller/Traits/JsonHelperTrait.php
+++ b/lib/Controller/Traits/JsonHelperTrait.php
@@ -31,7 +31,6 @@ trait JsonHelperTrait
     /**
      * @required
      *
-     * @param PimcoreSerializer $pimcoreSerializer
      */
     public function setPimcoreSerializer(PimcoreSerializer $pimcoreSerializer): void
     {
diff --git a/lib/DataObject/BlockDataMarshaller/Consent.php b/lib/DataObject/BlockDataMarshaller/Consent.php
index c927731513b..d3bc0777cc5 100644
--- a/lib/DataObject/BlockDataMarshaller/Consent.php
+++ b/lib/DataObject/BlockDataMarshaller/Consent.php
@@ -23,9 +23,6 @@
  */
 class Consent implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
@@ -35,9 +32,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if ($value instanceof \Pimcore\Model\DataObject\Data\Consent) {
diff --git a/lib/DataObject/BlockDataMarshaller/Date.php b/lib/DataObject/BlockDataMarshaller/Date.php
index a1c98b26c8e..d104f5ad477 100644
--- a/lib/DataObject/BlockDataMarshaller/Date.php
+++ b/lib/DataObject/BlockDataMarshaller/Date.php
@@ -24,9 +24,6 @@
  */
 class Date implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if ($value !== null) {
@@ -39,9 +36,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if ($value instanceof Carbon) {
diff --git a/lib/DataObject/BlockDataMarshaller/EncryptedField.php b/lib/DataObject/BlockDataMarshaller/EncryptedField.php
index 406f448c88d..e689eee2ea4 100644
--- a/lib/DataObject/BlockDataMarshaller/EncryptedField.php
+++ b/lib/DataObject/BlockDataMarshaller/EncryptedField.php
@@ -34,16 +34,12 @@ class EncryptedField implements MarshallerInterface
     /**
      * EncryptedField constructor.
      *
-     * @param MarshallerService $marshallerService
      */
     public function __construct(MarshallerService $marshallerService)
     {
         $this->marshallerService = $marshallerService;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if ($value !== null) {
@@ -62,9 +58,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if ($value !== null) {
@@ -86,10 +79,7 @@ public function unmarshal(mixed $value, array $params = []): mixed
     }
 
     /**
-     * @param mixed $data
-     * @param array $params
      *
-     * @return string
      *
      * @throws \Defuse\Crypto\Exception\BadFormatException
      * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException
@@ -122,10 +112,7 @@ public function encrypt(mixed $data, array $params = []): string
     }
 
     /**
-     * @param string|null $data
-     * @param array $params
      *
-     * @return string|null
      *
      * @throws \Exception
      */
diff --git a/lib/DataObject/BlockDataMarshaller/ExternalImage.php b/lib/DataObject/BlockDataMarshaller/ExternalImage.php
index 6d29f56efd6..5a532b3102e 100644
--- a/lib/DataObject/BlockDataMarshaller/ExternalImage.php
+++ b/lib/DataObject/BlockDataMarshaller/ExternalImage.php
@@ -23,9 +23,6 @@
  */
 class ExternalImage implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
@@ -35,9 +32,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if ($value instanceof \Pimcore\Model\DataObject\Data\ExternalImage) {
diff --git a/lib/DataObject/BlockDataMarshaller/Geobounds.php b/lib/DataObject/BlockDataMarshaller/Geobounds.php
index 2c7a0dc42d9..9622b3495c4 100644
--- a/lib/DataObject/BlockDataMarshaller/Geobounds.php
+++ b/lib/DataObject/BlockDataMarshaller/Geobounds.php
@@ -23,9 +23,6 @@
  */
 class Geobounds implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
@@ -38,9 +35,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
diff --git a/lib/DataObject/BlockDataMarshaller/Geopoint.php b/lib/DataObject/BlockDataMarshaller/Geopoint.php
index 4610be3a3bc..d915e0417b2 100644
--- a/lib/DataObject/BlockDataMarshaller/Geopoint.php
+++ b/lib/DataObject/BlockDataMarshaller/Geopoint.php
@@ -23,9 +23,6 @@
  */
 class Geopoint implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
@@ -38,9 +35,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
diff --git a/lib/DataObject/BlockDataMarshaller/Geopolygon.php b/lib/DataObject/BlockDataMarshaller/Geopolygon.php
index a47b3ae54f3..0627d7f5eb5 100644
--- a/lib/DataObject/BlockDataMarshaller/Geopolygon.php
+++ b/lib/DataObject/BlockDataMarshaller/Geopolygon.php
@@ -23,9 +23,6 @@
  */
 class Geopolygon implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
@@ -42,9 +39,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if ($value['value'] ?? null) {
diff --git a/lib/DataObject/BlockDataMarshaller/Localizedfields.php b/lib/DataObject/BlockDataMarshaller/Localizedfields.php
index 726f2eb0283..4230dc9a3d5 100644
--- a/lib/DataObject/BlockDataMarshaller/Localizedfields.php
+++ b/lib/DataObject/BlockDataMarshaller/Localizedfields.php
@@ -29,16 +29,12 @@ class Localizedfields implements MarshallerInterface
     /**
      * Localizedfields constructor.
      *
-     * @param MarshallerService $marshallerService
      */
     public function __construct(MarshallerService $marshallerService)
     {
         $this->marshallerService = $marshallerService;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         $object = $params['object'] ?? null;
@@ -70,9 +66,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         $object = $params['object'] ?? null;
diff --git a/lib/DataObject/BlockDataMarshaller/StructuredTable.php b/lib/DataObject/BlockDataMarshaller/StructuredTable.php
index d7a98295cbf..eebca68ae54 100644
--- a/lib/DataObject/BlockDataMarshaller/StructuredTable.php
+++ b/lib/DataObject/BlockDataMarshaller/StructuredTable.php
@@ -23,9 +23,6 @@
  */
 class StructuredTable implements MarshallerInterface
 {
-    /**
-     * @inheritDoc
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
@@ -38,9 +35,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if ($value instanceof \Pimcore\Model\DataObject\Data\StructuredTable) {
diff --git a/lib/DataObject/ClassificationstoreDataMarshaller/BooleanSelect.php b/lib/DataObject/ClassificationstoreDataMarshaller/BooleanSelect.php
index 4f7691f499a..bcd3977da28 100644
--- a/lib/DataObject/ClassificationstoreDataMarshaller/BooleanSelect.php
+++ b/lib/DataObject/ClassificationstoreDataMarshaller/BooleanSelect.php
@@ -23,9 +23,6 @@
  */
 class BooleanSelect implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if ($value === true) {
@@ -37,9 +34,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
diff --git a/lib/DataObject/ClassificationstoreDataMarshaller/EncryptedField.php b/lib/DataObject/ClassificationstoreDataMarshaller/EncryptedField.php
index 04d69ce37ea..cd3eb3e83b0 100644
--- a/lib/DataObject/ClassificationstoreDataMarshaller/EncryptedField.php
+++ b/lib/DataObject/ClassificationstoreDataMarshaller/EncryptedField.php
@@ -34,16 +34,12 @@ class EncryptedField implements MarshallerInterface
     /**
      * Localizedfields constructor.
      *
-     * @param MarshallerService $marshallerService
      */
     public function __construct(MarshallerService $marshallerService)
     {
         $this->marshallerService = $marshallerService;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if ($value !== null) {
@@ -79,9 +75,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
@@ -111,10 +104,7 @@ public function unmarshal(mixed $value, array $params = []): mixed
     }
 
     /**
-     * @param mixed $data
-     * @param array $params
      *
-     * @return string
      *
      * @throws \Defuse\Crypto\Exception\BadFormatException
      * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException
@@ -147,10 +137,7 @@ public function encrypt(mixed $data, array $params = []): string
     }
 
     /**
-     * @param string|null $data
-     * @param array $params
      *
-     * @return string|null
      *
      * @throws \Exception
      */
diff --git a/lib/DataObject/ClassificationstoreDataMarshaller/Multiselect.php b/lib/DataObject/ClassificationstoreDataMarshaller/Multiselect.php
index 54549f1d100..80af6aa6e34 100644
--- a/lib/DataObject/ClassificationstoreDataMarshaller/Multiselect.php
+++ b/lib/DataObject/ClassificationstoreDataMarshaller/Multiselect.php
@@ -23,9 +23,6 @@
  */
 class Multiselect implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
@@ -35,9 +32,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value) && strlen($value['value']) > 0) {
diff --git a/lib/DataObject/ClassificationstoreDataMarshaller/QuantityValue.php b/lib/DataObject/ClassificationstoreDataMarshaller/QuantityValue.php
index a61d01c4b62..6c94210d5ed 100644
--- a/lib/DataObject/ClassificationstoreDataMarshaller/QuantityValue.php
+++ b/lib/DataObject/ClassificationstoreDataMarshaller/QuantityValue.php
@@ -23,9 +23,6 @@
  */
 class QuantityValue implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
@@ -38,9 +35,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value) && ($value['value'] !== null || $value['value2'] !== null)) {
diff --git a/lib/DataObject/ClassificationstoreDataMarshaller/Table.php b/lib/DataObject/ClassificationstoreDataMarshaller/Table.php
index 93cadc76fbe..f83b759ca5a 100644
--- a/lib/DataObject/ClassificationstoreDataMarshaller/Table.php
+++ b/lib/DataObject/ClassificationstoreDataMarshaller/Table.php
@@ -24,9 +24,6 @@
  */
 class Table implements MarshallerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function marshal(mixed $value, array $params = []): mixed
     {
         if (!is_null($value)) {
@@ -36,9 +33,6 @@ public function marshal(mixed $value, array $params = []): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unmarshal(mixed $value, array $params = []): mixed
     {
         if (is_array($value)) {
diff --git a/lib/DataObject/Consent/Service.php b/lib/DataObject/Consent/Service.php
index 6a37bd8ec5c..62b28b2d034 100644
--- a/lib/DataObject/Consent/Service.php
+++ b/lib/DataObject/Consent/Service.php
@@ -31,7 +31,6 @@ class Service
      * @param string $consentContent - message that should be stored into the notes description
      * @param array $metaData - array of key/values that should be attached as details to the note
      *
-     * @return Note
      */
     public function insertConsentNote(AbstractObject $object, string $fieldname, string $consentContent, array $metaData = []): Note
     {
@@ -57,7 +56,6 @@ public function insertConsentNote(AbstractObject $object, string $fieldname, str
      * @param AbstractObject $object - object to attach the note to
      * @param string $fieldname - fieldname of consent field
      *
-     * @return Note
      */
     public function insertRevokeNote(AbstractObject $object, string $fieldname): Note
     {
@@ -80,8 +78,6 @@ public function insertRevokeNote(AbstractObject $object, string $fieldname): Not
      * @param string $consentContent - message that should be stored into the notes description
      * @param array $metaData - array of key/values that should be attached as details to the note
      *
-     * @return Note
-     *
      * @throws \Exception
      */
     public function giveConsent(AbstractObject $object, string $fieldname, string $consentContent, array $metaData = []): Note
@@ -105,8 +101,6 @@ public function giveConsent(AbstractObject $object, string $fieldname, string $c
      * @param AbstractObject $object - object to revoke the consent from
      * @param string $fieldname - fieldname of consent field
      *
-     * @return Note
-     *
      * @throws \Exception
      */
     public function revokeConsent(AbstractObject $object, string $fieldname): Note
diff --git a/lib/DataObject/FielddefinitionMarshaller/Traits/RgbaColorTrait.php b/lib/DataObject/FielddefinitionMarshaller/Traits/RgbaColorTrait.php
index 9e1c1536b54..44c0ec88f6f 100644
--- a/lib/DataObject/FielddefinitionMarshaller/Traits/RgbaColorTrait.php
+++ b/lib/DataObject/FielddefinitionMarshaller/Traits/RgbaColorTrait.php
@@ -21,7 +21,6 @@
  */
 trait RgbaColorTrait
 {
-    /** @inheritDoc */
     public function marshal(mixed $value, array $params = []): ?array
     {
         if (is_array($value)) {
@@ -37,7 +36,6 @@ public function marshal(mixed $value, array $params = []): ?array
         return null;
     }
 
-    /** @inheritDoc */
     public function unmarshal(mixed $value, array $params = []): ?array
     {
         if (is_array($value)) {
diff --git a/lib/DependencyInjection/CollectionServiceLocator.php b/lib/DependencyInjection/CollectionServiceLocator.php
index 8afd7b877af..7f0720aefc2 100644
--- a/lib/DependencyInjection/CollectionServiceLocator.php
+++ b/lib/DependencyInjection/CollectionServiceLocator.php
@@ -28,9 +28,6 @@ class CollectionServiceLocator extends ServiceLocator implements \IteratorAggreg
 {
     private array $ids;
 
-    /**
-     * {@inheritdoc}
-     */
     public function __construct($factories)
     {
         $this->ids = array_keys($factories);
@@ -45,9 +42,6 @@ public function all(): array
         }, $this->ids);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getIterator(): \Traversable
     {
         foreach ($this->ids as $id) {
diff --git a/lib/DependencyInjection/ServiceCollection.php b/lib/DependencyInjection/ServiceCollection.php
index 2094aaa9a7e..b9544125c1a 100644
--- a/lib/DependencyInjection/ServiceCollection.php
+++ b/lib/DependencyInjection/ServiceCollection.php
@@ -34,9 +34,6 @@ public function __construct(ContainerInterface $container, array $ids)
         $this->ids = $ids;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getIterator(): \Traversable
     {
         foreach ($this->ids as $id) {
diff --git a/lib/Document.php b/lib/Document.php
index 527cfdf054e..64d77417eee 100644
--- a/lib/Document.php
+++ b/lib/Document.php
@@ -24,9 +24,7 @@ class Document
     /**
      * Singleton for Pimcore\Document
      *
-     * @param string|null $adapter
      *
-     * @return Document\Adapter|null
      *
      * @throws \Exception
      */
@@ -57,7 +55,6 @@ public static function getInstance(string $adapter = null): ?Document\Adapter
     /**
      * Checks if adapter is available.
      *
-     * @return bool
      */
     public static function isAvailable(): bool
     {
@@ -71,9 +68,7 @@ public static function isAvailable(): bool
     /**
      * Checks if a file type is supported by the adapter.
      *
-     * @param string $filetype
      *
-     * @return bool
      */
     public static function isFileTypeSupported(string $filetype): bool
     {
@@ -87,7 +82,6 @@ public static function isFileTypeSupported(string $filetype): bool
     /**
      * Returns adapter class if exists or false if doesn't exist
      *
-     * @return Document\Adapter|null
      */
     public static function getDefaultAdapter(): ?Document\Adapter
     {
diff --git a/lib/Document/Adapter.php b/lib/Document/Adapter.php
index fa5b4e83db3..cb42fc309d9 100644
--- a/lib/Document/Adapter.php
+++ b/lib/Document/Adapter.php
@@ -49,7 +49,6 @@ abstract public function load(Asset\Document $asset): static;
     abstract public function saveImage(string $imageTargetPath, int $page = 1, int $resolution = 200): mixed;
 
     /**
-     * @param Asset\Document|null $asset
      *
      * @return resource
      */
@@ -58,7 +57,6 @@ abstract public function getPdf(?Asset\Document $asset = null);
     abstract public function isFileTypeSupported(string $fileType): bool;
 
     /**
-     * @return int
      *
      * @throws \Exception
      */
diff --git a/lib/Document/Adapter/Ghostscript.php b/lib/Document/Adapter/Ghostscript.php
index 64a12bfd439..f6c33f7e8e9 100644
--- a/lib/Document/Adapter/Ghostscript.php
+++ b/lib/Document/Adapter/Ghostscript.php
@@ -59,7 +59,6 @@ public function isFileTypeSupported(string $fileType): bool
     }
 
     /**
-     * @return string
      *
      * @throws \Exception
      */
@@ -69,7 +68,6 @@ public static function getGhostscriptCli(): string
     }
 
     /**
-     * @return string
      *
      * @throws \Exception
      */
@@ -98,9 +96,6 @@ public function load(Asset\Document $asset): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPdf(?Asset\Document $asset = null)
     {
         if (!$asset && $this->asset) {
@@ -117,9 +112,6 @@ public function getPdf(?Asset\Document $asset = null)
         throw new \Exception($message);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPageCount(): int
     {
         $process = Process::fromShellCommandline($this->buildPageCountCommand());
@@ -135,7 +127,6 @@ public function getPageCount(): int
     }
 
     /**
-     * @return string
      *
      * @throws \Exception
      */
@@ -159,7 +150,6 @@ protected function buildPageCountCommand(): string
     /**
      * Get the version of the installed Ghostscript CLI.
      *
-     * @return string
      *
      * @throws \Exception
      */
diff --git a/lib/Document/Adapter/Gotenberg.php b/lib/Document/Adapter/Gotenberg.php
index 686eae0aaea..aae4362e92e 100644
--- a/lib/Document/Adapter/Gotenberg.php
+++ b/lib/Document/Adapter/Gotenberg.php
@@ -56,7 +56,6 @@ public function isFileTypeSupported(string $fileType): bool
     }
 
     /**
-     * @return bool
      *
      * @throws \Exception
      */
@@ -111,7 +110,7 @@ public function load(Asset\Document $asset): static
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @throws \Exception
      */
diff --git a/lib/Document/Adapter/LibreOffice.php b/lib/Document/Adapter/LibreOffice.php
index 5e7ba97ccb8..24ccd00fd5f 100644
--- a/lib/Document/Adapter/LibreOffice.php
+++ b/lib/Document/Adapter/LibreOffice.php
@@ -53,7 +53,6 @@ public function isFileTypeSupported(string $fileType): bool
     }
 
     /**
-     * @return string
      *
      * @throws \Exception
      */
@@ -90,9 +89,6 @@ public function load(Asset\Document $asset): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPdf(?Asset\Document $asset = null)
     {
         if (!$asset && $this->asset) {
diff --git a/lib/Document/Editable/Block/BlockState.php b/lib/Document/Editable/Block/BlockState.php
index e7af8e4af78..f20cd6ab072 100644
--- a/lib/Document/Editable/Block/BlockState.php
+++ b/lib/Document/Editable/Block/BlockState.php
@@ -102,9 +102,6 @@ public function clearIndexes(): void
         $this->indexes = [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function jsonSerialize(): array
     {
         return [
diff --git a/lib/Document/Editable/Block/BlockStateStack.php b/lib/Document/Editable/Block/BlockStateStack.php
index ede7050b55c..5e5ab4d2853 100644
--- a/lib/Document/Editable/Block/BlockStateStack.php
+++ b/lib/Document/Editable/Block/BlockStateStack.php
@@ -38,7 +38,6 @@ public function __construct()
     /**
      * Adds a new state to the stack
      *
-     * @param BlockState|null $blockState
      */
     public function push(BlockState $blockState = null): void
     {
@@ -52,7 +51,6 @@ public function push(BlockState $blockState = null): void
     /**
      * Removes current state from the stack
      *
-     * @return BlockState
      */
     public function pop(): BlockState
     {
@@ -66,7 +64,6 @@ public function pop(): BlockState
     /**
      * Returns current state
      *
-     * @return BlockState
      */
     public function getCurrentState(): BlockState
     {
@@ -83,9 +80,6 @@ public function count(): int
         return count($this->states);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function jsonSerialize(): array
     {
         return $this->states;
diff --git a/lib/Document/Editable/EditableHandler.php b/lib/Document/Editable/EditableHandler.php
index 9fc47c532df..71360c61d89 100644
--- a/lib/Document/Editable/EditableHandler.php
+++ b/lib/Document/Editable/EditableHandler.php
@@ -239,9 +239,7 @@ protected function handleBrickActionResult(?Response $result): void
      * Try to get the brick template from getTemplate() method. If method returns null and brick implements
      * TemplateAreabrickInterface, fall back to auto-resolving the template reference. See interface for examples.
      *
-     * @param AreabrickInterface $brick
      *
-     * @return null|string
      */
     protected function resolveBrickTemplate(AreabrickInterface $brick): ?string
     {
@@ -272,9 +270,7 @@ protected function resolveBrickTemplate(AreabrickInterface $brick): ?string
     /**
      * Return either bundle or global (= app/Resources) template reference
      *
-     * @param TemplateAreabrickInterface $brick
      *
-     * @return string
      */
     protected function buildBrickTemplateReference(TemplateAreabrickInterface $brick): string
     {
diff --git a/lib/Document/Editable/EditmodeEditableDefinitionCollector.php b/lib/Document/Editable/EditmodeEditableDefinitionCollector.php
index 8da01ddab04..280772ea89e 100644
--- a/lib/Document/Editable/EditmodeEditableDefinitionCollector.php
+++ b/lib/Document/Editable/EditmodeEditableDefinitionCollector.php
@@ -31,7 +31,6 @@ final class EditmodeEditableDefinitionCollector
     private array $stash = [];
 
     /**
-     * @param Editable $editable
      *
      * @throws \Exception
      */
@@ -105,7 +104,6 @@ private function getJson(): string
     }
 
     /**
-     * @return string
      *
      * @throws \JsonException
      */
diff --git a/lib/Document/Editable/UsageRecorderSubscriber.php b/lib/Document/Editable/UsageRecorderSubscriber.php
index ce4ba2e91b3..d578b7ebc3e 100644
--- a/lib/Document/Editable/UsageRecorderSubscriber.php
+++ b/lib/Document/Editable/UsageRecorderSubscriber.php
@@ -28,9 +28,6 @@ final class UsageRecorderSubscriber implements EventSubscriberInterface
 {
     protected array $recordedEditableNames = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/lib/Document/Renderer/DocumentRenderer.php b/lib/Document/Renderer/DocumentRenderer.php
index e7890e72205..fb86136eb82 100644
--- a/lib/Document/Renderer/DocumentRenderer.php
+++ b/lib/Document/Renderer/DocumentRenderer.php
@@ -68,9 +68,6 @@ public function setContainerService(ContainerService $containerService): void
         // placeholder service/templating helper is used during the rendering process
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function render(Document\PageSnippet $document, array $attributes = [], array $query = [], array $options = []): string
     {
         $this->eventDispatcher->dispatch(
diff --git a/lib/Document/Renderer/DocumentRendererInterface.php b/lib/Document/Renderer/DocumentRendererInterface.php
index 0396d26b603..af661f2c72d 100644
--- a/lib/Document/Renderer/DocumentRendererInterface.php
+++ b/lib/Document/Renderer/DocumentRendererInterface.php
@@ -24,12 +24,7 @@ interface DocumentRendererInterface
     /**
      * Renders document and returns rendered result as string
      *
-     * @param Document\PageSnippet $document
-     * @param array $attributes
-     * @param array $query
-     * @param array $options
      *
-     * @return string
      */
     public function render(Document\PageSnippet $document, array $attributes = [], array $query = [], array $options = []): string;
 }
diff --git a/lib/Document/StaticPageGenerator.php b/lib/Document/StaticPageGenerator.php
index 61a362f155a..9641e994980 100644
--- a/lib/Document/StaticPageGenerator.php
+++ b/lib/Document/StaticPageGenerator.php
@@ -89,7 +89,6 @@ public function generate(Document\PageSnippet $document, array $params = []): bo
     }
 
     /**
-     * @param Document\PageSnippet $document
      *
      * @throws \League\Flysystem\FilesystemException
      */
diff --git a/lib/Event/Model/Asset/ResolveUploadTargetEvent.php b/lib/Event/Model/Asset/ResolveUploadTargetEvent.php
index 48dc2a0df35..0895d56e5d2 100644
--- a/lib/Event/Model/Asset/ResolveUploadTargetEvent.php
+++ b/lib/Event/Model/Asset/ResolveUploadTargetEvent.php
@@ -32,8 +32,6 @@ class ResolveUploadTargetEvent extends Event
     /**
      * ResolveUploadTargetEvent constructor.
      *
-     * @param int $parentId
-     * @param string $filename
      * @param array $context contextual information
      */
     public function __construct(int $parentId, string $filename, array $context)
diff --git a/lib/Event/Model/AssetEvent.php b/lib/Event/Model/AssetEvent.php
index 337ce6a7ad5..ed5a39e887f 100644
--- a/lib/Event/Model/AssetEvent.php
+++ b/lib/Event/Model/AssetEvent.php
@@ -29,7 +29,6 @@ class AssetEvent extends Event implements ElementEventInterface
     /**
      * AssetEvent constructor.
      *
-     * @param Asset $asset
      * @param array $arguments additional parameters (e.g. "versionNote" for the version note)
      */
     public function __construct(Asset $asset, array $arguments = [])
diff --git a/lib/Event/Model/DataObject/ClassDefinitionEvent.php b/lib/Event/Model/DataObject/ClassDefinitionEvent.php
index 137899f54cf..e26a37788de 100644
--- a/lib/Event/Model/DataObject/ClassDefinitionEvent.php
+++ b/lib/Event/Model/DataObject/ClassDefinitionEvent.php
@@ -26,7 +26,6 @@ class ClassDefinitionEvent extends Event
     /**
      * DocumentEvent constructor.
      *
-     * @param ClassDefinition $classDefinition
      */
     public function __construct(ClassDefinition $classDefinition)
     {
diff --git a/lib/Event/Model/DataObject/ClassificationStore/CollectionConfigEvent.php b/lib/Event/Model/DataObject/ClassificationStore/CollectionConfigEvent.php
index a6157c4100d..98f916bc34d 100644
--- a/lib/Event/Model/DataObject/ClassificationStore/CollectionConfigEvent.php
+++ b/lib/Event/Model/DataObject/ClassificationStore/CollectionConfigEvent.php
@@ -26,7 +26,6 @@ class CollectionConfigEvent extends Event
     /**
      * DocumentEvent constructor.
      *
-     * @param CollectionConfig $collectionConfig
      */
     public function __construct(CollectionConfig $collectionConfig)
     {
diff --git a/lib/Event/Model/DataObject/ClassificationStore/GroupConfigEvent.php b/lib/Event/Model/DataObject/ClassificationStore/GroupConfigEvent.php
index bc1840867d7..bc60df8794d 100644
--- a/lib/Event/Model/DataObject/ClassificationStore/GroupConfigEvent.php
+++ b/lib/Event/Model/DataObject/ClassificationStore/GroupConfigEvent.php
@@ -26,7 +26,6 @@ class GroupConfigEvent extends Event
     /**
      * DocumentEvent constructor.
      *
-     * @param GroupConfig $groupConfig
      */
     public function __construct(GroupConfig $groupConfig)
     {
diff --git a/lib/Event/Model/DataObject/ClassificationStore/KeyConfigEvent.php b/lib/Event/Model/DataObject/ClassificationStore/KeyConfigEvent.php
index 5be72b60260..dfe35fc9141 100644
--- a/lib/Event/Model/DataObject/ClassificationStore/KeyConfigEvent.php
+++ b/lib/Event/Model/DataObject/ClassificationStore/KeyConfigEvent.php
@@ -26,7 +26,6 @@ class KeyConfigEvent extends Event
     /**
      * DocumentEvent constructor.
      *
-     * @param KeyConfig $keyConfig
      */
     public function __construct(KeyConfig $keyConfig)
     {
diff --git a/lib/Event/Model/DataObject/ClassificationStore/StoreConfigEvent.php b/lib/Event/Model/DataObject/ClassificationStore/StoreConfigEvent.php
index 4212ce418d0..2c5fb146ca0 100644
--- a/lib/Event/Model/DataObject/ClassificationStore/StoreConfigEvent.php
+++ b/lib/Event/Model/DataObject/ClassificationStore/StoreConfigEvent.php
@@ -26,7 +26,6 @@ class StoreConfigEvent extends Event
     /**
      * DocumentEvent constructor.
      *
-     * @param StoreConfig $storeConfig
      */
     public function __construct(StoreConfig $storeConfig)
     {
diff --git a/lib/Event/Model/DataObject/CustomLayoutEvent.php b/lib/Event/Model/DataObject/CustomLayoutEvent.php
index ef4e22ee4f1..0af54b13c3d 100644
--- a/lib/Event/Model/DataObject/CustomLayoutEvent.php
+++ b/lib/Event/Model/DataObject/CustomLayoutEvent.php
@@ -26,7 +26,6 @@ class CustomLayoutEvent extends Event
     /**
      * DocumentEvent constructor.
      *
-     * @param ClassDefinition\CustomLayout $customLayout
      */
     public function __construct(ClassDefinition\CustomLayout $customLayout)
     {
diff --git a/lib/Event/Model/DataObject/QuantityValueUnitEvent.php b/lib/Event/Model/DataObject/QuantityValueUnitEvent.php
index 445cffc3739..0f8521c5ab5 100644
--- a/lib/Event/Model/DataObject/QuantityValueUnitEvent.php
+++ b/lib/Event/Model/DataObject/QuantityValueUnitEvent.php
@@ -26,7 +26,6 @@ class QuantityValueUnitEvent extends Event
     /**
      * QuantityValueUnitEvent constructor.
      *
-     * @param Unit $unit
      */
     public function __construct(Unit $unit)
     {
diff --git a/lib/Event/Model/DataObjectEvent.php b/lib/Event/Model/DataObjectEvent.php
index bfd76acfe23..eeb85e29f1a 100644
--- a/lib/Event/Model/DataObjectEvent.php
+++ b/lib/Event/Model/DataObjectEvent.php
@@ -29,8 +29,6 @@ class DataObjectEvent extends Event implements ElementEventInterface
     /**
      * DataObjectEvent constructor.
      *
-     * @param AbstractObject $object
-     * @param array $arguments
      */
     public function __construct(AbstractObject $object, array $arguments = [])
     {
diff --git a/lib/Event/Model/DataObjectImportEvent.php b/lib/Event/Model/DataObjectImportEvent.php
index 689376b1374..42fc3f88bd0 100644
--- a/lib/Event/Model/DataObjectImportEvent.php
+++ b/lib/Event/Model/DataObjectImportEvent.php
@@ -41,8 +41,6 @@ class DataObjectImportEvent extends Event
     /**
      * DataObjectImportEvent constructor.
      *
-     * @param mixed $config
-     * @param string $originalFile
      */
     public function __construct(mixed $config, string $originalFile)
     {
diff --git a/lib/Event/Model/Document/EditableNameEvent.php b/lib/Event/Model/Document/EditableNameEvent.php
index 90a1e1f7387..40d0f070a0f 100644
--- a/lib/Event/Model/Document/EditableNameEvent.php
+++ b/lib/Event/Model/Document/EditableNameEvent.php
@@ -26,28 +26,24 @@ class EditableNameEvent extends Event
     /**
      * Editable type (e.g. "input")
      *
-     * @var string
      */
     private string $type;
 
     /**
      * Editable name (e.g. "headline")
      *
-     * @var string
      */
     private string $inputName;
 
     /**
      * The current block state
      *
-     * @var BlockState
      */
     private BlockState $blockState;
 
     /**
      * The built editable name
      *
-     * @var string
      */
     private string $editableName;
 
diff --git a/lib/Event/Model/DocumentEvent.php b/lib/Event/Model/DocumentEvent.php
index 22f453277e7..3cfe5bf7033 100644
--- a/lib/Event/Model/DocumentEvent.php
+++ b/lib/Event/Model/DocumentEvent.php
@@ -29,8 +29,6 @@ class DocumentEvent extends Event implements ElementEventInterface
     /**
      * DocumentEvent constructor.
      *
-     * @param Document $document
-     * @param array $arguments
      */
     public function __construct(Document $document, array $arguments = [])
     {
diff --git a/lib/Event/Model/ElementEvent.php b/lib/Event/Model/ElementEvent.php
index ff45a02d471..18be4b0e55e 100644
--- a/lib/Event/Model/ElementEvent.php
+++ b/lib/Event/Model/ElementEvent.php
@@ -29,8 +29,6 @@ class ElementEvent extends Event implements ElementEventInterface
     /**
      * ElementEvent constructor.
      *
-     * @param ElementInterface $element
-     * @param array $arguments
      */
     public function __construct(ElementInterface $element, array $arguments = [])
     {
diff --git a/lib/Event/Model/ElementEventInterface.php b/lib/Event/Model/ElementEventInterface.php
index d144f07da3d..dbfe44d4aab 100644
--- a/lib/Event/Model/ElementEventInterface.php
+++ b/lib/Event/Model/ElementEventInterface.php
@@ -46,7 +46,6 @@ public function setArgument(string $key, mixed $value): static;
     /**
      * Getter for all arguments.
      *
-     * @return array
      */
     public function getArguments(): array;
 
@@ -64,7 +63,6 @@ public function setArguments(array $args = []): static;
      *
      * @param string $key Key of arguments array
      *
-     * @return bool
      */
     public function hasArgument(string $key): bool;
 }
diff --git a/lib/Event/Model/ModelEventInterface.php b/lib/Event/Model/ModelEventInterface.php
index 3d00fb349a3..d4733f4593b 100644
--- a/lib/Event/Model/ModelEventInterface.php
+++ b/lib/Event/Model/ModelEventInterface.php
@@ -46,7 +46,6 @@ public function setArgument(string $key, mixed $value): static;
     /**
      * Getter for all arguments.
      *
-     * @return array
      */
     public function getArguments(): array;
 
@@ -64,7 +63,6 @@ public function setArguments(array $args = []): static;
      *
      * @param string $key Key of arguments array
      *
-     * @return bool
      */
     public function hasArgument(string $key): bool;
 }
diff --git a/lib/Event/Model/NotificationEvent.php b/lib/Event/Model/NotificationEvent.php
index 851b35a585b..0a90276f03f 100644
--- a/lib/Event/Model/NotificationEvent.php
+++ b/lib/Event/Model/NotificationEvent.php
@@ -29,8 +29,6 @@ class NotificationEvent extends Event
     /**
      * DataObjectEvent constructor.
      *
-     * @param Notification $notification
-     * @param array $arguments
      */
     public function __construct(Notification $notification, array $arguments = [])
     {
diff --git a/lib/Event/Model/ResolveElementEvent.php b/lib/Event/Model/ResolveElementEvent.php
index 4e74b671655..c523af70557 100644
--- a/lib/Event/Model/ResolveElementEvent.php
+++ b/lib/Event/Model/ResolveElementEvent.php
@@ -30,9 +30,6 @@ class ResolveElementEvent extends Event
     /**
      * ElementEvent constructor.
      *
-     * @param string $type
-     * @param string $id
-     * @param array $arguments
      */
     public function __construct(string $type, string $id, array $arguments = [])
     {
diff --git a/lib/Event/Model/TagEvent.php b/lib/Event/Model/TagEvent.php
index 6c6d263aaec..d00c2a3c500 100644
--- a/lib/Event/Model/TagEvent.php
+++ b/lib/Event/Model/TagEvent.php
@@ -29,8 +29,6 @@ class TagEvent extends Event
     /**
      * TagEvent constructor.
      *
-     * @param Tag $tag
-     * @param array $arguments
      */
     public function __construct(Tag $tag, array $arguments = [])
     {
diff --git a/lib/Event/Model/TranslationEvent.php b/lib/Event/Model/TranslationEvent.php
index 4c0cda072b3..66fe08190d0 100644
--- a/lib/Event/Model/TranslationEvent.php
+++ b/lib/Event/Model/TranslationEvent.php
@@ -29,7 +29,6 @@ class TranslationEvent extends Event
     /**
      * AssetEvent constructor.
      *
-     * @param Translation $translation
      * @param array $arguments additional parameters (e.g. "versionNote" for the version note)
      */
     public function __construct(Translation $translation, array $arguments = [])
diff --git a/lib/Event/Model/UserRoleEvent.php b/lib/Event/Model/UserRoleEvent.php
index b4a4bf53002..d3cc0df75e8 100644
--- a/lib/Event/Model/UserRoleEvent.php
+++ b/lib/Event/Model/UserRoleEvent.php
@@ -26,7 +26,6 @@ class UserRoleEvent extends Event
     /**
      * DocumentEvent constructor.
      *
-     * @param AbstractUser $userRole
      */
     public function __construct(AbstractUser $userRole)
     {
diff --git a/lib/Event/Model/VersionEvent.php b/lib/Event/Model/VersionEvent.php
index d9205e8814d..e26d93915de 100644
--- a/lib/Event/Model/VersionEvent.php
+++ b/lib/Event/Model/VersionEvent.php
@@ -26,7 +26,6 @@ class VersionEvent extends Event
     /**
      * DocumentEvent constructor.
      *
-     * @param Version $version
      */
     public function __construct(Version $version)
     {
diff --git a/lib/Event/System/ConsoleEvent.php b/lib/Event/System/ConsoleEvent.php
index aa4984e8bb4..4367f4143b1 100644
--- a/lib/Event/System/ConsoleEvent.php
+++ b/lib/Event/System/ConsoleEvent.php
@@ -26,7 +26,6 @@ class ConsoleEvent extends Event
     /**
      * ConsoleEvent constructor.
      *
-     * @param Application $application
      */
     public function __construct(Application $application)
     {
diff --git a/lib/Event/Traits/ArgumentsAwareTrait.php b/lib/Event/Traits/ArgumentsAwareTrait.php
index 09de08775f2..b4173e47692 100644
--- a/lib/Event/Traits/ArgumentsAwareTrait.php
+++ b/lib/Event/Traits/ArgumentsAwareTrait.php
@@ -21,7 +21,6 @@ trait ArgumentsAwareTrait
     /**
      * Array of arguments.
      *
-     * @var array
      */
     protected array $arguments = [];
 
@@ -61,7 +60,6 @@ public function setArgument(string $key, mixed $value): static
     /**
      * Getter for all arguments.
      *
-     * @return array
      */
     public function getArguments(): array
     {
@@ -87,7 +85,6 @@ public function setArguments(array $args = []): static
      *
      * @param string $key Key of arguments array
      *
-     * @return bool
      */
     public function hasArgument(string $key): bool
     {
diff --git a/lib/Event/Traits/RecursionBlockingEventDispatchHelperTrait.php b/lib/Event/Traits/RecursionBlockingEventDispatchHelperTrait.php
index e9955eff413..99a28847914 100644
--- a/lib/Event/Traits/RecursionBlockingEventDispatchHelperTrait.php
+++ b/lib/Event/Traits/RecursionBlockingEventDispatchHelperTrait.php
@@ -26,10 +26,7 @@ trait RecursionBlockingEventDispatchHelperTrait
     /**
      * Dispatches an event, avoids recursion by checking if the active dispatch event is the same
      *
-     * @param object $event
-     * @param string|null $eventName
      *
-     * @return void
      */
     protected function dispatchEvent(object $event, string $eventName = null): void
     {
diff --git a/lib/Event/Traits/ResponseAwareTrait.php b/lib/Event/Traits/ResponseAwareTrait.php
index 98d257dcbce..88bcab86154 100644
--- a/lib/Event/Traits/ResponseAwareTrait.php
+++ b/lib/Event/Traits/ResponseAwareTrait.php
@@ -27,14 +27,12 @@ trait ResponseAwareTrait
     /**
      * The response object.
      *
-     * @var Response
      */
     protected Response $response;
 
     /**
      * Returns the response object.
      *
-     * @return Response
      */
     public function getResponse(): Response
     {
@@ -44,7 +42,6 @@ public function getResponse(): Response
     /**
      * Sets a response and stops event propagation.
      *
-     * @param Response $response
      */
     public function setResponse(Response $response): void
     {
diff --git a/lib/Event/Workflow/GlobalActionEvent.php b/lib/Event/Workflow/GlobalActionEvent.php
index 424f881b541..eb321e79c51 100644
--- a/lib/Event/Workflow/GlobalActionEvent.php
+++ b/lib/Event/Workflow/GlobalActionEvent.php
@@ -34,10 +34,6 @@ class GlobalActionEvent extends Event
     /**
      * DocumentEvent constructor.
      *
-     * @param Workflow $workflow
-     * @param mixed $subject
-     * @param GlobalAction $globalAction
-     * @param array $arguments
      */
     public function __construct(Workflow $workflow, mixed $subject, GlobalAction $globalAction, array $arguments = [])
     {
diff --git a/lib/Extension/Bundle/AbstractPimcoreBundle.php b/lib/Extension/Bundle/AbstractPimcoreBundle.php
index f86359a17be..dc35d3f5675 100644
--- a/lib/Extension/Bundle/AbstractPimcoreBundle.php
+++ b/lib/Extension/Bundle/AbstractPimcoreBundle.php
@@ -22,33 +22,21 @@ abstract class AbstractPimcoreBundle extends Bundle implements PimcoreBundleInte
 {
     protected static ?PimcoreBundleManager $bundleManager = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getNiceName(): string
     {
         return $this->getName();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDescription(): string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getVersion(): string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getInstaller(): ?Installer\InstallerInterface
     {
         return null;
diff --git a/lib/Extension/Bundle/Installer/AbstractInstaller.php b/lib/Extension/Bundle/Installer/AbstractInstaller.php
index 8f9a5d14911..260e368cd58 100644
--- a/lib/Extension/Bundle/Installer/AbstractInstaller.php
+++ b/lib/Extension/Bundle/Installer/AbstractInstaller.php
@@ -29,47 +29,29 @@ public function __construct()
         $this->output = new BufferedOutput(Output::VERBOSITY_NORMAL, true);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function install(): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function uninstall(): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isInstalled(): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function canBeInstalled(): bool
     {
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function canBeUninstalled(): bool
     {
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function needsReloadAfterInstall(): bool
     {
         return false;
diff --git a/lib/Extension/Bundle/Installer/InstallerInterface.php b/lib/Extension/Bundle/Installer/InstallerInterface.php
index 2d066af001e..2775cb41862 100644
--- a/lib/Extension/Bundle/Installer/InstallerInterface.php
+++ b/lib/Extension/Bundle/Installer/InstallerInterface.php
@@ -39,28 +39,24 @@ public function uninstall(): void;
     /**
      * Determine if bundle is installed
      *
-     * @return bool
      */
     public function isInstalled(): bool;
 
     /**
      * Determine if bundle is ready to be installed. Can be used to check prerequisites
      *
-     * @return bool
      */
     public function canBeInstalled(): bool;
 
     /**
      * Determine if bundle can be uninstalled
      *
-     * @return bool
      */
     public function canBeUninstalled(): bool;
 
     /**
      * Determines if admin interface should be reloaded after installation/uninstallation
      *
-     * @return bool
      */
     public function needsReloadAfterInstall(): bool;
 
diff --git a/lib/Extension/Bundle/PimcoreBundleInterface.php b/lib/Extension/Bundle/PimcoreBundleInterface.php
index 7c43aac2394..9b1d814be98 100644
--- a/lib/Extension/Bundle/PimcoreBundleInterface.php
+++ b/lib/Extension/Bundle/PimcoreBundleInterface.php
@@ -24,28 +24,24 @@ interface PimcoreBundleInterface extends BundleInterface
     /**
      * Bundle name as shown in extension manager
      *
-     * @return string
      */
     public function getNiceName(): string;
 
     /**
      * Bundle description as shown in extension manager
      *
-     * @return string
      */
     public function getDescription(): string;
 
     /**
      * Bundle version as shown in extension manager
      *
-     * @return string
      */
     public function getVersion(): string;
 
     /**
      * If the bundle has an installation routine, an installer is responsible of handling installation related tasks
      *
-     * @return InstallerInterface|null
      */
     public function getInstaller(): ?InstallerInterface;
 }
diff --git a/lib/Extension/Bundle/PimcoreBundleManager.php b/lib/Extension/Bundle/PimcoreBundleManager.php
index 4ad5ac0c409..eb127bfe299 100644
--- a/lib/Extension/Bundle/PimcoreBundleManager.php
+++ b/lib/Extension/Bundle/PimcoreBundleManager.php
@@ -70,7 +70,6 @@ public function __construct(
      * List of currently active bundles from kernel. A bundle can be in this list, without being enabled via
      * config file, if it is registered manually on the kernel.
      *
-     * @param bool $onlyInstalled
      *
      * @return PimcoreBundleInterface[]
      */
@@ -231,9 +230,7 @@ private static function getOptionsResolver(): OptionsResolver
     /**
      * Determines if a bundle exists
      *
-     * @param string|PimcoreBundleInterface $bundle
      *
-     * @return bool
      */
     public function exists(string|PimcoreBundleInterface $bundle): bool
     {
@@ -265,7 +262,6 @@ protected function isValidBundleIdentifier(string $identifier): bool
     /**
      * Validates bundle name against list if available and active bundles
      *
-     * @param string $identifier
      */
     protected function validateBundleIdentifier(string $identifier): void
     {
@@ -277,9 +273,7 @@ protected function validateBundleIdentifier(string $identifier): void
     /**
      * Determines if the bundle was programatically registered (not via extension manager)
      *
-     * @param string|PimcoreBundleInterface $bundle
      *
-     * @return bool
      */
     public function isManuallyRegistered(string|PimcoreBundleInterface $bundle): bool
     {
@@ -306,10 +300,7 @@ protected function loadBundleInstaller(PimcoreBundleInterface $bundle, bool $thr
     /**
      * Returns the bundle installer if configured
      *
-     * @param PimcoreBundleInterface $bundle
-     * @param bool $throwException
      *
-     * @return null|Installer\InstallerInterface
      */
     public function getInstaller(PimcoreBundleInterface $bundle, bool $throwException = false): ?Installer\InstallerInterface
     {
@@ -319,7 +310,6 @@ public function getInstaller(PimcoreBundleInterface $bundle, bool $throwExceptio
     /**
      * Runs install routine for a bundle
      *
-     * @param PimcoreBundleInterface $bundle
      *
      * @throws InstallationException If the bundle can not be installed or doesn't define an installer
      */
@@ -337,7 +327,6 @@ public function install(PimcoreBundleInterface $bundle): void
     /**
      * Runs uninstall routine for a bundle
      *
-     * @param PimcoreBundleInterface $bundle
      *
      * @throws InstallationException If the bundle can not be uninstalled or doesn't define an installer
      */
@@ -355,9 +344,7 @@ public function uninstall(PimcoreBundleInterface $bundle): void
     /**
      * Determines if a bundle can be installed
      *
-     * @param PimcoreBundleInterface $bundle
      *
-     * @return bool
      */
     public function canBeInstalled(PimcoreBundleInterface $bundle): bool
     {
@@ -371,9 +358,7 @@ public function canBeInstalled(PimcoreBundleInterface $bundle): bool
     /**
      * Determines if a bundle can be uninstalled
      *
-     * @param PimcoreBundleInterface $bundle
      *
-     * @return bool
      */
     public function canBeUninstalled(PimcoreBundleInterface $bundle): bool
     {
@@ -387,9 +372,7 @@ public function canBeUninstalled(PimcoreBundleInterface $bundle): bool
     /**
      * Determines if a bundle is installed
      *
-     * @param PimcoreBundleInterface $bundle
      *
-     * @return bool
      */
     public function isInstalled(PimcoreBundleInterface $bundle): bool
     {
@@ -404,9 +387,7 @@ public function isInstalled(PimcoreBundleInterface $bundle): bool
     /**
      * Determines if a reload is needed after installation
      *
-     * @param PimcoreBundleInterface $bundle
      *
-     * @return bool
      */
     public function needsReloadAfterInstall(PimcoreBundleInterface $bundle): bool
     {
@@ -469,8 +450,6 @@ public function getEditmodeCssPaths(): array
     /**
      * Iterates installed bundles and fetches asset paths
      *
-     * @param string $type
-     * @param string|null $mode
      *
      * @return string[]
      */
diff --git a/lib/Extension/Document/Areabrick/AbstractAreabrick.php b/lib/Extension/Document/Areabrick/AbstractAreabrick.php
index cdd741b54d0..fc10273ed38 100644
--- a/lib/Extension/Document/Areabrick/AbstractAreabrick.php
+++ b/lib/Extension/Document/Areabrick/AbstractAreabrick.php
@@ -33,7 +33,6 @@ abstract class AbstractAreabrick implements AreabrickInterface, TemplateAreabric
     /**
      * Called in AreabrickPass
      *
-     * @param EditableRenderer $editableRenderer
      */
     public function setEditableRenderer(EditableRenderer $editableRenderer): void
     {
@@ -42,9 +41,6 @@ public function setEditableRenderer(EditableRenderer $editableRenderer): void
 
     protected ?string $id = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function setId(string $id): void
     {
         // make sure ID is only set once
@@ -59,75 +55,48 @@ public function setId(string $id): void
         $this->id = $id;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getId(): string
     {
         return $this->id;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return $this->id ? ucfirst($this->id) : '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDescription(): string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getVersion(): string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getIcon(): ?string
     {
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasTemplate(): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function action(Info $info): ?\Symfony\Component\HttpFoundation\Response
     {
         // noop - implement as needed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function postRenderAction(Info $info): ?\Symfony\Component\HttpFoundation\Response
     {
         // noop - implement as needed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getHtmlTagOpen(Info $info): string
     {
         return '<div class="pimcore_area_' . $info->getId() . ' pimcore_area_content '. $this->getOpenTagCssClass($info) .'">';
@@ -138,9 +107,6 @@ protected function getOpenTagCssClass(Info $info): ?string
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getHtmlTagClose(Info $info): string
     {
         return '</div>';
diff --git a/lib/Extension/Document/Areabrick/AbstractTemplateAreabrick.php b/lib/Extension/Document/Areabrick/AbstractTemplateAreabrick.php
index 7fc3cc3fc46..3c7d17aafc8 100644
--- a/lib/Extension/Document/Areabrick/AbstractTemplateAreabrick.php
+++ b/lib/Extension/Document/Areabrick/AbstractTemplateAreabrick.php
@@ -30,26 +30,17 @@
  */
 abstract class AbstractTemplateAreabrick extends AbstractAreabrick
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getTemplate(): ?string
     {
         // return null by default = auto-discover
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getTemplateLocation(): string
     {
         return static::TEMPLATE_LOCATION_GLOBAL;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getTemplateSuffix(): string
     {
         return static::TEMPLATE_SUFFIX_TWIG;
diff --git a/lib/Extension/Document/Areabrick/AreabrickInterface.php b/lib/Extension/Document/Areabrick/AreabrickInterface.php
index 0400104e520..49ce0c77779 100644
--- a/lib/Extension/Document/Areabrick/AreabrickInterface.php
+++ b/lib/Extension/Document/Areabrick/AreabrickInterface.php
@@ -24,56 +24,48 @@ interface AreabrickInterface
     /**
      * The brick ID as registered on AreabrickManager
      *
-     * @param string $id
      */
     public function setId(string $id): void;
 
     /**
      * Brick ID - needs to be unique throughout the system.
      *
-     * @return string
      */
     public function getId(): string;
 
     /**
      * A descriptive name as shown in extension manager and edit mode.
      *
-     * @return string
      */
     public function getName(): string;
 
     /**
      * Area description as shown in extension manager.
      *
-     * @return string
      */
     public function getDescription(): string;
 
     /**
      * Area version as shown in extension manager.
      *
-     * @return string
      */
     public function getVersion(): string;
 
     /**
      * Icon as absolute path, e.g. /bundles/websitedemo/img/areas/foo/icon.png
      *
-     * @return string|null
      */
     public function getIcon(): ?string;
 
     /**
      * Determines if the brick has a view template
      *
-     * @return bool
      */
     public function hasTemplate(): bool;
 
     /**
      * Get view template
      *
-     * @return string|null
      */
     public function getTemplate(): ?string;
 
@@ -82,9 +74,7 @@ public function getTemplate(): ?string;
      *
      * If this method returns a Response object, it will be pushed onto the response stack and returned to the client.
      *
-     * @param Info $info
      *
-     * @return null|Response
      */
     public function action(Info $info): ?Response;
 
@@ -93,34 +83,27 @@ public function action(Info $info): ?Response;
      *
      * If this method returns a Response object, it will be pushed onto the response stack and returned to the client.
      *
-     * @param Info $info
      *
-     * @return null|Response
      */
     public function postRenderAction(Info $info): ?Response;
 
     /**
      * Returns the brick HTML open tag.
      *
-     * @param Info $info
      *
-     * @return string
      */
     public function getHtmlTagOpen(Info $info): string;
 
     /**
      * Returns the brick HTML close tag.
      *
-     * @param Info $info
      *
-     * @return string
      */
     public function getHtmlTagClose(Info $info): string;
 
     /**
      * Whether the UI needs a reload after this brick was added or removed
      *
-     * @return bool
      */
     public function needsReload(): bool;
 }
diff --git a/lib/Extension/Document/Areabrick/AreabrickManager.php b/lib/Extension/Document/Areabrick/AreabrickManager.php
index fc7e6d176a7..e756391a479 100644
--- a/lib/Extension/Document/Areabrick/AreabrickManager.php
+++ b/lib/Extension/Document/Areabrick/AreabrickManager.php
@@ -40,9 +40,6 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function register(string $id, AreabrickInterface $brick): void
     {
         if (array_key_exists($id, $this->bricks)) {
@@ -68,9 +65,6 @@ public function register(string $id, AreabrickInterface $brick): void
         $this->bricks[$id] = $brick;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function registerService(string $id, string $serviceId): void
     {
         if (array_key_exists($id, $this->bricks)) {
@@ -94,9 +88,6 @@ public function registerService(string $id, string $serviceId): void
         $this->brickServiceIds[$id] = $serviceId;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBrick(string $id): AreabrickInterface
     {
         $brick = null;
@@ -113,9 +104,6 @@ public function getBrick(string $id): AreabrickInterface
         return $brick;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBricks(): array
     {
         if (count($this->brickServiceIds) > 0) {
@@ -125,9 +113,6 @@ public function getBricks(): array
         return $this->bricks;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBrickIds(): array
     {
         $ids = array_merge(
@@ -141,9 +126,7 @@ public function getBrickIds(): array
     /**
      * Loads brick from container
      *
-     * @param string $id
      *
-     * @return AreabrickInterface|null
      */
     protected function loadServiceBrick(string $id): ?AreabrickInterface
     {
diff --git a/lib/Extension/Document/Areabrick/AreabrickManagerInterface.php b/lib/Extension/Document/Areabrick/AreabrickManagerInterface.php
index 1f0863e72f1..b06b340aa39 100644
--- a/lib/Extension/Document/Areabrick/AreabrickManagerInterface.php
+++ b/lib/Extension/Document/Areabrick/AreabrickManagerInterface.php
@@ -22,25 +22,19 @@ interface AreabrickManagerInterface
     /**
      * Registers an areabrick on the manager
      *
-     * @param string $id
-     * @param AreabrickInterface $brick
      */
     public function register(string $id, AreabrickInterface $brick): void;
 
     /**
      * Registers a lazy loaded area brick service on the manager
      *
-     * @param string $id
-     * @param string $serviceId
      */
     public function registerService(string $id, string $serviceId): void;
 
     /**
      * Fetches a brick by ID
      *
-     * @param string $id
      *
-     * @return AreabrickInterface
      */
     public function getBrick(string $id): AreabrickInterface;
 
@@ -54,7 +48,6 @@ public function getBricks(): array;
     /**
      * Lists all registered areabrick IDs
      *
-     * @return array
      */
     public function getBrickIds(): array;
 }
diff --git a/lib/Extension/Document/Areabrick/TemplateAreabrickInterface.php b/lib/Extension/Document/Areabrick/TemplateAreabrickInterface.php
index d0c34c859e0..6c5a11b3fe6 100644
--- a/lib/Extension/Document/Areabrick/TemplateAreabrickInterface.php
+++ b/lib/Extension/Document/Areabrick/TemplateAreabrickInterface.php
@@ -38,14 +38,12 @@ interface TemplateAreabrickInterface extends AreabrickInterface
     /**
      * Determines if template should be auto-located in bundle or in project
      *
-     * @return string
      */
     public function getTemplateLocation(): string;
 
     /**
      * Returns view suffix used to auto-build view names
      *
-     * @return string
      */
     public function getTemplateSuffix(): string;
 }
diff --git a/lib/Helper/ContrastColor.php b/lib/Helper/ContrastColor.php
index f0aa2cdeb4c..47cffbfe334 100644
--- a/lib/Helper/ContrastColor.php
+++ b/lib/Helper/ContrastColor.php
@@ -24,9 +24,7 @@ class ContrastColor
     /**
      * returns either hex code of black or white depending on the contrast to the given color
      *
-     * @param string $hexColor
      *
-     * @return string
      */
     public static function getContrastColor(string $hexColor): string
     {
diff --git a/lib/Helper/LongRunningHelper.php b/lib/Helper/LongRunningHelper.php
index 83df00ef521..9b7aa96e3d9 100644
--- a/lib/Helper/LongRunningHelper.php
+++ b/lib/Helper/LongRunningHelper.php
@@ -52,7 +52,6 @@ final class LongRunningHelper
     /**
      * LongRunningHelper constructor.
      *
-     * @param ConnectionRegistry $connectionRegistry
      */
     public function __construct(ConnectionRegistry $connectionRegistry)
     {
@@ -130,7 +129,6 @@ protected function cleanupMonolog(): void
     /**
      * @internal
      *
-     * @param HandlerInterface $handler
      */
     public function addMonologHandler(HandlerInterface $handler): void
     {
diff --git a/lib/Helper/Mail.php b/lib/Helper/Mail.php
index 9afb0fc0b35..35c0748fdb6 100644
--- a/lib/Helper/Mail.php
+++ b/lib/Helper/Mail.php
@@ -28,10 +28,7 @@
 class Mail
 {
     /**
-     * @param string $type
-     * @param MailClient $mail
      *
-     * @return string
      *
      * @throws \Exception
      */
@@ -92,7 +89,6 @@ public static function getDebugInformation(string $type, MailClient $mail): stri
      *
      * @static
      *
-     * @return string
      */
     public static function getDebugInformationCssStyle(): string
     {
@@ -131,9 +127,7 @@ public static function getDebugInformationCssStyle(): string
      *
      * Helper to format the receivers for the debug email and logging
      *
-     * @param array $receivers
      *
-     * @return string
      */
     public static function formatDebugReceivers(array $receivers): string
     {
@@ -154,13 +148,6 @@ public static function formatDebugReceivers(array $receivers): string
         return implode(', ', $formatedReceiversArray);
     }
 
-    /**
-     * @param MailClient $mail
-     * @param array $recipients
-     * @param string|null $error
-     *
-     * @return Model\Tool\Email\Log
-     */
     public static function logEmail(MailClient $mail, array $recipients, string $error = null): Model\Tool\Email\Log
     {
         $emailLog = new Model\Tool\Email\Log();
@@ -218,11 +205,7 @@ public static function logEmail(MailClient $mail, array $recipients, string $err
     }
 
     /**
-     * @param string $string
-     * @param Model\Document|null $document
-     * @param string|null $hostUrl
      *
-     * @return string
      *
      * @throws \Exception
      */
@@ -296,10 +279,7 @@ public static function setAbsolutePaths(string $string, ?Model\Document $documen
     }
 
     /**
-     * @param string $string
-     * @param Model\Document|null $document
      *
-     * @return string
      *
      * @throws \Exception
      */
@@ -355,10 +335,7 @@ public static function embedAndModifyCss(string $string, ?Model\Document $docume
      *
      * @static
      *
-     * @param string $content
-     * @param array $fileInfo
      *
-     * @return string
      */
     public static function normalizeCssContent(string $content, array $fileInfo): string
     {
@@ -386,10 +363,7 @@ public static function normalizeCssContent(string $content, array $fileInfo): st
     }
 
     /**
-     * @param string $path
-     * @param Model\Document|null $document
      *
-     * @return array
      *
      * @throws \Exception
      */
diff --git a/lib/Helper/TemporaryFileHelperTrait.php b/lib/Helper/TemporaryFileHelperTrait.php
index e62972007f7..ff605f86544 100644
--- a/lib/Helper/TemporaryFileHelperTrait.php
+++ b/lib/Helper/TemporaryFileHelperTrait.php
@@ -50,8 +50,6 @@ protected static function getLocalFileFromStream(mixed $stream): string
      * @param resource|string $stream
      * @param bool $keep whether to delete this file on shutdown or not
      *
-     * @return string
-     *
      * @throws \Exception
      */
     protected static function getTemporaryFileFromStream(mixed $stream, bool $keep = false): string
diff --git a/lib/Http/Exception/ResponseException.php b/lib/Http/Exception/ResponseException.php
index 7bac9d51c5a..ddc3ce98c97 100644
--- a/lib/Http/Exception/ResponseException.php
+++ b/lib/Http/Exception/ResponseException.php
@@ -22,10 +22,6 @@ class ResponseException extends \Exception
 {
     protected Response $response;
 
-    /**
-     * @param Response $response
-     * @param \Exception|null $previous
-     */
     public function __construct(Response $response, \Exception $previous = null)
     {
         parent::__construct('', 0, $previous);
diff --git a/lib/Http/Request/Resolver/DocumentResolver.php b/lib/Http/Request/Resolver/DocumentResolver.php
index 5670de33865..ec81d7d43d5 100644
--- a/lib/Http/Request/Resolver/DocumentResolver.php
+++ b/lib/Http/Request/Resolver/DocumentResolver.php
@@ -22,11 +22,6 @@
 
 class DocumentResolver extends AbstractRequestResolver
 {
-    /**
-     * @param Request|null $request
-     *
-     * @return null|Document
-     */
     public function getDocument(Request $request = null): ?Document
     {
         if (null === $request) {
diff --git a/lib/Http/Request/Resolver/EditmodeResolver.php b/lib/Http/Request/Resolver/EditmodeResolver.php
index 5f30edf7daf..0bc769c8739 100644
--- a/lib/Http/Request/Resolver/EditmodeResolver.php
+++ b/lib/Http/Request/Resolver/EditmodeResolver.php
@@ -50,11 +50,6 @@ public function setForceEditmode(bool $forceEditmode): static
         return $this;
     }
 
-    /**
-     * @param Request|null $request
-     *
-     * @return bool
-     */
     public function isEditmode(Request $request = null): bool
     {
         if ($this->forceEditmode) {
diff --git a/lib/Http/Request/Resolver/OutputTimestampResolver.php b/lib/Http/Request/Resolver/OutputTimestampResolver.php
index ebbce68f589..dec9fdd18c6 100644
--- a/lib/Http/Request/Resolver/OutputTimestampResolver.php
+++ b/lib/Http/Request/Resolver/OutputTimestampResolver.php
@@ -33,7 +33,6 @@ class OutputTimestampResolver extends AbstractRequestResolver
     /**
      * Gets timestamp for with the output should be rendered to
      *
-     * @return int
      */
     public function getOutputTimestamp(): int
     {
@@ -54,7 +53,6 @@ public function getOutputTimestamp(): int
     /**
      * Sets output timestamp to given value
      *
-     * @param int $timestamp
      */
     public function setOutputTimestamp(int $timestamp): void
     {
@@ -64,7 +62,6 @@ public function setOutputTimestamp(int $timestamp): void
     /**
      * Returns if timestamp was queried during request at least once
      *
-     * @return bool
      */
     public function timestampWasQueried(): bool
     {
diff --git a/lib/Http/Request/Resolver/PimcoreContextResolver.php b/lib/Http/Request/Resolver/PimcoreContextResolver.php
index e180aba018c..521f1800631 100644
--- a/lib/Http/Request/Resolver/PimcoreContextResolver.php
+++ b/lib/Http/Request/Resolver/PimcoreContextResolver.php
@@ -44,9 +44,7 @@ public function __construct(RequestStack $requestStack, PimcoreContextGuesser $g
     /**
      * Get pimcore context from request
      *
-     * @param Request|null $request
      *
-     * @return string|null
      */
     public function getPimcoreContext(Request $request = null): ?string
     {
@@ -67,8 +65,6 @@ public function getPimcoreContext(Request $request = null): ?string
     /**
      * Sets the pimcore context on the request
      *
-     * @param Request $request
-     * @param string $context
      */
     public function setPimcoreContext(Request $request, string $context): void
     {
@@ -79,10 +75,7 @@ public function setPimcoreContext(Request $request, string $context): void
      * Tests if the request matches a given contect. $context can also be an array of contexts. If one
      * of the contexts matches, the method will return true.
      *
-     * @param Request $request
-     * @param array|string $context
      *
-     * @return bool
      */
     public function matchesPimcoreContext(Request $request, array|string $context): bool
     {
diff --git a/lib/Http/Request/Resolver/ResponseHeaderResolver.php b/lib/Http/Request/Resolver/ResponseHeaderResolver.php
index d4c04fe07c5..d29b5880668 100644
--- a/lib/Http/Request/Resolver/ResponseHeaderResolver.php
+++ b/lib/Http/Request/Resolver/ResponseHeaderResolver.php
@@ -31,7 +31,6 @@ class ResponseHeaderResolver extends AbstractRequestResolver
      * Get response headers which were added to the request either by annotation
      * or manually.
      *
-     * @param Request|null $request
      *
      * @return ResponseHeader[]
      */
@@ -48,10 +47,6 @@ public function getResponseHeaders(Request $request = null): array
      * We don't have a response object at this point, but we can add headers here which will be
      * set by the ResponseHeaderListener which reads and adds this headers in the kernel.response event.
      *
-     * @param Request $request
-     * @param string $key
-     * @param array|string $values
-     * @param bool $replace
      */
     public function addResponseHeader(Request $request, string $key, array|string $values, bool $replace = false): void
     {
diff --git a/lib/Http/Request/Resolver/SiteResolver.php b/lib/Http/Request/Resolver/SiteResolver.php
index 1d8c01ed907..d93f472dee5 100644
--- a/lib/Http/Request/Resolver/SiteResolver.php
+++ b/lib/Http/Request/Resolver/SiteResolver.php
@@ -30,11 +30,6 @@ public function setSite(Request $request, Site $site): void
         $request->attributes->set(static::ATTRIBUTE_SITE, $site);
     }
 
-    /**
-     * @param Request|null $request
-     *
-     * @return Site|null
-     */
     public function getSite(Request $request = null): ?Site
     {
         if (null === $request) {
@@ -49,11 +44,6 @@ public function setSitePath(Request $request, string $path): void
         $request->attributes->set(static::ATTRIBUTE_SITE_PATH, $path);
     }
 
-    /**
-     * @param Request|null $request
-     *
-     * @return string|null
-     */
     public function getSitePath(Request $request = null): ?string
     {
         if (null === $request) {
@@ -63,11 +53,6 @@ public function getSitePath(Request $request = null): ?string
         return $request->attributes->get(static::ATTRIBUTE_SITE_PATH);
     }
 
-    /**
-     * @param Request|null $request
-     *
-     * @return bool
-     */
     public function isSiteRequest(Request $request = null): bool
     {
         $site = $this->getSite($request);
diff --git a/lib/Http/Request/Resolver/TemplateResolver.php b/lib/Http/Request/Resolver/TemplateResolver.php
index a3044777a4f..87f0f503aaf 100644
--- a/lib/Http/Request/Resolver/TemplateResolver.php
+++ b/lib/Http/Request/Resolver/TemplateResolver.php
@@ -24,11 +24,6 @@
  */
 class TemplateResolver extends AbstractRequestResolver
 {
-    /**
-     * @param Request|null $request
-     *
-     * @return null|string
-     */
     public function getTemplate(Request $request = null): ?string
     {
         if (null === $request) {
diff --git a/lib/Http/RequestHelper.php b/lib/Http/RequestHelper.php
index db7aeb05d45..eeac437e494 100644
--- a/lib/Http/RequestHelper.php
+++ b/lib/Http/RequestHelper.php
@@ -51,11 +51,6 @@ public function getCurrentRequest(): Request
         return $this->requestStack->getCurrentRequest();
     }
 
-    /**
-     * @param Request|null $request
-     *
-     * @return Request
-     */
     public function getRequest(Request $request = null): Request
     {
         if (null === $request) {
@@ -80,11 +75,6 @@ public function getMainRequest(): Request
         return $mainRequest;
     }
 
-    /**
-     * @param Request|null $request
-     *
-     * @return bool
-     */
     public function isFrontendRequest(Request $request = null): bool
     {
         $request = $this->getRequest($request);
@@ -120,9 +110,7 @@ private function detectFrontendRequest(Request $request): bool
     /**
      * Can be used to check if a user is trying to access the object preview and is allowed to do so.
      *
-     * @param Request|null $request
      *
-     * @return bool
      */
     public function isObjectPreviewRequestByAdmin(Request $request = null): bool
     {
@@ -135,9 +123,7 @@ public function isObjectPreviewRequestByAdmin(Request $request = null): bool
     /**
      * E.g. editmode, preview, version preview, always when it is a "frontend-request", but called out of the admin
      *
-     * @param Request|null $request
      *
-     * @return bool
      */
     public function isFrontendRequestByAdmin(Request $request = null): bool
     {
@@ -169,9 +155,7 @@ public function isFrontendRequestByAdmin(Request $request = null): bool
      *
      * @internal
      *
-     * @param Request|null $request
      *
-     * @return string
      */
     public function getAnonymizedClientIp(Request $request = null): string
     {
@@ -192,9 +176,7 @@ private function anonymizeIp(string $ip): string
     }
 
     /**
-     * @param string $uri
      *
-     * @return Request
      *
      * @internal
      */
diff --git a/lib/Http/Response/CodeInjector.php b/lib/Http/Response/CodeInjector.php
index 3d7104b7423..739be1a9526 100644
--- a/lib/Http/Response/CodeInjector.php
+++ b/lib/Http/Response/CodeInjector.php
@@ -70,13 +70,7 @@ public function inject(Response $response, string $code, string $selector = self
     /**
      * @internal
      *
-     * @param string $html
-     * @param string $code
-     * @param string $selector
-     * @param string $position
-     * @param string $charset
      *
-     * @return string
      */
     public function injectIntoHtml(string $html, string $code, string $selector, string $position, string $charset = 'UTF-8'): string
     {
diff --git a/lib/Http/ResponseHelper.php b/lib/Http/ResponseHelper.php
index 1ee37b57230..626b709ad5c 100644
--- a/lib/Http/ResponseHelper.php
+++ b/lib/Http/ResponseHelper.php
@@ -28,8 +28,6 @@ class ResponseHelper
     /**
      * Disable cache
      *
-     * @param Response $response
-     * @param bool $force
      */
     public function disableCache(Response $response, bool $force = false): void
     {
diff --git a/lib/HttpKernel/Bundle/DependentBundleInterface.php b/lib/HttpKernel/Bundle/DependentBundleInterface.php
index 5d0da5f8221..11d20927208 100644
--- a/lib/HttpKernel/Bundle/DependentBundleInterface.php
+++ b/lib/HttpKernel/Bundle/DependentBundleInterface.php
@@ -32,7 +32,6 @@ interface DependentBundleInterface
      * it will finally be included due to environment restrictions. If you need to load your dependencies conditionally,
      * specify the environments to use on the collection item.
      *
-     * @param BundleCollection $collection
      */
     public static function registerDependentBundles(BundleCollection $collection): void;
 }
diff --git a/lib/HttpKernel/BundleCollection/LazyLoadedItem.php b/lib/HttpKernel/BundleCollection/LazyLoadedItem.php
index 71b7f5a4305..c5f4ef83124 100644
--- a/lib/HttpKernel/BundleCollection/LazyLoadedItem.php
+++ b/lib/HttpKernel/BundleCollection/LazyLoadedItem.php
@@ -32,10 +32,6 @@ class LazyLoadedItem extends AbstractItem
     /**
      * LazyLoadedItem constructor.
      *
-     * @param string $className
-     * @param int $priority
-     * @param array $environments
-     * @param string $source
      */
     public function __construct(
         string $className,
diff --git a/lib/HttpKernel/BundleLocator/BundleLocator.php b/lib/HttpKernel/BundleLocator/BundleLocator.php
index 42e3eb44d40..bc8b5bac4bb 100644
--- a/lib/HttpKernel/BundleLocator/BundleLocator.php
+++ b/lib/HttpKernel/BundleLocator/BundleLocator.php
@@ -30,17 +30,11 @@ public function __construct(KernelInterface $kernel)
         $this->kernel = $kernel;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBundle(object|string $class): BundleInterface
     {
         return $this->getBundleForClass($class);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBundlePath(object|string $class): string
     {
         return $this->getBundleForClass($class)->getPath();
diff --git a/lib/HttpKernel/BundleLocator/BundleLocatorInterface.php b/lib/HttpKernel/BundleLocator/BundleLocatorInterface.php
index 47b0db7db9b..2d4026a8002 100644
--- a/lib/HttpKernel/BundleLocator/BundleLocatorInterface.php
+++ b/lib/HttpKernel/BundleLocator/BundleLocatorInterface.php
@@ -23,9 +23,7 @@ interface BundleLocatorInterface
     /**
      * Loads bundle for a class name. Returns the AppBundle for AppBundle\Controller\FooController
      *
-     * @param object|string $class
      *
-     * @return BundleInterface
      *
      * @throws NotFoundException
      */
@@ -36,9 +34,7 @@ public function getBundle(object|string $class): BundleInterface;
      *
      * AppBundle\Controller\FooController returns src/AppBundle
      *
-     * @param object|string $class
      *
-     * @return string
      *
      * @throws NotFoundException
      */
diff --git a/lib/HttpKernel/CacheWarmer/MkdirCacheWarmer.php b/lib/HttpKernel/CacheWarmer/MkdirCacheWarmer.php
index da370892732..d5f9514ae04 100644
--- a/lib/HttpKernel/CacheWarmer/MkdirCacheWarmer.php
+++ b/lib/HttpKernel/CacheWarmer/MkdirCacheWarmer.php
@@ -33,17 +33,11 @@ public function __construct(int $mode = 0775)
         $this->mode = $mode;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isOptional(): bool
     {
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function warmUp(string $cacheDir): array
     {
         $directories = [
diff --git a/lib/HttpKernel/CacheWarmer/PimcoreCoreCacheWarmer.php b/lib/HttpKernel/CacheWarmer/PimcoreCoreCacheWarmer.php
index aca7d5a3587..adfdc7cfbd7 100644
--- a/lib/HttpKernel/CacheWarmer/PimcoreCoreCacheWarmer.php
+++ b/lib/HttpKernel/CacheWarmer/PimcoreCoreCacheWarmer.php
@@ -26,17 +26,11 @@
  */
 class PimcoreCoreCacheWarmer implements CacheWarmerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function isOptional(): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function warmUp(string $cacheDir): array
     {
         $classes = [];
diff --git a/lib/Image.php b/lib/Image.php
index e3ba1039f41..c634b13d6a5 100644
--- a/lib/Image.php
+++ b/lib/Image.php
@@ -22,7 +22,6 @@
 final class Image
 {
     /**
-     * @return null|Adapter\GD|Adapter\Imagick
      *
      * @throws \Exception
      */
@@ -35,7 +34,6 @@ public static function getInstance(): Adapter\GD|Adapter\Imagick|null
     }
 
     /**
-     * @return null|Adapter\GD|Adapter\Imagick
      *
      * @throws \Exception
      *
diff --git a/lib/Image/Adapter.php b/lib/Image/Adapter.php
index 19132cbd79c..c25cca26292 100644
--- a/lib/Image/Adapter.php
+++ b/lib/Image/Adapter.php
@@ -231,11 +231,6 @@ public function roundCorners(int $width, int $height): static
     }
 
     /**
-     * @param mixed $image
-     * @param int $x
-     * @param int $y
-     * @param int $alpha
-     * @param string $composite
      * @param string $origin Origin of the X and Y coordinates (top-left, top-right, bottom-left, bottom-right or center)
      *
      * @return $this
@@ -305,27 +300,18 @@ public function brightnessSaturation(int $brightness = 100, int $saturation = 10
     }
 
     /**
-     * @abstract
      *
-     * @param string $imagePath
-     * @param array $options
      *
      * @return $this|false
      */
     abstract public function load(string $imagePath, array $options = []): static|false;
 
     /**
-     * @param string $path
-     * @param string|null $format
-     * @param int|null $quality
      *
      * @return $this
      */
     abstract public function save(string $path, string $format = null, int $quality = null): static;
 
-    /**
-     * @abstract
-     */
     abstract protected function destroy(): void;
 
     abstract public function getContentOptimizedFormat(): string;
diff --git a/lib/Image/Adapter/GD.php b/lib/Image/Adapter/GD.php
index a96793b7603..10ac7ff87bb 100644
--- a/lib/Image/Adapter/GD.php
+++ b/lib/Image/Adapter/GD.php
@@ -27,9 +27,6 @@ class GD extends Adapter
      */
     protected mixed $resource = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function load(string $imagePath, array $options = []): static|false
     {
         $this->path = $imagePath;
@@ -66,9 +63,6 @@ public function getContentOptimizedFormat(): string
         return $format;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function save(string $path, string $format = null, int $quality = null): static
     {
         if (!$format || $format == 'png32') {
@@ -131,9 +125,6 @@ private function hasAlphaChannel(): bool
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function destroy(): void
     {
         if ($this->resource) {
@@ -293,9 +284,6 @@ public function sepia(): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addOverlay(mixed $image, int $x = 0, int $y = 0, int $alpha = 100, string $composite = 'COMPOSITE_DEFAULT', string $origin = 'top-left'): static
     {
         $this->preModify();
@@ -364,9 +352,6 @@ public function rotate(int $angle): static
      */
     protected static array $supportedFormatsCache = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsFormat(string $format, bool $force = false): bool
     {
         if (!isset(self::$supportedFormatsCache[$format]) || $force) {
diff --git a/lib/Image/Adapter/Imagick.php b/lib/Image/Adapter/Imagick.php
index 9c9166289a8..cb7824182b3 100644
--- a/lib/Image/Adapter/Imagick.php
+++ b/lib/Image/Adapter/Imagick.php
@@ -43,9 +43,6 @@ class Imagick extends Adapter
 
     private ?array $initalOptions = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function load(string $imagePath, array $options = []): static|false
     {
         $this->initalOptions ??= $options;
@@ -182,9 +179,6 @@ public function getContentOptimizedFormat(): string
         return $format;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function save(string $path, string $format = null, int $quality = null): static
     {
         if (!$format) {
@@ -307,9 +301,6 @@ private function checkPreserveAnimation(string $format = '', \Imagick $i = null,
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function destroy(): void
     {
         if ($this->resource) {
@@ -419,7 +410,6 @@ private function setColorspaceToRGB(): static
     }
 
     /**
-     * @param string $CMYKColorProfile
      *
      * @internal
      */
@@ -431,7 +421,6 @@ public static function setCMYKColorProfile(string $CMYKColorProfile): void
     /**
      * @internal
      *
-     * @return string
      */
     public static function getCMYKColorProfile(): string
     {
@@ -450,7 +439,6 @@ public static function getCMYKColorProfile(): string
     }
 
     /**
-     * @param string $RGBColorProfile
      *
      * @internal
      *
@@ -463,7 +451,6 @@ public static function setRGBColorProfile(string $RGBColorProfile): void
     /**
      * @internal
      *
-     * @return string
      */
     public static function getRGBColorProfile(): string
     {
@@ -713,9 +700,6 @@ public function setBackgroundImage(string $image, string $mode = null): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addOverlay(mixed $image, int $x = 0, int $y = 0, int $alpha = 100, string $composite = 'COMPOSITE_DEFAULT', string $origin = 'top-left'): static
     {
         $this->preModify();
@@ -973,9 +957,6 @@ protected function getVectorRasterDimensions(): array
         return parent::getVectorRasterDimensions();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsFormat(string $format, bool $force = false): bool
     {
         if ($force) {
diff --git a/lib/Image/Optimizer/OptimizerInterface.php b/lib/Image/Optimizer/OptimizerInterface.php
index 8019c37fe47..970389a7950 100644
--- a/lib/Image/Optimizer/OptimizerInterface.php
+++ b/lib/Image/Optimizer/OptimizerInterface.php
@@ -21,10 +21,7 @@
 interface OptimizerInterface
 {
     /**
-     * @param string $input
-     * @param string $output
      *
-     * @return string
      *
      * @throws ImageOptimizationFailedException
      */
diff --git a/lib/Kernel.php b/lib/Kernel.php
index e1480797e9b..cf80a8c7b54 100644
--- a/lib/Kernel.php
+++ b/lib/Kernel.php
@@ -56,39 +56,21 @@ abstract class Kernel extends SymfonyKernel
 
     private BundleCollection $bundleCollection;
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getProjectDir(): string
     {
         return PIMCORE_PROJECT_ROOT;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getCacheDir(): string
     {
         return ($_SERVER['APP_CACHE_DIR'] ?? PIMCORE_SYMFONY_CACHE_DIRECTORY) . '/' . $this->environment;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getLogDir(): string
     {
         return PIMCORE_LOG_DIRECTORY;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $bundleConfigLocator = new BundleConfigLocator($this);
@@ -142,9 +124,6 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
         });
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function boot(): void
     {
         if (true === $this->booted) {
@@ -160,9 +139,6 @@ public function boot(): void
         parent::boot();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function shutdown(): void
     {
         if (true === $this->booted) {
@@ -173,9 +149,6 @@ public function shutdown(): void
         parent::shutdown();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function initializeContainer(): void
     {
         parent::initializeContainer();
@@ -233,7 +206,6 @@ public function registerBundles(): array
      * Creates bundle collection. Use this method to set bundles on the collection
      * early.
      *
-     * @return BundleCollection
      */
     protected function createBundleCollection(): BundleCollection
     {
@@ -243,7 +215,6 @@ protected function createBundleCollection(): BundleCollection
     /**
      * Returns the bundle collection which was used to build the set of used bundles
      *
-     * @return BundleCollection
      */
     public function getBundleCollection(): BundleCollection
     {
@@ -253,7 +224,6 @@ public function getBundleCollection(): BundleCollection
     /**
      * Registers "core" bundles
      *
-     * @param BundleCollection $collection
      */
     protected function registerCoreBundlesToCollection(BundleCollection $collection): void
     {
@@ -301,7 +271,6 @@ protected function getEnvironmentsForDevBundles(): array
      *
      * To be implemented in child classes
      *
-     * @param BundleCollection $collection
      */
     public function registerBundlesToCollection(BundleCollection $collection): void
     {
diff --git a/lib/Loader/ImplementationLoader/AbstractClassNameLoader.php b/lib/Loader/ImplementationLoader/AbstractClassNameLoader.php
index 5e0620649a3..3730e07b08f 100644
--- a/lib/Loader/ImplementationLoader/AbstractClassNameLoader.php
+++ b/lib/Loader/ImplementationLoader/AbstractClassNameLoader.php
@@ -26,9 +26,6 @@ abstract class AbstractClassNameLoader implements LoaderInterface, ClassNameLoad
 {
     abstract protected function getClassName(string $name): string;
 
-    /**
-     * {@inheritdoc}
-     */
     public function build(string $name, array $params = []): mixed
     {
         if (!$this->supports($name)) {
diff --git a/lib/Loader/ImplementationLoader/ClassMapLoader.php b/lib/Loader/ImplementationLoader/ClassMapLoader.php
index 52075a5af56..9d5af9cee65 100644
--- a/lib/Loader/ImplementationLoader/ClassMapLoader.php
+++ b/lib/Loader/ImplementationLoader/ClassMapLoader.php
@@ -33,9 +33,6 @@ public function __construct(array $classMap = [])
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supports(string $name): bool
     {
         return isset($this->classMap[$this->normalizeName($name)]);
diff --git a/lib/Loader/ImplementationLoader/ImplementationLoader.php b/lib/Loader/ImplementationLoader/ImplementationLoader.php
index cc0fb5acc33..2abb9b21003 100644
--- a/lib/Loader/ImplementationLoader/ImplementationLoader.php
+++ b/lib/Loader/ImplementationLoader/ImplementationLoader.php
@@ -78,17 +78,11 @@ private function getLoader(string $name): ?LoaderInterface
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supports(string $name): bool
     {
         return null !== $this->getLoader($name);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function build(string $name, array $params = []): mixed
     {
         $loader = $this->getLoader($name);
diff --git a/lib/Loader/ImplementationLoader/LoaderInterface.php b/lib/Loader/ImplementationLoader/LoaderInterface.php
index 6188eae04d5..44a27b20a45 100644
--- a/lib/Loader/ImplementationLoader/LoaderInterface.php
+++ b/lib/Loader/ImplementationLoader/LoaderInterface.php
@@ -25,19 +25,14 @@ interface LoaderInterface
     /**
      * Checks if implementation is supported
      *
-     * @param string $name
      *
-     * @return bool
      */
     public function supports(string $name): bool;
 
     /**
      * Builds an implementation instance
      *
-     * @param string $name
-     * @param array $params
      *
-     * @return mixed
      */
     public function build(string $name, array $params = []): mixed;
 }
diff --git a/lib/Loader/ImplementationLoader/PrefixLoader.php b/lib/Loader/ImplementationLoader/PrefixLoader.php
index 0e1bec2ec42..66945569d4d 100644
--- a/lib/Loader/ImplementationLoader/PrefixLoader.php
+++ b/lib/Loader/ImplementationLoader/PrefixLoader.php
@@ -59,9 +59,6 @@ private function setPrefixes(array $prefixes): void
         $this->prefixes = array_unique($this->prefixes);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supports(string $name): bool
     {
         return null !== $this->findClassName($name);
diff --git a/lib/Localization/IntlFormatter.php b/lib/Localization/IntlFormatter.php
index f1ce7845284..b91f270c9d3 100644
--- a/lib/Localization/IntlFormatter.php
+++ b/lib/Localization/IntlFormatter.php
@@ -97,9 +97,7 @@ public function setCurrencyFormat(string $locale, string $currencyFormat): void
     }
 
     /**
-     * @param string $format
      *
-     * @return \IntlDateFormatter
      *
      * @throws \RuntimeException
      */
@@ -168,10 +166,7 @@ protected function buildDateTimeFormatters(string $format): \IntlDateFormatter
     /**
      * formats given datetime in given format
      *
-     * @param \DateTimeInterface|int|string $dateTime
-     * @param string $format
      *
-     * @return bool|string
      */
     public function formatDateTime(\DateTimeInterface|int|string $dateTime, string $format = self::DATETIME_MEDIUM): bool|string
     {
@@ -188,9 +183,7 @@ public function formatDateTime(\DateTimeInterface|int|string $dateTime, string $
     /**
      * formats given value as number based on current locale
      *
-     * @param float|int $value
      *
-     * @return bool|string
      */
     public function formatNumber(float|int $value): bool|string
     {
@@ -204,11 +197,7 @@ public function formatNumber(float|int $value): bool|string
     /**
      * formats given value as currency string with given currency based on current locale
      *
-     * @param float $value
-     * @param string $currency
-     * @param string $pattern
      *
-     * @return string
      */
     public function formatCurrency(float $value, string $currency, string $pattern = 'default'): string
     {
diff --git a/lib/Localization/LocaleService.php b/lib/Localization/LocaleService.php
index 6d803b6af6b..f0784c99933 100644
--- a/lib/Localization/LocaleService.php
+++ b/lib/Localization/LocaleService.php
@@ -27,10 +27,6 @@ class LocaleService implements LocaleServiceInterface
 
     protected ?Translator $translator = null;
 
-    /**
-     * @param RequestStack|null $requestStack
-     * @param Translator|null $translator
-     */
     public function __construct(RequestStack $requestStack = null, Translator $translator = null)
     {
         $this->requestStack = $requestStack;
@@ -77,11 +73,6 @@ public function getLocaleList(): array
         return \ResourceBundle::getLocales('');
     }
 
-    /**
-     * @param string|null $locale
-     *
-     * @return array
-     */
     public function getDisplayRegions(string $locale = null): array
     {
         if (!$locale) {
diff --git a/lib/Localization/LocaleServiceInterface.php b/lib/Localization/LocaleServiceInterface.php
index 8488b987ded..6cb5ee30f7a 100644
--- a/lib/Localization/LocaleServiceInterface.php
+++ b/lib/Localization/LocaleServiceInterface.php
@@ -24,11 +24,6 @@ public function findLocale(): string;
 
     public function getLocaleList(): array;
 
-    /**
-     * @param string|null $locale
-     *
-     * @return array
-     */
     public function getDisplayRegions(string $locale = null): array;
 
     public function getLocale(): ?string;
diff --git a/lib/Logger.php b/lib/Logger.php
index 9fd01ef0028..b8dab75e04d 100644
--- a/lib/Logger.php
+++ b/lib/Logger.php
@@ -19,9 +19,6 @@
 class Logger
 {
     /**
-     * @param string $message
-     * @param string $level
-     * @param array $context
      *
      * @internal
      */
diff --git a/lib/Mail.php b/lib/Mail.php
index edeee560697..1e73d62db70 100644
--- a/lib/Mail.php
+++ b/lib/Mail.php
@@ -37,14 +37,12 @@ class Mail extends Email
     /**
      * If true - emails are logged in the database and on the file-system
      *
-     * @var bool
      */
     private bool $loggingEnable = true;
 
     /**
      * Contains the email document
      *
-     * @var Model\Document\Email|null
      */
     private Model\Document\Email|null $document = null;
 
@@ -72,14 +70,12 @@ class Mail extends Email
     /**
      * Prevent adding debug information
      *
-     * @var bool
      */
     private bool $preventDebugInformationAppending = false;
 
     /**
      * if true - the Pimcore debug mode is ignored
      *
-     * @var bool
      */
     private bool $ignoreDebugMode = false;
 
@@ -89,21 +85,18 @@ class Mail extends Email
      *
      * @see MailHelper::setAbsolutePaths()
      *
-     * @var string|null
      */
     private ?string $hostUrl = null;
 
     /**
      * if true: prevent setting the recipients from the Document - set in $this->clearRecipients()
      *
-     * @var bool
      */
     private bool $recipientsCleared = false;
 
     /**
      * place to store original data before modifying message when sending in debug mode
      *
-     * @var array|null
      */
     private ?array $originalData = null;
 
@@ -127,7 +120,6 @@ public function getHostUrl(): ?string
     /**
      * @param array|Headers|null $headers
      * @param AbstractPart|null $body
-     * @param string|null $contentType
      */
     public function __construct($headers = null, $body = null, string $contentType = null)
     {
@@ -164,7 +156,6 @@ public function __construct($headers = null, $body = null, string $contentType =
     /**
      * Initializes the mailer with the configured pimcore.email system settings
      *
-     * @param string $type
      *
      * @internal
      */
@@ -196,7 +187,6 @@ public function setIgnoreDebugMode(bool $value): static
     /**
      * Checks if the Debug mode is ignored
      *
-     * @return bool
      */
     public function getIgnoreDebugMode(): bool
     {
@@ -208,7 +198,6 @@ public function getIgnoreDebugMode(): bool
      *
      * @internal
      *
-     * @return bool
      */
     public function doRedirectMailsToDebugMailAddresses(): bool
     {
@@ -222,7 +211,6 @@ public function doRedirectMailsToDebugMailAddresses(): bool
     /**
      * Sets options that are passed to html2text
      *
-     * @param array $options
      *
      * @return $this
      */
@@ -287,7 +275,6 @@ public function enableLogging(): static
     /**
      * returns the logging status
      *
-     * @return bool
      */
     public function loggingIsEnabled(): bool
     {
@@ -297,7 +284,6 @@ public function loggingIsEnabled(): bool
     /**
      * Sets the parameters to the request object
      *
-     * @param array $params
      *
      * @return $this Provides fluent interface
      */
@@ -313,8 +299,6 @@ public function setParams(array $params): static
     /**
      * Sets a single parameter to the request object
      *
-     * @param int|string $key
-     * @param mixed $value
      *
      * @return $this Provides fluent interface
      */
@@ -342,9 +326,7 @@ public function getParams(): array
     /**
      * Returns a parameter which was set with "setParams" or "setParam"
      *
-     * @param int|string $key
      *
-     * @return mixed
      */
     public function getParam(int|string $key): mixed
     {
@@ -354,7 +336,6 @@ public function getParam(int|string $key): mixed
     /**
      * Forces the debug mode - useful for cli-script which should not send emails to recipients
      *
-     * @param bool $value
      */
     public static function setForceDebugMode(bool $value): void
     {
@@ -364,7 +345,6 @@ public static function setForceDebugMode(bool $value): void
     /**
      * Deletes parameters which were set with "setParams" or "setParam"
      *
-     * @param array $params
      *
      * @return $this Provides fluent interface
      */
@@ -380,7 +360,6 @@ public function unsetParams(array $params): static
     /**
      * Deletes a single parameter which was set with "setParams" or "setParam"
      *
-     * @param int|string $key
      *
      * @return $this Provides fluent interface
      */
@@ -449,7 +428,6 @@ private function setDocumentSettings(): static
      * set DefaultTransport or the internal mail function if no
      * default transport had been set.
      *
-     * @param  MailerInterface|null $mailer
      *
      * @return $this Provides fluent interface
      */
@@ -483,7 +461,6 @@ public function send(MailerInterface $mailer = null): static
      * sends mail without (re)rendering the content.
      * see also comments of send() method
      *
-     * @param MailerInterface|null $mailer
      *
      * @return $this
      *
@@ -644,7 +621,6 @@ private function renderParams(string $string, string $context): string
      *
      * @internal
      *
-     * @return string
      */
     public function getSubjectRendered(): string
     {
@@ -666,7 +642,6 @@ public function getSubjectRendered(): string
      *
      * @internal
      *
-     * @return string|null
      */
     public function getBodyHtmlRendered(): ?string
     {
@@ -701,7 +676,6 @@ public function getBodyHtmlRendered(): ?string
      *
      * @internal
      *
-     * @return string
      */
     public function getBodyTextRendered(): string
     {
@@ -739,7 +713,6 @@ public function getBodyTextRendered(): string
     }
 
     /**
-     * @param Model\Document|int|string|null $document
      *
      * @return $this
      *
@@ -769,7 +742,6 @@ public function setDocument(int|Model\Document|string|null $document): static
     /**
      * Returns the Document
      *
-     * @return Model\Document\Email|null
      */
     public function getDocument(): Model\Document\Email|null
     {
@@ -805,7 +777,6 @@ public function preventDebugInformationAppending(): static
      *
      * @internal
      *
-     * @return bool
      */
     public function isPreventingDebugInformationAppending(): bool
     {
@@ -832,7 +803,6 @@ private function html2Text(string $htmlContent): string
     /**
      * @internal
      *
-     * @return array|null
      */
     public function getOriginalData(): ?array
     {
@@ -840,7 +810,6 @@ public function getOriginalData(): ?array
     }
 
     /**
-     * @param array|null $originalData
      *
      * @internal
      */
@@ -857,7 +826,6 @@ public function getLastLogEntry(): Model\Tool\Email\Log
     /**
      * Set the Content-type of this entity.
      *
-     * @param string $type
      *
      * @return $this
      */
@@ -884,7 +852,7 @@ private function formatAddress(Address|string|array ...$addresses): array
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @return $this
      */
@@ -896,7 +864,7 @@ public function addTo(Address|string ...$addresses): static
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @return $this
      */
@@ -908,7 +876,7 @@ public function addCc(Address|string ...$addresses): static
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @return $this
      */
@@ -920,7 +888,7 @@ public function addBcc(Address|string ...$addresses): static
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @return $this
      */
@@ -932,7 +900,7 @@ public function addFrom(Address|string ...$addresses): static
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @return $this
      */
diff --git a/lib/Mail/Mailer.php b/lib/Mail/Mailer.php
index 9c2ab2d1ecf..c4af37052d4 100644
--- a/lib/Mail/Mailer.php
+++ b/lib/Mail/Mailer.php
@@ -34,9 +34,6 @@ public function __construct(MailerInterface $mailer, RedirectingPlugin $redirect
         $this->redirectPlugin = $redirectPlugin;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function send(RawMessage $message, Envelope $envelope = null): void
     {
         if ($message instanceof Mail) {
diff --git a/lib/Mail/Plugins/RedirectingPlugin.php b/lib/Mail/Plugins/RedirectingPlugin.php
index 45c856c7598..72411ef6147 100644
--- a/lib/Mail/Plugins/RedirectingPlugin.php
+++ b/lib/Mail/Plugins/RedirectingPlugin.php
@@ -29,14 +29,12 @@ final class RedirectingPlugin
     /**
      * The recipient who will receive all messages.
      *
-     * @var array
      */
     private array $recipient;
 
     /**
      * Create a new RedirectingPlugin.
      *
-     * @param array $recipient
      */
     public function __construct(array $recipient = [])
     {
@@ -51,7 +49,6 @@ public function __construct(array $recipient = [])
     /**
      * Set the recipient of all messages.
      *
-     * @param array $recipient
      */
     public function setRecipient(array $recipient): void
     {
@@ -61,7 +58,6 @@ public function setRecipient(array $recipient): void
     /**
      * Get the recipient of all messages.
      *
-     * @return array
      */
     public function getRecipient(): array
     {
@@ -71,7 +67,6 @@ public function getRecipient(): array
     /**
      * Invoked immediately before the Message is sent.
      *
-     * @param Mail $message
      *
      */
     public function beforeSendPerformed(Mail $message): void
diff --git a/lib/Maintenance/Executor.php b/lib/Maintenance/Executor.php
index af44416277d..b332aa495b9 100644
--- a/lib/Maintenance/Executor.php
+++ b/lib/Maintenance/Executor.php
@@ -66,9 +66,6 @@ public function executeTask(string $name): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function executeMaintenance(array $validJobs = [], array $excludedJobs = []): void
     {
         $this->setLastExecution();
diff --git a/lib/Maintenance/Tasks/CleanupBrickTablesTask.php b/lib/Maintenance/Tasks/CleanupBrickTablesTask.php
index fe144f1b1c1..8f06ae2e712 100644
--- a/lib/Maintenance/Tasks/CleanupBrickTablesTask.php
+++ b/lib/Maintenance/Tasks/CleanupBrickTablesTask.php
@@ -34,9 +34,6 @@ public function __construct(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $db = Db::get();
diff --git a/lib/Maintenance/Tasks/CleanupClassificationstoreTablesTask.php b/lib/Maintenance/Tasks/CleanupClassificationstoreTablesTask.php
index 5e9c96b234d..a7c8a863975 100644
--- a/lib/Maintenance/Tasks/CleanupClassificationstoreTablesTask.php
+++ b/lib/Maintenance/Tasks/CleanupClassificationstoreTablesTask.php
@@ -33,9 +33,6 @@ public function __construct(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $db = Db::get();
diff --git a/lib/Maintenance/Tasks/CleanupFieldcollectionTablesTask.php b/lib/Maintenance/Tasks/CleanupFieldcollectionTablesTask.php
index 8b2d6663b09..2bc01ae4b04 100644
--- a/lib/Maintenance/Tasks/CleanupFieldcollectionTablesTask.php
+++ b/lib/Maintenance/Tasks/CleanupFieldcollectionTablesTask.php
@@ -33,9 +33,6 @@ public function __construct(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $db = Db::get();
diff --git a/lib/Maintenance/Tasks/DbCleanupBrokenViewsTask.php b/lib/Maintenance/Tasks/DbCleanupBrokenViewsTask.php
index a7cb5f1a4a4..955a572f973 100644
--- a/lib/Maintenance/Tasks/DbCleanupBrokenViewsTask.php
+++ b/lib/Maintenance/Tasks/DbCleanupBrokenViewsTask.php
@@ -35,9 +35,6 @@ public function __construct(Connection $db, LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $tables = $this->db->fetchAllAssociative('SHOW FULL TABLES');
diff --git a/lib/Maintenance/Tasks/HousekeepingTask.php b/lib/Maintenance/Tasks/HousekeepingTask.php
index 701c903115a..79807d7c849 100644
--- a/lib/Maintenance/Tasks/HousekeepingTask.php
+++ b/lib/Maintenance/Tasks/HousekeepingTask.php
@@ -33,9 +33,6 @@ public function __construct(int $tmpFileTime, int $profilerTime)
         $this->profilerTime = $profilerTime;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         foreach (['dev'] as $environment) {
diff --git a/lib/Maintenance/Tasks/LogCleanupTask.php b/lib/Maintenance/Tasks/LogCleanupTask.php
index 8435e03edb3..8da315055a7 100644
--- a/lib/Maintenance/Tasks/LogCleanupTask.php
+++ b/lib/Maintenance/Tasks/LogCleanupTask.php
@@ -24,9 +24,6 @@
  */
 class LogCleanupTask implements TaskInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         // we don't use the RotatingFileHandler of Monolog, since rotating asynchronously is recommended + compression
diff --git a/lib/Maintenance/Tasks/LowQualityImagePreviewTask.php b/lib/Maintenance/Tasks/LowQualityImagePreviewTask.php
index 7d8b5e35dac..84d0945adb4 100644
--- a/lib/Maintenance/Tasks/LowQualityImagePreviewTask.php
+++ b/lib/Maintenance/Tasks/LowQualityImagePreviewTask.php
@@ -37,9 +37,6 @@ public function __construct(LoggerInterface $logger, LockFactory $lockFactory)
         $this->lock = $lockFactory->createLock(self::class, 86400 * 2);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $isLowQualityPreviewEnabled = \Pimcore::getContainer()->getParameter('pimcore.config')['assets']['image']['low_quality_image_preview']['enabled'];
diff --git a/lib/Maintenance/Tasks/ScheduledTasksTask.php b/lib/Maintenance/Tasks/ScheduledTasksTask.php
index 4c011837a22..94067faeaa0 100644
--- a/lib/Maintenance/Tasks/ScheduledTasksTask.php
+++ b/lib/Maintenance/Tasks/ScheduledTasksTask.php
@@ -37,9 +37,6 @@ public function __construct(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $list = new Listing();
diff --git a/lib/Maintenance/Tasks/StaticPagesGenerationTask.php b/lib/Maintenance/Tasks/StaticPagesGenerationTask.php
index 0b65a1de90d..6567c17632e 100644
--- a/lib/Maintenance/Tasks/StaticPagesGenerationTask.php
+++ b/lib/Maintenance/Tasks/StaticPagesGenerationTask.php
@@ -36,9 +36,6 @@ public function __construct(StaticPageGenerator $generator, LoggerInterface $log
         $this->logger = $logger;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $listing = new Document\Listing();
diff --git a/lib/Maintenance/Tasks/TmpStoreCleanupTask.php b/lib/Maintenance/Tasks/TmpStoreCleanupTask.php
index 01cd8d18a16..6fea22d85fe 100644
--- a/lib/Maintenance/Tasks/TmpStoreCleanupTask.php
+++ b/lib/Maintenance/Tasks/TmpStoreCleanupTask.php
@@ -31,9 +31,6 @@ public function __construct(Connection $db)
         $this->db = $db;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $this->db->executeQuery('DELETE FROM tmp_store WHERE `expiryDate` < :time', ['time' => time()]);
diff --git a/lib/Maintenance/Tasks/VersionsCleanupStackTraceDbTask.php b/lib/Maintenance/Tasks/VersionsCleanupStackTraceDbTask.php
index 5a89fc3fdf4..e5ceb9a1b62 100644
--- a/lib/Maintenance/Tasks/VersionsCleanupStackTraceDbTask.php
+++ b/lib/Maintenance/Tasks/VersionsCleanupStackTraceDbTask.php
@@ -24,9 +24,6 @@
  */
 class VersionsCleanupStackTraceDbTask implements TaskInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         Db::get()->executeStatement(
diff --git a/lib/Maintenance/Tasks/VersionsCleanupTask.php b/lib/Maintenance/Tasks/VersionsCleanupTask.php
index e61a97a2495..94824b0976a 100644
--- a/lib/Maintenance/Tasks/VersionsCleanupTask.php
+++ b/lib/Maintenance/Tasks/VersionsCleanupTask.php
@@ -40,9 +40,6 @@ public function __construct(LoggerInterface $logger, Config $config)
         $this->config = $config;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): void
     {
         $this->doVersionCleanup();
diff --git a/lib/Marshaller/MarshallerInterface.php b/lib/Marshaller/MarshallerInterface.php
index 1a1ca91022e..1168c11c96a 100644
--- a/lib/Marshaller/MarshallerInterface.php
+++ b/lib/Marshaller/MarshallerInterface.php
@@ -19,20 +19,14 @@
 interface MarshallerInterface
 {
     /**
-     * @param mixed $value
-     * @param array $params
      *
-     * @return mixed
      *
      * @throws \Exception
      */
     public function marshal(mixed $value, array $params = []): mixed;
 
     /**
-     * @param mixed $value
-     * @param array $params
      *
-     * @return mixed
      *
      * @throws  \Exception
      */
diff --git a/lib/Migrations/BundleAwareMigration.php b/lib/Migrations/BundleAwareMigration.php
index 6c6a4d1a534..d3b84ab7148 100644
--- a/lib/Migrations/BundleAwareMigration.php
+++ b/lib/Migrations/BundleAwareMigration.php
@@ -35,18 +35,12 @@ protected function checkBundleInstalled(): bool
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function preUp(Schema $schema): void
     {
         $this->checkBundleInstalled();
         parent::preUp($schema);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function preDown(Schema $schema): void
     {
         $this->checkBundleInstalled();
diff --git a/lib/Model/AbstractModel.php b/lib/Model/AbstractModel.php
index 8e9adfb8f25..ff8c3e26064 100644
--- a/lib/Model/AbstractModel.php
+++ b/lib/Model/AbstractModel.php
@@ -255,8 +255,6 @@ protected static function getModelFactory(): Factory
     /**
      * @internal
      *
-     * @param array $data
-     *
      * @throws \Exception
      */
     protected static function checkCreateData(array $data): void
diff --git a/lib/Model/Asset/Metadata/Loader/DataLoader.php b/lib/Model/Asset/Metadata/Loader/DataLoader.php
index 527207bbaf3..bb79924c7e9 100644
--- a/lib/Model/Asset/Metadata/Loader/DataLoader.php
+++ b/lib/Model/Asset/Metadata/Loader/DataLoader.php
@@ -22,9 +22,6 @@
 
 final class DataLoader extends ImplementationLoader implements DataLoaderInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function build(string $name, array $params = []): DataDefinitionInterface
     {
         return parent::build($name, $params);
diff --git a/lib/Model/Asset/Metadata/Loader/DataLoaderInterface.php b/lib/Model/Asset/Metadata/Loader/DataLoaderInterface.php
index d3694410672..44073213928 100644
--- a/lib/Model/Asset/Metadata/Loader/DataLoaderInterface.php
+++ b/lib/Model/Asset/Metadata/Loader/DataLoaderInterface.php
@@ -26,10 +26,7 @@ interface DataLoaderInterface extends LoaderInterface
     /**
      * Builds a asset metadata data instance
      *
-     * @param string $name
-     * @param array $params
      *
-     * @return DataDefinitionInterface
      */
     public function build(string $name, array $params = []): DataDefinitionInterface;
 }
diff --git a/lib/Model/Dao/AbstractDao.php b/lib/Model/Dao/AbstractDao.php
index 4627a0ddc96..e6ff8f294ce 100644
--- a/lib/Model/Dao/AbstractDao.php
+++ b/lib/Model/Dao/AbstractDao.php
@@ -93,7 +93,6 @@ public function getValidTableColumns(string $table, bool $cache = true, bool $pr
     /**
      * Clears the column information for the given table.
      *
-     * @param string $table
      */
     public function resetValidTableColumnsCache(string $table): void
     {
diff --git a/lib/Model/Dao/PimcoreLocationAwareConfigDao.php b/lib/Model/Dao/PimcoreLocationAwareConfigDao.php
index 21ebd5df53e..da49c58a59c 100644
--- a/lib/Model/Dao/PimcoreLocationAwareConfigDao.php
+++ b/lib/Model/Dao/PimcoreLocationAwareConfigDao.php
@@ -80,7 +80,6 @@ protected function loadIdList(): array
      * Removes config with corresponding id from the cache.
      * A new cache entry will be generated upon requesting the config again.
      *
-     * @param string $id
      */
     protected function invalidateCache(string $id): void
     {
@@ -88,8 +87,6 @@ protected function invalidateCache(string $id): void
     }
 
     /**
-     * @param string $id
-     * @param array $data
      *
      * @throws \Exception
      */
@@ -105,10 +102,7 @@ protected function saveData(string $id, array $data): void
     /**
      * Hook to prepare config data structure for yaml
      *
-     * @param string $id
-     * @param mixed $data
      *
-     * @return mixed
      */
     protected function prepareDataStructureForYaml(string $id, mixed $data): mixed
     {
@@ -131,7 +125,6 @@ public function isWriteable(): bool
     }
 
     /**
-     * @param string $id
      *
      * @throws \Exception
      */
diff --git a/lib/Model/DataObject/ClassDefinition/Loader/DataLoaderInterface.php b/lib/Model/DataObject/ClassDefinition/Loader/DataLoaderInterface.php
index 746eb72ee07..8c4aff87e70 100644
--- a/lib/Model/DataObject/ClassDefinition/Loader/DataLoaderInterface.php
+++ b/lib/Model/DataObject/ClassDefinition/Loader/DataLoaderInterface.php
@@ -22,8 +22,5 @@
 
 interface DataLoaderInterface extends LoaderInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function build(string $name, array $params = []): Data;
 }
diff --git a/lib/Model/DataObject/ClassDefinition/Loader/LayoutLoader.php b/lib/Model/DataObject/ClassDefinition/Loader/LayoutLoader.php
index ce788b6f811..37ef2a5ee13 100644
--- a/lib/Model/DataObject/ClassDefinition/Loader/LayoutLoader.php
+++ b/lib/Model/DataObject/ClassDefinition/Loader/LayoutLoader.php
@@ -25,9 +25,6 @@
  */
 final class LayoutLoader extends ImplementationLoader implements LayoutLoaderInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function build(string $name, array $params = []): Layout
     {
         return parent::build($name, $params);
diff --git a/lib/Model/DataObject/ClassDefinition/Loader/LayoutLoaderInterface.php b/lib/Model/DataObject/ClassDefinition/Loader/LayoutLoaderInterface.php
index de241615c44..1a43c2dfd0d 100644
--- a/lib/Model/DataObject/ClassDefinition/Loader/LayoutLoaderInterface.php
+++ b/lib/Model/DataObject/ClassDefinition/Loader/LayoutLoaderInterface.php
@@ -25,10 +25,7 @@ interface LayoutLoaderInterface extends LoaderInterface
     /**
      * Builds a classdefinition layout instance
      *
-     * @param string $name
-     * @param array $params
      *
-     * @return Layout
      */
     public function build(string $name, array $params = []): Layout;
 }
diff --git a/lib/Model/Document/Editable/Loader/EditableLoader.php b/lib/Model/Document/Editable/Loader/EditableLoader.php
index 1fb4a5b30e2..47a139aa830 100644
--- a/lib/Model/Document/Editable/Loader/EditableLoader.php
+++ b/lib/Model/Document/Editable/Loader/EditableLoader.php
@@ -25,9 +25,6 @@
  */
 class EditableLoader extends ImplementationLoader implements EditableLoaderInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function build(string $name, array $params = []): Editable
     {
         return parent::build($name, $params);
diff --git a/lib/Model/Document/Editable/Loader/EditableLoaderInterface.php b/lib/Model/Document/Editable/Loader/EditableLoaderInterface.php
index 4ef184f16f2..76e295415dc 100644
--- a/lib/Model/Document/Editable/Loader/EditableLoaderInterface.php
+++ b/lib/Model/Document/Editable/Loader/EditableLoaderInterface.php
@@ -25,10 +25,7 @@ interface EditableLoaderInterface extends LoaderInterface
     /**
      * Builds a tag instance
      *
-     * @param string $name
-     * @param array $params
      *
-     * @return Editable
      */
     public function build(string $name, array $params = []): Editable;
 }
diff --git a/lib/Model/Factory.php b/lib/Model/Factory.php
index e4ba8083923..86873d5d367 100644
--- a/lib/Model/Factory.php
+++ b/lib/Model/Factory.php
@@ -25,9 +25,6 @@
  */
 final class Factory extends ImplementationLoader implements FactoryInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getClassMap(): array
     {
         $map = [];
diff --git a/lib/Model/Factory/FallbackBuilder.php b/lib/Model/Factory/FallbackBuilder.php
index 226e32dd456..c177174cbfe 100644
--- a/lib/Model/Factory/FallbackBuilder.php
+++ b/lib/Model/Factory/FallbackBuilder.php
@@ -24,9 +24,6 @@
  */
 final class FallbackBuilder extends AbstractClassNameLoader
 {
-    /**
-     * {@inheritdoc}
-     */
     public function supports(string $name): bool
     {
         return class_exists($name);
diff --git a/lib/Model/FactoryInterface.php b/lib/Model/FactoryInterface.php
index 1c62a0ace06..65cd64998df 100644
--- a/lib/Model/FactoryInterface.php
+++ b/lib/Model/FactoryInterface.php
@@ -24,7 +24,6 @@ interface FactoryInterface extends LoaderInterface
     /**
      * Get class map from all classmap loaders
      *
-     * @return array
      */
     public function getClassMap(): array;
 }
diff --git a/lib/Model/Listing/AbstractListing.php b/lib/Model/Listing/AbstractListing.php
index 01b52bbaaf2..156f2c7d6a3 100644
--- a/lib/Model/Listing/AbstractListing.php
+++ b/lib/Model/Listing/AbstractListing.php
@@ -282,7 +282,6 @@ public function getCondition(): string
     }
 
     /**
-     * @param string $condition
      * @param array|scalar|null $conditionVariables
      *
      * @return $this
@@ -354,12 +353,6 @@ public function quoteIdentifier(string $value): string
         return $db->quoteIdentifier($value);
     }
 
-    /**
-     * @param mixed $value
-     * @param int|null $type
-     *
-     * @return string
-     */
     public function quote(mixed $value, int $type = null): string
     {
         $db = Db::get();
diff --git a/lib/Model/Paginator/PaginateListingInterface.php b/lib/Model/Paginator/PaginateListingInterface.php
index 0ca734eef59..5454f698ee4 100644
--- a/lib/Model/Paginator/PaginateListingInterface.php
+++ b/lib/Model/Paginator/PaginateListingInterface.php
@@ -24,7 +24,6 @@ interface PaginateListingInterface extends \Countable, \Iterator
      * @param int $offset Page offset
      * @param int $itemCountPerPage Number of items per page
      *
-     * @return array
      */
     public function getItems(int $offset, int $itemCountPerPage): array;
 }
diff --git a/lib/Navigation/Builder.php b/lib/Navigation/Builder.php
index 98267707a72..bf04d912fc5 100644
--- a/lib/Navigation/Builder.php
+++ b/lib/Navigation/Builder.php
@@ -33,14 +33,12 @@ class Builder
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $htmlMenuIdPrefix = null;
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $pageClass = DocumentPage::class;
 
@@ -179,10 +177,7 @@ public function getNavigation(array $params): Container
     /**
      * @internal
      *
-     * @param Container $navigation
-     * @param Document|null $activeDocument
      *
-     * @return void
      */
     protected function markActiveTrail(Container $navigation, ?Document $activeDocument): void
     {
@@ -269,8 +264,6 @@ protected function findActivePages(Container $navigation, string $property, stri
     }
 
     /**
-     * @param Page $page
-     * @param bool $isActive
      *
      * @throws \Exception
      *
@@ -316,7 +309,6 @@ public function setPageClass(string $pageClass): static
     /**
      * Returns the name of the pageclass
      *
-     * @return String
      */
     public function getPageClass(): string
     {
@@ -324,7 +316,6 @@ public function getPageClass(): string
     }
 
     /**
-     * @param Document $parentDocument
      *
      * @return Document[]
      */
@@ -336,11 +327,6 @@ protected function getChildren(Document $parentDocument): array
     }
 
     /**
-     * @param Document $parentDocument
-     * @param bool $isRoot
-     * @param callable|null $pageCallback
-     * @param array $parents
-     * @param int|null $maxDepth
      *
      * @return Page[]
      *
diff --git a/lib/Navigation/Container.php b/lib/Navigation/Container.php
index 5a57e8b06b5..b811b5f5f5f 100644
--- a/lib/Navigation/Container.php
+++ b/lib/Navigation/Container.php
@@ -51,14 +51,12 @@ class Container implements \RecursiveIterator, \Countable
     /**
      * An index that contains the order in which to iterate pages
      *
-     * @var array
      */
     protected array $_index = [];
 
     /**
      * Whether index is dirty and needs to be re-arranged
      *
-     * @var bool
      */
     protected bool $_dirtyIndex = false;
 
@@ -487,7 +485,6 @@ public function __call(string $method, array $arguments): mixed
     /**
      * Returns an array representation of all pages in container
      *
-     * @return array
      */
     public function toArray(): array
     {
@@ -504,7 +501,6 @@ public function toArray(): array
     }
 
     /**
-     * @return Page
      *
      * @throws \Exception
      */
diff --git a/lib/Navigation/Page.php b/lib/Navigation/Page.php
index 5996fdd9620..31abfa2fb9b 100644
--- a/lib/Navigation/Page.php
+++ b/lib/Navigation/Page.php
@@ -95,7 +95,6 @@ abstract class Page extends Container
      *
      * @link http://www.w3.org/TR/html4/struct/links.html#h-12.3.1
      *
-     * @var array
      */
     protected array $_rel = [];
 
@@ -104,7 +103,6 @@ abstract class Page extends Container
      *
      * @link http://www.w3.org/TR/html4/struct/links.html#h-12.3.1
      *
-     * @var array
      */
     protected array $_rev = [];
 
@@ -141,7 +139,6 @@ abstract class Page extends Container
     /**
      * The type of page to use when it wasn't set
      *
-     * @var string
      */
     protected static string $_defaultPageType;
 
@@ -233,7 +230,6 @@ public function __construct(array $options = null)
     /**
      * Initializes page (used by subclasses)
      *
-     * @return void
      */
     protected function _init(): void
     {
@@ -1071,9 +1067,6 @@ final public function hashCode(): int
         return \spl_object_id($this);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function toArray(): array
     {
         return array_merge(
diff --git a/lib/Navigation/Page/Url.php b/lib/Navigation/Page/Url.php
index 2eb32ba8d95..6b459e6f551 100644
--- a/lib/Navigation/Page/Url.php
+++ b/lib/Navigation/Page/Url.php
@@ -65,16 +65,12 @@ public function setUri(?string $uri): static
     /**
      * Returns URI
      *
-     * @return string|null
      */
     public function getUri(): ?string
     {
         return $this->_uri;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getHref(): string
     {
         $uri = $this->getUri();
@@ -93,9 +89,6 @@ public function getHref(): string
 
     // Public methods:
 
-    /**
-     * {@inheritdoc}
-     */
     public function toArray(): array
     {
         return array_merge(
diff --git a/lib/Navigation/Renderer/AbstractRenderer.php b/lib/Navigation/Renderer/AbstractRenderer.php
index 72076a73e99..9fc69e944a2 100644
--- a/lib/Navigation/Renderer/AbstractRenderer.php
+++ b/lib/Navigation/Renderer/AbstractRenderer.php
@@ -50,42 +50,36 @@ abstract class AbstractRenderer implements RendererInterface
     /**
      * The minimum depth a page must have to be included when rendering
      *
-     * @var int|null
      */
     protected ?int $_minDepth = null;
 
     /**
      * The maximum depth a page can have to be included when rendering
      *
-     * @var int|null
      */
     protected ?int $_maxDepth = null;
 
     /**
      * Indentation string
      *
-     * @var string
      */
     protected string $_indent = '';
 
     /**
      * Prefix for IDs when they are normalized
      *
-     * @var string|null
      */
     protected ?string $_prefixForId = null;
 
     /**
      * Skip current prefix for IDs when they are normalized (flag)
      *
-     * @var bool
      */
     protected bool $_skipPrefixForId = false;
 
     /**
      * Whether invisible items should be rendered by this helper
      *
-     * @var bool
      */
     protected bool $_renderInvisible = false;
 
@@ -99,7 +93,6 @@ public function __construct(EngineInterface $templatingEngine)
     /**
      * Sets the minimum depth a page must have to be included when rendering
      *
-     * @param int|null $minDepth
      *
      * @return $this
      */
@@ -120,7 +113,6 @@ public function getMinDepth(): ?int
     }
 
     /**
-     * @param int|null $maxDepth
      *
      * @return $this
      */
@@ -295,10 +287,7 @@ public function htmlify(Page $page): string
      * - If page is accepted by the rules above and $recursive is true, the page
      *   will not be accepted if it is the descendant of a non-accepted page.
      *
-     * @param  Page $page
-     * @param bool $recursive
      *
-     * @return bool
      */
     public function accept(Page $page, bool $recursive = true): bool
     {
@@ -325,9 +314,7 @@ public function accept(Page $page, bool $recursive = true): bool
     /**
      * Retrieve whitespace representation of $indent
      *
-     * @param int|string $indent
      *
-     * @return string
      */
     protected function _getWhitespace(int|string $indent): string
     {
@@ -341,9 +328,7 @@ protected function _getWhitespace(int|string $indent): string
     /**
      * Converts an associative array to a string of tag attributes.
      *
-     * @param array $attribs
      *
-     * @return string
      */
     protected function _htmlAttribs(array $attribs): string
     {
diff --git a/lib/Navigation/Renderer/Breadcrumbs.php b/lib/Navigation/Renderer/Breadcrumbs.php
index e351fd2af9e..5b85999af69 100644
--- a/lib/Navigation/Renderer/Breadcrumbs.php
+++ b/lib/Navigation/Renderer/Breadcrumbs.php
@@ -47,28 +47,24 @@ class Breadcrumbs extends AbstractRenderer
     /**
      * Breadcrumbs separator string
      *
-     * @var string
      */
     protected string $_separator = ' &gt; ';
 
     /**
      * The minimum depth a page must have to be included when rendering
      *
-     * @var int|null
      */
     protected ?int $_minDepth = 1;
 
     /**
      * Whether last page in breadcrumb should be hyperlinked
      *
-     * @var bool
      */
     protected bool $_linkLast = false;
 
     /**
      * Partial view script to use for rendering menu
      *
-     * @var string|array|null
      */
     protected string|array|null $_template = null;
 
@@ -128,7 +124,6 @@ public function setTemplate(array|string|null $template): static
     /**
      * Alias of getTemplate()
      *
-     * @return string|array|null
      */
     public function getPartial(): array|string|null
     {
@@ -138,7 +133,6 @@ public function getPartial(): array|string|null
     /**
      * Alias of setTemplate()
      *
-     * @param string $partial
      *
      * @return $this
      */
@@ -154,9 +148,7 @@ public function setPartial(string $partial): static
     /**
      * Get all pages between the currently active page and the container's root page.
      *
-     * @param Container $container
      *
-     * @return array
      */
     public function getPages(Container $container): array
     {
@@ -191,9 +183,7 @@ public function getPages(Container $container): array
      * Renders breadcrumbs by chaining 'a' elements with the separator
      * registered in the helper
      *
-     * @param Container $container
      *
-     * @return string
      */
     public function renderStraight(Container $container): string
     {
@@ -234,10 +224,7 @@ public function renderStraight(Container $container): string
     }
 
     /**
-     * @param Container $container
-     * @param string|null $partial
      *
-     * @return string
      *
      * @throws \Exception
      */
@@ -259,19 +246,13 @@ public function renderTemplate(Container $container, ?string $partial = null): s
     /**
      * Alias of renderTemplate() for ZF1 backward compatibility
      *
-     * @param Container $container
-     * @param string|null $partial
      *
-     * @return string
      */
     public function renderPartial(Container $container, ?string $partial = null): string
     {
         return $this->renderTemplate($container, $partial);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function render(Container $container): string
     {
         if ($partial = $this->getTemplate()) {
diff --git a/lib/Navigation/Renderer/Menu.php b/lib/Navigation/Renderer/Menu.php
index c3fcafb0b35..a91f5405a6e 100644
--- a/lib/Navigation/Renderer/Menu.php
+++ b/lib/Navigation/Renderer/Menu.php
@@ -47,77 +47,66 @@ class Menu extends AbstractRenderer
     /**
      * CSS class to use for the ul element
      *
-     * @var string
      */
     protected string $_ulClass = 'navigation';
 
     /**
      * Unique identifier (id) for the ul element
      *
-     * @var string|null
      */
     protected ?string $_ulId = null;
 
     /**
      * CSS class to use for the active elements
      *
-     * @var string
      */
     protected string $_activeClass = 'active';
 
     /**
      * CSS class to use for the parent li element
      *
-     * @var string
      */
     protected string $_parentClass = 'menu-parent';
 
     /**
      * Whether parent li elements should be rendered with parent class
      *
-     * @var bool
      */
     protected bool $_renderParentClass = false;
 
     /**
      * Whether only active branch should be rendered
      *
-     * @var bool
      */
     protected bool $_onlyActiveBranch = false;
 
     /**
      * Whether parents should be rendered when only rendering active branch
      *
-     * @var bool
      */
     protected bool $_renderParents = true;
 
     /**
      * Partial view script to use for rendering menu
      *
-     * @var string|array|null
      */
     protected string|array|null $_template = null;
 
     /**
      * Expand all sibling nodes of active branch nodes
      *
-     * @var bool
      */
     protected bool $_expandSiblingNodesOfActiveBranch = false;
 
     /**
      * Adds CSS class from page to li element
      *
-     * @var bool
      */
     protected bool $_addPageClassToLi = false;
 
     /**
      * Inner indentation string
      *
-     * @var string
      */
     protected string $_innerIndent = '    ';
 
@@ -355,7 +344,6 @@ public function setTemplate(array|string $template): void
     /**
      * Alias of setTemplate()
      *
-     * @param array|string $partial
      *
      * @return $this
      */
@@ -369,7 +357,6 @@ public function setPartial(array|string $partial): static
     /**
      * Alias of getTemplate()
      *
-     * @return array|string|null
      */
     public function getPartial(): array|string|null
     {
@@ -409,7 +396,6 @@ public function addPageClassToLi(bool $flag = true): static
      * Returns a flag indicating whether the CSS class from page to be added to
      * li element
      *
-     * @return bool
      */
     public function getAddPageClassToLi(): bool
     {
@@ -892,7 +878,6 @@ protected function _renderMenu(
      *
      * Available $options:
      *
-     * @param  Container $container
      * @param  array $options    [optional] options for controlling rendering
      *
      * @return string rendered menu
@@ -951,7 +936,6 @@ public function renderMenu(Container $container, array $options = []): string
      * ));
      * </code>
      *
-     * @param  Container $container
      * @param string|null $ulClass    [optional] CSS class to
      *                                               use for UL element. Default
      *                                               is to use the value from
@@ -1001,7 +985,6 @@ public function renderSubMenu(
      * as-is, and will be available in the partial script as 'container', e.g.
      * <code>echo 'Number of pages: ', count($this->container);</code>.
      *
-     * @param  Container $container
      * @param array|string|null $partial     [optional] partial view
      *                                               script to use. Default is to
      *                                               use the partial registered
@@ -1038,19 +1021,13 @@ public function renderTemplate(Container $container, array|string $partial = nul
     /**
      * Alias of renderTemplate()
      *
-     * @param Container $container
-     * @param array|string|null $partial
      *
-     * @return string
      */
     public function renderPartial(Container $container, array|string $partial = null): string
     {
         return $this->renderTemplate($container, $partial);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function render(Container $container): string
     {
         if ($partial = $this->getTemplate()) {
diff --git a/lib/Navigation/Renderer/RendererInterface.php b/lib/Navigation/Renderer/RendererInterface.php
index 8b6ad74bc8f..1869776aac7 100644
--- a/lib/Navigation/Renderer/RendererInterface.php
+++ b/lib/Navigation/Renderer/RendererInterface.php
@@ -51,9 +51,7 @@ public function getRenderInvisible(): bool;
     public function setRenderInvisible(bool $renderInvisible = true): static;
 
     /**
-     * @param Container $container
      *
-     * @return string
      *
      * @throws \Exception
      */
diff --git a/lib/Pimcore.php b/lib/Pimcore.php
index 4e18be91e35..01e29a68434 100644
--- a/lib/Pimcore.php
+++ b/lib/Pimcore.php
@@ -68,7 +68,6 @@ public static function unsetAdminMode(): void
     /**
      * check if the process is currently in admin mode or not
      *
-     * @return bool
      */
     public static function inAdmin(): bool
     {
@@ -89,7 +88,6 @@ public static function isInstalled(): bool
     /**
      * @internal
      *
-     * @return EventDispatcherInterface
      */
     public static function getEventDispatcher(): EventDispatcherInterface
     {
@@ -99,7 +97,6 @@ public static function getEventDispatcher(): EventDispatcherInterface
     /**
      * @internal
      *
-     * @return KernelInterface|null
      */
     public static function getKernel(): ?KernelInterface
     {
@@ -109,7 +106,6 @@ public static function getKernel(): ?KernelInterface
     /**
      * @internal
      *
-     * @return bool
      */
     public static function hasKernel(): bool
     {
@@ -123,7 +119,6 @@ public static function hasKernel(): bool
     /**
      * @internal
      *
-     * @param KernelInterface $kernel
      */
     public static function setKernel(KernelInterface $kernel): void
     {
@@ -138,7 +133,6 @@ public static function setKernel(KernelInterface $kernel): void
      *
      * @deprecated this method just exists for legacy reasons and shouldn't be used in new code
      *
-     * @return ContainerInterface|null
      */
     public static function getContainer(): ?ContainerInterface
     {
@@ -146,7 +140,6 @@ public static function getContainer(): ?ContainerInterface
     }
 
     /**
-     * @return bool
      *
      * @internal
      */
@@ -170,7 +163,6 @@ public static function hasContainer(): bool
      *
      * @static
      *
-     * @param array $keepItems
      */
     public static function collectGarbage(array $keepItems = []): void
     {
@@ -232,7 +224,6 @@ public static function enableShutdown(): void
     /**
      * @internal
      *
-     * @return bool
      */
     public static function disableMinifyJs(): bool
     {
diff --git a/lib/Routing/DataObjectRoute.php b/lib/Routing/DataObjectRoute.php
index b42dcee42d8..02bfbc6003b 100644
--- a/lib/Routing/DataObjectRoute.php
+++ b/lib/Routing/DataObjectRoute.php
@@ -78,17 +78,11 @@ public function setSite(?Site $site): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getContent(): ?object
     {
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteKey(): ?string
     {
         if ($this->object) {
diff --git a/lib/Routing/DocumentRoute.php b/lib/Routing/DocumentRoute.php
index 2b5e7366a96..c72f2a60434 100644
--- a/lib/Routing/DocumentRoute.php
+++ b/lib/Routing/DocumentRoute.php
@@ -39,17 +39,11 @@ public function setDocument(Document $document): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getContent(): ?object
     {
         return $this->getDocument();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteKey(): ?string
     {
         if ($this->document) {
diff --git a/lib/Routing/Dynamic/DataObjectRouteHandler.php b/lib/Routing/Dynamic/DataObjectRouteHandler.php
index 9a2813ba76c..67a11d36726 100644
--- a/lib/Routing/Dynamic/DataObjectRouteHandler.php
+++ b/lib/Routing/Dynamic/DataObjectRouteHandler.php
@@ -41,9 +41,6 @@ public function __construct(
         $this->requestHelper = $requestHelper;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteByName(string $name): ?DataObjectRoute
     {
         if (preg_match('/^data_object_(\d+)_(\d+)_(.*)$/', $name, $match)) {
@@ -60,9 +57,6 @@ public function getRouteByName(string $name): ?DataObjectRoute
         throw new RouteNotFoundException(sprintf("Route for name '%s' was not found", $name));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function matchRequest(RouteCollection $collection, DynamicRequestContext $context): void
     {
         $site = $this->siteResolver->getSite($context->getRequest());
diff --git a/lib/Routing/Dynamic/DocumentRouteHandler.php b/lib/Routing/Dynamic/DocumentRouteHandler.php
index a06f3e967e8..5fc773a1fbe 100644
--- a/lib/Routing/Dynamic/DocumentRouteHandler.php
+++ b/lib/Routing/Dynamic/DocumentRouteHandler.php
@@ -45,7 +45,6 @@ final class DocumentRouteHandler implements DynamicRouteHandlerInterface
      * Determines if unpublished documents should be matched, even when not in admin mode. This
      * is mainly needed for maintencance jobs/scripts.
      *
-     * @var bool
      */
     private bool $forceHandleUnpublishedDocuments = false;
 
@@ -88,9 +87,6 @@ public function getDirectRouteDocumentTypes(): array
         return $this->directRouteDocumentTypes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteByName(string $name): ?DocumentRoute
     {
         if (preg_match('/^document_(\d+)$/', $name, $match)) {
@@ -104,9 +100,6 @@ public function getRouteByName(string $name): ?DocumentRoute
         throw new RouteNotFoundException(sprintf("Route for name '%s' was not found", $name));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function matchRequest(RouteCollection $collection, DynamicRequestContext $context): void
     {
         $document = Document::getByPath($context->getPath());
@@ -158,10 +151,7 @@ public function matchRequest(RouteCollection $collection, DynamicRequestContext
     /**
      * Build a route for a document. Context is only set from match mode, not when generating URLs.
      *
-     * @param Document $document
-     * @param DynamicRequestContext|null $context
      *
-     * @return DocumentRoute|null
      */
     public function buildRouteForDocument(Document $document, DynamicRequestContext $context = null): ?DocumentRoute
     {
diff --git a/lib/Routing/Dynamic/DynamicRouteHandlerInterface.php b/lib/Routing/Dynamic/DynamicRouteHandlerInterface.php
index df111990c6e..60ef2559530 100644
--- a/lib/Routing/Dynamic/DynamicRouteHandlerInterface.php
+++ b/lib/Routing/Dynamic/DynamicRouteHandlerInterface.php
@@ -31,8 +31,6 @@ interface DynamicRouteHandlerInterface
      *
      * @param string $name The route name to fetch
      *
-     * @return Route|null
-     *
      * @throws RouteNotFoundException If there is no route with that name in
      *                                this repository
      */
@@ -41,8 +39,6 @@ public function getRouteByName(string $name): ?Route;
     /**
      * Add matching routes to the route collection
      *
-     * @param RouteCollection $collection
-     * @param DynamicRequestContext $context
      */
     public function matchRequest(RouteCollection $collection, DynamicRequestContext $context): void;
 }
diff --git a/lib/Routing/DynamicRouteProvider.php b/lib/Routing/DynamicRouteProvider.php
index 70fbfb9bfb8..aae6d4e88b3 100644
--- a/lib/Routing/DynamicRouteProvider.php
+++ b/lib/Routing/DynamicRouteProvider.php
@@ -38,7 +38,6 @@ final class DynamicRouteProvider implements RouteProviderInterface
     protected array $handlers = [];
 
     /**
-     * @param SiteResolver $siteResolver
      * @param DynamicRouteHandlerInterface[] $handlers
      */
     public function __construct(SiteResolver $siteResolver, array $handlers = [])
@@ -57,9 +56,6 @@ public function addHandler(DynamicRouteHandlerInterface $handler): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteCollectionForRequest(Request $request): RouteCollection
     {
         $collection = new RouteCollection();
@@ -82,9 +78,6 @@ public function getRouteCollectionForRequest(Request $request): RouteCollection
         return $collection;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteByName(string $name): SymfonyRoute
     {
         foreach ($this->handlers as $handler) {
@@ -98,9 +91,6 @@ public function getRouteByName(string $name): SymfonyRoute
         throw new RouteNotFoundException(sprintf("Route for name '%s' was not found", $name));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRoutesByNames(array $names = null): array
     {
         // TODO needs performance optimizations
diff --git a/lib/Routing/Element/Router.php b/lib/Routing/Element/Router.php
index e040bc32b34..235ba1629f3 100644
--- a/lib/Routing/Element/Router.php
+++ b/lib/Routing/Element/Router.php
@@ -45,25 +45,16 @@ public function __construct(RequestContext $context, RequestHelper $requestHelpe
         $this->requestHelper = $requestHelper;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setContext(RequestContext $context): void
     {
         $this->context = $context;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getContext(): RequestContext
     {
         return $this->context;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteDebugMessage(string $name, array $parameters = []): string
     {
         $element = $parameters['element'] ?? null;
@@ -74,9 +65,6 @@ public function getRouteDebugMessage(string $name, array $parameters = []): stri
         return 'pimcore_element (No element)';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generate(string $name, array $parameters = [], int $referenceType = self::ABSOLUTE_PATH): string
     {
         if ($name !== 'pimcore_element') {
@@ -162,25 +150,16 @@ protected function getCurrentRoute(): ?string
         return $route;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function matchRequest(Request $request): array
     {
         throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $request->getPathInfo()));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function match(string $pathinfo): array
     {
         throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteCollection(): RouteCollection
     {
         return new RouteCollection();
diff --git a/lib/Routing/Loader/AnnotatedRouteControllerLoader.php b/lib/Routing/Loader/AnnotatedRouteControllerLoader.php
index a2f9ed92e32..2041fe83111 100644
--- a/lib/Routing/Loader/AnnotatedRouteControllerLoader.php
+++ b/lib/Routing/Loader/AnnotatedRouteControllerLoader.php
@@ -25,9 +25,6 @@
  */
 class AnnotatedRouteControllerLoader extends BaseAnnotatedRouteControllerLoader
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method): string
     {
         $routeName = parent::getDefaultRouteName($class, $method);
diff --git a/lib/Routing/Loader/BundleRoutingLoader.php b/lib/Routing/Loader/BundleRoutingLoader.php
index a865b9d427a..807f939e255 100644
--- a/lib/Routing/Loader/BundleRoutingLoader.php
+++ b/lib/Routing/Loader/BundleRoutingLoader.php
@@ -32,9 +32,6 @@ public function __construct(BundleConfigLocator $locator)
         $this->locator = $locator;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function load(mixed $resource, string $type = null): mixed
     {
         $collection = new RouteCollection();
@@ -52,9 +49,6 @@ public function load(mixed $resource, string $type = null): mixed
         return $collection;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supports(mixed $resource, string $type = null): bool
     {
         return 'pimcore_bundle' === $type;
diff --git a/lib/Routing/RouteReference.php b/lib/Routing/RouteReference.php
index 277cf2cbc67..12f38dc1998 100644
--- a/lib/Routing/RouteReference.php
+++ b/lib/Routing/RouteReference.php
@@ -36,25 +36,16 @@ public function __construct(string $route, array $parameters = [], int $type = U
         $this->type = $type;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRoute(): string
     {
         return $this->route;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getParameters(): array
     {
         return $this->parameters;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): int
     {
         return $this->type;
diff --git a/lib/Routing/RouteReferenceInterface.php b/lib/Routing/RouteReferenceInterface.php
index 6fb5b708673..aa022eef0a4 100644
--- a/lib/Routing/RouteReferenceInterface.php
+++ b/lib/Routing/RouteReferenceInterface.php
@@ -23,14 +23,12 @@ interface RouteReferenceInterface
     /**
      * Get route name
      *
-     * @return string
      */
     public function getRoute(): string;
 
     /**
      * Get parameters to use when generating the route
      *
-     * @return array
      */
     public function getParameters(): array;
 
@@ -39,7 +37,6 @@ public function getParameters(): array;
      *
      * @see UrlGeneratorInterface
      *
-     * @return int
      */
     public function getType(): int;
 }
diff --git a/lib/Security/Hasher/AbstractUserAwarePasswordHasher.php b/lib/Security/Hasher/AbstractUserAwarePasswordHasher.php
index d60c502774b..9e8ac726fd4 100644
--- a/lib/Security/Hasher/AbstractUserAwarePasswordHasher.php
+++ b/lib/Security/Hasher/AbstractUserAwarePasswordHasher.php
@@ -27,9 +27,6 @@ abstract class AbstractUserAwarePasswordHasher extends PlaintextPasswordHasher i
 {
     protected ?UserInterface $user = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function setUser(UserInterface $user): void
     {
         if ($this->user) {
@@ -39,9 +36,6 @@ public function setUser(UserInterface $user): void
         $this->user = $user;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getUser(): UserInterface
     {
         if (!$this->user) {
diff --git a/lib/Security/Hasher/Factory/AbstractHasherFactory.php b/lib/Security/Hasher/Factory/AbstractHasherFactory.php
index c9e707fd677..6db31d1b367 100644
--- a/lib/Security/Hasher/Factory/AbstractHasherFactory.php
+++ b/lib/Security/Hasher/Factory/AbstractHasherFactory.php
@@ -27,7 +27,6 @@ abstract class AbstractHasherFactory implements PasswordHasherFactoryInterface
     /**
      * Hasher class name to build
      *
-     * @var string
      */
     protected string $className;
 
diff --git a/lib/Security/Hasher/Factory/UserAwarePasswordHasherFactory.php b/lib/Security/Hasher/Factory/UserAwarePasswordHasherFactory.php
index 8c53fac37ef..81632de7622 100644
--- a/lib/Security/Hasher/Factory/UserAwarePasswordHasherFactory.php
+++ b/lib/Security/Hasher/Factory/UserAwarePasswordHasherFactory.php
@@ -45,9 +45,6 @@ class UserAwarePasswordHasherFactory extends AbstractHasherFactory
      */
     private array $hashers = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPasswordHasher(string|PasswordAuthenticatedUserInterface|PasswordHasherAwareInterface $user): PasswordHasherInterface
     {
         if (!$user instanceof UserInterface) {
diff --git a/lib/Security/Hasher/PasswordFieldHasher.php b/lib/Security/Hasher/PasswordFieldHasher.php
index 9f977e12ed9..f9d555cfb49 100644
--- a/lib/Security/Hasher/PasswordFieldHasher.php
+++ b/lib/Security/Hasher/PasswordFieldHasher.php
@@ -36,7 +36,6 @@ class PasswordFieldHasher extends AbstractUserAwarePasswordHasher
     /**
      * If true, the user password hash will be updated if necessary.
      *
-     * @var bool
      */
     protected bool $updateHash = true;
 
@@ -74,7 +73,6 @@ public function isPasswordValid(string $encoded, string $raw): bool
     }
 
     /**
-     * @return Password
      *
      * @throws RuntimeException
      */
diff --git a/lib/Security/Hasher/PasswordHasherFactory.php b/lib/Security/Hasher/PasswordHasherFactory.php
index e9c4cb1b447..4d959de2152 100644
--- a/lib/Security/Hasher/PasswordHasherFactory.php
+++ b/lib/Security/Hasher/PasswordHasherFactory.php
@@ -42,9 +42,6 @@ public function __construct(protected PasswordHasherFactoryInterface $frameworkF
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPasswordHasher(string|PasswordAuthenticatedUserInterface|PasswordHasherAwareInterface $user): PasswordHasherInterface
     {
         if ($hasher = $this->getPasswordHasherFromFactory($user)) {
diff --git a/lib/Security/Hasher/PasswordHasherFactoryAwareInterface.php b/lib/Security/Hasher/PasswordHasherFactoryAwareInterface.php
index a133b593978..922919c46c9 100644
--- a/lib/Security/Hasher/PasswordHasherFactoryAwareInterface.php
+++ b/lib/Security/Hasher/PasswordHasherFactoryAwareInterface.php
@@ -27,7 +27,6 @@ interface PasswordHasherFactoryAwareInterface
      * If the method returns null, the standard way to retrieve the hasher
      * will be used instead.
      *
-     * @return string
      */
     public function getHasherFactoryName(): string;
 }
diff --git a/lib/Security/Hasher/PasswordHasherFactoryAwareUserInterface.php b/lib/Security/Hasher/PasswordHasherFactoryAwareUserInterface.php
index 734cedad782..9fee3b2e1bc 100644
--- a/lib/Security/Hasher/PasswordHasherFactoryAwareUserInterface.php
+++ b/lib/Security/Hasher/PasswordHasherFactoryAwareUserInterface.php
@@ -27,7 +27,6 @@ interface PasswordHasherFactoryAwareUserInterface
      * If the method returns null, the standard way to retrieve the hasher
      * will be used instead.
      *
-     * @return string
      */
     public function getHasherFactoryName(): string;
 }
diff --git a/lib/Security/Hasher/PimcoreUserPasswordHasher.php b/lib/Security/Hasher/PimcoreUserPasswordHasher.php
index eee94299205..54e8bd8090f 100644
--- a/lib/Security/Hasher/PimcoreUserPasswordHasher.php
+++ b/lib/Security/Hasher/PimcoreUserPasswordHasher.php
@@ -32,9 +32,6 @@ class PimcoreUserPasswordHasher extends AbstractUserAwarePasswordHasher
 {
     use CheckPasswordLengthTrait;
 
-    /**
-     * {@inheritdoc}
-     */
     public function hash(string $plainPassword, string $salt = null): string
     {
         if ($this->isPasswordTooLong($plainPassword)) {
@@ -44,9 +41,6 @@ public function hash(string $plainPassword, string $salt = null): string
         return Authentication::getPasswordHash($this->getUser()->getUserIdentifier(), $plainPassword);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool
     {
         if ($this->isPasswordTooLong($hashedPassword)) {
diff --git a/lib/Security/Hasher/UserAwarePasswordHasherInterface.php b/lib/Security/Hasher/UserAwarePasswordHasherInterface.php
index ba3b54628b1..ef0cbdb5612 100644
--- a/lib/Security/Hasher/UserAwarePasswordHasherInterface.php
+++ b/lib/Security/Hasher/UserAwarePasswordHasherInterface.php
@@ -28,7 +28,6 @@ interface UserAwarePasswordHasherInterface extends PasswordHasherInterface
     /**
      * Set the user
      *
-     * @param UserInterface $user
      *
      * @throws RuntimeException
      *      if the user is already set to prevent overwriting the scoped user object
@@ -38,7 +37,6 @@ public function setUser(UserInterface $user): void;
     /**
      * Get the user object
      *
-     * @return UserInterface
      *
      * @throws RuntimeException
      *      if no user was set
diff --git a/lib/Security/User/ObjectUserProvider.php b/lib/Security/User/ObjectUserProvider.php
index a1389a5177b..6afcca66e1f 100644
--- a/lib/Security/User/ObjectUserProvider.php
+++ b/lib/Security/User/ObjectUserProvider.php
@@ -43,7 +43,6 @@ class ObjectUserProvider implements UserProviderInterface
      * name (e.g. Pimcore\Model\DataObject\User or your custom user class extending
      * the generated one.
      *
-     * @var string
      */
     protected string $className;
 
@@ -74,9 +73,6 @@ protected function setClassName(string $className): void
         $this->className = $className;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function loadUserByIdentifier(string $username): UserInterface
     {
         $getter = sprintf('getBy%s', ucfirst($this->usernameField));
@@ -90,9 +86,6 @@ public function loadUserByIdentifier(string $username): UserInterface
         throw new UserNotFoundException(sprintf('User %s was not found', $username));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function refreshUser(UserInterface $user): UserInterface
     {
         if (!$user instanceof $this->className || !$user instanceof AbstractObject) {
@@ -104,9 +97,6 @@ public function refreshUser(UserInterface $user): UserInterface
         return $refreshedUser;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsClass(string $class): bool
     {
         return $class === $this->className;
diff --git a/lib/Security/User/TokenStorageUserResolver.php b/lib/Security/User/TokenStorageUserResolver.php
index e690e61ca37..c0e091be56d 100644
--- a/lib/Security/User/TokenStorageUserResolver.php
+++ b/lib/Security/User/TokenStorageUserResolver.php
@@ -45,7 +45,6 @@ public function getUser(): ?User
      *
      * The proxy is the wrapping Pimcore\Security\User\User object implementing UserInterface.
      *
-     * @return UserProxy|null
      */
     public function getUserProxy(): ?\Pimcore\Security\User\User
     {
diff --git a/lib/Security/User/User.php b/lib/Security/User/User.php
index 067bef96201..bdb0c1ebcf3 100644
--- a/lib/Security/User/User.php
+++ b/lib/Security/User/User.php
@@ -39,9 +39,6 @@ public function getId(): int
         return $this->user->getId();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getUserIdentifier(): string
     {
         return $this->user->getName() ?? '';
@@ -52,9 +49,6 @@ public function getUser(): PimcoreUser
         return $this->user;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRoles(): array
     {
         $roles = [];
@@ -79,18 +73,12 @@ public function getPassword(): ?string
         return $this->user->getPassword();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function eraseCredentials(): void
     {
         // TODO: Implement eraseCredentials() method.
         // TODO: anything to do here?
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isEqualTo(UserInterface $user): bool
     {
         return $user instanceof self && $user->getId() === $this->getId();
@@ -99,7 +87,6 @@ public function isEqualTo(UserInterface $user): bool
     /**
      * Return true if the user should do two-factor authentication.
      *
-     * @return bool
      */
     public function isGoogleAuthenticatorEnabled(): bool
     {
@@ -113,7 +100,6 @@ public function isGoogleAuthenticatorEnabled(): bool
     /**
      * Return the user name.
      *
-     * @return string
      */
     public function getGoogleAuthenticatorUsername(): string
     {
@@ -124,7 +110,6 @@ public function getGoogleAuthenticatorUsername(): string
      * Return the Google Authenticator secret
      * When an empty string or null is returned, the Google authentication is disabled.
      *
-     * @return string|null
      */
     public function getGoogleAuthenticatorSecret(): ?string
     {
diff --git a/lib/Security/User/UserChecker.php b/lib/Security/User/UserChecker.php
index 0776c2f4389..c2117542da9 100644
--- a/lib/Security/User/UserChecker.php
+++ b/lib/Security/User/UserChecker.php
@@ -28,9 +28,6 @@
  */
 class UserChecker extends InMemoryUserChecker
 {
-    /**
-     * {@inheritdoc}
-     */
     public function checkPreAuth(UserInterface $user): void
     {
         $this->checkValidUser($user);
@@ -38,9 +35,6 @@ public function checkPreAuth(UserInterface $user): void
         parent::checkPreAuth($user);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkPostAuth(UserInterface $user): void
     {
         $this->checkValidUser($user);
diff --git a/lib/Serializer/Normalizer/ReferenceLoopNormalizer.php b/lib/Serializer/Normalizer/ReferenceLoopNormalizer.php
index ee4ce6bb7c7..803fe2f9d2b 100644
--- a/lib/Serializer/Normalizer/ReferenceLoopNormalizer.php
+++ b/lib/Serializer/Normalizer/ReferenceLoopNormalizer.php
@@ -24,9 +24,6 @@
  */
 class ReferenceLoopNormalizer implements NormalizerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function normalize($object, $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
     {
         $object = Serialize::removeReferenceLoops($object);
@@ -49,9 +46,6 @@ public function normalize($object, $format = null, array $context = []): array|s
         return $object;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsNormalization($data, $format = null): bool
     {
         return $format === JsonEncoder::FORMAT;
diff --git a/lib/Session/Attribute/LockableAttributeBag.php b/lib/Session/Attribute/LockableAttributeBag.php
index 52f38fd8185..bea77590794 100644
--- a/lib/Session/Attribute/LockableAttributeBag.php
+++ b/lib/Session/Attribute/LockableAttributeBag.php
@@ -23,33 +23,21 @@ class LockableAttributeBag extends AttributeBag implements LockableAttributeBagI
 {
     protected bool $locked = false;
 
-    /**
-     * {@inheritdoc}
-     */
     public function lock(): void
     {
         $this->locked = true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function unlock(): void
     {
         $this->locked = false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isLocked(): bool
     {
         return $this->locked;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function set(string $name, mixed $value): void
     {
         $this->checkLock();
@@ -64,11 +52,6 @@ public function replace(array $attributes): void
         parent::replace($attributes);
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return mixed
-     */
     public function remove(string $name): mixed
     {
         $this->checkLock();
@@ -76,11 +59,6 @@ public function remove(string $name): mixed
         return parent::remove($name);
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return mixed
-     */
     public function clear(): mixed
     {
         $this->checkLock();
diff --git a/lib/Templating/Renderer/ActionRenderer.php b/lib/Templating/Renderer/ActionRenderer.php
index 0728c5f648e..441ad96ae5d 100644
--- a/lib/Templating/Renderer/ActionRenderer.php
+++ b/lib/Templating/Renderer/ActionRenderer.php
@@ -40,8 +40,6 @@ public function __construct(HttpKernelRuntime $httpKernelRuntime)
      * @param mixed $uri     A URI
      * @param array  $options An array of options
      *
-     * @return string
-     *
      * @see HttpKernelRuntime::renderFragment()
      */
     public function render(mixed $uri, array $options = []): string
@@ -56,11 +54,7 @@ public function render(mixed $uri, array $options = []): string
     /**
      * Create a document controller reference
      *
-     * @param Document\PageSnippet $document
-     * @param array $attributes
-     * @param array $query
      *
-     * @return ControllerReference
      */
     public function createDocumentReference(Document\PageSnippet $document, array $attributes = [], array $query = []): ControllerReference
     {
@@ -72,11 +66,7 @@ public function createDocumentReference(Document\PageSnippet $document, array $a
     /**
      * Add document params to params array
      *
-     * @param Document\PageSnippet $document
-     * @param array $attributes
-     * @param string $context
      *
-     * @return array
      */
     public function addDocumentAttributes(Document\PageSnippet $document, array $attributes = [], string $context = PimcoreContextResolver::CONTEXT_DEFAULT): array
     {
diff --git a/lib/Templating/Renderer/IncludeRenderer.php b/lib/Templating/Renderer/IncludeRenderer.php
index 4929d6dbb35..ea1abd8d03e 100644
--- a/lib/Templating/Renderer/IncludeRenderer.php
+++ b/lib/Templating/Renderer/IncludeRenderer.php
@@ -41,12 +41,7 @@ public function __construct(
     /**
      * Renders a document include
      *
-     * @param mixed $include
-     * @param array $params
-     * @param bool $editmode
-     * @param bool $cacheEnabled
      *
-     * @return string
      */
     public function render(mixed $include, array $params = [], bool $editmode = false, bool $cacheEnabled = true): string
     {
@@ -141,10 +136,7 @@ protected function renderAction(PageSnippet $include, array $params): string
      * add a class and the pimcore id / type so that it can be opened in editmode using the context menu
      * if there's no first level HTML container => add one (wrapper)
      *
-     * @param PageSnippet $include
-     * @param string $content
      *
-     * @return string
      */
     protected function modifyEditmodeContent(PageSnippet $include, string $content): string
     {
diff --git a/lib/Templating/TwigDefaultDelegatingEngine.php b/lib/Templating/TwigDefaultDelegatingEngine.php
index ce0389b0d17..a8642514fa1 100644
--- a/lib/Templating/TwigDefaultDelegatingEngine.php
+++ b/lib/Templating/TwigDefaultDelegatingEngine.php
@@ -39,9 +39,6 @@ public function __construct(protected Environment $twig, protected Config $confi
         parent::__construct($engines);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function exists(string|TemplateReferenceInterface $name): bool
     {
         if (!$this->delegate) {
@@ -52,7 +49,7 @@ public function exists(string|TemplateReferenceInterface $name): bool
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @throws \Exception
      */
@@ -65,9 +62,6 @@ public function render(string|TemplateReferenceInterface $name, array $parameter
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supports(string|TemplateReferenceInterface $name): bool
     {
         if (!$this->delegate) {
@@ -109,11 +103,7 @@ public function disableSandboxExtensionFromTwigEnvironment(): void
     }
 
     /**
-     * @param string $view
-     * @param array $parameters
-     * @param Response|null $response
      *
-     * @return Response
      *
      * @throws \Exception
      */
diff --git a/lib/Tool.php b/lib/Tool.php
index dbc3b7437e8..74f5f1747e6 100644
--- a/lib/Tool.php
+++ b/lib/Tool.php
@@ -28,7 +28,6 @@ final class Tool
      * Sets the current request to use when resolving request at early
      * stages (before container is loaded)
      *
-     * @var Request|null
      */
     private static ?Request $currentRequest = null;
 
@@ -39,7 +38,6 @@ final class Tool
     /**
      * Sets the current request to operate on
      *
-     * @param Request|null $request
      *
      * @internal
      */
@@ -58,7 +56,6 @@ public static function setCurrentRequest(?Request $request = null): void
      *
      * @param ?string $language
      *
-     * @return bool
      */
     public static function isValidLanguage(?string $language): bool
     {
@@ -133,7 +130,6 @@ public static function getFallbackLanguagesFor(string $language): array
      * returns the first language, or null, if no languages are configured
      * at all.
      *
-     * @return null|string
      */
     public static function getDefaultLanguage(): ?string
     {
@@ -204,11 +200,6 @@ private static function resolveRequest(Request $request = null): ?Request
         return $request;
     }
 
-    /**
-     * @param Request|null $request
-     *
-     * @return bool
-     */
     public static function isFrontend(Request $request = null): bool
     {
         if (null === $request) {
@@ -227,9 +218,7 @@ public static function isFrontend(Request $request = null): bool
     /**
      * eg. editmode, preview, version preview, always when it is a "frontend-request", but called out of the admin
      *
-     * @param Request|null $request
      *
-     * @return bool
      */
     public static function isFrontendRequestByAdmin(Request $request = null): bool
     {
@@ -247,10 +236,7 @@ public static function isFrontendRequestByAdmin(Request $request = null): bool
     /**
      * Verify element request (eg. editmode, preview, version preview) called within admin, with permissions.
      *
-     * @param Request $request
-     * @param Element\ElementInterface $element
      *
-     * @return bool
      */
     public static function isElementRequestByAdmin(Request $request, Element\ElementInterface $element): bool
     {
@@ -266,9 +252,7 @@ public static function isElementRequestByAdmin(Request $request, Element\Element
     /**
      * @internal
      *
-     * @param Request|null $request
      *
-     * @return bool
      */
     public static function useFrontendOutputFilters(Request $request = null): bool
     {
@@ -302,9 +286,7 @@ public static function useFrontendOutputFilters(Request $request = null): bool
     /**
      * @internal
      *
-     * @param Request|null $request
      *
-     * @return null|string
      */
     public static function getHostname(Request $request = null): ?string
     {
@@ -339,9 +321,7 @@ public static function getRequestScheme(Request $request = null): string
      * Returns the host URL
      *
      * @param string|null $useProtocol use a specific protocol
-     * @param Request|null $request
      *
-     * @return string
      */
     public static function getHostUrl(string $useProtocol = null, Request $request = null): string
     {
@@ -382,9 +362,7 @@ public static function getHostUrl(string $useProtocol = null, Request $request =
     /**
      * @internal
      *
-     * @param Request|null $request
      *
-     * @return string|null
      */
     public static function getClientIp(Request $request = null): ?string
     {
@@ -413,9 +391,7 @@ public static function getClientIp(Request $request = null): ?string
     /**
      * @internal
      *
-     * @param Request|null $request
      *
-     * @return null|string
      */
     public static function getAnonymizedClientIp(Request $request = null): ?string
     {
@@ -431,10 +407,7 @@ public static function getAnonymizedClientIp(Request $request = null): ?string
     }
 
     /**
-     * @param array|string|null $recipients
-     * @param string|null $subject
      *
-     * @return Mail
      *
      * @throws \Exception
      */
@@ -503,9 +476,7 @@ public static function getHttpData(string $url, array $paramsGet = [], array $pa
     }
 
     /**
-     * @param string $class
      *
-     * @return bool
      *
      * @internal
      */
@@ -515,9 +486,7 @@ public static function classExists(string $class): bool
     }
 
     /**
-     * @param string $class
      *
-     * @return bool
      *
      * @internal
      */
@@ -527,9 +496,7 @@ public static function interfaceExists(string $class): bool
     }
 
     /**
-     * @param string $class
      *
-     * @return bool
      *
      * @internal
      */
diff --git a/lib/Tool/Admin.php b/lib/Tool/Admin.php
index 8bb5a760145..d2d93150d97 100644
--- a/lib/Tool/Admin.php
+++ b/lib/Tool/Admin.php
@@ -34,7 +34,6 @@ class Admin
      *
      * @static
      *
-     * @return array
      */
     public static function getLanguages(): array
     {
@@ -76,9 +75,7 @@ public static function getLanguages(): array
     /**
      * @static
      *
-     * @param string $scriptContent
      *
-     * @return array
      */
     public static function getMinimizedScriptPath(string $scriptContent): array
     {
@@ -125,7 +122,6 @@ public static function determineCsvDialect(string $file): \stdClass
     /**
      * @static
      *
-     * @return string
      */
     public static function getMaintenanceModeFile(): string
     {
@@ -138,7 +134,6 @@ public static function getMaintenanceModeScheduleLoginFile(): string
     }
 
     /**
-     * @param string|null $sessionId
      *
      * @throws \Exception
      */
@@ -174,7 +169,6 @@ public static function deactivateMaintenanceMode(): void
     /**
      * @static
      *
-     * @return bool
      */
     public static function isInMaintenanceMode(): bool
     {
@@ -229,7 +223,6 @@ public static function unscheduleMaintenanceModeOnLogin(): void
     /**
      * @static
      *
-     * @return \Pimcore\Model\User|null
      */
     public static function getCurrentUser(): ?User
     {
diff --git a/lib/Tool/ArrayNormalizer.php b/lib/Tool/ArrayNormalizer.php
index 3860eb5ccd6..c7e1fc937dd 100644
--- a/lib/Tool/ArrayNormalizer.php
+++ b/lib/Tool/ArrayNormalizer.php
@@ -42,9 +42,7 @@ public function normalize(array $array): array
 
     /**
      * @param int|string|int[]|string[] $properties
-     * @param callable $normalizer
      *
-     * @return void
      */
     public function addNormalizer(array|int|string $properties, callable $normalizer): void
     {
diff --git a/lib/Tool/AssetsInstaller.php b/lib/Tool/AssetsInstaller.php
index 2bbaa7193d9..db2647b7f2b 100644
--- a/lib/Tool/AssetsInstaller.php
+++ b/lib/Tool/AssetsInstaller.php
@@ -35,9 +35,7 @@ class AssetsInstaller
     /**
      * Runs this assets:install command
      *
-     * @param array $options
      *
-     * @return Process
      */
     public function install(array $options = []): Process
     {
@@ -55,9 +53,7 @@ public function install(array $options = []): Process
     /**
      * Builds the process instance
      *
-     * @param array $options
      *
-     * @return Process
      */
     protected function buildProcess(array $options = []): Process
     {
@@ -90,9 +86,7 @@ protected function buildProcess(array $options = []): Process
      * Takes a set of options as defined in configureOptions and validates and merges them
      * with values from composer.json
      *
-     * @param array $options
      *
-     * @return array
      */
     public function resolveOptions(array $options = []): array
     {
@@ -102,9 +96,6 @@ public function resolveOptions(array $options = []): array
         return $resolver->resolve($options);
     }
 
-    /**
-     * @param \Closure|null $runCallback
-     */
     public function setRunCallback(\Closure $runCallback = null): void
     {
         $this->runCallback = $runCallback;
diff --git a/lib/Tool/Authentication.php b/lib/Tool/Authentication.php
index d8c69fdbfcf..f2fc41db5f5 100644
--- a/lib/Tool/Authentication.php
+++ b/lib/Tool/Authentication.php
@@ -27,11 +27,6 @@
 
 class Authentication
 {
-    /**
-     * @param Request|null $request
-     *
-     * @return User|null
-     */
     public static function authenticateSession(Request $request = null): ?User
     {
         if (null === $request) {
@@ -180,10 +175,7 @@ public static function isValidUser(?User $user): bool
     }
 
     /**
-     * @param string $username
-     * @param string $plainTextPassword
      *
-     * @return string
      *
      * @throws \Exception
      *
@@ -209,9 +201,7 @@ private static function preparePlainTextPassword(string $username, string $plain
     }
 
     /**
-     * @param string $username
      *
-     * @return string
      *
      * @internal
      */
diff --git a/lib/Tool/ClassUtils.php b/lib/Tool/ClassUtils.php
index 663e7b89f60..a384a3c5370 100644
--- a/lib/Tool/ClassUtils.php
+++ b/lib/Tool/ClassUtils.php
@@ -27,9 +27,7 @@ class ClassUtils
     /**
      * Returns the base name for a class
      *
-     * @param object|string $class
      *
-     * @return string
      */
     public static function getBaseName(object|string $class): string
     {
@@ -41,12 +39,9 @@ public static function getBaseName(object|string $class): string
      *
      * @see http://jarretbyrne.com/2015/06/197/
      *
-     * @param \SplFileInfo $file
-     *
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
      *
-     * @return string
      */
     public static function findClassName(\SplFileInfo $file): string
     {
diff --git a/lib/Tool/DeviceDetector.php b/lib/Tool/DeviceDetector.php
index 2c254907621..5829127ce86 100644
--- a/lib/Tool/DeviceDetector.php
+++ b/lib/Tool/DeviceDetector.php
@@ -34,11 +34,6 @@ class DeviceDetector
 
     protected bool $wasUsed = false;
 
-    /**
-     * @param string|null $default
-     *
-     * @return DeviceDetector
-     */
     public static function getInstance(string $default = null): DeviceDetector
     {
         if (!self::$instance) {
@@ -48,9 +43,6 @@ public static function getInstance(string $default = null): DeviceDetector
         return self::$instance;
     }
 
-    /**
-     * @param string|null $default
-     */
     public function __construct(string $default = null)
     {
         if ($default && in_array($default, ['desktop', 'mobile', 'tablet'])) {
@@ -92,7 +84,6 @@ public function setWasUsed(bool $wasUsed): void
     /**
      * Set the device type manually. Possible values for type: 'desktop', 'tablet', or 'phone'
      *
-     * @param string $type
      *
      * @throws \Exception
      */
diff --git a/lib/Tool/DomCrawler.php b/lib/Tool/DomCrawler.php
index 486562aa0ad..e3a78a62340 100644
--- a/lib/Tool/DomCrawler.php
+++ b/lib/Tool/DomCrawler.php
@@ -27,9 +27,6 @@ class DomCrawler extends Crawler
 
     private bool $wrappedHtmlFragment = false;
 
-    /**
-     * {@inheritDoc}
-     */
     public function __construct($node = null, string $uri = null, string $baseHref = null)
     {
         if (is_string($node)) {
@@ -44,9 +41,6 @@ public function __construct($node = null, string $uri = null, string $baseHref =
         parent::__construct($node, $uri, $baseHref);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function html(string $default = null): string
     {
         if ($this->wrappedHtmlFragment) {
diff --git a/lib/Tool/HtmlUtils.php b/lib/Tool/HtmlUtils.php
index fce39305720..b04c66c9ad4 100644
--- a/lib/Tool/HtmlUtils.php
+++ b/lib/Tool/HtmlUtils.php
@@ -25,10 +25,7 @@ class HtmlUtils
     /**
      * Builds an attribute string from an array of attributes
      *
-     * @param array $attributes
-     * @param bool $omitNullValues
      *
-     * @return string
      */
     public static function assembleAttributeString(array $attributes, bool $omitNullValues = false): string
     {
diff --git a/lib/Tool/Requirements.php b/lib/Tool/Requirements.php
index e8cb7715918..b6fe9d3714c 100644
--- a/lib/Tool/Requirements.php
+++ b/lib/Tool/Requirements.php
@@ -69,7 +69,6 @@ public static function checkFilesystem(): array
     }
 
     /**
-     * @param Connection $db
      *
      * @return Check[]
      */
@@ -679,10 +678,7 @@ public static function checkPhp(): array
     }
 
     /**
-     * @param string $base
-     * @param array $data
      *
-     * @return array
      *
      * @throws \Exception
      */
diff --git a/lib/Tool/Requirements/Check.php b/lib/Tool/Requirements/Check.php
index bd95fa97ffe..5f596ee7c9d 100644
--- a/lib/Tool/Requirements/Check.php
+++ b/lib/Tool/Requirements/Check.php
@@ -89,7 +89,6 @@ public function setMessage(string $message): void
     /**
      * @param string $offset
      *
-     * @return bool
      */
     public function offsetExists($offset): bool
     {
@@ -99,7 +98,6 @@ public function offsetExists($offset): bool
     /**
      * @param string $offset
      *
-     * @return string|int|null
      */
     public function offsetGet($offset): string|int|null
     {
diff --git a/lib/Tool/Serialize.php b/lib/Tool/Serialize.php
index 5ac747f4f59..a23aed29c67 100644
--- a/lib/Tool/Serialize.php
+++ b/lib/Tool/Serialize.php
@@ -39,7 +39,6 @@ public static function unserialize(?string $data = null): mixed
      *
      * Shortcut to access the admin serializer
      *
-     * @return \Symfony\Component\Serializer\Serializer
      */
     public static function getAdminSerializer(): \Symfony\Component\Serializer\Serializer
     {
@@ -52,9 +51,7 @@ public static function getAdminSerializer(): \Symfony\Component\Serializer\Seria
      * this is a special json encoder that avoids recursion errors
      * especially for pimcore models that contain massive self referencing objects
      *
-     * @param mixed $data
      *
-     * @return mixed
      */
     public static function removeReferenceLoops(mixed $data): mixed
     {
diff --git a/lib/Tool/Text.php b/lib/Tool/Text.php
index e2c145b67c3..b29db83b99c 100644
--- a/lib/Tool/Text.php
+++ b/lib/Tool/Text.php
@@ -233,9 +233,7 @@ private static function getElementsInWysiwyg(string $text): array
     /**
      * extracts all dependencies to other elements from wysiwyg text
      *
-     * @param string|null $text
      *
-     * @return array
      */
     public static function getDependenciesOfWysiwygText(?string $text): array
     {
diff --git a/lib/Tool/Transliteration.php b/lib/Tool/Transliteration.php
index fda587d741e..2d10dae3661 100644
--- a/lib/Tool/Transliteration.php
+++ b/lib/Tool/Transliteration.php
@@ -24,10 +24,7 @@ class Transliteration
     /**
      * @static
      *
-     * @param string $value
-     * @param string|null $language
      *
-     * @return string
      */
     public static function toASCII(string $value, string $language = null): string
     {
diff --git a/lib/Translation/Translator.php b/lib/Translation/Translator.php
index 19448762179..e50d90dd1f6 100644
--- a/lib/Translation/Translator.php
+++ b/lib/Translation/Translator.php
@@ -43,7 +43,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
      * the message. Can be useful for debugging and to get an overview over used translation keys on
      * a page.
      *
-     * @var bool
      */
     protected bool $disableTranslations = false;
 
@@ -58,11 +57,6 @@ public function __construct(TranslatorInterface $translator)
         $this->translator = $translator;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string
     {
         $id = trim($id);
@@ -107,9 +101,6 @@ public function trans(string $id, array $parameters = [], string $domain = null,
         return $term;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setLocale(string $locale): void
     {
         if ($this->translator instanceof LocaleAwareInterface) {
@@ -117,11 +108,6 @@ public function setLocale(string $locale): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getLocale(): string
     {
         if ($this->translator instanceof LocaleAwareInterface) {
@@ -131,11 +117,6 @@ public function getLocale(): string
         return \Pimcore\Tool::getDefaultLanguage();
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return MessageCatalogueInterface
-     */
     public function getCatalogue(string $locale = null): MessageCatalogueInterface
     {
         return $this->translator->getCatalogue($locale);
@@ -152,8 +133,6 @@ public function getCatalogues(): array
     /**
      * @internal
      *
-     * @param string $domain
-     * @param string $locale
      */
     public function lazyInitialize(string $domain, string $locale): void
     {
@@ -215,10 +194,7 @@ public function lazyInitialize(string $domain, string $locale): void
     /**
      * Resets the initialization of a specific catalogue
      *
-     * @param string $domain
-     * @param string $locale
      *
-     * @return void
      */
     public function resetInitialization(string $domain, string $locale): void
     {
@@ -322,7 +298,6 @@ private function checkForEmptyTranslation(string $id, string $translated, array
     /**
      * @internal
      *
-     * @return string
      */
     public function getAdminPath(): string
     {
@@ -330,7 +305,6 @@ public function getAdminPath(): string
     }
 
     /**
-     * @param string $adminPath
      *
      * @internal
      */
@@ -342,7 +316,6 @@ public function setAdminPath(string $adminPath): void
     /**
      * @internal
      *
-     * @return array
      */
     public function getAdminTranslationMapping(): array
     {
@@ -352,7 +325,6 @@ public function getAdminTranslationMapping(): array
     /**
      * @internal
      *
-     * @param array $adminTranslationMapping
      */
     public function setAdminTranslationMapping(array $adminTranslationMapping): void
     {
@@ -362,7 +334,6 @@ public function setAdminTranslationMapping(array $adminTranslationMapping): void
     /**
      * @internal
      *
-     * @return Kernel
      */
     public function getKernel(): Kernel
     {
@@ -370,7 +341,6 @@ public function getKernel(): Kernel
     }
 
     /**
-     * @param Kernel $kernel
      *
      * @internal
      */
@@ -412,7 +382,6 @@ private function getCacheKey(string $domain, string $locale): string
     }
 
     /**
-     * @param string $cacheDir
      *
      * @return string[]
      */
diff --git a/lib/Twig/Extension/CacheExtension.php b/lib/Twig/Extension/CacheExtension.php
index c846712832d..85dd7c5923b 100644
--- a/lib/Twig/Extension/CacheExtension.php
+++ b/lib/Twig/Extension/CacheExtension.php
@@ -52,9 +52,6 @@ public function getFunctions(): array
     }
 
     /**
-     * @param string $name
-     * @param int|null $lifetime
-     * @param bool $force
      *
      * @return $this
      */
@@ -126,9 +123,6 @@ protected function outputContent(string $content, string $key, bool $isLoadedFro
     /**
      * Save the (rendered) content to to cache. May be overriden to add custom markup / code, or specific tags, etc.
      *
-     * @param string $content
-     * @param string $key
-     * @param array $tags
      */
     protected function saveContentToCache(string $content, string $key, array $tags): void
     {
diff --git a/lib/Twig/Extension/DataObjectHelperExtensions.php b/lib/Twig/Extension/DataObjectHelperExtensions.php
index 598dd27077f..db42bce74da 100644
--- a/lib/Twig/Extension/DataObjectHelperExtensions.php
+++ b/lib/Twig/Extension/DataObjectHelperExtensions.php
@@ -27,9 +27,6 @@
  */
 class DataObjectHelperExtensions extends AbstractExtension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getTests(): array
     {
         return [
@@ -54,9 +51,6 @@ public function getTests(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getFunctions(): array
     {
         return [
diff --git a/lib/Twig/Extension/DocumentEditableExtension.php b/lib/Twig/Extension/DocumentEditableExtension.php
index df0338eda57..f436dfa17d0 100644
--- a/lib/Twig/Extension/DocumentEditableExtension.php
+++ b/lib/Twig/Extension/DocumentEditableExtension.php
@@ -34,9 +34,6 @@ public function __construct(EditableRenderer $editableRenderer)
         $this->editableRenderer = $editableRenderer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getFunctions(): array
     {
         return [
@@ -75,13 +72,6 @@ public function getFunctions(): array
     /**
      * @internal
      *
-     * @param array $context
-     * @param string $type
-     * @param string $name
-     * @param array $options
-     *
-     * @return \Pimcore\Model\Document\Editable\EditableInterface|string
-     *
      * @throws \Exception
      */
     public function renderEditable(array $context, string $type, string $name, array $options = []): string|\Pimcore\Model\Document\Editable\EditableInterface
@@ -100,9 +90,7 @@ public function renderEditable(array $context, string $type, string $name, array
      *
      * @internal
      *
-     * @param BlockInterface $block
      *
-     * @return \Generator
      */
     public function getBlockIterator(BlockInterface $block): \Generator
     {
diff --git a/lib/Twig/Extension/HelpersExtension.php b/lib/Twig/Extension/HelpersExtension.php
index 844cb8f8c87..27f3089b8f0 100644
--- a/lib/Twig/Extension/HelpersExtension.php
+++ b/lib/Twig/Extension/HelpersExtension.php
@@ -45,9 +45,6 @@ public function getFilters(): array
         ];
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function getFunctions(): array
     {
         return [
@@ -84,9 +81,7 @@ public function basenameFilter(string $value, string $suffix = ''): string
     }
 
     /**
-     * @param string $file
      *
-     * @return string
      *
      * @throws \Exception
      */
@@ -117,7 +112,6 @@ public function getAssetVersionPreview(string $file): string
     }
 
     /**
-     * @return string
      *
      * @throws \Exception
      */
diff --git a/lib/Twig/Extension/ImageThumbnailExtension.php b/lib/Twig/Extension/ImageThumbnailExtension.php
index 88b4666f592..34ddc7e2047 100644
--- a/lib/Twig/Extension/ImageThumbnailExtension.php
+++ b/lib/Twig/Extension/ImageThumbnailExtension.php
@@ -27,9 +27,6 @@
  */
 class ImageThumbnailExtension extends AbstractExtension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getFilters(): array
     {
         return [
@@ -38,9 +35,6 @@ public function getFilters(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getFunctions(): array
     {
         return [
diff --git a/lib/Twig/Extension/SubrequestExtension.php b/lib/Twig/Extension/SubrequestExtension.php
index 790498e9a49..1c34aa58d01 100644
--- a/lib/Twig/Extension/SubrequestExtension.php
+++ b/lib/Twig/Extension/SubrequestExtension.php
@@ -32,9 +32,6 @@ public function __construct(Inc $incHelper)
         $this->incHelper = $incHelper;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getFunctions(): array
     {
         // as runtime extension classes are invokable, we can pass them directly as callable
diff --git a/lib/Twig/Extension/Templating/HeadLink.php b/lib/Twig/Extension/Templating/HeadLink.php
index 34cbbe61528..f3e390997e4 100644
--- a/lib/Twig/Extension/Templating/HeadLink.php
+++ b/lib/Twig/Extension/Templating/HeadLink.php
@@ -70,7 +70,6 @@ class HeadLink extends CacheBusterAware
     /**
      * $_validAttributes
      *
-     * @var array
      */
     protected array $_itemKeys = [
         'charset',
@@ -103,8 +102,6 @@ class HeadLink extends CacheBusterAware
      *
      * Use PHP_EOL as separator
      *
-     * @param ContainerService $containerService
-     * @param WebLinkExtension $webLinkExtension
      */
     public function __construct(
         ContainerService $containerService,
@@ -122,8 +119,6 @@ public function __construct(
      * Returns current object instance. Optionally, allows passing array of
      * values to build link.
      *
-     * @param array|null $attributes
-     * @param string $placement
      *
      * @return $this
      */
@@ -207,9 +202,7 @@ public function __call(string $method, array $args): mixed
     /**
      * Check if value is valid
      *
-     * @param  mixed $value
      *
-     * @return bool
      */
     protected function _isValid(mixed $value): bool
     {
@@ -232,7 +225,6 @@ protected function _isValid(mixed $value): bool
      *
      * @param  \stdClass $value
      *
-     * @return void
      */
     public function append($value): void
     {
@@ -247,9 +239,7 @@ public function append($value): void
      * offsetSet()
      *
      * @param  string|int $offset
-     * @param mixed $value
      *
-     * @return void
      */
     public function offsetSet($offset, mixed $value): void
     {
@@ -291,9 +281,7 @@ public function set($value): void
     /**
      * Create HTML link element from data item
      *
-     * @param  \stdClass $item
      *
-     * @return string
      */
     public function itemToString(\stdClass $item): string
     {
@@ -333,9 +321,7 @@ public function itemToString(\stdClass $item): string
     /**
      * Render link elements as string
      *
-     * @param int|string|null $indent
      *
-     * @return string
      */
     public function toString(int|string $indent = null): string
     {
@@ -391,9 +377,7 @@ protected function prepareEntries(): void
     /**
      * Create data item for stack
      *
-     * @param  array $attributes
      *
-     * @return \stdClass
      */
     public function createData(array $attributes): \stdClass
     {
@@ -405,7 +389,6 @@ public function createData(array $attributes): \stdClass
     /**
      * Create item for stylesheet link item
      *
-     * @param  array $args
      *
      * @return \stdClass|false Returns fals if stylesheet is a duplicate
      */
@@ -452,9 +435,7 @@ public function createDataStylesheet(array $args): bool|\stdClass
     /**
      * Is the linked stylesheet a duplicate?
      *
-     * @param string $uri
      *
-     * @return bool
      */
     protected function _isDuplicateStylesheet(string $uri): bool
     {
@@ -470,9 +451,7 @@ protected function _isDuplicateStylesheet(string $uri): bool
     /**
      * Create item for alternate link item
      *
-     * @param  array $args
      *
-     * @return \stdClass
      */
     public function createDataAlternate(array $args): \stdClass
     {
@@ -507,9 +486,7 @@ public function createDataAlternate(array $args): \stdClass
     /**
      * Apply any overrides specified in the 'extras' array
      *
-     * @param array $attributes
      *
-     * @return array
      */
     protected function _applyExtras(array $attributes): array
     {
diff --git a/lib/Twig/Extension/Templating/HeadMeta.php b/lib/Twig/Extension/Templating/HeadMeta.php
index f082818f5b7..1db37772bda 100644
--- a/lib/Twig/Extension/Templating/HeadMeta.php
+++ b/lib/Twig/Extension/Templating/HeadMeta.php
@@ -68,7 +68,6 @@ class HeadMeta extends AbstractExtension implements RuntimeExtensionInterface
     /**
      * Types of attributes
      *
-     * @var array
      */
     protected array $_typeKeys = ['name', 'http-equiv', 'charset', 'property'];
 
@@ -88,7 +87,6 @@ class HeadMeta extends AbstractExtension implements RuntimeExtensionInterface
      *
      * Set separator to PHP_EOL.
      *
-     * @param ContainerService $containerService
      */
     public function __construct(ContainerService $containerService)
     {
@@ -99,11 +97,6 @@ public function __construct(ContainerService $containerService)
     /**
      * Retrieve object instance; optionally add meta tag
      *
-     * @param string|null $content
-     * @param string|null $keyValue
-     * @param string $keyType
-     * @param array $modifiers
-     * @param string $placement
      *
      * @return $this
      */
@@ -168,8 +161,6 @@ public function getItem(string $type, string $keyValue): mixed
      * - prependProperty($keyValue, $content, $modifiers = array())
      * - setProperty($keyValue, $content, $modifiers = array())
      *
-     * @param string $method
-     * @param array $args
      *
      * @return HeadMeta
      */
@@ -215,9 +206,7 @@ public function __call(string $method, array $args): mixed
     /**
      * Determine if item is valid
      *
-     * @param  mixed $item
      *
-     * @return bool
      */
     protected function _isValid(mixed $item): bool
     {
@@ -229,8 +218,6 @@ protected function _isValid(mixed $item): bool
      *
      * @param  \stdClass $value
      *
-     * @return void
-     *
      * @throws Exception
      */
     public function append($value): void
@@ -246,9 +233,6 @@ public function append($value): void
      * OffsetSet
      *
      * @param  string|int $offset
-     * @param mixed $value
-     *
-     * @return void
      *
      * @throws Exception
      */
@@ -266,8 +250,6 @@ public function offsetSet($offset, mixed $value): void
      *
      * @param  string|int $index
      *
-     * @return void
-     *
      * @throws Exception
      */
     public function offsetUnset($index): void
@@ -284,8 +266,6 @@ public function offsetUnset($index): void
      *
      * @param  string $value
      *
-     * @return void
-     *
      * @throws Exception
      */
     public function prepend($value): void
@@ -300,9 +280,7 @@ public function prepend($value): void
     /**
      * Set
      *
-     * @param mixed $value
      *
-     * @return void
      *
      * @throws Exception
      */
@@ -325,9 +303,7 @@ public function set(mixed $value): void
     /**
      * Build meta HTML string
      *
-     * @param \stdClass $item
      *
-     * @return string
      */
     public function itemToString(\stdClass $item): string
     {
@@ -369,9 +345,7 @@ public function itemToString(\stdClass $item): string
     /**
      * Render placeholder as string
      *
-     * @param int|string|null $indent
      *
-     * @return string
      */
     public function toString(int|string $indent = null): string
     {
@@ -403,12 +377,7 @@ public function toString(int|string $indent = null): string
     /**
      * Create data item for inserting into stack
      *
-     * @param string $type
-     * @param string $typeValue
-     * @param string $content
-     * @param  array $modifiers
      *
-     * @return \stdClass
      */
     public function createData(string $type, string $typeValue, string $content, array $modifiers): \stdClass
     {
@@ -434,9 +403,6 @@ public function getRaw(): array
     }
 
     /**
-     * @param string $string
-     * @param int|null $length
-     * @param string $suffix
      *
      * @return $this
      */
diff --git a/lib/Twig/Extension/Templating/HeadScript.php b/lib/Twig/Extension/Templating/HeadScript.php
index 826e04e471f..40998e216d0 100644
--- a/lib/Twig/Extension/Templating/HeadScript.php
+++ b/lib/Twig/Extension/Templating/HeadScript.php
@@ -77,14 +77,12 @@ class HeadScript extends CacheBusterAware implements RuntimeExtensionInterface
     /**
      * Registry key for placeholder
      *
-     * @var string
      */
     protected string $_regKey = 'HeadScript';
 
     /**
      * Are arbitrary attributes allowed?
      *
-     * @var bool
      */
     protected bool $_arbitraryAttributes = false;
 
@@ -105,7 +103,6 @@ class HeadScript extends CacheBusterAware implements RuntimeExtensionInterface
     /**
      * Optional allowed attributes for script tag
      *
-     * @var array
      */
     protected array $_optionalAttributes = [
         'charset', 'defer', 'language', 'src', 'type', 'async',
@@ -114,7 +111,6 @@ class HeadScript extends CacheBusterAware implements RuntimeExtensionInterface
     /**
      * Required attributes for script tag
      *
-     * @var array
      */
     protected array $_requiredAttributes = ['type'];
 
@@ -122,7 +118,6 @@ class HeadScript extends CacheBusterAware implements RuntimeExtensionInterface
      * Whether or not to format scripts using CDATA; used only if doctype
      * helper is not accessible
      *
-     * @var bool
      */
     public bool $useCdata = false;
 
@@ -138,8 +133,6 @@ class HeadScript extends CacheBusterAware implements RuntimeExtensionInterface
      *
      * Set separator to PHP_EOL.
      *
-     * @param ContainerService $containerService
-     * @param WebLinkExtension $webLinkExtension
      */
     public function __construct(
         ContainerService $containerService,
@@ -193,9 +186,7 @@ public function __invoke(string $mode = self::FILE, string $spec = null, string
      *
      * @param string $captureType
      * @param string $type
-     * @param array $attrs
      *
-     * @return void
      */
     public function captureStart($captureType = Container::APPEND, $type = 'text/javascript', array $attrs = []): void
     {
@@ -213,7 +204,6 @@ public function captureStart($captureType = Container::APPEND, $type = 'text/jav
     /**
      * End capture action and store
      *
-     * @return void
      */
     public function captureEnd(): void
     {
@@ -252,8 +242,6 @@ public function captureEnd(): void
      * - prependScript($script, $type = 'text/javascript', $attrs = array())
      * - setScript($script, $type = 'text/javascript', $attrs = array())
      *
-     * @param string $method
-     * @param array $args
      *
      * @return HeadScript
      *
@@ -322,9 +310,7 @@ public function __call(string $method, array $args): mixed
     /**
      * Is the file specified a duplicate?
      *
-     * @param string $file
      *
-     * @return bool
      */
     protected function _isDuplicate(string $file): bool
     {
@@ -342,9 +328,7 @@ protected function _isDuplicate(string $file): bool
     /**
      * Is the script provided valid?
      *
-     * @param mixed $value
      *
-     * @return bool
      */
     protected function _isValid(mixed $value): bool
     {
@@ -362,7 +346,6 @@ protected function _isValid(mixed $value): bool
      *
      * @param  string $value
      *
-     * @return void
      */
     public function append($value): void
     {
@@ -378,7 +361,6 @@ public function append($value): void
      *
      * @param  string $value
      *
-     * @return void
      */
     public function prepend($value): void
     {
@@ -394,7 +376,6 @@ public function prepend($value): void
      *
      * @param  string $value
      *
-     * @return void
      */
     public function set($value): void
     {
@@ -409,9 +390,7 @@ public function set($value): void
      * Override offsetSet
      *
      * @param  string|int $offset
-     * @param mixed $value
      *
-     * @return void
      */
     public function offsetSet($offset, mixed $value): void
     {
@@ -425,7 +404,6 @@ public function offsetSet($offset, mixed $value): void
     /**
      * Set flag indicating if arbitrary attributes are allowed
      *
-     * @param bool $flag
      *
      * @return $this
      */
@@ -439,7 +417,6 @@ public function setAllowArbitraryAttributes(bool $flag): static
     /**
      * Are arbitrary attributes allowed?
      *
-     * @return bool
      */
     public function arbitraryAttributesAllowed(): bool
     {
@@ -449,12 +426,7 @@ public function arbitraryAttributesAllowed(): bool
     /**
      * Create script HTML
      *
-     * @param \stdClass $item
-     * @param string $indent
-     * @param string $escapeStart
-     * @param string $escapeEnd
      *
-     * @return string
      */
     public function itemToString(\stdClass $item, string $indent, string $escapeStart, string $escapeEnd): string
     {
@@ -528,9 +500,7 @@ public function itemToString(\stdClass $item, string $indent, string $escapeStar
     /**
      * Retrieve string representation
      *
-     * @param int|string|null $indent
      *
-     * @return string
      */
     public function toString(int|string $indent = null): string
     {
@@ -601,11 +571,7 @@ protected function prepareEntries(): void
     /**
      * Create data item containing all necessary components of script
      *
-     * @param string $type
-     * @param  array $attributes
-     * @param string|null $content
      *
-     * @return \stdClass
      */
     public function createData(string $type, array $attributes, string $content = null): \stdClass
     {
diff --git a/lib/Twig/Extension/Templating/HeadStyle.php b/lib/Twig/Extension/Templating/HeadStyle.php
index ef483e3dfae..f5066aba91d 100644
--- a/lib/Twig/Extension/Templating/HeadStyle.php
+++ b/lib/Twig/Extension/Templating/HeadStyle.php
@@ -57,21 +57,18 @@ class HeadStyle extends AbstractExtension implements RuntimeExtensionInterface
     /**
      * Registry key for placeholder
      *
-     * @var string
      */
     protected string $_regKey = 'HeadStyle';
 
     /**
      * Allowed optional attributes
      *
-     * @var array
      */
     protected array $_optionalAttributes = ['lang', 'title', 'media', 'dir'];
 
     /**
      * Allowed media types
      *
-     * @var array
      */
     protected array $_mediaTypes = [
         'all', 'aural', 'braille', 'handheld', 'print',
@@ -81,21 +78,18 @@ class HeadStyle extends AbstractExtension implements RuntimeExtensionInterface
     /**
      * Capture type and/or attributes (used for hinting during capture)
      *
-     * @var array|null
      */
     protected ?array $_captureAttrs = null;
 
     /**
      * Capture lock
      *
-     * @var bool
      */
     protected bool $_captureLock = false;
 
     /**
      * Capture type (append, prepend, set)
      *
-     * @var string
      */
     protected string $_captureType;
 
@@ -104,7 +98,6 @@ class HeadStyle extends AbstractExtension implements RuntimeExtensionInterface
      *
      * Set separator to PHP_EOL.
      *
-     * @param ContainerService $containerService
      */
     public function __construct(ContainerService $containerService)
     {
@@ -156,10 +149,7 @@ public function __invoke(string $content = null, string $placement = 'APPEND', a
      * - prependStyle($content, $attributes = array())
      * - setStyle($content, $attributes = array())
      *
-     * @param string $method
-     * @param array $args
      *
-     * @return mixed
      *
      * @throws Exception When no $content provided or invalid method
      */
@@ -204,9 +194,7 @@ public function __call(string $method, array $args): mixed
     /**
      * Determine if a value is a valid style tag
      *
-     * @param mixed $value
      *
-     * @return bool
      */
     protected function _isValid(mixed $value): bool
     {
@@ -222,9 +210,7 @@ protected function _isValid(mixed $value): bool
     /**
      * Override append to enforce style creation
      *
-     * @param  mixed $value
      *
-     * @return void
      */
     public function append(mixed $value): void
     {
@@ -239,9 +225,7 @@ public function append(mixed $value): void
      * Override offsetSet to enforce style creation
      *
      * @param  string|int $offset
-     * @param mixed $value
      *
-     * @return void
      */
     public function offsetSet($offset, mixed $value): void
     {
@@ -255,9 +239,7 @@ public function offsetSet($offset, mixed $value): void
     /**
      * Override prepend to enforce style creation
      *
-     * @param  mixed $value
      *
-     * @return void
      */
     public function prepend(mixed $value): void
     {
@@ -271,9 +253,7 @@ public function prepend(mixed $value): void
     /**
      * Override set to enforce style creation
      *
-     * @param  mixed $value
      *
-     * @return void
      */
     public function set(mixed $value): void
     {
@@ -290,7 +270,6 @@ public function set(mixed $value): void
      * @param string $type
      * @param array|null $attrs
      *
-     * @return void
      */
     public function captureStart($type = Container::APPEND, $attrs = null): void
     {
@@ -307,7 +286,6 @@ public function captureStart($type = Container::APPEND, $attrs = null): void
     /**
      * End capture action and store
      *
-     * @return void
      */
     public function captureEnd(): void
     {
@@ -339,7 +317,6 @@ public function captureEnd(): void
      * @param  \stdClass $item Item to render
      * @param string|null $indent Indentation to use
      *
-     * @return string
      */
     public function itemToString(\stdClass $item, ?string $indent): string
     {
@@ -398,9 +375,7 @@ public function itemToString(\stdClass $item, ?string $indent): string
     /**
      * Create string representation of placeholder
      *
-     * @param int|string|null $indent
      *
-     * @return string
      */
     public function toString(int|string $indent = null): string
     {
@@ -426,10 +401,7 @@ public function toString(int|string $indent = null): string
     /**
      * Create data item for use in stack
      *
-     * @param string $content
-     * @param  array $attributes
      *
-     * @return \stdClass
      */
     public function createData(string $content, array $attributes): \stdClass
     {
diff --git a/lib/Twig/Extension/Templating/HeadTitle.php b/lib/Twig/Extension/Templating/HeadTitle.php
index 880595114c2..407fd0234b7 100644
--- a/lib/Twig/Extension/Templating/HeadTitle.php
+++ b/lib/Twig/Extension/Templating/HeadTitle.php
@@ -49,20 +49,16 @@ class HeadTitle extends AbstractExtension implements RuntimeExtensionInterface
     /**
      * Registry key for placeholder
      *
-     * @var string
      */
     protected string $_regKey = 'HeadTitle';
 
     /**
      * Default title rendering order (i.e. order in which each title attached)
      *
-     * @var string|null
      */
     protected ?string $_defaultAttachOrder = null;
 
     /**
-     * @param string|null $title
-     * @param string|null $setType
      *
      * @return $this
      */
@@ -92,7 +88,6 @@ public function __invoke(string $title = null, string $setType = null): static
     /**
      * Set a default order to add titles
      *
-     * @param string $setType
      *
      * @return $this
      */
@@ -114,7 +109,6 @@ public function setDefaultAttachOrder(string $setType): static
     /**
      * Get the default attach order, if any.
      *
-     * @return string|null
      */
     public function getDefaultAttachOrder(): ?string
     {
@@ -124,10 +118,7 @@ public function getDefaultAttachOrder(): ?string
     /**
      * Turn helper into string
      *
-     * @param string|null $indent
-     * @param string|null $locale
      *
-     * @return string
      */
     public function toString(string $indent = null, string $locale = null): string
     {
@@ -154,7 +145,6 @@ public function toString(string $indent = null, string $locale = null): string
     /**
      * Get container content without indentation, prefix or postfix
      *
-     * @return string
      */
     public function getRawContent(): string
     {
diff --git a/lib/Twig/Extension/Templating/Inc.php b/lib/Twig/Extension/Templating/Inc.php
index e92128ba281..8e4af509ec9 100644
--- a/lib/Twig/Extension/Templating/Inc.php
+++ b/lib/Twig/Extension/Templating/Inc.php
@@ -36,14 +36,6 @@ public function __construct(IncludeRenderer $includeRenderer, EditmodeResolver $
         $this->editmodeResolver = $editmodeResolver;
     }
 
-    /**
-     * @param int|string|PageSnippet $include
-     * @param array $params
-     * @param bool $cacheEnabled
-     * @param bool|null $editmode
-     *
-     * @return string
-     */
     public function __invoke(int|string|PageSnippet $include, array $params = [], bool $cacheEnabled = true, bool $editmode = null): string
     {
         if (null === $editmode) {
diff --git a/lib/Twig/Extension/Templating/InlineScript.php b/lib/Twig/Extension/Templating/InlineScript.php
index 5490fc86f8e..db5d9e1fcae 100644
--- a/lib/Twig/Extension/Templating/InlineScript.php
+++ b/lib/Twig/Extension/Templating/InlineScript.php
@@ -54,7 +54,6 @@ class InlineScript extends HeadScript implements RuntimeExtensionInterface
     /**
      * Registry key for placeholder
      *
-     * @var string
      */
     protected string $_regKey = 'InlineScript';
 }
diff --git a/lib/Twig/Extension/Templating/Navigation.php b/lib/Twig/Extension/Templating/Navigation.php
index ce2514e0df0..5cf30a21f42 100644
--- a/lib/Twig/Extension/Templating/Navigation.php
+++ b/lib/Twig/Extension/Templating/Navigation.php
@@ -52,9 +52,7 @@ public function __construct(Builder $builder, ContainerInterface $rendererLocato
      * Builds a navigation container by passing params
      * Possible config params are: 'root', 'htmlMenuPrefix', 'pageCallback', 'cache', 'cacheLifetime', 'maxDepth', 'active', 'markActiveTrail'
      *
-     * @param array $params
      *
-     * @return Container
      *
      * @throws \Exception
      */
@@ -66,9 +64,7 @@ public function build(array $params): Container
     /**
      * Get a named renderer
      *
-     * @param string $alias
      *
-     * @return RendererInterface
      */
     public function getRenderer(string $alias): RendererInterface
     {
@@ -88,12 +84,9 @@ public function getRenderer(string $alias): RendererInterface
     /**
      * Renders a navigation with the given renderer
      *
-     * @param Container $container
-     * @param string $rendererName
      * @param string $renderMethod     Optional render method to use (e.g. menu -> renderMenu)
      * @param array<int, mixed> $rendererArguments      Option arguments to pass to the render method after the container
      *
-     * @return string
      */
     public function render(
         Container $container,
@@ -115,10 +108,7 @@ public function render(
     /**
      * Magic overload is an alias to getRenderer()
      *
-     * @param string $method
-     * @param array $arguments
      *
-     * @return RendererInterface
      */
     public function __call(string $method, array $arguments = []): RendererInterface
     {
diff --git a/lib/Twig/Extension/Templating/PimcoreUrl.php b/lib/Twig/Extension/Templating/PimcoreUrl.php
index 61dbc5a61c4..140ec7f4886 100644
--- a/lib/Twig/Extension/Templating/PimcoreUrl.php
+++ b/lib/Twig/Extension/Templating/PimcoreUrl.php
@@ -36,15 +36,6 @@ public function __construct(UrlGeneratorInterface $generator, RequestHelper $req
         $this->requestHelper = $requestHelper;
     }
 
-    /**
-     * @param array $urlOptions
-     * @param string|null $name
-     * @param bool $reset
-     * @param bool $encode
-     * @param bool $relative
-     *
-     * @return string
-     */
     public function __invoke(array $urlOptions = [], string $name = null, bool $reset = false, bool $encode = true, bool $relative = false): string
     {
         // merge all parameters from request to parameters
@@ -58,12 +49,7 @@ public function __invoke(array $urlOptions = [], string $name = null, bool $rese
     /**
      * Generate URL with support to only pass parameters ZF1 style (defaults to current route).
      *
-     * @param array|string|null $name
-     * @param array|null $parameters
-     * @param int $referenceType
-     * @param bool $encode
      *
-     * @return string
      */
     protected function generateUrl(array|string $name = null, ?array $parameters = [], int $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH, bool $encode = true): string
     {
@@ -125,7 +111,6 @@ protected function generateUrl(array|string $name = null, ?array $parameters = [
     /**
      * Tries to get the current route name from current or main request
      *
-     * @return string|null
      */
     protected function getCurrentRoute(): ?string
     {
diff --git a/lib/Twig/Extension/Templating/Placeholder.php b/lib/Twig/Extension/Templating/Placeholder.php
index 9a5fc515bd4..d54bb6999e6 100644
--- a/lib/Twig/Extension/Templating/Placeholder.php
+++ b/lib/Twig/Extension/Templating/Placeholder.php
@@ -54,7 +54,6 @@ class Placeholder extends AbstractExtension
     /**
      * Registry key under which container registers itself
      *
-     * @var string
      */
     protected string $_regKey = 'Placeholder';
 
@@ -66,9 +65,7 @@ class Placeholder extends AbstractExtension
     /**
      * Retrieve object instance; optionally add meta tag
      *
-     * @param string|null $containerName
      *
-     * @return Container
      */
     public function __invoke(string $containerName = null): Container
     {
diff --git a/lib/Twig/Extension/Templating/Placeholder/AbstractExtension.php b/lib/Twig/Extension/Templating/Placeholder/AbstractExtension.php
index 969582cfb77..1b5a97bbd14 100644
--- a/lib/Twig/Extension/Templating/Placeholder/AbstractExtension.php
+++ b/lib/Twig/Extension/Templating/Placeholder/AbstractExtension.php
@@ -70,7 +70,6 @@ abstract class AbstractExtension implements \IteratorAggregate, \Countable, \Arr
     /**
      * Registry key under which container registers itself
      *
-     * @var string
      */
     protected string $_regKey;
 
@@ -78,7 +77,6 @@ abstract class AbstractExtension implements \IteratorAggregate, \Countable, \Arr
      * Flag whether to automatically escape output, must also be
      * enforced in the child class if __toString/toString is overwritten
      *
-     * @var bool
      */
     protected bool $_autoEscape = true;
 
@@ -114,9 +112,7 @@ public function getAutoEscape(): bool
     /**
      * Escape a string
      *
-     * @param string $string
      *
-     * @return string
      */
     protected function _escape(string $string): string
     {
@@ -126,7 +122,6 @@ protected function _escape(string $string): string
     /**
      * Set container on which to operate
      *
-     * @param  Container $container
      *
      * @return $this
      */
@@ -140,7 +135,6 @@ public function setContainer(Container $container): static
     /**
      * Retrieve placeholder container
      *
-     * @return Container
      */
     public function getContainer(): Container
     {
@@ -159,7 +153,6 @@ public function __set(string $key, mixed $value): void
     /**
      * Overloading: retrieve property
      *
-     * @param string $key
      *
      * @return mixed
      */
@@ -176,7 +169,6 @@ public function __get(string $key)
     /**
      * Overloading: check if property is set
      *
-     * @param string $key
      *
      * @return bool
      */
@@ -190,7 +182,6 @@ public function __isset(string $key)
     /**
      * Overloading: unset property
      *
-     * @param string $key
      *
      * @return void
      */
@@ -226,7 +217,6 @@ public function __call(string $method, array $args): mixed
     /**
      * String representation
      *
-     * @return string
      */
     public function toString(): string
     {
@@ -244,7 +234,6 @@ public function __toString(): string
     /**
      * Countable
      *
-     * @return int
      */
     public function count(): int
     {
@@ -258,7 +247,6 @@ public function count(): int
      *
      * @param  string|int $offset
      *
-     * @return bool
      */
     public function offsetExists($offset): bool
     {
@@ -270,7 +258,6 @@ public function offsetExists($offset): bool
      *
      * @param  string|int $offset
      *
-     * @return mixed
      */
     public function offsetGet($offset): mixed
     {
@@ -281,9 +268,7 @@ public function offsetGet($offset): mixed
      * ArrayAccess: offsetSet
      *
      * @param  string|int $offset
-     * @param  mixed $value
      *
-     * @return void
      */
     public function offsetSet($offset, mixed $value): void
     {
@@ -295,7 +280,6 @@ public function offsetSet($offset, mixed $value): void
      *
      * @param  string|int $offset
      *
-     * @return void
      */
     public function offsetUnset($offset): void
     {
@@ -305,7 +289,6 @@ public function offsetUnset($offset): void
     /**
      * IteratorAggregate: get Iterator
      *
-     * @return \Traversable
      */
     public function getIterator(): \Traversable
     {
diff --git a/lib/Twig/Extension/Templating/Placeholder/Container.php b/lib/Twig/Extension/Templating/Placeholder/Container.php
index 867215a6dd3..b7fbe8711d4 100644
--- a/lib/Twig/Extension/Templating/Placeholder/Container.php
+++ b/lib/Twig/Extension/Templating/Placeholder/Container.php
@@ -65,58 +65,49 @@ class Container extends \ArrayObject
     /**
      * What text to prefix the placeholder with when rendering
      *
-     * @var string
      */
     protected string $_prefix = '';
 
     /**
      * What text to append the placeholder with when rendering
      *
-     * @var string
      */
     protected string $_postfix = '';
 
     /**
      * What string to use between individual items in the placeholder when rendering
      *
-     * @var string
      */
     protected string $_separator = '';
 
     /**
      * What string to use as the indentation of output, this will typically be spaces. Eg: '    '
      *
-     * @var string
      */
     protected string $_indent = '';
 
     /**
      * Whether or not we're already capturing for this given container
      *
-     * @var bool
      */
     protected bool $_captureLock = false;
 
     /**
      * What type of capture (overwrite (set), append, prepend) to use
      *
-     * @var string
      */
     protected string $_captureType;
 
     /**
      * Key to which to capture content
      *
-     * @var string|null
      */
     protected ?string $_captureKey = null;
 
     /**
      * Set a single value
      *
-     * @param  mixed $value
      *
-     * @return void
      */
     public function set(mixed $value): void
     {
@@ -126,9 +117,7 @@ public function set(mixed $value): void
     /**
      * Prepend a value to the top of the container
      *
-     * @param  mixed $value
      *
-     * @return void
      */
     public function prepend(mixed $value): void
     {
@@ -143,7 +132,6 @@ public function prepend(mixed $value): void
      * If single element registered, returns that element; otherwise,
      * serializes to array.
      *
-     * @return mixed
      */
     public function getValue(): mixed
     {
@@ -160,7 +148,6 @@ public function getValue(): mixed
     /**
      * Set prefix for __toString() serialization
      *
-     * @param string $prefix
      *
      * @return $this
      */
@@ -174,7 +161,6 @@ public function setPrefix(string $prefix): static
     /**
      * Retrieve prefix
      *
-     * @return string
      */
     public function getPrefix(): string
     {
@@ -184,7 +170,6 @@ public function getPrefix(): string
     /**
      * Set postfix for __toString() serialization
      *
-     * @param string $postfix
      *
      * @return $this
      */
@@ -198,7 +183,6 @@ public function setPostfix(string $postfix): static
     /**
      * Retrieve postfix
      *
-     * @return string
      */
     public function getPostfix(): string
     {
@@ -210,7 +194,6 @@ public function getPostfix(): string
      *
      * Used to implode elements in container
      *
-     * @param string $separator
      *
      * @return $this
      */
@@ -224,7 +207,6 @@ public function setSeparator(string $separator): static
     /**
      * Retrieve separator
      *
-     * @return string
      */
     public function getSeparator(): string
     {
@@ -235,7 +217,6 @@ public function getSeparator(): string
      * Set the indentation string for __toString() serialization,
      * optionally, if a number is passed, it will be the number of spaces
      *
-     * @param int|string $indent
      *
      * @return $this
      */
@@ -249,7 +230,6 @@ public function setIndent(int|string $indent): static
     /**
      * Retrieve indentation
      *
-     * @return string
      */
     public function getIndent(): string
     {
@@ -259,9 +239,7 @@ public function getIndent(): string
     /**
      * Retrieve whitespace representation of $indent
      *
-     * @param int|string $indent
      *
-     * @return string
      */
     public function getWhitespace(int|string $indent): string
     {
@@ -278,8 +256,6 @@ public function getWhitespace(int|string $indent): string
      * @param int|string $type How to capture content into placeholder; append, prepend, or set
      * @param mixed $key
      *
-     * @return void
-     *
      * @throws Exception
      */
     public function captureStart(int|string $type = self::APPEND, mixed $key = null): void
@@ -299,7 +275,6 @@ public function captureStart(int|string $type = self::APPEND, mixed $key = null)
     /**
      * End content capture
      *
-     * @return void
      */
     public function captureEnd(): void
     {
@@ -348,7 +323,6 @@ public function captureEnd(): void
     /**
      * Get keys
      *
-     * @return array
      */
     public function getKeys(): array
     {
@@ -362,7 +336,6 @@ public function getKeys(): array
      *
      * as defined by the PHP manual
      *
-     * @return int
      */
     public function nextIndex(): int
     {
@@ -377,9 +350,7 @@ public function nextIndex(): int
     /**
      * Render the placeholder
      *
-     * @param int|string|null $indent
      *
-     * @return string
      */
     public function toString(int|string $indent = null): string
     {
diff --git a/lib/Twig/Extension/Templating/Placeholder/ContainerService.php b/lib/Twig/Extension/Templating/Placeholder/ContainerService.php
index a02518a387a..a189f7b4b16 100644
--- a/lib/Twig/Extension/Templating/Placeholder/ContainerService.php
+++ b/lib/Twig/Extension/Templating/Placeholder/ContainerService.php
@@ -50,7 +50,6 @@ class ContainerService
     /**
      * Placeholder containers
      *
-     * @var array
      */
     protected array $_items = [];
 
@@ -86,10 +85,7 @@ public function popIndex(): void
     /**
      * createContainer
      *
-     * @param string $key
-     * @param  array $value
      *
-     * @return Container
      */
     public function createContainer(string $key, array $value = []): Container
     {
@@ -99,9 +95,7 @@ public function createContainer(string $key, array $value = []): Container
     /**
      * Retrieve a placeholder container
      *
-     * @param string $key
      *
-     * @return Container
      */
     public function getContainer(string $key): Container
     {
@@ -111,9 +105,7 @@ public function getContainer(string $key): Container
     /**
      * Does a particular container exist?
      *
-     * @param string $key
      *
-     * @return bool
      */
     public function containerExists(string $key): bool
     {
@@ -123,8 +115,6 @@ public function containerExists(string $key): bool
     /**
      * Set the container for an item in the registry
      *
-     * @param string $key
-     * @param  Container $container
      *
      * @return $this
      */
@@ -138,9 +128,7 @@ public function setContainer(string $key, Container $container): static
     /**
      * Delete a container
      *
-     * @param string $key
      *
-     * @return bool
      */
     public function deleteContainer(string $key): bool
     {
diff --git a/lib/Twig/Extension/Templating/Traits/TextUtilsTrait.php b/lib/Twig/Extension/Templating/Traits/TextUtilsTrait.php
index 455ddccea1e..20bd05f6a18 100644
--- a/lib/Twig/Extension/Templating/Traits/TextUtilsTrait.php
+++ b/lib/Twig/Extension/Templating/Traits/TextUtilsTrait.php
@@ -23,13 +23,6 @@
  */
 trait TextUtilsTrait
 {
-    /**
-     * @param string $string
-     * @param int|null $length
-     * @param string $suffix
-     *
-     * @return string
-     */
     public function normalizeString(string $string, int $length = null, string $suffix = ''): string
     {
         $string = strip_tags($string);
diff --git a/lib/Twig/Extension/Templating/Traits/WebLinksTrait.php b/lib/Twig/Extension/Templating/Traits/WebLinksTrait.php
index c8502a42ce6..e90d71f7012 100644
--- a/lib/Twig/Extension/Templating/Traits/WebLinksTrait.php
+++ b/lib/Twig/Extension/Templating/Traits/WebLinksTrait.php
@@ -30,7 +30,6 @@ trait WebLinksTrait
      * Whether to use WebLinks (HTTP/2 push) for every item. Can be
      * overridden on an item level.
      *
-     * @var bool
      */
     protected bool $webLinksEnabled = false;
 
diff --git a/lib/Twig/Extension/WebsiteConfigExtension.php b/lib/Twig/Extension/WebsiteConfigExtension.php
index 63c15db8110..1446efc244e 100644
--- a/lib/Twig/Extension/WebsiteConfigExtension.php
+++ b/lib/Twig/Extension/WebsiteConfigExtension.php
@@ -38,9 +38,7 @@ public function getFunctions(): array
      *
      * @param string|null $key  Config key to directly load. If null, the whole config will be returned
      * @param mixed $default    Default value to use if the key is not set
-     * @param string|null $language
      *
-     * @return mixed
      */
     public function getWebsiteConfig(string $key = null, mixed $default = null, string $language = null): mixed
     {
diff --git a/lib/Video.php b/lib/Video.php
index 1def64f71e1..5986653305c 100644
--- a/lib/Video.php
+++ b/lib/Video.php
@@ -22,9 +22,7 @@
 class Video
 {
     /**
-     * @param string|null $adapter
      *
-     * @return Video\Adapter|null
      *
      * @throws \Exception
      */
diff --git a/lib/Video/Adapter.php b/lib/Video/Adapter.php
index 76ab06f0cdd..c6e7a1be180 100644
--- a/lib/Video/Adapter.php
+++ b/lib/Video/Adapter.php
@@ -36,7 +36,6 @@ abstract class Adapter
     /**
      * length in seconds
      *
-     * @var int
      */
     public int $length;
 
diff --git a/lib/Video/Adapter/Ffmpeg.php b/lib/Video/Adapter/Ffmpeg.php
index f867129e708..af4079e7764 100644
--- a/lib/Video/Adapter/Ffmpeg.php
+++ b/lib/Video/Adapter/Ffmpeg.php
@@ -52,7 +52,6 @@ public function isAvailable(): bool
     }
 
     /**
-     * @return string|bool
      *
      * @throws \Exception
      */
@@ -70,7 +69,6 @@ public function load(string $file, array $options = []): static
     }
 
     /**
-     * @return bool
      *
      * @throws \Exception
      */
@@ -223,7 +221,6 @@ public function saveImage(string $file, int $timeOffset = null): void
     }
 
     /**
-     * @return string
      *
      * @throws \Exception
      */
diff --git a/lib/Workflow/Dumper/GraphvizDumper.php b/lib/Workflow/Dumper/GraphvizDumper.php
index a27ca7691fa..3e3cef06eab 100644
--- a/lib/Workflow/Dumper/GraphvizDumper.php
+++ b/lib/Workflow/Dumper/GraphvizDumper.php
@@ -51,8 +51,6 @@ public function __construct(Manager $workflowManager)
     }
 
     /**
-     * {@inheritdoc}
-     *
      * Dumps the workflow as a graphviz graph.
      *
      * Available options:
diff --git a/lib/Workflow/Dumper/StateMachineGraphvizDumper.php b/lib/Workflow/Dumper/StateMachineGraphvizDumper.php
index 19eb4be5904..6a68509bd89 100644
--- a/lib/Workflow/Dumper/StateMachineGraphvizDumper.php
+++ b/lib/Workflow/Dumper/StateMachineGraphvizDumper.php
@@ -26,8 +26,6 @@
 class StateMachineGraphvizDumper extends GraphvizDumper
 {
     /**
-     * {@inheritdoc}
-     *
      * Dumps the workflow as a graphviz graph.
      *
      * Available options:
diff --git a/lib/Workflow/EventSubscriber/NotesSubscriber.php b/lib/Workflow/EventSubscriber/NotesSubscriber.php
index 6d4549a5268..8a03c6621d6 100644
--- a/lib/Workflow/EventSubscriber/NotesSubscriber.php
+++ b/lib/Workflow/EventSubscriber/NotesSubscriber.php
@@ -47,7 +47,6 @@ public function __construct(TranslatorInterface $translator)
     }
 
     /**
-     * @param Event $event
      *
      * @throws ValidationException
      */
@@ -80,7 +79,6 @@ public function onWorkflowCompleted(Event $event): void
     }
 
     /**
-     * @param GlobalActionEvent $event
      *
      * @throws ValidationException
      */
diff --git a/lib/Workflow/GlobalAction.php b/lib/Workflow/GlobalAction.php
index c3095242132..3703ce802c5 100644
--- a/lib/Workflow/GlobalAction.php
+++ b/lib/Workflow/GlobalAction.php
@@ -36,14 +36,6 @@ class GlobalAction implements NotesAwareInterface
 
     private string $workflowName;
 
-    /**
-     * @param string $name
-     * @param array $options
-     * @param ExpressionService $expressionService
-     * @param string $workflowName
-     * @param CustomHtmlServiceInterface|null $customHtmlService
-     *
-     */
     public function __construct(string $name, array $options, ExpressionService $expressionService, string $workflowName, CustomHtmlServiceInterface $customHtmlService = null)
     {
         $this->name = $name;
diff --git a/lib/Workflow/Manager.php b/lib/Workflow/Manager.php
index c6c67625eaa..30e4c5ec095 100644
--- a/lib/Workflow/Manager.php
+++ b/lib/Workflow/Manager.php
@@ -81,10 +81,6 @@ public function addPlaceConfig(string $workflowName, string $place, array $place
     }
 
     /**
-     * @param string $workflowName
-     * @param string $action
-     * @param array $actionConfig
-     * @param CustomHtmlServiceInterface|null $customHtmlService
      *
      * @return $this
      */
@@ -117,8 +113,6 @@ public function getPlaceConfig(string $workflowName, string $place): ?PlaceConfi
     /**
      * Returns all PlaceConfigs (for given marking) ordered by it's appearence in the workflow config file
      *
-     * @param Workflow $workflow
-     * @param Marking|null $marking
      *
      * @return PlaceConfig[];
      */
@@ -175,7 +169,6 @@ public function getWorkflowConfig(string $workflowName): WorkflowConfig
     }
 
     /**
-     * @param object $subject
      *
      * @return Workflow[]
      */
@@ -216,13 +209,7 @@ public function getWorkflowByName(string $workflowName): ?object
     }
 
     /**
-     * @param Workflow $workflow
-     * @param Asset|Concrete|PageSnippet $subject
-     * @param string $transition
-     * @param array $additionalData
-     * @param bool $saveSubject
      *
-     * @return Marking
      *
      * @throws ValidationException
      * @throws \Exception
@@ -250,13 +237,7 @@ public function applyWithAdditionalData(Workflow $workflow, Asset|PageSnippet|Co
     }
 
     /**
-     * @param Workflow $workflow
-     * @param object $subject
-     * @param string $globalAction
-     * @param array $additionalData
-     * @param bool $saveSubject
      *
-     * @return Marking
      *
      * @throws \Exception
      */
@@ -297,10 +278,7 @@ public function applyGlobalAction(Workflow $workflow, object $subject, string $g
     }
 
     /**
-     * @param string $workflowName
-     * @param string $transitionName
      *
-     * @return null|\Symfony\Component\Workflow\Transition
      *
      * @throws \Exception
      */
@@ -324,8 +302,6 @@ public function getTransitionByName(string $workflowName, string $transitionName
      * As of Symfony 4.4.8 built-in implementations of @see \Symfony\Component\Workflow\MarkingStore\MarkingStoreInterface
      * use strict `null` comparison when retrieving the current marking and throw an exception otherwise.
      *
-     * @param string $workflowName
-     * @param object $subject
      *
      * @return bool true if initial state was applied
      *
diff --git a/lib/Workflow/MarkingStore/DataObjectMultipleStateMarkingStore.php b/lib/Workflow/MarkingStore/DataObjectMultipleStateMarkingStore.php
index 9fe14e84b73..dcaba0941dc 100644
--- a/lib/Workflow/MarkingStore/DataObjectMultipleStateMarkingStore.php
+++ b/lib/Workflow/MarkingStore/DataObjectMultipleStateMarkingStore.php
@@ -29,10 +29,6 @@ class DataObjectMultipleStateMarkingStore implements MarkingStoreInterface
 
     private \Symfony\Component\PropertyAccess\PropertyAccessor|PropertyAccessorInterface $propertyAccessor;
 
-    /**
-     * @param string $property
-     * @param PropertyAccessorInterface|null $propertyAccessor
-     */
     public function __construct(string $property = 'marking', PropertyAccessorInterface $propertyAccessor = null)
     {
         $this->property = $property;
diff --git a/lib/Workflow/MarkingStore/DataObjectSplittedStateMarkingStore.php b/lib/Workflow/MarkingStore/DataObjectSplittedStateMarkingStore.php
index 334c09f3758..c248142962f 100644
--- a/lib/Workflow/MarkingStore/DataObjectSplittedStateMarkingStore.php
+++ b/lib/Workflow/MarkingStore/DataObjectSplittedStateMarkingStore.php
@@ -95,7 +95,6 @@ public function setMarking(object $subject, Marking $marking, array $context = [
     }
 
     /**
-     * @param string $fieldName
      *
      * @return string[]
      */
diff --git a/lib/Workflow/Notes/CustomHtmlServiceInterface.php b/lib/Workflow/Notes/CustomHtmlServiceInterface.php
index 89aff8adbf1..caee98ccaf9 100644
--- a/lib/Workflow/Notes/CustomHtmlServiceInterface.php
+++ b/lib/Workflow/Notes/CustomHtmlServiceInterface.php
@@ -24,7 +24,6 @@ interface CustomHtmlServiceInterface
      * Render custom HTML for the default position, which is typically controlled by the workflow configuration file.
      * Implement this method to render custom HTML for the default position (=most common case)
      *
-     * @param ElementInterface $element
      *
      * @return string the custom HTML markup as a string.
      */
@@ -35,7 +34,6 @@ public function renderHtml(ElementInterface $element): string;
      * Implement this method if you need full control of the rendering process, and you want to show HTML
      * on multiple positions for an element.
      *
-     * @param ElementInterface $element
      * @param string $requestedPosition the requested position for which content should be rendered.
      *
      * @return string the HTML markup or an empty string, if for the requested position nothing should be rendered.
diff --git a/lib/Workflow/Notes/NotesAwareTrait.php b/lib/Workflow/Notes/NotesAwareTrait.php
index 7e0ce546686..5c2511f604b 100644
--- a/lib/Workflow/Notes/NotesAwareTrait.php
+++ b/lib/Workflow/Notes/NotesAwareTrait.php
@@ -67,7 +67,6 @@ public function getNotesAdditionalFields(): array
     /**
      * Inject service via compiler pass.
      *
-     * @param CustomHtmlServiceInterface $customHtmlService
      */
     public function setCustomHtmlService(CustomHtmlServiceInterface $customHtmlService): void
     {
diff --git a/lib/Workflow/Notification/AbstractNotificationService.php b/lib/Workflow/Notification/AbstractNotificationService.php
index 42eca04e319..5cd93d0643c 100644
--- a/lib/Workflow/Notification/AbstractNotificationService.php
+++ b/lib/Workflow/Notification/AbstractNotificationService.php
@@ -43,9 +43,6 @@ protected function getNoteInfo(int $id): string
     /**
      * Returns a list of distinct users given an user- and role array containing their respective names
      *
-     * @param array $users
-     * @param array $roles
-     * @param bool $includeAllUsers
      *
      * @return User[][]
      */
diff --git a/lib/Workflow/Notification/NotificationEmailService.php b/lib/Workflow/Notification/NotificationEmailService.php
index 61f899772ae..1ce2ffc437e 100644
--- a/lib/Workflow/Notification/NotificationEmailService.php
+++ b/lib/Workflow/Notification/NotificationEmailService.php
@@ -47,14 +47,6 @@ public function __construct(EngineInterface $template, RouterInterface $router,
     /**
      * Sends an Mail
      *
-     * @param array $users
-     * @param array $roles
-     * @param Workflow $workflow
-     * @param string $subjectType
-     * @param ElementInterface $subject
-     * @param string $action
-     * @param string $mailType
-     * @param string $mailPath
      */
     public function sendWorkflowEmailNotification(array $users, array $roles, Workflow $workflow, string $subjectType, ElementInterface $subject, string $action, string $mailType, string $mailPath): void
     {
@@ -123,13 +115,6 @@ public function sendWorkflowEmailNotification(array $users, array $roles, Workfl
 
     /**
      * @param User[] $recipients
-     * @param string $subjectType
-     * @param ElementInterface $subject
-     * @param Workflow $workflow
-     * @param string $action
-     * @param string $language
-     * @param string $mailPath
-     * @param string $deeplink
      */
     protected function sendPimcoreDocumentMail(array $recipients, string $subjectType, ElementInterface $subject, Workflow $workflow, string $action, string $language, string $mailPath, string $deeplink): void
     {
@@ -144,13 +129,6 @@ protected function sendPimcoreDocumentMail(array $recipients, string $subjectTyp
 
     /**
      * @param User[] $recipients
-     * @param string $subjectType
-     * @param ElementInterface $subject
-     * @param Workflow $workflow
-     * @param string $action
-     * @param string $language
-     * @param string $mailPath
-     * @param string $deeplink
      */
     protected function sendTemplateMail(array $recipients, string $subjectType, ElementInterface $subject, Workflow $workflow, string $action, string $language, string $mailPath, string $deeplink): void
     {
diff --git a/lib/Workflow/Notification/PimcoreNotificationService.php b/lib/Workflow/Notification/PimcoreNotificationService.php
index 4e9f23f7355..a7a7093a989 100644
--- a/lib/Workflow/Notification/PimcoreNotificationService.php
+++ b/lib/Workflow/Notification/PimcoreNotificationService.php
@@ -30,8 +30,6 @@ class PimcoreNotificationService extends AbstractNotificationService
     /**
      * PimcoreNotificationService constructor.
      *
-     * @param NotificationService $notificationService
-     * @param TranslatorInterface $translator
      */
     public function __construct(NotificationService $notificationService, TranslatorInterface $translator)
     {
diff --git a/lib/Workflow/Place/OptionsProvider.php b/lib/Workflow/Place/OptionsProvider.php
index 4b7888cde1b..bbfe2b591d4 100644
--- a/lib/Workflow/Place/OptionsProvider.php
+++ b/lib/Workflow/Place/OptionsProvider.php
@@ -38,10 +38,7 @@ public function __construct(Manager $workflowManager, TranslatorInterface $trans
     }
 
     /**
-     * @param array $context
-     * @param Data $fieldDefinition
      *
-     * @return array
      *
      * @throws \Exception
      */
diff --git a/lib/Workflow/Place/StatusInfo.php b/lib/Workflow/Place/StatusInfo.php
index 3fad45783e5..49af33b1db6 100644
--- a/lib/Workflow/Place/StatusInfo.php
+++ b/lib/Workflow/Place/StatusInfo.php
@@ -48,9 +48,6 @@ public function getToolbarHtml(object $subject): string
         );
     }
 
-    /**
-     * @param string|null $workflowName
-     */
     public function getAllPalacesHtml(object $subject, string $workflowName = null): string
     {
         $places = $this->getAllPlaces($subject, false, $workflowName);
diff --git a/lib/Workflow/Service.php b/lib/Workflow/Service.php
index af8e4c23efb..df1856c50d5 100644
--- a/lib/Workflow/Service.php
+++ b/lib/Workflow/Service.php
@@ -26,7 +26,6 @@ class Service
      * @param array $fc - The field configuration from the Workflow
      * @param mixed $value - The value
      *
-     * @return array
      */
     public static function createNoteData(array $fc, mixed $value): array
     {
@@ -92,12 +91,6 @@ public static function getDataFromEditmode(mixed $data, string $pimcoreTagName):
     /**
      * Creates a note for an action with a transition
      *
-     * @param Element\ElementInterface $element
-     * @param string $type
-     * @param string $title
-     * @param string $description
-     * @param array $noteData
-     * @param User|null $user
      *
      * @return Element\Note $note
      */
diff --git a/lib/Workflow/SupportStrategy/ExpressionSupportStrategy.php b/lib/Workflow/SupportStrategy/ExpressionSupportStrategy.php
index a7d52029430..c7c17cffe61 100644
--- a/lib/Workflow/SupportStrategy/ExpressionSupportStrategy.php
+++ b/lib/Workflow/SupportStrategy/ExpressionSupportStrategy.php
@@ -37,9 +37,7 @@ class ExpressionSupportStrategy implements WorkflowSupportStrategyInterface
     /**
      * ExpressionSupportStrategy constructor.
      *
-     * @param ExpressionService $expressionService
      * @param string|string[] $className a FQCN
-     * @param string $expression
      */
     public function __construct(ExpressionService $expressionService, array|string $className, string $expression)
     {
diff --git a/lib/Workflow/Transition.php b/lib/Workflow/Transition.php
index 382927d0d6f..3adc3a5c64b 100644
--- a/lib/Workflow/Transition.php
+++ b/lib/Workflow/Transition.php
@@ -40,10 +40,8 @@ class Transition extends \Symfony\Component\Workflow\Transition implements Notes
     /**
      * Transition constructor.
      *
-     * @param string $name
      * @param string|string[] $froms
      * @param string|string[] $tos
-     * @param array $options
      */
     public function __construct(string $name, $froms, $tos, array $options = [])
     {
diff --git a/lib/helper-functions.php b/lib/helper-functions.php
index 4f3cb40b9cb..5320a38dad0 100644
--- a/lib/helper-functions.php
+++ b/lib/helper-functions.php
@@ -90,10 +90,8 @@ function foldersize(string $path): int
 }
 
 /**
- * @param string $string
  * @param string[] $values
  *
- * @return string
  */
 function replace_pcre_backreferences(string $string, array $values): string
 {
@@ -135,8 +133,6 @@ function in_arrayi(string $needle, array $haystack): bool
 }
 
 /**
- * @param string $needle
- * @param array $haystack
  *
  * @return false|int|string the key for needle if it is found in the array, false otherwise.
  */
@@ -176,7 +172,6 @@ function array_toquerystring(array $args): string
 /**
  * @param array $array with attribute names as keys, and values as values
  *
- * @return string
  */
 function array_to_html_attribute_string(array $array): string
 {
@@ -296,10 +291,6 @@ function rscandir(string $base = '', array &$data = []): array
 /**
  * Wrapper for explode() to get a trimmed array
  *
- * @param string $delimiter
- * @param string $string
- * @param int $limit
- * @param bool $useArrayFilter
  *
  * @return string[]
  *
@@ -388,9 +379,7 @@ function wrapArrayElements(array $array, string $prefix = "'", string $suffix =
 /**
  * Checks if an array is associative
  *
- * @param array $arr
  *
- * @return bool
  */
 function isAssocArray(array $arr): bool
 {
@@ -400,9 +389,7 @@ function isAssocArray(array $arr): bool
 /**
  * this is an alternative for realpath() which isn't able to handle symlinks correctly
  *
- * @param string $filename
  *
- * @return string
  */
 function resolvePath(string $filename): string
 {
@@ -454,9 +441,7 @@ function closureHash(Closure $closure): string
 /**
  * Checks if the given directory is empty
  *
- * @param string $dir
  *
- * @return bool|null
  */
 function is_dir_empty(string $dir): ?bool
 {
diff --git a/models/Asset.php b/models/Asset.php
index 558f7180b62..65b7a9fcfb9 100644
--- a/models/Asset.php
+++ b/models/Asset.php
@@ -70,21 +70,18 @@ class Asset extends Element\AbstractElement
     /**
      * @internal
      *
-     * @var string
      */
     protected string $type = '';
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $filename = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $mimetype = null;
 
@@ -98,14 +95,12 @@ class Asset extends Element\AbstractElement
     /**
      * @internal
      *
-     * @var array|null
      */
     protected ?array $versions = null;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $metadata = [];
 
@@ -115,34 +110,27 @@ class Asset extends Element\AbstractElement
      *
      * @internal
      *
-     * @var array
      */
     protected array $customSettings = [];
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $hasMetaData = false;
 
     /**
      * @internal
      *
-     * @var Listing|null
      */
     protected ?Listing $siblings = null;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $dataChanged = false;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getBlockedVars(): array
     {
         $blockedVars = ['scheduledTasks', 'versions', 'parent', 'stream'];
@@ -168,10 +156,7 @@ public static function getTypes(): array
     /**
      * Static helper to get an asset by the passed path
      *
-     * @param string $path
-     * @param array $params
      *
-     * @return static|null
      */
     public static function getByPath(string $path, array $params = []): static|null
     {
@@ -194,9 +179,7 @@ public static function getByPath(string $path, array $params = []): static|null
     /**
      * @internal
      *
-     * @param Asset $asset
      *
-     * @return bool
      */
     protected static function typeMatch(Asset $asset): bool
     {
@@ -379,9 +362,7 @@ private static function checkMaxPixels(string $localPath, array $data): void
     }
 
     /**
-     * @param array $config
      *
-     * @return Listing
      *
      * @throws Exception
      */
@@ -401,10 +382,7 @@ public static function getList(array $config = []): Listing
     }
 
     /**
-     * @param string $mimeType
-     * @param string $filename
      *
-     * @return string
      *
      * @internal
      */
@@ -439,9 +417,6 @@ public static function getTypeFromMimeMapping(string $mimeType, string $filename
         return $type;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function save(array $parameters = []): static
     {
         $isUpdate = false;
@@ -778,12 +753,8 @@ protected function postPersistData(): void
     }
 
     /**
-     * @param bool $setModificationDate
-     * @param bool $saveOnlyVersion
      * @param string|null $versionNote version note
      *
-     * @return null|Version
-     *
      * @throws Exception
      */
     public function saveVersion(bool $setModificationDate = true, bool $saveOnlyVersion = true, string $versionNote = null): ?Version
@@ -853,7 +824,6 @@ public function getFullPath(): string
     /**
      * Returns the full path of the asset (listener aware)
      *
-     * @return string
      *
      * @internal
      */
@@ -1175,9 +1145,6 @@ public function setDataChanged(bool $changed = true): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getVersions(): array
     {
         if ($this->versions === null) {
@@ -1204,8 +1171,6 @@ public function setVersions(array $versions): static
      *
      * @param bool $keep whether to delete this file on shutdown or not
      *
-     * @return string
-     *
      * @throws Exception
      */
     public function getTemporaryFile(bool $keep = false): string
@@ -1216,8 +1181,6 @@ public function getTemporaryFile(bool $keep = false): string
     /**
      * @internal
      *
-     * @return string
-     *
      * @throws Exception
      */
     public function getLocalFile(): string
@@ -1337,10 +1300,8 @@ public function setHasMetaData(bool $hasMetaData): static
     }
 
     /**
-     * @param string $name
      * @param string $type can be "asset", "checkbox", "date", "document", "input", "object", "select" or "textarea"
      * @param mixed $data
-     * @param string|null $language
      *
      * @return $this
      */
@@ -1556,9 +1517,6 @@ public function __destruct()
         $this->closeStream();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function resolveDependencies(): array
     {
         $dependencies = [parent::resolveDependencies()];
diff --git a/models/Asset/Archive.php b/models/Asset/Archive.php
index 6a4baf6aca5..cf9fee78d01 100644
--- a/models/Asset/Archive.php
+++ b/models/Asset/Archive.php
@@ -23,8 +23,5 @@
  */
 class Archive extends Model\Asset
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'archive';
 }
diff --git a/models/Asset/Audio.php b/models/Asset/Audio.php
index 2654acf13ae..9f8e09a8037 100644
--- a/models/Asset/Audio.php
+++ b/models/Asset/Audio.php
@@ -23,8 +23,5 @@
  */
 class Audio extends Model\Asset
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'audio';
 }
diff --git a/models/Asset/Dao.php b/models/Asset/Dao.php
index 34c01cd0f9d..6008615e85f 100644
--- a/models/Asset/Dao.php
+++ b/models/Asset/Dao.php
@@ -41,7 +41,6 @@ class Dao extends Model\Element\Dao
     /**
      * Get the data for the object by id from database and assign it to the object (model)
      *
-     * @param int $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -85,7 +84,6 @@ public function getById(int $id): void
     /**
      * Get the data for the asset from database for the given path
      *
-     * @param string $path
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -196,9 +194,7 @@ public function updateWorkspaces(): void
     }
 
     /**
-     * @param string $oldPath
      *
-     * @return array
      *
      * @internal
      */
@@ -228,9 +224,7 @@ public function updateChildPaths(string $oldPath): array
     /**
      * Get the properties for the object from database and assign it
      *
-     * @param bool $onlyInherited
      *
-     * @return array
      */
     public function getProperties(bool $onlyInherited = false): array
     {
@@ -327,7 +321,6 @@ public function getVersionCountForUpdate(): int
      *
      * @param Model\User|null $user
      *
-     * @return bool
      */
     public function hasChildren(User $user = null): bool
     {
@@ -360,7 +353,6 @@ public function hasChildren(User $user = null): bool
     /**
      * Quick test if there are siblings
      *
-     * @return bool
      */
     public function hasSiblings(): bool
     {
@@ -388,7 +380,6 @@ public function hasSiblings(): bool
      *
      * @param Model\User|null $user
      *
-     * @return int
      */
     public function getChildAmount(User $user = null): int
     {
@@ -443,10 +434,7 @@ public function unlockPropagate(): array
     }
 
     /**
-     * @param string $type
-     * @param array $userIds
      *
-     * @return int
      *
      * @throws \Doctrine\DBAL\Exception
      */
@@ -502,8 +490,6 @@ public function isAllowed(string $type, User $user): bool
     }
 
     /**
-     * @param array $columns
-     * @param User $user
      *
      * @return array<string, int>
      *
diff --git a/models/Asset/Document.php b/models/Asset/Document.php
index 382eb328ae8..cfa80c60382 100644
--- a/models/Asset/Document.php
+++ b/models/Asset/Document.php
@@ -25,14 +25,8 @@
  */
 class Document extends Model\Asset
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'document';
 
-    /**
-     * {@inheritdoc}
-     */
     protected function update(array $params = []): void
     {
         if ($this->getDataChanged()) {
@@ -47,7 +41,6 @@ protected function update(array $params = []): void
     }
 
     /**
-     * @param string|null $path
      *
      * @internal
      */
@@ -75,7 +68,6 @@ public function processPageCount(string $path = null): void
     /**
      * returns null when page count wasn't processed yet (done asynchronously)
      *
-     * @return int|null
      */
     public function getPageCount(): ?int
     {
@@ -88,11 +80,8 @@ public function getPageCount(): ?int
     }
 
     /**
-     * @param string|array|Image\Thumbnail\Config $thumbnailName
-     * @param int $page
      * @param bool $deferred $deferred deferred means that the image will be generated on-the-fly (details see below)
      *
-     * @return Document\ImageThumbnail
      */
     public function getImageThumbnail(array|string|Image\Thumbnail\Config $thumbnailName, int $page = 1, bool $deferred = false): Document\ImageThumbnail
     {
@@ -110,11 +99,6 @@ public function getImageThumbnail(array|string|Image\Thumbnail\Config $thumbnail
         return new Document\ImageThumbnail($this, $thumbnailName, $page, $deferred);
     }
 
-    /**
-     * @param int|null $page
-     *
-     * @return string|null
-     */
     public function getText(int $page = null): ?string
     {
         if (\Pimcore\Document::isAvailable() && \Pimcore\Document::isFileTypeSupported($this->getFilename())) {
diff --git a/models/Asset/Document/ImageThumbnail.php b/models/Asset/Document/ImageThumbnail.php
index f3ad9d4c93d..b605ad9f307 100644
--- a/models/Asset/Document/ImageThumbnail.php
+++ b/models/Asset/Document/ImageThumbnail.php
@@ -39,16 +39,9 @@ final class ImageThumbnail
     /**
      * @internal
      *
-     * @var int
      */
     protected int $page = 1;
 
-    /**
-     * @param Model\Asset\Document|null $asset
-     * @param string|array|Image\Thumbnail\Config|null $config
-     * @param int $page
-     * @param bool $deferred
-     */
     public function __construct(?Model\Asset\Document $asset, array|string|Image\Thumbnail\Config $config = null, int $page = 1, bool $deferred = true)
     {
         $this->asset = $asset;
diff --git a/models/Asset/Folder.php b/models/Asset/Folder.php
index 6e6d40a35f8..9892a952a2d 100644
--- a/models/Asset/Folder.php
+++ b/models/Asset/Folder.php
@@ -28,9 +28,6 @@
  */
 class Folder extends Model\Asset
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'folder';
 
     /**
@@ -43,7 +40,6 @@ class Folder extends Model\Asset
     /**
      * set the children of the document
      *
-     * @param Listing|null $children
      *
      * @return $this
      */
@@ -82,8 +78,6 @@ public function hasChildren(): bool
     /**
      * @internal
      *
-     * @param bool $force
-     *
      * @return resource|null
      *
      * @throws \Doctrine\DBAL\Exception
diff --git a/models/Asset/Image.php b/models/Asset/Image.php
index b0ffa98c02c..9ebb7ba12c6 100644
--- a/models/Asset/Image.php
+++ b/models/Asset/Image.php
@@ -30,16 +30,10 @@ class Image extends Model\Asset
 {
     use Model\Asset\MetaData\EmbeddedMetaDataTrait;
 
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'image';
 
     private bool $clearThumbnailsOnSave = false;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function update(array $params = []): void
     {
         if ($this->getDataChanged()) {
@@ -62,9 +56,7 @@ private function isLowQualityPreviewEnabled(): bool
     }
 
     /**
-     * @param string|null $generator
      *
-     * @return bool|string
      *
      * @throws \Exception
      *
@@ -170,7 +162,6 @@ public function getLowQualityPreviewDataUri(): ?string
      *
      * @internal
      *
-     * @return Image\Thumbnail\Config|null
      */
     public function getThumbnailConfig(array|string|Image\Thumbnail\Config|null $config): ?Image\Thumbnail\Config
     {
@@ -192,7 +183,6 @@ public function getThumbnail(array|string|Image\Thumbnail\Config|null $config =
      *
      * @throws \Exception
      *
-     * @return null|\Pimcore\Image\Adapter
      */
     public static function getImageTransformInstance(): ?\Pimcore\Image\Adapter
     {
@@ -223,10 +213,7 @@ public function getFormat(): string
     }
 
     /**
-     * @param string|null $path
-     * @param bool $force
      *
-     * @return array|null
      *
      * @throws \Exception
      */
@@ -355,7 +342,6 @@ public function isVectorGraphic(): bool
     /**
      * Checks if this file represents an animated image (png or gif)
      *
-     * @return bool
      */
     public function isAnimated(): bool
     {
diff --git a/models/Asset/Image/Thumbnail.php b/models/Asset/Image/Thumbnail.php
index eeec8f59e51..0be9081ddc8 100644
--- a/models/Asset/Image/Thumbnail.php
+++ b/models/Asset/Image/Thumbnail.php
@@ -36,11 +36,6 @@ final class Thumbnail
      */
     protected static array $hasListenersCache = [];
 
-    /**
-     * @param Image $asset
-     * @param string|array|Thumbnail\Config|null $config
-     * @param bool $deferred
-     */
     public function __construct(Image $asset, array|string|Thumbnail\Config $config = null, bool $deferred = true)
     {
         $this->asset = $asset;
@@ -210,7 +205,6 @@ private function getSourceTagHtml(Image\Thumbnail\Config $thumbConfig, string $m
      *
      * @param array $options Custom configuration
      *
-     * @return string
      */
     public function getHtml(array $options = []): string
     {
@@ -370,10 +364,7 @@ public function getImageTag(array $options = [], array $removeAttributes = []):
     }
 
     /**
-     * @param string $name
-     * @param int $highRes
      *
-     * @return Thumbnail
      *
      * @throws \Exception
      */
diff --git a/models/Asset/Image/Thumbnail/Config.php b/models/Asset/Image/Thumbnail/Config.php
index 4756612585d..85dc69c9d66 100644
--- a/models/Asset/Image/Thumbnail/Config.php
+++ b/models/Asset/Image/Thumbnail/Config.php
@@ -51,119 +51,101 @@ final class Config extends Model\AbstractModel
      *
      * @internal
      *
-     * @var array
      */
     protected array $items = [];
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $medias = [];
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $name = '';
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $description = '';
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $group = '';
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $format = 'SOURCE';
 
     /**
      * @internal
      *
-     * @var int
      */
     protected int $quality = 85;
 
     /**
      * @internal
      *
-     * @var float|null
      */
     protected ?float $highResolution = null;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $preserveColor = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $preserveMetaData = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $rasterizeSVG = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $downloadable = false;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $modificationDate = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $creationDate = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $filenameSuffix = null;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $preserveAnimation = false;
 
     /**
-     * @param array|string|self $config
      *
-     * @return self|null
      *
      * @internal
      */
@@ -194,9 +176,7 @@ public static function getByAutoDetect(array|string|Config $config): ?Config
     }
 
     /**
-     * @param string $name
      *
-     * @return null|Config
      *
      * @throws \Exception
      */
@@ -258,7 +238,6 @@ public static function exists(string $name): bool
     /**
      * @internal
      *
-     * @return Config
      */
     public static function getPreviewConfig(): Config
     {
@@ -298,11 +277,7 @@ protected function createMediaIfNotExists(string $name): void
     /**
      * @internal
      *
-     * @param string $name
-     * @param array $parameters
-     * @param string|null $media
      *
-     * @return bool
      */
     public function addItem(string $name, array $parameters, ?string $media = null): bool
     {
@@ -325,12 +300,7 @@ public function addItem(string $name, array $parameters, ?string $media = null):
     /**
      * @internal
      *
-     * @param int $position
-     * @param string $name
-     * @param array $parameters
-     * @param string|null $media
      *
-     * @return bool
      */
     public function addItemAt(int $position, string $name, array $parameters, ?string $media = null): bool
     {
@@ -477,9 +447,7 @@ public function getFilenameSuffix(): ?string
     }
 
     /**
-     * @param array $config
      *
-     * @return self
      *
      * @internal
      */
@@ -510,9 +478,7 @@ public static function getByArrayConfig(array $config): Config
     /**
      * This is mainly here for backward compatibility
      *
-     * @param array $config
      *
-     * @return self
      *
      * @internal
      */
@@ -594,9 +560,7 @@ public static function getByLegacyConfig(array $config): Config
     }
 
     /**
-     * @param Model\Asset\Image $asset
      *
-     * @return array
      *
      * @internal
      */
@@ -804,7 +768,6 @@ public function __clone(): void
     /**
      * @internal
      *
-     * @return array
      */
     public static function getAutoFormats(): array
     {
diff --git a/models/Asset/Image/Thumbnail/Config/Dao.php b/models/Asset/Image/Thumbnail/Config/Dao.php
index c2a0f186b84..cbf1589bcce 100644
--- a/models/Asset/Image/Thumbnail/Config/Dao.php
+++ b/models/Asset/Image/Thumbnail/Config/Dao.php
@@ -41,7 +41,6 @@ public function configure(): void
     }
 
     /**
-     * @param string|null $id
      *
      * @throws \Exception
      */
@@ -110,9 +109,6 @@ public function save(bool $forceClearTempFiles = false): void
         $this->clearDatabaseCache();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataStructureForYaml(string $id, mixed $data): mixed
     {
         return [
diff --git a/models/Asset/Image/Thumbnail/Processor.php b/models/Asset/Image/Thumbnail/Processor.php
index c0c7c78b041..61d33debde7 100644
--- a/models/Asset/Image/Thumbnail/Processor.php
+++ b/models/Asset/Image/Thumbnail/Processor.php
@@ -80,13 +80,8 @@ private static function getAllowedFormat(string $format, array $allowed = [], st
     }
 
     /**
-     * @param Asset $asset
-     * @param Config $config
      * @param string|resource|null $fileSystemPath
      * @param bool $deferred deferred means that the image will be generated on-the-fly (details see below)
-     * @param bool $generated
-     *
-     * @return array
      *
      * @throws \Exception
      */
diff --git a/models/Asset/Listing.php b/models/Asset/Listing.php
index 44e6df784e3..eca23d441ec 100644
--- a/models/Asset/Listing.php
+++ b/models/Asset/Listing.php
@@ -49,8 +49,6 @@ public function setAssets(array $assets): static
     }
 
     /**
-     * @param int $offset
-     * @param int $itemCountPerPage
      *
      * @return Model\Asset[]
      */
@@ -64,10 +62,6 @@ public function getItems(int $offset, int $itemCountPerPage): array
 
     /**
      * @internal
-     *
-     * @param Model\User $user
-     * @param Model\Asset $asset
-
      *
      * @return $this
      */
diff --git a/models/Asset/Listing/Dao.php b/models/Asset/Listing/Dao.php
index 3bbbad633ae..44ecedb6a4d 100644
--- a/models/Asset/Listing/Dao.php
+++ b/models/Asset/Listing/Dao.php
@@ -31,7 +31,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Get the assets from database
      *
-     * @return array
      */
     public function load(): array
     {
@@ -56,7 +55,6 @@ public function load(): array
     /**
      * @param string|string[]|null $columns
      *
-     * @return DoctrineQueryBuilder
      */
     public function getQueryBuilder(...$columns): DoctrineQueryBuilder
     {
diff --git a/models/Asset/MetaData/ClassDefinition/Data/DataDefinitionInterface.php b/models/Asset/MetaData/ClassDefinition/Data/DataDefinitionInterface.php
index 59b0475807c..923962b8ad9 100644
--- a/models/Asset/MetaData/ClassDefinition/Data/DataDefinitionInterface.php
+++ b/models/Asset/MetaData/ClassDefinition/Data/DataDefinitionInterface.php
@@ -21,8 +21,6 @@ interface DataDefinitionInterface
     public function isEmpty(mixed $data, array $params = []): bool;
 
     /**
-     * @param mixed $data
-     * @param array $params
      *
      * @throws \Exception
      */
diff --git a/models/Asset/MetaData/EmbeddedMetaDataTrait.php b/models/Asset/MetaData/EmbeddedMetaDataTrait.php
index b11d3158206..0bf4b8d9b1d 100644
--- a/models/Asset/MetaData/EmbeddedMetaDataTrait.php
+++ b/models/Asset/MetaData/EmbeddedMetaDataTrait.php
@@ -22,10 +22,7 @@
 trait EmbeddedMetaDataTrait
 {
     /**
-     * @param bool $force
-     * @param bool $useExifTool
      *
-     * @return array
      *
      * @throws \Exception
      */
@@ -41,9 +38,6 @@ public function getEmbeddedMetaData(bool $force, bool $useExifTool = true): arra
     /**
      * @internal
      *
-     * @param bool $useExifTool
-     * @param string|null $filePath
-     *
      * @throws \Exception
      */
     public function handleEmbeddedMetaData(bool $useExifTool = true, ?string $filePath = null): void
@@ -54,10 +48,7 @@ public function handleEmbeddedMetaData(bool $useExifTool = true, ?string $filePa
     }
 
     /**
-     * @param bool $useExifTool
-     * @param string|null $filePath
      *
-     * @return array
      *
      * @throws \Exception
      */
@@ -134,9 +125,7 @@ public function getEXIFData(?string $filePath = null): array
     }
 
     /**
-     * @param string|null $filePath
      *
-     * @return array
      *
      * @throws \Exception
      */
diff --git a/models/Asset/Service.php b/models/Asset/Service.php
index 5b4c940b8f4..a765c755d1c 100644
--- a/models/Asset/Service.php
+++ b/models/Asset/Service.php
@@ -50,28 +50,21 @@ class Service extends Model\Element\Service
     /**
      * @internal
      *
-     * @var Model\User|null
      */
     protected ?Model\User $_user;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $_copyRecursiveIds;
 
-    /**
-     * @param Model\User|null $user
-     */
     public function __construct(Model\User $user = null)
     {
         $this->_user = $user;
     }
 
     /**
-     * @param Asset $target
-     * @param Asset $source
      *
      * @return Asset|Folder|null copied asset
      *
@@ -134,8 +127,6 @@ public function copyRecursive(Asset $target, Asset $source): Asset|Folder|null
     }
 
     /**
-     * @param Asset $target
-     * @param Asset $source
      *
      * @return Asset|Folder copied asset
      *
@@ -183,10 +174,7 @@ public function copyAsChild(Asset $target, Asset $source): Asset|Folder
     }
 
     /**
-     * @param Asset $target
-     * @param Asset $source
      *
-     * @return Asset
      *
      * @throws \Exception
      */
@@ -210,12 +198,7 @@ public function copyContents(Asset $target, Asset $source): Asset
     }
 
     /**
-     * @param Asset $asset
-     * @param array|null $fields
-     * @param string|null $requestedLanguage
-     * @param array $params
      *
-     * @return array
      *
      * @internal
      */
@@ -282,11 +265,7 @@ public static function gridAssetData(Asset $asset, array $fields = null, string
     }
 
     /**
-     * @param Asset $asset
-     * @param array $params
-     * @param bool $onlyMethod
      *
-     * @return string|null
      *
      * @internal
      */
@@ -320,10 +299,7 @@ public static function getPreviewThumbnail(Asset $asset, array $params = [], boo
     /**
      * @static
      *
-     * @param string $path
-     * @param string|null $type
      *
-     * @return bool
      */
     public static function pathExists(string $path, string $type = null): bool
     {
@@ -350,9 +326,7 @@ public static function pathExists(string $path, string $type = null): bool
     /**
      * @internal
      *
-     * @param Element\ElementInterface $element
      *
-     * @return Element\ElementInterface
      */
     public static function loadAllFields(Element\ElementInterface $element): Element\ElementInterface
     {
@@ -372,10 +346,7 @@ public static function loadAllFields(Element\ElementInterface $element): Element
      *  "asset" => array(...)
      * )
      *
-     * @param Asset $asset
-     * @param array $rewriteConfig
      *
-     * @return Asset
      *
      * @internal
      */
@@ -392,10 +363,7 @@ public static function rewriteIds(Asset $asset, array $rewriteConfig): Asset
     }
 
     /**
-     * @param array $metadata
-     * @param string $mode
      *
-     * @return array
      *
      * @internal
      */
@@ -430,9 +398,7 @@ public static function minimizeMetadata(array $metadata, string $mode): array
     }
 
     /**
-     * @param array $metadata
      *
-     * @return array
      *
      * @internal
      */
diff --git a/models/Asset/Text.php b/models/Asset/Text.php
index 20aa841350f..c60cdefba4b 100644
--- a/models/Asset/Text.php
+++ b/models/Asset/Text.php
@@ -23,8 +23,5 @@
  */
 class Text extends Model\Asset
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'text';
 }
diff --git a/models/Asset/Thumbnail/ImageThumbnailTrait.php b/models/Asset/Thumbnail/ImageThumbnailTrait.php
index f0b05ebb434..932ebc98269 100644
--- a/models/Asset/Thumbnail/ImageThumbnailTrait.php
+++ b/models/Asset/Thumbnail/ImageThumbnailTrait.php
@@ -31,63 +31,54 @@ trait ImageThumbnailTrait
     /**
      * @internal
      *
-     * @var Asset|null
      */
     protected ?Asset $asset = null;
 
     /**
      * @internal
      *
-     * @var Config|null
      */
     protected ?Config $config = null;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $pathReference = [];
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $width = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $height = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $realWidth = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $realHeight = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $mimetype = null;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $deferred = true;
 
@@ -327,8 +318,6 @@ public function getFrontendPath(): string
     /**
      * @internal
      *
-     * @return string|null
-     *
      * @throws \Exception
      */
     public function getLocalFile(): ?string
@@ -365,10 +354,6 @@ public function exists(): bool
     /**
      * @internal
      *
-     * @param array|null $pathReference
-     *
-     * @return bool
-     *
      * @throws \League\Flysystem\FilesystemException
      */
     public function existsOnStorage(?array $pathReference = []): bool
@@ -421,9 +406,7 @@ public function getFilename(): string
     /**
      * Returns path for thumbnail image in a given file format
      *
-     * @param string $format
      *
-     * @return static
      */
     public function getAsFormat(string $format): static
     {
diff --git a/models/Asset/Unknown.php b/models/Asset/Unknown.php
index 9ce31e4d048..dff1f6d3c58 100644
--- a/models/Asset/Unknown.php
+++ b/models/Asset/Unknown.php
@@ -23,8 +23,5 @@
  */
 class Unknown extends Model\Asset
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'unknown';
 }
diff --git a/models/Asset/Video.php b/models/Asset/Video.php
index d0256dc7bdf..5fb85ae625d 100644
--- a/models/Asset/Video.php
+++ b/models/Asset/Video.php
@@ -29,14 +29,8 @@ class Video extends Model\Asset
 {
     use Model\Asset\MetaData\EmbeddedMetaDataTrait;
 
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'video';
 
-    /**
-     * {@inheritdoc}
-     */
     protected function update(array $params = []): void
     {
         if ($this->getDataChanged()) {
@@ -64,10 +58,6 @@ public function clearThumbnails(bool $force = false): void
     /**
      * @internal
      *
-     * @param string|Video\Thumbnail\Config $config
-     *
-     * @return Video\Thumbnail\Config|null
-     *
      * @throws Model\Exception\NotFoundException
      */
     public function getThumbnailConfig(string|Video\Thumbnail\Config $config): ?Video\Thumbnail\Config
@@ -90,10 +80,7 @@ public function getThumbnailConfig(string|Video\Thumbnail\Config $config): ?Vide
     /**
      * Returns a path to a given thumbnail or an thumbnail configuration
      *
-     * @param string|Video\Thumbnail\Config $thumbnailName
-     * @param array $onlyFormats
      *
-     * @return array|null
      */
     public function getThumbnail(string|Video\Thumbnail\Config $thumbnailName, array $onlyFormats = []): ?array
     {
@@ -147,13 +134,6 @@ private function enrichThumbnailPath(string $path): string
         return $event->getArgument('frontendPath');
     }
 
-    /**
-     * @param string|array|Image\Thumbnail\Config $thumbnailName
-     * @param int|null $timeOffset
-     * @param Image|null $imageAsset
-     *
-     * @return Video\ImageThumbnail
-     */
     public function getImageThumbnail(array|string|Image\Thumbnail\Config $thumbnailName, int $timeOffset = null, Image $imageAsset = null): Video\ImageThumbnail
     {
         if (!\Pimcore\Video::isAvailable()) {
@@ -175,9 +155,7 @@ public function getImageThumbnail(array|string|Image\Thumbnail\Config $thumbnail
     /**
      * @internal
      *
-     * @param string|null $filePath
      *
-     * @return float|null
      */
     public function getDurationFromBackend(?string $filePath = null): ?float
     {
@@ -198,7 +176,6 @@ public function getDurationFromBackend(?string $filePath = null): ?float
     /**
      * @internal
      *
-     * @return array|null
      */
     public function getDimensionsFromBackend(): ?array
     {
@@ -213,7 +190,6 @@ public function getDimensionsFromBackend(): ?array
     }
 
     /**
-     * @return float|int|null
      *
      * @throws \Exception
      */
@@ -282,7 +258,6 @@ public function getHeight(): ?int
     /**
      * @internal
      *
-     * @return array
      */
     public function getSphericalMetaData(): array
     {
diff --git a/models/Asset/Video/ImageThumbnail.php b/models/Asset/Video/ImageThumbnail.php
index 3194d6c022c..5470857a172 100644
--- a/models/Asset/Video/ImageThumbnail.php
+++ b/models/Asset/Video/ImageThumbnail.php
@@ -36,24 +36,15 @@ final class ImageThumbnail
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $timeOffset = null;
 
     /**
      * @internal
      *
-     * @var Image|null
      */
     protected ?Image $imageAsset = null;
 
-    /**
-     * @param Model\Asset\Video|null $asset
-     * @param string|array|Image\Thumbnail\Config|null $config
-     * @param int|null $timeOffset
-     * @param Image|null $imageAsset
-     * @param bool $deferred
-     */
     public function __construct(?Model\Asset\Video $asset, array|string|Image\Thumbnail\Config $config = null, int $timeOffset = null, Image $imageAsset = null, bool $deferred = true)
     {
         $this->asset = $asset;
@@ -208,10 +199,7 @@ private function createConfig(array|string|Image\Thumbnail\Config $selector): ?I
     }
 
     /**
-     * @param string $name
-     * @param int $highRes
      *
-     * @return Image\Thumbnail|null
      *
      * @throws \Exception
      */
diff --git a/models/Asset/Video/Thumbnail/Config.php b/models/Asset/Video/Thumbnail/Config.php
index e97f4747488..4adb05536a4 100644
--- a/models/Asset/Video/Thumbnail/Config.php
+++ b/models/Asset/Video/Thumbnail/Config.php
@@ -44,77 +44,65 @@ final class Config extends Model\AbstractModel
      *
      * @internal
      *
-     * @var array
      */
     protected array $items = [];
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $medias = [];
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $name = '';
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $description = '';
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $group = '';
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $videoBitrate = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $audioBitrate = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $modificationDate = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $creationDate = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $filenameSuffix = null;
 
     /**
-     * @param string $name
      *
-     * @return null|Config
      *
      * @throws \Exception
      */
@@ -145,7 +133,6 @@ public static function getByName(string $name): ?Config
     /**
      * @internal
      *
-     * @return Config
      */
     public static function getPreviewConfig(): Config
     {
@@ -175,11 +162,7 @@ private function createMediaIfNotExists(string $name): void
     }
 
     /**
-     * @param string $name
-     * @param array $parameters
-     * @param string|null $media
      *
-     * @return bool
      *
      * @internal
      */
@@ -340,7 +323,6 @@ public function getVideoBitrate(): ?int
     /**
      * @internal
      *
-     * @return array
      */
     public function getEstimatedDimensions(): array
     {
diff --git a/models/Asset/Video/Thumbnail/Config/Dao.php b/models/Asset/Video/Thumbnail/Config/Dao.php
index de3359bdf31..fe9974f5a81 100644
--- a/models/Asset/Video/Thumbnail/Config/Dao.php
+++ b/models/Asset/Video/Thumbnail/Config/Dao.php
@@ -41,7 +41,6 @@ public function configure(): void
     }
 
     /**
-     * @param string|null $id
      *
      * @throws \Exception
      */
@@ -113,9 +112,6 @@ protected function autoClearTempFiles(): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataStructureForYaml(string $id, mixed $data): mixed
     {
         return [
diff --git a/models/Asset/Video/Thumbnail/Processor.php b/models/Asset/Video/Thumbnail/Processor.php
index e2f1f2c24d0..542b895490e 100644
--- a/models/Asset/Video/Thumbnail/Processor.php
+++ b/models/Asset/Video/Thumbnail/Processor.php
@@ -54,11 +54,7 @@ class Processor
     protected int $status;
 
     /**
-     * @param Model\Asset\Video $asset
-     * @param Config $config
-     * @param array $onlyFormats
      *
-     * @return Processor|null
      *
      * @throws \Exception
      */
@@ -307,11 +303,6 @@ public function save(): bool
         return true;
     }
 
-    /**
-     * @param string|null $processId
-     *
-     * @return string
-     */
     protected function getJobStoreId(string $processId = null): string
     {
         if (!$processId) {
diff --git a/models/Asset/WebDAV/File.php b/models/Asset/WebDAV/File.php
index 69fdbebb4e2..e86ca4d6490 100644
--- a/models/Asset/WebDAV/File.php
+++ b/models/Asset/WebDAV/File.php
@@ -146,7 +146,6 @@ public function get()
     /**
      * Get a hash of the file for an unique identifier
      *
-     * @return string
      */
     public function getETag(): string
     {
@@ -156,7 +155,6 @@ public function getETag(): string
     /**
      * Returns the mimetype of the asset
      *
-     * @return string
      */
     public function getContentType(): string
     {
@@ -166,7 +164,6 @@ public function getContentType(): string
     /**
      * Get size of file in bytes
      *
-     * @return int
      */
     public function getSize(): int
     {
diff --git a/models/Asset/WebDAV/Folder.php b/models/Asset/WebDAV/Folder.php
index 1eef79da2d0..9a8a947c633 100644
--- a/models/Asset/WebDAV/Folder.php
+++ b/models/Asset/WebDAV/Folder.php
@@ -37,7 +37,6 @@ public function __construct(Asset $asset)
     /**
      * Returns the children of the asset if the asset is a folder
      *
-     * @return array
      */
     public function getChildren(): array
     {
diff --git a/models/DataObject/AbstractObject.php b/models/DataObject/AbstractObject.php
index 9a5f19f9554..6edf6ff7ea6 100644
--- a/models/DataObject/AbstractObject.php
+++ b/models/DataObject/AbstractObject.php
@@ -116,9 +116,6 @@ abstract class AbstractObject extends Model\Element\AbstractElement
      */
     protected ?string $childrenSortOrder = null;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getBlockedVars(): array
     {
         $blockedVars = ['versions', 'class', 'scheduledTasks', 'parent', 'parent', 'omitMandatoryCheck'];
@@ -137,7 +134,6 @@ protected function getBlockedVars(): array
     /**
      * @static
      *
-     * @return bool
      */
     public static function getHideUnpublished(): bool
     {
@@ -147,7 +143,6 @@ public static function getHideUnpublished(): bool
     /**
      * @static
      *
-     * @param bool $hideUnpublished
      */
     public static function setHideUnpublished(bool $hideUnpublished): void
     {
@@ -157,7 +152,6 @@ public static function setHideUnpublished(bool $hideUnpublished): void
     /**
      * @static
      *
-     * @return bool
      */
     public static function doHideUnpublished(): bool
     {
@@ -167,7 +161,6 @@ public static function doHideUnpublished(): bool
     /**
      * @static
      *
-     * @param bool $getInheritedValues
      */
     public static function setGetInheritedValues(bool $getInheritedValues): void
     {
@@ -177,7 +170,6 @@ public static function setGetInheritedValues(bool $getInheritedValues): void
     /**
      * @static
      *
-     * @return bool
      */
     public static function getGetInheritedValues(): bool
     {
@@ -187,9 +179,7 @@ public static function getGetInheritedValues(): bool
     /**
      * @static
      *
-     * @param Concrete|null $object
      *
-     * @return bool
      */
     public static function doGetInheritedValues(Concrete $object = null): bool
     {
@@ -305,7 +295,6 @@ public static function getByPath(string $path, array $params = []): static|null
     }
 
     /**
-     * @param array $config
      *
      * @return DataObject\Listing
      *
@@ -516,9 +505,6 @@ public function delete(): void
         $this->dispatchEvent(new DataObjectEvent($this), DataObjectEvents::POST_DELETE);
     }
 
-    /**
-     * @inheritDoc
-     */
     public function save(array $parameters = []): static
     {
         $isUpdate = false;
@@ -710,8 +696,6 @@ protected function correctPath(): void
     }
 
     /**
-     * @param bool|null $isUpdate
-     * @param array $params
      *
      * @throws \Exception
      *
@@ -763,8 +747,6 @@ public function clearDependentCache(array $additionalTags = []): void
     }
 
     /**
-     * @param int $objectId
-     * @param array $additionalTags
      *
      * @internal
      */
@@ -785,7 +767,6 @@ public static function clearDependentCacheByObjectId(int $objectId, array $addit
     }
 
     /**
-     * @param int $index
      *
      * @internal
      */
@@ -939,10 +920,7 @@ public static function setDoNotRestoreKeyAndPath(bool $doNotRestoreKeyAndPath):
     }
 
     /**
-     * @param string $fieldName
-     * @param string|null $language
      *
-     * @return mixed
      *
      * @throws \Exception
      */
@@ -956,11 +934,7 @@ public function get(string $fieldName, string $language = null): mixed
     }
 
     /**
-     * @param string $fieldName
-     * @param mixed $value
-     * @param string|null $language
      *
-     * @return mixed
      *
      * @throws \Exception
      */
@@ -976,7 +950,6 @@ public function set(string $fieldName, mixed $value, string $language = null): m
     /**
      * @internal
      *
-     * @return bool
      */
     public static function isDirtyDetectionDisabled(): bool
     {
@@ -986,7 +959,6 @@ public static function isDirtyDetectionDisabled(): bool
     /**
      * @internal
      *
-     * @param bool $disableDirtyDetection
      */
     public static function setDisableDirtyDetection(bool $disableDirtyDetection): void
     {
@@ -1012,9 +984,7 @@ public static function enableDirtyDetection(): void
     /**
      * @internal
      *
-     * @param array $args
      *
-     * @return string
      */
     protected function getListingCacheKey(array $args = []): string
     {
@@ -1031,7 +1001,6 @@ protected function getListingCacheKey(array $args = []): string
     }
 
     /**
-     * @param string | null $reverseSort
      *
      * @return AbstractObject
      */
@@ -1060,8 +1029,6 @@ public function __clone(): void
     }
 
     /**
-     * @param string $method
-     * @param array $arguments
      *
      * @return mixed
      *
@@ -1112,10 +1079,7 @@ public static function __callStatic(string $method, array $arguments)
     }
 
     /**
-     * @param array $listConfig
-     * @param array|null $objectTypes
      *
-     * @return Listing
      *
      * @throws \Exception
      */
diff --git a/models/DataObject/AbstractObject/Dao.php b/models/DataObject/AbstractObject/Dao.php
index c1e14b1ba0d..d63ac4f9d0c 100644
--- a/models/DataObject/AbstractObject/Dao.php
+++ b/models/DataObject/AbstractObject/Dao.php
@@ -33,7 +33,6 @@ class Dao extends Model\Element\Dao
     /**
      * Get the data for the object from database for the given id
      *
-     * @param int $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -54,7 +53,6 @@ public function getById(int $id): void
     /**
      * Get the data for the object from database for the given path
      *
-     * @param string $path
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -87,7 +85,6 @@ public function create(): void
     }
 
     /**
-     * @param bool|null $isUpdate
      *
      * @throws \Exception
      */
@@ -137,7 +134,6 @@ public function update(bool $isUpdate = null): void
     /**
      * Deletes object from database
      *
-     * @return void
      */
     public function delete(): void
     {
@@ -156,9 +152,7 @@ public function updateWorkspaces(): void
     /**
      * Updates the paths for children, children's properties and children's permissions in the database
      *
-     * @param string $oldPath
      *
-     * @return null|array
      *
      * @internal
      */
@@ -192,7 +186,6 @@ public function updateChildPaths(string $oldPath): ?array
     /**
      * deletes all properties for the object from database
      *
-     * @return void
      */
     public function deleteAllProperties(): void
     {
@@ -230,9 +223,7 @@ public function getVersionCountForUpdate(): int
     /**
      * Get the properties for the object from database and assign it
      *
-     * @param bool $onlyInherited
      *
-     * @return array
      */
     public function getProperties(bool $onlyInherited = false): array
     {
@@ -382,10 +373,8 @@ public function hasSiblings(
     /**
      * returns the amount of directly children (not recursivly)
      *
-     * @param array|null $objectTypes
      * @param Model\User|null $user
      *
-     * @return int
      */
     public function getChildAmount(?array $objectTypes = [DataObject::OBJECT_TYPE_OBJECT, DataObject::OBJECT_TYPE_VARIANT, DataObject::OBJECT_TYPE_FOLDER], User $user = null): int
     {
@@ -417,9 +406,7 @@ public function getChildAmount(?array $objectTypes = [DataObject::OBJECT_TYPE_OB
     }
 
     /**
-     * @param int $id
      *
-     * @return array
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -505,10 +492,7 @@ protected function collectParentIds(): array
     }
 
     /**
-     * @param string $type
-     * @param array $userIds
      *
-     * @return int
      *
      * @throws \Doctrine\DBAL\Exception
      */
@@ -552,8 +536,6 @@ public function isAllowed(string $type, User $user): bool
     }
 
     /**
-     * @param array $columns
-     * @param User $user
      *
      * @return array<string, int>
      *
diff --git a/models/DataObject/ClassDefinition/CustomLayout.php b/models/DataObject/ClassDefinition/CustomLayout.php
index db614cd70a3..fc789d4f1f0 100644
--- a/models/DataObject/ClassDefinition/CustomLayout.php
+++ b/models/DataObject/ClassDefinition/CustomLayout.php
@@ -79,9 +79,7 @@ public static function getById(string $id): ?CustomLayout
     }
 
     /**
-     * @param string $name
      *
-     * @return null|CustomLayout
      *
      * @throws \Exception
      */
@@ -108,10 +106,7 @@ public static function getByName(string $name): ?CustomLayout
     }
 
     /**
-     * @param string $name
-     * @param string $classId
      *
-     * @return null|CustomLayout
      *
      * @throws \Exception
      */
@@ -202,7 +197,6 @@ public function save(): void
     /**
      * @internal
      *
-     * @return string
      */
     protected function getInfoDocBlock(): string
     {
@@ -222,9 +216,7 @@ protected function getInfoDocBlock(): string
     /**
      * @internal
      *
-     * @param string $classId
      *
-     * @return UuidV4|null
      *
      *
      */
diff --git a/models/DataObject/ClassDefinition/CustomLayout/Dao.php b/models/DataObject/ClassDefinition/CustomLayout/Dao.php
index 6f77f6c8344..30ef2c8cd80 100644
--- a/models/DataObject/ClassDefinition/CustomLayout/Dao.php
+++ b/models/DataObject/ClassDefinition/CustomLayout/Dao.php
@@ -45,7 +45,6 @@ public function configure(): void
     }
 
     /**
-     * @param string|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -131,9 +130,7 @@ public function getNewId(): UuidV4
     /**
      * Get latest identifier
      *
-     * @param string $classId
      *
-     * @return UuidV4
      */
     public function getLatestIdentifier(string $classId): UuidV4
     {
@@ -184,9 +181,6 @@ public function delete(): void
         $this->deleteData($this->model->getId());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataStructureForYaml(string $id, mixed $data): mixed
     {
         return [
diff --git a/models/DataObject/ClassDefinition/CustomLayout/Listing/Dao.php b/models/DataObject/ClassDefinition/CustomLayout/Listing/Dao.php
index d70996fb35c..fe30dfa396c 100644
--- a/models/DataObject/ClassDefinition/CustomLayout/Listing/Dao.php
+++ b/models/DataObject/ClassDefinition/CustomLayout/Listing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\DataObject\ClassDefinition\CustomLayout\Dao
     /**
      * Loads a list of custom layouts for the specified parameters, returns an array of DataObject\ClassDefinition\CustomLayout elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/DataObject/ClassDefinition/Dao.php b/models/DataObject/ClassDefinition/Dao.php
index bda48b8124b..6b320011789 100644
--- a/models/DataObject/ClassDefinition/Dao.php
+++ b/models/DataObject/ClassDefinition/Dao.php
@@ -51,9 +51,7 @@ public function getNameById(string $id): ?string
     }
 
     /**
-     * @param string $name
      *
-     * @return string
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -78,7 +76,6 @@ public function getIdByName(string $name): string
     }
 
     /**
-     * @param bool $isUpdate
      *
      * @throws \Exception
      */
@@ -231,7 +228,6 @@ public function update(): void
     /**
      * Create a new record for the object in database
      *
-     * @return void
      */
     public function create(): void
     {
@@ -296,7 +292,6 @@ public function delete(): void
     /**
      * Update the class name in all object
      *
-     * @param string $newName
      */
     public function updateClassNameInObjects(string $newName): void
     {
diff --git a/models/DataObject/ClassDefinition/Data.php b/models/DataObject/ClassDefinition/Data.php
index 19b28d5ad06..4cdeb17c5e3 100644
--- a/models/DataObject/ClassDefinition/Data.php
+++ b/models/DataObject/ClassDefinition/Data.php
@@ -85,31 +85,20 @@ abstract class Data implements DataObject\ClassDefinition\Data\TypeDeclarationSu
     /**
      * Returns the data for the editmode
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return mixed
      */
     abstract public function getDataForEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): mixed;
 
     /**
      * Converts data from editmode to internal eg. Image-Id to Asset\Image object
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return mixed
      */
     abstract public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): mixed;
 
     /**
      * Checks if data is valid for current data field
      *
-     * @param mixed $data
-     * @param bool $omitMandatoryCheck
-     * @param array $params
      *
      * @throws \Exception
      */
@@ -136,10 +125,7 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
     /**
      * converts object data to a simple string value or CSV Export
      *
-     * @param DataObject\Concrete|DataObject\Localizedfield|DataObject\Objectbrick\Data\AbstractData|DataObject\Fieldcollection\Data\AbstractData $object
-     * @param array $params
      *
-     * @return string
      *
      * @internal
      */
@@ -332,11 +318,7 @@ public function resolveDependencies(mixed $data): array
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param  mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      *
      */
     public function getFilterCondition(mixed $value, string $operator, array $params = []): string
@@ -353,11 +335,8 @@ public function getFilterCondition(mixed $value, string $operator, array $params
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
      * @param array $params optional params used to change the behavior
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
@@ -422,9 +401,7 @@ protected function getPreGetValueHookCode(string $key): string
     /**
      * Creates getter code which is used for generation of php file for object classes using this data type
      *
-     * @param DataObject\ClassDefinition|DataObject\Objectbrick\Definition|DataObject\Fieldcollection\Definition $class
      *
-     * @return string
      */
     public function getGetterCode(DataObject\ClassDefinition|DataObject\Objectbrick\Definition|DataObject\Fieldcollection\Definition $class): string
     {
@@ -475,9 +452,7 @@ public function getGetterCode(DataObject\ClassDefinition|DataObject\Objectbrick\
     /**
      * Creates setter code which is used for generation of php file for object classes using this data type
      *
-     * @param DataObject\ClassDefinition|DataObject\Objectbrick\Definition|DataObject\Fieldcollection\Definition $class
      *
-     * @return string
      */
     public function getSetterCode(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
@@ -565,9 +540,7 @@ public function getSetterCode(DataObject\Objectbrick\Definition|DataObject\Class
     /**
      * Creates getter code which is used for generation of php file for object brick classes using this data type
      *
-     * @param DataObject\Objectbrick\Definition $brickClass
      *
-     * @return string
      */
     public function getGetterCodeObjectbrick(DataObject\Objectbrick\Definition $brickClass): string
     {
@@ -616,9 +589,7 @@ public function getGetterCodeObjectbrick(DataObject\Objectbrick\Definition $bric
     /**
      * Creates setter code which is used for generation of php file for object brick classes using this data type
      *
-     * @param DataObject\Objectbrick\Definition $brickClass
      *
-     * @return string
      */
     public function getSetterCodeObjectbrick(DataObject\Objectbrick\Definition $brickClass): string
     {
@@ -701,9 +672,7 @@ public function getSetterCodeObjectbrick(DataObject\Objectbrick\Definition $bric
     /**
      * Creates getter code which is used for generation of php file for fieldcollectionk classes using this data type
      *
-     * @param DataObject\Fieldcollection\Definition $fieldcollectionDefinition
      *
-     * @return string
      */
     public function getGetterCodeFieldcollection(DataObject\Fieldcollection\Definition $fieldcollectionDefinition): string
     {
@@ -744,9 +713,7 @@ public function getGetterCodeFieldcollection(DataObject\Fieldcollection\Definiti
     /**
      * Creates setter code which is used for generation of php file for fieldcollection classes using this data type
      *
-     * @param DataObject\Fieldcollection\Definition $fieldcollectionDefinition
      *
-     * @return string
      */
     public function getSetterCodeFieldcollection(DataObject\Fieldcollection\Definition $fieldcollectionDefinition): string
     {
@@ -818,9 +785,7 @@ public function getSetterCodeFieldcollection(DataObject\Fieldcollection\Definiti
     /**
      * Creates getter code which is used for generation of php file for localized fields in classes using this data type
      *
-     * @param DataObject\ClassDefinition|DataObject\Objectbrick\Definition|DataObject\Fieldcollection\Definition $class
      *
-     * @return string
      */
     public function getGetterCodeLocalizedfields(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
@@ -860,9 +825,7 @@ public function getGetterCodeLocalizedfields(DataObject\Objectbrick\Definition|D
     /**
      * Creates setter code which is used for generation of php file for localized fields in classes using this data type
      *
-     * @param DataObject\ClassDefinition|DataObject\Objectbrick\Definition|DataObject\Fieldcollection\Definition $class
      *
-     * @return string
      */
     public function getSetterCodeLocalizedfields(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
@@ -943,7 +906,6 @@ public function getSetterCodeLocalizedfields(DataObject\Objectbrick\Definition|D
     /**
      * Creates filter method code for listing classes
      *
-     * @return string
      */
     public function getFilterCode(): string
     {
@@ -987,13 +949,6 @@ public function getAsFloatCast(mixed $number): ?float
         return strlen((string) $number) === 0 ? null : (float)$number;
     }
 
-    /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
-     *
-     * @return string
-     */
     public function getVersionPreview(mixed $data, DataObject\Concrete $object = null, array $params = []): string
     {
         return 'no preview';
@@ -1005,10 +960,7 @@ public function isEmpty(mixed $data): bool
     }
 
     /** True if change is allowed in edit mode.
-     * @param DataObject\Concrete $object
-     * @param array $params
      *
-     * @return bool
      */
     public function isDiffChangeAllowed(DataObject\Concrete $object, array $params = []): bool
     {
@@ -1021,11 +973,7 @@ public function isDiffChangeAllowed(DataObject\Concrete $object, array $params =
      *  - "key" => the key of the data element
      *  - "data" => the data
      *
-     * @param array $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return mixed
      */
     public function getDiffDataFromEditmode(array $data, DataObject\Concrete $object = null, array $params = []): mixed
     {
@@ -1047,11 +995,7 @@ public function getDiffDataFromEditmode(array $data, DataObject\Concrete $object
      *      - "title" => pretty name describing the data element
      *
      *
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return null|array
      */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -1083,10 +1027,7 @@ public function getUnique(): bool
     }
 
     /**
-     * @param DataObject\Concrete|DataObject\Localizedfield|DataObject\Objectbrick\Data\AbstractData|DataObject\Fieldcollection\Data\AbstractData $object
-     * @param array $params
      *
-     * @return mixed
      *
      * @throws \Exception
      */
@@ -1247,7 +1188,6 @@ public function removeData(mixed $existingData, mixed $removeData): mixed
     /**
      * Returns if datatype supports data inheritance
      *
-     * @return bool
      */
     public function supportsInheritance(): bool
     {
@@ -1269,7 +1209,6 @@ public function markLazyloadedFieldAsLoaded(Localizedfield|AbstractData|Model\Da
     /**
      * Returns if datatype supports listing filters: getBy, filterBy
      *
-     * @return bool
      */
     public function isFilterable(): bool
     {
@@ -1277,11 +1216,9 @@ public function isFilterable(): bool
     }
 
     /**
-     * @param DataObject\Listing $listing
      * @param string|int|float|array|Model\Element\ElementInterface $data comparison data, can be scalar or array (if operator is e.g. "IN (?)")
      * @param string $operator SQL comparison operator, e.g. =, <, >= etc. You can use "?" as placeholder, e.g. "IN (?)"
      *
-     * @return DataObject\Listing
      */
     public function addListingFilter(DataObject\Listing $listing, float|array|int|string|Model\Element\ElementInterface $data, string $operator = '='): DataObject\Listing
     {
diff --git a/models/DataObject/ClassDefinition/Data/AbstractQuantityValue.php b/models/DataObject/ClassDefinition/Data/AbstractQuantityValue.php
index 2e7a5eba0ce..07e917a0e3b 100644
--- a/models/DataObject/ClassDefinition/Data/AbstractQuantityValue.php
+++ b/models/DataObject/ClassDefinition/Data/AbstractQuantityValue.php
@@ -161,9 +161,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -252,9 +249,6 @@ public static function __set_state(array $data): static
         return $obj;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getFilterCondition(mixed $value, string $operator, array $params = []): string
     {
         /** @var UnitConversionService $converter */
diff --git a/models/DataObject/ClassDefinition/Data/AdvancedManyToManyObjectRelation.php b/models/DataObject/ClassDefinition/Data/AdvancedManyToManyObjectRelation.php
index 0884604751e..364e464c954 100644
--- a/models/DataObject/ClassDefinition/Data/AdvancedManyToManyObjectRelation.php
+++ b/models/DataObject/ClassDefinition/Data/AdvancedManyToManyObjectRelation.php
@@ -36,21 +36,18 @@ class AdvancedManyToManyObjectRelation extends ManyToManyObjectRelation implemen
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $allowedClassId = null;
 
     /**
      * @internal
      *
-     * @var array|string|null
      */
     public array|string|null $visibleFields = null;
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $columns = [];
 
@@ -74,13 +71,9 @@ class AdvancedManyToManyObjectRelation extends ManyToManyObjectRelation implemen
     /**
      * @internal
      *
-     * @var array
      */
     public array $visibleFieldDefinitions = [];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataForPersistence(array|Element\ElementInterface $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         $return = [];
@@ -110,9 +103,6 @@ protected function prepareDataForPersistence(array|Element\ElementInterface $dat
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function loadData(array $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         $list = [
@@ -206,11 +196,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see Data::getDataForEditmode
      *
@@ -251,11 +237,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataFromEditmode
      *
@@ -308,11 +290,8 @@ public function getDataFromGridEditor(array $data, Concrete $object = null, arra
     }
 
     /**
-     * @param array|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDataForGrid(?array $data, Concrete $object = null, array $params = []): array
     {
@@ -320,11 +299,7 @@ public function getDataForGrid(?array $data, Concrete $object = null, array $par
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -365,9 +340,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && empty($data)) {
@@ -400,9 +372,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -544,9 +513,6 @@ public function save(Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objec
         parent::save($object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function preGetData(mixed $container, array $params = []): array
     {
         $data = null;
@@ -698,9 +664,6 @@ public function classSaved(DataObject\ClassDefinition $class, array $params = []
         $temp->getDao()->createOrUpdateTable($class);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -723,9 +686,6 @@ public function rewriteIds(mixed $container, array $idMapping, array $params = [
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $mainDefinition): void
     {
         if ($mainDefinition instanceof self) {
@@ -735,9 +695,6 @@ public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $m
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enrichLayoutDefinition(?Concrete $object, array $context = []): static
     {
         $classId = $this->allowedClassId;
@@ -945,9 +902,7 @@ public function setAllowMultipleAssignments(bool $allowMultipleAssignments): sta
     }
 
     /**
-     * @param ElementInterface $item
      *
-     * @return string
      *
      * @internal
      */
diff --git a/models/DataObject/ClassDefinition/Data/AdvancedManyToManyRelation.php b/models/DataObject/ClassDefinition/Data/AdvancedManyToManyRelation.php
index 8fde972628c..013e7afe49c 100644
--- a/models/DataObject/ClassDefinition/Data/AdvancedManyToManyRelation.php
+++ b/models/DataObject/ClassDefinition/Data/AdvancedManyToManyRelation.php
@@ -36,7 +36,6 @@ class AdvancedManyToManyRelation extends ManyToManyRelation implements IdRewrite
     /**
      * @internal
      *
-     * @var array
      */
     public array $columns;
 
@@ -52,7 +51,6 @@ class AdvancedManyToManyRelation extends ManyToManyRelation implements IdRewrite
      *
      * @internal
      *
-     * @var string
      */
     public string $phpdocType = '\\Pimcore\\Model\\DataObject\\Data\\ElementMetadata[]';
 
@@ -71,9 +69,6 @@ class AdvancedManyToManyRelation extends ManyToManyRelation implements IdRewrite
      */
     public bool $allowMultipleAssignments = false;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataForPersistence(array|Element\ElementInterface $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         $return = [];
@@ -103,9 +98,6 @@ protected function prepareDataForPersistence(array|Element\ElementInterface $dat
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function loadData(array $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         $list = [
@@ -193,11 +185,7 @@ protected function loadData(array $data, Localizedfield|AbstractData|\Pimcore\Mo
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @throws \Exception
      */
@@ -226,11 +214,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -347,11 +331,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataFromEditmode
      *
@@ -412,13 +392,6 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
         return $multihrefMetadata;
     }
 
-    /**
-     * @param array|null $data
-     * @param Concrete|null $object
-     * @param array $params
-     *
-     * @return array|null
-     */
     public function getDataForGrid(?array $data, Concrete $object = null, array $params = []): ?array
     {
         $ret = $this->getDataForEditmode($data, $object, $params);
@@ -427,11 +400,7 @@ public function getDataForGrid(?array $data, Concrete $object = null, array $par
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -470,9 +439,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && empty($data)) {
@@ -510,9 +476,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -635,9 +598,6 @@ public function save(Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objec
         parent::save($object, $params);
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preGetData(mixed $container, array $params = []): mixed
     {
         $data = null;
@@ -757,9 +717,6 @@ public function classSaved(DataObject\ClassDefinition $class, array $params = []
         $temp->getDao()->createOrUpdateTable($class);
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -838,9 +795,6 @@ public function normalize(mixed $value, array $params = []): ?array
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function denormalize(mixed $value, array $params = []): ?array
     {
         if (is_array($value)) {
@@ -871,9 +825,6 @@ public function denormalize(mixed $value, array $params = []): ?array
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function processDiffDataForEditMode(?array $originalData, ?array $data, Concrete $object = null, array $params = []): ?array
     {
         if ($data) {
@@ -922,9 +873,6 @@ protected function processDiffDataForEditMode(?array $originalData, ?array $data
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
         $data = parent::getDiffDataForEditMode($data, $object, $params);
@@ -933,11 +881,8 @@ public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object
     }
 
     /** See parent class.
-     * @param array $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataFromEditmode(array $data, $object = null, array $params = []): ?array
     {
@@ -959,9 +904,7 @@ public function getDiffDataFromEditmode(array $data, $object = null, array $para
     }
 
     /**
-     * @param ElementInterface $item
      *
-     * @return string
      *
      * @internal
      */
@@ -973,9 +916,6 @@ protected function buildUniqueKeyForAppending(ElementInterface $item): string
         return $elementType . $id;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isOptimizedAdminLoading(): bool
     {
         return $this->optimizedAdminLoading;
diff --git a/models/DataObject/ClassDefinition/Data/AfterDecryptionUnmarshallerInterface.php b/models/DataObject/ClassDefinition/Data/AfterDecryptionUnmarshallerInterface.php
index 982733729ba..d44e9111269 100644
--- a/models/DataObject/ClassDefinition/Data/AfterDecryptionUnmarshallerInterface.php
+++ b/models/DataObject/ClassDefinition/Data/AfterDecryptionUnmarshallerInterface.php
@@ -20,12 +20,5 @@
 
 interface AfterDecryptionUnmarshallerInterface
 {
-    /**
-     * @param mixed $value
-     * @param Concrete|null $object
-     * @param array $params
-     *
-     * @return mixed
-     */
     public function unmarshalAfterDecryption(mixed $value, Concrete $object = null, array $params = []): mixed;
 }
diff --git a/models/DataObject/ClassDefinition/Data/BeforeEncryptionMarshallerInterface.php b/models/DataObject/ClassDefinition/Data/BeforeEncryptionMarshallerInterface.php
index 6eb39410343..af81ea10818 100644
--- a/models/DataObject/ClassDefinition/Data/BeforeEncryptionMarshallerInterface.php
+++ b/models/DataObject/ClassDefinition/Data/BeforeEncryptionMarshallerInterface.php
@@ -20,12 +20,5 @@
 
 interface BeforeEncryptionMarshallerInterface
 {
-    /**
-     * @param mixed $value
-     * @param Concrete|null $object
-     * @param array $params
-     *
-     * @return mixed
-     */
     public function marshalBeforeEncryption(mixed $value, Concrete $object = null, array $params = []): mixed;
 }
diff --git a/models/DataObject/ClassDefinition/Data/Block.php b/models/DataObject/ClassDefinition/Data/Block.php
index 6d06f64481c..2370df2a99a 100644
--- a/models/DataObject/ClassDefinition/Data/Block.php
+++ b/models/DataObject/ClassDefinition/Data/Block.php
@@ -63,28 +63,24 @@ class Block extends Data implements CustomResourcePersistingInterface, ResourceP
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $maxItems = null;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $styleElement = '';
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $children = [];
 
     /**
      * @internal
      *
-     * @var array|null
      */
     public ?array $layout = null;
 
@@ -93,18 +89,13 @@ class Block extends Data implements CustomResourcePersistingInterface, ResourceP
      *
      * @internal
      *
-     * @var array
      */
     protected array $referencedFields = [];
 
     /**
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      */
     public function getDataForResource(mixed $data, DataObject\Concrete $object = null, array $params = []): string
     {
@@ -164,11 +155,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     /**
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataFromResource(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -257,11 +244,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     /**
      * @see Data::getDataForEditmode
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDataForEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): array
     {
@@ -305,11 +288,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     /**
      * @see Data::getDataFromEditmode
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): array
     {
@@ -372,9 +351,6 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
 
     /**
      * @param DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return mixed
      *
      * @throws \Exception
      */
@@ -441,28 +417,18 @@ protected function getBlockDataFromContainer(Concrete $object, array $params = [
     /**
      * @see Data::getVersionPreview
      *
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      */
     public function getVersionPreview(mixed $data, DataObject\Concrete $object = null, array $params = []): string
     {
         return $this->getDiffVersionPreview($data, $object, $params)['html'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -471,11 +437,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either HTML or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param array|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDiffVersionPreview(?array $data, Concrete $object = null, array $params = []): array
     {
@@ -736,9 +699,6 @@ public function setLazyLoading(bool $lazyLoading): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function preSetData(mixed $container, mixed $data, array $params = []): mixed
     {
         $this->markLazyloadedFieldAsLoaded($container);
@@ -828,9 +788,6 @@ public function delete(Localizedfield|AbstractData|\Pimcore\Model\DataObject\Obj
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function preGetData(mixed $container, array $params = []): mixed
     {
         $data = null;
@@ -888,9 +845,6 @@ public function setDisallowReorder(bool $disallowReorder): void
         $this->disallowReorder = $disallowReorder;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck) {
@@ -959,8 +913,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
     /**
      * This method is called in DataObject\ClassDefinition::save()
      *
-     * @param DataObject\ClassDefinition $class
-     * @param array $params
      */
     public function classSaved(DataObject\ClassDefinition $class, array $params = []): void
     {
diff --git a/models/DataObject/ClassDefinition/Data/BooleanSelect.php b/models/DataObject/ClassDefinition/Data/BooleanSelect.php
index b8fdd410db2..4dc34c1b8da 100644
--- a/models/DataObject/ClassDefinition/Data/BooleanSelect.php
+++ b/models/DataObject/ClassDefinition/Data/BooleanSelect.php
@@ -69,21 +69,18 @@ class BooleanSelect extends Data implements
     /**
      * @internal
      *
-     * @var string
      */
     public string $yesLabel;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $noLabel;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $emptyLabel;
 
@@ -106,11 +103,7 @@ public function setOptions(array $options): static
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return bool|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -131,11 +124,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return int|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -145,11 +134,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return int|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -169,11 +154,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -190,20 +171,13 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
     }
 
     /** See parent class.
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -233,9 +207,6 @@ public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object
         return $result;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         //TODO mandatory probably doesn't make much sense
@@ -319,11 +290,8 @@ public function setEmptyLabel(string $emptyLabel): static
     }
 
     /**
-     * @param bool|null $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
      *
-     * @return int
      */
     public function getDataForGrid(?bool $data, Concrete $object = null, array $params = []): int
     {
@@ -331,11 +299,7 @@ public function getDataForGrid(?bool $data, Concrete $object = null, array $para
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return int
      *
      * @see Data::getDataForEditmode
      *
@@ -353,11 +317,8 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param string $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return bool|null
      */
     public function getDataFromGridEditor(string $data, Concrete $object = null, array $params = []): ?bool
     {
@@ -365,11 +326,7 @@ public function getDataFromGridEditor(string $data, Concrete $object = null, arr
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return bool|null
      *
      * @see Data::getDataFromEditmode
      *
@@ -390,9 +347,6 @@ public function isEqual(mixed $oldValue, mixed $newValue): bool
         return $oldValue === $newValue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $value = $this->getDataFromObjectParam($object, $params);
diff --git a/models/DataObject/ClassDefinition/Data/CalculatedValue.php b/models/DataObject/ClassDefinition/Data/CalculatedValue.php
index e2372d02822..98d82ab02d7 100644
--- a/models/DataObject/ClassDefinition/Data/CalculatedValue.php
+++ b/models/DataObject/ClassDefinition/Data/CalculatedValue.php
@@ -41,7 +41,6 @@ class CalculatedValue extends Data implements QueryResourcePersistenceAwareInter
     /**
      * @internal
      *
-     * @var string
      */
     public string $elementType = 'input';
 
@@ -58,7 +57,6 @@ class CalculatedValue extends Data implements QueryResourcePersistenceAwareInter
     /**
      * @internal
      *
-     * @var string
      */
     public string $calculatorClass;
 
@@ -67,7 +65,6 @@ class CalculatedValue extends Data implements QueryResourcePersistenceAwareInter
      *
      * @internal
      *
-     * @var int
      */
     public int $columnLength = 190;
 
@@ -136,11 +133,7 @@ public function setCalculatorExpression(?string $calculatorExpression): void
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -150,11 +143,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
      * @param Concrete|null $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see Data::getDataForEditmode
      */
@@ -168,9 +157,6 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
      * @return null
      *
@@ -183,11 +169,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -197,17 +179,11 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return (string)$this->getDataForEditmode($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         // nothing to do
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         return $this->getDataFromObjectParam($object, $params) ?? '';
@@ -218,9 +194,6 @@ public function getQueryColumnType(): string
         return 'varchar(' . $this->getColumnLength() . ')';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCode(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         $key = $this->getName();
@@ -248,9 +221,6 @@ public function getGetterCode(DataObject\Objectbrick\Definition|DataObject\Class
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCodeLocalizedfields(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         $key = $this->getName();
@@ -303,9 +273,6 @@ public function getGetterCodeLocalizedfields(DataObject\Objectbrick\Definition|D
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCodeObjectbrick(\Pimcore\Model\DataObject\Objectbrick\Definition $brickClass): string
     {
         $key = $this->getName();
@@ -330,9 +297,6 @@ public function getGetterCodeObjectbrick(\Pimcore\Model\DataObject\Objectbrick\D
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCodeFieldcollection(Definition $fieldcollectionDefinition): string
     {
         $key = $this->getName();
@@ -359,53 +323,31 @@ public function getGetterCodeFieldcollection(Definition $fieldcollectionDefiniti
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSetterCode(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSetterCodeObjectbrick(\Pimcore\Model\DataObject\Objectbrick\Definition $brickClass): string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSetterCodeFieldcollection(Definition $fieldcollectionDefinition): string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSetterCodeLocalizedfields(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         return '';
     }
 
-    /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
-     *
-     * @return mixed
-     */
     public function getDataForGrid(mixed $data, DataObject\Concrete $object = null, array $params = []): mixed
     {
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsInheritance(): bool
     {
         return false;
diff --git a/models/DataObject/ClassDefinition/Data/Checkbox.php b/models/DataObject/ClassDefinition/Data/Checkbox.php
index 3726d9e7f1b..4fca455016a 100644
--- a/models/DataObject/ClassDefinition/Data/Checkbox.php
+++ b/models/DataObject/ClassDefinition/Data/Checkbox.php
@@ -30,7 +30,6 @@ class Checkbox extends Data implements ResourcePersistenceAwareInterface, QueryR
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $defaultValue = null;
 
@@ -50,11 +49,7 @@ public function setDefaultValue(mixed $defaultValue): static
     }
 
     /**
-     * @param mixed $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return int|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -67,11 +62,7 @@ public function getDataForResource(mixed $data, Concrete $object = null, array $
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return bool|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -86,11 +77,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return int|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -100,11 +87,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return int|null
      *
      * @see Data::getDataForEditmode
      *
@@ -120,11 +103,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -134,9 +113,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return (string)$data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && $data === null) {
@@ -149,9 +125,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }*/
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params) ?? '';
@@ -159,9 +132,6 @@ public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollec
         return (string)$data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -178,11 +148,7 @@ public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $m
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      *
      */
     public function getFilterCondition(mixed $value, string $operator, array $params = []): string
@@ -199,11 +165,8 @@ public function getFilterCondition(mixed $value, string $operator, array $params
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
      * @param array $params optional params used to change the behavior
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
@@ -226,9 +189,6 @@ public function isEmpty(mixed $data): bool
         return $data === null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/Data/Classificationstore.php b/models/DataObject/ClassDefinition/Data/Classificationstore.php
index 457cc60d203..9fe34fa2b1c 100644
--- a/models/DataObject/ClassDefinition/Data/Classificationstore.php
+++ b/models/DataObject/ClassDefinition/Data/Classificationstore.php
@@ -34,49 +34,42 @@ class Classificationstore extends Data implements CustomResourcePersistingInterf
     /**
      * @internal
      *
-     * @var array
      */
     public array $children = [];
 
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $name = null;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $region;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $layout;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $title = null;
 
     /**
      * @internal
      *
-     * @var int
      */
     public int $maxTabs;
 
     /**
      * @internal
      *
-     * @var int
      */
     public int $labelWidth = 0;
 
@@ -88,7 +81,6 @@ class Classificationstore extends Data implements CustomResourcePersistingInterf
     /**
      * @internal
      *
-     * @var int
      */
     public int $storeId;
 
@@ -107,58 +99,47 @@ class Classificationstore extends Data implements CustomResourcePersistingInterf
      *
      * @internal
      *
-     * @var array
      */
     protected array $referencedFields = [];
 
     /**
      * @internal
      *
-     * @var array|null
      */
     public ?array $fieldDefinitionsCache = null;
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $allowedGroupIds;
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $activeGroupDefinitions = [];
 
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $maxItems = null;
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $permissionView;
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $permissionEdit;
 
     /**
-     * @param mixed $data
      * @param Concrete|null $object
-     * @param array $params
-     *
-     * @return array
      *
      * @throws \Exception
      *
@@ -311,11 +292,7 @@ private function doGetDataForEditMode(DataObject\Classificationstore $data, Conc
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Classificationstore
      *
      * @see Data::getDataFromEditmode
      */
@@ -376,11 +353,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      */
     public function getDataForGrid(mixed $data, Concrete $object = null, array $params = []): string
     {
@@ -388,11 +362,7 @@ public function getDataForGrid(mixed $data, Concrete $object = null, array $para
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -404,9 +374,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return 'CLASSIFICATIONSTORE';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         return 'not supported';
@@ -538,8 +505,6 @@ public function delete(Localizedfield|AbstractData|\Pimcore\Model\DataObject\Obj
     /**
      * This method is called in DataObject\ClassDefinition::save() and is used to create the database table for the classification data
      *
-     * @param DataObject\ClassDefinition $class
-     * @param array $params
      */
     public function classSaved(DataObject\ClassDefinition $class, array $params = []): void
     {
@@ -548,9 +513,6 @@ public function classSaved(DataObject\ClassDefinition $class, array $params = []
         $classificationStore->createUpdateTable();
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preGetData(mixed $container, array $params = []): mixed
     {
         if (!$container instanceof DataObject\Concrete) {
@@ -624,9 +586,6 @@ public function getTitle(): string
         return $this->title;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $activeGroups = $data->getActiveGroups();
@@ -703,9 +662,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
      * @throws \Exception
      */
@@ -715,9 +671,7 @@ public function getDiffDataForEditmode(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param array $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
      * @throws \Exception
      */
@@ -726,9 +680,6 @@ public function getDiffDataFromEditmode(array $data, $object = null, array $para
         throw new \Exception('not supported');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return false;
@@ -849,9 +800,6 @@ private function recursiveGetActiveGroupCollectionMapping(?Concrete $object, arr
 
     /**
      * @param DataObject\Concrete|null $object
-     * @param array $activeGroups
-     *
-     * @return array|null
      *
      * @internal
      */
@@ -883,9 +831,6 @@ public function recursiveGetActiveGroupsIds(?Concrete $object, array $activeGrou
         return $activeGroups;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enrichLayoutDefinition(?Concrete $object, array $context = []): static
     {
         $this->activeGroupDefinitions = [];
@@ -1148,9 +1093,7 @@ public function denormalize(mixed $value, array $params = []): ?DataObject\Class
     /**
      * Creates getter code which is used for generation of php file for object classes using this data type
      *
-     * @param DataObject\ClassDefinition|DataObject\Objectbrick\Definition|DataObject\Fieldcollection\Definition $class
      *
-     * @return string
      */
     public function getGetterCode(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
diff --git a/models/DataObject/ClassDefinition/Data/Consent.php b/models/DataObject/ClassDefinition/Data/Consent.php
index bc30d721983..32bf10adc91 100644
--- a/models/DataObject/ClassDefinition/Data/Consent.php
+++ b/models/DataObject/ClassDefinition/Data/Consent.php
@@ -29,16 +29,11 @@ class Consent extends Data implements ResourcePersistenceAwareInterface, QueryRe
     /**
      * @internal
      *
-     * @var int
      */
     public int $defaultValue = 0;
 
     /**
-     * @param mixed $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return array
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -59,11 +54,7 @@ public function getDataForResource(mixed $data, Concrete $object = null, array $
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Consent
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -85,11 +76,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return bool
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -103,11 +90,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -127,11 +110,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Consent
      *
      * @see Data::getDataFromEditmode
      */
@@ -172,11 +151,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
      *  - "key" => the key of the data element
      *  - "data" => the data
      *
-     * @param array $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return DataObject\Data\Consent
      */
     public function getDiffDataFromEditmode(array $data, $object = null, array $params = []): DataObject\Data\Consent
     {
@@ -216,11 +192,8 @@ public function getDiffDataFromEditmode(array $data, $object = null, array $para
     }
 
     /**
-     * @param DataObject\Data\Consent|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataForGrid(?DataObject\Data\Consent $data, Concrete $object = null, array $params = []): ?array
     {
@@ -228,11 +201,8 @@ public function getDataForGrid(?DataObject\Data\Consent $data, Concrete $object
     }
 
     /**
-     * @param bool|string $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return DataObject\Data\Consent
      */
     public function getDataFromGridEditor(bool|string $data, Concrete $object = null, array $params = []): DataObject\Data\Consent
     {
@@ -240,11 +210,7 @@ public function getDataFromGridEditor(bool|string $data, Concrete $object = null
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -254,9 +220,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return $data ? (string)$data->getConsent() : '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && $data === null) {
@@ -269,9 +232,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }*/
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -279,9 +239,6 @@ public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollec
         return $data ? (string)$data->getConsent() : '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -298,11 +255,7 @@ public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $m
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      *
      */
     public function getFilterCondition(mixed $value, string $operator, array $params = []): string
@@ -319,11 +272,8 @@ public function getFilterCondition(mixed $value, string $operator, array $params
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
      * @param array $params optional params used to change the behavior
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
@@ -341,9 +291,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsInheritance(): bool
     {
         return false;
diff --git a/models/DataObject/ClassDefinition/Data/Country.php b/models/DataObject/ClassDefinition/Data/Country.php
index 00e7ba6f65a..89156567b51 100644
--- a/models/DataObject/ClassDefinition/Data/Country.php
+++ b/models/DataObject/ClassDefinition/Data/Country.php
@@ -29,13 +29,9 @@ class Country extends Model\DataObject\ClassDefinition\Data\Select
      *
      * @internal
      *
-     * @var string|null
      */
     public ?string $restrictTo = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -58,9 +54,6 @@ public function getRestrictTo(): ?string
         return $this->restrictTo;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/Data/Countrymultiselect.php b/models/DataObject/ClassDefinition/Data/Countrymultiselect.php
index 215a489b2d1..0547a42de5d 100644
--- a/models/DataObject/ClassDefinition/Data/Countrymultiselect.php
+++ b/models/DataObject/ClassDefinition/Data/Countrymultiselect.php
@@ -26,7 +26,6 @@ class Countrymultiselect extends Model\DataObject\ClassDefinition\Data\Multisele
      *
      * @internal
      *
-     * @var string|null
      */
     public ?string $restrictTo = null;
 
diff --git a/models/DataObject/ClassDefinition/Data/Date.php b/models/DataObject/ClassDefinition/Data/Date.php
index d772daedabd..db69461eed7 100644
--- a/models/DataObject/ClassDefinition/Data/Date.php
+++ b/models/DataObject/ClassDefinition/Data/Date.php
@@ -31,7 +31,6 @@ class Date extends Data implements ResourcePersistenceAwareInterface, QueryResou
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $defaultValue = null;
 
@@ -46,11 +45,7 @@ class Date extends Data implements ResourcePersistenceAwareInterface, QueryResou
     public string $columnType = 'bigint(20)';
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return int|string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -72,11 +67,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return \Carbon\Carbon|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -107,11 +98,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return int|null
      *
      * @see Data::getDataForEditmode
      *
@@ -134,11 +121,7 @@ private function getDateFromTimestamp(float|int|string $timestamp): Carbon
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return \Carbon\Carbon|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -152,11 +135,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param float $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return \Carbon\Carbon|null
      */
     public function getDataFromGridEditor(float $data, Concrete $object = null, array $params = []): ?Carbon
     {
@@ -168,11 +148,8 @@ public function getDataFromGridEditor(float $data, Concrete $object = null, arra
     }
 
     /**
-     * @param Carbon|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return int|null
      */
     public function getDataForGrid(?Carbon $data, Concrete $object = null, array $params = []): ?int
     {
@@ -184,11 +161,7 @@ public function getDataForGrid(?Carbon $data, Concrete $object = null, array $pa
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -224,9 +197,6 @@ public function setDefaultValue(mixed $defaultValue): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -257,9 +227,6 @@ public function isUseCurrentDate(): bool
         return $this->useCurrentDate;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -267,11 +234,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
 
     /** See parent class.
      *
-     * @param array $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return Carbon|null
      */
     public function getDiffDataFromEditmode(array $data, $object = null, array $params = []): ?Carbon
     {
@@ -284,11 +248,7 @@ public function getDiffDataFromEditmode(array $data, $object = null, array $para
     }
 
     /** See parent class.
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -315,11 +275,8 @@ public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
      * @param array $params optional params used to change the behavior
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
@@ -348,9 +305,6 @@ public function getFilterConditionExt(mixed $value, string $operator, array $par
         return parent::getFilterConditionExt($value, $operator, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
@@ -419,7 +373,6 @@ public function denormalize(mixed $value, array $params = []): mixed
     /**
      * overwrite default implementation to consider columnType & queryColumnType from class config
      *
-     * @return array
      */
     public function resolveBlockedVars(): array
     {
diff --git a/models/DataObject/ClassDefinition/Data/DateRange.php b/models/DataObject/ClassDefinition/Data/DateRange.php
index 771eb893119..cd805c0c3f0 100644
--- a/models/DataObject/ClassDefinition/Data/DateRange.php
+++ b/models/DataObject/ClassDefinition/Data/DateRange.php
@@ -46,7 +46,6 @@ class DateRange extends Data implements
     ];
 
     /**
-     * @param DataObject\Concrete|null $object
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -74,7 +73,6 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param null|DataObject\Concrete $object
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -99,11 +97,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -113,11 +107,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -137,11 +127,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return CarbonPeriod|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -176,11 +162,7 @@ public function getDataForGrid(?CarbonPeriod $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -195,7 +177,7 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
     }
 
     /**
-     * {@inheritDoc}
+     *
      *
      * @throws Exception
      */
@@ -217,9 +199,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -255,9 +234,6 @@ public function resolveBlockedVars(): array
         return array_merge($defaultBlockedVars, $this->getBlockedVarsForExport());
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $isEmpty = true;
diff --git a/models/DataObject/ClassDefinition/Data/Datetime.php b/models/DataObject/ClassDefinition/Data/Datetime.php
index e46efb29fd4..a8f403b2041 100644
--- a/models/DataObject/ClassDefinition/Data/Datetime.php
+++ b/models/DataObject/ClassDefinition/Data/Datetime.php
@@ -31,7 +31,6 @@ class Datetime extends Data implements ResourcePersistenceAwareInterface, QueryR
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $defaultValue = null;
 
@@ -46,11 +45,7 @@ class Datetime extends Data implements ResourcePersistenceAwareInterface, QueryR
     public string $columnType = 'bigint(20)';
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return int|string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -72,11 +67,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return Carbon|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -99,12 +90,6 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return int|string|null
-     *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
     public function getDataForQueryResource(mixed $data, DataObject\Concrete $object = null, array $params = []): int|string|null
@@ -113,11 +98,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return int|null
      *
      * @see Data::getDataForEditmode
      *
@@ -140,11 +121,7 @@ private function getDateFromTimestamp(float|int|string $timestamp): Carbon
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return Carbon|null
      *
      * @see Data::getDataFromEditmode
      *
@@ -159,11 +136,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param float $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return Carbon|null
      */
     public function getDataFromGridEditor(float $data, Concrete $object = null, array $params = []): Carbon|null
     {
@@ -175,11 +149,8 @@ public function getDataFromGridEditor(float $data, Concrete $object = null, arra
     }
 
     /**
-     * @param \DateTime|null $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return int|null
      */
     public function getDataForGrid(?\DateTime $data, Concrete $object = null, array $params = []): ?int
     {
@@ -191,11 +162,7 @@ public function getDataForGrid(?\DateTime $data, Concrete $object = null, array
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -209,9 +176,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -257,9 +221,6 @@ public function isUseCurrentDate(): bool
         return $this->useCurrentDate;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -267,11 +228,7 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
 
     /** See parent class.
      *
-     * @param array $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return Carbon|null
      */
     public function getDiffDataFromEditmode(array $data, DataObject\Concrete $object = null, array $params = []): ?Carbon
     {
@@ -284,11 +241,8 @@ public function getDiffDataFromEditmode(array $data, DataObject\Concrete $object
     }
 
     /** See parent class.
-     * @param mixed $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -315,11 +269,8 @@ public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
      * @param array $params optional params used to change the behavior
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
@@ -349,9 +300,6 @@ public function getFilterConditionExt(mixed $value, string $operator, array $par
         return parent::getFilterConditionExt($value, $operator, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
@@ -420,7 +368,6 @@ public function denormalize(mixed $value, array $params = []): ?Carbon
     /**
      * overwrite default implementation to consider columnType & queryColumnType from class config
      *
-     * @return array
      */
     public function resolveBlockedVars(): array
     {
diff --git a/models/DataObject/ClassDefinition/Data/Email.php b/models/DataObject/ClassDefinition/Data/Email.php
index c7d1a61f3f7..92ddbf08d93 100644
--- a/models/DataObject/ClassDefinition/Data/Email.php
+++ b/models/DataObject/ClassDefinition/Data/Email.php
@@ -22,9 +22,6 @@
 
 class Email extends Model\DataObject\ClassDefinition\Data\Input
 {
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && is_string($data) && strlen($data) > 0) {
diff --git a/models/DataObject/ClassDefinition/Data/EncryptedField.php b/models/DataObject/ClassDefinition/Data/EncryptedField.php
index b161b3fe956..cf058821c8d 100644
--- a/models/DataObject/ClassDefinition/Data/EncryptedField.php
+++ b/models/DataObject/ClassDefinition/Data/EncryptedField.php
@@ -49,7 +49,6 @@ class EncryptedField extends Data implements ResourcePersistenceAwareInterface,
     /**
      * @internal
      *
-     * @var string
      */
     public string $delegateDatatype;
 
@@ -61,11 +60,7 @@ class EncryptedField extends Data implements ResourcePersistenceAwareInterface,
     public Data|array|null $delegate = null;
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return mixed
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -159,11 +154,7 @@ private function decrypt(?string $data, Model\DataObject\Concrete $object = null
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return Model\DataObject\Data\EncryptedField|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -191,11 +182,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see Data::getDataForEditmode
      *
@@ -214,11 +201,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return Model\DataObject\Data\EncryptedField|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -235,13 +218,6 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
         return null;
     }
 
-    /**
-     * @param float $data
-     * @param Model\DataObject\Concrete|null $object
-     * @param array $params
-     *
-     * @return float|Model\DataObject\Data\EncryptedField
-     */
     public function getDataFromGridEditor(float $data, Model\DataObject\Concrete $object = null, array $params = []): float|Model\DataObject\Data\EncryptedField
     {
         $fd = $this->getDelegateDatatypeDefinition();
@@ -253,9 +229,6 @@ public function getDataFromGridEditor(float $data, Model\DataObject\Concrete $ob
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $fd = $this->getDelegateDatatypeDefinition();
@@ -280,11 +253,7 @@ public function isEmpty(mixed $data): bool
     /**
      * display the quantity value field data in the grid
      *
-     * @param mixed $data
-     * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDataForGrid(mixed $data, Model\DataObject\Concrete $object = null, array $params = []): array
     {
@@ -301,11 +270,8 @@ public function getDataForGrid(mixed $data, Model\DataObject\Concrete $object =
     }
 
     /**
-     * @param mixed $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      */
     public function getVersionPreview(mixed $data, DataObject\Concrete $object = null, array $params = []): string
     {
@@ -315,9 +281,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return $fd->getVersionPreview($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $fd = $this->getDelegateDatatypeDefinition();
@@ -339,11 +302,7 @@ public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollec
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      *
      */
     public function getFilterCondition(mixed $value, string $operator, array $params = []): string
@@ -369,7 +328,6 @@ public function getDelegateDatatypeDefinition(): Data|array|null
     /**
      * @internal
      *
-     * @param mixed $data
      */
     public function setupDelegate(mixed $data): void
     {
@@ -408,9 +366,6 @@ public function setDelegate(Data|array|null $delegate): void
         $this->delegate = $delegate;
     }
 
-    /**
-     * @inheritdoc
-     */
     public function enrichLayoutDefinition(?Concrete $object, array $context = []): static
     {
         $delegate = $this->getDelegate();
diff --git a/models/DataObject/ClassDefinition/Data/EqualComparisonInterface.php b/models/DataObject/ClassDefinition/Data/EqualComparisonInterface.php
index 26819a9e514..c883656286e 100644
--- a/models/DataObject/ClassDefinition/Data/EqualComparisonInterface.php
+++ b/models/DataObject/ClassDefinition/Data/EqualComparisonInterface.php
@@ -21,10 +21,7 @@ interface EqualComparisonInterface
     /**
      * Returns if old data and new data is equal
      *
-     * @param mixed $oldValue
-     * @param mixed $newValue
      *
-     * @return bool
      */
     public function isEqual(mixed $oldValue, mixed $newValue): bool;
 }
diff --git a/models/DataObject/ClassDefinition/Data/Extension/RelationFilterConditionParser.php b/models/DataObject/ClassDefinition/Data/Extension/RelationFilterConditionParser.php
index 7843cd1ebb1..189241e203f 100644
--- a/models/DataObject/ClassDefinition/Data/Extension/RelationFilterConditionParser.php
+++ b/models/DataObject/ClassDefinition/Data/Extension/RelationFilterConditionParser.php
@@ -26,11 +26,7 @@ trait RelationFilterConditionParser
     /**
      * Parses filter value of a relation field and creates the filter condition
      *
-     * @param string|null $value
-     * @param string $operator
-     * @param string $name
      *
-     * @return string
      */
     public function getRelationFilterCondition(?string $value, string $operator, string $name): string
     {
diff --git a/models/DataObject/ClassDefinition/Data/Extension/Text.php b/models/DataObject/ClassDefinition/Data/Extension/Text.php
index 27994c64058..e57643ce2e4 100644
--- a/models/DataObject/ClassDefinition/Data/Extension/Text.php
+++ b/models/DataObject/ClassDefinition/Data/Extension/Text.php
@@ -21,9 +21,6 @@
 
 trait Text
 {
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && $this->isEmpty($data)) {
@@ -36,20 +33,13 @@ public function isEmpty(mixed $data): bool
         return strlen((string) $data) < 1;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
     }
 
     /**
-     * @param mixed $data
-     * @param null|Model\DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
diff --git a/models/DataObject/ClassDefinition/Data/ExternalImage.php b/models/DataObject/ClassDefinition/Data/ExternalImage.php
index bb5c2595613..d699f22d8f5 100644
--- a/models/DataObject/ClassDefinition/Data/ExternalImage.php
+++ b/models/DataObject/ClassDefinition/Data/ExternalImage.php
@@ -27,21 +27,18 @@ class ExternalImage extends Data implements ResourcePersistenceAwareInterface, Q
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $previewWidth = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $inputWidth = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $previewHeight = null;
 
@@ -76,11 +73,7 @@ public function setInputWidth(?int $inputWidth): void
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -94,9 +87,6 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
      * @return Model\DataObject\Data\ExternalImage
      *
@@ -117,11 +107,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -131,11 +117,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see Data::getDataForEditmode
      *
@@ -152,9 +134,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     /**
      * @param Model\DataObject\Data\ExternalImage|null $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      */
     public function getDataForGrid(?DataObject\Data\ExternalImage $data, Concrete $object = null, array $params = []): ?string
     {
@@ -162,9 +142,6 @@ public function getDataForGrid(?DataObject\Data\ExternalImage $data, Concrete $o
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
      * @return Model\DataObject\Data\ExternalImage
      *
@@ -176,9 +153,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param string|null $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
      * @return Model\DataObject\Data\ExternalImage
      */
@@ -188,11 +163,7 @@ public function getDataFromGridEditor(?string $data, Concrete $object = null, ar
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -206,9 +177,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -219,9 +187,6 @@ public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollec
         return $return ?? '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -230,11 +195,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param string $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      */
     public function getDiffVersionPreview(string $data, Concrete $object = null, array $params = []): string
     {
@@ -256,9 +218,6 @@ public function synchronizeWithMainDefinition(Model\DataObject\ClassDefinition\D
     }
 
     /**
-     * @param mixed $data
-     * @param bool $omitMandatoryCheck
-     * @param array $params
      *
      * @throws Model\Element\ValidationException
      */
diff --git a/models/DataObject/ClassDefinition/Data/FieldDefinitionEnrichmentInterface.php b/models/DataObject/ClassDefinition/Data/FieldDefinitionEnrichmentInterface.php
index ba54528726d..3dc8ecda9a4 100644
--- a/models/DataObject/ClassDefinition/Data/FieldDefinitionEnrichmentInterface.php
+++ b/models/DataObject/ClassDefinition/Data/FieldDefinitionEnrichmentInterface.php
@@ -26,7 +26,6 @@ interface FieldDefinitionEnrichmentInterface
      * One example purpose is to populate or change dynamic settings like the options for select and multiselect fields.
      * The context param contains contextual information about the container, the field name, etc ...
      *
-     * @param array $context
      *
      * @return $this
      */
diff --git a/models/DataObject/ClassDefinition/Data/Fieldcollections.php b/models/DataObject/ClassDefinition/Data/Fieldcollections.php
index 92d3303653a..9a9064d2ff7 100644
--- a/models/DataObject/ClassDefinition/Data/Fieldcollections.php
+++ b/models/DataObject/ClassDefinition/Data/Fieldcollections.php
@@ -32,7 +32,6 @@ class Fieldcollections extends Data implements CustomResourcePersistingInterface
     /**
      * @internal
      *
-     * @var array
      */
     public array $allowedTypes = [];
 
@@ -44,7 +43,6 @@ class Fieldcollections extends Data implements CustomResourcePersistingInterface
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $maxItems = null;
 
@@ -86,11 +84,7 @@ public function setLazyLoading(bool $lazyLoading): static
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see Data::getDataForEditmode
      *
@@ -143,11 +137,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Fieldcollection
      *
      * @see Data::getDataFromEditmode
      */
@@ -221,11 +211,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -235,9 +221,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return $this->getDiffVersionPreview($data, $object, $params)['html'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         return 'NOT SUPPORTED';
@@ -373,9 +356,6 @@ public function getCacheTags(mixed $data, array $tags = []): array
         return $tags;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if ($data instanceof DataObject\Fieldcollection) {
@@ -423,9 +403,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preGetData(mixed $container, array $params = []): mixed
     {
         if (!$container instanceof DataObject\Concrete) {
@@ -449,9 +426,6 @@ public function preGetData(mixed $container, array $params = []): mixed
         return $data;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preSetData(mixed $container, mixed $data, array $params = []): mixed
     {
         $this->markLazyloadedFieldAsLoaded($container);
@@ -464,20 +438,14 @@ public function preSetData(mixed $container, mixed $data, array $params = []): m
     }
 
     /**
-     * @param DataObject\Fieldcollection|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      */
     public function getDataForGrid(?DataObject\Fieldcollection $data, Concrete $object = null, array $params = []): string
     {
         return 'NOT SUPPORTED';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCode(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         // getter, no inheritance here, that's the only difference
@@ -522,9 +490,6 @@ public function getMaxItems(): ?int
         return $this->maxItems;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -533,11 +498,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either HTML or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param DataObject\Fieldcollection|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDiffVersionPreview(?DataObject\Fieldcollection $data, Concrete $object = null, array $params = []): array
     {
@@ -572,9 +534,6 @@ public function getDiffVersionPreview(?DataObject\Fieldcollection $data, Concret
         return $value;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -614,8 +573,6 @@ public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $m
     /**
      * This method is called in DataObject\ClassDefinition::save() and is used to create the database table for the localized data
      *
-     * @param DataObject\ClassDefinition $class
-     * @param array $params
      */
     public function classSaved(DataObject\ClassDefinition $class, array $params = []): void
     {
@@ -710,9 +667,6 @@ public static function collectCalculatedValueItems(array $container, array &$lis
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsInheritance(): bool
     {
         return false;
diff --git a/models/DataObject/ClassDefinition/Data/Gender.php b/models/DataObject/ClassDefinition/Data/Gender.php
index 5add13341b2..cbd9cca3c40 100644
--- a/models/DataObject/ClassDefinition/Data/Gender.php
+++ b/models/DataObject/ClassDefinition/Data/Gender.php
@@ -50,9 +50,6 @@ public function jsonSerialize(): mixed
         return parent::jsonSerialize();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveBlockedVars(): array
     {
         $blockedVars = parent::resolveBlockedVars();
diff --git a/models/DataObject/ClassDefinition/Data/Geo/AbstractGeo.php b/models/DataObject/ClassDefinition/Data/Geo/AbstractGeo.php
index 073e5c41523..50153b47cb9 100644
--- a/models/DataObject/ClassDefinition/Data/Geo/AbstractGeo.php
+++ b/models/DataObject/ClassDefinition/Data/Geo/AbstractGeo.php
@@ -33,28 +33,24 @@ abstract class AbstractGeo extends Data implements TypeDeclarationSupportInterfa
     /**
      * @internal
      *
-     * @var float
      */
     public float $lat = 0.0;
 
     /**
      * @internal
      *
-     * @var float
      */
     public float $lng = 0.0;
 
     /**
      * @internal
      *
-     * @var int
      */
     public int $zoom = 1;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $mapType = 'roadmap';
 
@@ -94,13 +90,11 @@ public function setZoom(int $zoom): static
         return $this;
     }
 
-    /** { @inheritdoc } */
     public function marshalBeforeEncryption(mixed $value, Concrete $object = null, array $params = []): mixed
     {
         return Serialize::serialize($value);
     }
 
-    /** { @inheritdoc } */
     public function unmarshalAfterDecryption(mixed $value, Concrete $object = null, array $params = []): mixed
     {
         return Serialize::unserialize($value);
diff --git a/models/DataObject/ClassDefinition/Data/Geobounds.php b/models/DataObject/ClassDefinition/Data/Geobounds.php
index c468b9fa816..edb1d7280cd 100644
--- a/models/DataObject/ClassDefinition/Data/Geobounds.php
+++ b/models/DataObject/ClassDefinition/Data/Geobounds.php
@@ -30,11 +30,7 @@ class Geobounds extends AbstractGeo implements
     NormalizerInterface
 {
     /**
-     * @param mixed $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return array
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -58,9 +54,6 @@ public function getDataForResource(mixed $data, Concrete $object = null, array $
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $isEmpty = true;
@@ -78,11 +71,7 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Geobounds|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -108,11 +97,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -122,11 +107,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -146,11 +127,8 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param DataObject\Data\Geobounds|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataForGrid(?DataObject\Data\Geobounds $data, Concrete $object = null, array $params = []): ?array
     {
@@ -158,11 +136,7 @@ public function getDataForGrid(?DataObject\Data\Geobounds $data, Concrete $objec
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Geobounds|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -179,11 +153,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -197,9 +167,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -215,9 +182,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/Data/Geopoint.php b/models/DataObject/ClassDefinition/Data/Geopoint.php
index b892f65005f..ece439a62ad 100644
--- a/models/DataObject/ClassDefinition/Data/Geopoint.php
+++ b/models/DataObject/ClassDefinition/Data/Geopoint.php
@@ -30,11 +30,7 @@ class Geopoint extends AbstractGeo implements
     NormalizerInterface
 {
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -55,11 +51,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return DataObject\Data\GeoCoordinates|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -82,11 +74,7 @@ public function getDataFromResource(mixed $data, Concrete $object = null, array
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -96,11 +84,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -118,11 +102,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\GeoCoordinates|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -136,11 +116,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param array|null $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\GeoCoordinates|null
      */
     public function getDataFromGridEditor(?array $data, Concrete $object = null, array $params = []): ?DataObject\Data\GeoCoordinates
     {
@@ -148,11 +125,7 @@ public function getDataFromGridEditor(?array $data, Concrete $object = null, arr
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -166,9 +139,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -184,9 +154,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -220,20 +187,14 @@ public function denormalize(mixed $value, array $params = []): ?DataObject\Data\
     }
 
     /**
-     * @param DataObject\Data\GeoCoordinates|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataForGrid(?DataObject\Data\GeoCoordinates $data, Concrete $object = null, array $params = []): ?array
     {
         return $this->getDataForEditmode($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $isEmpty = true;
diff --git a/models/DataObject/ClassDefinition/Data/Geopolygon.php b/models/DataObject/ClassDefinition/Data/Geopolygon.php
index 8a749ce11a3..46cb249d76f 100644
--- a/models/DataObject/ClassDefinition/Data/Geopolygon.php
+++ b/models/DataObject/ClassDefinition/Data/Geopolygon.php
@@ -26,11 +26,7 @@
 class Geopolygon extends AbstractGeo implements ResourcePersistenceAwareInterface, QueryResourcePersistenceAwareInterface, EqualComparisonInterface, VarExporterInterface, NormalizerInterface
 {
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -40,9 +36,6 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
         return Serialize::serialize($data);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $isEmpty = true;
@@ -75,11 +68,7 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -89,11 +78,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -103,11 +88,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -132,9 +113,6 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
      * @return DataObject\Data\GeoCoordinates[]|null
      *
@@ -155,11 +133,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -169,9 +143,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return $this->getDiffVersionPreview($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -195,9 +166,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -206,11 +174,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param array|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      */
     public function getDiffVersionPreview(?array $data, Concrete $object = null, array $params = []): string
     {
diff --git a/models/DataObject/ClassDefinition/Data/Geopolyline.php b/models/DataObject/ClassDefinition/Data/Geopolyline.php
index c4f417e46f1..f336476bdda 100644
--- a/models/DataObject/ClassDefinition/Data/Geopolyline.php
+++ b/models/DataObject/ClassDefinition/Data/Geopolyline.php
@@ -31,11 +31,7 @@ class Geopolyline extends AbstractGeo implements
     NormalizerInterface
 {
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -46,11 +42,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -60,11 +52,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -73,9 +61,6 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
         return $this->getDataForResource($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $isEmpty = true;
@@ -108,11 +93,7 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -137,9 +118,6 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
      * @return DataObject\Data\GeoCoordinates[]|null
      *
@@ -160,11 +138,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -174,9 +148,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return $this->getDiffVersionPreview($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -200,9 +171,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -211,11 +179,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param array|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      */
     public function getDiffVersionPreview(?array $data, Concrete $object = null, array $params = []): string
     {
diff --git a/models/DataObject/ClassDefinition/Data/Hotspotimage.php b/models/DataObject/ClassDefinition/Data/Hotspotimage.php
index 523c01cecf3..e621dc0206e 100644
--- a/models/DataObject/ClassDefinition/Data/Hotspotimage.php
+++ b/models/DataObject/ClassDefinition/Data/Hotspotimage.php
@@ -33,21 +33,18 @@ class Hotspotimage extends Data implements ResourcePersistenceAwareInterface, Qu
     /**
      * @internal
      *
-     * @var int
      */
     public int $ratioX;
 
     /**
      * @internal
      *
-     * @var int
      */
     public int $ratioY;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $predefinedDataTemplates;
 
@@ -82,11 +79,7 @@ public function setPredefinedDataTemplates(string $predefinedDataTemplates): voi
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -120,11 +113,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Hotspotimage|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -188,11 +177,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -202,11 +187,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -252,11 +233,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Hotspotimage
      *
      * @see Data::getDataFromEditmode
      */
@@ -293,24 +270,13 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
         return new DataObject\Data\Hotspotimage($data['id'] ?? null, $data['hotspots'] ?? [], $data['marker'] ?? [], $data['crop'] ?? []);
     }
 
-    /**
-     * @param array $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return DataObject\Data\Hotspotimage
-     */
     public function getDataFromGridEditor(array $data, DataObject\Concrete $object = null, array $params = []): DataObject\Data\Hotspotimage
     {
         return $this->getDataFromEditmode($data, $object, $params);
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -324,9 +290,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -417,21 +380,11 @@ public function resolveDependencies(mixed $data): array
         return $dependencies;
     }
 
-    /**
-     * @param DataObject\Data\Hotspotimage|null $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
-     *
-     * @return array|null
-     */
     public function getDataForGrid(?DataObject\Data\Hotspotimage $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
         return $this->getDataForEditmode($data, $object, $params);
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -611,11 +564,7 @@ public function denormalize(mixed $value, array $params = []): ?DataObject\Data\
     /**
      * Filter by relation feature
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
diff --git a/models/DataObject/ClassDefinition/Data/IdRewriterInterface.php b/models/DataObject/ClassDefinition/Data/IdRewriterInterface.php
index 6ab788048d1..18abc0faf2d 100644
--- a/models/DataObject/ClassDefinition/Data/IdRewriterInterface.php
+++ b/models/DataObject/ClassDefinition/Data/IdRewriterInterface.php
@@ -32,8 +32,6 @@ interface IdRewriterInterface
      * )
      *
      * @param mixed $container any container type like Concrete, Localizedfields, Fieldcollection, etc...
-     * @param array $idMapping
-     * @param array $params
      *
      * @return mixed rewritten data based on data type
      */
diff --git a/models/DataObject/ClassDefinition/Data/Image.php b/models/DataObject/ClassDefinition/Data/Image.php
index c800ad5fae4..e0dde5afc5c 100644
--- a/models/DataObject/ClassDefinition/Data/Image.php
+++ b/models/DataObject/ClassDefinition/Data/Image.php
@@ -30,11 +30,7 @@ class Image extends Data implements ResourcePersistenceAwareInterface, QueryReso
     use Data\Extension\RelationFilterConditionParser;
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return int|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -49,11 +45,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return Asset|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -67,11 +59,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return int|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -85,11 +73,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      */
@@ -108,11 +92,7 @@ public function getDataForGrid(?Asset\Image $data, Concrete $object = null, arra
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return Asset\Image|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -126,9 +106,6 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param bool $omitMandatoryCheck
-     * @param array $params
      *
      * @throws Element\ValidationException
      */
@@ -143,11 +120,8 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
     }
 
     /**
-     * @param array|null $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
      *
-     * @return Asset\Image|null
      */
     public function getDataFromGridEditor(?array $data, Concrete $object = null, array $params = []): Asset\Image|null
     {
@@ -155,11 +129,7 @@ public function getDataFromGridEditor(?array $data, Concrete $object = null, arr
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -173,9 +143,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -216,9 +183,6 @@ public function resolveDependencies(mixed $data): array
         return $dependencies;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -227,11 +191,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param Asset\Image|null $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|string
      */
     public function getDiffVersionPreview(?Asset\Image $data, Concrete $object = null, array $params = []): array|string
     {
@@ -251,9 +212,6 @@ public function getDiffVersionPreview(?Asset\Image $data, Concrete $object = nul
         }
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -274,9 +232,6 @@ public function synchronizeWithMainDefinition(Model\DataObject\ClassDefinition\D
         $this->uploadPath = $mainDefinition->uploadPath;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
@@ -334,11 +289,7 @@ public function denormalize(mixed $value, array $params = []): ?Asset
     /**
      * Filter by relation feature
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
diff --git a/models/DataObject/ClassDefinition/Data/ImageGallery.php b/models/DataObject/ClassDefinition/Data/ImageGallery.php
index 9a02c6d884b..4342b7f95c8 100644
--- a/models/DataObject/ClassDefinition/Data/ImageGallery.php
+++ b/models/DataObject/ClassDefinition/Data/ImageGallery.php
@@ -32,7 +32,6 @@ class ImageGallery extends Data implements ResourcePersistenceAwareInterface, Qu
     /**
      * @internal
      *
-     * @var string
      */
     public string $uploadPath;
 
@@ -49,7 +48,6 @@ class ImageGallery extends Data implements ResourcePersistenceAwareInterface, Qu
     /**
      * @internal
      *
-     * @var string
      */
     public string $predefinedDataTemplates;
 
@@ -94,11 +92,7 @@ public function setUploadPath(string $uploadPath): void
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -135,11 +129,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\ImageGallery
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -203,11 +193,7 @@ private function createEmptyImageGallery(array $params): DataObject\Data\ImageGa
     }
 
     /**
-     * @param mixed $data
-     * @param Concrete|null $object
-     * @param array $params
      *
-     * @return array
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -217,11 +203,7 @@ public function getDataForQueryResource(mixed $data, Concrete $object = null, ar
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see Data::getDataForEditmode
      *
@@ -241,11 +223,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\ImageGallery
      *
      * @see Data::getDataFromEditmode
      */
@@ -264,24 +242,13 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
         return new DataObject\Data\ImageGallery($resultItems);
     }
 
-    /**
-     * @param array|null $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return DataObject\Data\ImageGallery
-     */
     public function getDataFromGridEditor(?array $data, DataObject\Concrete $object = null, array $params = []): DataObject\Data\ImageGallery
     {
         return $this->getDataFromEditmode($data, $object, $params);
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -295,9 +262,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -341,21 +305,11 @@ public function resolveDependencies(mixed $data): array
         return $dependencies;
     }
 
-    /**
-     * @param DataObject\Data\ImageGallery|null $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
-     *
-     * @return array
-     */
     public function getDataForGrid(?DataObject\Data\ImageGallery $data, DataObject\Concrete $object = null, array $params = []): array
     {
         return $this->getDataForEditmode($data, $object, $params);
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -370,9 +324,6 @@ public function rewriteIds(mixed $container, array $idMapping, array $params = [
     }
 
     /**
-     * @param mixed $data
-     * @param bool $omitMandatoryCheck
-     * @param array $params
      *
      * @throws Element\ValidationException
      */
diff --git a/models/DataObject/ClassDefinition/Data/ImageTrait.php b/models/DataObject/ClassDefinition/Data/ImageTrait.php
index f38b1b7d3dd..cf963172b0e 100644
--- a/models/DataObject/ClassDefinition/Data/ImageTrait.php
+++ b/models/DataObject/ClassDefinition/Data/ImageTrait.php
@@ -30,7 +30,6 @@ trait ImageTrait
     /**
      * @internal
      *
-     * @var string
      */
     public string $uploadPath;
 
diff --git a/models/DataObject/ClassDefinition/Data/Input.php b/models/DataObject/ClassDefinition/Data/Input.php
index 9cfa8af4696..094d614a138 100644
--- a/models/DataObject/ClassDefinition/Data/Input.php
+++ b/models/DataObject/ClassDefinition/Data/Input.php
@@ -68,11 +68,7 @@ class Input extends Data implements
     public bool $showCharCount = false;
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -84,11 +80,7 @@ public function getDataForResource(mixed $data, Concrete $object = null, array $
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -98,11 +90,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -112,11 +100,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see Data::getDataForEditmode
      *
@@ -139,11 +123,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param string $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string|null
      */
     public function getDataFromGridEditor(string $data, Concrete $object = null, array $params = []): ?string
     {
@@ -214,9 +195,6 @@ public function getQueryColumnType(): string
         return $this->getColumnType();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if(is_string($data)) {
@@ -254,9 +232,6 @@ public function synchronizeWithMainDefinition(Model\DataObject\ClassDefinition\D
         $this->columnLength = $mainDefinition->columnLength;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/Data/InputQuantityValue.php b/models/DataObject/ClassDefinition/Data/InputQuantityValue.php
index 93ad1611428..f16b24b7c00 100644
--- a/models/DataObject/ClassDefinition/Data/InputQuantityValue.php
+++ b/models/DataObject/ClassDefinition/Data/InputQuantityValue.php
@@ -82,9 +82,6 @@ public function getDataFromGridEditor(array $data, Concrete $object = null, arra
         return $this->getDataFromEditmode($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if ($omitMandatoryCheck) {
diff --git a/models/DataObject/ClassDefinition/Data/Language.php b/models/DataObject/ClassDefinition/Data/Language.php
index 7020ae161f2..29bd57002a1 100644
--- a/models/DataObject/ClassDefinition/Data/Language.php
+++ b/models/DataObject/ClassDefinition/Data/Language.php
@@ -81,9 +81,6 @@ public function jsonSerialize(): mixed
         return parent::jsonSerialize();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveBlockedVars(): array
     {
         $blockedVars = parent::resolveBlockedVars();
@@ -92,9 +89,6 @@ public function resolveBlockedVars(): array
         return $blockedVars;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/Data/Languagemultiselect.php b/models/DataObject/ClassDefinition/Data/Languagemultiselect.php
index 30726ccc6b8..b5b2983fc6a 100644
--- a/models/DataObject/ClassDefinition/Data/Languagemultiselect.php
+++ b/models/DataObject/ClassDefinition/Data/Languagemultiselect.php
@@ -83,9 +83,6 @@ public function jsonSerialize(): mixed
         return parent::jsonSerialize();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveBlockedVars(): array
     {
         $blockedVars = parent::resolveBlockedVars();
diff --git a/models/DataObject/ClassDefinition/Data/LayoutDefinitionEnrichmentInterface.php b/models/DataObject/ClassDefinition/Data/LayoutDefinitionEnrichmentInterface.php
index ff65193d5ac..bfbd173fc0a 100644
--- a/models/DataObject/ClassDefinition/Data/LayoutDefinitionEnrichmentInterface.php
+++ b/models/DataObject/ClassDefinition/Data/LayoutDefinitionEnrichmentInterface.php
@@ -26,7 +26,6 @@ interface LayoutDefinitionEnrichmentInterface
      * An example would the select datatype with a dynamic options provider.
      *
      *
-     * @param Concrete|null $object
      * @param array<string, mixed> $context additional contextual data like fieldname etc.
      *
      * @return $this
diff --git a/models/DataObject/ClassDefinition/Data/Link.php b/models/DataObject/ClassDefinition/Data/Link.php
index 8687ecd04c7..06cc96a5975 100644
--- a/models/DataObject/ClassDefinition/Data/Link.php
+++ b/models/DataObject/ClassDefinition/Data/Link.php
@@ -46,11 +46,7 @@ class Link extends Data implements ResourcePersistenceAwareInterface, QueryResou
     public ?array $disabledFields = null;
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -84,11 +80,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Link|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -118,11 +110,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -132,11 +120,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -153,11 +137,8 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param DataObject\Data\Link|null $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataForGrid(?DataObject\Data\Link $data, Concrete $object = null, array $params = []): ?array
     {
@@ -165,11 +146,7 @@ public function getDataForGrid(?DataObject\Data\Link $data, Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Link|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -186,11 +163,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param array $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Link|null
      */
     public function getDataFromGridEditor(array $data, Concrete $object = null, array $params = []): ?DataObject\Data\Link
     {
@@ -198,11 +172,7 @@ public function getDataFromGridEditor(array $data, Concrete $object = null, arra
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -212,9 +182,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return (string) $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if ($data instanceof DataObject\Data\Link) {
@@ -278,9 +245,6 @@ public function getCacheTags(mixed $data, array $tags = []): array
         return $tags;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -301,9 +265,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -312,11 +273,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either HTML or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param DataObject\Data\Link|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string|null
      */
     public function getDiffVersionPreview(?DataObject\Data\Link $data, Concrete $object = null, array $params = []): ?string
     {
@@ -331,9 +289,6 @@ public function getDiffVersionPreview(?DataObject\Data\Link $data, Concrete $obj
         return null;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
diff --git a/models/DataObject/ClassDefinition/Data/Localizedfields.php b/models/DataObject/ClassDefinition/Data/Localizedfields.php
index fc0d9448a8f..fb1fa19d559 100644
--- a/models/DataObject/ClassDefinition/Data/Localizedfields.php
+++ b/models/DataObject/ClassDefinition/Data/Localizedfields.php
@@ -102,11 +102,7 @@ class Localizedfields extends Data implements CustomResourcePersistingInterface,
     public ?array $permissionEdit = null;
 
     /**
-     * @param mixed $localizedField
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see Data::getDataForEditmode
      *
@@ -258,9 +254,6 @@ private function doGetDataForEditMode(DataObject\Localizedfield $data, DataObjec
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
      * @return DataObject\Localizedfield
      *
@@ -300,9 +293,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     /**
      * @param DataObject\Localizedfield|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return \stdClass
      */
     public function getDataForGrid(?Localizedfield $data, Concrete $object = null, array $params = []): \stdClass
     {
@@ -324,11 +315,7 @@ public function getDataForGrid(?Localizedfield $data, Concrete $object = null, a
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -340,9 +327,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return 'LOCALIZED FIELDS';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         return 'NOT SUPPORTED';
@@ -479,8 +463,6 @@ public function delete(Localizedfield|AbstractData|\Pimcore\Model\DataObject\Obj
     /**
      * This method is called in DataObject\ClassDefinition::save() and is used to create the database table for the localized data
      *
-     * @param DataObject\ClassDefinition $class
-     * @param array $params
      */
     public function classSaved(DataObject\ClassDefinition $class, array $params = []): void
     {
@@ -498,9 +480,6 @@ public function classSaved(DataObject\ClassDefinition $class, array $params = []
         }
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preGetData(mixed $container, array $params = []): mixed
     {
         if (
@@ -546,27 +525,20 @@ public function preGetData(mixed $container, array $params = []): mixed
         return $container->getObjectVar('localizedfields');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getGetterCode($class): string
+    public function getGetterCode(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         $code = '';
         if (!$class instanceof DataObject\Fieldcollection\Definition) {
             $code .= parent::getGetterCode($class);
         }
 
-        $fieldDefinitions = $this->getFieldDefinitions();
-        foreach ($fieldDefinitions as $fd) {
+        foreach ($this->getFieldDefinitions() as $fd) {
             $code .= $fd->getGetterCodeLocalizedfields($class);
         }
 
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSetterCode(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         $code = '';
@@ -653,7 +625,6 @@ public function setBorder(bool $border): void
     }
 
     /**
-     * @param string $name
      *
      * @return $this
      *
@@ -682,9 +653,6 @@ public function getRegion(): string
         return $this->region;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $languages = Tool::getValidLanguages();
@@ -779,13 +747,6 @@ private function getDataForValidity(DataObject\Localizedfield $localizedObject,
         return $data;
     }
 
-    /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
-     *
-     * @return array|null
-     */
     public function getDiffDataForEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
         $return = [];
@@ -830,9 +791,7 @@ public function getDiffDataForEditmode(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param array $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
      * @return DataObject\Localizedfield
      */
@@ -881,9 +840,6 @@ public function getDiffDataFromEditmode(array $data, $object = null, array $para
         return $localizedFields;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -912,9 +868,6 @@ public function __sleep(): array
         return array_keys($vars);
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -1001,9 +954,6 @@ public function supportsDirtyDetection(): bool
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/Data/ManyToManyObjectRelation.php b/models/DataObject/ClassDefinition/Data/ManyToManyObjectRelation.php
index 87ac4c62959..45018d0fed3 100644
--- a/models/DataObject/ClassDefinition/Data/ManyToManyObjectRelation.php
+++ b/models/DataObject/ClassDefinition/Data/ManyToManyObjectRelation.php
@@ -36,7 +36,6 @@ class ManyToManyObjectRelation extends AbstractRelations implements QueryResourc
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $maxItems = null;
 
@@ -48,7 +47,6 @@ class ManyToManyObjectRelation extends AbstractRelations implements QueryResourc
     /**
      * @internal
      *
-     * @var array|string|null
      */
     public array|string|null $visibleFields = null;
 
@@ -75,7 +73,6 @@ class ManyToManyObjectRelation extends AbstractRelations implements QueryResourc
     /**
      * @internal
      *
-     * @var array
      */
     public array $visibleFieldDefinitions = [];
 
@@ -84,9 +81,6 @@ public function getObjectsAllowed(): bool
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataForPersistence(array|Element\ElementInterface $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         $return = [];
@@ -115,9 +109,6 @@ protected function prepareDataForPersistence(array|Element\ElementInterface $dat
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function loadData(array $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         $objects = [
@@ -137,11 +128,7 @@ protected function loadData(array $data, Localizedfield|AbstractData|\Pimcore\Mo
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @throws \Exception
      *
@@ -171,11 +158,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see Data::getDataForEditmode
      *
@@ -201,11 +184,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataFromEditmode
      *
@@ -231,11 +210,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param array $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return array|null
      *
      * @see Data::getDataFromEditmode
      *
@@ -245,24 +220,13 @@ public function getDataFromGridEditor(array $data, Concrete $object = null, arra
         return $this->getDataFromEditmode($data, $object, $params);
     }
 
-    /**
-     * @param array|null $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
-     *
-     * @return array|null
-     */
     public function getDataForGrid(?array $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
         return $this->getDataForEditmode($data, $object, $params);
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -283,9 +247,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && empty($data)) {
@@ -318,9 +279,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -391,9 +349,6 @@ public function preGetData(mixed $container, array $params = []): array
         return is_array($data) ? $data : [];
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preSetData(mixed $container, mixed $data, array $params = []): mixed
     {
         if ($data === null) {
@@ -417,9 +372,6 @@ public function getMaxItems(): ?int
         return $this->maxItems;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -430,9 +382,7 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
      *
      * @param Element\ElementInterface[]|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDiffVersionPreview(?array $data, Concrete $object = null, array $params = []): array
     {
@@ -448,9 +398,6 @@ public function getDiffVersionPreview(?array $data, Concrete $object = null, arr
         return $value;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -468,9 +415,6 @@ public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $m
         $this->relationType = $mainDefinition->relationType;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enrichLayoutDefinition(?Concrete $object, array $context = []): static
     {
         if (!$this->visibleFields) {
@@ -552,9 +496,6 @@ public function enrichLayoutDefinition(?Concrete $object, array $context = []):
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getPhpdocType(): string
     {
         return $this->getPhpDocClassString(true);
@@ -601,9 +542,7 @@ public function denormalize(mixed $value, array $params = []): ?array
     /**
      * Returns a ID which must be unique across the grid rows
      *
-     * @param array $item
      *
-     * @return string
      *
      * @internal
      *
@@ -669,9 +608,6 @@ protected function processDiffDataForEditMode(mixed $originalData, mixed $data,
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
         $originalData = $data;
@@ -683,11 +619,7 @@ public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object
 
     /** See parent class.
      *
-     * @param array $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataFromEditmode(array $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -743,9 +675,6 @@ public function setAllowToClearRelation(bool $allowToClearRelation): void
         $this->allowToClearRelation = $allowToClearRelation;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isOptimizedAdminLoading(): bool
     {
         return $this->optimizedAdminLoading;
@@ -766,17 +695,11 @@ public function setEnableTextSelection(bool $enableTextSelection): void
         $this->enableTextSelection = $enableTextSelection;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addListingFilter(DataObject\Listing $listing, float|array|int|string|Model\Element\ElementInterface $data, string $operator = '='): DataObject\Listing
     {
         if ($data instanceof DataObject\Concrete) {
@@ -795,11 +718,7 @@ public function addListingFilter(DataObject\Listing $listing, float|array|int|st
     /**
      * Filter by relation feature
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
diff --git a/models/DataObject/ClassDefinition/Data/ManyToManyRelation.php b/models/DataObject/ClassDefinition/Data/ManyToManyRelation.php
index 82f817c2df4..388d00c02c1 100644
--- a/models/DataObject/ClassDefinition/Data/ManyToManyRelation.php
+++ b/models/DataObject/ClassDefinition/Data/ManyToManyRelation.php
@@ -41,7 +41,6 @@ class ManyToManyRelation extends AbstractRelations implements QueryResourcePersi
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $maxItems = null;
 
@@ -53,7 +52,6 @@ class ManyToManyRelation extends AbstractRelations implements QueryResourcePersi
     /**
      * @internal
      *
-     * @var string
      */
     public string $assetUploadPath;
 
@@ -82,7 +80,6 @@ class ManyToManyRelation extends AbstractRelations implements QueryResourcePersi
      *
      * @internal
      *
-     * @var array
      */
     public array $assetTypes = [];
 
@@ -96,7 +93,6 @@ class ManyToManyRelation extends AbstractRelations implements QueryResourcePersi
      *
      * @internal
      *
-     * @var array
      */
     public array $documentTypes = [];
 
@@ -168,9 +164,6 @@ public function setAssetTypes(array $assetTypes): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataForPersistence(array|Element\ElementInterface $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         $return = [];
@@ -199,9 +192,6 @@ protected function prepareDataForPersistence(array|Element\ElementInterface $dat
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function loadData(array $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         $elements = [
@@ -229,11 +219,7 @@ protected function loadData(array $data, Localizedfield|AbstractData|\Pimcore\Mo
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @throws \Exception
      *
@@ -263,11 +249,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -299,11 +281,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataFromEditmode
      *
@@ -337,11 +315,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param array $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataFromGridEditor(array $data, Concrete $object = null, array $params = []): ?array
     {
@@ -349,11 +324,7 @@ public function getDataFromGridEditor(array $data, Concrete $object = null, arra
     }
 
     /**
-     * @param array|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
-     *
-     * @return array|null
      *
      * @todo: $pathes is undefined
      */
@@ -363,11 +334,7 @@ public function getDataForGrid(?array $data, Concrete $object = null, array $par
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -389,9 +356,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && empty($data)) {
@@ -424,9 +388,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -468,9 +429,6 @@ public function resolveDependencies(mixed $data): array
         return $dependencies;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preGetData(mixed $container, array $params = []): mixed
     {
         $data = null;
@@ -510,9 +468,6 @@ public function preGetData(mixed $container, array $params = []): mixed
         return is_array($data) ? $data : [];
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preSetData(mixed $container, mixed $data, array $params = []): mixed
     {
         if ($data === null) {
@@ -573,9 +528,6 @@ public function setAllowToClearRelation(bool $allowToClearRelation): void
         $this->allowToClearRelation = $allowToClearRelation;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -584,11 +536,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param array|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDiffVersionPreview(?array $data, Concrete $object = null, array $params = []): array
     {
@@ -604,9 +553,6 @@ public function getDiffVersionPreview(?array $data, Concrete $object = null, arr
         return $value;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -630,9 +576,6 @@ public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $m
         $this->documentTypes = $mainDefinition->documentTypes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getPhpdocType(): string
     {
         return $this->getPhpDocClassString(true);
@@ -659,10 +602,7 @@ public function normalize(mixed $value, array $params = []): ?array
 
     /** See marshal
      *
-     * @param mixed $value
-     * @param array $params
      *
-     * @return array|null
      */
     public function denormalize(mixed $value, array $params = []): ?array
     {
@@ -686,9 +626,7 @@ public function denormalize(mixed $value, array $params = []): ?array
     /**
      * Returns a ID which must be unique across the grid rows
      *
-     * @param array $item
      *
-     * @return string
      */
     public function buildUniqueKeyForDiffEditor(array $item): string
     {
@@ -704,11 +642,8 @@ public function buildUniqueKeyForDiffEditor(array $item): string
 
     /**
      * @param Element\ElementInterface[]|null $originalData
-     * @param array|null $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      */
     protected function processDiffDataForEditMode(?array $originalData, ?array $data, Concrete $object = null, array $params = []): ?array
     {
@@ -764,9 +699,6 @@ protected function processDiffDataForEditMode(?array $originalData, ?array $data
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
         $originalData = $data;
@@ -777,11 +709,8 @@ public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object
     }
 
     /** See parent class.
-     * @param array $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataFromEditmode(array $data, $object = null, array $params = []): ?array
     {
@@ -802,9 +731,6 @@ public function getDiffDataFromEditmode(array $data, $object = null, array $para
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isOptimizedAdminLoading(): bool
     {
         return true;
@@ -820,17 +746,11 @@ public function setEnableTextSelection(bool $enableTextSelection): void
         $this->enableTextSelection = $enableTextSelection;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addListingFilter(DataObject\Listing $listing, float|array|int|string|Model\Element\ElementInterface $data, string $operator = '='): DataObject\Listing
     {
         if ($data instanceof Element\ElementInterface) {
@@ -856,11 +776,7 @@ public function addListingFilter(DataObject\Listing $listing, float|array|int|st
     /**
      * Filter by relation feature
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
diff --git a/models/DataObject/ClassDefinition/Data/ManyToOneRelation.php b/models/DataObject/ClassDefinition/Data/ManyToOneRelation.php
index ef40fd43681..ec3cf34ca51 100644
--- a/models/DataObject/ClassDefinition/Data/ManyToOneRelation.php
+++ b/models/DataObject/ClassDefinition/Data/ManyToOneRelation.php
@@ -45,7 +45,6 @@ class ManyToOneRelation extends AbstractRelations implements QueryResourcePersis
     /**
      * @internal
      *
-     * @var string
      */
     public string $assetUploadPath;
 
@@ -74,7 +73,6 @@ class ManyToOneRelation extends AbstractRelations implements QueryResourcePersis
      *
      * @internal
      *
-     * @var array
      */
     public array $assetTypes = [];
 
@@ -88,7 +86,6 @@ class ManyToOneRelation extends AbstractRelations implements QueryResourcePersis
      *
      * @internal
      *
-     * @var array
      */
     public array $documentTypes = [];
 
@@ -152,9 +149,6 @@ public function setAssetTypes(array $assetTypes): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataForPersistence(array|Element\ElementInterface $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         if ($data instanceof Element\ElementInterface) {
@@ -171,9 +165,6 @@ protected function prepareDataForPersistence(array|Element\ElementInterface $dat
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function loadData(array $data, Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): mixed
     {
         // data from relation table
@@ -197,11 +188,7 @@ protected function loadData(array $data, Localizedfield|AbstractData|\Pimcore\Mo
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -220,11 +207,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -247,11 +230,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return Asset|Document|DataObject\AbstractObject|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -265,11 +244,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param array $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return Asset|Document|DataObject\AbstractObject|null
      */
     public function getDataFromGridEditor(array $data, Concrete $object = null, array $params = []): Asset|Document|DataObject\AbstractObject|null
     {
@@ -277,11 +253,8 @@ public function getDataFromGridEditor(array $data, Concrete $object = null, arra
     }
 
     /**
-     * @param Element\ElementInterface|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataForGrid(?Element\ElementInterface $data, Concrete $object = null, array $params = []): ?array
     {
@@ -289,11 +262,7 @@ public function getDataForGrid(?Element\ElementInterface $data, Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -307,9 +276,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && empty($data)) {
@@ -334,9 +300,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -393,9 +356,6 @@ public function preGetData(mixed $container, array $params = []): ?Element\Eleme
         return $data;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preSetData(mixed $container, mixed $data, array $params = []): mixed
     {
         $this->markLazyloadedFieldAsLoaded($container);
@@ -440,17 +400,11 @@ public function setAllowToClearRelation(bool $allowToClearRelation): void
         $this->allowToClearRelation = $allowToClearRelation;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -471,9 +425,6 @@ public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $m
         $this->relationType = $mainDefinition->relationType;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getPhpdocType(): string
     {
         return $this->getPhpDocClassString(false);
@@ -514,9 +465,6 @@ public function isEqual(mixed $oldValue, mixed $newValue): bool
         return $oldValue === $newValue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
@@ -532,9 +480,6 @@ public function getReturnTypeDeclaration(): ?string
         return '?\\' . Element\AbstractElement::class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addListingFilter(DataObject\Listing $listing, float|array|int|string|Model\Element\ElementInterface $data, string $operator = '='): DataObject\Listing
     {
         if ($data instanceof Element\ElementInterface) {
@@ -578,11 +523,7 @@ public function getPhpdocReturnType(): ?string
     /**
      * Filter by relation feature
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
diff --git a/models/DataObject/ClassDefinition/Data/Multiselect.php b/models/DataObject/ClassDefinition/Data/Multiselect.php
index d118f3d6c57..2cada3483a6 100644
--- a/models/DataObject/ClassDefinition/Data/Multiselect.php
+++ b/models/DataObject/ClassDefinition/Data/Multiselect.php
@@ -47,21 +47,18 @@ class Multiselect extends Data implements
      *
      * @internal
      *
-     * @var array|null
      */
     public ?array $options = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $maxItems = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $renderType = null;
 
@@ -70,7 +67,6 @@ class Multiselect extends Data implements
      *
      * @internal
      *
-     * @var string|null
      */
     public ?string $optionsProviderClass = null;
 
@@ -79,7 +75,6 @@ class Multiselect extends Data implements
      *
      * @internal
      *
-     * @var string|null
      */
     public ?string $optionsProviderData = null;
 
@@ -127,11 +122,7 @@ public function getRenderType(): ?string
     /**
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      */
     public function getDataForResource(mixed $data, DataObject\Concrete $object = null, array $params = []): ?string
     {
@@ -145,11 +136,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     /**
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataFromResource(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -163,11 +150,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     /**
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      */
     public function getDataForQueryResource(mixed $data, DataObject\Concrete $object = null, array $params = []): ?string
     {
@@ -181,11 +164,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     /**
      * @see Data::getDataForEditmode
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      */
     public function getDataForEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?string
     {
@@ -227,11 +206,7 @@ public function getDataForGrid(?array $data, Concrete $object = null, array $par
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return mixed
      *
      * @see Data::getDataFromEditmode
      *
@@ -241,10 +216,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getDiffDataFromEditmode($data, $object = null, $params = []): ?array
+    public function getDiffDataFromEditmode(array $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
         $data = $data[0]['data'];
         if (is_string($data) && $data !== '') {
@@ -255,11 +227,7 @@ public function getDiffDataFromEditmode($data, $object = null, $params = []): ?a
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -275,9 +243,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && empty($data)) {
@@ -289,9 +254,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -315,11 +277,7 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      */
     public function getFilterCondition(mixed $value, string $operator, array $params = []): string
     {
@@ -335,11 +293,8 @@ public function getFilterCondition(mixed $value, string $operator, array $params
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
      * @param array $params optional params used to change the behavior
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
@@ -370,9 +325,6 @@ public function getFilterConditionExt(mixed $value, string $operator, array $par
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -381,11 +333,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param array|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|string
      */
     public function getDiffVersionPreview(?array $data, Concrete $object = null, array $params = []): array|string
     {
@@ -467,9 +416,6 @@ public function removeData(mixed $existingData, mixed $removeData): array
         return $existingData;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
@@ -489,9 +435,6 @@ public function jsonSerialize(): mixed
         return parent::jsonSerialize();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveBlockedVars(): array
     {
         $blockedVars = parent::resolveBlockedVars();
@@ -526,8 +469,6 @@ public function getPhpdocReturnType(): ?string
     /**
      * Perform sanity checks, see #5010.
      *
-     * @param mixed $containerDefinition
-     * @param array $params
      */
     public function preSave(mixed $containerDefinition, array $params = []): void
     {
@@ -561,9 +502,6 @@ public function postSave(mixed $containerDefinition, array $params = []): void
         // nothing to do
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enrichFieldDefinition(array $context = []): static
     {
         $this->doEnrichDefinitionDefinition(null, $this->getName(),
@@ -572,9 +510,6 @@ public function enrichFieldDefinition(array $context = []): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enrichLayoutDefinition(?Concrete $object, array $context = []): static
     {
         $this->doEnrichDefinitionDefinition($object, $this->getName(),
diff --git a/models/DataObject/ClassDefinition/Data/Numeric.php b/models/DataObject/ClassDefinition/Data/Numeric.php
index 538ec6d4aff..ffaa85f681c 100644
--- a/models/DataObject/ClassDefinition/Data/Numeric.php
+++ b/models/DataObject/ClassDefinition/Data/Numeric.php
@@ -47,7 +47,6 @@ class Numeric extends Data implements ResourcePersistenceAwareInterface, QueryRe
     /**
      * @internal
      *
-     * @var float|int|string|null
      */
     public string|int|null|float $defaultValue = null;
 
@@ -64,14 +63,12 @@ class Numeric extends Data implements ResourcePersistenceAwareInterface, QueryRe
     /**
      * @internal
      *
-     * @var float|null
      */
     public ?float $minValue = null;
 
     /**
      * @internal
      *
-     * @var float|null
      */
     public ?float $maxValue = null;
 
@@ -87,7 +84,6 @@ class Numeric extends Data implements ResourcePersistenceAwareInterface, QueryRe
      *
      * @internal
      *
-     * @var int|null
      */
     public ?int $decimalSize = null;
 
@@ -97,7 +93,6 @@ class Numeric extends Data implements ResourcePersistenceAwareInterface, QueryRe
      *
      * @internal
      *
-     * @var int|null
      */
     public ?int $decimalPrecision = null;
 
@@ -274,11 +269,7 @@ private function buildDecimalColumnType(): string
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return float|int|string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -294,11 +285,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return float|int|string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -313,11 +300,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return float|int|string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      *
@@ -330,11 +313,7 @@ public function getDataForQueryResource(mixed $data, Concrete $object = null, ar
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return float|int|string|null
      *
      * @see Data::getDataForEditmode
      */
@@ -344,11 +323,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return float|int|string|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -358,11 +333,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string
      *
      * @see Data::getVersionPreview
      */
@@ -371,9 +342,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return (string) $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && $this->isEmpty($data)) {
@@ -409,9 +377,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params) ?? '';
@@ -422,11 +387,8 @@ public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollec
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
      * @param array $params optional params used to change the behavior
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
@@ -452,9 +414,6 @@ public function getFilterConditionExt(mixed $value, string $operator, array $par
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -480,9 +439,6 @@ private function toNumeric(mixed $value): float|int|string
         return (float) $value;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preSetData(mixed $container, mixed $data, array $params = []): mixed
     {
         if (!is_null($data) && $this->getDecimalPrecision()) {
@@ -492,9 +448,6 @@ public function preSetData(mixed $container, mixed $data, array $params = []): m
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/Data/NumericRange.php b/models/DataObject/ClassDefinition/Data/NumericRange.php
index c53253f5b68..710c7de7583 100644
--- a/models/DataObject/ClassDefinition/Data/NumericRange.php
+++ b/models/DataObject/ClassDefinition/Data/NumericRange.php
@@ -211,11 +211,7 @@ private function buildDecimalColumnType(): array
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -236,11 +232,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\NumericRange|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -266,11 +258,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return array
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -280,11 +268,7 @@ public function getDataForQueryResource(mixed $data, Concrete $object = null, ar
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -302,11 +286,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\NumericRange|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -325,11 +305,7 @@ public function getDataFromGridEditor(array $data, DataObject\Concrete $object =
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -344,7 +320,7 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
     }
 
     /**
-     * {@inheritDoc}
+     *
      *
      * @throws Exception
      */
@@ -364,9 +340,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -398,9 +371,6 @@ public function getDataForGrid(
         return $this->getDataForEditmode($data, $object, $params);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $isEmpty = true;
diff --git a/models/DataObject/ClassDefinition/Data/Objectbricks.php b/models/DataObject/ClassDefinition/Data/Objectbricks.php
index 0803332e9b2..1320611843a 100644
--- a/models/DataObject/ClassDefinition/Data/Objectbricks.php
+++ b/models/DataObject/ClassDefinition/Data/Objectbricks.php
@@ -34,14 +34,12 @@ class Objectbricks extends Data implements CustomResourcePersistingInterface, Ty
     /**
      * @internal
      *
-     * @var array
      */
     public array $allowedTypes = [];
 
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $maxItems = null;
 
@@ -75,11 +73,7 @@ public function setBorder(bool $border): void
     /**
      * @see Data::getDataForEditmode
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDataForEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): array
     {
@@ -244,11 +238,7 @@ private function getDataForField(Objectbrick\Data\AbstractData $item, string $ke
     /**
      * @see Data::getDataFromEditmode
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return Objectbrick
      */
     public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): Objectbrick
     {
@@ -305,11 +295,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     /**
      * @see Data::getVersionPreview
      *
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      */
     public function getVersionPreview(mixed $data, DataObject\Concrete $object = null, array $params = []): string
     {
@@ -318,9 +304,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return 'BRICKS';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         return 'NOT SUPPORTED';
@@ -405,9 +388,6 @@ public function setAllowedTypes(array|string|null $allowedTypes): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function preSetData(mixed $container, mixed $data, array $params = []): mixed
     {
         if ($data instanceof DataObject\Objectbrick) {
@@ -463,9 +443,6 @@ public function getCacheTags(mixed $data, array $tags = []): array
         return $tags;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCode(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         // getter
@@ -509,9 +486,6 @@ public function getGetterCode(DataObject\Objectbrick\Definition|DataObject\Class
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if ($data instanceof DataObject\Objectbrick) {
@@ -593,11 +567,8 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
     }
 
     /**
-     * @param Objectbrick|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string
      */
     public function getDataForGrid(?Objectbrick $data, Concrete $object = null, array $params = []): string
     {
@@ -666,11 +637,7 @@ private function doGetDiffDataForEditmode(Objectbrick $data, string $getter, arr
     }
 
     /** See parent class.
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -695,11 +662,7 @@ public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object
     /**
      * See parent class.
      *
-     * @param array $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return mixed
      */
     public function getDiffDataFromEditmode(array $data, DataObject\Concrete $object = null, array $params = []): mixed
     {
@@ -743,17 +706,11 @@ public function getDiffDataFromEditmode(array $data, DataObject\Concrete $object
         return $brickdata;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -795,8 +752,6 @@ public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $m
     /**
      * This method is called in DataObject\ClassDefinition::save() and is used to create the database table for the localized data
      *
-     * @param DataObject\ClassDefinition $class
-     * @param array $params
      */
     public function classSaved(DataObject\ClassDefinition $class, array $params = []): void
     {
diff --git a/models/DataObject/ClassDefinition/Data/OptimizedAdminLoadingInterface.php b/models/DataObject/ClassDefinition/Data/OptimizedAdminLoadingInterface.php
index 143a09f993d..6d7593c9caa 100644
--- a/models/DataObject/ClassDefinition/Data/OptimizedAdminLoadingInterface.php
+++ b/models/DataObject/ClassDefinition/Data/OptimizedAdminLoadingInterface.php
@@ -22,7 +22,6 @@ interface OptimizedAdminLoadingInterface
      * e.g. load relations directly from relations table and if necessary additional data
      * (like object attributes or meta data) asynchronously when the UI is ready
      *
-     * @return bool
      */
     public function isOptimizedAdminLoading(): bool;
 }
diff --git a/models/DataObject/ClassDefinition/Data/Password.php b/models/DataObject/ClassDefinition/Data/Password.php
index 2d4781d4e4d..a49a1fc3472 100644
--- a/models/DataObject/ClassDefinition/Data/Password.php
+++ b/models/DataObject/ClassDefinition/Data/Password.php
@@ -35,21 +35,18 @@ class Password extends Data implements ResourcePersistenceAwareInterface, QueryR
     /**
      * @internal
      *
-     * @var string
      */
     public string $algorithm = self::HASH_FUNCTION_PASSWORD_HASH;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $salt = '';
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $saltlocation = '';
 
@@ -96,11 +93,7 @@ public function getSaltlocation(): string
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -156,9 +149,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     /**
      * Calculate hash according to configured parameters
      *
-     * @param string $data
      *
-     * @return string
      *
      * @internal
      */
@@ -190,12 +181,8 @@ public function calculateHash(string $data): string
      * from the ones which were used to create the hash (e.g. cost was increased from 10 to 12).
      * In this case, the hash will be re-calculated with the new parameters and saved back to the object.
      *
-     * @param string $password
-     * @param DataObject\Concrete $object
      * @param bool|true $updateHash
      *
-     * @return bool
-     *
      * @internal
      */
     public function verifyPassword(string $password, DataObject\Concrete $object, bool $updateHash = true): bool
@@ -230,11 +217,7 @@ public function verifyPassword(string $password, DataObject\Concrete $object, bo
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -244,11 +227,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -276,11 +255,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -300,20 +275,14 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
     }
 
     /**
-     * @param array $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return mixed
      */
     public function getDiffDataFromEditmode(array $data, $object = null, array $params = []): mixed
     {
@@ -321,11 +290,7 @@ public function getDiffDataFromEditmode(array $data, $object = null, array $para
     }
 
     /** See parent class.
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -380,9 +345,6 @@ public function getPhpdocReturnType(): ?string
     }
 
     /**
-     * @param mixed $data
-     * @param bool $omitMandatoryCheck
-     * @param array $params
      *
      * @throws Model\Element\ValidationException|\Exception
      */
diff --git a/models/DataObject/ClassDefinition/Data/PreGetDataInterface.php b/models/DataObject/ClassDefinition/Data/PreGetDataInterface.php
index 1e8c8a1ccf2..beb0962a48d 100644
--- a/models/DataObject/ClassDefinition/Data/PreGetDataInterface.php
+++ b/models/DataObject/ClassDefinition/Data/PreGetDataInterface.php
@@ -24,9 +24,7 @@ interface PreGetDataInterface
 {
     /**
      * @param mixed $container any container type, e.g. Concrete, Localizedfield, AbstractData, etc ...
-     * @param array $params
      *
-     * @return mixed
      */
     public function preGetData(mixed $container, array $params = []): mixed;
 }
diff --git a/models/DataObject/ClassDefinition/Data/PreSetDataInterface.php b/models/DataObject/ClassDefinition/Data/PreSetDataInterface.php
index 0486c12cf5e..9009d8f9e8d 100644
--- a/models/DataObject/ClassDefinition/Data/PreSetDataInterface.php
+++ b/models/DataObject/ClassDefinition/Data/PreSetDataInterface.php
@@ -22,10 +22,7 @@ interface PreSetDataInterface
 {
     /**
      * @param mixed $container any container type, e.g. Concrete, Localizedfield, AbstractData, etc ...
-     * @param mixed $data
-     * @param array $params
      *
-     * @return mixed
      */
     public function preSetData(mixed $container, mixed $data, array $params = []): mixed;
 }
diff --git a/models/DataObject/ClassDefinition/Data/QuantityValue.php b/models/DataObject/ClassDefinition/Data/QuantityValue.php
index 239ec33c260..d1c8f8146a0 100644
--- a/models/DataObject/ClassDefinition/Data/QuantityValue.php
+++ b/models/DataObject/ClassDefinition/Data/QuantityValue.php
@@ -269,9 +269,6 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (
diff --git a/models/DataObject/ClassDefinition/Data/QuantityValueRange.php b/models/DataObject/ClassDefinition/Data/QuantityValueRange.php
index beff7b56272..10d7853b113 100644
--- a/models/DataObject/ClassDefinition/Data/QuantityValueRange.php
+++ b/models/DataObject/ClassDefinition/Data/QuantityValueRange.php
@@ -109,7 +109,6 @@ public function setAutoConvert(bool $autoConvert): void
     }
 
     /**
-     * @param DataObject\Concrete|null $object
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -131,7 +130,6 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param DataObject\Concrete|null $object
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -157,7 +155,6 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param DataObject\Concrete|null $object
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -167,7 +164,6 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param DataObject\Concrete|null $object
      *
      * @see Data::getDataForEditmode
      *
@@ -186,11 +182,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return DataObject\Data\QuantityValueRange|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -213,7 +205,6 @@ public function getDataFromGridEditor(array $data, DataObject\Concrete $object =
     }
 
     /**
-     * @param DataObject\Concrete|null $object
      *
      * @see Data::getVersionPreview
      *
@@ -228,7 +219,7 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @throws Exception
      */
@@ -290,9 +281,6 @@ public function getDataForGrid(
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         $fieldName = $this->getName();
diff --git a/models/DataObject/ClassDefinition/Data/QueryResourcePersistenceAwareInterface.php b/models/DataObject/ClassDefinition/Data/QueryResourcePersistenceAwareInterface.php
index 46ce30350b9..3dbc716f8ca 100644
--- a/models/DataObject/ClassDefinition/Data/QueryResourcePersistenceAwareInterface.php
+++ b/models/DataObject/ClassDefinition/Data/QueryResourcePersistenceAwareInterface.php
@@ -23,9 +23,6 @@ interface QueryResourcePersistenceAwareInterface
     /**
      * Returns the data which should be stored in the query columns
      *
-     * @param mixed $data
-     * @param null|Concrete $object
-     * @param array $params
      *
      * @return mixed
      *
diff --git a/models/DataObject/ClassDefinition/Data/Relations/AbstractRelations.php b/models/DataObject/ClassDefinition/Data/Relations/AbstractRelations.php
index 88c8d59bae6..745a02aa353 100644
--- a/models/DataObject/ClassDefinition/Data/Relations/AbstractRelations.php
+++ b/models/DataObject/ClassDefinition/Data/Relations/AbstractRelations.php
@@ -44,7 +44,6 @@ abstract class AbstractRelations extends Data implements
      *
      * @internal
      *
-     * @var array
      */
     public array $classes = [];
 
@@ -60,7 +59,6 @@ abstract class AbstractRelations extends Data implements
      *
      * @internal
      *
-     * @var null|string
      */
     public ?string $pathFormatterClass = null;
 
@@ -192,11 +190,7 @@ public function load(Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objec
     }
 
     /**
-     * @param array $data
-     * @param Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete|null $object
-     * @param array $params
      *
-     * @return mixed
      *
      * @internal
      */
@@ -205,9 +199,6 @@ abstract protected function loadData(array $data, Localizedfield|AbstractData|\P
     /**
      * @param array|ElementInterface $data
      * @param Localizedfield|AbstractData|DataObject\Objectbrick\Data\AbstractData|Concrete|null $object
-     * @param array $params
-     *
-     * @return mixed
      *
      * @internal
      */
@@ -228,10 +219,7 @@ public function delete(Localizedfield|AbstractData|\Pimcore\Model\DataObject\Obj
      *  "asset" => array(...)
      * )
      *
-     * @param mixed $data
-     * @param array $idMapping
      *
-     * @return array
      *
      * @internal
      */
@@ -323,9 +311,7 @@ public function removeData(mixed $existingData, mixed $removeData): array
     }
 
     /**
-     * @param Element\ElementInterface $item
      *
-     * @return string
      *
      * @internal
      */
@@ -337,9 +323,6 @@ protected function buildUniqueKeyForAppending(Element\ElementInterface $item): s
         return $elementType . $id;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isEqual(mixed $array1, mixed $array2): bool
     {
         $array1 = array_filter(is_array($array1) ? $array1 : []);
@@ -375,8 +358,6 @@ public function supportsDirtyDetection(): bool
     /**
      * @internal
      *
-     * @param DataObject\Fieldcollection\Data\AbstractData $item
-     *
      * @throws \Exception
      */
     protected function loadLazyFieldcollectionField(DataObject\Fieldcollection\Data\AbstractData $item): void
@@ -396,8 +377,6 @@ protected function loadLazyFieldcollectionField(DataObject\Fieldcollection\Data\
     /**
      * @internal
      *
-     * @param DataObject\Objectbrick\Data\AbstractData $item
-     *
      * @throws \Exception
      */
     protected function loadLazyBrickField(DataObject\Objectbrick\Data\AbstractData $item): void
@@ -419,7 +398,6 @@ protected function loadLazyBrickField(DataObject\Objectbrick\Data\AbstractData $
     /**
      * checks for multiple assignments and throws an exception in case the rules are violated.
      *
-     * @param array|null $data
      *
      * @throws Element\ValidationException
      *
@@ -492,7 +470,6 @@ public function getPhpdocReturnType(): ?string
     /**
      * @internal
      *
-     * @return string
      */
     abstract protected function getPhpdocType(): string;
 }
diff --git a/models/DataObject/ClassDefinition/Data/Relations/AllowAssetRelationTrait.php b/models/DataObject/ClassDefinition/Data/Relations/AllowAssetRelationTrait.php
index 319f97d2352..9dcbd2d1030 100644
--- a/models/DataObject/ClassDefinition/Data/Relations/AllowAssetRelationTrait.php
+++ b/models/DataObject/ClassDefinition/Data/Relations/AllowAssetRelationTrait.php
@@ -27,9 +27,7 @@ trait AllowAssetRelationTrait
     /**
      * Checks if an asset is an allowed relation
      *
-     * @param Asset $asset
      *
-     * @return bool
      *
      * @internal
      */
diff --git a/models/DataObject/ClassDefinition/Data/Relations/AllowDocumentRelationTrait.php b/models/DataObject/ClassDefinition/Data/Relations/AllowDocumentRelationTrait.php
index 22d5e3e657f..1f2c009ef38 100644
--- a/models/DataObject/ClassDefinition/Data/Relations/AllowDocumentRelationTrait.php
+++ b/models/DataObject/ClassDefinition/Data/Relations/AllowDocumentRelationTrait.php
@@ -27,9 +27,7 @@ trait AllowDocumentRelationTrait
     /**
      * Checks if a document is an allowed relation
      *
-     * @param Document $document
      *
-     * @return bool
      *
      * @internal
      */
diff --git a/models/DataObject/ClassDefinition/Data/Relations/AllowObjectRelationTrait.php b/models/DataObject/ClassDefinition/Data/Relations/AllowObjectRelationTrait.php
index 78ef4e1e82f..b197c5c9a31 100644
--- a/models/DataObject/ClassDefinition/Data/Relations/AllowObjectRelationTrait.php
+++ b/models/DataObject/ClassDefinition/Data/Relations/AllowObjectRelationTrait.php
@@ -27,9 +27,7 @@ trait AllowObjectRelationTrait
     /**
      * Checks if an object is an allowed relation
      *
-     * @param DataObject\AbstractObject $object
      *
-     * @return bool
      *
      * @internal
      */
diff --git a/models/DataObject/ClassDefinition/Data/ResourcePersistenceAwareInterface.php b/models/DataObject/ClassDefinition/Data/ResourcePersistenceAwareInterface.php
index f91e193f248..d7246862168 100644
--- a/models/DataObject/ClassDefinition/Data/ResourcePersistenceAwareInterface.php
+++ b/models/DataObject/ClassDefinition/Data/ResourcePersistenceAwareInterface.php
@@ -23,22 +23,14 @@ interface ResourcePersistenceAwareInterface
     /**
      * Returns the the data that should be stored in the resource
      *
-     * @param mixed $data
-     * @param null|Concrete $object
-     * @param array $params
      *
-     * @return mixed
      */
     public function getDataForResource(mixed $data, Concrete $object = null, array $params = []): mixed;
 
     /**
      * Convert the saved data in the resource to the internal eg. Image-Id to Asset\Image object, this is the inverted getDataForResource()
      *
-     * @param mixed $data
-     * @param null|Concrete $object
-     * @param array $params
      *
-     * @return mixed
      */
     public function getDataFromResource(mixed $data, Concrete $object = null, array $params = []): mixed;
 
diff --git a/models/DataObject/ClassDefinition/Data/ReverseObjectRelation.php b/models/DataObject/ClassDefinition/Data/ReverseObjectRelation.php
index e3a8c13e8b9..f4c388875b2 100644
--- a/models/DataObject/ClassDefinition/Data/ReverseObjectRelation.php
+++ b/models/DataObject/ClassDefinition/Data/ReverseObjectRelation.php
@@ -35,14 +35,12 @@ class ReverseObjectRelation extends ManyToManyObjectRelation
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $ownerClassId = null;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $ownerFieldName;
 
@@ -115,10 +113,7 @@ public function setOwnerFieldName(string $fieldName): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function allowObjectRelation($object): bool
+    protected function allowObjectRelation(DataObject\AbstractObject $object): bool
     {
         //only relations of owner type are allowed
         $ownerClass = DataObject\ClassDefinition::getByName($this->getOwnerClassName());
@@ -132,9 +127,6 @@ protected function allowObjectRelation($object): bool
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         //TODO
@@ -186,17 +178,11 @@ public function resolveDependencies(mixed $data): array
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isOptimizedAdminLoading(): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function preGetData(mixed $container, array $params = []): array
     {
         return $this->load($container);
diff --git a/models/DataObject/ClassDefinition/Data/RgbaColor.php b/models/DataObject/ClassDefinition/Data/RgbaColor.php
index 64e36da1b79..46a4d07f21e 100644
--- a/models/DataObject/ClassDefinition/Data/RgbaColor.php
+++ b/models/DataObject/ClassDefinition/Data/RgbaColor.php
@@ -36,11 +36,7 @@ class RgbaColor extends Data implements
     use DataObject\Traits\DataWidthTrait;
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return array
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -64,11 +60,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return Model\DataObject\Data\RgbaColor|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -95,11 +87,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return array
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -109,11 +97,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see Data::getDataForEditmode
      *
@@ -130,11 +114,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return Model\DataObject\Data\RgbaColor|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -152,20 +132,14 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param string|null $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return Model\DataObject\Data\RgbaColor|null
      */
     public function getDataFromGridEditor(?string $data, Concrete $object = null, array $params = []): ?Model\DataObject\Data\RgbaColor
     {
         return $this->getDataFromEditmode($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         parent::checkValidity($data, $omitMandatoryCheck);
@@ -206,11 +180,8 @@ public function isEmpty(mixed $data): bool
     /**
      * display the quantity value field data in the grid
      *
-     * @param Model\DataObject\Data\RgbaColor|null $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string|null
      */
     public function getDataForGrid(?Model\DataObject\Data\RgbaColor $data, Concrete $object = null, array $params = []): ?string
     {
@@ -218,11 +189,8 @@ public function getDataForGrid(?Model\DataObject\Data\RgbaColor $data, Concrete
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      */
     public function getVersionPreview(mixed $data, DataObject\Concrete $object = null, array $params = []): string
     {
@@ -266,9 +234,6 @@ public function denormalize(mixed $value, array $params = []): ?Model\DataObject
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -279,11 +244,7 @@ public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollec
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      *
      */
     public function getFilterCondition(mixed $value, string $operator, array $params = []): string
@@ -300,11 +261,8 @@ public function getFilterCondition(mixed $value, string $operator, array $params
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
      * @param array $params optional params used to change the behavior
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
@@ -330,13 +288,11 @@ public function getFilterConditionExt(mixed $value, string $operator, array $par
         return $key . ' ' . $operator . ' ' . $value . ' ';
     }
 
-    /** { @inheritdoc } */
     public function marshalBeforeEncryption(mixed $value, Concrete $object = null, array $params = []): mixed
     {
         return Serialize::serialize($value);
     }
 
-    /** { @inheritdoc } */
     public function unmarshalAfterDecryption(mixed $value, Concrete $object = null, array $params = []): mixed
     {
         return Serialize::unserialize($value);
diff --git a/models/DataObject/ClassDefinition/Data/Select.php b/models/DataObject/ClassDefinition/Data/Select.php
index 5778de14319..1dbb50d245d 100644
--- a/models/DataObject/ClassDefinition/Data/Select.php
+++ b/models/DataObject/ClassDefinition/Data/Select.php
@@ -46,14 +46,12 @@ class Select extends Data implements
      *
      * @internal
      *
-     * @var array|null
      */
     public ?array $options = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $defaultValue = null;
 
@@ -62,7 +60,6 @@ class Select extends Data implements
      *
      * @internal
      *
-     * @var string|null
      */
     public ?string $optionsProviderClass = null;
 
@@ -71,7 +68,6 @@ class Select extends Data implements
      *
      * @internal
      *
-     * @var string|null
      */
     public ?string $optionsProviderData = null;
 
@@ -80,7 +76,6 @@ class Select extends Data implements
      *
      * @internal
      *
-     * @var int
      */
     public int $columnLength = 190;
 
@@ -138,11 +133,7 @@ public function setOptions(?array $options): static
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return  null|string|int
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -154,11 +145,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return  null|string|int
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -168,11 +155,7 @@ public function getDataFromResource(mixed $data, Concrete $object = null, array
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -182,11 +165,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return  null|string|int
      *
      * @see Data::getDataForEditmode
      *
@@ -197,11 +176,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return  null|string|int
      *
      * @see Data::getDataFromEditmode
      *
@@ -212,11 +187,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -226,20 +197,13 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return htmlspecialchars((string) $data, ENT_QUOTES, 'UTF-8');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
     }
 
     /** See parent class.
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
@@ -269,9 +233,6 @@ public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object
         return $result;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && $this->isEmpty($data)) {
@@ -330,9 +291,6 @@ public function setOptionsProviderData(?string $optionsProviderData): void
         $this->optionsProviderData = $optionsProviderData;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function enrichFieldDefinition(array $context = []): static
     {
         $this->doEnrichDefinitionDefinition(null, $this->getName(),
@@ -341,9 +299,6 @@ public function enrichFieldDefinition(array $context = []): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enrichLayoutDefinition(?Concrete $object, array $context = []): static
     {
         $this->doEnrichDefinitionDefinition($object, $this->getName(),
@@ -353,11 +308,8 @@ public function enrichLayoutDefinition(?Concrete $object, array $context = []):
     }
 
     /**
-     * @param string|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|string|null
      */
     public function getDataForGrid(?string $data, Concrete $object = null, array $params = []): array|string|null
     {
@@ -392,11 +344,8 @@ public function getDataForGrid(?string $data, Concrete $object = null, array $pa
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
      * @param array $params optional params used to change the behavior
      *
-     * @return string
      */
     public function getFilterConditionExt(mixed $value, string $operator, array $params = []): string
     {
@@ -419,9 +368,6 @@ public function getFilterConditionExt(mixed $value, string $operator, array $par
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
@@ -458,9 +404,6 @@ public function jsonSerialize(): mixed
         return parent::jsonSerialize();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveBlockedVars(): array
     {
         $blockedVars = parent::resolveBlockedVars();
diff --git a/models/DataObject/ClassDefinition/Data/Slider.php b/models/DataObject/ClassDefinition/Data/Slider.php
index 51c03caf2c0..6ee55157c56 100644
--- a/models/DataObject/ClassDefinition/Data/Slider.php
+++ b/models/DataObject/ClassDefinition/Data/Slider.php
@@ -32,14 +32,12 @@ class Slider extends Data implements ResourcePersistenceAwareInterface, QueryRes
     /**
      * @internal
      *
-     * @var float|null
      */
     public ?float $minValue = null;
 
     /**
      * @internal
      *
-     * @var float|null
      */
     public ?float $maxValue = null;
 
@@ -51,14 +49,12 @@ class Slider extends Data implements ResourcePersistenceAwareInterface, QueryRes
     /**
      * @internal
      *
-     * @var float|null
      */
     public ?float $increment = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $decimalPrecision = null;
 
@@ -123,11 +119,7 @@ public function setDecimalPrecision(?int $decimalPrecision): static
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return float|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -141,11 +133,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return float|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -159,11 +147,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return float|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -173,11 +157,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return float|null
      *
      * @see Data::getDataForEditmode
      *
@@ -188,11 +168,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return float|null
      *
      * @see Data::getDataFromEditmode
      *
@@ -203,11 +179,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param float|null $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return float|null
      */
     public function getDataFromGridEditor(?float $data, Concrete $object = null, array $params = []): ?float
     {
@@ -215,11 +188,7 @@ public function getDataFromGridEditor(?float $data, Concrete $object = null, arr
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -229,9 +198,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return (string)$data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && $data === null) {
@@ -243,9 +209,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -263,9 +226,6 @@ public function synchronizeWithMainDefinition(DataObject\ClassDefinition\Data $m
         $this->decimalPrecision = $mainDefinition->decimalPrecision;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/Data/StructuredTable.php b/models/DataObject/ClassDefinition/Data/StructuredTable.php
index 195afeb2bd9..e075a34aaa8 100644
--- a/models/DataObject/ClassDefinition/Data/StructuredTable.php
+++ b/models/DataObject/ClassDefinition/Data/StructuredTable.php
@@ -32,28 +32,24 @@ class StructuredTable extends Data implements ResourcePersistenceAwareInterface,
     /**
      * @internal
      *
-     * @var int
      */
     public int $labelWidth = 0;
 
     /**
      * v
      *
-     * @var string
      */
     public string $labelFirstCell;
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $cols = [];
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $rows = [];
 
@@ -127,11 +123,7 @@ public function setRows(array $rows): static
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
@@ -154,11 +146,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return DataObject\Data\StructuredTable
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -185,11 +173,7 @@ public function getDataFromResource(mixed $data, Concrete $object = null, array
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -199,11 +183,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see Data::getDataForEditmode
      *
@@ -232,11 +212,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\StructuredTable
      *
      * @see Data::getDataFromEditmode
      */
@@ -255,11 +231,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param DataObject\Data\StructuredTable|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataForGrid(?DataObject\Data\StructuredTable $data, Concrete $object = null, array $params = []): ?array
     {
@@ -273,11 +246,7 @@ public function getDataForGrid(?DataObject\Data\StructuredTable $data, Concrete
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -291,9 +260,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory()) {
@@ -318,9 +284,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $value = $this->getDataFromObjectParam($object, $params);
@@ -382,7 +345,6 @@ protected function calculateDbColumns(): array
      * @param string $type text|number|bool
      * @param int|null $length The length of the column, default is 255 for text
      *
-     * @return string|null
      */
     protected function typeMapper(string $type, int $length = null): ?string
     {
@@ -404,20 +366,13 @@ public function isEmpty(mixed $data): bool
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
     }
 
     /** See parent class.
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDiffDataForEditMode(mixed $data, DataObject\Concrete $object = null, array $params = []): ?array
     {
diff --git a/models/DataObject/ClassDefinition/Data/Table.php b/models/DataObject/ClassDefinition/Data/Table.php
index 44dee8379bf..10aaa2cb54f 100644
--- a/models/DataObject/ClassDefinition/Data/Table.php
+++ b/models/DataObject/ClassDefinition/Data/Table.php
@@ -34,7 +34,6 @@ class Table extends Data implements ResourcePersistenceAwareInterface, QueryReso
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $cols = null;
 
@@ -46,7 +45,6 @@ class Table extends Data implements ResourcePersistenceAwareInterface, QueryReso
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $rows = null;
 
@@ -60,7 +58,6 @@ class Table extends Data implements ResourcePersistenceAwareInterface, QueryReso
      *
      * @internal
      *
-     * @var string
      */
     public string $data = '';
 
@@ -72,7 +69,6 @@ class Table extends Data implements ResourcePersistenceAwareInterface, QueryReso
     /**
      * @internal
      *
-     * @var array
      */
     public array $columnConfig = [];
 
@@ -171,11 +167,7 @@ protected function convertDataToValueArray(array $data): array
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -195,11 +187,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -239,11 +227,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -266,11 +250,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -291,11 +271,7 @@ public function getDataForGrid(?array $data, Concrete $object = null, array $par
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataFromEditmode
      *
@@ -321,11 +297,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param array $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function getDataFromGridEditor(array $data, Concrete $object = null, array $params = []): ?array
     {
@@ -333,11 +306,7 @@ public function getDataFromGridEditor(array $data, Concrete $object = null, arra
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -352,9 +321,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && empty($data)) {
@@ -366,9 +332,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -399,9 +362,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -410,11 +370,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param array|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|string
      */
     public function getDiffVersionPreview(?array $data, Concrete $object = null, array $params = []): array|string
     {
@@ -496,9 +453,6 @@ public function getPhpdocReturnType(): ?string
         return 'array';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCode(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         $key = $this->getName();
@@ -545,9 +499,6 @@ public function getGetterCode(DataObject\Objectbrick\Definition|DataObject\Class
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCodeObjectbrick(\Pimcore\Model\DataObject\Objectbrick\Definition $brickClass): string
     {
         $key = $this->getName();
@@ -592,9 +543,6 @@ public function getGetterCodeObjectbrick(\Pimcore\Model\DataObject\Objectbrick\D
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCodeFieldcollection(Definition $fieldcollectionDefinition): string
     {
         $key = $this->getName();
@@ -632,9 +580,6 @@ public function getGetterCodeFieldcollection(Definition $fieldcollectionDefiniti
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getGetterCodeLocalizedfields(DataObject\Objectbrick\Definition|DataObject\ClassDefinition|DataObject\Fieldcollection\Definition $class): string
     {
         $key = $this->getName();
diff --git a/models/DataObject/ClassDefinition/Data/Textarea.php b/models/DataObject/ClassDefinition/Data/Textarea.php
index 2cb6df0bce8..a47ac563b61 100644
--- a/models/DataObject/ClassDefinition/Data/Textarea.php
+++ b/models/DataObject/ClassDefinition/Data/Textarea.php
@@ -32,7 +32,6 @@ class Textarea extends Data implements ResourcePersistenceAwareInterface, QueryR
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $maxLength = null;
 
@@ -79,11 +78,7 @@ public function setExcludeFromSearchIndex(bool $excludeFromSearchIndex): static
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -93,11 +88,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -107,11 +98,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -121,11 +108,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return string|null
      *
      * @see Data::getDataForEditmode
      *
@@ -152,11 +135,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
      * Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param string|null $data
-     * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|string
      */
     public function getDiffVersionPreview(?string $data, Model\DataObject\Concrete $object = null, array $params = []): array|string
     {
@@ -184,9 +163,6 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMaxLength() !== null) {
@@ -198,9 +174,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         parent::checkValidity($data, $omitMandatoryCheck);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/Data/Time.php b/models/DataObject/ClassDefinition/Data/Time.php
index 0bc8c5fa777..2ac108ed3ce 100644
--- a/models/DataObject/ClassDefinition/Data/Time.php
+++ b/models/DataObject/ClassDefinition/Data/Time.php
@@ -27,28 +27,24 @@ class Time extends Model\DataObject\ClassDefinition\Data\Input
      *
      * @internal
      *
-     * @var int
      */
     public int $columnLength = 5;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $minValue = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $maxValue = null;
 
     /**
      * @internal
      *
-     * @var int
      */
     public int $increment = 15 ;
 
@@ -80,9 +76,6 @@ public function setMaxValue(?string $maxValue): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         parent::checkValidity($data, $omitMandatoryCheck);
@@ -110,9 +103,6 @@ public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, arr
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return true;
@@ -126,9 +116,7 @@ public function isEmpty(mixed $data): bool
     /**
      * Returns a 5 digit time string of a given time
      *
-     * @param string $timestamp
      *
-     * @return null|string
      */
     private function toTime(string $timestamp): ?string
     {
@@ -143,10 +131,7 @@ private function toTime(string $timestamp): ?string
     /**
      * Returns a timestamp representation of a given time
      *
-     * @param string $string
-     * @param int|null $baseTimestamp
      *
-     * @return int
      */
     private function toTimestamp(string $string, int $baseTimestamp = null): int
     {
@@ -160,10 +145,7 @@ private function toTimestamp(string $string, int $baseTimestamp = null): int
     /**
      * Returns whether or not a time is earlier than the subject
      *
-     * @param string $subject
-     * @param string $comparison
      *
-     * @return bool
      */
     private function isEarlier(string $subject, string $comparison): bool
     {
@@ -175,10 +157,7 @@ private function isEarlier(string $subject, string $comparison): bool
     /**
      * Returns whether or not a time is later than the subject
      *
-     * @param string $subject
-     * @param string $comparison
      *
-     * @return bool
      */
     private function isLater(string $subject, string $comparison): bool
     {
diff --git a/models/DataObject/ClassDefinition/Data/UrlSlug.php b/models/DataObject/ClassDefinition/Data/UrlSlug.php
index da8217af1d3..17e320cef9f 100644
--- a/models/DataObject/ClassDefinition/Data/UrlSlug.php
+++ b/models/DataObject/ClassDefinition/Data/UrlSlug.php
@@ -39,14 +39,12 @@ class UrlSlug extends Data implements CustomResourcePersistingInterface, LazyLoa
     /**
      * @internal
      *
-     * @var int|null
      */
     public ?int $domainLabelWidth = null;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $action;
 
@@ -60,11 +58,8 @@ class UrlSlug extends Data implements CustomResourcePersistingInterface, LazyLoa
     /**
      * @see Data::getDataForEditmode
      *
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDataForEditmode(mixed $data, DataObject\Concrete $object = null, array $params = []): array
     {
@@ -94,9 +89,6 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
      * @return Model\DataObject\Data\UrlSlug[]
      */
@@ -121,9 +113,7 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param float $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
      * @return Model\DataObject\Data\UrlSlug[]
      */
@@ -132,9 +122,6 @@ public function getDataFromGridEditor(float $data, Concrete $object = null, arra
         return $this->getDataFromEditmode($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if ($data && !is_array($data)) {
@@ -253,11 +240,8 @@ public function save(Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objec
     }
 
     /**
-     * @param mixed $data
      * @param Model\DataObject\Concrete|Model\DataObject\Fieldcollection\Data\AbstractData|Model\DataObject\Objectbrick\Data\AbstractData|Model\DataObject\Localizedfield|null $object
-     * @param array $params
      *
-     * @return array|null
      */
     public function prepareDataForPersistence(mixed $data, Localizedfield|AbstractData|Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object = null, array $params = []): ?array
     {
@@ -434,18 +418,13 @@ public function getVersionPreview(mixed $data, Model\DataObject\Concrete $object
     /**
      * @param null|Model\DataObject\Data\UrlSlug[] $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDataForGrid(?array $data, Concrete $object = null, array $params = []): array
     {
         return $this->getDataForEditmode($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
@@ -454,11 +433,7 @@ public function isFilterable(): bool
     /**
      * returns sql query statement to filter according to this data types value(s)
      *
-     * @param mixed $value
-     * @param string $operator
-     * @param array $params
      *
-     * @return string
      *
      */
     public function getFilterCondition(mixed $value, string $operator, array $params = []): string
@@ -504,9 +479,6 @@ public function setDomainLabelWidth(?int $domainLabelWidth): static
         return $this;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preGetData(mixed $container, array $params = []): mixed
     {
         $data = null;
@@ -553,9 +525,6 @@ public function preGetData(mixed $container, array $params = []): mixed
         return is_array($data) ? $data : [];
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function preSetData(mixed $container, mixed $data, array $params = []): mixed
     {
         if ($data === null) {
@@ -572,9 +541,6 @@ public function getLazyLoading(): bool
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $result = [];
@@ -590,9 +556,6 @@ public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollec
         return implode(',', $result);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsInheritance(): bool
     {
         return false;
diff --git a/models/DataObject/ClassDefinition/Data/User.php b/models/DataObject/ClassDefinition/Data/User.php
index a001872b38b..a9c3793ff08 100644
--- a/models/DataObject/ClassDefinition/Data/User.php
+++ b/models/DataObject/ClassDefinition/Data/User.php
@@ -47,11 +47,8 @@ protected function init(): static
     /**
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
-     * @param mixed $data
      * @param null|Model\DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      */
     public function getDataFromResource(mixed $data, Concrete $object = null, array $params = []): ?string
     {
@@ -69,11 +66,8 @@ public function getDataFromResource(mixed $data, Concrete $object = null, array
     /**
      * @see ResourcePersistenceAwareInterface::getDataForResource
      *
-     * @param mixed $data
      * @param Model\DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return null|string
      */
     public function getDataForResource(mixed $data, DataObject\Concrete $object = null, array $params = []): ?string
     {
@@ -119,9 +113,6 @@ public function configureOptions(): void
         $this->setOptions($options);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && empty($data)) {
@@ -175,9 +166,6 @@ public function jsonSerialize(): mixed
         return parent::jsonSerialize();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveBlockedVars(): array
     {
         $blockedVars = parent::resolveBlockedVars();
diff --git a/models/DataObject/ClassDefinition/Data/VarExporterInterface.php b/models/DataObject/ClassDefinition/Data/VarExporterInterface.php
index 4111e3e1b22..e8296af36f1 100644
--- a/models/DataObject/ClassDefinition/Data/VarExporterInterface.php
+++ b/models/DataObject/ClassDefinition/Data/VarExporterInterface.php
@@ -23,7 +23,6 @@ public function getBlockedVarsForExport(): array;
     /**
      * Resolves blocked vars to cleanup on export
      *
-     * @return array
      */
     public function resolveBlockedVars(): array;
 
diff --git a/models/DataObject/ClassDefinition/Data/Video.php b/models/DataObject/ClassDefinition/Data/Video.php
index 89eeb54dccb..b8516fcc1f4 100644
--- a/models/DataObject/ClassDefinition/Data/Video.php
+++ b/models/DataObject/ClassDefinition/Data/Video.php
@@ -54,14 +54,12 @@ class Video extends Data implements
     /**
      * @internal
      *
-     * @var array|null
      */
     public ?array $allowedTypes = null;
 
     /**
      * @internal
      *
-     * @var array
      */
     public array $supportedTypes = [
         self::TYPE_ASSET,
@@ -103,11 +101,7 @@ public function getSupportedTypes(): array
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -133,11 +127,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
-     *
-     * @return DataObject\Data\Video|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      *
@@ -180,11 +170,7 @@ public function getDataFromResource(mixed $data, Concrete $object = null, array
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -194,11 +180,7 @@ public function getDataForQueryResource(mixed $data, DataObject\Concrete $object
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return array|null
      *
      * @see Data::getDataForEditmode
      *
@@ -221,11 +203,7 @@ public function getDataForEditmode(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Video|null
      *
      * @see Data::getDataFromEditmode
      */
@@ -262,11 +240,8 @@ public function getDataFromEditmode(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param array|null $data
      * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return DataObject\Data\Video|null
      */
     public function getDataFromGridEditor(?array $data, Concrete $object = null, array $params = []): ?DataObject\Data\Video
     {
@@ -274,11 +249,8 @@ public function getDataFromGridEditor(?array $data, Concrete $object = null, arr
     }
 
     /**
-     * @param DataObject\Data\Video|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array
      */
     public function getDataForGrid(?DataObject\Data\Video $data, Concrete $object = null, array $params = []): array
     {
@@ -295,11 +267,7 @@ public function getDataForGrid(?DataObject\Data\Video $data, Concrete $object =
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string
      *
      * @see Data::getVersionPreview
      *
@@ -313,9 +281,6 @@ public function getVersionPreview(mixed $data, DataObject\Concrete $object = nul
         return parent::getVersionPreview($data, $object, $params);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getForCsvExport(DataObject\Localizedfield|DataObject\Fieldcollection\Data\AbstractData|DataObject\Objectbrick\Data\AbstractData|DataObject\Concrete $object, array $params = []): string
     {
         $data = $this->getDataFromObjectParam($object, $params);
@@ -360,9 +325,6 @@ public function getCacheTags(mixed $data, array $tags = []): array
         return $tags;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function enrichFieldDefinition(array $context = []): static
     {
         if (empty($this->getAllowedTypes()) && (isset($context['object']) || isset($context['containerType']))) {
@@ -372,9 +334,6 @@ public function enrichFieldDefinition(array $context = []): static
         return $this;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function enrichLayoutDefinition(?Concrete $object, array $context = []): static
     {
         return $this->enrichFieldDefinition($context);
@@ -401,9 +360,6 @@ public function resolveDependencies(mixed $data): array
         return $dependencies;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     {
         return false;
@@ -412,11 +368,8 @@ public function isDiffChangeAllowed(Concrete $object, array $params = []): bool
     /** Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param DataObject\Data\Video|null $data
      * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|string
      */
     public function getDiffVersionPreview(?DataObject\Data\Video $data, Concrete $object = null, array $params = []): array|string
     {
@@ -437,9 +390,6 @@ public function getDiffVersionPreview(?DataObject\Data\Video $data, Concrete $ob
         return '';
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
diff --git a/models/DataObject/ClassDefinition/Data/Wysiwyg.php b/models/DataObject/ClassDefinition/Data/Wysiwyg.php
index 0f8ff29d4ce..52e5db90d79 100644
--- a/models/DataObject/ClassDefinition/Data/Wysiwyg.php
+++ b/models/DataObject/ClassDefinition/Data/Wysiwyg.php
@@ -47,7 +47,6 @@ class Wysiwyg extends Data implements ResourcePersistenceAwareInterface, QueryRe
     /**
      * @internal
      *
-     * @var string|int
      */
     public string|int $maxCharacters = 0;
 
@@ -89,11 +88,7 @@ public function setMaxCharacters(int|string $maxCharacters): void
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataForResource
      */
@@ -103,11 +98,7 @@ public function getDataForResource(mixed $data, DataObject\Concrete $object = nu
     }
 
     /**
-     * @param mixed $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see ResourcePersistenceAwareInterface::getDataFromResource
      */
@@ -121,11 +112,7 @@ public function getDataFromResource(mixed $data, DataObject\Concrete $object = n
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see QueryResourcePersistenceAwareInterface::getDataForQueryResource
      */
@@ -155,11 +142,7 @@ public function getDataForSearchIndex(DataObject\Localizedfield|DataObject\Field
     }
 
     /**
-     * @param mixed $data
-     * @param null|DataObject\Concrete $object
-     * @param array $params
      *
-     * @return string|null
      *
      * @see Data::getDataForEditmode
      *
@@ -192,9 +175,6 @@ public function getCacheTags(mixed $data, array $tags = []): array
         return Text::getCacheTagsOfWysiwygText($data, $tags);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function checkValidity(mixed $data, bool $omitMandatoryCheck = false, array $params = []): void
     {
         if (!$omitMandatoryCheck && $this->getMandatory() && empty($data)) {
@@ -234,11 +214,7 @@ public function preGetData(mixed $container, array $params = []): ?string
     /** Generates a pretty version preview (similar to getVersionPreview) can be either html or
      * a image URL. See the https://github.com/pimcore/object-merger bundle documentation for details
      *
-     * @param string|null $data
-     * @param DataObject\Concrete|null $object
-     * @param array $params
      *
-     * @return array|string
      */
     public function getDiffVersionPreview(?string $data, DataObject\Concrete $object = null, array $params = []): array|string
     {
@@ -253,9 +229,6 @@ public function getDiffVersionPreview(?string $data, DataObject\Concrete $object
         }
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(mixed $container, array $idMapping, array $params = []): mixed
     {
         $data = $this->getDataFromObjectParam($container, $params);
@@ -285,9 +258,6 @@ public function rewriteIds(mixed $container, array $idMapping, array $params = [
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFilterable(): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/DynamicOptionsProvider/CountryOptionsProvider.php b/models/DataObject/ClassDefinition/DynamicOptionsProvider/CountryOptionsProvider.php
index b27fec98cef..e0f2d7fb840 100644
--- a/models/DataObject/ClassDefinition/DynamicOptionsProvider/CountryOptionsProvider.php
+++ b/models/DataObject/ClassDefinition/DynamicOptionsProvider/CountryOptionsProvider.php
@@ -59,9 +59,6 @@ public function getOptions(array $context, Data $fieldDefinition): array
         return $options;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasStaticOptions(array $context, Data $fieldDefinition): bool
     {
         return true;
diff --git a/models/DataObject/ClassDefinition/DynamicOptionsProvider/MultiSelectOptionsProviderInterface.php b/models/DataObject/ClassDefinition/DynamicOptionsProvider/MultiSelectOptionsProviderInterface.php
index 7ad882fa0ee..f980620b805 100644
--- a/models/DataObject/ClassDefinition/DynamicOptionsProvider/MultiSelectOptionsProviderInterface.php
+++ b/models/DataObject/ClassDefinition/DynamicOptionsProvider/MultiSelectOptionsProviderInterface.php
@@ -28,10 +28,7 @@ public function getOptions(array $context, Data $fieldDefinition): array;
      * there will be no batch assignment mode, and filtering can only be done through a text field instead of the
      * options list.
      *
-     * @param array $context
-     * @param Data $fieldDefinition
      *
-     * @return bool
      */
     public function hasStaticOptions(array $context, Data $fieldDefinition): bool;
 }
diff --git a/models/DataObject/ClassDefinition/Helper/ClassResolver.php b/models/DataObject/ClassDefinition/Helper/ClassResolver.php
index c1c91eeb6da..d289955e0d8 100644
--- a/models/DataObject/ClassDefinition/Helper/ClassResolver.php
+++ b/models/DataObject/ClassDefinition/Helper/ClassResolver.php
@@ -23,12 +23,6 @@ abstract class ClassResolver
 {
     private static array $cache;
 
-    /**
-     * @param string|null $class
-     * @param callable|null $validationCallback
-     *
-     * @return object|null
-     */
     protected static function resolve(?string $class, callable $validationCallback = null): ?object
     {
         if (!$class) {
diff --git a/models/DataObject/ClassDefinition/Layout.php b/models/DataObject/ClassDefinition/Layout.php
index f8b220b2b8e..d053300d3f1 100644
--- a/models/DataObject/ClassDefinition/Layout.php
+++ b/models/DataObject/ClassDefinition/Layout.php
@@ -57,7 +57,6 @@ class Layout implements Model\DataObject\ClassDefinition\Data\VarExporterInterfa
     /**
      * @internal
      *
-     * @var bool
      */
     public bool $collapsible = false;
 
@@ -74,7 +73,6 @@ class Layout implements Model\DataObject\ClassDefinition\Data\VarExporterInterfa
     /**
      * @internal
      *
-     * @var string
      */
     public string $datatype = 'layout';
 
@@ -205,7 +203,6 @@ public function getChildren(): array
     /**
      * @internal
      *
-     * @return array
      */
     public function &getChildrenByRef(): array
     {
diff --git a/models/DataObject/ClassDefinition/Layout/Accordion.php b/models/DataObject/ClassDefinition/Layout/Accordion.php
index 5edd7753d65..c77004ef4ba 100644
--- a/models/DataObject/ClassDefinition/Layout/Accordion.php
+++ b/models/DataObject/ClassDefinition/Layout/Accordion.php
@@ -25,14 +25,12 @@ class Accordion extends Model\DataObject\ClassDefinition\Layout
      *
      * @internal
      *
-     * @var string
      */
     public string $fieldtype = 'accordion';
 
     /**
      * @internal
      *
-     * @var bool
      */
     public bool $border = false;
 
diff --git a/models/DataObject/ClassDefinition/Layout/Fieldcontainer.php b/models/DataObject/ClassDefinition/Layout/Fieldcontainer.php
index c756347ea88..c9c9cfcac3d 100644
--- a/models/DataObject/ClassDefinition/Layout/Fieldcontainer.php
+++ b/models/DataObject/ClassDefinition/Layout/Fieldcontainer.php
@@ -28,21 +28,18 @@ class Fieldcontainer extends Model\DataObject\ClassDefinition\Layout
      *
      * @internal
      *
-     * @var string
      */
     public string $fieldtype = 'fieldcontainer';
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $layout = 'hbox';
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $fieldLabel;
 
diff --git a/models/DataObject/ClassDefinition/Layout/Fieldset.php b/models/DataObject/ClassDefinition/Layout/Fieldset.php
index ed7a29c6e16..dcee16f61fd 100644
--- a/models/DataObject/ClassDefinition/Layout/Fieldset.php
+++ b/models/DataObject/ClassDefinition/Layout/Fieldset.php
@@ -28,7 +28,6 @@ class Fieldset extends Model\DataObject\ClassDefinition\Layout
      *
      * @internal
      *
-     * @var string
      */
     public string $fieldtype = 'fieldset';
 }
diff --git a/models/DataObject/ClassDefinition/Layout/Iframe.php b/models/DataObject/ClassDefinition/Layout/Iframe.php
index d142156e60c..122d85e12a6 100644
--- a/models/DataObject/ClassDefinition/Layout/Iframe.php
+++ b/models/DataObject/ClassDefinition/Layout/Iframe.php
@@ -27,21 +27,18 @@ class Iframe extends Model\DataObject\ClassDefinition\Layout implements LayoutDe
      *
      * @internal
      *
-     * @var string
      */
     public string $fieldtype = 'iframe';
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $iframeUrl;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $renderingData;
 
@@ -65,9 +62,6 @@ public function setRenderingData(string $renderingData): void
         $this->renderingData = $renderingData;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enrichLayoutDefinition(?Concrete $object, array $context = []): static
     {
         $this->width = $this->getWidth() ? $this->getWidth() : 500;
diff --git a/models/DataObject/ClassDefinition/Layout/Region.php b/models/DataObject/ClassDefinition/Layout/Region.php
index 907df135b4d..af74b1da227 100644
--- a/models/DataObject/ClassDefinition/Layout/Region.php
+++ b/models/DataObject/ClassDefinition/Layout/Region.php
@@ -28,7 +28,6 @@ class Region extends Model\DataObject\ClassDefinition\Layout
      *
      * @internal
      *
-     * @var string
      */
     public string $fieldtype = 'region';
 }
diff --git a/models/DataObject/ClassDefinition/Layout/Tabpanel.php b/models/DataObject/ClassDefinition/Layout/Tabpanel.php
index bac29dab627..a6a57911465 100644
--- a/models/DataObject/ClassDefinition/Layout/Tabpanel.php
+++ b/models/DataObject/ClassDefinition/Layout/Tabpanel.php
@@ -25,21 +25,18 @@ class Tabpanel extends Model\DataObject\ClassDefinition\Layout
      *
      * @internal
      *
-     * @var string
      */
     public string $fieldtype = 'tabpanel';
 
     /**
      * @internal
      *
-     * @var bool
      */
     public bool $border = false;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $tabPosition = 'top';
 
diff --git a/models/DataObject/ClassDefinition/Layout/Text.php b/models/DataObject/ClassDefinition/Layout/Text.php
index 467b9ef628d..2d1e437e9a0 100644
--- a/models/DataObject/ClassDefinition/Layout/Text.php
+++ b/models/DataObject/ClassDefinition/Layout/Text.php
@@ -28,35 +28,30 @@ class Text extends Model\DataObject\ClassDefinition\Layout implements Model\Data
      *
      * @internal
      *
-     * @var string
      */
     public string $fieldtype = 'text';
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $html = '';
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $renderingClass = '';
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $renderingData;
 
     /**
      * @internal
      *
-     * @var bool
      */
     public bool $border = false;
 
@@ -102,9 +97,6 @@ public function setBorder(bool $border): void
         $this->border = $border;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function enrichLayoutDefinition(?Concrete $object, array $context = []): static
     {
         $renderer = null;
diff --git a/models/DataObject/ClassDefinition/Layout/Traits/IconTrait.php b/models/DataObject/ClassDefinition/Layout/Traits/IconTrait.php
index faf8b802733..7dae69afc28 100644
--- a/models/DataObject/ClassDefinition/Layout/Traits/IconTrait.php
+++ b/models/DataObject/ClassDefinition/Layout/Traits/IconTrait.php
@@ -24,7 +24,6 @@ trait IconTrait
     /**
      * @internal
      *
-     * @var string|null
      */
     public ?string $icon = null;
 
diff --git a/models/DataObject/ClassDefinition/Layout/Traits/LabelTrait.php b/models/DataObject/ClassDefinition/Layout/Traits/LabelTrait.php
index 8e94e6a5213..142f46da21a 100644
--- a/models/DataObject/ClassDefinition/Layout/Traits/LabelTrait.php
+++ b/models/DataObject/ClassDefinition/Layout/Traits/LabelTrait.php
@@ -26,14 +26,12 @@ trait LabelTrait
      *
      * @internal
      *
-     * @var int
      */
     public int $labelWidth = 100;
 
     /**
      * @internal
      *
-     * @var string
      */
     public string $labelAlign = 'left';
 
diff --git a/models/DataObject/ClassDefinition/Listing/Dao.php b/models/DataObject/ClassDefinition/Listing/Dao.php
index 34fba30a5ea..6aa5b47ffac 100644
--- a/models/DataObject/ClassDefinition/Listing/Dao.php
+++ b/models/DataObject/ClassDefinition/Listing/Dao.php
@@ -28,7 +28,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of object-classes for the specicifies parameters, returns an array of DataObject\ClassDefinition elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/DataObject/ClassDefinition/Service.php b/models/DataObject/ClassDefinition/Service.php
index 30abbb5bdcd..4d6c60d1d93 100644
--- a/models/DataObject/ClassDefinition/Service.php
+++ b/models/DataObject/ClassDefinition/Service.php
@@ -30,7 +30,6 @@ class Service
     /**
      * @internal
      *
-     * @return bool
      */
     public static function doRemoveDynamicOptions(): bool
     {
@@ -40,7 +39,6 @@ public static function doRemoveDynamicOptions(): bool
     /**
      * @internal
      *
-     * @param bool $doRemoveDynamicOptions
      */
     public static function setDoRemoveDynamicOptions(bool $doRemoveDynamicOptions): void
     {
@@ -286,9 +284,6 @@ public static function importObjectBrickFromJson(DataObject\Objectbrick\Definiti
     }
 
     /**
-     * @param array $array
-     * @param bool $throwException
-     * @param bool $insideLocalizedField
      *
      * @return EncryptedField|bool|Data|Layout
      *
@@ -377,8 +372,6 @@ private static function removeDynamicOptionsFromArray(array &$data, array $block
     }
 
     /**
-     * @param array $tableDefinitions
-     * @param array $tableNames
      *
      * @internal
      */
@@ -408,14 +401,7 @@ public static function updateTableDefinitions(array &$tableDefinitions, array $t
     }
 
     /**
-     * @param array $tableDefinitions
-     * @param string $table
-     * @param string $colName
-     * @param string $type
-     * @param string $default
-     * @param string $null
      *
-     * @return bool
      *
      * @internal
      */
@@ -441,11 +427,8 @@ public static function skipColumn(array $tableDefinitions, string $table, string
     }
 
     /**
-     * @param array $implementsParts
      * @param string|null $newInterfaces A comma separated list of interfaces
      *
-     * @return string
-     *
      * @throws \Exception
      *
      * @internal
@@ -472,10 +455,7 @@ public static function buildImplementsInterfacesCode(array $implementsParts, ?st
     }
 
     /**
-     * @param array $useParts
-     * @param string|null $newTraits
      *
-     * @return string
      *
      * @throws \Exception
      *
@@ -503,9 +483,7 @@ public static function buildUseTraitsCode(array $useParts, ?string $newTraits):
     }
 
     /**
-     * @param array $useParts
      *
-     * @return string
      *
      * @throws \Exception
      *
diff --git a/models/DataObject/Classificationstore.php b/models/DataObject/Classificationstore.php
index ebb5e6dfb72..cf315e66eed 100644
--- a/models/DataObject/Classificationstore.php
+++ b/models/DataObject/Classificationstore.php
@@ -35,14 +35,12 @@ class Classificationstore extends Model\AbstractModel implements DirtyIndicatorI
     /**
      * @internal
      *
-     * @var array
      */
     protected array $items = [];
 
     /**
      * @internal
      *
-     * @var Concrete|Model\Element\ElementDescriptor|null
      */
     protected Concrete|Model\Element\ElementDescriptor|null $object = null;
 
@@ -54,27 +52,21 @@ class Classificationstore extends Model\AbstractModel implements DirtyIndicatorI
     /**
      * @internal
      *
-     * @var string
      */
     protected string $fieldname;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $activeGroups = [];
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $groupCollectionMapping = [];
 
-    /**
-     * @param array|null $items
-     */
     public function __construct(array $items = null)
     {
         if ($items) {
@@ -140,11 +132,6 @@ public function getClass(): ?ClassDefinition
         return $this->class;
     }
 
-    /**
-     * @param string|null $language
-     *
-     * @return string
-     */
     public function getLanguage(string $language = null): string
     {
         if ($language) {
@@ -155,10 +142,6 @@ public function getLanguage(string $language = null): string
     }
 
     /**
-     * @param int $groupId
-     * @param int $keyId
-     * @param mixed $value
-     * @param string|null $language
      *
      * @return $this
      *
@@ -238,7 +221,6 @@ public function setLocalizedKeyValue(int $groupId, int $keyId, mixed $value, str
     /**
      * Removes the group with the given id
      *
-     * @param int $groupId
      */
     public function removeGroupData(int $groupId): void
     {
@@ -246,7 +228,6 @@ public function removeGroupData(int $groupId): void
     }
 
     /** Returns an array of
-     * @return array
      */
     public function getGroupIdsWithData(): array
     {
@@ -325,13 +306,7 @@ private function getFallbackValue(int $groupId, int $keyId, string $language, Cl
     }
 
     /**
-     * @param int $groupId
-     * @param int $keyId
-     * @param string $language
-     * @param bool $ignoreFallbackLanguage
-     * @param bool $ignoreDefaultLanguage
      *
-     * @return mixed
      *
      * @throws \Exception
      */
@@ -429,10 +404,6 @@ public function setGroupCollectionMappings(array $groupCollectionMapping): void
         $this->groupCollectionMapping = $groupCollectionMapping;
     }
 
-    /**
-     * @param int|null $groupId
-     * @param int|null $collectionId
-     */
     public function setGroupCollectionMapping(int $groupId = null, int $collectionId = null): void
     {
         if ($groupId && $collectionId) {
diff --git a/models/DataObject/Classificationstore/CollectionConfig.php b/models/DataObject/Classificationstore/CollectionConfig.php
index 8825c516b5e..3cfc1c0eef7 100644
--- a/models/DataObject/Classificationstore/CollectionConfig.php
+++ b/models/DataObject/Classificationstore/CollectionConfig.php
@@ -35,7 +35,6 @@ final class CollectionConfig extends Model\AbstractModel
     /**
      * Store ID
      *
-     * @var int
      */
     protected int $storeId = 1;
 
@@ -44,7 +43,6 @@ final class CollectionConfig extends Model\AbstractModel
     /**
      * The collection description.
      *
-     * @var string
      */
     protected string $description = '';
 
@@ -79,11 +77,7 @@ public static function getById(int $id, ?bool $force = false): ?CollectionConfig
     }
 
     /**
-     * @param string $name
-     * @param int $storeId
-     * @param bool|null $force
      *
-     * @return self|null
      *
      * @throws \Exception
      */
@@ -151,7 +145,6 @@ public function getName(): string
     /**
      * Returns the description.
      *
-     * @return string
      */
     public function getDescription(): string
     {
@@ -161,7 +154,6 @@ public function getDescription(): string
     /**
      * Sets the description.
      *
-     * @param string $description
      *
      * @return Model\DataObject\Classificationstore\CollectionConfig
      */
diff --git a/models/DataObject/Classificationstore/CollectionConfig/Dao.php b/models/DataObject/Classificationstore/CollectionConfig/Dao.php
index bd9b4a6e2dd..ea2ef99d637 100644
--- a/models/DataObject/Classificationstore/CollectionConfig/Dao.php
+++ b/models/DataObject/Classificationstore/CollectionConfig/Dao.php
@@ -29,7 +29,6 @@ class Dao extends Model\Dao\AbstractDao
     /**
      * Get the data for the object from database for the given id, or from the ID which is set in the object
      *
-     * @param int|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -49,7 +48,6 @@ public function getById(int $id = null): void
     }
 
     /**
-     * @param string|null $name
      *
      * @throws Model\Exception\NotFoundException
      */
diff --git a/models/DataObject/Classificationstore/CollectionConfig/Listing/Dao.php b/models/DataObject/Classificationstore/CollectionConfig/Listing/Dao.php
index 3305479950c..c1f82307726 100644
--- a/models/DataObject/Classificationstore/CollectionConfig/Listing/Dao.php
+++ b/models/DataObject/Classificationstore/CollectionConfig/Listing/Dao.php
@@ -28,7 +28,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of Classificationstore collection configs for the specified parameters, returns an array of config elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/DataObject/Classificationstore/CollectionGroupRelation/Dao.php b/models/DataObject/Classificationstore/CollectionGroupRelation/Dao.php
index e0b5f263f0d..a870ee0c65d 100644
--- a/models/DataObject/Classificationstore/CollectionGroupRelation/Dao.php
+++ b/models/DataObject/Classificationstore/CollectionGroupRelation/Dao.php
@@ -31,8 +31,6 @@ class Dao extends Model\Dao\AbstractDao
     public const TABLE_NAME_RELATIONS = 'classificationstore_collectionrelations';
 
     /**
-     * @param int $colId
-     * @param int $groupId
      *
      * @throws NotFoundException
      */
diff --git a/models/DataObject/Classificationstore/CollectionGroupRelation/Listing/Dao.php b/models/DataObject/Classificationstore/CollectionGroupRelation/Listing/Dao.php
index a7b24ae751e..3e93c37a3e3 100644
--- a/models/DataObject/Classificationstore/CollectionGroupRelation/Listing/Dao.php
+++ b/models/DataObject/Classificationstore/CollectionGroupRelation/Listing/Dao.php
@@ -28,7 +28,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of Classificationstore group configs for the specified parameters, returns an array of config elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/DataObject/Classificationstore/Group.php b/models/DataObject/Classificationstore/Group.php
index cfb885987a6..6871793edd5 100644
--- a/models/DataObject/Classificationstore/Group.php
+++ b/models/DataObject/Classificationstore/Group.php
@@ -71,7 +71,6 @@ protected function getKeyGroupRelationListing(): KeyGroupRelation\Listing
     }
 
     /**
-     * @param KeyGroupRelation ...$keyGroupRelations
      *
      * @return Key[]
      */
diff --git a/models/DataObject/Classificationstore/GroupConfig.php b/models/DataObject/Classificationstore/GroupConfig.php
index 5c9554ccafe..5561861929a 100644
--- a/models/DataObject/Classificationstore/GroupConfig.php
+++ b/models/DataObject/Classificationstore/GroupConfig.php
@@ -36,21 +36,18 @@ final class GroupConfig extends Model\AbstractModel
     /**
      * Store ID
      *
-     * @var int
      */
     protected int $storeId = 1;
 
     /**
      * Parent id
      *
-     * @var int|null
      */
     protected ?int $parentId = null;
 
     /**
      * The group name.
      *
-     * @var string
      */
     protected string $name;
 
@@ -91,11 +88,7 @@ public static function getById(int $id, ?bool $force = false): ?GroupConfig
     }
 
     /**
-     * @param string $name
-     * @param int $storeId
-     * @param bool|null $force
      *
-     * @return self|null
      *
      * @throws \Exception
      */
diff --git a/models/DataObject/Classificationstore/GroupConfig/Dao.php b/models/DataObject/Classificationstore/GroupConfig/Dao.php
index cd62ec4c0bc..d98c9577e59 100644
--- a/models/DataObject/Classificationstore/GroupConfig/Dao.php
+++ b/models/DataObject/Classificationstore/GroupConfig/Dao.php
@@ -29,7 +29,6 @@ class Dao extends Model\Dao\AbstractDao
     /**
      * Get the data for the object from database for the given id, or from the ID which is set in the object
      *
-     * @param int|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -49,7 +48,6 @@ public function getById(int $id = null): void
     }
 
     /**
-     * @param string|null $name
      *
      * @throws \Exception
      */
diff --git a/models/DataObject/Classificationstore/GroupConfig/Listing/Dao.php b/models/DataObject/Classificationstore/GroupConfig/Listing/Dao.php
index ae119ae392e..784b9575563 100644
--- a/models/DataObject/Classificationstore/GroupConfig/Listing/Dao.php
+++ b/models/DataObject/Classificationstore/GroupConfig/Listing/Dao.php
@@ -28,7 +28,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of Classificationstore group configs for the specified parameters, returns an array of config elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/DataObject/Classificationstore/KeyConfig.php b/models/DataObject/Classificationstore/KeyConfig.php
index 4cb4f50ceac..fa0aecce7c0 100644
--- a/models/DataObject/Classificationstore/KeyConfig.php
+++ b/models/DataObject/Classificationstore/KeyConfig.php
@@ -35,17 +35,14 @@ final class KeyConfig extends Model\AbstractModel
     /**
      * Store ID
      *
-     * @var int
      */
     protected int $storeId = 1;
 
     /** The key
-     * @var string
      */
     protected string $name;
 
     /** Pseudo column for title
-     * @var string|null
      */
     protected ?string $title = null;
 
@@ -57,7 +54,6 @@ final class KeyConfig extends Model\AbstractModel
     /**
      * The key type ("text", "number", etc...)
      *
-     * @var string
      */
     protected string $type;
 
@@ -96,12 +92,8 @@ public static function getById(int $id, ?bool $force = false): ?KeyConfig
     }
 
     /**
-     * @param string $name
-     * @param int $storeId
      * @param bool $force
      *
-     * @return self|null
-     *
      * @throws \Exception
      */
     public static function getByName(string $name, int $storeId = 1, ?bool $force = false): ?KeyConfig
diff --git a/models/DataObject/Classificationstore/KeyConfig/Dao.php b/models/DataObject/Classificationstore/KeyConfig/Dao.php
index e6ac11d2e18..9cef78b5a02 100644
--- a/models/DataObject/Classificationstore/KeyConfig/Dao.php
+++ b/models/DataObject/Classificationstore/KeyConfig/Dao.php
@@ -29,7 +29,6 @@ class Dao extends Model\Dao\AbstractDao
     /**
      * Get the data for the object from database for the given id, or from the ID which is set in the object
      *
-     * @param int|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -50,7 +49,6 @@ public function getById(int $id = null): void
     }
 
     /**
-     * @param string|null $name
      *
      * @throws \Exception
      */
diff --git a/models/DataObject/Classificationstore/KeyConfig/Listing/Dao.php b/models/DataObject/Classificationstore/KeyConfig/Listing/Dao.php
index c1025ba6df1..2b7d0455f5e 100644
--- a/models/DataObject/Classificationstore/KeyConfig/Listing/Dao.php
+++ b/models/DataObject/Classificationstore/KeyConfig/Listing/Dao.php
@@ -28,7 +28,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of Classificationstore key configs for the specified parameters, returns an array of config elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/DataObject/Classificationstore/KeyGroupRelation/Dao.php b/models/DataObject/Classificationstore/KeyGroupRelation/Dao.php
index 4e46353dd4f..5c46349a95d 100644
--- a/models/DataObject/Classificationstore/KeyGroupRelation/Dao.php
+++ b/models/DataObject/Classificationstore/KeyGroupRelation/Dao.php
@@ -31,8 +31,6 @@ class Dao extends AbstractDao
     public const TABLE_NAME_RELATIONS = 'classificationstore_relations';
 
     /**
-     * @param int $keyId
-     * @param int $groupId
      *
      * @throws NotFoundException
      */
diff --git a/models/DataObject/Classificationstore/KeyGroupRelation/Listing/Dao.php b/models/DataObject/Classificationstore/KeyGroupRelation/Listing/Dao.php
index 4e9588aa50c..35f6a2c929c 100644
--- a/models/DataObject/Classificationstore/KeyGroupRelation/Listing/Dao.php
+++ b/models/DataObject/Classificationstore/KeyGroupRelation/Listing/Dao.php
@@ -28,7 +28,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of Classificationstore group configs for the specified parameters, returns an array of config elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/DataObject/Classificationstore/Service.php b/models/DataObject/Classificationstore/Service.php
index b6b9cdd7277..69f43fd9916 100644
--- a/models/DataObject/Classificationstore/Service.php
+++ b/models/DataObject/Classificationstore/Service.php
@@ -39,7 +39,6 @@ public static function clearDefinitionsCache(): void
     }
 
     /**
-     * @param KeyConfig|KeyGroupRelation $keyConfig
      *
      * @return EncryptedField|Data|null
      *
diff --git a/models/DataObject/Classificationstore/StoreConfig.php b/models/DataObject/Classificationstore/StoreConfig.php
index 9c55f2ebc83..09f96cf2b69 100644
--- a/models/DataObject/Classificationstore/StoreConfig.php
+++ b/models/DataObject/Classificationstore/StoreConfig.php
@@ -33,14 +33,12 @@ final class StoreConfig extends Model\AbstractModel
     /**
      * The store name.
      *
-     * @var string|null
      */
     protected ?string $name = null;
 
     /**
      * The store description.
      *
-     * @var string|null
      */
     protected ?string $description = null;
 
@@ -91,7 +89,6 @@ public function getName(): ?string
     /**
      * Returns the description.
      *
-     * @return string|null
      */
     public function getDescription(): ?string
     {
@@ -101,7 +98,6 @@ public function getDescription(): ?string
     /**
      * Sets the description.
      *
-     * @param string $description
      *
      * @return Model\DataObject\Classificationstore\StoreConfig
      */
diff --git a/models/DataObject/Classificationstore/StoreConfig/Dao.php b/models/DataObject/Classificationstore/StoreConfig/Dao.php
index dc110355cef..fafea39b22c 100644
--- a/models/DataObject/Classificationstore/StoreConfig/Dao.php
+++ b/models/DataObject/Classificationstore/StoreConfig/Dao.php
@@ -29,7 +29,6 @@ class Dao extends Model\Dao\AbstractDao
     /**
      * Get the data for the object from database for the given id, or from the ID which is set in the object
      *
-     * @param int|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -49,7 +48,6 @@ public function getById(int $id = null): void
     }
 
     /**
-     * @param string|null $name
      *
      * @throws Model\Exception\NotFoundException
      */
diff --git a/models/DataObject/Classificationstore/StoreConfig/Listing/Dao.php b/models/DataObject/Classificationstore/StoreConfig/Listing/Dao.php
index df4ad543d9f..f0a66f9d1ec 100644
--- a/models/DataObject/Classificationstore/StoreConfig/Listing/Dao.php
+++ b/models/DataObject/Classificationstore/StoreConfig/Listing/Dao.php
@@ -28,7 +28,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of Classificationstore store configs for the specified parameters, returns an array of config elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/DataObject/Concrete.php b/models/DataObject/Concrete.php
index a45ac051cb6..d9ef740cf14 100644
--- a/models/DataObject/Concrete.php
+++ b/models/DataObject/Concrete.php
@@ -41,7 +41,6 @@ class Concrete extends DataObject implements LazyLoadedFieldsInterface
     /**
      * @internal
      *
-     * @var array|null
      */
     protected ?array $__rawRelationData = null;
 
@@ -50,7 +49,6 @@ class Concrete extends DataObject implements LazyLoadedFieldsInterface
      *
      * Necessary for assigning object reference to corresponding fields while wakeup
      *
-     * @var array
      */
     public array $__objectAwareFields = [];
 
@@ -64,7 +62,6 @@ class Concrete extends DataObject implements LazyLoadedFieldsInterface
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $published = false;
 
@@ -90,28 +87,24 @@ class Concrete extends DataObject implements LazyLoadedFieldsInterface
     /**
      * @internal
      *
-     * @var array|null
      */
     protected ?array $versions = null;
 
     /**
      * @internal
      *
-     * @var bool|null
      */
     protected ?bool $omitMandatoryCheck = null;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $allLazyKeysMarkedAsLoaded = false;
 
     /**
      * returns the class ID of the current object class
      *
-     * @return string
      */
     public static function classId(): string
     {
@@ -120,9 +113,6 @@ public static function classId(): string
         return $v['classId'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function update(bool $isUpdate = null, array $params = []): void
     {
         $fieldDefinitions = $this->getClass()->getFieldDefinitions();
@@ -227,9 +217,6 @@ private function saveChildData(): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doDelete(): void
     {
         // Dispatch Symfony Message Bus to delete versions
@@ -246,12 +233,8 @@ protected function doDelete(): void
      * $callPluginHook is true when the method is called from outside (eg. directly in the controller "save only version")
      * it is false when the method is called by $this->update()
      *
-     * @param bool $setModificationDate
-     * @param bool $saveOnlyVersion
      * @param string|null $versionNote version note
-     * @param bool $isAutoSave
      *
-     * @return Model\Version|null
      */
     public function saveVersion(bool $setModificationDate = true, bool $saveOnlyVersion = true, string $versionNote = null, bool $isAutoSave = false): ?Model\Version
     {
@@ -362,9 +345,6 @@ public function getCacheTags(array $tags = []): array
         return $tags;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function resolveDependencies(): array
     {
         $dependencies = [parent::resolveDependencies()];
@@ -478,11 +458,8 @@ public function getOmitMandatoryCheck(): bool
     }
 
     /**
-     * @param string $key
      * @param mixed $params
      *
-     * @return mixed
-     *
      * @throws InheritanceParentNotFoundException
      */
     public function getValueFromParent(string $key, mixed $params = null): mixed
@@ -503,7 +480,6 @@ public function getValueFromParent(string $key, mixed $params = null): mixed
     /**
      * @internal
      *
-     * @return Concrete|null
      */
     public function getNextParentForInheritance(): ?Concrete
     {
@@ -532,11 +508,7 @@ public function getClosestParentOfClass(string $classId): ?self
     /**
      * get object relation data as array for a specific field
      *
-     * @param string $fieldName
-     * @param bool $forOwner
-     * @param string|null $remoteClassId
      *
-     * @return array
      */
     public function getRelationData(string $fieldName, bool $forOwner, ?string $remoteClassId = null): array
     {
@@ -546,8 +518,6 @@ public function getRelationData(string $fieldName, bool $forOwner, ?string $remo
     }
 
     /**
-     * @param string $method
-     * @param array $arguments
      *
      * @return Model\Listing\AbstractListing|Concrete|null
      *
@@ -698,7 +668,6 @@ public function save(array $parameters = []): static
     /**
      * @internal
      *
-     * @return array
      */
     public function getLazyLoadedFieldNames(): array
     {
@@ -715,9 +684,6 @@ public function getLazyLoadedFieldNames(): array
         return $lazyLoadedFieldNames;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isAllLazyKeysMarkedAsLoaded(): bool
     {
         if (!$this->getId()) {
@@ -784,10 +750,7 @@ public function __clone(): void
     /**
      * @internal
      *
-     * @param array $descriptor
-     * @param string $table
      *
-     * @return array
      */
     protected function doRetrieveData(array $descriptor, string $table): array
     {
@@ -801,9 +764,7 @@ protected function doRetrieveData(array $descriptor, string $table): array
     }
 
     /**
-     * @param array $descriptor
      *
-     * @return array
      *
      * @internal
      */
@@ -815,9 +776,7 @@ public function retrieveSlugData(array $descriptor): array
     }
 
     /**
-     * @param array $descriptor
      *
-     * @return array
      *
      * @internal
      */
@@ -861,7 +820,6 @@ public function retrieveRelationData(array $descriptor): array
     /**
      * @internal
      *
-     * @return array
      */
     public function __getRawRelationData(): array
     {
diff --git a/models/DataObject/Concrete/Dao.php b/models/DataObject/Concrete/Dao.php
index 1049ee54e63..df46c8cc983 100644
--- a/models/DataObject/Concrete/Dao.php
+++ b/models/DataObject/Concrete/Dao.php
@@ -54,7 +54,6 @@ protected function getInheritanceHelper(): Dao\InheritanceHelper
     /**
      * Get the data for the object from database for the given id
      *
-     * @param int $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -183,7 +182,6 @@ public function getData(): void
     /**
      * Save changes to database, it's an good idea to use save() instead
      *
-     * @param bool|null $isUpdate
      */
     public function update(bool $isUpdate = null): void
     {
diff --git a/models/DataObject/Concrete/Dao/InheritanceHelper.php b/models/DataObject/Concrete/Dao/InheritanceHelper.php
index aec6cfddede..1e92dbca229 100644
--- a/models/DataObject/Concrete/Dao/InheritanceHelper.php
+++ b/models/DataObject/Concrete/Dao/InheritanceHelper.php
@@ -64,14 +64,6 @@ class InheritanceHelper
 
     protected ?string $queryIdField = null;
 
-    /**
-     * @param string $classId
-     * @param string|null $idField
-     * @param string|null $storetable
-     * @param string|null $querytable
-     * @param string|null $relationtable
-     * @param string|null $queryIdField
-     */
     public function __construct(string $classId, string $idField = null, string $storetable = null, string $querytable = null, string $relationtable = null, string $queryIdField = null)
     {
         $this->db = \Pimcore\Db::get();
@@ -111,7 +103,6 @@ public function __construct(string $classId, string $idField = null, string $sto
     /**
      * Enable or disable the runtime cache. Default value is off.
      *
-     * @param bool $value
      */
     public static function setUseRuntimeCache(bool $value): void
     {
@@ -143,11 +134,6 @@ public function addFieldToCheck(string $fieldname, DataObject\ClassDefinition\Da
         $this->fieldDefinitions[$fieldname] = $fieldDefinition;
     }
 
-    /**
-     * @param string $fieldname
-     * @param DataObject\ClassDefinition\Data $fieldDefinition
-     * @param array|null $queryfields
-     */
     public function addRelationToCheck(string $fieldname, DataObject\ClassDefinition\Data $fieldDefinition, array $queryfields = null): void
     {
         if ($queryfields === null) {
@@ -161,9 +147,6 @@ public function addRelationToCheck(string $fieldname, DataObject\ClassDefinition
     }
 
     /**
-     * @param int $oo_id
-     * @param bool $createMissingChildrenRows
-     * @param array $params
      *
      * @throws \Exception
      */
@@ -263,8 +246,6 @@ public function doUpdate(int $oo_id, bool $createMissingChildrenRows = false, ar
      * Currently solely used for object bricks. If a brick is removed, this info must be propagated to all
      * child elements.
      *
-     * @param int $objectId
-     * @param array $params
      */
     public function doDelete(int $objectId, array $params = []): void
     {
@@ -365,14 +346,6 @@ protected function filterResultByLanguage(array $result, string $language, strin
         return array_values($filteredResult);
     }
 
-    /**
-     * @param int $currentParentId
-     * @param string $fields
-     * @param array|null $parentIdGroups
-     * @param array $params
-     *
-     * @return array
-     */
     protected function buildTree(int $currentParentId, string $fields = '', array $parentIdGroups = null, array $params = []): array
     {
         $objects = [];
@@ -598,9 +571,6 @@ protected function getIdsToUpdateForRelationfields(array $currentNode, string $f
     }
 
     /**
-     * @param int $oo_id
-     * @param array $ids
-     * @param string $fieldname
      *
      * @throws \Exception
      */
diff --git a/models/DataObject/Data/AbstractQuantityValue.php b/models/DataObject/Data/AbstractQuantityValue.php
index 0a28f38409e..905313edb86 100644
--- a/models/DataObject/Data/AbstractQuantityValue.php
+++ b/models/DataObject/Data/AbstractQuantityValue.php
@@ -33,9 +33,6 @@ abstract class AbstractQuantityValue implements OwnerAwareFieldInterface
 
     protected ?Unit $unit = null;
 
-    /**
-     * @param string|Unit|null $unit
-     */
     public function __construct(Unit|string $unit = null)
     {
         if ($unit instanceof Unit) {
@@ -71,8 +68,6 @@ public function getUnit(): ?Unit
     /**
      * @param string|Unit $unit target unit. if string provided, unit is tried to be found by abbreviation
      *
-     * @return self
-     *
      * @throws \Exception
      */
     public function convertTo(Unit|string $unit): AbstractQuantityValue
diff --git a/models/DataObject/Data/BlockElement.php b/models/DataObject/Data/BlockElement.php
index ff848c47f6f..32446731bb9 100644
--- a/models/DataObject/Data/BlockElement.php
+++ b/models/DataObject/Data/BlockElement.php
@@ -45,16 +45,12 @@ class BlockElement extends AbstractModel implements OwnerAwareFieldInterface, Ca
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $needsRenewReferences = false;
 
     /**
      * BlockElement constructor.
      *
-     * @param string $name
-     * @param string $type
-     * @param mixed $data
      */
     public function __construct(string $name, string $type, mixed $data)
     {
@@ -141,7 +137,6 @@ function ($currentValue) {
              * @param object $object
              * @param string $property
              *
-             * @return bool
              */
             public function matches($object, $property): bool
             {
@@ -171,7 +166,6 @@ public function __wakeup(): void
     /**
      * @internal
      *
-     * @return bool
      */
     public function getNeedsRenewReferences(): bool
     {
@@ -181,7 +175,6 @@ public function getNeedsRenewReferences(): bool
     /**
      * @internal
      *
-     * @param bool $needsRenewReferences
      */
     public function setNeedsRenewReferences(bool $needsRenewReferences): void
     {
diff --git a/models/DataObject/Data/CalculatedValue.php b/models/DataObject/Data/CalculatedValue.php
index f69fc318e44..26c35593949 100644
--- a/models/DataObject/Data/CalculatedValue.php
+++ b/models/DataObject/Data/CalculatedValue.php
@@ -42,7 +42,6 @@ class CalculatedValue implements OwnerAwareFieldInterface
     /**
      * CalculatedValue constructor.
      *
-     * @param string $fieldname
      */
     public function __construct(string $fieldname)
     {
@@ -51,12 +50,6 @@ public function __construct(string $fieldname)
     }
 
     /**
-     * @param string $ownerType
-     * @param string|null $ownerName
-     * @param int|string|null $index
-     * @param string|null $position
-     * @param int|null $groupId
-     * @param int|null $keyId
      * @param mixed $keyDefinition
      *
      * @internal
diff --git a/models/DataObject/Data/Consent.php b/models/DataObject/Data/Consent.php
index d7514bfa70b..e84eb9c41bb 100644
--- a/models/DataObject/Data/Consent.php
+++ b/models/DataObject/Data/Consent.php
@@ -30,10 +30,6 @@ class Consent implements OwnerAwareFieldInterface
 
     protected ?Note $note = null;
 
-    /**
-     * @param bool $consent
-     * @param int|null $noteId
-     */
     public function __construct(bool $consent = false, int $noteId = null)
     {
         $this->consent = $consent;
diff --git a/models/DataObject/Data/ElementMetadata.php b/models/DataObject/Data/ElementMetadata.php
index 0d19a9d16a0..12f7eb5a0b2 100644
--- a/models/DataObject/Data/ElementMetadata.php
+++ b/models/DataObject/Data/ElementMetadata.php
@@ -38,9 +38,6 @@ class ElementMetadata extends Model\AbstractModel implements DataObject\OwnerAwa
     protected array $data = [];
 
     /**
-     * @param string|null $fieldname
-     * @param array $columns
-     * @param Model\Element\ElementInterface|null $element
      *
      * @throws \Exception
      */
@@ -59,8 +56,6 @@ public function setElementTypeAndId(?string $elementType, ?int $elementId): void
     }
 
     /**
-     * @param string $method
-     * @param array $args
      *
      * @return mixed|void
      *
diff --git a/models/DataObject/Data/EncryptedField.php b/models/DataObject/Data/EncryptedField.php
index 156dd9f389b..b22ff0ee7cd 100644
--- a/models/DataObject/Data/EncryptedField.php
+++ b/models/DataObject/Data/EncryptedField.php
@@ -63,7 +63,6 @@ public function setPlain(mixed $plain): void
     }
 
     /**
-     * @return array
      *
      * @throws \Exception
      */
diff --git a/models/DataObject/Data/ExternalImage.php b/models/DataObject/Data/ExternalImage.php
index e82f7e64b95..5b0680be477 100644
--- a/models/DataObject/Data/ExternalImage.php
+++ b/models/DataObject/Data/ExternalImage.php
@@ -25,9 +25,6 @@ class ExternalImage implements OwnerAwareFieldInterface
 
     protected ?string $url = null;
 
-    /**
-     * @param string|null $url
-     */
     public function __construct(string $url = null)
     {
         $this->url = $url;
diff --git a/models/DataObject/Data/GeoCoordinates.php b/models/DataObject/Data/GeoCoordinates.php
index fbdbf65f393..28551e4b7be 100644
--- a/models/DataObject/Data/GeoCoordinates.php
+++ b/models/DataObject/Data/GeoCoordinates.php
@@ -27,10 +27,6 @@ class GeoCoordinates implements OwnerAwareFieldInterface
 
     protected ?float $latitude = null;
 
-    /**
-     * @param float|null $latitude
-     * @param float|null $longitude
-     */
     public function __construct(float $latitude = null, float $longitude = null)
     {
         if ($latitude !== null) {
diff --git a/models/DataObject/Data/Geobounds.php b/models/DataObject/Data/Geobounds.php
index 60b9d8f2053..641a4e20976 100644
--- a/models/DataObject/Data/Geobounds.php
+++ b/models/DataObject/Data/Geobounds.php
@@ -27,10 +27,6 @@ class Geobounds implements OwnerAwareFieldInterface
 
     protected ?GeoCoordinates $southWest = null;
 
-    /**
-     * @param GeoCoordinates|null $northEast
-     * @param GeoCoordinates|null $southWest
-     */
     public function __construct(GeoCoordinates $northEast = null, GeoCoordinates $southWest = null)
     {
         if ($northEast) {
diff --git a/models/DataObject/Data/Hotspotimage.php b/models/DataObject/Data/Hotspotimage.php
index 8d46537469c..9722644e17c 100644
--- a/models/DataObject/Data/Hotspotimage.php
+++ b/models/DataObject/Data/Hotspotimage.php
@@ -43,12 +43,6 @@ class Hotspotimage implements OwnerAwareFieldInterface
      */
     protected ?array $crop = null;
 
-    /**
-     * @param Asset\Image|int|null $image
-     * @param array $hotspots
-     * @param array $marker
-     * @param array $crop
-     */
     public function __construct(Asset\Image|int $image = null, array $hotspots = [], array $marker = [], array $crop = [])
     {
         if ($image instanceof Asset\Image) {
@@ -149,12 +143,6 @@ public function getImage(): ?Asset\Image
         return $this->image;
     }
 
-    /**
-     * @param string|array|Asset\Image\Thumbnail\Config|null $thumbnailName
-     * @param bool $deferred
-     *
-     * @return Asset\Image\Thumbnail|string
-     */
     public function getThumbnail(array|string|Asset\Image\Thumbnail\Config $thumbnailName = null, bool $deferred = true): Asset\Image\Thumbnail|string
     {
         if (!$this->getImage()) {
diff --git a/models/DataObject/Data/Link.php b/models/DataObject/Data/Link.php
index 3014c1d7bdd..216fa2bd3e9 100644
--- a/models/DataObject/Data/Link.php
+++ b/models/DataObject/Data/Link.php
@@ -292,7 +292,6 @@ public function getPath(): string
     /**
      * Returns the plain text path of the link
      *
-     * @return string
      */
     public function getHref(): string
     {
diff --git a/models/DataObject/Data/ObjectMetadata.php b/models/DataObject/Data/ObjectMetadata.php
index a38312e365d..4e06b222192 100644
--- a/models/DataObject/Data/ObjectMetadata.php
+++ b/models/DataObject/Data/ObjectMetadata.php
@@ -39,8 +39,6 @@ class ObjectMetadata extends Model\AbstractModel implements DataObject\OwnerAwar
     protected array $data = [];
 
     /**
-     * @param string|null $fieldname
-     * @param array $columns
      * @param Concrete|null $object
      */
     public function __construct(?string $fieldname, array $columns = [], DataObject\Concrete $object = null)
@@ -66,8 +64,6 @@ public function setObject(?DataObject\Concrete $object): static
     }
 
     /**
-     * @param string $method
-     * @param array $args
      *
      * @return mixed|void
      *
diff --git a/models/DataObject/Data/RgbaColor.php b/models/DataObject/Data/RgbaColor.php
index ee1316cbcf7..f1dc7204568 100644
--- a/models/DataObject/Data/RgbaColor.php
+++ b/models/DataObject/Data/RgbaColor.php
@@ -34,10 +34,6 @@ class RgbaColor implements OwnerAwareFieldInterface
     /**
      * RgbaColor constructor.
      *
-     * @param int|null $r
-     * @param int|null $g
-     * @param int|null $b
-     * @param int|null $a
      */
     public function __construct(int $r = null, int $g = null, int $b = null, int $a = null)
     {
@@ -100,7 +96,6 @@ public function getRgb(): array
     /**
      *  Return R 0-255, G 0-255, B 0-255, A 0-255
      *
-     * @return array
      */
     public function getRgba(): array
     {
@@ -110,7 +105,6 @@ public function getRgba(): array
     /**
      *  Return R 0-255, G 0-255, B 0-255, A 0-1 (1 == full opacity)
      *
-     * @return array
      */
     public function getCssRgba(): array
     {
@@ -132,7 +126,6 @@ public function getHex(bool $withAlpha = false, bool $withHash = true): string
     }
 
     /**
-     * @param string $hexValue
      *
      * @throws \Exception
      */
@@ -157,12 +150,6 @@ public function setHex(string $hexValue): void
         $this->markMeDirty();
     }
 
-    /**
-     * @param int|null $r
-     * @param int|null $g
-     * @param int|null $b
-     * @param int|null $a
-     */
     public function setRgba(int $r = null, int $g = null, int $b = null, int $a = null): void
     {
         $this->setR($r);
diff --git a/models/DataObject/Data/StructuredTable.php b/models/DataObject/Data/StructuredTable.php
index c7b5f453b35..dce5e625a86 100644
--- a/models/DataObject/Data/StructuredTable.php
+++ b/models/DataObject/Data/StructuredTable.php
@@ -47,8 +47,6 @@ public function getData(): array
     }
 
     /**
-     * @param string $name
-     * @param array $arguments
      *
      * @return mixed|void
      *
diff --git a/models/DataObject/Data/UrlSlug.php b/models/DataObject/Data/UrlSlug.php
index 906202c3318..4ea93299ca0 100644
--- a/models/DataObject/Data/UrlSlug.php
+++ b/models/DataObject/Data/UrlSlug.php
@@ -58,8 +58,6 @@ class UrlSlug implements OwnerAwareFieldInterface
     /**
      * UrlSlug constructor.
      *
-     * @param string|null $slug
-     * @param int|null $siteId
      */
     public function __construct(?string $slug, ?int $siteId = 0)
     {
@@ -94,7 +92,6 @@ public function setSlug(?string $slug): static
     /**
      * @internal
      *
-     * @return string|null
      */
     public function getPreviousSlug(): ?string
     {
@@ -104,7 +101,6 @@ public function getPreviousSlug(): ?string
     /**
      * @internal
      *
-     * @param string|null $previousSlug
      */
     public function setPreviousSlug(?string $previousSlug): void
     {
@@ -198,10 +194,7 @@ public static function createFromDataRow(array $rawItem): UrlSlug
     }
 
     /**
-     * @param string $path
-     * @param int $siteId
      *
-     * @return UrlSlug|null
      *
      * @internal
      */
@@ -249,8 +242,6 @@ public static function resolveSlug(string $path, int $siteId = 0): ?UrlSlug
     /**
      * @internal
      *
-     * @return string
-     *
      * @throws \Exception
      */
     public function getAction(): string
@@ -371,7 +362,6 @@ public function delete(): void
     }
 
     /**
-     * @param int $siteId
      *
      * @throws \Exception
      */
@@ -382,7 +372,6 @@ public static function handleSiteDeleted(int $siteId): void
     }
 
     /**
-     * @param string $classId
      *
      * @throws \Exception
      */
@@ -393,10 +382,7 @@ public static function handleClassDeleted(string $classId): void
     }
 
     /**
-     * @param string $path
-     * @param int $siteId
      *
-     * @return string
      *
      * @internal
      */
diff --git a/models/DataObject/DefinitionModifier.php b/models/DataObject/DefinitionModifier.php
index 0c8be3aa2e8..1449c180b10 100644
--- a/models/DataObject/DefinitionModifier.php
+++ b/models/DataObject/DefinitionModifier.php
@@ -24,11 +24,8 @@ final class DefinitionModifier
     /**
      * appends valid $fieldsToAdd to a $layoutDefinition element with $nameToFind
      *
-     * @param Layout $layoutDefinition
-     * @param string $nameToFind
      * @param Data|Data[]|Layout|Layout[] $fieldsToAdd
      *
-     * @return bool
      */
     public function appendFields(Layout $layoutDefinition, string $nameToFind, array|Data|Layout $fieldsToAdd): bool
     {
@@ -42,11 +39,8 @@ public function appendFields(Layout $layoutDefinition, string $nameToFind, array
     /**
      * prepends valid $fieldsToAdd to a $layoutDefinition element with $nameToFind
      *
-     * @param Layout $layoutDefinition
-     * @param string $nameToFind
      * @param Data|Data[]|Layout|Layout[] $fieldsToAdd
      *
-     * @return bool
      */
     public function prependFields(Layout $layoutDefinition, string $nameToFind, array|Data|Layout $fieldsToAdd): bool
     {
@@ -60,11 +54,8 @@ public function prependFields(Layout $layoutDefinition, string $nameToFind, arra
     /**
      * inserts valid $fieldsToAdd into a $layoutDefinition element of type Layout that is given by $nameToFind
      *
-     * @param Layout $layoutDefinition
-     * @param string $nameToFind
      * @param Data|Data[]|Layout|Layout[] $fieldsToInsert
      *
-     * @return bool
      */
     public function insertFieldsFront(Layout $layoutDefinition, string $nameToFind, array|Data|Layout $fieldsToInsert): bool
     {
@@ -78,11 +69,8 @@ public function insertFieldsFront(Layout $layoutDefinition, string $nameToFind,
     /**
      * inserts valid $fieldsToAdd into a $layoutDefinition element of type Layout that is given by $nameToFind
      *
-     * @param Layout $layoutDefinition
-     * @param string $nameToFind
      * @param Data|Data[]|Layout|Layout[] $fieldsToInsert
      *
-     * @return bool
      */
     public function insertFieldsBack(Layout $layoutDefinition, string $nameToFind, array|Data|Layout $fieldsToInsert): bool
     {
@@ -96,11 +84,8 @@ public function insertFieldsBack(Layout $layoutDefinition, string $nameToFind, a
     /**
      * replaces a $layoutDefinition element, that is specified by $nameToFind, with $field
      *
-     * @param Layout $layoutDefinition
-     * @param string $nameToFind
      * @param Data|Data[]|Layout|Layout[] $fieldReplacements
      *
-     * @return bool
      */
     public function replaceField(Layout $layoutDefinition, string $nameToFind, array|Data|Layout $fieldReplacements): bool
     {
@@ -125,11 +110,7 @@ public function removeField(Layout $layoutDefinition, string $nameToFind): bool
      * callback is executed - passing the parent, its child which was found by name and the child-index it was found at
      * to edit upon.
      *
-     * @param Layout|Data\Localizedfields $layoutDefinition
-     * @param string $nameToFind
-     * @param callable $callback
      *
-     * @return bool
      */
     public function findField(Data\Localizedfields|Layout $layoutDefinition, string $nameToFind, callable $callback): bool
     {
diff --git a/models/DataObject/Fieldcollection.php b/models/DataObject/Fieldcollection.php
index 24f3adeb263..c6b911582b5 100644
--- a/models/DataObject/Fieldcollection.php
+++ b/models/DataObject/Fieldcollection.php
@@ -42,13 +42,11 @@ class Fieldcollection extends Model\AbstractModel implements \Iterator, DirtyInd
     /**
      * @internal
      *
-     * @var string
      */
     protected string $fieldname;
 
     /**
      * @param TItem[] $items
-     * @param string|null $fieldname
      */
     public function __construct(array $items = [], string $fieldname = null)
     {
@@ -111,7 +109,6 @@ public function getItemDefinitions(): array
     }
 
     /**
-     * @param Concrete $object
      * @param array<string, mixed> $params
      *
      * @throws \Exception
@@ -231,11 +228,6 @@ public function valid(): bool
     }
 
     /**
-     * @param Concrete $object
-     * @param string $type
-     * @param string $fcField
-     * @param int $index
-     * @param string $field
      *
      * @throws \Exception
      *
diff --git a/models/DataObject/Fieldcollection/Data/AbstractData.php b/models/DataObject/Fieldcollection/Data/AbstractData.php
index 9567d94c79f..5fce78d2d81 100644
--- a/models/DataObject/Fieldcollection/Data/AbstractData.php
+++ b/models/DataObject/Fieldcollection/Data/AbstractData.php
@@ -92,24 +92,11 @@ public function getObject(): ?Concrete
         return $this->object;
     }
 
-    /**
-     * @param string $fieldName
-     * @param string|null $language
-     *
-     * @return mixed
-     */
     public function get(string $fieldName, string $language = null): mixed
     {
         return $this->{'get'.ucfirst($fieldName)}($language);
     }
 
-    /**
-     * @param string $fieldName
-     * @param mixed $value
-     * @param string|null $language
-     *
-     * @return mixed
-     */
     public function set(string $fieldName, mixed $value, string $language = null): mixed
     {
         return $this->{'set'.ucfirst($fieldName)}($value, $language);
@@ -118,7 +105,6 @@ public function set(string $fieldName, mixed $value, string $language = null): m
     /**
      * @internal
      *
-     * @return array
      */
     protected function getLazyLoadedFieldNames(): array
     {
@@ -135,9 +121,6 @@ protected function getLazyLoadedFieldNames(): array
         return $lazyLoadedFieldNames;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isAllLazyKeysMarkedAsLoaded(): bool
     {
         $object = $this->getObject();
diff --git a/models/DataObject/Fieldcollection/Data/Dao.php b/models/DataObject/Fieldcollection/Data/Dao.php
index 262ea3e8c19..30dce5b5b44 100644
--- a/models/DataObject/Fieldcollection/Data/Dao.php
+++ b/models/DataObject/Fieldcollection/Data/Dao.php
@@ -28,9 +28,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param Model\DataObject\Concrete $object
-     * @param array $params
-     * @param bool|array $saveRelationalData
      *
      * @throws \Exception
      */
diff --git a/models/DataObject/Fieldcollection/Definition.php b/models/DataObject/Fieldcollection/Definition.php
index 8339ce1d738..ffb2a005334 100644
--- a/models/DataObject/Fieldcollection/Definition.php
+++ b/models/DataObject/Fieldcollection/Definition.php
@@ -45,9 +45,6 @@ class Definition extends Model\AbstractModel
         'object', 'interface', 'default',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doEnrichFieldDefinition(Data $fieldDefinition, array $context = []): Data
     {
         if ($fieldDefinition instanceof FieldDefinitionEnrichmentInterface) {
@@ -62,7 +59,6 @@ protected function doEnrichFieldDefinition(Data $fieldDefinition, array $context
     /**
      * @internal
      *
-     * @param DataObject\ClassDefinition\Layout|DataObject\ClassDefinition\Data $def
      */
     protected function extractDataDefinitions(DataObject\ClassDefinition\Data|DataObject\ClassDefinition\Layout $def): void
     {
@@ -88,9 +84,7 @@ protected function extractDataDefinitions(DataObject\ClassDefinition\Data|DataOb
     }
 
     /**
-     * @param string $key
      *
-     * @return self|null
      *
      * @throws \Exception
      */
@@ -124,7 +118,6 @@ public static function getByKey(string $key): ?Definition
     }
 
     /**
-     * @param bool $saveDefinitionFile
      *
      * @throws \Exception
      */
@@ -175,7 +168,6 @@ public function save(bool $saveDefinitionFile = true): void
     }
 
     /**
-     * @param bool $generateDefinitionFile
      *
      * @throws \Exception
      * @throws DataObject\Exception\DefinitionWriteException
@@ -252,9 +244,7 @@ public function isWritable(): bool
     }
 
     /**
-     * @param string|null $key
      *
-     * @return string
      *
      * @internal
      */
@@ -266,7 +256,6 @@ public function getDefinitionFile(string $key = null): string
     /**
      * @internal
      *
-     * @return string
      */
     public function getPhpClassFile(): string
     {
@@ -276,7 +265,6 @@ public function getPhpClassFile(): string
     /**
      * @internal
      *
-     * @return string
      */
     protected function getInfoDocBlock(): string
     {
diff --git a/models/DataObject/Folder.php b/models/DataObject/Folder.php
index 0724af26adf..338e5302522 100644
--- a/models/DataObject/Folder.php
+++ b/models/DataObject/Folder.php
@@ -23,9 +23,6 @@
  */
 class Folder extends DataObject
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'folder';
 
     public static function create(array $values): Folder
@@ -39,18 +36,12 @@ public static function create(array $values): Folder
         return $object;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function update(bool $isUpdate = null, array $params = []): void
     {
         parent::update($isUpdate, $params);
         $this->getDao()->update($isUpdate);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete(): void
     {
         if ($this->getId() == 1) {
diff --git a/models/DataObject/LazyLoadedFieldsInterface.php b/models/DataObject/LazyLoadedFieldsInterface.php
index 4b4b3470262..a431a391bc6 100644
--- a/models/DataObject/LazyLoadedFieldsInterface.php
+++ b/models/DataObject/LazyLoadedFieldsInterface.php
@@ -27,7 +27,6 @@ public function isLazyKeyLoaded(string $key): bool;
     /**
      * @internal
      *
-     * @return bool
      */
     public function isAllLazyKeysMarkedAsLoaded(): bool;
 }
diff --git a/models/DataObject/Listing.php b/models/DataObject/Listing.php
index 4ce72084126..4d5fefd7863 100644
--- a/models/DataObject/Listing.php
+++ b/models/DataObject/Listing.php
@@ -72,9 +72,6 @@ public function getObjectTypes(): array
         return $this->objectTypes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getItems(int $offset, int $itemCountPerPage): array
     {
         $this->setOffset($offset);
@@ -85,8 +82,6 @@ public function getItems(int $offset, int $itemCountPerPage): array
 
     /**
      * @internal
-     *
-     * @return bool
      */
     public function addDistinct(): bool
     {
diff --git a/models/DataObject/Listing/Concrete.php b/models/DataObject/Listing/Concrete.php
index f85b6011a8b..15bc0193688 100644
--- a/models/DataObject/Listing/Concrete.php
+++ b/models/DataObject/Listing/Concrete.php
@@ -42,7 +42,6 @@ abstract class Concrete extends Model\DataObject\Listing
      * do not use the localized views for this list (in the case the class contains localized fields),
      * conditions on localized fields are not possible
      *
-     * @var bool
      */
     protected bool $ignoreLocalizedFields = false;
 
@@ -120,13 +119,10 @@ public function getIgnoreLocalizedFields(): bool
     /**
      * field collection queries
      *
-     * @var array
      */
     private array $fieldCollectionConfigs = [];
 
     /**
-     * @param string $type
-     * @param string|null $fieldname
      *
      * @throws \Exception
      */
@@ -143,7 +139,6 @@ public function addFieldCollection(string $type, string $fieldname = null): void
     }
 
     /**
-     * @param array $fieldCollections
      *
      * @return $this
      *
@@ -168,12 +163,10 @@ public function getFieldCollections(): array
     /**
      * object brick queries
      *
-     * @var array
      */
     private array $objectBrickConfigs = [];
 
     /**
-     * @param string $type
      *
      * @throws \Exception
      */
@@ -192,7 +185,6 @@ public function addObjectbrick(string $type): void
     }
 
     /**
-     * @param array $objectbricks
      *
      * @return $this
      *
@@ -219,7 +211,6 @@ public function getObjectbricks(): array
     /**
      * @internal
      *
-     * @return bool
      */
     public function addDistinct(): bool
     {
diff --git a/models/DataObject/Listing/Concrete/Dao.php b/models/DataObject/Listing/Concrete/Dao.php
index 6709c4859e6..77723112ff8 100644
--- a/models/DataObject/Listing/Concrete/Dao.php
+++ b/models/DataObject/Listing/Concrete/Dao.php
@@ -49,7 +49,6 @@ public function loadIdList(): array
     }
 
     /**
-     * @param \Exception $e
      *
      * @return int[]
      *
@@ -75,7 +74,6 @@ protected function exceptionHandler(\Exception $e): array
     }
 
     /**
-     * @return string|null
      *
      * @throws \Exception
      */
@@ -106,7 +104,6 @@ public function getLocalizedBrickLanguage(): ?string
     }
 
     /**
-     * @return string
      *
      * @throws \Exception
      */
@@ -152,7 +149,6 @@ public function getTableName(): string
     }
 
     /**
-     * @param DoctrineQueryBuilder $queryBuilder
      *
      * @return $this
      *
diff --git a/models/DataObject/Listing/Dao.php b/models/DataObject/Listing/Dao.php
index b73718d5cca..d9ccfa7e674 100644
--- a/models/DataObject/Listing/Dao.php
+++ b/models/DataObject/Listing/Dao.php
@@ -37,8 +37,6 @@ public function getTableName(): string
     /**
      * @param string|string[]|null $columns
      *
-     * @return DoctrineQueryBuilder
-     *
      * @throws \Exception
      */
     public function getQueryBuilder(...$columns): DoctrineQueryBuilder
@@ -57,7 +55,6 @@ public function getQueryBuilder(...$columns): DoctrineQueryBuilder
     /**
      * Loads a list of objects for the specicifies parameters, returns an array of DataObject\AbstractObject elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/DataObject/Localizedfield.php b/models/DataObject/Localizedfield.php
index fe7c759f892..8b98cf9190e 100644
--- a/models/DataObject/Localizedfield.php
+++ b/models/DataObject/Localizedfield.php
@@ -65,7 +65,6 @@ final class Localizedfield extends Model\AbstractModel implements
     /**
      * @internal
      *
-     * @var Concrete|Model\Element\ElementDescriptor|null
      */
     protected Concrete|Model\Element\ElementDescriptor|null $object = null;
 
@@ -123,9 +122,6 @@ public static function doGetFallbackValues(): bool
         return self::$getFallbackValues;
     }
 
-    /**
-     * @param array|null $items
-     */
     public function __construct(array $items = null)
     {
         if ($items) {
@@ -165,7 +161,6 @@ public function loadLazyData(): void
     }
 
     /**
-     * @param bool $mark
      *
      * @internal
      */
@@ -179,9 +174,7 @@ public function setLoadedAllLazyData(bool $mark = true): void
      *
      * @internal
      *
-     * @param bool $loadLazyFields
      *
-     * @return array
      */
     public function getInternalData(bool $loadLazyFields = false): array
     {
@@ -214,7 +207,6 @@ public function getInternalData(bool $loadLazyFields = false): array
     }
 
     /**
-     * @param Concrete|Model\Element\ElementDescriptor|null $object
      *
      * @return $this
      *
@@ -262,9 +254,7 @@ public function getClass(): ?ClassDefinition
     /**
      * @throws \Exception
      *
-     * @param string|null $language
      *
-     * @return string
      */
     public function getLanguage(string $language = null): string
     {
@@ -328,8 +318,6 @@ public function getFieldDefinition(string $name, array $context = []): ?ClassDef
     }
 
     /**
-     * @param array $context
-     * @param array $params
      *
      * @return ClassDefinition\Data[]
      *
@@ -389,11 +377,7 @@ private function loadLazyField(Model\DataObject\ClassDefinition\Data $fieldDefin
     }
 
     /**
-     * @param string $name
-     * @param string|null $language
-     * @param bool $ignoreFallbackLanguage
      *
-     * @return mixed
      *
      * @throws \Exception
      * @throws Model\Exception\NotFoundException
@@ -507,10 +491,6 @@ public function getLocalizedValue(string $name, string $language = null, bool $i
     }
 
     /**
-     * @param string $name
-     * @param mixed $value
-     * @param string|null $language
-     * @param bool $markFieldAsDirty
      *
      * @return $this
      *
@@ -600,9 +580,6 @@ public function setLocalizedValue(string $name, mixed $value, string $language =
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isAllLazyKeysMarkedAsLoaded(): bool
     {
         $object = $this->getObject();
@@ -647,7 +624,6 @@ public function setContext(?array $context): void
     /**
      * @internal
      *
-     * @return bool
      */
     public function hasDirtyLanguages(): bool
     {
@@ -661,9 +637,7 @@ public function hasDirtyLanguages(): bool
     /**
      * @internal
      *
-     * @param string $language
      *
-     * @return bool
      */
     public function isLanguageDirty(string $language): bool
     {
@@ -694,7 +668,6 @@ public function resetLanguageDirtyMap(): void
     /**
      * @internal
      *
-     * @return array|null
      */
     public function getDirtyLanguages(): ?array
     {
@@ -712,7 +685,6 @@ public function markAllLanguagesAsDirty(): void
     /**
      * @internal
      *
-     * @return bool
      */
     public function allLanguagesAreDirty(): bool
     {
@@ -726,8 +698,6 @@ public function allLanguagesAreDirty(): bool
     /**
      * @internal
      *
-     * @param string $language
-     * @param bool $dirty
      */
     public function markLanguageAsDirty(string $language, bool $dirty = true): void
     {
@@ -758,8 +728,6 @@ public function markLanguagesAsDirty(array $languages): void
     /**
      * @internal
      *
-     * @return array
-     *
      * @throws \Exception
      */
     protected function getLazyLoadedFieldNames(): array
diff --git a/models/DataObject/Localizedfield/Dao.php b/models/DataObject/Localizedfield/Dao.php
index 66aa079d6b7..5dd4bf41255 100644
--- a/models/DataObject/Localizedfield/Dao.php
+++ b/models/DataObject/Localizedfield/Dao.php
@@ -76,7 +76,6 @@ public function getQueryTableName(): string
     }
 
     /**
-     * @param array $params
      *
      * @throws \Exception
      */
@@ -440,8 +439,6 @@ public function save(array $params = []): void
     }
 
     /**
-     * @param bool $deleteQuery
-     * @param bool $isUpdate
      *
      * @return bool force update
      */
@@ -781,7 +778,6 @@ public function createLocalizedViews(): void
     }
 
     /**
-     * @param array $params
      *
      * @throws \Exception
      */
diff --git a/models/DataObject/Objectbrick.php b/models/DataObject/Objectbrick.php
index 1ef7d2f2864..2ad51bbb719 100644
--- a/models/DataObject/Objectbrick.php
+++ b/models/DataObject/Objectbrick.php
@@ -37,7 +37,6 @@ class Objectbrick extends Model\AbstractModel implements DirtyIndicatorInterface
     /**
      * @internal
      *
-     * @var string
      */
     protected string $fieldname;
 
@@ -277,9 +276,6 @@ public function set(string $fieldName, mixed $value): mixed
     }
 
     /**
-     * @param string $brick
-     * @param string $brickField
-     * @param string $field
      *
      * @throws \Exception
      *
diff --git a/models/DataObject/Objectbrick/Dao.php b/models/DataObject/Objectbrick/Dao.php
index af9d3578bde..b4e87ea1b39 100644
--- a/models/DataObject/Objectbrick/Dao.php
+++ b/models/DataObject/Objectbrick/Dao.php
@@ -121,10 +121,8 @@ public function load(DataObject\Concrete $object, array $params = []): array
     }
 
     /**
-     * @param DataObject\Concrete $object
      * @param bool $saveMode true if called from save method
      *
-     * @return array
      */
     public function delete(DataObject\Concrete $object, bool $saveMode = false): array
     {
diff --git a/models/DataObject/Objectbrick/Data/AbstractData.php b/models/DataObject/Objectbrick/Data/AbstractData.php
index 549aed2eb5d..c351716ea15 100644
--- a/models/DataObject/Objectbrick/Data/AbstractData.php
+++ b/models/DataObject/Objectbrick/Data/AbstractData.php
@@ -38,7 +38,6 @@ abstract class AbstractData extends Model\AbstractModel implements Model\DataObj
     /**
      * Will be overriden by the actual ObjectBrick
      *
-     * @var string
      */
     protected string $type = '';
 
@@ -122,9 +121,7 @@ protected function flushContainer(): void
     }
 
     /**
-     * @param string $key
      *
-     * @return mixed
      *
      * @throws InheritanceParentNotFoundException
      */
@@ -174,24 +171,11 @@ public function getValueForFieldName(string $key): mixed
         return false;
     }
 
-    /**
-     * @param string $fieldName
-     * @param string|null $language
-     *
-     * @return mixed
-     */
     public function get(string $fieldName, string $language = null): mixed
     {
         return $this->{'get'.ucfirst($fieldName)}($language);
     }
 
-    /**
-     * @param string $fieldName
-     * @param mixed $value
-     * @param string|null $language
-     *
-     * @return mixed
-     */
     public function set(string $fieldName, mixed $value, string $language = null): mixed
     {
         return $this->{'set'.ucfirst($fieldName)}($value, $language);
@@ -200,7 +184,6 @@ public function set(string $fieldName, mixed $value, string $language = null): m
     /**
      * @internal
      *
-     * @return array
      */
     protected function getLazyLoadedFieldNames(): array
     {
@@ -217,9 +200,6 @@ protected function getLazyLoadedFieldNames(): array
         return $lazyLoadedFieldNames;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isAllLazyKeysMarkedAsLoaded(): bool
     {
         $object = $this->getObject();
diff --git a/models/DataObject/Objectbrick/Data/Dao.php b/models/DataObject/Objectbrick/Data/Dao.php
index 163be9be246..d612dcdb8e9 100644
--- a/models/DataObject/Objectbrick/Data/Dao.php
+++ b/models/DataObject/Objectbrick/Data/Dao.php
@@ -34,8 +34,6 @@ class Dao extends Model\Dao\AbstractDao
     protected ?DataObject\Concrete\Dao\InheritanceHelper $inheritanceHelper = null;
 
     /**
-     * @param DataObject\Concrete $object
-     * @param array $params
      *
      * @throws \Exception
      */
diff --git a/models/DataObject/Objectbrick/Definition.php b/models/DataObject/Objectbrick/Definition.php
index 22a3fbb745e..18da41f3b3b 100644
--- a/models/DataObject/Objectbrick/Definition.php
+++ b/models/DataObject/Objectbrick/Definition.php
@@ -59,9 +59,7 @@ public function getClassDefinitions(): array
     /**
      * @static
      *
-     * @param string $key
      *
-     * @return self|null
      */
     public static function getByKey(string $key): ?Definition
     {
@@ -139,7 +137,6 @@ private function checkTablenames(): void
     }
 
     /**
-     * @param bool $saveDefinitionFile
      *
      * @throws \Exception
      */
@@ -229,9 +226,6 @@ private function checkContainerRestrictions(): void
         $this->enforceBlockRules($fds);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function generateClassFiles(bool $generateDefinitionFile = true): void
     {
         if ($generateDefinitionFile && !$this->isWritable()) {
@@ -378,11 +372,9 @@ private function updateDatabase(): void
     }
 
     /**
-     * @param DataObject\ClassDefinition $class
      *
      * @internal
      *
-     * @return array
      */
     public function getAllowedTypesWithFieldname(DataObject\ClassDefinition $class): array
     {
@@ -446,10 +438,7 @@ private function createContainerClasses(): void
     }
 
     /**
-     * @param string $classname
-     * @param string $fieldname
      *
-     * @return string
      *
      * @internal
      */
@@ -459,10 +448,7 @@ public function getContainerClassName(string $classname, string $fieldname): str
     }
 
     /**
-     * @param string $classname
-     * @param string $fieldname
      *
-     * @return string
      *
      * @internal
      */
@@ -472,9 +458,7 @@ public function getContainerNamespace(string $classname, string $fieldname): str
     }
 
     /**
-     * @param string $classname
      *
-     * @return string
      *
      * @internal
      */
@@ -535,9 +519,6 @@ public function delete(): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doEnrichFieldDefinition(Data $fieldDefinition, array $context = []): Data
     {
         if ($fieldDefinition instanceof FieldDefinitionEnrichmentInterface) {
@@ -558,9 +539,7 @@ public function isWritable(): bool
     }
 
     /**
-     * @param string|null $key
      *
-     * @return string
      *
      * @internal
      */
@@ -572,7 +551,6 @@ public function getDefinitionFile(string $key = null): string
     /**
      * @internal
      *
-     * @return string
      */
     public function getPhpClassFile(): string
     {
diff --git a/models/DataObject/OwnerAwareFieldInterface.php b/models/DataObject/OwnerAwareFieldInterface.php
index 3289ddddeca..a523bb5dd5a 100644
--- a/models/DataObject/OwnerAwareFieldInterface.php
+++ b/models/DataObject/OwnerAwareFieldInterface.php
@@ -19,7 +19,6 @@
 interface OwnerAwareFieldInterface
 {
     /**
-     * @param mixed $owner
      *
      * @return $this;
      */
diff --git a/models/DataObject/QuantityValue/Unit/Dao.php b/models/DataObject/QuantityValue/Unit/Dao.php
index 88c0a94d871..1008bf6a814 100644
--- a/models/DataObject/QuantityValue/Unit/Dao.php
+++ b/models/DataObject/QuantityValue/Unit/Dao.php
@@ -30,7 +30,6 @@ class Dao extends Model\Dao\AbstractDao
     /**
      * Contains all valid columns in the database table
      *
-     * @var array
      */
     protected array $validColumns = [];
 
@@ -44,7 +43,6 @@ public function init(): void
     }
 
     /**
-     * @param string $abbreviation
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -58,7 +56,6 @@ public function getByAbbreviation(string $abbreviation): void
     }
 
     /**
-     * @param string $reference
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -72,7 +69,6 @@ public function getByReference(string $reference): void
     }
 
     /**
-     * @param int $id
      *
      * @throws Model\Exception\NotFoundException
      */
diff --git a/models/DataObject/Service.php b/models/DataObject/Service.php
index fb320e003c1..39418d52d01 100644
--- a/models/DataObject/Service.php
+++ b/models/DataObject/Service.php
@@ -54,7 +54,6 @@ class Service extends Model\Element\Service
     /**
      * System fields used by filter conditions
      *
-     * @var array
      */
     protected static array $systemFields = ['path', 'key', 'id', 'published', 'creationDate', 'modificationDate', 'fullpath'];
 
@@ -68,9 +67,6 @@ class Service extends Model\Element\Service
                                                                 'classid', 'childrensortby', 'classname', 'childrensortorder',
                                                                 'versioncount', ];
 
-    /**
-     * @param Model\User|null $user
-     */
     public function __construct(Model\User $user = null)
     {
         $this->_user = $user;
@@ -81,8 +77,6 @@ public function __construct(Model\User $user = null)
      *
      * @static
      *
-     * @param int $userId
-     *
      * @return Concrete[]
      */
     public static function getObjectsReferencingUser(int $userId): array
@@ -171,8 +165,6 @@ public function copyRecursive(AbstractObject $target, AbstractObject $source): ?
     }
 
     /**
-     * @param AbstractObject $target
-     * @param AbstractObject $source
      *
      * @return AbstractObject copied object
      */
@@ -277,9 +269,7 @@ public function copyContents(Concrete $target, Concrete $source): Concrete
     }
 
     /**
-     * @param string $field
      *
-     * @return bool
      *
      * @internal
      */
@@ -291,12 +281,7 @@ public static function isHelperGridColumnConfig(string $field): bool
     /**
      * Language only user for classification store !!!
      *
-     * @param AbstractObject $object
-     * @param array|null $fields
-     * @param string|null $requestedLanguage
-     * @param array $params
      *
-     * @return array
      *
      * @internal
      */
@@ -478,8 +463,6 @@ public static function gridObjectData(AbstractObject $object, array $fields = nu
     }
 
     /**
-     * @param array $helperDefinitions
-     * @param string $key
      *
      * @return string[]|null
      *
@@ -496,11 +479,7 @@ public static function expandGridColumnForExport(array $helperDefinitions, strin
     }
 
     /**
-     * @param array $helperDefinitions
-     * @param string $key
-     * @param array $context
      *
-     * @return ConfigElementInterface|null
      *
      * @internal
      */
@@ -755,7 +734,6 @@ public static function hasInheritableParentObject(Concrete $object): ?Concrete
      *
      * @static
      *
-     * @param AbstractObject $object
      */
     public static function loadAllObjectFields(AbstractObject $object): void
     {
@@ -783,10 +761,7 @@ public static function loadAllObjectFields(AbstractObject $object): void
     /**
      * @static
      *
-     * @param string|Concrete $object
-     * @param string|ClassDefinition\Data\Select|ClassDefinition\Data\Multiselect $definition
      *
-     * @return array
      */
     public static function getOptionsForSelectField(string|Concrete $object, ClassDefinition\Data\Multiselect|ClassDefinition\Data\Select|string $definition): array
     {
@@ -830,10 +805,7 @@ public static function getOptionsForSelectField(string|Concrete $object, ClassDe
     /**
      * alias of getOptionsForMultiSelectField
      *
-     * @param string|Concrete $object
-     * @param string|ClassDefinition\Data\Select|ClassDefinition\Data\Multiselect $fieldname
      *
-     * @return array
      */
     public static function getOptionsForMultiSelectField(string|Concrete $object, ClassDefinition\Data\Multiselect|ClassDefinition\Data\Select|string $fieldname): array
     {
@@ -843,10 +815,7 @@ public static function getOptionsForMultiSelectField(string|Concrete $object, Cl
     /**
      * @static
      *
-     * @param string $path
-     * @param string|null $type
      *
-     * @return bool
      */
     public static function pathExists(string $path, string $type = null): bool
     {
@@ -889,11 +858,7 @@ public static function pathExists(string $path, string $type = null): bool
      *  "asset" => array(...)
      * )
      *
-     * @param AbstractObject $object
-     * @param array $rewriteConfig
-     * @param array $params
      *
-     * @return AbstractObject
      */
     public static function rewriteIds(AbstractObject $object, array $rewriteConfig, array $params = []): AbstractObject
     {
@@ -923,7 +888,6 @@ public static function rewriteIds(AbstractObject $object, array $rewriteConfig,
     }
 
     /**
-     * @param Concrete $object
      *
      * @return array<string, DataObject\ClassDefinition\CustomLayout>
      */
@@ -992,9 +956,7 @@ public static function getValidLayouts(Concrete $object): array
      * Returns the fields of a datatype container (e.g. block or localized fields)
      *
      * @param ClassDefinition\Data|Model\DataObject\ClassDefinition\Layout $layout
-     * @param string $targetClass
      * @param ClassDefinition\Data[] $targetList
-     * @param bool $insideDataType
      *
      * @return ClassDefinition\Data[]
      */
@@ -1018,9 +980,7 @@ public static function extractFieldDefinitions(ClassDefinition\Data|ClassDefinit
     }
 
     /** Calculates the super layout definition for the given object.
-     * @param Concrete $object
      *
-     * @return mixed
      */
     public static function getSuperLayoutDefinition(Concrete $object): mixed
     {
@@ -1091,7 +1051,6 @@ private static function synchronizeCustomLayoutFieldWithMain(array $mainDefiniti
     }
 
     /** Synchronizes a custom layout with its main layout
-     * @param ClassDefinition\CustomLayout $customLayout
      */
     public static function synchronizeCustomLayout(ClassDefinition\CustomLayout $customLayout): void
     {
@@ -1112,10 +1071,7 @@ public static function synchronizeCustomLayout(ClassDefinition\CustomLayout $cus
     }
 
     /**
-     * @param string $classId
-     * @param int $objectId
      *
-     * @return array|null
      *
      * @internal
      */
@@ -1286,8 +1242,6 @@ private static function doFilterCustomGridFieldDefinitions(ClassDefinition\Data|
     }
 
     /**  Determines the custom layout definition (if necessary) for the given class
-     * @param ClassDefinition $class
-     * @param int $objectId
      *
      * @return array layout
      *
@@ -1366,7 +1320,6 @@ public static function getUniqueKey(ElementInterface $element, int $nr = 0): str
      * Enriches the layout definition before it is returned to the admin interface.
      *
      * @param Model\DataObject\ClassDefinition\Data|Model\DataObject\ClassDefinition\Layout|null $layout
-     * @param Concrete|null $object
      * @param array<string, mixed> $context additional contextual data
      *
      * @internal
@@ -1480,12 +1433,8 @@ private static function evaluateExpression(Model\DataObject\ClassDefinition\Data
     }
 
     /**
-     * @param Concrete $object
-     * @param array $params
      * @param Model\DataObject\Data\CalculatedValue|null $data
      *
-     * @return string|null
-     *
      * @internal
      */
     public static function getCalculatedFieldValueForEditMode(Concrete $object, array $params, ?Data\CalculatedValue $data): ?string
@@ -1639,9 +1588,7 @@ public static function recursiveResetDirtyMap(AbstractObject $object): void
     }
 
     /**
-     * @param array $descriptor
      *
-     * @return array
      *
      * @internal
      */
@@ -1662,15 +1609,7 @@ public static function buildConditionPartsFromDescriptor(array $descriptor): arr
     }
 
     /**
-     * @param Concrete $object
-     * @param string $requestedLanguage
-     * @param array $fields
-     * @param array $helperDefinitions
-     * @param LocaleServiceInterface $localeService
-     * @param bool $returnMappedFieldNames
-     * @param array $context
      *
-     * @return array
      *
      * @internal
      */
@@ -1729,14 +1668,8 @@ public static function getCsvDataForObject(Concrete $object, string $requestedLa
     }
 
     /**
-     * @param string $requestedLanguage
-     * @param LocaleServiceInterface $localeService
      * @param DataObject\Listing $list
      * @param string[] $fields
-     * @param bool $addTitles
-     * @param array $context
-     *
-     * @return array
      *
      * @internal
      */
diff --git a/models/DataObject/Traits/CompositeIndexTrait.php b/models/DataObject/Traits/CompositeIndexTrait.php
index 981a30e3a2b..b592a12a6cc 100644
--- a/models/DataObject/Traits/CompositeIndexTrait.php
+++ b/models/DataObject/Traits/CompositeIndexTrait.php
@@ -28,9 +28,6 @@ trait CompositeIndexTrait
     /**
      * @internal
      *
-     * @param string $table
-     * @param string $type
-     * @param array $compositeIndices
      *
      */
     public function updateCompositeIndices(string $table, string $type, array $compositeIndices): void
diff --git a/models/DataObject/Traits/ContextPersistenceTrait.php b/models/DataObject/Traits/ContextPersistenceTrait.php
index 644b278670d..6c464dfa783 100644
--- a/models/DataObject/Traits/ContextPersistenceTrait.php
+++ b/models/DataObject/Traits/ContextPersistenceTrait.php
@@ -28,11 +28,6 @@ trait ContextPersistenceTrait
     /**
      * Enrich relation / slug with type-specific data.
      *
-     * @param \Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|AbstractData|Concrete|Localizedfield $object
-     * @param array $params
-     * @param string|null $classId
-     * @param array $row
-     * @param string $srcCol
      */
     protected function enrichDataRow(Localizedfield|AbstractData|\Pimcore\Model\DataObject\Objectbrick\Data\AbstractData|Concrete $object, array $params, ?string &$classId, array &$row = [], string $srcCol = 'src_id'): void
     {
diff --git a/models/DataObject/Traits/DefaultValueTrait.php b/models/DataObject/Traits/DefaultValueTrait.php
index 5e9d9e879df..72efebc7bf5 100644
--- a/models/DataObject/Traits/DefaultValueTrait.php
+++ b/models/DataObject/Traits/DefaultValueTrait.php
@@ -34,9 +34,6 @@ trait DefaultValueTrait
     abstract protected function doGetDefaultValue(Concrete $object, array $context = []): mixed;
 
     /**
-     * @param mixed $data
-     * @param Concrete|null $object
-     * @param array $params
      *
      * @return mixed $data
      */
diff --git a/models/DataObject/Traits/ObjectVarTrait.php b/models/DataObject/Traits/ObjectVarTrait.php
index d5b167dabe4..e5ae30989f9 100644
--- a/models/DataObject/Traits/ObjectVarTrait.php
+++ b/models/DataObject/Traits/ObjectVarTrait.php
@@ -27,7 +27,6 @@ trait ObjectVarTrait
     /**
      * returns object values without the dao
      *
-     * @return array
      */
     public function getObjectVars(): array
     {
@@ -54,9 +53,6 @@ public function getObjectVar(?string $var): mixed
     }
 
     /**
-     * @param string $var
-     * @param mixed $value
-     * @param bool $silent
      *
      * @return $this
      *
diff --git a/models/DataObject/Traits/OwnerAwareFieldTrait.php b/models/DataObject/Traits/OwnerAwareFieldTrait.php
index 44cc8a0a365..ac0e6a01c1b 100644
--- a/models/DataObject/Traits/OwnerAwareFieldTrait.php
+++ b/models/DataObject/Traits/OwnerAwareFieldTrait.php
@@ -31,7 +31,6 @@ trait OwnerAwareFieldTrait
     protected ?string $_language = null;
 
     /**
-     * @param mixed $owner
      *
      * @return $this
      *
@@ -62,8 +61,6 @@ public function _getOwnerLanguage(): ?string
     /**
      * @internal
      *
-     * @param string|null $fieldname
-     *
      * @return $this;
      */
     public function _setOwnerFieldname(?string $fieldname): static
@@ -76,8 +73,6 @@ public function _setOwnerFieldname(?string $fieldname): static
     /**
      * @internal
      *
-     * @param string|null $language
-     *
      * @return $this
      */
     public function _setOwnerLanguage(?string $language): static
diff --git a/models/Dependency.php b/models/Dependency.php
index ae358ed0d3c..4f62239da1e 100644
--- a/models/Dependency.php
+++ b/models/Dependency.php
@@ -27,31 +27,25 @@ class Dependency extends AbstractModel
     /**
      * The ID of the object to get dependencies for
      *
-     * @var int
      */
     protected int $sourceId;
 
     /**
      * The type of the object to get dependencies for
      *
-     * @var string
      */
     protected string $sourceType;
 
     /**
      * Contains the ID/type of objects which are required for the given source object (sourceId/sourceType)
      *
-     * @var array
      */
     protected array $requires = [];
 
     /**
      * Static helper to get the dependencies for the given sourceId & type
      *
-     * @param int $id
-     * @param string $type
      *
-     * @return Dependency
      */
     public static function getBySourceId(int $id, string $type): Dependency
     {
@@ -64,8 +58,6 @@ public static function getBySourceId(int $id, string $type): Dependency
     /**
      * Add a requirement to the source object
      *
-     * @param int $id
-     * @param string $type
      */
     public function addRequirement(int $id, string $type): void
     {
@@ -79,7 +71,6 @@ public function addRequirement(int $id, string $type): void
      * Used when element gets deleted. Removes entries (by source = element) and
      * schedules a sanity check for the affected targets.
      *
-     * @param Element\ElementInterface $element
      */
     public function cleanAllForElement(Element\ElementInterface $element): void
     {
@@ -101,12 +92,6 @@ public function getSourceId(): int
         return $this->sourceId;
     }
 
-    /**
-     * @param int|null $offset
-     * @param int|null $limit
-     *
-     * @return array
-     */
     public function getRequires(int $offset = null, int $limit = null): array
     {
         if ($offset !== null) {
@@ -116,25 +101,11 @@ public function getRequires(int $offset = null, int $limit = null): array
         return $this->requires;
     }
 
-    /**
-     * @param int|null $offset
-     * @param int|null $limit
-     *
-     * @return array
-     */
     public function getRequiredBy(int $offset = null, int $limit = null): array
     {
         return $this->getDao()->getRequiredBy($offset, $limit);
     }
 
-    /**
-     * @param string|null $orderBy
-     * @param string|null $orderDirection
-     * @param int|null $offset
-     * @param int|null $limit
-     *
-     * @return array
-     */
     public function getRequiredByWithPath(int $offset = null, int $limit = null, string $orderBy = null, string $orderDirection = null): array
     {
         return $this->getDao()->getRequiredByWithPath($offset, $limit, $orderBy, $orderDirection);
@@ -179,7 +150,6 @@ public function getRequiredByTotalCount(): int
     /**
      * Check if the source object is required by an other object (an other object depends on this object)
      *
-     * @return bool
      */
     public function isRequired(): bool
     {
diff --git a/models/Dependency/Dao.php b/models/Dependency/Dao.php
index 8558935d334..abfaccf51e5 100644
--- a/models/Dependency/Dao.php
+++ b/models/Dependency/Dao.php
@@ -33,10 +33,7 @@ class Dao extends Model\Dao\AbstractDao
     /**
      * Loads the relations for the given sourceId and type
      *
-     * @param int|null $id
-     * @param string|null $type
      *
-     * @return void
      */
     public function getBySourceId(int $id = null, string $type = null): void
     {
@@ -65,9 +62,7 @@ public function getBySourceId(int $id = null, string $type = null): void
     /**
      * Clear all relations in the database
      *
-     * @param Element\ElementInterface $element
      *
-     * @return void
      */
     public function cleanAllForElement(Element\ElementInterface $element): void
     {
@@ -94,7 +89,6 @@ public function cleanAllForElement(Element\ElementInterface $element): void
     /**
      * Clear all relations in the database for current source id
      *
-     * @return void
      */
     public function clear(): void
     {
@@ -108,7 +102,6 @@ public function clear(): void
     /**
      * Save to database
      *
-     * @return void
      */
     public function save(): void
     {
@@ -176,10 +169,7 @@ public function save(): void
     /**
      * Loads the relations that need the given source element
      *
-     * @param int|null $offset
-     * @param int|null $limit
      *
-     * @return array
      */
     public function getRequiredBy(int $offset = null, int $limit = null): array
     {
@@ -212,14 +202,6 @@ public function getRequiredBy(int $offset = null, int $limit = null): array
         return $requiredBy;
     }
 
-    /**
-     * @param string|null $orderBy
-     * @param string|null $orderDirection
-     * @param int|null $offset
-     * @param int|null $limit
-     *
-     * @return array
-     */
     public function getRequiredByWithPath(int $offset = null, int $limit = null, string $orderBy = null, string $orderDirection = null): array
     {
         $targetId = $this->model->getSourceId();
@@ -274,7 +256,6 @@ public function getRequiredByWithPath(int $offset = null, int $limit = null, str
     /**
      * get total count of required by records
      *
-     * @return int
      */
     public function getRequiredByTotalCount(): int
     {
diff --git a/models/Document.php b/models/Document.php
index 507422af474..f7252f8d3cb 100644
--- a/models/Document.php
+++ b/models/Document.php
@@ -86,9 +86,6 @@ class Document extends Element\AbstractElement
      */
     protected array $siblings = [];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getBlockedVars(): array
     {
         $blockedVars = ['versions', 'scheduledTasks', 'parent', 'fullPathCache'];
@@ -125,9 +122,7 @@ public static function getTypesConfiguration(): array
     /**
      * @internal
      *
-     * @param string $path
      *
-     * @return string
      */
     protected static function getPathCacheKey(string $path): string
     {
@@ -167,9 +162,7 @@ public static function getByPath(string $path, array $params = []): static|null
     /**
      * @internal
      *
-     * @param Document $document
      *
-     * @return bool
      */
     protected static function typeMatch(Document $document): bool
     {
@@ -271,9 +264,7 @@ public static function create(int $parentId, array $data = [], bool $save = true
     }
 
     /**
-     * @param array $config
      *
-     * @return Listing
      *
      * @throws \Exception
      */
@@ -286,9 +277,6 @@ public static function getList(array $config = []): Listing
         return $list;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function save(array $parameters = []): static
     {
         $isUpdate = false;
@@ -516,7 +504,6 @@ protected function update(array $params = []): void
     }
 
     /**
-     * @param int $index
      *
      * @internal
      */
@@ -541,8 +528,6 @@ public function clearDependentCache(array $additionalTags = []): void
     /**
      * set the children of the document
      *
-     * @param Listing|null $children
-     * @param bool $includingUnpublished
      *
      * @return $this
      */
@@ -863,7 +848,6 @@ public function setKey(string $key): static
     /**
      * Set the parent id of the document.
      *
-     * @param int|null $id
      *
      * @return $this
      */
@@ -879,7 +863,6 @@ public function setParentId(?int $id): static
     /**
      * Returns the document index.
      *
-     * @return int|null
      */
     public function getIndex(): ?int
     {
@@ -889,7 +872,6 @@ public function getIndex(): ?int
     /**
      * Set the document index.
      *
-     * @param int $index
      *
      * @return $this
      */
@@ -908,7 +890,6 @@ public function getType(): string
     /**
      * Set the document type.
      *
-     * @param string $type
      *
      * @return $this
      */
@@ -946,7 +927,6 @@ public function getParent(): ?Document
     /**
      * Set the parent document instance.
      *
-     * @param ElementInterface|null $parent
      *
      * @return $this
      */
@@ -964,7 +944,6 @@ public function setParent(?ElementInterface $parent): static
     /**
      * Set true if want to hide documents.
      *
-     * @param bool $hideUnpublished
      */
     public static function setHideUnpublished(bool $hideUnpublished): void
     {
@@ -974,7 +953,6 @@ public static function setHideUnpublished(bool $hideUnpublished): void
     /**
      * Checks if unpublished documents should be hidden.
      *
-     * @return bool
      */
     public static function doHideUnpublished(): bool
     {
@@ -984,9 +962,7 @@ public static function doHideUnpublished(): bool
     /**
      * @internal
      *
-     * @param array $args
      *
-     * @return string
      */
     protected function getListingCacheKey(array $args = []): string
     {
diff --git a/models/Document/Dao.php b/models/Document/Dao.php
index 837ba6567cd..116cf65ed04 100644
--- a/models/Document/Dao.php
+++ b/models/Document/Dao.php
@@ -33,7 +33,6 @@ class Dao extends Model\Element\Dao
     /**
      * Fetch a row by an id from the database and assign variables to the document model.
      *
-     * @param int $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -54,7 +53,6 @@ public function getById(int $id): void
     /**
      * Fetch a row by a path from the database and assign variables to the model.
      *
-     * @param string $path
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -191,9 +189,7 @@ public function updateWorkspaces(): void
     /**
      * Updates children path in order to the old document path specified in the $oldPath parameter.
      *
-     * @param string $oldPath
      *
-     * @return array
      *
      * @internal
      */
@@ -223,7 +219,6 @@ public function updateChildPaths(string $oldPath): array
     /**
      * Returns the current full document path from the database.
      *
-     * @return string|null
      */
     public function getCurrentFullPath(): ?string
     {
@@ -257,10 +252,7 @@ public function getVersionCountForUpdate(): int
     /**
      * Returns properties for the object from the database and assigns these.
      *
-     * @param bool $onlyInherited
-     * @param bool $onlyDirect
      *
-     * @return array
      */
     public function getProperties(bool $onlyInherited = false, bool $onlyDirect = false): array
     {
@@ -367,7 +359,6 @@ public function hasChildren(?bool $includingUnpublished = null, ?User $user = nu
      *
      * @param Model\User|null $user
      *
-     * @return int
      */
     public function getChildAmount(?User $user = null): int
     {
@@ -395,9 +386,7 @@ public function getChildAmount(?User $user = null): int
     /**
      * Checks if the document has siblings
      *
-     * @param bool|null $includingUnpublished
      *
-     * @return bool
      */
     public function hasSiblings(?bool $includingUnpublished = null): bool
     {
@@ -427,7 +416,6 @@ public function hasSiblings(?bool $includingUnpublished = null): bool
     /**
      * Checks if the document is locked.
      *
-     * @return bool
      *
      * @throws \Exception
      */
@@ -472,7 +460,6 @@ public function updateLocks(): void
     /**
      * Deletes locks from the document and its children.
      *
-     * @return array
      */
     public function unlockPropagate(): array
     {
@@ -483,10 +470,7 @@ public function unlockPropagate(): array
     }
 
     /**
-     * @param string $type
-     * @param array $userIds
      *
-     * @return int
      *
      * @throws \Doctrine\DBAL\Exception
      */
@@ -498,10 +482,8 @@ public function isInheritingPermission(string $type, array $userIds): int
     /**
      * Checks if the action is allowed.
      *
-     * @param string $type
      * @param Model\User $user
      *
-     * @return bool
      */
     public function isAllowed(string $type, User $user): bool
     {
@@ -550,8 +532,6 @@ public function isAllowed(string $type, User $user): bool
     }
 
     /**
-     * @param array $columns
-     * @param User $user
      *
      * @return array<string, int>
      *
@@ -564,7 +544,6 @@ public function areAllowed(array $columns, User $user): array
     /**
      * Save the document index.
      *
-     * @param int $index
      */
     public function saveIndex(int $index): void
     {
@@ -578,7 +557,6 @@ public function saveIndex(int $index): void
     /**
      * Fetches the maximum index value from siblings.
      *
-     * @return int
      */
     public function getNextIndex(): int
     {
diff --git a/models/Document/DocType/Dao.php b/models/Document/DocType/Dao.php
index e5e1e9ecbbf..fce34e0cf6f 100644
--- a/models/Document/DocType/Dao.php
+++ b/models/Document/DocType/Dao.php
@@ -43,7 +43,6 @@ public function configure(): void
     /**
      * Get the data for the object from database for the given id
      *
-     * @param string|null $id
      *
      * @throws \Exception
      */
@@ -100,9 +99,6 @@ public function delete(): void
         $this->deleteData($this->model->getId());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataStructureForYaml(string $id, mixed $data): mixed
     {
         return [
diff --git a/models/Document/DocType/Listing.php b/models/Document/DocType/Listing.php
index 15b6a76b3c9..0820b094003 100644
--- a/models/Document/DocType/Listing.php
+++ b/models/Document/DocType/Listing.php
@@ -35,7 +35,6 @@ class Listing extends AbstractModel implements CallableFilterListingInterface, C
     /**
      * @internal
      *
-     * @var array|null
      */
     protected ?array $docTypes = null;
 
diff --git a/models/Document/DocType/Listing/Dao.php b/models/Document/DocType/Listing/Dao.php
index 70dce41e3c4..da078d81468 100644
--- a/models/Document/DocType/Listing/Dao.php
+++ b/models/Document/DocType/Listing/Dao.php
@@ -54,10 +54,7 @@ public function getTotalCount(): int
     /**
      * Sorts DocTypes by priority and falls back to group and name in case they are equal
      *
-     * @param DocType $a
-     * @param DocType $b
      *
-     * @return int
      */
     public static function sortByPriority(DocType $a, DocType $b): int
     {
diff --git a/models/Document/Editable.php b/models/Document/Editable.php
index 494d17db8bc..0e6a2b7eaed 100644
--- a/models/Document/Editable.php
+++ b/models/Document/Editable.php
@@ -357,7 +357,6 @@ final public function getParentBlockNames(): array
     /**
      * Returns only the properties which should be serialized
      *
-     * @return array
      */
     public function __sleep(): array
     {
@@ -380,9 +379,6 @@ public function __clone(): void
         $this->document = null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     final public function render(): mixed
     {
         if ($this->editmode) {
diff --git a/models/Document/Editable/Area.php b/models/Document/Editable/Area.php
index b33ecf216ca..c98df8fdab2 100644
--- a/models/Document/Editable/Area.php
+++ b/models/Document/Editable/Area.php
@@ -35,7 +35,6 @@ class Area extends Model\Document\Editable
      *
      * @internal
      *
-     * @var string|null
      */
     protected ?string $type = null;
 
@@ -44,17 +43,11 @@ public function getBrickType(): ?string
         return $this->type;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'area';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return [
@@ -76,9 +69,6 @@ public function getDataEditmode(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function admin(): void
     {
         $attributes = $this->getEditmodeElementAttributes();
@@ -135,9 +125,6 @@ private function buildInfoObject(): Area\Info
         return $info;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend(): void
     {
         $config = $this->getConfig();
@@ -201,9 +188,6 @@ public function frontend(): void
         $blockState->popBlock();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         if (strlen($data) > 2) {
@@ -215,9 +199,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         if (is_array($data)) {
@@ -237,9 +218,7 @@ public function isEmpty(): bool
      * as used areabrick and this areabrick defines a block "gallery", you can use $area->getElement('gallery') to get
      * an instance of the block element.
      *
-     * @param string $name
      *
-     * @return Model\Document\Editable
      */
     public function getElement(string $name): Model\Document\Editable
     {
diff --git a/models/Document/Editable/Area/AbstractArea.php b/models/Document/Editable/Area/AbstractArea.php
index 64aa9a5ab67..32f27ce7a91 100644
--- a/models/Document/Editable/Area/AbstractArea.php
+++ b/models/Document/Editable/Area/AbstractArea.php
@@ -21,21 +21,18 @@ abstract class AbstractArea
     /**
      * @internal
      *
-     * @var array
      */
     protected array $config;
 
     /**
      * @internal
      *
-     * @var Info
      */
     protected Info $brick;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $params = [];
 
diff --git a/models/Document/Editable/Area/Info.php b/models/Document/Editable/Area/Info.php
index e8e6965ae90..b4d840e1376 100644
--- a/models/Document/Editable/Area/Info.php
+++ b/models/Document/Editable/Area/Info.php
@@ -25,42 +25,36 @@ class Info
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $id = null;
 
     /**
      * @internal
      *
-     * @var Editable|null
      */
     protected ?Editable $editable = null;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $params = [];
 
     /**
      * @internal
      *
-     * @var Request|null
      */
     protected ?Request $request = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $type = null;
 
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $index = null;
 
@@ -156,10 +150,7 @@ public function getDocument(): Document\PageSnippet
     }
 
     /**
-     * @param string $name
-     * @param string $type
      *
-     * @return Editable|null
      *
      * @throws \Exception
      */
diff --git a/models/Document/Editable/Areablock.php b/models/Document/Editable/Areablock.php
index 2e27387c7f0..36e1208cac5 100644
--- a/models/Document/Editable/Areablock.php
+++ b/models/Document/Editable/Areablock.php
@@ -35,7 +35,6 @@ class Areablock extends Model\Document\Editable implements BlockInterface
      *
      * @internal
      *
-     * @var array
      */
     protected array $indices = [];
 
@@ -44,58 +43,42 @@ class Areablock extends Model\Document\Editable implements BlockInterface
      *
      * @internal
      *
-     * @var int
      */
     protected int $current = 0;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $currentIndex;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $blockStarted;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $brickTypeUsageCounter = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'areablock';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return $this->indices;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function admin(): void
     {
         $this->frontend();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend(): void
     {
         if (!is_array($this->indices)) {
@@ -144,7 +127,6 @@ public function getIterator(): \Generator
     /**
      * @internal
      *
-     * @return bool
      */
     public function loop(): bool
     {
@@ -203,7 +185,6 @@ public function loop(): bool
     /**
      * @internal
      *
-     * @return Area\Info
      */
     public function buildInfoObject(): Area\Info
     {
@@ -230,8 +211,6 @@ public function buildInfoObject(): Area\Info
 
     /**
      * @param null|Document\Editable\Area\Info $info
-     * @param array $templateParams
-     * @param bool $return
      *
      * @return string|void
      */
@@ -263,7 +242,6 @@ public function content(Area\Info $info = null, array $templateParams = [], bool
     /**
      * @internal
      *
-     * @return EditableHandler
      */
     protected function getEditableHandler(): EditableHandler
     {
@@ -271,9 +249,6 @@ protected function getEditableHandler(): EditableHandler
         return \Pimcore::getContainer()->get(EditableHandler::class);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->indices = Tool\Serialize::unserialize($data);
@@ -284,9 +259,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $this->indices = $data;
@@ -294,9 +266,6 @@ public function setDataFromEditmode(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function blockConstruct(): void
     {
         // set the current block suffix for the child elements (0, 1, 3, ...)
@@ -304,9 +273,6 @@ public function blockConstruct(): void
         $this->getBlockState()->pushIndex($this->indices[$this->current]['key']);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function blockDestruct(): void
     {
         $this->getBlockState()->popIndex();
@@ -323,9 +289,6 @@ private function getToolBarDefaultConfig(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getEditmodeDefinition(): array
     {
         $config = array_merge($this->getToolBarDefaultConfig(), $this->getConfig());
@@ -338,9 +301,6 @@ public function getEditmodeDefinition(): array
         return $options;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getEditmodeElementAttributes(): array
     {
         $attributes = parent::getEditmodeElementAttributes();
@@ -458,10 +418,6 @@ public function blockStart(Area\Info $info = null): array
     /**
      * This method needs to be `protected` as it is used in other bundles such as pimcore/headless-documents
      *
-     * @param array $config
-     * @param EditableRenderer $editableRenderer
-     * @param string $dialogId
-     * @param string $html
      *
      * @throws \Exception
      *
@@ -490,9 +446,6 @@ protected function renderDialogBoxEditables(array $config, EditableRenderer $edi
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function blockEnd(): void
     {
         $this->blockStarted = false;
@@ -613,25 +566,16 @@ private function sortAvailableAreas(array $areas, array $config): array
         return $result;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCount(): int
     {
         return count($this->indices);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCurrent(): int
     {
         return $this->current - 1;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCurrentIndex(): int
     {
         return $this->indices[$this->getCurrent()]['key'] ?? 0;
@@ -657,7 +601,6 @@ public function isEmpty(): bool
     }
 
     /**
-     * @param string $name
      *
      * @return Areablock\Item[]
      */
diff --git a/models/Document/Editable/Block.php b/models/Document/Editable/Block.php
index 5c26cd0ba1c..7d62e57baa2 100644
--- a/models/Document/Editable/Block.php
+++ b/models/Document/Editable/Block.php
@@ -35,7 +35,6 @@ class Block extends Model\Document\Editable implements BlockInterface
      *
      * @internal
      *
-     * @var array
      */
     protected array $indices = [];
 
@@ -44,47 +43,31 @@ class Block extends Model\Document\Editable implements BlockInterface
      *
      * @internal
      *
-     * @var int
      */
     protected int $current = 0;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'block';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return $this->indices;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function admin()
     {
         // nothing to do
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         // nothing to do
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->indices = \Pimcore\Tool\Serialize::unserialize($data);
@@ -92,9 +75,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $this->indices = $data;
@@ -163,7 +143,6 @@ public function getIterator(): \Generator
     /**
      * @internal
      *
-     * @return bool
      */
     public function loop(): bool
     {
@@ -201,9 +180,6 @@ public function loop(): bool
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getEditmodeElementAttributes(): array
     {
         $attributes = parent::getEditmodeElementAttributes();
@@ -216,9 +192,6 @@ protected function getEditmodeElementAttributes(): array
         return $attributes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function start()
     {
         // set name suffix for the whole block element, this will be added to all child elements of the block
@@ -232,9 +205,6 @@ public function start()
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function end(bool $return = false): void
     {
         $this->current = 0;
@@ -248,9 +218,6 @@ public function end(bool $return = false): void
         $this->outputEditmode('</div>');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function blockConstruct(): void
     {
         // set the current block suffix for the child elements (0, 1, 3, ...)
@@ -258,9 +225,6 @@ public function blockConstruct(): void
         $this->getBlockState()->pushIndex((int) ($this->indices[$this->current] ?? 0));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function blockDestruct(): void
     {
         $blockState = $this->getBlockState();
@@ -352,25 +316,16 @@ public function setConfig(array $config): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCount(): int
     {
         return count($this->indices);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCurrent(): int
     {
         return $this->current - 1;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCurrentIndex(): int
     {
         return (int) ($this->indices[$this->getCurrent()] ?? 0);
diff --git a/models/Document/Editable/Block/AbstractBlockItem.php b/models/Document/Editable/Block/AbstractBlockItem.php
index 2cde1ba3285..f6df6baa481 100644
--- a/models/Document/Editable/Block/AbstractBlockItem.php
+++ b/models/Document/Editable/Block/AbstractBlockItem.php
@@ -23,21 +23,18 @@ abstract class AbstractBlockItem
     /**
      * @internal
      *
-     * @var Document\PageSnippet
      */
     protected Document\PageSnippet $document;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $parentBlockNames;
 
     /**
      * @internal
      *
-     * @var int
      */
     protected int $index;
 
diff --git a/models/Document/Editable/BlockInterface.php b/models/Document/Editable/BlockInterface.php
index 78ba66953dd..15038e5fa29 100644
--- a/models/Document/Editable/BlockInterface.php
+++ b/models/Document/Editable/BlockInterface.php
@@ -62,21 +62,18 @@ public function blockEnd();
     /**
      * Return the amount of block elements
      *
-     * @return int
      */
     public function getCount(): int;
 
     /**
      * Return current iteration step
      *
-     * @return int
      */
     public function getCurrent(): int;
 
     /**
      * Return current index
      *
-     * @return int
      */
     public function getCurrentIndex(): int;
 
diff --git a/models/Document/Editable/Checkbox.php b/models/Document/Editable/Checkbox.php
index 53b16471d4d..6a5234f971e 100644
--- a/models/Document/Editable/Checkbox.php
+++ b/models/Document/Editable/Checkbox.php
@@ -28,21 +28,14 @@ class Checkbox extends Model\Document\Editable
      *
      * @internal
      *
-     * @var bool
      */
     protected bool $value = false;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'checkbox';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return $this->value;
@@ -53,17 +46,11 @@ public function getValue(): mixed
         return $this->getData();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         return (string)$this->value;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->value = (bool) $data;
@@ -71,9 +58,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $this->value = (bool) $data;
diff --git a/models/Document/Editable/Date.php b/models/Document/Editable/Date.php
index d7971457e49..41d911b8d68 100644
--- a/models/Document/Editable/Date.php
+++ b/models/Document/Editable/Date.php
@@ -29,21 +29,14 @@ class Date extends Model\Document\Editable implements EditmodeDataInterface
      *
      * @internal
      *
-     * @var Carbon|null
      */
     protected ?\Carbon\Carbon $date = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'date';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return $this->date;
@@ -54,9 +47,6 @@ public function getDate(): ?\Carbon\Carbon
         return $this->getData();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): ?int
     {
         if ($this->date) {
@@ -66,9 +56,6 @@ public function getDataEditmode(): ?int
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         if ($this->date instanceof Carbon) {
@@ -95,9 +82,6 @@ public function getDataForResource(): mixed
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         if ($data) {
@@ -107,9 +91,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         if (strlen((string) $data) > 5) {
diff --git a/models/Document/Editable/EditableInterface.php b/models/Document/Editable/EditableInterface.php
index ffe1a3947b4..6cd35f81a00 100644
--- a/models/Document/Editable/EditableInterface.php
+++ b/models/Document/Editable/EditableInterface.php
@@ -21,7 +21,6 @@ interface EditableInterface
     /**
      * Renders the editable, calls either frontend() or admin() depending on the context
      *
-     * @return mixed
      */
     public function render(): mixed;
 
@@ -29,21 +28,18 @@ public function render(): mixed;
      * Get the current data stored for the element
      * this is used as general fallback for the methods getDataForResource(), admin(), getValue()
      *
-     * @return mixed
      */
     public function getData(): mixed;
 
     /**
      * Return the type of the element
      *
-     * @return string
      */
     public function getType(): string;
 
     /**
      * Receives the data from the editmode and convert this to the internal data in the object eg. image-id to Asset\Image
      *
-     * @param mixed $data
      *
      * @return $this
      */
@@ -52,7 +48,6 @@ public function setDataFromEditmode(mixed $data): static;
     /**
      * Receives the data from the resource, an convert to the internal data in the object eg. image-id to Asset\Image
      *
-     * @param mixed $data
      *
      * @return $this
      */
diff --git a/models/Document/Editable/Embed.php b/models/Document/Editable/Embed.php
index e056750341b..54574242eb8 100644
--- a/models/Document/Editable/Embed.php
+++ b/models/Document/Editable/Embed.php
@@ -28,17 +28,11 @@ class Embed extends Model\Document\Editable
      */
     protected ?string $url = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'embed';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return [
@@ -58,9 +52,6 @@ public function getDataForResource(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         if ($this->url) {
@@ -90,9 +81,6 @@ public function frontend()
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function admin()
     {
         $html = parent::admin();
@@ -104,9 +92,6 @@ public function admin()
         return $html;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         if (!empty($data)) {
@@ -118,9 +103,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         if ($data['url']) {
diff --git a/models/Document/Editable/Image.php b/models/Document/Editable/Image.php
index 7f351cd28a6..7f86477f1d3 100644
--- a/models/Document/Editable/Image.php
+++ b/models/Document/Editable/Image.php
@@ -47,56 +47,48 @@ class Image extends Model\Document\Editable implements IdRewriterInterface, Edit
      *
      * @internal
      *
-     * @var Asset\Image|ElementInterface|Element\ElementDescriptor|null
      */
     protected Asset\Image|ElementInterface|Element\ElementDescriptor|null $image = null;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $cropPercent = false;
 
     /**
      * @internal
      *
-     * @var float
      */
     protected float $cropWidth = 0.0;
 
     /**
      * @internal
      *
-     * @var float
      */
     protected float $cropHeight = 0.0;
 
     /**
      * @internal
      *
-     * @var float
      */
     protected float $cropTop = 0.0;
 
     /**
      * @internal
      *
-     * @var float
      */
     protected float $cropLeft = 0.0;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $hotspots = [];
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $marker = [];
 
@@ -107,17 +99,11 @@ class Image extends Model\Document\Editable implements IdRewriterInterface, Edit
      */
     protected ?string $thumbnail = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'image';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return [
@@ -150,9 +136,6 @@ public function getDataForResource(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): ?array
     {
         $image = $this->getImage();
@@ -227,9 +210,6 @@ public function getConfig(): array
         return $config;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         if (!is_array($this->config)) {
@@ -291,9 +271,6 @@ public function frontend()
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         if (strlen($data) > 2) {
@@ -332,9 +309,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $rewritePath = function ($data) {
@@ -537,9 +511,6 @@ public function getCacheTags(Model\Document\PageSnippet $ownerDocument, array $t
         return $tags;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveDependencies(): array
     {
         $dependencies = [];
@@ -665,9 +636,6 @@ public function getMarker(): array
         return $this->marker;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function rewriteIds(array $idMapping): void
     {
         if (array_key_exists('asset', $idMapping) && array_key_exists($this->getId(), $idMapping['asset'])) {
diff --git a/models/Document/Editable/Input.php b/models/Document/Editable/Input.php
index dec3ea18d8f..243fd8fecda 100644
--- a/models/Document/Editable/Input.php
+++ b/models/Document/Editable/Input.php
@@ -28,21 +28,14 @@ class Input extends Model\Document\Editable implements EditmodeDataInterface
      *
      * @internal
      *
-     * @var string
      */
     protected string $text = '';
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'input';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return $this->text;
@@ -53,9 +46,6 @@ public function getText(): string
         return $this->getData();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         $config = $this->getConfig();
@@ -68,17 +58,11 @@ public function frontend()
         return $text;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): string
     {
         return htmlentities($this->text);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->text = $data;
@@ -86,9 +70,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $data = html_entity_decode($data, ENT_HTML5); // this is because the input is now an div contenteditable -> therefore in entities
diff --git a/models/Document/Editable/Link.php b/models/Document/Editable/Link.php
index bdd1000be8f..c6c6a20de12 100644
--- a/models/Document/Editable/Link.php
+++ b/models/Document/Editable/Link.php
@@ -31,21 +31,14 @@ class Link extends Model\Document\Editable implements IdRewriterInterface, Editm
      *
      * @internal
      *
-     * @var array|null
      */
     protected ?array $data = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'link';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         // update path if internal link
@@ -54,9 +47,6 @@ public function getData(): mixed
         return $this->data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): ?array
     {
         // update path if internal link
@@ -65,9 +55,6 @@ public function getDataEditmode(): ?array
         return $this->data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getEditmodeElementClasses(array $options = []): array
     {
         // we don't want the class attribute being applied to the editable container element (<div>, only to the <a> tag inside
@@ -80,9 +67,6 @@ protected function getEditmodeElementClasses(array $options = []): array
         return $classes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         $url = $this->getHref();
@@ -336,9 +320,6 @@ public function getClass(): mixed
         return $this->data['class'] ?? '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->data = \Pimcore\Tool\Serialize::unserialize($data);
@@ -349,9 +330,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         if (!is_array($data)) {
@@ -407,9 +385,6 @@ public function isEmpty(): bool
         return strlen($this->getHref()) < 1;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveDependencies(): array
     {
         $dependencies = [];
@@ -442,9 +417,6 @@ public function resolveDependencies(): array
         return $dependencies;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(array $idMapping): void
     {
         if (isset($this->data['internal']) && $this->data['internal']) {
diff --git a/models/Document/Editable/Multiselect.php b/models/Document/Editable/Multiselect.php
index 555fc5b3c25..35dc0f3f0d3 100644
--- a/models/Document/Editable/Multiselect.php
+++ b/models/Document/Editable/Multiselect.php
@@ -28,21 +28,14 @@ class Multiselect extends Model\Document\Editable implements EditmodeDataInterfa
      *
      * @internal
      *
-     * @var array
      */
     protected array $values = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'multiselect';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return $this->values;
@@ -53,25 +46,16 @@ public function getValues(): array
         return $this->getData();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         return implode(',', $this->values);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): array
     {
         return $this->values;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->values = \Pimcore\Tool\Serialize::unserialize($data);
@@ -79,9 +63,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         if (empty($data)) {
diff --git a/models/Document/Editable/Numeric.php b/models/Document/Editable/Numeric.php
index 72a1b332643..85cd8a9660c 100644
--- a/models/Document/Editable/Numeric.php
+++ b/models/Document/Editable/Numeric.php
@@ -30,17 +30,11 @@ class Numeric extends Model\Document\Editable
      */
     protected ?string $number = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'numeric';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return $this->number;
@@ -49,24 +43,17 @@ public function getData(): mixed
     /**
      * @see EditableInterface::getData
      *
-     * @return string
      */
     public function getNumber(): string
     {
         return $this->getData();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         return $this->number;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->number = $data;
@@ -74,9 +61,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $this->number = (string)$data;
diff --git a/models/Document/Editable/Pdf.php b/models/Document/Editable/Pdf.php
index 54ade6a51a1..c265d9d5c57 100644
--- a/models/Document/Editable/Pdf.php
+++ b/models/Document/Editable/Pdf.php
@@ -28,21 +28,14 @@ class Pdf extends Model\Document\Editable implements EditmodeDataInterface
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $id = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'pdf';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return [
@@ -57,9 +50,6 @@ public function getDataForResource(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): array
     {
         $pages = 0;
@@ -86,9 +76,6 @@ public function getCacheTags(Model\Document\PageSnippet $ownerDocument, array $t
         return $tags;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveDependencies(): array
     {
         $dependencies = [];
@@ -120,9 +107,6 @@ public function checkValidity(): bool
         return $sane;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         if (!empty($data)) {
@@ -134,9 +118,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $pdf = $data['id'] ? Asset::getById($data['id']) : null;
@@ -147,9 +128,6 @@ public function setDataFromEditmode(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         $asset = $this->id ? Asset::getById($this->id) : null;
diff --git a/models/Document/Editable/Relation.php b/models/Document/Editable/Relation.php
index dbcb083b2ee..0029471d8f3 100644
--- a/models/Document/Editable/Relation.php
+++ b/models/Document/Editable/Relation.php
@@ -32,7 +32,6 @@ class Relation extends Model\Document\Editable implements IdRewriterInterface, E
      *
      * @internal
      *
-     * @var int|null
      */
     protected ?int $id = null;
 
@@ -41,7 +40,6 @@ class Relation extends Model\Document\Editable implements IdRewriterInterface, E
      *
      * @internal
      *
-     * @var string|null
      */
     protected ?string $type = null;
 
@@ -50,7 +48,6 @@ class Relation extends Model\Document\Editable implements IdRewriterInterface, E
      *
      * @internal
      *
-     * @var string|null
      */
     protected ?string $subtype = null;
 
@@ -59,22 +56,15 @@ class Relation extends Model\Document\Editable implements IdRewriterInterface, E
      *
      * @internal
      *
-     * @var mixed
      */
     protected mixed $element = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         //TODO: getType != $type ... that might be dangerous
         return 'relation';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return [
@@ -84,9 +74,6 @@ public function getData(): mixed
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): ?array
     {
         $this->setElement();
@@ -103,9 +90,6 @@ public function getDataEditmode(): ?array
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         $this->setElement();
@@ -122,9 +106,6 @@ public function frontend()
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         if (!empty($data)) {
@@ -140,9 +121,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $this->id = $data['id'] ?? null;
@@ -216,9 +194,6 @@ public function isEmpty(): bool
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveDependencies(): array
     {
         $dependencies = [];
@@ -254,9 +229,6 @@ public function checkValidity(): bool
         return $sane;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __sleep(): array
     {
         $finalVars = [];
@@ -271,9 +243,6 @@ public function __sleep(): array
         return $finalVars;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function load(): void
     {
         if (!$this->element) {
@@ -305,9 +274,6 @@ public function getSubtype(): ?string
         return $this->subtype;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(array $idMapping): void
     {
         if (array_key_exists($this->type, $idMapping) && array_key_exists($this->getId(), $idMapping[$this->type])) {
diff --git a/models/Document/Editable/Relations.php b/models/Document/Editable/Relations.php
index 6528bb6b785..e72d6e0bf8f 100644
--- a/models/Document/Editable/Relations.php
+++ b/models/Document/Editable/Relations.php
@@ -37,13 +37,9 @@ class Relations extends Model\Document\Editable implements \Iterator, IdRewriter
     /**
      * @internal
      *
-     * @var array
      */
     protected array $elementIds = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'relations';
@@ -69,9 +65,6 @@ public function getElementIds(): array
         return $this->elementIds;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         $this->setElements();
@@ -84,9 +77,6 @@ public function getDataForResource(): mixed
         return $this->elementIds;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): array
     {
         $this->setElements();
@@ -109,9 +99,6 @@ public function getDataEditmode(): array
         return $return;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         $this->setElements();
@@ -126,9 +113,6 @@ public function frontend()
         return $return;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         if ($data = \Pimcore\Tool\Serialize::unserialize($data)) {
@@ -138,9 +122,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         if (is_array($data)) {
@@ -180,9 +161,6 @@ public function isEmpty(): bool
         return count($this->elements) > 0 ? false : true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveDependencies(): array
     {
         $this->setElements();
@@ -205,9 +183,6 @@ public function resolveDependencies(): array
         return $dependencies;
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(array $idMapping): void
     {
         // reset existing elements store
@@ -225,9 +200,6 @@ public function rewriteIds(array $idMapping): void
         $this->setElements();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __sleep(): array
     {
         $finalVars = [];
@@ -242,9 +214,6 @@ public function __sleep(): array
         return $finalVars;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function load(): void
     {
         $this->setElements();
diff --git a/models/Document/Editable/Renderlet.php b/models/Document/Editable/Renderlet.php
index f7b4710a5b7..a3c9c8a032f 100644
--- a/models/Document/Editable/Renderlet.php
+++ b/models/Document/Editable/Renderlet.php
@@ -36,7 +36,6 @@ class Renderlet extends Model\Document\Editable implements IdRewriterInterface,
      *
      * @internal
      *
-     * @var int|null
      */
     protected ?int $id = null;
 
@@ -52,7 +51,6 @@ class Renderlet extends Model\Document\Editable implements IdRewriterInterface,
      *
      * @internal
      *
-     * @var string|null
      */
     protected ?string $type = null;
 
@@ -61,21 +59,14 @@ class Renderlet extends Model\Document\Editable implements IdRewriterInterface,
      *
      * @internal
      *
-     * @var string|null
      */
     protected ?string $subtype = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'renderlet';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return [
@@ -85,9 +76,6 @@ public function getData(): mixed
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): ?array
     {
         if ($this->o instanceof Element\ElementInterface) {
@@ -101,9 +89,6 @@ public function getDataEditmode(): ?array
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         // TODO inject services via DI when editables are built through container
@@ -168,7 +153,7 @@ public function frontend()
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @return $this
      */
@@ -186,7 +171,7 @@ public function setDataFromResource(mixed $data): static
     }
 
     /**
-     * {@inheritdoc}
+     *
      *
      * @return $this
      */
@@ -217,9 +202,6 @@ public function setElement(): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveDependencies(): array
     {
         $this->load();
@@ -285,9 +267,6 @@ public function checkValidity(): bool
         return $sane;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __sleep(): array
     {
         $finalVars = [];
@@ -302,9 +281,6 @@ public function __sleep(): array
         return $finalVars;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function load(): void
     {
         if (!$this->o) {
@@ -354,9 +330,6 @@ public function getSubtype(): ?string
         return $this->subtype;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function rewriteIds(array $idMapping): void
     {
         $type = (string) $this->type;
diff --git a/models/Document/Editable/Scheduledblock.php b/models/Document/Editable/Scheduledblock.php
index c7fd2dbe2e1..abe84609dfe 100644
--- a/models/Document/Editable/Scheduledblock.php
+++ b/models/Document/Editable/Scheduledblock.php
@@ -29,21 +29,14 @@ class Scheduledblock extends Block implements BlockInterface
     /**
      * @internal
      *
-     * @var array|null
      */
     protected ?array $cachedCurrentElement = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'scheduledblock';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $this->indices = $data;
@@ -59,9 +52,6 @@ public function setDataFromEditmode(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setDefault(): static
     {
         if (empty($this->indices)) {
@@ -128,9 +118,6 @@ private function updateOutputCacheLifetime(int $outputTimestamp, array $nextElem
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function loop(): bool
     {
         $this->setDefault();
@@ -159,9 +146,6 @@ public function loop(): bool
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function start(): void
     {
         if ($this->getEditmode()) {
@@ -181,9 +165,6 @@ public function start(): void
         $this->outputEditmode('<div class="pimcore_scheduled_block_controls" ></div>');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function blockConstruct(): void
     {
         // set the current block suffix for the child elements (0, 1, 3, ...)
@@ -193,9 +174,6 @@ public function blockConstruct(): void
         $this->getBlockState()->pushIndex((int) $elements[$this->current]['key']);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function blockStart(bool $showControls = true, bool $return = false, string $additionalClass = ''): void
     {
         $attributes = [
@@ -217,9 +195,6 @@ public function blockStart(bool $showControls = true, bool $return = false, stri
         $this->current++;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCurrentIndex(): int
     {
         return (int) $this->indices[$this->getCurrent()]['key'];
@@ -232,9 +207,6 @@ public function getIterator(): \Generator
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getElements(): array
     {
         $document = $this->getDocument();
diff --git a/models/Document/Editable/Select.php b/models/Document/Editable/Select.php
index d64bc9ceda8..11bd466ca86 100644
--- a/models/Document/Editable/Select.php
+++ b/models/Document/Editable/Select.php
@@ -30,17 +30,11 @@ class Select extends Model\Document\Editable
      */
     protected ?string $text = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'select';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return (string) $this->text;
@@ -51,17 +45,11 @@ public function getText(): string
         return $this->getData();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         return $this->text;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->text = (string)$data;
@@ -69,9 +57,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $this->text = (string)$data;
diff --git a/models/Document/Editable/Snippet.php b/models/Document/Editable/Snippet.php
index 531123153af..3e162e0f11e 100644
--- a/models/Document/Editable/Snippet.php
+++ b/models/Document/Editable/Snippet.php
@@ -43,17 +43,11 @@ class Snippet extends Model\Document\Editable implements IdRewriterInterface, Ed
      */
     protected Document\Snippet|Model\Element\ElementDescriptor|null $snippet = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'snippet';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return $this->id;
@@ -69,9 +63,6 @@ public function getId(): int
         return (int) $this->id;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): ?array
     {
         if ($this->snippet instanceof Document\Snippet) {
@@ -84,9 +75,6 @@ public function getDataEditmode(): ?array
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         // TODO inject services via DI when editables are built through container
@@ -154,9 +142,6 @@ public function frontend()
         return $content;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $data = (int) $data;
@@ -168,9 +153,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         if ((int)$data > 0) {
@@ -192,9 +174,6 @@ public function isEmpty(): bool
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveDependencies(): array
     {
         $dependencies = [];
@@ -211,9 +190,6 @@ public function resolveDependencies(): array
         return $dependencies;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __sleep(): array
     {
         $finalVars = [];
@@ -228,9 +204,6 @@ public function __sleep(): array
         return $finalVars;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function load(): void
     {
         if (!$this->snippet && $this->id) {
@@ -238,9 +211,6 @@ public function load(): void
         }
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(array $idMapping): void
     {
         $id = $this->getId();
diff --git a/models/Document/Editable/Table.php b/models/Document/Editable/Table.php
index 316ff4db45c..f465b87e244 100644
--- a/models/Document/Editable/Table.php
+++ b/models/Document/Editable/Table.php
@@ -28,29 +28,19 @@ class Table extends Model\Document\Editable
      *
      * @internal
      *
-     * @var array
      */
     protected array $data = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'table';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return $this->data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         $html = '';
@@ -73,9 +63,6 @@ public function frontend()
         return $html;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->data = \Pimcore\Tool\Serialize::unserialize($data);
@@ -83,9 +70,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $this->data = $data;
diff --git a/models/Document/Editable/Textarea.php b/models/Document/Editable/Textarea.php
index 7d9fe3b21c2..49c495652f4 100644
--- a/models/Document/Editable/Textarea.php
+++ b/models/Document/Editable/Textarea.php
@@ -30,17 +30,11 @@ class Textarea extends Model\Document\Editable implements EditmodeDataInterface
      */
     protected ?string $text = null;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'textarea';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return (string) $this->text;
@@ -51,9 +45,6 @@ public function getText(): string
         return $this->getData();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         $config = $this->getConfig();
@@ -70,17 +61,11 @@ public function frontend()
         return $text;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDataEditmode(): string
     {
         return htmlentities((string)$this->text);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $this->text = $data;
@@ -88,9 +73,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $data = html_entity_decode($data, ENT_HTML5); // this is because the input is now an div contenteditable -> therefore in entities
diff --git a/models/Document/Editable/Video.php b/models/Document/Editable/Video.php
index 25639ed6d5c..6c8c68c58b0 100644
--- a/models/Document/Editable/Video.php
+++ b/models/Document/Editable/Video.php
@@ -47,7 +47,6 @@ class Video extends Model\Document\Editable implements IdRewriterInterface
      *
      * @internal
      *
-     * @var int|string|null
      */
     protected string|int|null $id = null;
 
@@ -56,7 +55,6 @@ class Video extends Model\Document\Editable implements IdRewriterInterface
      *
      * @internal
      *
-     * @var string|null
      */
     protected ?string $type = null;
 
@@ -65,28 +63,24 @@ class Video extends Model\Document\Editable implements IdRewriterInterface
      *
      * @internal
      *
-     * @var int|null
      */
     protected ?int $poster = null;
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $title = '';
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $description = '';
 
     /**
      * @internal
      *
-     * @var array|null
      */
     protected ?array $allowedTypes = null;
 
@@ -158,9 +152,6 @@ public function setType(string $type): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'video';
@@ -182,9 +173,6 @@ public function getAllowedTypes(): array
         return $this->allowedTypes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         $path = $this->id;
@@ -247,9 +235,6 @@ public function getDataForResource(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         $inAdmin = false;
@@ -279,9 +264,6 @@ public function frontend()
         return $this->getEmptyCode();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveDependencies(): array
     {
         $dependencies = [];
@@ -330,9 +312,6 @@ public function checkValidity(): bool
         return $valid;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function admin()
     {
         $html = parent::admin();
@@ -344,9 +323,6 @@ public function admin()
         return $html;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         if (!empty($data)) {
@@ -362,9 +338,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         if (isset($data['type'])
@@ -1052,7 +1025,6 @@ public function getPosterAsset(): ?Asset\Image
     }
 
     /**
-     * @param string|Asset\Video\Thumbnail\Config $config
      *
      * @return Asset\Image\Thumbnail|Asset\Video\ImageThumbnail|string
      *
@@ -1080,9 +1052,6 @@ public function getThumbnail(string|Asset\Video\Thumbnail\Config $config): array
         return [];
     }
 
-    /**
-     * { @inheritdoc }
-     */
     public function rewriteIds(array $idMapping): void
     {
         if ($this->type == self::TYPE_ASSET && array_key_exists(self::TYPE_ASSET, $idMapping) && array_key_exists($this->getId(), $idMapping[self::TYPE_ASSET])) {
diff --git a/models/Document/Editable/Wysiwyg.php b/models/Document/Editable/Wysiwyg.php
index 615e113c70e..ecd82490ea7 100644
--- a/models/Document/Editable/Wysiwyg.php
+++ b/models/Document/Editable/Wysiwyg.php
@@ -40,17 +40,11 @@ private static function getWysiwygSanitizer(): HtmlSanitizer
         return self::$pimcoreWysiwygSanitizer ??= \Pimcore::getContainer()->get(Text::PIMCORE_WYSIWYG_SANITIZER_ID);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getType(): string
     {
         return 'wysiwyg';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getData(): mixed
     {
         return (string) $this->text;
@@ -71,9 +65,6 @@ public function getDataEditmode(): ?string
         ]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function frontend()
     {
         $document = $this->getDocument();
@@ -84,9 +75,6 @@ public function frontend()
             ]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromResource(mixed $data): static
     {
         $helper = self::getWysiwygSanitizer();
@@ -95,9 +83,6 @@ public function setDataFromResource(mixed $data): static
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setDataFromEditmode(mixed $data): static
     {
         $helper = self::getWysiwygSanitizer();
@@ -111,9 +96,6 @@ public function isEmpty(): bool
         return empty($this->text);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveDependencies(): array
     {
         return Text::getDependenciesOfWysiwygText($this->text);
@@ -124,9 +106,6 @@ public function getCacheTags(Model\Document\PageSnippet $ownerDocument, array $t
         return Text::getCacheTagsOfWysiwygText($this->text, $tags);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function rewriteIds(array $idMapping): void
     {
         $html = new DomCrawler($this->text);
diff --git a/models/Document/Email.php b/models/Document/Email.php
index 5294a5e1bf5..92034c019b8 100644
--- a/models/Document/Email.php
+++ b/models/Document/Email.php
@@ -23,9 +23,6 @@
  */
 class Email extends Model\Document\PageSnippet
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'email';
 
     /**
@@ -70,15 +67,11 @@ class Email extends Model\Document\PageSnippet
      */
     protected string $bcc = '';
 
-    /**
-     * {@inheritdoc}
-     */
     protected bool $supportsContentMain = false;
 
     /**
      * Contains the email subject
      *
-     * @param string $subject
      *
      * @return $this
      */
@@ -92,7 +85,6 @@ public function setSubject(string $subject): static
     /**
      * Returns the email subject
      *
-     * @return string
      */
     public function getSubject(): string
     {
@@ -102,7 +94,6 @@ public function getSubject(): string
     /**
      * Sets the "to" receiver
      *
-     * @param string $to
      *
      * @return $this
      */
@@ -116,7 +107,6 @@ public function setTo(string $to): static
     /**
      * Returns the "to" receivers
      *
-     * @return string
      */
     public function getTo(): string
     {
@@ -126,7 +116,6 @@ public function getTo(): string
     /**
      * Sets the "from" email address
      *
-     * @param string $from
      *
      * @return $this
      */
@@ -140,7 +129,6 @@ public function setFrom(string $from): static
     /**
      * Returns the "from" email address
      *
-     * @return string
      */
     public function getFrom(): string
     {
@@ -150,7 +138,6 @@ public function getFrom(): string
     /**
      * Sets the "replyTo" email address
      *
-     * @param string $replyTo
      *
      * @return $this
      */
@@ -164,7 +151,6 @@ public function setReplyTo(string $replyTo): static
     /**
      * Returns the "replyTo" email address
      *
-     * @return string
      */
     public function getReplyTo(): string
     {
@@ -174,7 +160,6 @@ public function getReplyTo(): string
     /**
      * Sets the carbon copy receivers (multiple receivers should be separated with a ",")
      *
-     * @param string $cc
      *
      * @return $this
      */
@@ -188,7 +173,6 @@ public function setCc(string $cc): static
     /**
      * Returns the carbon copy receivers
      *
-     * @return string
      */
     public function getCc(): string
     {
@@ -198,7 +182,6 @@ public function getCc(): string
     /**
      * Sets the blind carbon copy receivers (multiple receivers should be separated with a ",")
      *
-     * @param string $bcc
      *
      * @return $this
      */
@@ -212,7 +195,6 @@ public function setBcc(string $bcc): static
     /**
      * Returns the blind carbon copy receivers
      *
-     * @return string
      */
     public function getBcc(): string
     {
diff --git a/models/Document/Email/Dao.php b/models/Document/Email/Dao.php
index 0322a2f50c1..f6bcc95dd45 100644
--- a/models/Document/Email/Dao.php
+++ b/models/Document/Email/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Document\PageSnippet\Dao
     /**
      * Get the data for the object by the given id, or by the id which is set in the object
      *
-     * @param int|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
diff --git a/models/Document/Folder.php b/models/Document/Folder.php
index 863e0138299..c2b9d9bb858 100644
--- a/models/Document/Folder.php
+++ b/models/Document/Folder.php
@@ -23,8 +23,5 @@
  */
 class Folder extends Model\Document
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'folder';
 }
diff --git a/models/Document/Hardlink.php b/models/Document/Hardlink.php
index 03eaca2a97a..616940ee3fe 100644
--- a/models/Document/Hardlink.php
+++ b/models/Document/Hardlink.php
@@ -26,29 +26,23 @@ class Hardlink extends Document
 {
     use Model\Element\Traits\ScheduledTasksTrait;
 
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'hardlink';
 
     /**
      * @internal
      *
-     * @var int
      */
     protected int $sourceId;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $propertiesFromSource;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $childrenFromSource;
 
@@ -61,9 +55,6 @@ public function getSourceDocument(): ?Document
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function resolveDependencies(): array
     {
         $dependencies = parent::resolveDependencies();
@@ -130,9 +121,6 @@ public function getPropertiesFromSource(): bool
         return $this->propertiesFromSource;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getProperties(): array
     {
         if ($this->properties === null) {
@@ -163,9 +151,6 @@ public function getProperties(): array
         return $this->properties;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getChildren(bool $includingUnpublished = false): Listing
     {
         $cacheKey = $this->getListingCacheKey(func_get_args());
@@ -195,9 +180,6 @@ public function hasChildren(?bool $includingUnpublished = null): bool
         return count($this->getChildren((bool)$includingUnpublished)) > 0;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function update(array $params = []): void
     {
         parent::update($params);
diff --git a/models/Document/Hardlink/Dao.php b/models/Document/Hardlink/Dao.php
index 43ed57d5dce..6d8fae72284 100644
--- a/models/Document/Hardlink/Dao.php
+++ b/models/Document/Hardlink/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Document\Dao
     /**
      * Get the data for the object by the given id, or by the id which is set in the object
      *
-     * @param int|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
diff --git a/models/Document/Hardlink/Service.php b/models/Document/Hardlink/Service.php
index 1f4a7322817..13766c21628 100644
--- a/models/Document/Hardlink/Service.php
+++ b/models/Document/Hardlink/Service.php
@@ -24,7 +24,6 @@
 class Service
 {
     /**
-     * @param Document $doc
      *
      * @return WrapperInterface|Hardlink|null
      *
@@ -60,8 +59,6 @@ public static function wrap(Document $doc): Wrapper\WrapperInterface|Wrapper\Har
      *
      * @static
      *
-     * @param Document $doc
-     *
      * @return Document\Hardlink\Wrapper\WrapperInterface
      */
     public static function upperCastDocument(Document $doc): Wrapper\WrapperInterface
@@ -84,8 +81,6 @@ public static function upperCastDocument(Document $doc): Wrapper\WrapperInterfac
     }
 
     /**
-     * @param Document\Hardlink $hardlink
-     * @param string $path
      *
      * @return WrapperInterface|Hardlink|null
      *
@@ -120,8 +115,6 @@ public static function getChildByPath(Document\Hardlink $hardlink, string $path)
     }
 
     /**
-     * @param Document\Hardlink $hardlink
-     * @param string $path
      *
      * @return WrapperInterface|Hardlink|null
      *
diff --git a/models/Document/Hardlink/Wrapper.php b/models/Document/Hardlink/Wrapper.php
index 687f4017519..3d04016eeb4 100644
--- a/models/Document/Hardlink/Wrapper.php
+++ b/models/Document/Hardlink/Wrapper.php
@@ -41,7 +41,6 @@ public function save(array $parameters = []): static
     }
 
     /**
-     * @param array $params
      *
      * @throws \Exception
      */
diff --git a/models/Document/Hardlink/Wrapper/Link.php b/models/Document/Hardlink/Wrapper/Link.php
index d9a1717419f..e701674b2a3 100644
--- a/models/Document/Hardlink/Wrapper/Link.php
+++ b/models/Document/Hardlink/Wrapper/Link.php
@@ -25,9 +25,6 @@ class Link extends Model\Document\Link implements Model\Document\Hardlink\Wrappe
 {
     use Model\Document\Hardlink\Wrapper;
 
-    /**
-     * {@inheritdoc}
-     */
     public function getHref(): string
     {
         if ($this->getLinktype() === 'internal' && $this->getInternalType() === 'document') {
diff --git a/models/Document/Link.php b/models/Document/Link.php
index 9fd0fb4b233..9aa41c5a1a3 100644
--- a/models/Document/Link.php
+++ b/models/Document/Link.php
@@ -33,7 +33,6 @@ class Link extends Model\Document
      *
      * @internal
      *
-     * @var int|null
      */
     protected ?int $internal = null;
 
@@ -42,7 +41,6 @@ class Link extends Model\Document
      *
      * @internal
      *
-     * @var string|null
      */
     protected ?string $internalType = null;
 
@@ -51,7 +49,6 @@ class Link extends Model\Document
      *
      * @internal
      *
-     * @var Model\Element\ElementInterface|null
      */
     protected ?Model\Element\ElementInterface $object = null;
 
@@ -69,9 +66,6 @@ class Link extends Model\Document
      */
     protected string $linktype = 'internal';
 
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'link';
 
     /**
@@ -81,9 +75,6 @@ class Link extends Model\Document
      */
     protected string $href = '';
 
-    /**
-     * {@inheritdoc}
-     */
     protected function resolveDependencies(): array
     {
         $dependencies = parent::resolveDependencies();
@@ -123,7 +114,6 @@ public function getCacheTags(array $tags = []): array
     /**
      * Returns the plain text path of the link
      *
-     * @return string
      */
     public function getHref(): string
     {
@@ -157,7 +147,6 @@ public function getHref(): string
     /**
      * Returns the plain text path of the link needed for the editmode
      *
-     * @return string
      */
     public function getRawHref(): string
     {
@@ -181,7 +170,6 @@ public function getRawHref(): string
     /**
      * Returns the path of the link including the anchor and parameters
      *
-     * @return string
      */
     public function getLink(): string
     {
@@ -203,7 +191,6 @@ public function getLink(): string
     /**
      * Returns the id of the internal document|asset which is linked
      *
-     * @return int|null
      */
     public function getInternal(): ?int
     {
@@ -213,7 +200,6 @@ public function getInternal(): ?int
     /**
      * Returns the direct link (eg. http://www.pimcore.org/test)
      *
-     * @return string
      */
     public function getDirect(): string
     {
@@ -223,7 +209,6 @@ public function getDirect(): string
     /**
      * Returns the type of the link (internal/direct)
      *
-     * @return string
      */
     public function getLinktype(): string
     {
@@ -315,7 +300,6 @@ private function setObjectFromId(): ?Model\Element\ElementInterface
     /**
      * returns the ready-use html for this link
      *
-     * @return string
      */
     public function getHtml(): string
     {
@@ -343,9 +327,6 @@ public function getHtml(): string
         return '<a href="' . $link . '" ' . implode(' ', $attribs) . '>' . htmlspecialchars($this->getProperty('navigation_name')) . '</a>';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function update(array $params = []): void
     {
         parent::update($params);
diff --git a/models/Document/Link/Dao.php b/models/Document/Link/Dao.php
index 512488e52cd..5890d252c62 100644
--- a/models/Document/Link/Dao.php
+++ b/models/Document/Link/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Document\Dao
     /**
      * Get the data for the object by the given id, or by the id which is set in the object
      *
-     * @param int|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
diff --git a/models/Document/Listing.php b/models/Document/Listing.php
index 41cdf9187b3..a17c5d4c76c 100644
--- a/models/Document/Listing.php
+++ b/models/Document/Listing.php
@@ -37,14 +37,12 @@ class Listing extends Model\Listing\AbstractListing implements PaginateListingIn
      *
      * @internal
      *
-     * @var bool
      */
     protected bool $objectTypeDocument = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $unpublished = false;
 
@@ -64,7 +62,6 @@ public function setDocuments(array $documents): Listing
     /**
      * Checks if the document is unpublished.
      *
-     * @return bool
      */
     public function getUnpublished(): bool
     {
@@ -74,7 +71,6 @@ public function getUnpublished(): bool
     /**
      * Set the unpublished flag for the document.
      *
-     * @param bool $unpublished
      *
      * @return $this
      */
@@ -100,9 +96,6 @@ public function getCondition(): string
         return $condition;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getItems(int $offset, int $itemCountPerPage): array
     {
         $this->setOffset($offset);
diff --git a/models/Document/Listing/Dao.php b/models/Document/Listing/Dao.php
index 639a67530e4..1e7bbc43c44 100644
--- a/models/Document/Listing/Dao.php
+++ b/models/Document/Listing/Dao.php
@@ -57,7 +57,6 @@ public function load(): array
     /**
      * @param string|string[]|null $columns
      *
-     * @return DoctrineQueryBuilder
      */
     public function getQueryBuilder(...$columns): DoctrineQueryBuilder
     {
diff --git a/models/Document/Page.php b/models/Document/Page.php
index caad2e1e3d5..da06ea5a355 100644
--- a/models/Document/Page.php
+++ b/models/Document/Page.php
@@ -28,7 +28,6 @@ class Page extends PageSnippet
      *
      * @internal
      *
-     * @var string
      */
     protected string $title = '';
 
@@ -37,19 +36,14 @@ class Page extends PageSnippet
      *
      * @internal
      *
-     * @var string
      */
     protected string $description = '';
 
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'page';
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $prettyUrl = null;
 
diff --git a/models/Document/Page/Dao.php b/models/Document/Page/Dao.php
index 57774f7db78..3a1a24aa9f5 100644
--- a/models/Document/Page/Dao.php
+++ b/models/Document/Page/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Document\PageSnippet\Dao
     /**
      * Get the data for the object by the given id, or by the id which is set in the object
      *
-     * @param int|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
diff --git a/models/Document/PageSnippet.php b/models/Document/PageSnippet.php
index e4671c64c25..a63cd2c9f95 100644
--- a/models/Document/PageSnippet.php
+++ b/models/Document/PageSnippet.php
@@ -38,14 +38,12 @@ abstract class PageSnippet extends Model\Document
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $controller = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $template = null;
 
@@ -54,7 +52,6 @@ abstract class PageSnippet extends Model\Document
      *
      * @internal
      *
-     * @var array|null
      *
      */
     protected ?array $editables = null;
@@ -64,14 +61,12 @@ abstract class PageSnippet extends Model\Document
      *
      * @internal
      *
-     * @var array|null
      */
     protected ?array $versions = null;
 
     /**
      * @internal
      *
-     * @var null|int
      */
     protected ?int $contentMainDocumentId = null;
 
@@ -90,7 +85,6 @@ abstract class PageSnippet extends Model\Document
     /**
      * @internal
      *
-     * @var null|bool
      */
     protected ?bool $missingRequiredEditable = null;
 
@@ -102,14 +96,12 @@ abstract class PageSnippet extends Model\Document
     /**
      * @internal
      *
-     * @var null|int
      */
     protected ?int $staticGeneratorLifetime = null;
 
     /**
      * @internal
      *
-     * @var array
      */
     protected array $inheritedEditables = [];
 
@@ -130,9 +122,6 @@ public static function getGetInheritedValues(): bool
         return self::$getInheritedValues;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function save(array $parameters = []): static
     {
         // checking the required editables renders the document, so this needs to be
@@ -145,9 +134,6 @@ public function save(array $parameters = []): static
         return parent::save($parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function update(array $params = []): void
     {
         // update elements
@@ -172,12 +158,7 @@ protected function update(array $params = []): void
     }
 
     /**
-     * @param bool $setModificationDate
-     * @param bool $saveOnlyVersion
-     * @param string|null $versionNote
-     * @param bool $isAutoSave
      *
-     * @return null|Model\Version
      *
      * @throws \Exception
      */
@@ -237,9 +218,6 @@ public function saveVersion(bool $setModificationDate = true, bool $saveOnlyVers
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doDelete(): void
     {
         // Dispatch Symfony Message Bus to delete versions
@@ -264,9 +242,6 @@ public function getCacheTags(array $tags = []): array
         return $tags;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function resolveDependencies(): array
     {
         $dependencies = [parent::resolveDependencies()];
@@ -321,10 +296,6 @@ public function setTemplate(?string $template): static
      *
      * @internal
      *
-     * @param string $name
-     * @param string $type
-     * @param mixed $data
-     *
      * @return $this
      */
     public function setRawEditable(string $name, string $type, mixed $data): static
@@ -351,7 +322,6 @@ public function setRawEditable(string $name, string $type, mixed $data): static
     /**
      * Set an element with the given key/name
      *
-     * @param Editable $editable
      *
      * @return $this
      */
@@ -376,9 +346,7 @@ public function removeEditable(string $name): static
     /**
      * Get an editable with the given key/name
      *
-     * @param string $name
      *
-     * @return Editable|null
      */
     public function getEditable(string $name): ?Editable
     {
@@ -409,8 +377,6 @@ public function getEditable(string $name): ?Editable
     }
 
     /**
-     * @param int|string|null $contentMainDocumentId
-     * @param bool $validate
      *
      * @return $this
      *
@@ -528,7 +494,6 @@ public function setVersions(array $versions): static
     /**
      * @see Document::getFullPath
      *
-     * @return string
      */
     public function getHref(): string
     {
@@ -552,10 +517,7 @@ public function __sleep(): array
     }
 
     /**
-     * @param string|null $hostname
-     * @param string|null $scheme
      *
-     * @return string
      *
      * @throws \Exception
      */
@@ -598,7 +560,6 @@ public function getUrl(string $hostname = null, string $scheme = null): string
     /**
      * checks if the document is missing values for required editables
      *
-     * @return bool|null
      */
     public function getMissingRequiredEditable(): ?bool
     {
@@ -615,7 +576,6 @@ public function setMissingRequiredEditable(?bool $missingRequiredEditable): stat
     /**
      * @internal
      *
-     * @return bool
      */
     public function supportsContentMain(): bool
     {
diff --git a/models/Document/Service.php b/models/Document/Service.php
index 891432b1f69..dfd78127563 100644
--- a/models/Document/Service.php
+++ b/models/Document/Service.php
@@ -53,9 +53,6 @@ class Service extends Model\Element\Service
      */
     protected array $nearestPathCache;
 
-    /**
-     * @param Model\User|null $user
-     */
     public function __construct(Model\User $user = null)
     {
         $this->_user = $user;
@@ -68,13 +65,7 @@ public function __construct(Model\User $user = null)
      *
      * @static
      *
-     * @param Document\PageSnippet $document
-     * @param array $attributes
-     * @param bool $useLayout
-     * @param array $query
-     * @param array $options
      *
-     * @return string
      */
     public static function render(Document\PageSnippet $document, array $attributes = [], bool $useLayout = false, array $query = [], array $options = []): string
     {
@@ -91,8 +82,6 @@ public static function render(Document\PageSnippet $document, array $attributes
     }
 
     /**
-     * @param Document $target
-     * @param Document $source
      *
      * @return Page|Document|null copied document
      *
@@ -158,13 +147,7 @@ public function copyRecursive(Document $target, Document $source): Page|Document
 
     /**
      *
-     * @param Document $target
-     * @param Document $source
-     * @param bool $enableInheritance
-     * @param bool $resetIndex
-     * @param bool $language
      *
-     * @return Page|Document|PageSnippet
      *
      * @throws ValidationException
      */
@@ -234,10 +217,7 @@ public function copyAsChild(Document $target, Document $source, bool $enableInhe
     }
 
     /**
-     * @param Document $target
-     * @param Document $source
      *
-     * @return Link|Page|Document|PageSnippet
      *
      * @throws ValidationException
      */
@@ -276,9 +256,7 @@ public function copyContents(Document $target, Document $source): Link|Page|Docu
     }
 
     /**
-     * @param Document $document
      *
-     * @return array
      *
      * @internal
      */
@@ -299,9 +277,7 @@ public static function gridDocumentData(Document $document): array
     }
 
     /**
-     * @param Document $doc
      *
-     * @return Document
      *
      * @internal
      */
@@ -323,10 +299,7 @@ public static function loadAllDocumentFields(Document $doc): Document
     /**
      * @static
      *
-     * @param string $path
-     * @param string|null $type
      *
-     * @return bool
      */
     public static function pathExists(string $path, string $type = null): bool
     {
@@ -366,11 +339,7 @@ public static function isValidType(string $type): bool
      *  "asset" => array(...)
      * )
      *
-     * @param Document $document
-     * @param array $rewriteConfig
-     * @param array $params
      *
-     * @return Document|PageSnippet
      *
      * @internal
      */
@@ -430,9 +399,7 @@ public static function rewriteIds(Document $document, array $rewriteConfig, arra
     }
 
     /**
-     * @param string $url
      *
-     * @return Document|null
      *
      * @internal
      */
@@ -496,11 +463,7 @@ public static function getUniqueKey(ElementInterface $element, int $nr = 0): str
     /**
      * Get the nearest document by path. Used to match nearest document for a static route.
      *
-     * @param string|Request $path
-     * @param bool $ignoreHardlinks
-     * @param array $types
      *
-     * @return Document|null
      *
      * @internal
      */
@@ -572,11 +535,7 @@ public function getNearestDocumentByPath(string|Request $path, bool $ignoreHardl
     }
 
     /**
-     * @param int $id
-     * @param Request|null $request
-     * @param string|null $hostUrl
      *
-     * @return bool
      *
      * @throws \Exception
      *
diff --git a/models/Document/Service/Dao.php b/models/Document/Service/Dao.php
index 69f04f4574a..2fd64f4a4c9 100644
--- a/models/Document/Service/Dao.php
+++ b/models/Document/Service/Dao.php
@@ -48,8 +48,6 @@ public function getTranslationSourceId(Document $document): mixed
     }
 
     /**
-     * @param Document $document
-     * @param string $task
      *
      * @return int[]
      */
@@ -88,11 +86,6 @@ public function getTranslations(Document $document, string $task = 'open'): arra
         return $translations;
     }
 
-    /**
-     * @param Document $document
-     * @param Document $translation
-     * @param string|null $language
-     */
     public function addTranslation(Document $document, Document $translation, string $language = null): void
     {
         $sourceId = $this->getTranslationSourceId($document);
diff --git a/models/Document/Snippet.php b/models/Document/Snippet.php
index aba5b08fe58..6a329d38f62 100644
--- a/models/Document/Snippet.php
+++ b/models/Document/Snippet.php
@@ -21,8 +21,5 @@
  */
 class Snippet extends \Pimcore\Model\Document\PageSnippet
 {
-    /**
-     * {@inheritdoc}
-     */
     protected string $type = 'snippet';
 }
diff --git a/models/Document/Snippet/Dao.php b/models/Document/Snippet/Dao.php
index 3b2ff296c17..122052c3264 100644
--- a/models/Document/Snippet/Dao.php
+++ b/models/Document/Snippet/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Document\PageSnippet\Dao
     /**
      * Get the data for the object by the given id, or by the id which is set in the object
      *
-     * @param int|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
diff --git a/models/Element/AbstractElement.php b/models/Element/AbstractElement.php
index 6d70a09caa0..d4601e8f21f 100644
--- a/models/Element/AbstractElement.php
+++ b/models/Element/AbstractElement.php
@@ -182,7 +182,6 @@ public function setUserOwner(int $userOwner): static
     /**
      * enum('self','propagate') nullable
      *
-     * @return string|null
      */
     public function getLocked(): ?string
     {
@@ -196,7 +195,6 @@ public function getLocked(): ?string
     /**
      * enum('self','propagate') nullable
      *
-     * @param string|null $locked
      *
      * @return $this
      */
@@ -252,9 +250,6 @@ public function getProperties(): array
         return $this->properties;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function setProperties(?array $properties): static
     {
         $this->properties = $properties;
@@ -322,9 +317,6 @@ protected function updateModificationInfos(): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getProperty(string $name, bool $asContainer = false): mixed
     {
         $properties = $this->getProperties();
@@ -373,9 +365,7 @@ public function getCacheTag(): string
     }
 
     /**
-     * @param int|string $id
      *
-     * @return string
      *
      * @internal
      */
@@ -398,7 +388,6 @@ public function getCacheTags(array $tags = []): array
      *
      * @internal
      *
-     * @return array
      */
     protected function resolveDependencies(): array
     {
@@ -414,9 +403,6 @@ protected function resolveDependencies(): array
         return array_merge(...$dependencies);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isLocked(): bool
     {
         if ($this->getLocked()) {
@@ -428,9 +414,7 @@ public function isLocked(): bool
     }
 
     /**
-     * @param User|null $user
      *
-     * @return array
      *
      * @throws \Exception
      *
@@ -477,9 +461,6 @@ public function getUserPermissions(?User $user = null): array
         return $permissions;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isAllowed(string $type, ?User $user = null): bool
     {
         if (null === $user) {
@@ -561,12 +542,7 @@ public function __isBasedOnLatestData(): bool
     }
 
     /**
-     * @param string|null $versionNote
-     * @param bool $saveOnlyVersion
-     * @param bool $saveStackTrace
-     * @param bool $isAutoSave
      *
-     * @return Model\Version
      *
      * @throws \Exception
      *
@@ -622,17 +598,11 @@ public function getDependencies(): Model\Dependency
         return $this->dependencies;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getScheduledTasks(): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getVersions(): array
     {
         return [];
@@ -685,7 +655,6 @@ public function __clone(): void
     }
 
     /**
-     * @param int|null $userId
      *
      * @internal
      */
diff --git a/models/Element/Dao.php b/models/Element/Dao.php
index 02671eb1e4b..72ce496caaa 100644
--- a/models/Element/Dao.php
+++ b/models/Element/Dao.php
@@ -73,11 +73,7 @@ protected function extractKeyAndPath(string $fullpath): array
     abstract public function getVersionCountForUpdate(): int;
 
     /**
-     * @param string $type
-     * @param array $userIds
-     * @param string $tableSuffix
      *
-     * @return int
      *
      * @throws \Doctrine\DBAL\Exception
      */
@@ -98,9 +94,6 @@ public function InheritingPermission(string $type, array $userIds, string $table
     }
 
     /**
-     * @param array $columns
-     * @param User $user
-     * @param string $tableSuffix
      *
      * @return array<string, int>
      *
diff --git a/models/Element/Data/MarkerHotspotItem.php b/models/Element/Data/MarkerHotspotItem.php
index 1e227363524..c7478140683 100644
--- a/models/Element/Data/MarkerHotspotItem.php
+++ b/models/Element/Data/MarkerHotspotItem.php
@@ -72,7 +72,6 @@ public function setValue(mixed $value): void
     /**
      * @param string $offset
      *
-     * @return bool
      */
     public function offsetExists($offset): bool
     {
@@ -82,7 +81,6 @@ public function offsetExists($offset): bool
     /**
      * @param string $offset
      *
-     * @return mixed
      */
     public function offsetGet($offset): mixed
     {
@@ -99,7 +97,6 @@ public function offsetGet($offset): mixed
 
     /**
      * @param string $offset
-     * @param mixed $value
      */
     public function offsetSet($offset, mixed $value): void
     {
diff --git a/models/Element/DeepCopy/MarshalMatcher.php b/models/Element/DeepCopy/MarshalMatcher.php
index b9b1670eceb..062317d4d38 100644
--- a/models/Element/DeepCopy/MarshalMatcher.php
+++ b/models/Element/DeepCopy/MarshalMatcher.php
@@ -32,8 +32,6 @@ class MarshalMatcher extends TypeMatcher
     /**
      * MarshalMatcher constructor.
      *
-     * @param string|null $sourceType
-     * @param int|null $sourceId
      */
     public function __construct(?string $sourceType, ?int $sourceId)
     {
@@ -44,7 +42,6 @@ public function __construct(?string $sourceType, ?int $sourceId)
     /**
      * @param mixed $element
      *
-     * @return bool
      */
     public function matches($element): bool
     {
diff --git a/models/Element/DeepCopy/PimcoreClassDefinitionMatcher.php b/models/Element/DeepCopy/PimcoreClassDefinitionMatcher.php
index 69de6620346..7fb29ab1614 100644
--- a/models/Element/DeepCopy/PimcoreClassDefinitionMatcher.php
+++ b/models/Element/DeepCopy/PimcoreClassDefinitionMatcher.php
@@ -30,7 +30,6 @@ class PimcoreClassDefinitionMatcher implements Matcher
     /**
      * PimcoreClassDefinitionMatcher constructor.
      *
-     * @param string $matchType
      */
     public function __construct(string $matchType)
     {
@@ -41,7 +40,6 @@ public function __construct(string $matchType)
      * @param object $object
      * @param string $property
      *
-     * @return bool
      */
     public function matches($object, $property): bool
     {
diff --git a/models/Element/Editlock/Dao.php b/models/Element/Editlock/Dao.php
index 0432cc3158f..f208cf84b59 100644
--- a/models/Element/Editlock/Dao.php
+++ b/models/Element/Editlock/Dao.php
@@ -26,8 +26,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int $cid
-     * @param string $ctype
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -51,7 +49,6 @@ public function getByElement(int $cid, string $ctype): void
     /**
      * Save object to database
      *
-     * @return bool
      *
      * @todo: not all save methods return a boolean, why this one?
      */
diff --git a/models/Element/ElementDescriptor.php b/models/Element/ElementDescriptor.php
index 095571c7735..c664bddc017 100644
--- a/models/Element/ElementDescriptor.php
+++ b/models/Element/ElementDescriptor.php
@@ -58,7 +58,6 @@ public function setId(int $id): static
     /**
      * get the cache tag for the element
      *
-     * @return string
      */
     public function getCacheKey(): string
     {
diff --git a/models/Element/ElementDumpStateInterface.php b/models/Element/ElementDumpStateInterface.php
index 48bcd738fe1..b74cbd1992a 100644
--- a/models/Element/ElementDumpStateInterface.php
+++ b/models/Element/ElementDumpStateInterface.php
@@ -23,7 +23,6 @@ interface ElementDumpStateInterface
     /**
      * Set to true to indicate that we are about to serialize the version data.
      *
-     * @param bool $dumpState
      */
     public function setInDumpState(bool $dumpState): void;
 
diff --git a/models/Element/ElementDumpStateTrait.php b/models/Element/ElementDumpStateTrait.php
index 88fac80c13b..ee491180f54 100644
--- a/models/Element/ElementDumpStateTrait.php
+++ b/models/Element/ElementDumpStateTrait.php
@@ -21,7 +21,6 @@ trait ElementDumpStateTrait
     /**
      * This needs to be equal to the value of ElementDumpStateInterface::DUMP_STATE_PROPERTY_NAME
      *
-     * @var bool
      */
     protected bool $_fulldump = false;
 
diff --git a/models/Element/ElementInterface.php b/models/Element/ElementInterface.php
index fbea14c4b57..20bdbf72819 100644
--- a/models/Element/ElementInterface.php
+++ b/models/Element/ElementInterface.php
@@ -86,10 +86,7 @@ public function setProperties(?array $properties): static;
      * Get specific property data or the property object itself ($asContainer=true) by its name, if the
      * property doesn't exists return null
      *
-     * @param string $name
-     * @param bool $asContainer
      *
-     * @return mixed
      */
     public function getProperty(string $name, bool $asContainer = false): mixed;
 
@@ -100,14 +97,12 @@ public function hasProperty(string $name): bool;
     /**
      * returns true if the element is locked
      *
-     * @return bool
      */
     public function isLocked(): bool;
 
     /**
      * enum('self','propagate') nullable
      *
-     * @param string|null $locked
      *
      * @return $this
      */
@@ -116,7 +111,6 @@ public function setLocked(?string $locked): static;
     /**
      * enum('self','propagate') nullable
      *
-     * @return string|null
      */
     public function getLocked(): ?string;
 
@@ -167,10 +161,7 @@ public function setId(?int $id): static;
     /**
      * This is used for user-permissions, pass a permission type (eg. list, view, save) an you know if the current user is allowed to perform the requested action
      *
-     * @param string $type
-     * @param null|User $user
      *
-     * @return bool
      */
     public function isAllowed(string $type, ?User $user = null): bool;
 
diff --git a/models/Element/Note.php b/models/Element/Note.php
index 73abe6847e5..2ee09457ec0 100644
--- a/models/Element/Note.php
+++ b/models/Element/Note.php
@@ -29,7 +29,6 @@ final class Note extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $id = null;
 
@@ -46,7 +45,6 @@ final class Note extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var string
      */
     protected string $ctype;
 
@@ -58,7 +56,6 @@ final class Note extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $user = null;
 
@@ -75,7 +72,6 @@ final class Note extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var array
      */
     protected array $data = [];
 
@@ -89,9 +85,7 @@ final class Note extends Model\AbstractModel
     /**
      * @static
      *
-     * @param int $id
      *
-     * @return self|null
      */
     public static function getById(int $id): ?Note
     {
diff --git a/models/Element/Note/Dao.php b/models/Element/Note/Dao.php
index dc7ec10fb21..69ddbaa59ac 100644
--- a/models/Element/Note/Dao.php
+++ b/models/Element/Note/Dao.php
@@ -29,7 +29,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -85,7 +84,6 @@ public function getById(int $id): void
     }
 
     /** Saves note to database.
-     * @return bool
      *
      * @throws \Exception
      */
diff --git a/models/Element/Recyclebin/Item.php b/models/Element/Recyclebin/Item.php
index 0872fcaeebb..18bf97e2689 100644
--- a/models/Element/Recyclebin/Item.php
+++ b/models/Element/Recyclebin/Item.php
@@ -59,8 +59,6 @@ class Item extends Model\AbstractModel
     /**
      * @static
      *
-     * @param Element\ElementInterface $element
-     * @param Model\User|null $user
      */
     public static function create(Element\ElementInterface $element, Model\User $user = null): void
     {
@@ -72,9 +70,7 @@ public static function create(Element\ElementInterface $element, Model\User $use
     /**
      * @static
      *
-     * @param int $id
      *
-     * @return self|null
      */
     public static function getById(int $id): ?Item
     {
@@ -89,7 +85,6 @@ public static function getById(int $id): ?Item
     }
 
     /**
-     * @param Model\User|null $user
      *
      * @throws \Exception
      */
@@ -158,9 +153,6 @@ public function restore(Model\User $user = null): void
         $this->delete();
     }
 
-    /**
-     * @param Model\User|null $user
-     */
     public function save(Model\User $user = null): void
     {
         $this->setType(Element\Service::getElementType($this->getElement()));
@@ -256,7 +248,6 @@ public function loadChildren(Element\ElementInterface $element): void
     }
 
     /**
-     * @param Element\ElementInterface $element
      *
      * @throws \Exception
      */
diff --git a/models/Element/Recyclebin/Item/Dao.php b/models/Element/Recyclebin/Item/Dao.php
index 2516af68a00..2925fd6233a 100644
--- a/models/Element/Recyclebin/Item/Dao.php
+++ b/models/Element/Recyclebin/Item/Dao.php
@@ -26,7 +26,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int $id
      *
      * @throws \Exception
      */
@@ -44,7 +43,6 @@ public function getById(int $id): void
     /**
      * Save object to database
      *
-     * @return bool
      *
      * @todo: not all save methods return a boolean, why this one?
      */
diff --git a/models/Element/Recyclebin/Item/Listing/Dao.php b/models/Element/Recyclebin/Item/Listing/Dao.php
index 3f02f9cd5fe..5385f8644b3 100644
--- a/models/Element/Recyclebin/Item/Listing/Dao.php
+++ b/models/Element/Recyclebin/Item/Listing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of static routes for the specicifies parameters, returns an array of Staticroute elements
      *
-     * @return array
      */
     public function load(): array
     {
@@ -44,7 +43,6 @@ public function load(): array
     }
 
     /**
-     * @return int
      *
      * @todo: $amount could not be defined, so this could cause an issue
      */
diff --git a/models/Element/Service.php b/models/Element/Service.php
index 8eef0566c0e..bea854f8425 100644
--- a/models/Element/Service.php
+++ b/models/Element/Service.php
@@ -59,9 +59,7 @@ class Service extends Model\AbstractModel
     /**
      * @internal
      *
-     * @param ElementInterface $element
      *
-     * @return string
      */
     public static function getIdPath(ElementInterface $element): string
     {
@@ -84,10 +82,6 @@ public static function getIdPath(ElementInterface $element): string
     /**
      * @internal
      *
-     * @param ElementInterface $element
-     *
-     * @return string
-     *
      * @throws \Exception
      */
     public static function getTypePath(ElementInterface $element): string
@@ -113,10 +107,6 @@ public static function getTypePath(ElementInterface $element): string
     /**
      * @internal
      *
-     * @param ElementInterface $element
-     *
-     * @return string
-     *
      * @throws \Exception
      */
     public static function getSortIndexPath(ElementInterface $element): string
@@ -137,8 +127,6 @@ public static function getSortIndexPath(ElementInterface $element): string
     }
 
     /**
-     * @param array|Model\Listing\AbstractListing $list
-     * @param string $idGetter
      *
      * @return int[]
      *
@@ -166,11 +154,7 @@ public static function getIdList(Model\Listing\AbstractListing|array $list, stri
     }
 
     /**
-     * @param Dependency $d
-     * @param int|null $offset
-     * @param int|null $limit
      *
-     * @return array
      *
      * @internal
      */
@@ -194,11 +178,7 @@ public static function getRequiredByDependenciesForFrontend(Dependency $d, ?int
     }
 
     /**
-     * @param Dependency $d
-     * @param int|null $offset
-     * @param int|null $limit
      *
-     * @return array
      *
      * @internal
      */
@@ -251,9 +231,7 @@ public static function doHideUnpublished(?ElementInterface $element): bool
     /**
      * determines whether an element is published
      *
-     * @param  ElementInterface|null $element
      *
-     * @return bool
      *
      * @internal
      */
@@ -271,9 +249,7 @@ public static function isPublished(ElementInterface $element = null): bool
     }
 
     /**
-     * @param array|null $data
      *
-     * @return array
      *
      * @throws \Exception
      *
@@ -356,9 +332,7 @@ public static function getElementByPath(string $type, string $path): ?ElementInt
     }
 
     /**
-     * @param string|ElementInterface $element
      *
-     * @return string
      *
      * @throws \Exception
      *
@@ -385,10 +359,7 @@ public static function getBaseClassNameForElement(string|ElementInterface $eleme
     /**
      * Returns a uniqe key for the element in the $target-Path (recursive)
      *
-     * @return string
      *
-     * @param string $sourceKey
-     * @param ElementInterface $target
      */
     public static function getSafeCopyName(string $sourceKey, ElementInterface $target): string
     {
@@ -417,12 +388,6 @@ public static function getSafeCopyName(string $sourceKey, ElementInterface $targ
         return $sourceKey;
     }
 
-    /**
-     * @param string $path
-     * @param string|null $type
-     *
-     * @return bool
-     */
     public static function pathExists(string $path, string $type = null): bool
     {
         return match ($type) {
@@ -456,9 +421,7 @@ public static function getElementById(string $type, int|string $id, array $param
     /**
      * @internal
      *
-     * @param array $params
      *
-     * @return array
      */
     public static function prepareGetByIdParams(array $params): array
     {
@@ -475,9 +438,7 @@ public static function prepareGetByIdParams(array $params): array
     /**
      * @static
      *
-     * @param ElementInterface $element
      *
-     * @return string|null
      */
     public static function getElementType(ElementInterface $element): ?string
     {
@@ -492,9 +453,7 @@ public static function getElementType(ElementInterface $element): ?string
     /**
      * @internal
      *
-     * @param string $className
      *
-     * @return string|null
      */
     public static function getElementTypeByClassName(string $className): ?string
     {
@@ -511,9 +470,7 @@ public static function getElementTypeByClassName(string $className): ?string
     /**
      * @internal
      *
-     * @param ElementInterface $element
      *
-     * @return string|null
      */
     public static function getElementHash(ElementInterface $element): ?string
     {
@@ -526,9 +483,7 @@ public static function getElementHash(ElementInterface $element): ?string
     }
 
     /**
-     * @param array $props
      *
-     * @return array
      *
      * @internal
      */
@@ -607,9 +562,7 @@ protected function updateChildren(DataObject|Document|Asset\Folder $target, Elem
     /**
      * @internal
      *
-     * @param  ElementInterface $element
      *
-     * @return array
      */
     public static function gridElementData(ElementInterface $element): array
     {
@@ -637,7 +590,6 @@ public static function gridElementData(ElementInterface $element): array
      * A user may have custom workspaces and/or may inherit those from their role(s), if any.
      *
      * @param string $type asset|object|document
-     * @param Model\User $user
      *
      * @return array{forbidden: array, allowed: array}
      *
@@ -712,11 +664,7 @@ public static function findForbiddenPaths(string $type, Model\User $user): array
     /**
      * renews all references, for example after unserializing an ElementInterface
      *
-     * @param mixed $data
-     * @param bool $initial
-     * @param string|null $key
      *
-     * @return mixed
      *
      * @internal
      */
@@ -793,9 +741,7 @@ public static function renewReferences(mixed $data, bool $initial = true, string
     /**
      * @internal
      *
-     * @param string $path
      *
-     * @return string
      */
     public static function correctPath(string $path): string
     {
@@ -817,9 +763,7 @@ public static function correctPath(string $path): string
     /**
      * @internal
      *
-     * @param ElementInterface $element
      *
-     * @return ElementInterface
      */
     public static function loadAllFields(ElementInterface $element): ElementInterface
     {
@@ -847,10 +791,7 @@ private static function filterNullValues(string $var): bool
     }
 
     /**
-     * @param string $path
-     * @param array $options
      *
-     * @return Asset\Folder|DataObject\Folder|Document\Folder|null
      *
      * @throws \Exception
      */
@@ -933,7 +874,6 @@ public static function createFolderByPath(string $path, array $options = []): As
     /**
      * Changes the query according to the custom view config
      *
-     * @param array $cv
      * @param Model\Asset\Listing|Model\DataObject\Listing|Model\Document\Listing $childrenList
      *
      * @internal
@@ -1026,10 +966,7 @@ public static function isValidPath(string $path, string $type): bool
     /**
      * returns a unique key for an element
      *
-     * @param ElementInterface $element
-     * @param int $nr
      *
-     * @return string|null
      *
      * @throws \Exception
      */
@@ -1051,10 +988,7 @@ public static function getUniqueKey(ElementInterface $element, int $nr = 0): ?st
     }
 
     /**
-     * @param array $data
-     * @param string $type
      *
-     * @return array
      *
      * @internal
      */
@@ -1095,8 +1029,6 @@ public static function fixAllowedTypes(array $data, string $type): array
     /**
      * @param Model\Version[] $versions
      *
-     * @return array
-     *
      * @internal
      */
     public static function getSafeVersionInfo(array $versions): array
@@ -1143,9 +1075,6 @@ public static function cloneMe(ElementInterface $element): ElementInterface
     {
         $deepCopy = new \DeepCopy\DeepCopy();
         $deepCopy->addFilter(new \DeepCopy\Filter\KeepFilter(), new class() implements \DeepCopy\Matcher\Matcher {
-            /**
-             * {@inheritdoc}
-             */
             public function matches($object, $property): bool
             {
                 try {
@@ -1212,9 +1141,7 @@ public static function cloneProperties(mixed $properties): mixed
     /**
      * @internal
      *
-     * @param Note $note
      *
-     * @return array
      */
     public static function getNoteData(Note $note): array
     {
@@ -1287,11 +1214,7 @@ public static function getNoteData(Note $note): array
     }
 
     /**
-     * @param string $type
-     * @param int $elementId
-     * @param string|null $postfix
      *
-     * @return string
      *
      * @internal
      */
@@ -1341,8 +1264,6 @@ function (Concrete $object, Data $fieldDefinition, $property, $currentValue) {
     }
 
     /**
-     * @param ElementInterface $element
-     * @param string $postfix
      * @param bool $clone save a copy
      *
      * @internal
@@ -1399,10 +1320,7 @@ public static function removeElementFromSession(string $type, int $elementId, st
     /**
      * @internal
      *
-     * @param mixed $element
-     * @param array|null $context
      *
-     * @return DeepCopy
      */
     public static function getDeepCopyInstance(mixed $element, ?array $context = []): DeepCopy
     {
@@ -1467,9 +1385,7 @@ function ($currentValue) {
     /**
      * @internal
      *
-     * @param array $rowData
      *
-     * @return array
      */
     public static function escapeCsvRecord(array $rowData): array
     {
@@ -1482,10 +1398,7 @@ public static function escapeCsvRecord(array $rowData): array
     }
 
     /**
-     * @param string $type
-     * @param int|string|null $id
      *
-     * @return string
      *
      * @internal
      */
diff --git a/models/Element/Tag.php b/models/Element/Tag.php
index 38c260e79c9..647f428d2b8 100644
--- a/models/Element/Tag.php
+++ b/models/Element/Tag.php
@@ -36,7 +36,6 @@ final class Tag extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var string
      */
     protected string $name;
 
@@ -48,7 +47,6 @@ final class Tag extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var string
      */
     protected string $idPath = '';
 
@@ -62,16 +60,13 @@ final class Tag extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var Tag|null
      */
     protected ?Tag $parent = null;
 
     /**
      * @static
      *
-     * @param int $id
      *
-     * @return Tag|null
      */
     public static function getById(int $id): ?Tag
     {
@@ -88,8 +83,6 @@ public static function getById(int $id): ?Tag
     /**
      * returns all assigned tags for element
      *
-     * @param string $cType
-     * @param int $cId
      *
      * @return Tag[]
      */
@@ -103,9 +96,6 @@ public static function getTagsForElement(string $cType, int $cId): array
     /**
      * adds given tag to element
      *
-     * @param string $cType
-     * @param int $cId
-     * @param Tag $tag
      */
     public static function addTagToElement(string $cType, int $cId, Tag $tag): void
     {
@@ -123,9 +113,6 @@ public static function addTagToElement(string $cType, int $cId, Tag $tag): void
     /**
      * removes given tag from element
      *
-     * @param string $cType
-     * @param int $cId
-     * @param Tag $tag
      */
     public static function removeTagFromElement(string $cType, int $cId, Tag $tag): void
     {
@@ -144,8 +131,6 @@ public static function removeTagFromElement(string $cType, int $cId, Tag $tag):
      * sets given tags to element and removes all other tags
      * to remove all tags from element, provide empty array of tags
      *
-     * @param string $cType
-     * @param int $cId
      * @param Tag[] $tags
      */
     public static function setTagsForElement(string $cType, int $cId, array $tags): void
@@ -169,7 +154,6 @@ public static function batchAssignTagsToElement(string $cType, array $cIds, arra
      * @param array $classNames        For objects only: filter by classnames
      * @param bool $considerChildTags Look for elements having one of $tag's children assigned
      *
-     * @return array
      */
     public static function getElementsForTag(
         Tag $tag,
@@ -184,7 +168,6 @@ public static function getElementsForTag(
     /**
      * @param string $path name path of tags
      *
-     * @return Tag|null
      */
     public static function getByPath(string $path): ?Tag
     {
diff --git a/models/Element/Tag/Dao.php b/models/Element/Tag/Dao.php
index 34f512c8b9f..7c28e491852 100644
--- a/models/Element/Tag/Dao.php
+++ b/models/Element/Tag/Dao.php
@@ -27,7 +27,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -43,7 +42,6 @@ public function getById(int $id): void
     /**
      * Save object to database
      *
-     * @return bool
      *
      * @throws \Exception
      *
@@ -119,8 +117,6 @@ public function delete(): void
     }
 
     /**
-     * @param string $cType
-     * @param int $cId
      *
      * @return Model\Element\Tag[]
      */
@@ -166,9 +162,6 @@ public function removeTagFromElement(string $cType, int $cId): void
     }
 
     /**
-     * @param string $cType
-     * @param int $cId
-     * @param array $tags
      *
      * @throws \Exception
      */
@@ -217,7 +210,6 @@ public function batchAssignTagsToElement(string $cType, array $cIds, array $tagI
      * @param array  $classNames        For objects only: filter by classnames
      * @param bool $considerChildTags Look for elements having one of $tag's children assigned
      *
-     * @return array
      */
     public function getElementsForTag(
         Tag $tag,
@@ -281,7 +273,6 @@ public function getElementsForTag(
     /**
      * @param string $tagPath separated by "/"
      *
-     * @return null|Tag
      */
     public function getByPath(string $tagPath): ?Tag
     {
diff --git a/models/Element/Tag/Listing/Dao.php b/models/Element/Tag/Listing/Dao.php
index 5fe27fe2b78..02aa5eb82ee 100644
--- a/models/Element/Tag/Listing/Dao.php
+++ b/models/Element/Tag/Listing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of tags for the specified parameters, returns an array of Element\Tag elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/Element/Traits/VersionDaoTrait.php b/models/Element/Traits/VersionDaoTrait.php
index d0c0d8edc78..587ad3cf877 100644
--- a/models/Element/Traits/VersionDaoTrait.php
+++ b/models/Element/Traits/VersionDaoTrait.php
@@ -27,10 +27,7 @@ trait VersionDaoTrait
     /**
      * Get latest available version, using $includingPublished to also consider the published one
      *
-     * @param int|null $userId
-     * @param bool $includingPublished
      *
-     * @return Version|null
      */
     public function getLatestVersion(int $userId = null, bool $includingPublished = false): ?Version
     {
diff --git a/models/Element/WorkflowState/Dao.php b/models/Element/WorkflowState/Dao.php
index 2f348459e8b..7cc94daeba8 100644
--- a/models/Element/WorkflowState/Dao.php
+++ b/models/Element/WorkflowState/Dao.php
@@ -26,9 +26,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int $cid
-     * @param string $ctype
-     * @param string $workflow
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -45,7 +42,6 @@ public function getByPrimary(int $cid, string $ctype, string $workflow): void
     /**
      * Save object to database
      *
-     * @return bool
      *
      * @todo: not all save methods return a boolean, why this one?
      */
diff --git a/models/Element/WorkflowState/Listing/Dao.php b/models/Element/WorkflowState/Listing/Dao.php
index 037d9d29f7b..0e27925f713 100644
--- a/models/Element/WorkflowState/Listing/Dao.php
+++ b/models/Element/WorkflowState/Listing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of workflow states for the specified parameters, returns an array of Element\WorkflowState elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/Metadata/Predefined/Dao.php b/models/Metadata/Predefined/Dao.php
index ab6d34c2dfa..cad575b2f89 100644
--- a/models/Metadata/Predefined/Dao.php
+++ b/models/Metadata/Predefined/Dao.php
@@ -41,7 +41,6 @@ public function configure(): void
     }
 
     /**
-     * @param string|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -65,8 +64,6 @@ public function getById(string $id = null): void
     }
 
     /**
-     * @param string|null $name
-     * @param string|null $language
      *
      * @throws \Exception
      */
@@ -128,9 +125,6 @@ public function delete(): void
         $this->deleteData($this->model->getId());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataStructureForYaml(string $id, mixed $data): mixed
     {
         return [
diff --git a/models/Metadata/Predefined/Listing.php b/models/Metadata/Predefined/Listing.php
index 4a9660731f6..89a1bf42a95 100644
--- a/models/Metadata/Predefined/Listing.php
+++ b/models/Metadata/Predefined/Listing.php
@@ -63,8 +63,6 @@ public function setDefinitions(?array $definitions): static
     }
 
     /**
-     * @param string $type
-     * @param array|string|null $subTypes
      *
      * @return \Pimcore\Model\Metadata\Predefined[]|null
      *
@@ -99,13 +97,6 @@ public static function getByTargetType(string $type, array|string $subTypes = nu
         return $list->load();
     }
 
-    /**
-     * @param string $key
-     * @param string|null $language
-     * @param string|null $targetSubtype
-     *
-     * @return \Pimcore\Model\Metadata\Predefined|null
-     */
     public static function getByKeyAndLanguage(string $key, ?string $language, string $targetSubtype = null): ?\Pimcore\Model\Metadata\Predefined
     {
         $list = new self();
diff --git a/models/Notification.php b/models/Notification.php
index f75c4dc43c0..780017955a4 100644
--- a/models/Notification.php
+++ b/models/Notification.php
@@ -33,7 +33,6 @@ class Notification extends AbstractModel
     /**
      * @internal
      *
-     * @var int|null
      */
     protected ?int $id = null;
 
@@ -245,7 +244,6 @@ public function setLinkedElement(?Element\ElementInterface $linkedElement): stat
     /**
      * enum('document','asset', 'object) nullable
      *
-     * @return string|null
      */
     public function getLinkedElementType(): ?string
     {
diff --git a/models/Notification/Dao.php b/models/Notification/Dao.php
index 646c0d28f9a..8dc1457d8e9 100644
--- a/models/Notification/Dao.php
+++ b/models/Notification/Dao.php
@@ -33,7 +33,6 @@ class Dao extends AbstractDao
     const DB_TABLE_NAME = 'notifications';
 
     /**
-     * @param int $id
      *
      * @throws NotFoundException
      */
diff --git a/models/Notification/Listing.php b/models/Notification/Listing.php
index 3f2a05b1878..5f8c0c5b773 100644
--- a/models/Notification/Listing.php
+++ b/models/Notification/Listing.php
@@ -32,8 +32,6 @@ public function isValidOrderKey(string $key): bool
     }
 
     /**
-     * @param int $offset
-     * @param int $limit
      *
      * @return Model\Notification[]
      */
diff --git a/models/Notification/Listing/Dao.php b/models/Notification/Listing/Dao.php
index 9eacc444bb8..1ff12e42e39 100644
--- a/models/Notification/Listing/Dao.php
+++ b/models/Notification/Listing/Dao.php
@@ -47,7 +47,6 @@ public function getTotalCount(): int
     }
 
     /**
-     * @return array
      *
      * @throws Exception
      */
diff --git a/models/Notification/Service/NotificationService.php b/models/Notification/Service/NotificationService.php
index 3efa1018ddf..b0980909bbc 100644
--- a/models/Notification/Service/NotificationService.php
+++ b/models/Notification/Service/NotificationService.php
@@ -34,7 +34,6 @@ class NotificationService
     /**
      * NotificationService constructor.
      *
-     * @param UserService $userService
      */
     public function __construct(UserService $userService)
     {
@@ -42,11 +41,6 @@ public function __construct(UserService $userService)
     }
 
     /**
-     * @param int $userId
-     * @param int $fromUser
-     * @param string $title
-     * @param string $message
-     * @param ElementInterface|null $element
      *
      * @throws \UnexpectedValueException
      */
@@ -86,11 +80,6 @@ public function sendToUser(
     }
 
     /**
-     * @param int $groupId
-     * @param int $fromUser
-     * @param string $title
-     * @param string $message
-     * @param ElementInterface|null $element
      *
      * @throws \UnexpectedValueException
      */
@@ -139,9 +128,7 @@ public function sendToGroup(
     }
 
     /**
-     * @param int $id
      *
-     * @return Notification
      *
      * @throws \UnexpectedValueException
      */
@@ -157,10 +144,7 @@ public function find(int $id): Notification
     }
 
     /**
-     * @param int $id
-     * @param int|null $recipientId
      *
-     * @return Notification
      *
      * @throws \UnexpectedValueException
      */
diff --git a/models/Notification/Service/NotificationServiceFilterParser.php b/models/Notification/Service/NotificationServiceFilterParser.php
index c054cbcc401..4a43c94c2ef 100644
--- a/models/Notification/Service/NotificationServiceFilterParser.php
+++ b/models/Notification/Service/NotificationServiceFilterParser.php
@@ -53,7 +53,6 @@ class NotificationServiceFilterParser
     /**
      * ExtJSFilterParser constructor.
      *
-     * @param Request $request
      */
     public function __construct(Request $request)
     {
diff --git a/models/Property.php b/models/Property.php
index 7aea2428b1f..fd676a9ff77 100644
--- a/models/Property.php
+++ b/models/Property.php
@@ -44,8 +44,6 @@ final class Property extends AbstractModel
     /**
      * @internal
      *
-     * @param mixed $data
-     *
      * @return $this
      */
     public function setDataFromEditmode(mixed $data): static
@@ -74,8 +72,6 @@ public function setDataFromEditmode(mixed $data): static
     /**
      * @internal
      *
-     * @param mixed $data
-     *
      * @return $this
      */
     public function setDataFromResource(mixed $data): static
@@ -146,7 +142,6 @@ public function setCid(int $cid): static
     /**
      * enum('document','asset','object')
      *
-     * @param string $ctype
      *
      * @return $this
      */
@@ -185,7 +180,6 @@ public function setName(string $name): static
     /**
      * enum('text','document','asset','object','bool','select')
      *
-     * @param string $type
      *
      * @return $this
      */
@@ -209,7 +203,6 @@ public function getInherited(): bool
     /**
      * Alias for getInherited()
      *
-     * @return bool
      */
     public function isInherited(): bool
     {
@@ -254,7 +247,6 @@ public function setInheritable(bool $inheritable): static
     /**
      * @internal
      *
-     * @return array
      */
     public function resolveDependencies(): array
     {
@@ -283,7 +275,6 @@ public function resolveDependencies(): array
      *  "asset" => array(...)
      * )
      *
-     * @param array $idMapping
      *
      * @internal
      */
@@ -303,7 +294,6 @@ public function rewriteIds(array $idMapping): void
     /**
      * @internal
      *
-     * @return array
      */
     public function serialize(): array
     {
diff --git a/models/Property/Predefined/Dao.php b/models/Property/Predefined/Dao.php
index 4c4805362e4..f6c94b616aa 100644
--- a/models/Property/Predefined/Dao.php
+++ b/models/Property/Predefined/Dao.php
@@ -41,7 +41,6 @@ public function configure(): void
     }
 
     /**
-     * @param string|null $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -68,7 +67,6 @@ public function getById(string $id = null): void
     }
 
     /**
-     * @param string|null $key
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -131,9 +129,6 @@ public function delete(): void
         $this->deleteData($this->model->getId());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function prepareDataStructureForYaml(string $id, mixed $data): mixed
     {
         return [
diff --git a/models/Schedule/Task/Dao.php b/models/Schedule/Task/Dao.php
index 581ceb7e768..94d1c5db7ed 100644
--- a/models/Schedule/Task/Dao.php
+++ b/models/Schedule/Task/Dao.php
@@ -25,7 +25,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int $id
      *
      * @throws Model\Exception\NotFoundException
      */
diff --git a/models/Schedule/Task/Listing/Dao.php b/models/Schedule/Task/Listing/Dao.php
index 929ecdfecaa..65908785203 100644
--- a/models/Schedule/Task/Listing/Dao.php
+++ b/models/Schedule/Task/Listing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of thumanils for the specicifies parameters, returns an array of Schedule\Task elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/Site/Dao.php b/models/Site/Dao.php
index e15a3004867..b4df4c42c9b 100644
--- a/models/Site/Dao.php
+++ b/models/Site/Dao.php
@@ -26,7 +26,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int $id
      *
      * @throws NotFoundException
      */
@@ -40,7 +39,6 @@ public function getById(int $id): void
     }
 
     /**
-     * @param int $id
      *
      * @throws NotFoundException
      */
@@ -54,7 +52,6 @@ public function getByRootId(int $id): void
     }
 
     /**
-     * @param string $domain
      *
      * @throws NotFoundException
      */
diff --git a/models/Site/Listing/Dao.php b/models/Site/Listing/Dao.php
index 902bbdc131b..9dd903f5232 100644
--- a/models/Site/Listing/Dao.php
+++ b/models/Site/Listing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of thumanils for the specicifies parameters, returns an array of Thumbnail elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/Tool/Email/Blocklist/Dao.php b/models/Tool/Email/Blocklist/Dao.php
index f3e4702518b..b39b2fd9af5 100644
--- a/models/Tool/Email/Blocklist/Dao.php
+++ b/models/Tool/Email/Blocklist/Dao.php
@@ -26,7 +26,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param string $address
      *
      * @throws Model\Exception\NotFoundException(
      */
diff --git a/models/Tool/Email/Blocklist/Listing/Dao.php b/models/Tool/Email/Blocklist/Listing/Dao.php
index 1a6a7c5a465..6df9f28d6b8 100644
--- a/models/Tool/Email/Blocklist/Listing/Dao.php
+++ b/models/Tool/Email/Blocklist/Listing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of static routes for the specicifies parameters, returns an array of Tool\Email\Blocklist elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/Tool/Email/Log.php b/models/Tool/Email/Log.php
index ab40c6fee64..8c0a34d9d8a 100644
--- a/models/Tool/Email/Log.php
+++ b/models/Tool/Email/Log.php
@@ -37,7 +37,6 @@ class Log extends Model\AbstractModel
     /**
      * Id of the email document or null if no document was given
      *
-     * @var int | null
      */
     protected ?int $documentId = null;
 
@@ -49,21 +48,18 @@ class Log extends Model\AbstractModel
     /**
      * Modification date as timestamp
      *
-     * @var int
      */
     protected int $modificationDate;
 
     /**
      * The request URI from were the email was sent
      *
-     * @var string
      */
     protected string $requestUri;
 
     /**
      * The "from" email address
      *
-     * @var string
      */
     protected string $from;
 
@@ -75,63 +71,54 @@ class Log extends Model\AbstractModel
     /**
      * The "to" recipients (multiple recipients are separated by a ",")
      *
-     * @var string|null
      */
     protected ?string $to = null;
 
     /**
      * The carbon copy recipients (multiple recipients are separated by a ",")
      *
-     * @var string|null
      */
     protected ?string $cc = null;
 
     /**
      * The blind carbon copy recipients (multiple recipients are separated by a ",")
      *
-     * @var string|null
      */
     protected ?string $bcc = null;
 
     /**
      * Contains 1 if a html logfile exists and 0 if no html logfile exists
      *
-     * @var int
      */
     protected int $emailLogExistsHtml;
 
     /**
      * Contains 1 if a text logfile exists and 0 if no text logfile exists
      *
-     * @var int
      */
     protected int $emailLogExistsText;
 
     /**
      * Contains the timestamp when the email was sent
      *
-     * @var int
      */
     protected int $sentDate;
 
     /**
      * Contains the rendered html content of the email
      *
-     * @var string
      */
     protected string $bodyHtml = '';
 
     /**
      * Contains the rendered text content of the email
      *
-     * @var string
      */
     protected string $bodyText = '';
 
     /**
      * Contains the rendered subject of the email
      *
-     * @var string
      */
     protected string $subject;
 
@@ -163,7 +150,6 @@ public function setRequestUri(string $requestUri): static
     /**
      * Returns the request uri
      *
-     * @return string
      */
     public function getRequestUri(): string
     {
@@ -201,7 +187,6 @@ public function setSubject(string $subject): static
     /**
      * Returns the subject
      *
-     * @return string
      */
     public function getSubject(): string
     {
@@ -213,9 +198,7 @@ public function getSubject(): string
      *
      * @static
      *
-     * @param int $id
      *
-     * @return Log|null
      */
     public static function getById(int $id): ?Log
     {
@@ -234,7 +217,6 @@ public static function getById(int $id): ?Log
     /**
      * Returns the email document id
      *
-     * @return int|null
      */
     public function getDocumentId(): ?int
     {
@@ -254,7 +236,6 @@ public function setParams(string|array $params): static
     /**
      * Returns the dynamic parameter
      *
-     * @return array
      */
     public function getParams(): array
     {
@@ -268,7 +249,6 @@ public function getParams(): array
     /**
      * Sets the modification date
      *
-     * @param int $modificationDate
      *
      * @return $this
      */
@@ -306,7 +286,6 @@ public function setSentDate(int $sentDate): static
     /**
      * Returns the sent date and time as unix timestamp
      *
-     * @return int
      */
     public function getSentDate(): int
     {
@@ -364,7 +343,6 @@ public function getEmailLogExistsText(): int
     /**
      * Returns the filename of the html log
      *
-     * @return string
      */
     public function getHtmlLogFilename(): string
     {
@@ -374,7 +352,6 @@ public function getHtmlLogFilename(): string
     /**
      * Returns the filename of the text log
      *
-     * @return string
      */
     public function getTextLogFilename(): string
     {
@@ -456,7 +433,6 @@ public function setTo(?string $to): static
     /**
      * Returns the "to" recipients
      *
-     * @return string|null
      */
     public function getTo(): ?string
     {
@@ -476,7 +452,6 @@ public function setCc(?string $cc): static
     /**
      * Returns the carbon copy recipients
      *
-     * @return string|null
      */
     public function getCc(): ?string
     {
@@ -496,7 +471,6 @@ public function setBcc(?string $bcc): static
     /**
      * Returns the blind carbon copy recipients
      *
-     * @return string|null
      */
     public function getBcc(): ?string
     {
@@ -516,7 +490,6 @@ public function setFrom(string $from): static
     /**
      * Returns the "from" email address
      *
-     * @return string
      */
     public function getFrom(): string
     {
@@ -536,7 +509,6 @@ public function setReplyTo(string $replyTo): static
     /**
      * Returns the "replyTo" email address
      *
-     * @return string|null
      */
     public function getReplyTo(): ?string
     {
@@ -556,7 +528,6 @@ public function setBodyHtml(string $html): static
     /**
      * returns the html content of the email
      *
-     * @return string | null
      */
     public function getBodyHtml(): ?string
     {
@@ -576,7 +547,6 @@ public function setBodyText(string $text): static
     /**
      * Returns the text version of the email
      *
-     * @return string
      */
     public function getBodyText(): string
     {
diff --git a/models/Tool/Email/Log/Dao.php b/models/Tool/Email/Log/Dao.php
index 15f487ba9ce..4aedc88118c 100644
--- a/models/Tool/Email/Log/Dao.php
+++ b/models/Tool/Email/Log/Dao.php
@@ -28,14 +28,12 @@ class Dao extends Model\Dao\AbstractDao
     /**
      * Name of the db table
      *
-     * @var string
      */
     protected static string $dbTable = 'email_log';
 
     /**
      * Get the data for the object from database for the given id, or from the ID which is set in the object
      *
-     * @param int|null $id
      */
     public function getById(int $id = null): void
     {
@@ -126,10 +124,7 @@ protected function createJsonLoggingObject(array|string $data): array|string
      * Creates the basic logging for the treeGrid in the backend
      * Data will be enhanced with live-data in the backend
      *
-     * @param string $key
-     * @param mixed $value
      *
-     * @return \stdClass
      */
     protected function prepareLoggingData(string $key, mixed $value): \stdClass
     {
diff --git a/models/Tool/Email/Log/Listing.php b/models/Tool/Email/Log/Listing.php
index 129f6f61024..3c094d30c4b 100644
--- a/models/Tool/Email/Log/Listing.php
+++ b/models/Tool/Email/Log/Listing.php
@@ -39,7 +39,6 @@ public function getEmailLogs(): array
     /**
      * Sets EmailLog entries
      *
-     * @param array $emailLogs
      *
      * @return $this
      */
diff --git a/models/Tool/Email/Log/Listing/Dao.php b/models/Tool/Email/Log/Listing/Dao.php
index 83772553aaa..2e40340f1dd 100644
--- a/models/Tool/Email/Log/Listing/Dao.php
+++ b/models/Tool/Email/Log/Listing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of Email_Log for the specified parameters, returns an array of Email_Log elements
      *
-     * @return array
      */
     public function load(): array
     {
@@ -45,7 +44,6 @@ public function load(): array
     /**
      * Returns the db entries from email_log by the specified parameters
      *
-     * @return array
      */
     public function getDataArray(): array
     {
@@ -57,7 +55,6 @@ public function getDataArray(): array
     /**
      * Returns the total amount of Email_Log entries
      *
-     * @return int
      */
     public function getTotalCount(): int
     {
diff --git a/models/Tool/SettingsStore.php b/models/Tool/SettingsStore.php
index 4346d8cfddc..43426bc5314 100644
--- a/models/Tool/SettingsStore.php
+++ b/models/Tool/SettingsStore.php
@@ -42,35 +42,30 @@ final class SettingsStore extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var string
      */
     protected string $id;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $scope = null;
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $type = '';
 
     /**
      * @internal
      *
-     * @var mixed
      */
     protected mixed $data = null;
 
     /**
      * @internal
      *
-     * @var self|null
      */
     protected static ?self $instance = null;
 
@@ -96,12 +91,7 @@ private static function validateType(string $type): bool
     }
 
     /**
-     * @param string $id
-     * @param float|bool|int|string $data
-     * @param string $type
-     * @param string|null $scope
      *
-     * @return bool
      *
      * @throws \Exception
      */
@@ -131,7 +121,6 @@ public static function get(string $id, ?string $scope = null): ?SettingsStore
     }
 
     /**
-     * @param string $scope
      *
      * @return string[]
      */
@@ -168,7 +157,6 @@ public function getType(): ?string
     }
 
     /**
-     * @param string $type
      *
      * @throws \Exception
      */
diff --git a/models/Tool/TmpStore.php b/models/Tool/TmpStore.php
index 8adbd1dfb33..ab5b8f71008 100644
--- a/models/Tool/TmpStore.php
+++ b/models/Tool/TmpStore.php
@@ -27,7 +27,6 @@ final class TmpStore extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var string
      */
     protected string $id;
 
@@ -39,35 +38,30 @@ final class TmpStore extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var mixed
      */
     protected mixed $data = null;
 
     /**
      * @internal
      *
-     * @var int
      */
     protected int $date;
 
     /**
      * @internal
      *
-     * @var int
      */
     protected int $expiryDate;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $serialized = false;
 
     /**
      * @internal
      *
-     * @var self|null
      */
     protected static ?self $instance = null;
 
@@ -100,14 +94,6 @@ public static function add(string $id, mixed $data, ?string $tag = null, ?int $l
         return $instance->getDao()->add($id, $data, $tag, $lifetime);
     }
 
-    /**
-     * @param string $id
-     * @param mixed $data
-     * @param string|null $tag
-     * @param int|null $lifetime
-     *
-     * @return bool
-     */
     public static function set(string $id, mixed $data, string $tag = null, int $lifetime = null): bool
     {
         $instance = self::getInstance();
@@ -207,11 +193,6 @@ public function setExpiryDate(int $expiryDate): void
         $this->expiryDate = $expiryDate;
     }
 
-    /**
-     * @param int|null $lifetime
-     *
-     * @return bool
-     */
     public function update(int $lifetime = null): bool
     {
         if (!$lifetime) {
diff --git a/models/Translation.php b/models/Translation.php
index 0745256aba4..870392d229e 100644
--- a/models/Translation.php
+++ b/models/Translation.php
@@ -184,9 +184,7 @@ public function setUserModification(?int $userModification): void
     /**
      * @internal
      *
-     * @param string $domain
      *
-     * @return array
      */
     public static function getValidLanguages(string $domain = self::DOMAIN_DEFAULT): array
     {
@@ -221,13 +219,7 @@ public static function clearDependentCache(): void
     }
 
     /**
-     * @param string $id
-     * @param string $domain
-     * @param bool $create
-     * @param bool $returnIdIfEmpty
-     * @param array|null $languages
      *
-     * @return static|null
      *
      * @throws \Exception
      */
@@ -295,13 +287,8 @@ public static function getRegisteredDomains(): array
     }
 
     /**
-     * @param string $id
-     * @param string $domain
      * @param bool $create - creates an empty translation entry if the key doesn't exists
      * @param bool $returnIdIfEmpty - returns $id if no translation is available
-     * @param string|null $language
-     *
-     * @return string|null
      *
      * @throws \Exception
      */
@@ -372,12 +359,6 @@ public function delete(): void
      * The CSV file has to have the same format as an Pimcore translation-export-file
      *
      * @param string $file - path to the csv file
-     * @param string $domain
-     * @param bool $replaceExistingTranslations
-     * @param array|null $languages
-     * @param \stdClass|null $dialect
-     *
-     * @return array
      *
      * @throws \Exception
      *
diff --git a/models/Translation/Dao.php b/models/Translation/Dao.php
index 93a73934af0..40f019d53f7 100644
--- a/models/Translation/Dao.php
+++ b/models/Translation/Dao.php
@@ -39,8 +39,6 @@ public function getDatabaseTableName(): string
     }
 
     /**
-     * @param string $key
-     * @param array|null $languages
      *
      * @throws NotFoundResourceException
      * @throws \Doctrine\DBAL\Exception
@@ -128,7 +126,6 @@ public function delete(): void
     /**
      * Returns a array containing all available languages
      *
-     * @return array
      */
     public function getAvailableLanguages(): array
     {
@@ -145,7 +142,6 @@ public function getAvailableLanguages(): array
     /**
      * Returns a array containing all available domains
      *
-     * @return array
      */
     public function getAvailableDomains(): array
     {
@@ -162,9 +158,7 @@ public function getAvailableDomains(): array
     /**
      * Returns boolean, if the domain table exists & domain registered in config
      *
-     * @param string $domain
      *
-     * @return bool
      */
     public function isAValidDomain(string $domain): bool
     {
diff --git a/models/Translation/Listing.php b/models/Translation/Listing.php
index a56b42e7d28..abedbea10cf 100644
--- a/models/Translation/Listing.php
+++ b/models/Translation/Listing.php
@@ -41,7 +41,6 @@ class Listing extends Model\Listing\AbstractListing
     /**
      * @internal
      *
-     * @var string
      */
     protected string $domain = Model\Translation::DOMAIN_DEFAULT;
 
diff --git a/models/Translation/Listing/Dao.php b/models/Translation/Listing/Dao.php
index 067faf7af3e..32612bdb5ab 100644
--- a/models/Translation/Listing/Dao.php
+++ b/models/Translation/Listing/Dao.php
@@ -166,7 +166,6 @@ public function cleanup(): void
     /**
      * @param string|string[]|null $columns
      *
-     * @return DoctrineQueryBuilder
      */
     public function getQueryBuilder(...$columns): DoctrineQueryBuilder
     {
diff --git a/models/User.php b/models/User.php
index 4a9fb5da581..c0ef923ac5e 100644
--- a/models/User.php
+++ b/models/User.php
@@ -111,7 +111,6 @@ public function setPassword(?string $password): static
     /**
      * Alias for getName()
      *
-     * @return string|null
      */
     public function getUsername(): ?string
     {
@@ -198,7 +197,6 @@ public function setLanguage(string $language): static
     /**
      * @see getAdmin()
      *
-     * @return bool
      */
     public function isAdmin(): bool
     {
@@ -426,8 +424,6 @@ public function setImage(?string $path): void
     }
 
     /**
-     * @param int|null $width
-     * @param int|null $height
      *
      * @return resource
      */
diff --git a/models/User/AbstractUser/Dao.php b/models/User/AbstractUser/Dao.php
index 7c8a38a5fc0..afcd8b53fb9 100644
--- a/models/User/AbstractUser/Dao.php
+++ b/models/User/AbstractUser/Dao.php
@@ -26,7 +26,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int $id
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -52,7 +51,6 @@ public function getById(int $id): void
     }
 
     /**
-     * @param string $name
      *
      * @throws Model\Exception\NotFoundException
      */
@@ -86,7 +84,6 @@ public function create(): void
     /**
      * Quick test if there are children
      *
-     * @return bool
      */
     public function hasChildren(): bool
     {
diff --git a/models/User/Listing/AbstractListing/Dao.php b/models/User/Listing/AbstractListing/Dao.php
index 525d726367f..2a0c3985e1d 100644
--- a/models/User/Listing/AbstractListing/Dao.php
+++ b/models/User/Listing/AbstractListing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of users for the specified parameters, returns an array of User elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/User/Permission/Definition.php b/models/User/Permission/Definition.php
index 1cedfa13908..72c819e8b0c 100644
--- a/models/User/Permission/Definition.php
+++ b/models/User/Permission/Definition.php
@@ -67,9 +67,7 @@ public function setCategory(string $category): static
     }
 
     /**
-     * @param string $permission
      *
-     * @return Definition|null
      *
      * @throws \Exception
      */
@@ -91,9 +89,7 @@ public static function getByKey(string $permission): ?Definition
     }
 
     /**
-     * @param string $permission
      *
-     * @return self|static
      *
      * @throws \Exception
      */
diff --git a/models/User/Permission/Definition/Listing/Dao.php b/models/User/Permission/Definition/Listing/Dao.php
index 7e493f5c8d4..aafb18ec735 100644
--- a/models/User/Permission/Definition/Listing/Dao.php
+++ b/models/User/Permission/Definition/Listing/Dao.php
@@ -27,7 +27,6 @@ class Dao extends Model\Listing\Dao\AbstractDao
     /**
      * Loads a list of definitions for the specicified parameters, returns an array of User\Permission\Definition elements
      *
-     * @return array
      */
     public function load(): array
     {
diff --git a/models/User/Service.php b/models/User/Service.php
index 36593da0cf8..5a7bc24c981 100644
--- a/models/User/Service.php
+++ b/models/User/Service.php
@@ -28,9 +28,7 @@ class Service
      *
      * @static
      *
-     * @param string $type
      *
-     * @return string|null
      */
     public static function getClassNameForType(string $type): ?string
     {
diff --git a/models/User/UserRole.php b/models/User/UserRole.php
index 82394c38f61..371e0915a4d 100644
--- a/models/User/UserRole.php
+++ b/models/User/UserRole.php
@@ -88,9 +88,6 @@ abstract class UserRole extends AbstractUser
      */
     protected array $websiteTranslationLanguagesEdit = [];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function update(): void
     {
         $this->getDao()->update();
@@ -125,8 +122,6 @@ public function setAllAclToFalse(): static
     }
 
     /**
-     * @param string $permissionName
-     * @param bool|null $value
      *
      * @return $this
      */
diff --git a/models/User/UserRole/Dao.php b/models/User/UserRole/Dao.php
index c8f7f6211f5..d912dd6a5c3 100644
--- a/models/User/UserRole/Dao.php
+++ b/models/User/UserRole/Dao.php
@@ -26,7 +26,6 @@
 class Dao extends Model\User\AbstractUser\Dao
 {
     /**
-     * @param int $id
      *
      * @throws \Exception
      */
@@ -40,7 +39,6 @@ public function getById(int $id): void
     }
 
     /**
-     * @param string $name
      *
      * @throws \Exception
      */
diff --git a/models/User/UserRole/Folder.php b/models/User/UserRole/Folder.php
index af88eef2df3..5c6b11ebf4e 100644
--- a/models/User/UserRole/Folder.php
+++ b/models/User/UserRole/Folder.php
@@ -27,21 +27,18 @@ class Folder extends Model\User\AbstractUser
     /**
      * @internal
      *
-     * @var array|null
      */
     protected ?array $children = null;
 
     /**
      * @internal
      *
-     * @var bool|null
      */
     protected ?bool $hasChildren = null;
 
     /**
      * Returns true if the document has at least one child
      *
-     * @return bool
      */
     public function hasChildren(): bool
     {
diff --git a/models/User/Workspace/AbstractWorkspace.php b/models/User/Workspace/AbstractWorkspace.php
index d5337e8b360..ebe2a5f9c32 100644
--- a/models/User/Workspace/AbstractWorkspace.php
+++ b/models/User/Workspace/AbstractWorkspace.php
@@ -29,84 +29,72 @@ abstract class AbstractWorkspace extends Model\AbstractModel
     /**
      * @internal
      *
-     * @var int
      */
     protected int $userId;
 
     /**
      * @internal
      *
-     * @var int
      */
     protected int $cid;
 
     /**
      * @internal
      *
-     * @var string
      */
     protected string $cpath;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $list = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $view = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $publish = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $delete = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $rename = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $create = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $settings = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $versions = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $properties = false;
 
diff --git a/models/User/Workspace/DataObject.php b/models/User/Workspace/DataObject.php
index 663788b450c..a8f9c0c3308 100644
--- a/models/User/Workspace/DataObject.php
+++ b/models/User/Workspace/DataObject.php
@@ -21,35 +21,30 @@ class DataObject extends AbstractWorkspace
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $save = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $unpublish = false;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $lEdit = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $lView = null;
 
     /**
      * @internal
      *
-     * @var string|null
      */
     protected ?string $layouts = null;
 
diff --git a/models/User/Workspace/Document.php b/models/User/Workspace/Document.php
index 34f3859a769..6e05c097a0b 100644
--- a/models/User/Workspace/Document.php
+++ b/models/User/Workspace/Document.php
@@ -21,14 +21,12 @@ class Document extends AbstractWorkspace
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $save = false;
 
     /**
      * @internal
      *
-     * @var bool
      */
     protected bool $unpublish = false;
 
diff --git a/models/Version.php b/models/Version.php
index 684e272d03c..b822851f8f4 100644
--- a/models/Version.php
+++ b/models/Version.php
@@ -271,9 +271,7 @@ public function delete(): void
     }
 
     /**
-     * @param bool $renewReferences
      *
-     * @return mixed
      *
      * @internal
      */
diff --git a/models/Version/Adapter/DatabaseVersionStorageAdapter.php b/models/Version/Adapter/DatabaseVersionStorageAdapter.php
index 019ce039dcb..752678c9aeb 100644
--- a/models/Version/Adapter/DatabaseVersionStorageAdapter.php
+++ b/models/Version/Adapter/DatabaseVersionStorageAdapter.php
@@ -55,12 +55,7 @@ public function save(Version $version, string $metaData, mixed $binaryDataStream
     }
 
     /**
-     * @param int $id
-     * @param int $cId
-     * @param string $cType
-     * @param bool $binaryData
      *
-     * @return mixed
      *
      * @throws \Doctrine\DBAL\Exception
      */
diff --git a/models/Version/Adapter/ProxyVersionStorageAdapter.php b/models/Version/Adapter/ProxyVersionStorageAdapter.php
index 8218942547f..42cb8edf3a4 100644
--- a/models/Version/Adapter/ProxyVersionStorageAdapter.php
+++ b/models/Version/Adapter/ProxyVersionStorageAdapter.php
@@ -27,17 +27,11 @@ public function __construct(FileSystemVersionStorageAdapter $storageAdapter)
         $this->storageAdapter = $storageAdapter;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getStorageType(int $metaDataSize = null, int $binaryDataSize = null): string
     {
         return $this->storageAdapter->getStorageType($metaDataSize, $binaryDataSize);
     }
 
-    /**
-     * @inheritDoc
-     */
     public function save(Version $version, string $metaData, mixed $binaryDataStream): void
     {
         $this->storageAdapter->save($version, $metaData, $binaryDataStream);
diff --git a/models/Version/Adapter/VersionStorageAdapterInterface.php b/models/Version/Adapter/VersionStorageAdapterInterface.php
index 03cc2c0c8e8..2b8effa7496 100644
--- a/models/Version/Adapter/VersionStorageAdapterInterface.php
+++ b/models/Version/Adapter/VersionStorageAdapterInterface.php
@@ -20,21 +20,12 @@
 
 interface VersionStorageAdapterInterface
 {
-    /**
-     * @param int|null $metaDataSize
-     * @param int|null $binaryDataSize
-     *
-     * @return string
-     */
     public function getStorageType(int $metaDataSize = null,
         int $binaryDataSize = null): string;
 
     /**
-     * @param Version $version
-     * @param string $metaData
      * @param resource|null $binaryDataStream
      *
-     * @return void
      */
     public function save(Version $version, string $metaData, mixed $binaryDataStream): void;
 
diff --git a/models/Version/Dao.php b/models/Version/Dao.php
index 8af8775b444..2c9b8b972bd 100644
--- a/models/Version/Dao.php
+++ b/models/Version/Dao.php
@@ -28,7 +28,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int $id
      *
      * @throws NotFoundException
      */
@@ -49,7 +48,6 @@ public function getById(int $id): void
     /**
      * Save object to database
      *
-     * @return int
      *
      * @todo: $data could be undefined
      */
diff --git a/models/Version/SetDumpStateFilter.php b/models/Version/SetDumpStateFilter.php
index 3a84bf7d0a3..ec9a07d6385 100644
--- a/models/Version/SetDumpStateFilter.php
+++ b/models/Version/SetDumpStateFilter.php
@@ -31,9 +31,6 @@ public function __construct(bool $state)
         $this->state = $state;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function apply($object, $property, $objectCopier): void
     {
         if ($object instanceof ElementDumpStateInterface) {
diff --git a/models/WebsiteSetting.php b/models/WebsiteSetting.php
index 67853bff272..02b3049b823 100644
--- a/models/WebsiteSetting.php
+++ b/models/WebsiteSetting.php
@@ -49,13 +49,6 @@ final class WebsiteSetting extends AbstractModel
      */
     protected static array $nameIdMappingCache = [];
 
-    /**
-     * @param string $name
-     * @param int|null $siteId
-     * @param string|null $language
-     *
-     * @return string
-     */
     protected static function getCacheKey(string $name, int $siteId = null, string $language = null): string
     {
         return $name . '~~~' . $siteId . '~~~' . $language;
@@ -89,8 +82,6 @@ public static function getById(int $id): ?WebsiteSetting
      * @param string|null $language language, if property cannot be found the value of property without language is returned
      * @param string|null $fallbackLanguage fallback language
      *
-     * @return WebsiteSetting|null
-     *
      * @throws \Exception
      */
     public static function getByName(string $name, int $siteId = null, string $language = null, string $fallbackLanguage = null): ?WebsiteSetting
@@ -231,7 +222,6 @@ public function getSiteId(): ?int
     /**
      * enum('text','document','asset','object','bool')
      *
-     * @param string $type
      *
      * @return $this
      */
@@ -245,7 +235,6 @@ public function setType(string $type): static
     /**
      * enum('text','document','asset','object','bool')
      *
-     * @return string
      */
     public function getType(): string
     {
diff --git a/models/WebsiteSetting/Dao.php b/models/WebsiteSetting/Dao.php
index 505e3b6ff14..9bd46c9659d 100644
--- a/models/WebsiteSetting/Dao.php
+++ b/models/WebsiteSetting/Dao.php
@@ -26,7 +26,6 @@
 class Dao extends Model\Dao\AbstractDao
 {
     /**
-     * @param int|null $id
      *
      * @throws NotFoundException
      */
@@ -47,9 +46,6 @@ public function getById(int $id = null): void
     }
 
     /**
-     * @param string|null $name
-     * @param int|null $siteId
-     * @param string|null $language
      *
      * @throws NotFoundException
      */
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 9a752d304d0..230348dc70c 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -151,7 +151,7 @@ parameters:
 
 		-
 			message: "#^Method Pimcore\\\\Model\\\\DataObject\\\\Service\\:\\:getConfigForHelperDefinition\\(\\) has invalid return type Pimcore\\\\Bundle\\\\AdminBundle\\\\DataObject\\\\GridColumnConfig\\\\ConfigElementInterface\\.$#"
-			count: 2
+			count: 1
 			path: models/DataObject/Service.php
 
 		-
diff --git a/tests/Cache/Core/AbstractCoreHandlerTest.php b/tests/Cache/Core/AbstractCoreHandlerTest.php
index c46b31e7be6..048e5bd65e4 100644
--- a/tests/Cache/Core/AbstractCoreHandlerTest.php
+++ b/tests/Cache/Core/AbstractCoreHandlerTest.php
@@ -51,9 +51,6 @@ abstract class AbstractCoreHandlerTest extends Unit
      */
     protected static array $logHandlers = [];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         $this->cache = $this->createCachePool();
@@ -68,7 +65,6 @@ protected function setUp(): void
     /**
      * Set up a logger with a buffer and a test handler (can be printed to STDOUT on demand)
      *
-     * @param string $name
      */
     protected static function setupLogger(string $name): void
     {
@@ -105,7 +101,6 @@ protected static function handleLogOutput(): void
     /**
      * Initializes item pool
      *
-     * @return TagAwareAdapterInterface
      */
     abstract protected function createCachePool(): TagAwareAdapterInterface;
 
@@ -148,28 +143,16 @@ protected function createHandlerMock(): \PHPUnit_Framework_MockObject_MockObject
         return $handler;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function setUpBeforeClass(): void
     {
         static::setupLogger((new \ReflectionClass(__CLASS__))->getShortName());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function tearDownAfterClass(): void
     {
         static::handleLogOutput();
     }
 
-    /**
-     * @param string $property
-     * @param CoreCacheHandler|null $handler
-     *
-     * @return mixed
-     */
     protected function getHandlerPropertyValue(string $property, CoreCacheHandler $handler = null): mixed
     {
         if (null === $handler) {
@@ -192,8 +175,6 @@ protected function cacheHasItem(string $key): bool
     /**
      * Add sample entries to cache
      *
-     * @param bool $write
-     * @param bool $assertExisting
      */
     protected function buildSampleEntries(bool $write = true, bool $assertExisting = true): void
     {
@@ -222,7 +203,6 @@ public function testCacheIsEnabledByDefault(): void
      *
      * @dataProvider invalidKeys
      *
-     * @param string $key
      */
     public function testExceptionOnInvalidItemKeySave(string $key): void
     {
@@ -235,7 +215,6 @@ public function testExceptionOnInvalidItemKeySave(string $key): void
      *
      * @dataProvider invalidKeys
      *
-     * @param string $key
      */
     public function testExceptionOnInvalidItemKeyRemove(string $key): void
     {
@@ -572,8 +551,6 @@ protected function runClearedTagEntryAssertions(array $expectedRemoveEntries): v
     /**
      * @dataProvider tagEntriesProvider
      *
-     * @param string $tag
-     * @param array $expectedRemoveEntries
      */
     public function testClearTag(string $tag, array $expectedRemoveEntries): void
     {
@@ -588,8 +565,6 @@ public function testClearTag(string $tag, array $expectedRemoveEntries): void
      *
      * @skipped
      *
-     * @param array $tags
-     * @param array $expectedRemoveEntries
      */
     public function testClearTags(array $tags, array $expectedRemoveEntries): void
     {
@@ -725,7 +700,6 @@ public function testWriteLockIsRemovedOnShutdown(): void
     /**
      * Data provider for invalid keys.
      *
-     * @return array
      */
     public static function invalidKeys(): array
     {
diff --git a/tests/Cache/Core/DoctrineDbalCoreHandlerTest.php b/tests/Cache/Core/DoctrineDbalCoreHandlerTest.php
index df3afb1e10d..54c8c4e297f 100644
--- a/tests/Cache/Core/DoctrineDbalCoreHandlerTest.php
+++ b/tests/Cache/Core/DoctrineDbalCoreHandlerTest.php
@@ -28,7 +28,6 @@ class DoctrineDbalCoreHandlerTest extends AbstractCoreHandlerTest
     /**
      * Initializes item pool
      *
-     * @return TagAwareAdapter
      */
     protected function createCachePool(): TagAwareAdapter
     {
diff --git a/tests/Cache/Core/RedisCoreHandlerTest.php b/tests/Cache/Core/RedisCoreHandlerTest.php
index 7b3b8e221ea..82314a62660 100644
--- a/tests/Cache/Core/RedisCoreHandlerTest.php
+++ b/tests/Cache/Core/RedisCoreHandlerTest.php
@@ -27,7 +27,6 @@ class RedisCoreHandlerTest extends AbstractCoreHandlerTest
     /**
      * Initializes item pool
      *
-     * @return RedisTagAwareAdapter
      */
     protected function createCachePool(): RedisTagAwareAdapter
     {
diff --git a/tests/Model/Asset/AssetThumbnailCacheTest.php b/tests/Model/Asset/AssetThumbnailCacheTest.php
index 8307d4f8c29..cb6d77bee18 100644
--- a/tests/Model/Asset/AssetThumbnailCacheTest.php
+++ b/tests/Model/Asset/AssetThumbnailCacheTest.php
@@ -46,9 +46,6 @@ public function tearDown(): void
         TestHelper::clearThumbnailConfigurations();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function needsDb(): bool
     {
         return true;
diff --git a/tests/Model/DataType/BlockTest.php b/tests/Model/DataType/BlockTest.php
index cda1e3963a7..949dffc94cd 100644
--- a/tests/Model/DataType/BlockTest.php
+++ b/tests/Model/DataType/BlockTest.php
@@ -53,7 +53,6 @@ protected function setUpTestClasses(): void
     }
 
     /**
-     * @return unittestBlock
      *
      * @throws \Exception
      */
diff --git a/tests/Model/DataType/ClassificationStore/AbstractClassificationStoreTest.php b/tests/Model/DataType/ClassificationStore/AbstractClassificationStoreTest.php
index f0c9fedcdea..827af68d94d 100644
--- a/tests/Model/DataType/ClassificationStore/AbstractClassificationStoreTest.php
+++ b/tests/Model/DataType/ClassificationStore/AbstractClassificationStoreTest.php
@@ -56,9 +56,6 @@ protected function configureStoreWithQuantityValueField(Classificationstore\Stor
         $keygroupconfig->save();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUpTestClasses(): void
     {
         if (!ClassDefinition::getByName('csstore')) {
diff --git a/tests/Model/DataType/ClassificationStore/GeneralTest.php b/tests/Model/DataType/ClassificationStore/GeneralTest.php
index 2743e07b914..eda4075ffcf 100644
--- a/tests/Model/DataType/ClassificationStore/GeneralTest.php
+++ b/tests/Model/DataType/ClassificationStore/GeneralTest.php
@@ -154,7 +154,6 @@ public function testBooleanSelect(): void
     }
 
     /**
-     * @return \Pimcore\Model\DataObject\Csstore
      *
      * @throws \Exception
      */
diff --git a/tests/Model/DataType/LinkTest.php b/tests/Model/DataType/LinkTest.php
index 704bbb90524..5c1a0ab3a96 100644
--- a/tests/Model/DataType/LinkTest.php
+++ b/tests/Model/DataType/LinkTest.php
@@ -47,7 +47,6 @@ protected function setUpTestClasses(): void
     }
 
     /**
-     * @return unittestLink
      *
      * @throws \Exception
      */
diff --git a/tests/Model/DataType/NormalizerTest.php b/tests/Model/DataType/NormalizerTest.php
index d140dfae98c..6eef7525fc8 100644
--- a/tests/Model/DataType/NormalizerTest.php
+++ b/tests/Model/DataType/NormalizerTest.php
@@ -42,9 +42,6 @@ protected function setUp(): void
         }
     }
 
-    /**
-     * @inheritdoc
-     */
     protected function needsDb(): bool
     {
         return true;
diff --git a/tests/Model/Document/EditableTest.php b/tests/Model/Document/EditableTest.php
index df18ccfff94..8cff875ec54 100644
--- a/tests/Model/Document/EditableTest.php
+++ b/tests/Model/Document/EditableTest.php
@@ -170,9 +170,6 @@ protected function createTestPage(array|string $fields = [], array &$returnData
     /**
      * Calls fill* methods on the object as needed in test
      *
-     * @param Page $document
-     * @param array|string $fields
-     * @param array $returnData
      */
     protected function fillPage(Page $document, array|string $fields = [], array &$returnData = []): void
     {
diff --git a/tests/Model/Inheritance/ClassificationstoreTest.php b/tests/Model/Inheritance/ClassificationstoreTest.php
index e9457eb7a9c..b1d5e269d88 100644
--- a/tests/Model/Inheritance/ClassificationstoreTest.php
+++ b/tests/Model/Inheritance/ClassificationstoreTest.php
@@ -39,9 +39,6 @@ public function setUp(): void
         \Pimcore::setAdminMode();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUpTestClasses(): void
     {
         $class = ClassDefinition::getByName('inheritance');
diff --git a/tests/Model/LazyLoading/AbstractLazyLoadingTest.php b/tests/Model/LazyLoading/AbstractLazyLoadingTest.php
index ab6e7595fdd..a25bd042377 100644
--- a/tests/Model/LazyLoading/AbstractLazyLoadingTest.php
+++ b/tests/Model/LazyLoading/AbstractLazyLoadingTest.php
@@ -79,9 +79,7 @@ protected function createDataObject(): LazyLoading
     }
 
     /**
-     * @param AbstractObject $parent
      *
-     * @return LazyLoading
      *
      * @throws \Exception
      */
@@ -97,7 +95,6 @@ protected function createChildDataObject(AbstractObject $parent): LazyLoading
     }
 
     /**
-     * @return RelationTest\Listing
      *
      * @throws \Exception
      */
diff --git a/tests/Service/Element/VersionTest.php b/tests/Service/Element/VersionTest.php
index 02513eaf64a..d3ac09e8ab3 100644
--- a/tests/Service/Element/VersionTest.php
+++ b/tests/Service/Element/VersionTest.php
@@ -279,9 +279,6 @@ public function testStorageAdapterDelegateWithBinaryFile(): void
         $this->assertNotEmpty($id, 'id must not be empty');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         parent::setUp();
@@ -299,9 +296,6 @@ public function tearDown(): void
         $db->executeStatement('DROP TABLE versionsData');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function needsDb(): bool
     {
         return true;
diff --git a/tests/Support/Test/AbstractPropertiesTest.php b/tests/Support/Test/AbstractPropertiesTest.php
index 81b97942387..9dae6617170 100644
--- a/tests/Support/Test/AbstractPropertiesTest.php
+++ b/tests/Support/Test/AbstractPropertiesTest.php
@@ -39,9 +39,6 @@ abstract public function createElement(): ElementInterface;
 
     abstract public function reloadElement(): ElementInterface;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function needsDb(): bool
     {
         return true;
diff --git a/tests/Support/Test/DataType/AbstractDataTypeTestCase.php b/tests/Support/Test/DataType/AbstractDataTypeTestCase.php
index ad5433bdf67..5197cf7f67d 100644
--- a/tests/Support/Test/DataType/AbstractDataTypeTestCase.php
+++ b/tests/Support/Test/DataType/AbstractDataTypeTestCase.php
@@ -91,9 +91,6 @@ protected function fillObject(Concrete $object, array|string $fields = [], ?arra
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function needsDb(): bool
     {
         return true;
diff --git a/tests/Support/Test/ModelTestCase.php b/tests/Support/Test/ModelTestCase.php
index 270c0dcff40..5ddcd46a7a3 100644
--- a/tests/Support/Test/ModelTestCase.php
+++ b/tests/Support/Test/ModelTestCase.php
@@ -29,9 +29,6 @@ abstract class ModelTestCase extends TestCase
 {
     private ?SessionInterface $session = null;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         parent::setUp();
@@ -48,9 +45,6 @@ protected function setUpTestClasses(): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function needsDb(): bool
     {
         return true;
diff --git a/tests/Support/Test/TestCase.php b/tests/Support/Test/TestCase.php
index 8f8e0e9b6d9..4c4eee9a99a 100644
--- a/tests/Support/Test/TestCase.php
+++ b/tests/Support/Test/TestCase.php
@@ -27,16 +27,12 @@ abstract class TestCase extends Unit
     /**
      * Determine if the test needs a DB connection (will be skipped if no DB is present)
      *
-     * @return bool
      */
     protected function needsDb(): bool
     {
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/Unit/Document/Glossary/GlossaryTest.php b/tests/Unit/Document/Glossary/GlossaryTest.php
index 334459acd12..dfd7bc81db2 100644
--- a/tests/Unit/Document/Glossary/GlossaryTest.php
+++ b/tests/Unit/Document/Glossary/GlossaryTest.php
@@ -26,9 +26,6 @@ class GlossaryTest extends TestCase
 {
     protected Processor $processor;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/Unit/HttpKernel/BundleCollection/BundleCollectionTest.php b/tests/Unit/HttpKernel/BundleCollection/BundleCollectionTest.php
index 5eb32c7a020..4b7f8b23b1f 100644
--- a/tests/Unit/HttpKernel/BundleCollection/BundleCollectionTest.php
+++ b/tests/Unit/HttpKernel/BundleCollection/BundleCollectionTest.php
@@ -33,9 +33,6 @@ class BundleCollectionTest extends TestCase
      */
     private array $bundles;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/Unit/Notification/Service/NotificationServiceTest.php b/tests/Unit/Notification/Service/NotificationServiceTest.php
index 083349788f5..7d59a7623bb 100644
--- a/tests/Unit/Notification/Service/NotificationServiceTest.php
+++ b/tests/Unit/Notification/Service/NotificationServiceTest.php
@@ -26,9 +26,6 @@ class NotificationServiceTest extends TestCase
 {
     protected NotificationService $notificationService;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/Unit/Tool/PlaceholderProcessorTest.php b/tests/Unit/Tool/PlaceholderProcessorTest.php
index b5d5036895b..f23e825d4bf 100644
--- a/tests/Unit/Tool/PlaceholderProcessorTest.php
+++ b/tests/Unit/Tool/PlaceholderProcessorTest.php
@@ -24,9 +24,6 @@ class PlaceholderProcessorTest extends TestCase
 {
     private PlaceholderProcessor $processor;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         $this->processor = new PlaceholderProcessor();
diff --git a/tests/Unit/Translation/TranslatorTest.php b/tests/Unit/Translation/TranslatorTest.php
index 5da43da5b12..d466344e318 100644
--- a/tests/Unit/Translation/TranslatorTest.php
+++ b/tests/Unit/Translation/TranslatorTest.php
@@ -29,7 +29,6 @@ class TranslatorTest extends TestCase
     /**
      * ['locale' => 'fallback']
      *
-     * @var array
      */
     protected array $locales = [
         'en' => '',
@@ -63,9 +62,6 @@ class TranslatorTest extends TestCase
         ],
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         parent::setUp();