From 3aa4bb53a830e220e91828a8cdd95dfcf0f46189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20B=C3=BCchler?= Date: Thu, 28 Mar 2024 17:59:11 +0200 Subject: [PATCH] [BUGFIX] Strictify bootstrap structure vh --- Classes/ViewHelpers/Render/Bootstrap/ColumnViewHelper.php | 3 ++- Classes/ViewHelpers/Structure/Wrap/ColumnViewHelper.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Classes/ViewHelpers/Render/Bootstrap/ColumnViewHelper.php b/Classes/ViewHelpers/Render/Bootstrap/ColumnViewHelper.php index 90086b6e0..aa42ad6b4 100644 --- a/Classes/ViewHelpers/Render/Bootstrap/ColumnViewHelper.php +++ b/Classes/ViewHelpers/Render/Bootstrap/ColumnViewHelper.php @@ -66,7 +66,8 @@ public function render() $this->tagName = $arguments['tagName']; $this->tag->setTagName($arguments['tagName']); $gutter = StructureVariantsUtility::getVectorProperty($arguments['gutter']); - $multiplier = ColumnVariantsUtility::getMultiplier($arguments['class'], $arguments['rowClass'], $arguments['count']); + $multiplier = ColumnVariantsUtility::getMultiplier( + $arguments['class'] ?? '', $arguments['rowClass'] ?? 'row-cols-1', $arguments['count'] ?? 1); $correction = StructureVariantsUtility::getVectorProperty($arguments['correction']); $modifier = (new VariantsModifier()) ->setMargins(VectorUtility::negate($gutter)) diff --git a/Classes/ViewHelpers/Structure/Wrap/ColumnViewHelper.php b/Classes/ViewHelpers/Structure/Wrap/ColumnViewHelper.php index 7f69fc891..252c1fb69 100644 --- a/Classes/ViewHelpers/Structure/Wrap/ColumnViewHelper.php +++ b/Classes/ViewHelpers/Structure/Wrap/ColumnViewHelper.php @@ -78,7 +78,8 @@ public static function renderStatic( */ if ($GLOBALS['TSFE'] instanceof TypoScriptFrontendController) { $gutter = StructureVariantsUtility::getVectorProperty($arguments['gutter']); - $multiplier = ColumnVariantsUtility::getMultiplier($arguments['class'], $arguments['rowClass'], $arguments['count']); + $multiplier = ColumnVariantsUtility::getMultiplier( + $arguments['class'] ?? '', $arguments['rowClass'] ?? 'row-cols-1', $arguments['count'] ?? 1); $correction = StructureVariantsUtility::getVectorProperty($arguments['correction']); $modifier = (new VariantsModifier()) ->setMargins(VectorUtility::negate($gutter))