diff --git a/typo3/sysext/core/Classes/Page/JavaScriptModuleInstruction.php b/typo3/sysext/core/Classes/Page/JavaScriptModuleInstruction.php
index cde9a4ec72327e7a6aa0acece55a8aef4a20cf60..f4a4a96567d6cc76313a7531c901b0e78883526a 100644
--- a/typo3/sysext/core/Classes/Page/JavaScriptModuleInstruction.php
+++ b/typo3/sysext/core/Classes/Page/JavaScriptModuleInstruction.php
@@ -42,7 +42,7 @@ class JavaScriptModuleInstruction implements \JsonSerializable
 
     /**
      * @param string $name RequireJS module name
-     * @param ?string $exportName (optional) name used internally to export the module
+     * @param string|null $exportName (optional) name used internally to export the module
      * @return static
      */
     public static function forRequireJS(string $name, string $exportName = null): self
diff --git a/typo3/sysext/core/Tests/Unit/Package/MetaDataTest.php b/typo3/sysext/core/Tests/Unit/Package/MetaDataTest.php
index 67a3f119b36714b6f594fefe29eef6b11b09db2b..ea632f9b513025cded1dae1125728298fcf4a2d7 100644
--- a/typo3/sysext/core/Tests/Unit/Package/MetaDataTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/MetaDataTest.php
@@ -50,7 +50,7 @@ class MetaDataTest extends UnitTestCase
     }
 
     /**
-     * @param ?string $type
+     * @param string|null $type
      * @param bool $isExtension
      * @param bool $isFramework
      * @test
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
index abc7d7ccdda9632932a1162c857b3d424bdaeabd..b8415822cff560cc8af05a39f3bf7891f4023b8e 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
@@ -56,7 +56,7 @@ class LazyLoadingProxy implements \Iterator, LoadingStrategyInterface
      * @param DomainObjectInterface $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
+     * @param DataMapper|null $dataMapper
      */
     public function __construct($parentObject, $propertyName, $fieldValue, ?DataMapper $dataMapper = null)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
index 08ede3a385529a8c1e6ae94612e70ee59aa03677..716a9f4946db1bc1983624609d37c8f3bc929bb2 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
@@ -84,7 +84,7 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
      * @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
+     * @param DataMapper|null $dataMapper
      */
     public function __construct($parentObject, $propertyName, $fieldValue, ?DataMapper $dataMapper = null)
     {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
index 46d3ac0a83a93a5e09c22ff04fd9119f0f539579..e20b29529ca0972c80f3cb7cd556ae5641b99479 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
@@ -137,7 +137,7 @@ class Query implements QueryInterface
     }
 
     /**
-     * @param ?QueryInterface $parentQuery
+     * @param QueryInterface|null $parentQuery
      * @internal
      */
     public function setParentQuery(?QueryInterface $parentQuery): void
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Blog.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Blog.php
index 5b4d27a1c1458b98a766aaf14a0145dbff95c0a7..206b7e31dad3eec7bbed0e68f795bc7c593afa37 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Blog.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Model/Blog.php
@@ -251,7 +251,7 @@ class Blog extends AbstractEntity
     }
 
     /**
-     * @param ?string $subtitle
+     * @param string|null $subtitle
      */
     public function setSubtitle($subtitle): void
     {