diff --git a/Classes/Utility/FileUtility.php b/Classes/Utility/FileUtility.php index d82869cf..dfadd552 100644 --- a/Classes/Utility/FileUtility.php +++ b/Classes/Utility/FileUtility.php @@ -21,7 +21,9 @@ use TYPO3\CMS\Core\Configuration\Features; use TYPO3\CMS\Core\Http\NormalizedParams; use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection; +use TYPO3\CMS\Core\Resource\File; use TYPO3\CMS\Core\Resource\FileInterface; +use TYPO3\CMS\Core\Resource\FileReference; use TYPO3\CMS\Core\Resource\ProcessedFile; use TYPO3\CMS\Core\Resource\Rendering\RendererRegistry; use TYPO3\CMS\Core\Utility\ArrayUtility; @@ -69,8 +71,8 @@ public function process(FileInterface $fileReference, ProcessingConfiguration $p { $originalFileReference = clone $fileReference; $originalFileUrl = $fileReference->getPublicUrl(); - $fileReferenceUid = $fileReference->getUid(); - $uidLocal = $fileReference->getProperty('uid_local'); + $fileReferenceUid = $fileReference instanceof FileReference ? $fileReference->getUid() : null; + $uidLocal = $fileReference instanceof File ? $fileReference->getUid() : $fileReference->getProperty('uid_local'); $fileRenderer = $this->rendererRegistry->getRenderer($fileReference); $crop = $fileReference->getProperty('crop'); $link = $fileReference->getProperty('link'); diff --git a/Tests/Unit/Utility/FileUtilityTest.php b/Tests/Unit/Utility/FileUtilityTest.php index 67df0cfb..28c33521 100644 --- a/Tests/Unit/Utility/FileUtilityTest.php +++ b/Tests/Unit/Utility/FileUtilityTest.php @@ -217,8 +217,8 @@ public function testCustomProcessingOptions(): void 'type' => 'image', 'filename' => 'test-file.jpg', 'originalUrl' => '/fileadmin/test-file.jpg', - 'uidLocal' => null, - 'fileReferenceUid' => 103, + 'uidLocal' => 103, + 'fileReferenceUid' => null, 'size' => '71 KB', 'dimensions' => [ @@ -245,8 +245,8 @@ public function testCustomProcessingOptions(): void 'link' => null, 'mimeType' => 'image/jpeg', 'type' => 'image', - 'uidLocal' => null, - 'fileReferenceUid' => 103, + 'uidLocal' => 103, + 'fileReferenceUid' => null, 'size' => '71 KB', 'dimensions' => [ @@ -677,8 +677,8 @@ protected function getBaselineResultArrayForFile(): array 'type' => 'image', 'filename' => 'test-file.jpg', 'originalUrl' => '/fileadmin/test-file.jpg', - 'uidLocal' => null, - 'fileReferenceUid' => 103, + 'uidLocal' => 103, + 'fileReferenceUid' => null, 'size' => '71 KB', 'dimensions' => [