diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php index 55026bade2d34addaffa9469364e21c8432b38fa..86f8639625ebdec160a25ab936822a6fb22a1f3b 100644 --- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php +++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php @@ -4039,6 +4039,7 @@ class ContentObjectRenderer implements LoggerAwareInterface public function getImgResource($file, $fileArray) { $importedFile = null; + $fileReference = null; if (empty($file) && empty($fileArray)) { return null; } @@ -4059,6 +4060,7 @@ class ContentObjectRenderer implements LoggerAwareInterface if ($file instanceof File) { $fileObject = $file; } elseif ($file instanceof FileReference) { + $fileReference = $file; $fileObject = $file->getOriginalFile(); } else { try { @@ -4105,7 +4107,7 @@ class ContentObjectRenderer implements LoggerAwareInterface $processingConfiguration['noScale'] = $this->stdWrapValue('noScale', $fileArray ?? []); $processingConfiguration['additionalParameters'] = $this->stdWrapValue('params', $fileArray ?? []); $processingConfiguration['frame'] = (int)$this->stdWrapValue('frame', $fileArray ?? []); - if (isset($fileReference)) { + if ($fileReference instanceof FileReference) { $processingConfiguration['crop'] = $this->getCropAreaFromFileReference($fileReference, $fileArray); } else { $processingConfiguration['crop'] = $this->getCropAreaFromFromTypoScriptSettings($fileObject, $fileArray); diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php index 24cfad0f5c6c2473f8559357be202ef4b5e65266..121bf132cdb6bbb7ad0bdf75f18618b8e094f2b9 100644 --- a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php +++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php @@ -740,4 +740,27 @@ And another one'; self::assertSame($expectedParams, $jsonDecodedArray); } } + + /** + * @test + */ + public function getImgResourceRespectsFileReferenceObjectCropData(): void + { + $this->importCSVDataSet(__DIR__ . '/DataSet/FileReferences.csv'); + $fileReferenceData = [ + 'uid' => 1, + 'uid_local' => 1, + 'crop' => '{"default":{"cropArea":{"x":0,"y":0,"width":0.5,"height":0.5},"selectedRatio":"NaN","focusArea":null}}', + ]; + $fileReference = new FileReference($fileReferenceData); + + $subject = GeneralUtility::makeInstance(ContentObjectRenderer::class); + $result = $subject->getImgResource($fileReference, []); + + $expectedWidth = 512; + $expectedHeight = 341; + + self::assertEquals($expectedWidth, $result[0]); + self::assertEquals($expectedHeight, $result[1]); + } } diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/DataSet/FileReferences.csv b/typo3/sysext/frontend/Tests/Functional/ContentObject/DataSet/FileReferences.csv index d44afc82297d39d10c54544e358b44d6bc82fc45..a4c95ba00ff1c4e32f8da4d8d767d395960a0bd0 100644 --- a/typo3/sysext/frontend/Tests/Functional/ContentObject/DataSet/FileReferences.csv +++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/DataSet/FileReferences.csv @@ -8,3 +8,6 @@ "sys_file_reference",,,,,,,,,,,,,,,,,,,, ,"uid","pid","title","uid_local","uid_foreign","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","deleted","tablenames","fieldname","sorting_foreign","table_local","description","alternative","link","l10n_diffsource" ,1,1,"T3BOARD",1,297,0,0,0,0,0,0,0,"tt_content","image",2,"sys_file",,,, +"sys_file_metadata",,,,,,,,,,,,,,,,,,,,, +,uid,pid,sys_language_uid,l10n_parent,l10n_state,t3_origuid,l10n_diffsource,t3ver_oid,t3ver_wsid,t3ver_state,t3ver_stage,file,title,width,height,description,alternative,categories +,1,0,0,0,,0,,0,0,0,0,1,,1024,683,,,0,