[TASK] Introduce a proxy for FileRepository

FluidTYPO3 · Jan 28, 2025 · 4e0cd50 · 4e0cd50
1 parent 1b12798
commit 4e0cd50
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 12 deletions.
diff --git a/Classes/Proxy/FileRepositoryProxy.php b/Classes/Proxy/FileRepositoryProxy.php
@@ -0,0 +1,20 @@
+<?php
+namespace FluidTYPO3\Vhs\Proxy;
+
+use TYPO3\CMS\Core\Resource\FileRepository;
+use TYPO3\CMS\Core\SingletonInterface;
+
+class FileRepositoryProxy implements SingletonInterface
+{
+    private FileRepository $fileRepository;
+
+    public function __construct(FileRepository $fileRepository)
+    {
+        $this->fileRepository = $fileRepository;
+    }
+
+    public function findByRelation(string $tableName, string $fieldName, int $uid, ?int $workspaceId = null): array
+    {
+        return $this->fileRepository->findByRelation($tableName, $fieldName, $uid, $workspaceId);
+    }
+}
diff --git a/Classes/ViewHelpers/Resource/Record/FalViewHelper.php b/Classes/ViewHelpers/Resource/Record/FalViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
+use FluidTYPO3\Vhs\Proxy\FileRepositoryProxy;
 use FluidTYPO3\Vhs\Proxy\ResourceFactoryProxy;
 use FluidTYPO3\Vhs\Utility\ResourceUtility;
 use TYPO3\CMS\Core\Database\Connection;
@@ -55,7 +56,7 @@ class FalViewHelper extends AbstractRecordResourceViewHelper
     protected $resourceFactory;
 
     /**
-     * @var FileRepository
+     * @var FileRepositoryProxy
      */
     protected $fileRepository;
 
@@ -72,8 +73,8 @@ public function __construct()
         /** @var ResourceFactoryProxy $resourceFactory */
         $resourceFactory = GeneralUtility::makeInstance(ResourceFactoryProxy::class);
         $this->resourceFactory = $resourceFactory;
-        /** @var FileRepository $fileRepository */
-        $fileRepository = GeneralUtility::makeInstance(FileRepository::class);
+        /** @var FileRepositoryProxy $fileRepository */
+        $fileRepository = GeneralUtility::makeInstance(FileRepositoryProxy::class);
         $this->fileRepository = $fileRepository;
     }
 

diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
@@ -20,6 +20,9 @@ services:
   FluidTYPO3\Vhs\Proxy\ResourceFactoryProxy:
     public: true
 
+  FluidTYPO3\Vhs\Proxy\FileRepositoryProxy:
+    public: true
+
   FluidTYPO3\Vhs\Service\AssetService:
     public: true
 

diff --git a/Tests/Unit/ViewHelpers/Condition/Form/HasValidatorViewHelperTest.php b/Tests/Unit/ViewHelpers/Condition/Form/HasValidatorViewHelperTest.php
@@ -8,12 +8,12 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\FileRepositoryProxy;
 use FluidTYPO3\Vhs\Proxy\ResourceFactoryProxy;
 use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\Bar;
 use FluidTYPO3\Vhs\Tests\Fixtures\Domain\Model\Foo;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTest;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTestCase;
-use TYPO3\CMS\Core\Resource\FileRepository;
 use TYPO3\CMS\Extbase\Reflection\ReflectionService;
 
 class HasValidatorViewHelperTest extends AbstractViewHelperTestCase
