Skip to content

Commit

Permalink
[BUGFIX] Fix getEntry() function in BasketController (#1263)
Browse files Browse the repository at this point in the history
Co-authored-by: Sebastian Meyer <[email protected]>
  • Loading branch information
beatrycze-volk and sebastian-meyer committed Jul 5, 2024
1 parent 1657409 commit 05a7292
Showing 1 changed file with 16 additions and 17 deletions.
33 changes: 16 additions & 17 deletions Classes/Controller/BasketController.php
Original file line number Diff line number Diff line change
Expand Up @@ -268,20 +268,18 @@ protected function getBasketData(): Basket
*
* @access protected
*
* @param array $data DocumentData
* @param bool|null|object $data DocumentData
*
* @return array One basket entry
*/
protected function getEntry(array $data): array
protected function getEntry($data): array
{
// TODO: Call to function is_object() with array will always evaluate to false.
// @phpstan-ignore-next-line
if (is_object($data)) {
$data = get_object_vars($data);
}
$id = $data['id'];
$startpage = $data['startpage'];
$endpage = $data['endpage'];
$startPage = $data['startpage'];
$endPage = $data['endpage'];
$startX = $data['startX'];
$startY = $data['startY'];
$endX = $data['endX'];
Expand All @@ -290,32 +288,33 @@ protected function getEntry(array $data): array

$docData = $this->getDocumentData((int) $id, $data);

$entryArray['BASKETDATA'] = $docData;

$entryKey = $id . '_' . $startpage;
$entryKey = $id . '_' . $startPage;
if (!empty($startX)) {
$entryKey .= '_' . $startX;
}
if (!empty($endX)) {
$entryKey .= '_' . $endX;
}

$entryArray['id'] = $id;
$entryArray['CONTROLS'] = [
'startpage' => $startpage,
'endpage' => $endpage,
$entry = [
'BASKETDATA' => $docData,
'id' => $id,
'NUMBER' => $docData['record_id'],
'key' => $entryKey
];

$entry['CONTROLS'] = [
'startpage' => $startPage,
'endpage' => $endPage,
'startX' => $startX,
'startY' => $startY,
'endX' => $endX,
'endY' => $endY,
'rotation' => $rotation,
];

$entryArray['NUMBER'] = $docData['record_id'];
$entryArray['key'] = $entryKey;

// return one entry
return $entryArray;
return $entry;
}

/**
Expand Down

0 comments on commit 05a7292

Please sign in to comment.