diff --git a/typo3/sysext/dashboard/Classes/Controller/WidgetAjaxController.php b/typo3/sysext/dashboard/Classes/Controller/WidgetAjaxController.php
index a73afd90e44d4e05245066b7357909ee1a94bddc..890f503b858617c6227d7693570d5a7f8a7b8cee 100644
--- a/typo3/sysext/dashboard/Classes/Controller/WidgetAjaxController.php
+++ b/typo3/sysext/dashboard/Classes/Controller/WidgetAjaxController.php
@@ -32,7 +32,7 @@ use TYPO3\CMS\Dashboard\Widgets\WidgetInterface;
 class WidgetAjaxController extends AbstractController
 {
     /**
-     * @var Dashboard
+     * @var Dashboard|null
      */
     protected $currentDashboard;
 
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
index cb34d54e1be3686a2dc99c797e618a6857737ed5..309ea04577abf3691e1a950d29acafd7bdaa8c01 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
@@ -34,7 +34,7 @@ class FrontendUser extends AbstractEntity
     protected $password = '';
 
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
+     * @var ObjectStorage<FrontendUserGroup>
      */
     protected $usergroup;
 
@@ -109,7 +109,7 @@ class FrontendUser extends AbstractEntity
     protected $company = '';
 
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
+     * @var ObjectStorage<FileReference>
      */
     protected $image;
 
@@ -185,7 +185,7 @@ class FrontendUser extends AbstractEntity
      * Sets the usergroups. Keep in mind that the property is called "usergroup"
      * although it can hold several usergroups.
      *
-     * @param ObjectStorage $usergroup
+     * @param ObjectStorage<FrontendUserGroup> $usergroup
      */
     public function setUsergroup(ObjectStorage $usergroup)
     {
@@ -216,7 +216,7 @@ class FrontendUser extends AbstractEntity
      * Returns the usergroups. Keep in mind that the property is called "usergroup"
      * although it can hold several usergroups.
      *
-     * @return ObjectStorage An object storage containing the usergroup
+     * @return ObjectStorage<FrontendUserGroup> An object storage containing the usergroup
      */
     public function getUsergroup()
     {
@@ -506,7 +506,7 @@ class FrontendUser extends AbstractEntity
     /**
      * Sets the image value
      *
-     * @param ObjectStorage $image
+     * @param ObjectStorage<FileReference> $image
      */
     public function setImage(ObjectStorage $image)
     {
@@ -516,7 +516,7 @@ class FrontendUser extends AbstractEntity
     /**
      * Gets the image value
      *
-     * @return ObjectStorage
+     * @return ObjectStorage<FileReference>
      */
     public function getImage()
     {
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php
index 900fe6ca57c3f60756cb1475630fb6e85159e0ae..c32708a467a20f6029d64e22e44b3c29daf954c9 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUserGroup.php
@@ -34,7 +34,7 @@ class FrontendUserGroup extends AbstractEntity
     protected $description = '';
 
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup>
+     * @var ObjectStorage<FrontendUserGroup>
      */
     protected $subgroup;
 
@@ -93,7 +93,7 @@ class FrontendUserGroup extends AbstractEntity
      * Sets the subgroups. Keep in mind that the property is called "subgroup"
      * although it can hold several subgroups.
      *
-     * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $subgroup An object storage containing the subgroups to add
+     * @param ObjectStorage<FrontendUserGroup> $subgroup An object storage containing the subgroups to add
      */
     public function setSubgroup(ObjectStorage $subgroup)
     {
@@ -103,9 +103,9 @@ class FrontendUserGroup extends AbstractEntity
     /**
      * Adds a subgroup to the frontend user
      *
-     * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup
+     * @param FrontendUserGroup $subgroup
      */
-    public function addSubgroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup)
+    public function addSubgroup(FrontendUserGroup $subgroup)
     {
         $this->subgroup->attach($subgroup);
     }
@@ -113,9 +113,9 @@ class FrontendUserGroup extends AbstractEntity
     /**
      * Removes a subgroup from the frontend user group
      *
-     * @param \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup
+     * @param FrontendUserGroup $subgroup
      */
-    public function removeSubgroup(\TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup $subgroup)
+    public function removeSubgroup(FrontendUserGroup $subgroup)
     {
         $this->subgroup->detach($subgroup);
     }
@@ -124,7 +124,7 @@ class FrontendUserGroup extends AbstractEntity
      * Returns the subgroups. Keep in mind that the property is called "subgroup"
      * although it can hold several subgroups.
      *
-     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage An object storage containing the subgroups
+     * @return ObjectStorage<FrontendUserGroup> An object storage containing the subgroups
      */
     public function getSubgroup()
     {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
index 08494d87d873e7f9bbc5d9fbc82a7a5827b47922..a0abdecfc79d0ea1c2ec863876156d1b1186a1e8 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
@@ -128,7 +128,7 @@ abstract class ActionController implements ControllerInterface
     /**
      * The current request.
      *
-     * @var \TYPO3\CMS\Extbase\Mvc\Request
+     * @var RequestInterface
      */
     protected $request;
 
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
index 942a60f1e37dc3e0acf6f02a0381bfadae6bef42..367f299861495778c41555b654a2db02e232521f 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
@@ -84,7 +84,7 @@ class UriBuilder
     protected $createAbsoluteUri = false;
 
     /**
-     * @var string
+     * @var string|null
      */
     protected $absoluteUriScheme;
 
@@ -114,7 +114,7 @@ class UriBuilder
     protected $targetPageType = 0;
 
     /**
-     * @var string
+     * @var string|null
      */
     protected $language;
 
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
index e24d51165a51b0b273e4f45ebc4b77dc35a711a2..f03d5eed4e25a9ec7cb39e9fecffadd0777ba575 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
@@ -15,7 +15,6 @@
 
 namespace TYPO3\CMS\Extbase\Persistence\Generic;
 
-use TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface;
 use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper;
@@ -25,6 +24,9 @@ use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
  * A proxy that can replace any object and replaces itself in it's parent on
  * first access (call, get, set, isset, unset).
  * @internal only to be used within Extbase, not part of TYPO3 Core API.
+ *
+ * @template TEntity
+ * @extends ObjectStorage<TEntity>
  */
 class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterface
 {
@@ -95,7 +97,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
     /**
      * Constructs this proxy instance.
      *
-     * @param DomainObjectInterface $parentObject The object instance this proxy is part of
+     * @param TEntity $parentObject The object instance this proxy is part of
      * @param string $propertyName The name of the proxied property in it's parent
      * @param mixed $fieldValue The raw field value.
      * @param ?DataMapper $dataMapper
@@ -158,7 +160,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
     }
 
     /**
-     * @param DomainObjectInterface $object The object to add.
+     * @param TEntity $object The object to add.
      * @param mixed $data The data to associate with the object.
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::attach
@@ -170,7 +172,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
     }
 
     /**
-     * @param DomainObjectInterface $object The object to look for.
+     * @param TEntity $object The object to look for.
      * @return bool
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::contains
@@ -204,7 +206,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
     }
 
     /**
-     * @return DomainObjectInterface The object at the current iterator position.
+     * @return TEntity The object at the current iterator position.
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::current
      */
@@ -215,7 +217,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
     }
 
     /**
-     * @param DomainObjectInterface $object The object to remove.
+     * @param TEntity $object The object to remove.
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::detach
      */
@@ -246,7 +248,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
     }
 
     /**
-     * @param DomainObjectInterface $value The object to look for, or the key in the storage.
+     * @param TEntity $value The object to look for, or the key in the storage.
      * @return bool
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetExists
@@ -258,7 +260,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
     }
 
     /**
-     * @param DomainObjectInterface $value The object to look for, or its key in the storage.
+     * @param TEntity $value The object to look for, or its key in the storage.
      * @return mixed
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetGet
@@ -270,7 +272,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
     }
 
     /**
-     * @param DomainObjectInterface $object The object to add.
+     * @param TEntity $object The object to add.
      * @param mixed $info The data to associate with the object.
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetSet
@@ -282,7 +284,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
     }
 
     /**
-     * @param DomainObjectInterface $value The object to remove, or its key in the storage.
+     * @param TEntity $value The object to remove, or its key in the storage.
      *
      * @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetUnset
      */
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Join.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Join.php
index e5f65b0bc41c5ec688fe123a6743292b99803ce6..658821023bb19cfa1848df2719424a20d5038569 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Join.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Join.php
@@ -32,7 +32,7 @@ class Join implements JoinInterface
     protected $right;
 
     /**
-     * @var int
+     * @var string
      */
     protected $joinType;
 
diff --git a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
index 747df6783a4b0a8d35f3896f390ce511173d6ff1..2dae63923c50e4ee0354aa30c0010cd86ac1d072 100644
--- a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
@@ -23,6 +23,10 @@ use TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface;
  * SplObjectStorage introduced in PHP 5.3.
  *
  * Opposed to the SplObjectStorage the ObjectStorage does not implement the Serializable interface.
+ *
+ * @template TEntity
+ * @implements \ArrayAccess<string, TEntity>
+ * @implements \Iterator<string, TEntity>
  */
 class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonitoringInterface
 {
@@ -116,7 +120,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
     /**
      * Returns the current storage entry.
      *
-     * @return DomainObjectInterface The object at the current iterator position.
+     * @return TEntity The object at the current iterator position.
      */
     public function current()
     {
@@ -145,7 +149,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
     /**
      * Associates data to an object in the storage. offsetSet() is an alias of attach().
      *
-     * @param DomainObjectInterface $object The object to add.
+     * @param TEntity $object The object to add.
      * @param mixed $information The data to associate with the object.
      */
     public function offsetSet($object, $information)
@@ -160,7 +164,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
     /**
      * Checks whether an object exists in the storage.
      *
-     * @param DomainObjectInterface|int $value The object to look for, or the key in the storage.
+     * @param TEntity|int $value The object to look for, or the key in the storage.
      * @return bool
      */
     public function offsetExists($value)
@@ -172,7 +176,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
     /**
      * Removes an object from the storage. offsetUnset() is an alias of detach().
      *
-     * @param DomainObjectInterface|int $value The object to remove, or its key in the storage.
+     * @param TEntity|int $value The object to remove, or its key in the storage.
      */
     public function offsetUnset($value)
     {
@@ -198,7 +202,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      * Returns the data associated with an object, or the object itself if an
      * integer is passed.
      *
-     * @param DomainObjectInterface|int $value The object to look for, or its key in the storage.
+     * @param TEntity|int $value The object to look for, or its key in the storage.
      * @return mixed The data associated with an object in the storage, or the object itself if an integer is passed.
      */
     public function offsetGet($value)
@@ -214,7 +218,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
     /**
      * Checks if the storage contains a specific object.
      *
-     * @param DomainObjectInterface $object The object to look for.
+     * @param TEntity $object The object to look for.
      * @return bool
      */
     public function contains($object)
@@ -225,7 +229,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
     /**
      * Adds an object in the storage, and optionally associate it to some data.
      *
-     * @param DomainObjectInterface $object The object to add.
+     * @param TEntity $object The object to add.
      * @param mixed $information The data to associate with the object.
      */
     public function attach($object, $information = null)
@@ -236,7 +240,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
     /**
      * Removes an object from the storage.
      *
-     * @param DomainObjectInterface $object The object to remove.
+     * @param TEntity $object The object to remove.
      */
     public function detach($object)
     {
@@ -269,7 +273,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
     /**
      * Adds all objects-data pairs from a different storage in the current storage.
      *
-     * @param ObjectStorage $objectStorage
+     * @param ObjectStorage<TEntity> $objectStorage
      */
     public function addAll(ObjectStorage $objectStorage)
     {
@@ -281,7 +285,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
     /**
      * Removes objects contained in another storage from the current storage.
      *
-     * @param ObjectStorage $objectStorage The storage containing the elements to remove.
+     * @param ObjectStorage<TEntity> $objectStorage The storage containing the elements to remove.
      */
     public function removeAll(ObjectStorage $objectStorage)
     {
diff --git a/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php b/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php
index ec7b27ccebc68f5d99744acd479414cfb8c8c258..3d3a1e7ac7e85a62772cccc201d7f4747365c293 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php
@@ -20,6 +20,7 @@ namespace TYPO3\CMS\Extbase\Reflection;
 use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\PropertyAccess\PropertyPath;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
@@ -38,7 +39,7 @@ use TYPO3\CMS\Extbase\Reflection\Exception\PropertyNotAccessibleException;
 class ObjectAccess
 {
     /**
-     * @var PropertyAccessor
+     * @var PropertyAccessorInterface
      */
     private static $propertyAccessor;
 
diff --git a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
index a15ba14dba61eb6ab45971da7d2c0d183cb2dda8..da235c1cff32cb4c38f06228ff1c58abc71a787f 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
@@ -35,7 +35,7 @@ class ReflectionService implements SingletonInterface
     private static $cacheEntryIdentifier;
 
     /**
-     * @var FrontendInterface
+     * @var FrontendInterface|null
      */
     protected $dataCache;
 
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ExtensionComposerStatusController.php b/typo3/sysext/extensionmanager/Classes/Controller/ExtensionComposerStatusController.php
index 6bf0e313e9cff9ea3bbfbf2c08eb6f9c43f7eb43..2f69f68e9b5468bea3f6b5c507deda604e91742e 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ExtensionComposerStatusController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ExtensionComposerStatusController.php
@@ -43,7 +43,7 @@ class ExtensionComposerStatusController extends AbstractModuleController
     protected $composerDeficitDetector;
 
     /**
-     * @var ComposerDeficitDetector
+     * @var ComposerManifestProposalGenerator
      */
     protected $composerManifestProposalGenerator;
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
index 4a9ac9536e0da42d349fc20dcf15c6964fdc7adf..aaa39c090db25d9e268b2352079498121081b09d 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
@@ -147,7 +147,7 @@ class Extension extends AbstractEntity
     protected $serializedDependencies = '';
 
     /**
-     * @var \SplObjectStorage<\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency>
+     * @var \SplObjectStorage<Dependency>
      */
     protected $dependencies;
 
@@ -509,7 +509,7 @@ class Extension extends AbstractEntity
     }
 
     /**
-     * @param \SplObjectStorage $dependencies
+     * @param \SplObjectStorage<Dependency> $dependencies
      */
     public function setDependencies($dependencies)
     {
@@ -517,7 +517,7 @@ class Extension extends AbstractEntity
     }
 
     /**
-     * @return \SplObjectStorage
+     * @return \SplObjectStorage<Dependency>
      */
     public function getDependencies()
     {
@@ -657,7 +657,7 @@ class Extension extends AbstractEntity
      * Converts string dependencies to an object storage of dependencies
      *
      * @param string $dependencies
-     * @return \SplObjectStorage
+     * @return \SplObjectStorage<Dependency>
      */
     protected function convertDependenciesToObjects(string $dependencies): \SplObjectStorage
     {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/BulkExtensionRepositoryWriter.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/BulkExtensionRepositoryWriter.php
index 4c24517f4ebbf5bc61f4127f63d7e868b3a8ea2d..23f6139762a339e9d79e3a9095b3373e877c89ac 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/BulkExtensionRepositoryWriter.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/BulkExtensionRepositoryWriter.php
@@ -146,7 +146,7 @@ class BulkExtensionRepositoryWriter implements \SplObserver
         $countOfBindParamsPerRow = count(self::$fieldNames);
         // flush at least chunks of 50 elements - in case the currently used
         // database platform does not support that, the threshold is lowered
-        $this->maxRowsPerChunk = min(
+        $this->maxRowsPerChunk = (int)min(
             $this->maxRowsPerChunk,
             floor($maxBindParameters / $countOfBindParamsPerRow)
         );
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php
index 8b570ac78cc3fee276cda7eab4d96d4156dd40d7..18c8aa4c7bf41f19304e1ce7d719e88841b427a6 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php
@@ -54,7 +54,7 @@ class ListUtility implements SingletonInterface
     protected $packageManager;
 
     /**
-     * @var array
+     * @var array|null
      */
     protected $availableExtensions;
 
diff --git a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php
index 36a6699d638a12103263ec3c3b0c5a1a6230b454..515d21cfd21039e7e09d8f0365626298d91894ec 100644
--- a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php
+++ b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php
@@ -31,7 +31,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 class FileProvider extends AbstractProvider
 {
     /**
-     * @var File|Folder
+     * @var File|Folder|null
      */
     protected $record;
 
diff --git a/typo3/sysext/filelist/Classes/Controller/File/EditFileController.php b/typo3/sysext/filelist/Classes/Controller/File/EditFileController.php
index 941961fc6234fc3035948bd769eaa25f5d199a76..23cf7f1605a7c71edafcdce2b186bbdc856b83ce 100644
--- a/typo3/sysext/filelist/Classes/Controller/File/EditFileController.php
+++ b/typo3/sysext/filelist/Classes/Controller/File/EditFileController.php
@@ -35,6 +35,7 @@ use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Resource\Exception\InsufficientFileAccessPermissionsException;
 use TYPO3\CMS\Core\Resource\File;
+use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
@@ -76,7 +77,7 @@ class EditFileController
     /**
      * the file that is being edited on
      *
-     * @var File
+     * @var File|Folder|null
      */
     protected $fileObject;
 
diff --git a/typo3/sysext/filelist/Classes/Controller/File/FileUploadController.php b/typo3/sysext/filelist/Classes/Controller/File/FileUploadController.php
index 634334a0c2e45d24e446b60ab397c6eed32c261d..2c8160dd38dfd9377c5c6120a591fe40746ccac8 100644
--- a/typo3/sysext/filelist/Classes/Controller/File/FileUploadController.php
+++ b/typo3/sysext/filelist/Classes/Controller/File/FileUploadController.php
@@ -28,6 +28,8 @@ use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Resource\Exception\InsufficientFolderAccessPermissionsException;
+use TYPO3\CMS\Core\Resource\File;
+use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -61,7 +63,7 @@ class FileUploadController
     /**
      * The folder object which is the target directory for the upload
      *
-     * @var \TYPO3\CMS\Core\Resource\Folder $folderObject
+     * @var File|Folder|null
      */
     protected $folderObject;
 
diff --git a/typo3/sysext/filelist/Classes/Controller/File/RenameFileController.php b/typo3/sysext/filelist/Classes/Controller/File/RenameFileController.php
index 324c238e59d4bebfa0d2e5467a5719d8ec03984a..5cf847ce60149fa591f9f100134b9f05616329d5 100644
--- a/typo3/sysext/filelist/Classes/Controller/File/RenameFileController.php
+++ b/typo3/sysext/filelist/Classes/Controller/File/RenameFileController.php
@@ -53,7 +53,7 @@ class RenameFileController
     /**
      * The file or folder object that should be renamed
      *
-     * @var File|Folder $fileOrFolderObject
+     * @var File|Folder|null
      */
     protected $fileOrFolderObject;
 
diff --git a/typo3/sysext/filelist/Classes/Controller/File/ReplaceFileController.php b/typo3/sysext/filelist/Classes/Controller/File/ReplaceFileController.php
index 2d837f76571820a8ed081183e6130331f479ef24..093e6d91909dca290aecc231fbf9d72f02467eec 100644
--- a/typo3/sysext/filelist/Classes/Controller/File/ReplaceFileController.php
+++ b/typo3/sysext/filelist/Classes/Controller/File/ReplaceFileController.php
@@ -50,7 +50,7 @@ class ReplaceFileController
     /**
      * The file or folder object that should be renamed
      *
-     * @var ResourceInterface $fileOrFolderObject
+     * @var ResourceInterface|null
      */
     protected $fileOrFolderObject;
 
diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php
index 7c965b48afa4442b2e4a52b4941ea2deff428f14..6be72cba476fb9bd9b4bae021136c010bb9ca499 100644
--- a/typo3/sysext/filelist/Classes/Controller/FileListController.php
+++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php
@@ -80,7 +80,7 @@ class FileListController extends ActionController implements LoggerAwareInterfac
     protected $id;
 
     /**
-     * @var Folder
+     * @var Folder|null
      */
     protected $folderObject;
 
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index 4ea3ae756bc602b4c9c0e68f36b3bf7c5da5a7fe..22284838e36727d925555d9f34e228cfcadb6400 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -209,7 +209,7 @@ class FileList
      *
      * @param Folder $folderObject The folder to work on
      * @param int $pointer Pointer
-     * @param bool $sort Sorting column
+     * @param string $sort Sorting column
      * @param bool $sortRev Sorting direction
      * @param bool $clipBoard
      * @param bool $bigControlPanel Show clipboard flag