From ec5302b8283f442dc8ce563f60a874ed2f572946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20L=C3=B6ffler?= Date: Thu, 11 Jul 2024 16:41:04 +0200 Subject: [PATCH] [BUGFIX] Fix parameter types --- Classes/Controller/Backend/SettingsController.php | 3 +++ Classes/Service/ImageMetaDataService.php | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Classes/Controller/Backend/SettingsController.php b/Classes/Controller/Backend/SettingsController.php index f5511f9..64fc238 100644 --- a/Classes/Controller/Backend/SettingsController.php +++ b/Classes/Controller/Backend/SettingsController.php @@ -182,6 +182,9 @@ public function saveDefaultPromptAction(): ResponseInterface // in case argument is an identity array $promptUid = $promptUid['__identity']; } + /** + * @var Prompt $defaultPrompt + */ $defaultPrompt = $this->promptRepository->findByUid($promptUid); // check if deletePrompt argument is set diff --git a/Classes/Service/ImageMetaDataService.php b/Classes/Service/ImageMetaDataService.php index f290ba3..8ea37ea 100644 --- a/Classes/Service/ImageMetaDataService.php +++ b/Classes/Service/ImageMetaDataService.php @@ -11,7 +11,9 @@ use T3G\AgencyPack\FileVariants\Service\ResourcesService; use TYPO3\CMS\Core\Resource\Exception\InvalidUidException; use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException; +use TYPO3\CMS\Core\Resource\File; use TYPO3\CMS\Core\Resource\FileInterface; +use TYPO3\CMS\Core\Resource\FolderInterface; use TYPO3\CMS\Core\Resource\ResourceFactory; use TYPO3\CMS\Core\Site\Entity\SiteLanguage; use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; @@ -168,15 +170,14 @@ public function saveMetaData(string $target, string $altText = null, int $langua /** * Retrieve all language overlays for a file * - * @param FileInterface|int $fileObject + * @param File $fileObject * @param int[]|SiteLanguage[] $languages * @return array * @throws InvalidUidException * @throws \Doctrine\DBAL\Exception */ - public function getMetaDataLanguages(FileInterface|int $fileObject, array $languages): array + public function getMetaDataLanguages(File $fileObject, array $languages): array { - $translations = []; $siteLanguages = []; foreach ($languages as $language) { @@ -186,9 +187,6 @@ public function getMetaDataLanguages(FileInterface|int $fileObject, array $langu $siteLanguages[] = $language; } } - if (is_numeric($fileObject)) { - $fileObject = $this->resourceFactory->retrieveFileOrFolderObject($fileObject); - } $fileMetadata = $fileObject->getMetaData()->get(); $fileMetadataUid = $fileMetadata['uid'];