[TASK] Check for SingletonInterface of FileRepository

Gernott · Mar 8, 2024 · f42072a · f42072a
1 parent 5ad31ba
commit f42072a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Tests/Unit/Helper/InlineHelperTest.php b/Tests/Unit/Helper/InlineHelperTest.php
@@ -23,6 +23,7 @@
 use MASK\Mask\Tests\Unit\StorageRepositoryCreatorTrait;
 use TYPO3\CMS\Core\Resource\FileReference;
 use TYPO3\CMS\Core\Resource\FileRepository;
+use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\BaseTestCase;
 
@@ -125,8 +126,11 @@ public function addFilesToData(array $json, string $key, array $data, string $ta
         $fileRepositoryMock = $this->createMock(FileRepository::class);
         $fileReference = $this->createMock(FileReference::class);
         $fileRepositoryMock->method('findByRelation')->willReturn([$fileReference]);
-        GeneralUtility::setSingletonInstance(FileRepository::class, $fileRepositoryMock);
-
+        if ($fileRepositoryMock instanceof SingletonInterface) {
+            GeneralUtility::setSingletonInstance(FileRepository::class, $fileRepositoryMock);
+        } else {
+            GeneralUtility::addInstance(FileRepository::class, $fileRepositoryMock);
+        }
         $inlineHelper = new InlineHelper(TableDefinitionCollection::createFromArray($json), $backendLayoutRepositoryMock);
         $inlineHelper->addFilesToData($data, $table);