@@ -22,7 +22,7 @@ class HasValidatorViewHelperTest extends AbstractViewHelperTestCase
     protected function setUp(): void
     {
         $this->singletonInstances[ResourceFactoryProxy::class] = $this->getMockBuilder(ResourceFactoryProxy::class)->disableOriginalConstructor()->getMock();
-        $this->singletonInstances[FileRepository::class] = $this->getMockBuilder(FileRepository::class)->disableOriginalConstructor()->getMock();
+        $this->singletonInstances[FileRepositoryProxy::class] = $this->getMockBuilder(FileRepositoryProxy::class)->disableOriginalConstructor()->getMock();
         $this->singletonInstances[ReflectionService::class] = $this->getMockBuilder(ReflectionService::class)
             ->setMethods(['__destruct'])
             ->disableOriginalConstructor()

diff --git a/Tests/Unit/ViewHelpers/Content/Resources/FalViewHelperTest.php b/Tests/Unit/ViewHelpers/Content/Resources/FalViewHelperTest.php
@@ -8,10 +8,10 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\FileRepositoryProxy;
 use FluidTYPO3\Vhs\Proxy\ResourceFactoryProxy;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTest;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTestCase;
-use TYPO3\CMS\Core\Resource\FileRepository;
 
 /**
  * Class FalViewHelperTest
@@ -21,7 +21,7 @@ class FalViewHelperTest extends AbstractViewHelperTestCase
     protected function setUp(): void
     {
         $this->singletonInstances[ResourceFactoryProxy::class] = $this->getMockBuilder(ResourceFactoryProxy::class)->disableOriginalConstructor()->getMock();
-        $this->singletonInstances[FileRepository::class] = $this->getMockBuilder(FileRepository::class)->disableOriginalConstructor()->getMock();
+        $this->singletonInstances[FileRepositoryProxy::class] = $this->getMockBuilder(FileRepositoryProxy::class)->disableOriginalConstructor()->getMock();
 
         parent::setUp();
     }

diff --git a/Tests/Unit/ViewHelpers/Page/Resources/FalViewHelperTest.php b/Tests/Unit/ViewHelpers/Page/Resources/FalViewHelperTest.php
@@ -8,10 +8,10 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\FileRepositoryProxy;
 use FluidTYPO3\Vhs\Proxy\ResourceFactoryProxy;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTest;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTestCase;
-use TYPO3\CMS\Core\Resource\FileRepository;
 
 /**
  * Class FalViewHelperTest
@@ -21,7 +21,7 @@ class FalViewHelperTest extends AbstractViewHelperTestCase
     protected function setUp(): void
     {
         $this->singletonInstances[ResourceFactoryProxy::class] = $this->getMockBuilder(ResourceFactoryProxy::class)->disableOriginalConstructor()->getMock();
-        $this->singletonInstances[FileRepository::class] = $this->getMockBuilder(FileRepository::class)->disableOriginalConstructor()->getMock();
+        $this->singletonInstances[FileRepositoryProxy::class] = $this->getMockBuilder(FileRepositoryProxy::class)->disableOriginalConstructor()->getMock();
 
         parent::setUp();
     }

diff --git a/Tests/Unit/ViewHelpers/Resource/Record/FalViewHelperTest.php b/Tests/Unit/ViewHelpers/Resource/Record/FalViewHelperTest.php
@@ -8,14 +8,14 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\FileRepositoryProxy;
 use FluidTYPO3\Vhs\Proxy\ResourceFactoryProxy;
 use FluidTYPO3\Vhs\Tests\Fixtures\Classes\DummyQueryBuilder;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTest;
 use FluidTYPO3\Vhs\Tests\Unit\ViewHelpers\AbstractViewHelperTestCase;
 use FluidTYPO3\Vhs\ViewHelpers\Resource\Record\FalViewHelper;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileReference;
-use TYPO3\CMS\Core\Resource\FileRepository;
 use TYPO3\CMS\Core\Resource\ResourceStorage;
 
 class FalViewHelperTest extends AbstractViewHelperTestCase
@@ -26,7 +26,7 @@ protected function setUp(): void
             ->setMethods(['getFileReferenceObject'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->singletonInstances[FileRepository::class] = $this->getMockBuilder(FileRepository::class)
+        $this->singletonInstances[FileRepositoryProxy::class] = $this->getMockBuilder(FileRepositoryProxy::class)
             ->setMethods(['findByRelation'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -71,7 +71,7 @@ public function testGetResource(): void
 
     public function testGetResourcesWhenPageContext(): void
     {
-        $this->singletonInstances[FileRepository::class]->method('findByRelation')->willReturn([]);
+        $this->singletonInstances[FileRepositoryProxy::class]->method('findByRelation')->willReturn([]);
 
         $GLOBALS['TSFE'] = (object) ['sys_page' => 'foobar'];
 

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,5 +1,9 @@
 parameters:
     ignoreErrors:
+        -
+            message: "#^Method TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileRepository\\:\\:findByRelation\\(\\) invoked with 4 parameters, 3 required\\.$#"
+            count: 1
+            path: Classes/Proxy/FileRepositoryProxy.php
         -
             message: "#^Parameter \\#2 \\$response of method FluidTYPO3\\\\Vhs\\\\Proxy\\\\DispatcherProxy\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\|null, \\(TYPO3\\\\CMS\\\\Core\\\\Http\\\\Response\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|\\(TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|null given\\.$#"
             count: 1