[BUGFIX] Fix UIDs for files depending on class implementing FileInterface

Author: dvdmlln

Classes/Utility/FileUtility.php

@@ -19,7 +19,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;
@@ -65,8 +67,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');

Tests/Unit/Utility/FileUtilityTest.php

@@ -212,8 +212,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' =>
                 [
@@ -240,8 +240,8 @@ public function testCustomProcessingOptions(): void
             'link' => null,
             'mimeType' => 'image/jpeg',
             'type' => 'image',
-            'uidLocal' => null,
-            'fileReferenceUid' => 103,
+            'uidLocal' => 103,
+            'fileReferenceUid' => null,
             'size' => '71 KB',
             'dimensions' =>
                 [
@@ -672,8 +672,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' =>
                         [