diff --git a/typo3/sysext/backend/Classes/Security/EmailLoginNotification.php b/typo3/sysext/backend/Classes/Security/EmailLoginNotification.php
index 56cbf2a4628d03af20c6a3ca3653768695dff31f..f476c9156ff8f310a7167a31c433cd6ea4e6299a 100644
--- a/typo3/sysext/backend/Classes/Security/EmailLoginNotification.php
+++ b/typo3/sysext/backend/Classes/Security/EmailLoginNotification.php
@@ -103,7 +103,7 @@ class EmailLoginNotification
     {
         return sprintf(
             'User "%s" logged in from %s at "%s" (%s)',
-            $user['username'],
+            $user['username'] ?? 'unknown',
             $ipAddress,
             $siteName,
             $httpHost
diff --git a/typo3/sysext/backend/Tests/Unit/Http/RouteDispatcherTest.php b/typo3/sysext/backend/Tests/Unit/Http/RouteDispatcherTest.php
index d2b9a59db90382785fe11a1f88f12f6cc43d3fcd..90b84eb99ec7acbabd945d35c7b1264346148c08 100644
--- a/typo3/sysext/backend/Tests/Unit/Http/RouteDispatcherTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Http/RouteDispatcherTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Http;
 
 use Prophecy\Argument;
 use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Http\RouteDispatcher;
 use TYPO3\CMS\Backend\Routing\Route;
@@ -52,7 +51,6 @@ class RouteDispatcherTest extends UnitTestCase
         FormProtectionFactory::set('default', $formProtectionProphecy->reveal());
 
         $requestProphecy = $this->prophesize(ServerRequestInterface::class);
-        $responseProphecy = $this->prophesize(ResponseInterface::class);
         $routerProphecy = $this->prophesize(Router::class);
         GeneralUtility::setSingletonInstance(Router::class, $routerProphecy->reveal());
         $routeProphecy = $this->prophesize(Route::class);
@@ -72,7 +70,7 @@ class RouteDispatcherTest extends UnitTestCase
         $this->expectExceptionCode(1425381442);
 
         $subject = new RouteDispatcher($containerProphecy->reveal());
-        $subject->dispatch($requestProphecy->reveal(), $responseProphecy->reveal());
+        $subject->dispatch($requestProphecy->reveal());
     }
 
     /**
@@ -85,7 +83,6 @@ class RouteDispatcherTest extends UnitTestCase
         FormProtectionFactory::set('default', $formProtectionProphecy->reveal());
 
         $requestProphecy = $this->prophesize(ServerRequestInterface::class);
-        $responseProphecy = $this->prophesize(ResponseInterface::class);
         $routerProphecy = $this->prophesize(Router::class);
         GeneralUtility::setSingletonInstance(Router::class, $routerProphecy->reveal());
         $routeProphecy = $this->prophesize(Route::class);
@@ -98,7 +95,7 @@ class RouteDispatcherTest extends UnitTestCase
         $containerProphecy->has(Argument::any())->willReturn(false);
 
         $target = [
-            RouteDispatcherClassFixture::class,
+            new RouteDispatcherClassFixture(),
             'mainAction'
         ];
         $routeProphecy->getOption('target')->willReturn($target);
@@ -108,7 +105,7 @@ class RouteDispatcherTest extends UnitTestCase
         $this->expectExceptionCode(1520756142);
 
         $subject = new RouteDispatcher($containerProphecy->reveal());
-        $subject->dispatch($requestProphecy->reveal(), $responseProphecy->reveal());
+        $subject->dispatch($requestProphecy->reveal());
     }
 
     /**
@@ -121,7 +118,6 @@ class RouteDispatcherTest extends UnitTestCase
         FormProtectionFactory::set('default', $formProtectionProphecy->reveal());
 
         $requestProphecy = $this->prophesize(ServerRequestInterface::class);
-        $responseProphecy = $this->prophesize(ResponseInterface::class);
         $routerProphecy = $this->prophesize(Router::class);
         GeneralUtility::setSingletonInstance(Router::class, $routerProphecy->reveal());
         $routeProphecy = $this->prophesize(Route::class);
@@ -143,7 +139,7 @@ class RouteDispatcherTest extends UnitTestCase
         $this->expectExceptionCode(1520756466);
 
         $subject = new RouteDispatcher($containerProphecy->reveal());
-        $subject->dispatch($requestProphecy->reveal(), $responseProphecy->reveal());
+        $subject->dispatch($requestProphecy->reveal());
     }
 
     /**
@@ -156,7 +152,6 @@ class RouteDispatcherTest extends UnitTestCase
         FormProtectionFactory::set('default', $formProtectionProphecy->reveal());
 
         $requestProphecy = $this->prophesize(ServerRequestInterface::class);
-        $responseProphecy = $this->prophesize(ResponseInterface::class);
         $routerProphecy = $this->prophesize(Router::class);
         GeneralUtility::setSingletonInstance(Router::class, $routerProphecy->reveal());
         $routeProphecy = $this->prophesize(Route::class);
@@ -176,7 +171,7 @@ class RouteDispatcherTest extends UnitTestCase
         $this->expectExceptionCode(1520756623);
 
         $subject = new RouteDispatcher($containerProphecy->reveal());
-        $subject->dispatch($requestProphecy->reveal(), $responseProphecy->reveal());
+        $subject->dispatch($requestProphecy->reveal());
     }
 
     /**
@@ -189,7 +184,6 @@ class RouteDispatcherTest extends UnitTestCase
         FormProtectionFactory::set('default', $formProtectionProphecy->reveal());
 
         $requestProphecy = $this->prophesize(ServerRequestInterface::class);
-        $responseProphecy = $this->prophesize(ResponseInterface::class);
         $routerProphecy = $this->prophesize(Router::class);
         GeneralUtility::setSingletonInstance(Router::class, $routerProphecy->reveal());
         $routeProphecy = $this->prophesize(Route::class);
@@ -210,7 +204,7 @@ class RouteDispatcherTest extends UnitTestCase
         $this->expectExceptionCode(1520756623);
 
         $subject = new RouteDispatcher($containerProphecy->reveal());
-        $subject->dispatch($requestProphecy->reveal(), $responseProphecy->reveal());
+        $subject->dispatch($requestProphecy->reveal());
     }
 
     /**
@@ -223,7 +217,6 @@ class RouteDispatcherTest extends UnitTestCase
         FormProtectionFactory::set('default', $formProtectionProphecy->reveal());
 
         $requestProphecy = $this->prophesize(ServerRequestInterface::class);
-        $responseProphecy = $this->prophesize(ResponseInterface::class);
         $routerProphecy = $this->prophesize(Router::class);
         GeneralUtility::setSingletonInstance(Router::class, $routerProphecy->reveal());
         $routeProphecy = $this->prophesize(Route::class);
@@ -243,7 +236,7 @@ class RouteDispatcherTest extends UnitTestCase
         $this->expectExceptionCode(1442431631);
 
         $subject = new RouteDispatcher($containerProphecy->reveal());
-        $subject->dispatch($requestProphecy->reveal(), $responseProphecy->reveal());
+        $subject->dispatch($requestProphecy->reveal());
     }
 
     /**
@@ -256,7 +249,6 @@ class RouteDispatcherTest extends UnitTestCase
         FormProtectionFactory::set('default', $formProtectionProphecy->reveal());
 
         $requestProphecy = $this->prophesize(ServerRequestInterface::class);
-        $responseProphecy = $this->prophesize(ResponseInterface::class);
         $routerProphecy = $this->prophesize(Router::class);
         GeneralUtility::setSingletonInstance(Router::class, $routerProphecy->reveal());
         $routeProphecy = $this->prophesize(Route::class);
@@ -276,7 +268,7 @@ class RouteDispatcherTest extends UnitTestCase
         $this->expectExceptionCode(1520756142);
 
         $subject = new RouteDispatcher($containerProphecy->reveal());
-        $subject->dispatch($requestProphecy->reveal(), $responseProphecy->reveal());
+        $subject->dispatch($requestProphecy->reveal());
     }
 
     /**
@@ -289,7 +281,6 @@ class RouteDispatcherTest extends UnitTestCase
         FormProtectionFactory::set('default', $formProtectionProphecy->reveal());
 
         $requestProphecy = $this->prophesize(ServerRequestInterface::class);
-        $responseProphecy = $this->prophesize(ResponseInterface::class);
         $routerProphecy = $this->prophesize(Router::class);
         GeneralUtility::setSingletonInstance(Router::class, $routerProphecy->reveal());
         $routeProphecy = $this->prophesize(Route::class);
@@ -309,6 +300,6 @@ class RouteDispatcherTest extends UnitTestCase
         $this->expectExceptionCode(1520757000);
 
         $subject = new RouteDispatcher($containerProphecy->reveal());
-        $subject->dispatch($requestProphecy->reveal(), $responseProphecy->reveal());
+        $subject->dispatch($requestProphecy->reveal());
     }
 }
diff --git a/typo3/sysext/core/Classes/Information/Typo3Information.php b/typo3/sysext/core/Classes/Information/Typo3Information.php
index 01df3f8820fe5b9179b0d4cacd32f97af2039651..39e3282ecc9ce693165c0cac0de69f57038e27f7 100644
--- a/typo3/sysext/core/Classes/Information/Typo3Information.php
+++ b/typo3/sysext/core/Classes/Information/Typo3Information.php
@@ -37,7 +37,7 @@ class Typo3Information
     {
         if ($languageService) {
             $this->languageService = $languageService;
-        } elseif ($GLOBALS['LANG'] instanceof LanguageService) {
+        } elseif (($GLOBALS['LANG'] ?? null) instanceof LanguageService) {
             $this->languageService = $GLOBALS['LANG'];
         } else {
             $this->languageService = LanguageService::create('default');
diff --git a/typo3/sysext/core/Classes/Routing/PageRouter.php b/typo3/sysext/core/Classes/Routing/PageRouter.php
index cb57514e808e8d95eed3c814a46468549194804b..fec43bf288eb92aceb33efd22a7715e3f5b3786d 100644
--- a/typo3/sysext/core/Classes/Routing/PageRouter.php
+++ b/typo3/sysext/core/Classes/Routing/PageRouter.php
@@ -239,7 +239,7 @@ class PageRouter implements RouterInterface
         $page = $pageRepository->getPage($pageId, true);
         $pagePath = $page['slug'] ?? '';
 
-        if ($parameters['MP'] ?? false) {
+        if ($parameters['MP'] ?? '') {
             $mountPointPairs = explode(',', $parameters['MP']);
             $pagePath = $this->resolveMountPointParameterIntoPageSlug(
                 $pageId,
@@ -511,7 +511,7 @@ class PageRouter implements RouterInterface
         $pageId = (int)($page['l10n_parent'] > 0 ? $page['l10n_parent'] : $page['uid']);
         $type = $this->resolveType($route, $remainingQueryParameters);
         // See PageSlugCandidateProvider where this is added.
-        if ($page['MPvar']) {
+        if ($page['MPvar'] ?? '') {
             $routeArguments['MP'] = $page['MPvar'];
         }
         return new PageArguments($pageId, $type, $routeArguments, [], $remainingQueryParameters);
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
index 8422ce9ee7565d90223c1a75e819bb7c0277264f..4c489d2bfbef18cb3be95bec8bf44836579985d8 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
@@ -304,7 +304,7 @@ class LegacyLinkNotationConverterTest extends UnitTestCase
                 $parameters['folder'] = substr($parameters['folder'], 5);
             }
             // fake "0" storage
-            if (!MathUtility::canBeInterpretedAsInteger($parameters['folder']{0})) {
+            if (!MathUtility::canBeInterpretedAsInteger($parameters['folder'][0])) {
                 $parameters['folder'] = '0:' . $parameters['folder'];
             }
             $folderObject = $this->getMockBuilder(Folder::class)
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
index 86837030498416d7b4aca4267d6cb1ee33dd60be..9265696d3d05bf44a1ead0d6dfce82c42391943f 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
@@ -486,11 +486,15 @@ class ResourceStorageTest extends BaseTestCase
 
         $folderStub = new Folder($this->subject, '/foo/', 'foo');
         $resourceFactory->createFolderObject(Argument::cetera())->willReturn($folderStub);
-        $fileStub = new File(['identifier' => '/foo/bar.jpg'], $this->subject);
+        $fileStub = new File(['identifier' => '/foo/bar.jpg', 'name' => 'bar.jpg'], $this->subject);
         $driverMock->expects(self::once())
             ->method('isWithin')
             ->with($folderStub->getIdentifier(), $fileStub->getIdentifier())
             ->willReturn(true);
+        $driverMock->expects(self::once())
+            ->method('getFolderInfoByIdentifier')
+            ->with($folderStub->getIdentifier())
+            ->willReturn(['identifier' => $folderStub->getIdentifier(), 'name' => $folderStub->getName()]);
 
         $this->subject->setEvaluatePermissions(true);
         $this->subject->addFileMount('/foo/', [
@@ -510,13 +514,17 @@ class ResourceStorageTest extends BaseTestCase
         $resourceFactory = $this->prophesize(ResourceFactory::class);
         $this->prepareSubject([], false, $driverMock, $resourceFactory->reveal(), [], ['isWithinProcessingFolder']);
 
-        $fileStub = new File(['identifier' => '/foo/bar.jpg'], $this->subject);
+        $fileStub = new File(['identifier' => '/foo/bar.jpg', 'name' => 'bar.jpg'], $this->subject);
         $folderStub = new Folder($this->subject, '/foo/', 'foo');
         $resourceFactory->createFolderObject(Argument::cetera())->willReturn($folderStub);
         $driverMock->expects(self::once())
             ->method('isWithin')
             ->with($folderStub->getIdentifier(), $fileStub->getIdentifier())
             ->willReturn(true);
+        $driverMock->expects(self::once())
+            ->method('getFolderInfoByIdentifier')
+            ->with($folderStub->getIdentifier())
+            ->willReturn(['identifier' => $folderStub->getIdentifier(), 'name' => $folderStub->getName()]);
 
         $this->subject->setEvaluatePermissions(true);
         $this->subject->addFileMount('/foo/', [
diff --git a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
index bdc1f0a53139af6a31054b181a93283c78412824..cb3c15af71c657d12b305793ddf24f99db854ea1 100644
--- a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
@@ -92,7 +92,7 @@ class TreeDataProviderFactoryTest extends UnitTestCase
      */
     public function factoryThrowsExceptionIfInvalidConfigurationIsGiven(array $tcaConfiguration, int $expectedExceptionCode): void
     {
-        if ($tcaConfiguration['internal_type'] === 'db' && is_array($tcaConfiguration['treeConfig'] ?? null)) {
+        if (($tcaConfiguration['internal_type'] ?? '') === 'db' && is_array($tcaConfiguration['treeConfig'] ?? null)) {
             $treeDataProvider = $this->prophesize(DatabaseTreeDataProvider::class);
             GeneralUtility::addInstance(DatabaseTreeDataProvider::class, $treeDataProvider->reveal());
         }
diff --git a/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php b/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
index a15f255e0fbb7083cee521284ced117320be800d..8215ca07ab6bf2049aa301e741f636ff3a82e0f5 100644
--- a/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
+++ b/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
@@ -316,7 +316,10 @@ class ExtensionManagementService implements SingletonInterface
     protected function setInExtensionRepository($extensionKey)
     {
         $paths = Extension::returnInstallPaths();
-        $path = $paths[$this->downloadUtility->getDownloadPath()];
+        $path = $paths[$this->downloadUtility->getDownloadPath()] ?? '';
+        if (empty($path)) {
+            return;
+        }
         $localExtensionStorage = $path . $extensionKey . '/Initialisation/Extensions/';
         $this->dependencyUtility->setLocalExtensionStorage($localExtensionStorage);
     }
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
index 2a01ef45cd2d63612e1bc62fce73437d898fe233..690cb9deb51e8a3d9a1e06a9b58af46dc44cd82a 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
@@ -57,8 +57,8 @@ class EmConfUtilityTest extends UnitTestCase
             ],
         ];
         $subject = new EmConfUtility();
-        $_EXTKEY = 'test';
-        $result = $subject->constructEmConf(['EM_CONF' => $input]);
+        $_EXTKEY = 'seminars';
+        $result = $subject->constructEmConf(['EM_CONF' => $input, 'extKey' => $_EXTKEY]);
         eval(substr($result, 7));
         $result = $EM_CONF[$_EXTKEY];
         self::assertEquals($expected, $result);
@@ -86,8 +86,8 @@ class EmConfUtilityTest extends UnitTestCase
         ];
         $subject = new EmConfUtility();
 
-        $_EXTKEY = 'test';
-        $result = $subject->constructEmConf(['EM_CONF' => $input]);
+        $_EXTKEY = 'seminars';
+        $result = $subject->constructEmConf(['EM_CONF' => $input, 'extKey' => $_EXTKEY]);
         eval(substr($result, 7));
         $result = $EM_CONF[$_EXTKEY];
         self::assertEquals($expected, $result);