Skip to content

Commit

Permalink
Fix several php8 errors (#2426)
Browse files Browse the repository at this point in the history
  • Loading branch information
a-v-l authored Mar 27, 2023
1 parent 66d40f6 commit 1f1bd06
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ protected function getAddressOptions($arrFields = null)
$arrOptions[] = [
'value' => $objAddress->id,
'label' => $objAddress->generate($arrFields),
'default' => $objAddress->id == $objDefault->id ? '1' : '',
'default' => $objAddress->id == ($objDefault->id ?? false) ? '1' : '',
];
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function getOptionsForWidget(IsotopeProduct $objProduct = null)
foreach ($options as $option) {
$option['label'] = Translation::get($option['label']);

if ($option['group']) {
if ($option['group'] ?? false) {
$group = $option['label'];
continue;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ protected function generateProductOptionWidget($strField, &$arrVariantOptions, &
} else {
$blankOption = $k;
}
} elseif (!\in_array($option['value'], $arrOptions) && !$option['group']) {
} elseif (!\in_array($option['value'], $arrOptions) && !($option['group'] ?? false)) {
unset($arrField['options'][$k]);
}
}
Expand Down
4 changes: 2 additions & 2 deletions system/modules/isotope_rules/library/Isotope/Rules.php
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,12 @@ public function getCouponForm($objModule)
$objTemplate->usedCoupons = $arrCoupons;
$objTemplate->rules = $objRules;

if ($_SESSION['COUPON_FAILED'][$objModule->id] != '') {
if (!empty($_SESSION['COUPON_FAILED'][$objModule->id])) {
$objTemplate->message = $_SESSION['COUPON_FAILED'][$objModule->id];
$objTemplate->mclass = 'failed';
unset($_SESSION['COUPON_FAILED']);

} elseif ($_SESSION['COUPON_SUCCESS'][$objModule->id] != '') {
} elseif (!empty($_SESSION['COUPON_SUCCESS'][$objModule->id])) {
$objTemplate->message = $_SESSION['COUPON_SUCCESS'][$objModule->id];
$objTemplate->mclass = 'success';
unset($_SESSION['COUPON_SUCCESS']);
Expand Down

0 comments on commit 1f1bd06

Please sign in to comment.