diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php index 55fb2b9da7b0aff0b8f6acb3c58ab793039955fe..c194080ef2a6fbf62825438549d0b8ffad312ffe 100644 --- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php +++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php @@ -3721,6 +3721,7 @@ class ContentObjectRenderer implements LoggerAwareInterface public function getImgResource($file, $fileArray) { $importedFile = null; + $fileReference = null; if (empty($file) && empty($fileArray)) { return null; } @@ -3742,6 +3743,7 @@ class ContentObjectRenderer implements LoggerAwareInterface if ($file instanceof File) { $fileObject = $file; } elseif ($file instanceof FileReference) { + $fileReference = $file; $fileObject = $file->getOriginalFile(); } else { try { @@ -3788,7 +3790,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 8fe05860e0240ec3846874d8597182c1d5dd7161..fae1ed990f0d0ef3d4b02508d994a6ec96893033 100644 --- a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php +++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php @@ -1228,4 +1228,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 8cb29a6dbe87928f16e838064bcc3cc36da0ae6a..3264363a3df723a8a5e22f0f477cfc424d996891 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","description","alternative","link","l10n_diffsource" ,1,1,"T3BOARD",1,297,0,0,0,0,0,0,0,"tt_content","image",2,,,, +"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,