Skip to content

Commit afffd9d

Browse files
Sebastian80mam08ixo
authored andcommitted
DHLGW-1172: establish M2.4.4 compatibility
1 parent 9b40b23 commit afffd9d

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

Block/Adminhtml/Data/Form/Confirm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function toHtml()
5353
if ($useContainer) {
5454
$html .= '<form ' . $this->serialize($this->getHtmlAttributes()) . '>';
5555
$html .= '<div>';
56-
if (strtolower($this->getData('method')) == 'post') {
56+
if (strtolower($this->getData('method')) === 'post') {
5757
$html .= '<input name="form_key" type="hidden" value="' . $this->formKey->getFormKey() . '" />';
5858
}
5959
$html .= '</div>';

Block/Adminhtml/Widget/Form/Renderer/TableRow.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class TableRow extends Template implements RendererInterface
2727
/**
2828
* @return AbstractElement
2929
*/
30-
public function getElement()
30+
public function getElement(): AbstractElement
3131
{
3232
return $this->_element;
3333
}

Model/ShippingSettings/TypeProcessor/ShippingOptions/UpdatePackageDimensionsProcessor.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
namespace Netresearch\InteractiveBatchProcessing\Model\ShippingSettings\TypeProcessor\ShippingOptions;
1010

1111
use Magento\Sales\Api\Data\ShipmentInterface;
12-
use Netresearch\InteractiveBatchProcessing\Model\Registry\SelectedShippingSettings;
1312
use Netresearch\ShippingCore\Api\Config\ParcelProcessingConfigInterface;
1413
use Netresearch\ShippingCore\Api\Data\ShippingSettings\ShippingOption\InputInterface;
15-
use Netresearch\ShippingCore\Api\Data\ShippingSettings\ShippingOption\OptionInterface;
1614
use Netresearch\ShippingCore\Api\Data\ShippingSettings\ShippingOptionInterface;
1715
use Netresearch\ShippingCore\Api\ShippingSettings\TypeProcessor\ShippingOptionsProcessorInterface;
18-
use Netresearch\ShippingCore\Model\Config\ParcelProcessingConfig;
1916
use Netresearch\ShippingCore\Model\ShippingBox\Package;
2017
use Netresearch\ShippingCore\Model\ShippingSettings\ShippingOption\Codes;
2118

@@ -49,7 +46,7 @@ private function updateInputs(
4946
ShippingOptionInterface $shippingOption,
5047
Package $selectedPackage,
5148
?Package $defaultPackage
52-
) {
49+
): void {
5350
$packagingWeightInput = $this->getOptionInput($shippingOption, Codes::PACKAGE_INPUT_PACKAGING_WEIGHT);
5451
if ($packagingWeightInput instanceof InputInterface) {
5552
$packagingWeightInput->setDefaultValue((string) $selectedPackage->getWeight());
@@ -85,7 +82,7 @@ private function updateInputs(
8582
* @param ShippingOptionInterface $shippingOption
8683
* @param ShipmentInterface $shipment
8784
*/
88-
private function processInputs(ShippingOptionInterface $shippingOption, ShipmentInterface $shipment)
85+
private function processInputs(ShippingOptionInterface $shippingOption, ShipmentInterface $shipment): void
8986
{
9087
if ($shippingOption->getCode() !== Codes::PACKAGE_OPTION_DETAILS) {
9188
return;

composer.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,18 @@
2121
]
2222
},
2323
"require": {
24-
"php": "^7.1.3",
24+
"php": "^7.2.0 || ^8.1.0",
2525
"magento/framework": "^102.0.0 || ^103.0.0",
2626
"magento/module-backend": "^101.0.0 || ^102.0.0",
2727
"magento/module-config": "^101.1.0",
2828
"magento/module-sales": "^102.0.0 || ^103.0.0",
2929
"magento/module-store": "^101.0.0",
3030
"magento/module-ui": "^101.1.0",
31-
"netresearch/module-shipping-core": "^2.5.0"
31+
"netresearch/module-shipping-core": "^2.8.0"
32+
},
33+
"extra": {
34+
"branch-alias": {
35+
"dev-develop": "1.1.0.x-dev"
36+
}
3237
}
3338
}

0 commit comments

Comments
 (0)