Skip to content

Commit

Permalink
Merge pull request #49 from TYPO3GmbH/undefined-array-key
Browse files Browse the repository at this point in the history
Avoid possible undefined array key access
  • Loading branch information
mbrodala authored Mar 26, 2024
2 parents 5fab83a + a7b8399 commit 4d8aba4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Classes/Controller/FileVariantsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function ajaxResetFileVariant(ServerRequestInterface $request): ResponseI
$formData = $formDataCompiler->compile($formDataCompilerInput);
$formData['renderType'] = 'fileInfo';

$fileUid = (int)$formData['databaseRow']['file'][0];
$fileUid = (int)($formData['databaseRow']['file'][0] ?? 0);
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_file');
$fileRecord = $queryBuilder->select('l10n_parent')->from('sys_file')->where($queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($fileUid, Connection::PARAM_INT)))->executeQuery()->fetchAssociative();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function render(): array
$result = $this->initializeResultArray();

// no parent - we are in default language
$parentField = (int)$this->data['databaseRow']['l10n_parent'][0];
$parentField = (int)($this->data['databaseRow']['l10n_parent'][0] ?? 0);
if ($parentField === 0) {
$result['html'] .= '<div class="variants-preview">';
$resourcesService = GeneralUtility::makeInstance(ResourcesService::class);
Expand Down
6 changes: 3 additions & 3 deletions Classes/FormEngine/FileVariantInfoElement.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function render(): array
$languageUid = $this->data['databaseRow']['sys_language_uid'];

if ($languageUid > 0) {
$fileUid = (int)$this->data['databaseRow']['file'][0];
$fileUid = (int)($this->data['databaseRow']['file'][0] ?? 0);
if ($fileUid < 1) {
$resultArray['html'] = 'something went wrong, no valid file uid received (' . $fileUid . ')';
} else {
Expand Down Expand Up @@ -124,7 +124,7 @@ public function render(): array
*/
protected function areRelatedFilesEqual(): bool
{
$fileUid = (int)$this->data['databaseRow']['file'][0];
$fileUid = (int)($this->data['databaseRow']['file'][0] ?? 0);
$defaultFileUid = $this->getDefaultFileUid();

// this file has not been copied upon metadata translation. Probably we talk stale data.
Expand All @@ -147,7 +147,7 @@ protected function areRelatedFilesEqual(): bool
*/
protected function getDefaultFileUid(): int
{
$l10nParent = $this->data['databaseRow']['l10n_parent'][0]['uid'];
$l10nParent = $this->data['databaseRow']['l10n_parent'][0]['uid'] ?? 0;

/** @var QueryBuilder $queryBuilder */
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_file_metadata');
Expand Down

0 comments on commit 4d8aba4

Please sign in to comment.