Skip to content
Code-Schnipsel Gruppen Projekte
Commit a5f3b8e5 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

fix(phpstan): update abstractorder and other files for consistent function behaviour

Updated AbstractOrder.php to return null instead of false in getShippingStatus() when the shipping
status is not set. This makes the method's behaviour more consistent.

Updated Search.php to add a condition check for class existence before retrieving shipping status.
This ensures that the code will not fail if the class is not defined.

Modified DataLayer.php to add a condition check for class existence before retrieving shipping.

Added @phpstan-ignore-next-line in Utils.php to silence phpstan for the next line of code.

Related: #172
Übergeordneter b7d4519e
No related branches found
No related tags found
2 Merge Requests!146fix: update `getCustomerFiles` method signature in `AbstractOrder`,!145Update 'next-3.x' with latest changes from 'main'
Pipeline #15525 fehlgeschlagen mit Phase
in 2 Minuten und 30 Sekunden
......@@ -2228,15 +2228,15 @@ public function setProcessingStatus(ProcessingStatus\Status|int $status): void
* Return the shipping status
* -> This method only works if shipping is installed
*
* @return bool|QUI\ERP\Shipping\ShippingStatus\Status|null
* @return QUI\ERP\Shipping\ShippingStatus\Status|null
*/
public function getShippingStatus(): bool|QUI\ERP\Shipping\ShippingStatus\Status|null
public function getShippingStatus(): QUI\ERP\Shipping\ShippingStatus\Status|null
{
if (
!QUI::getPackageManager()->isInstalled('quiqqer/shipping')
|| !class_exists('QUI\ERP\Shipping\ShippingStatus\Handler')
) {
return false;
return null;
}
if ($this->ShippingStatus !== null) {
......@@ -2251,7 +2251,7 @@ public function getShippingStatus(): bool|QUI\ERP\Shipping\ShippingStatus\Status
// use default status
if ($this->ShippingStatus === null) {
return false;
return null;
}
return $this->ShippingStatus;
......
......@@ -527,7 +527,7 @@ protected function parseListForGrid(array $data): array
} catch (QUI\Exception $Exception) {
QUI\System\Log::writeException($Exception);
$result[] = $fillFields($entry);
$fillFields($entry);
continue;
}
......@@ -604,12 +604,14 @@ protected function parseListForGrid(array $data): array
$orderData['shipping_status_title'] = Handler::EMPTY_VALUE;
$orderData['shipping_status_color'] = '';
$ShippingStatus = $Order->getShippingStatus();
if (class_exists('QUI\ERP\Shipping\ShippingStatus\Status')) {
$ShippingStatus = $Order->getShippingStatus();
if ($ShippingStatus) {
$orderData['shipping_status_id'] = $ShippingStatus->getId();
$orderData['shipping_status_title'] = $ShippingStatus->getTitle();
$orderData['shipping_status_color'] = $ShippingStatus->getColor();
if ($ShippingStatus) {
$orderData['shipping_status_id'] = $ShippingStatus->getId();
$orderData['shipping_status_title'] = $ShippingStatus->getTitle();
$orderData['shipping_status_color'] = $ShippingStatus->getColor();
}
}
}
......
......@@ -119,7 +119,7 @@ public static function parseOrder(QUI\ERP\Order\OrderInterface $Order, null | QU
'tax' => $tax
];
if ($Order->getShipping()) {
if (class_exists('QUI\ERP\Shipping\Types\ShippingEntry') && $Order->getShipping()) {
$order['shipping'] = $Order->getShipping()->getPrice();
}
......
......@@ -429,6 +429,7 @@ public static function getMergedProductList($products): array
{
$newProductList = [];
$getProductIndex = function ($product) use (&$newProductList) {
// @phpstan-ignore-next-line
foreach ($newProductList as $index => $p) {
$p1 = serialize(self::getCompareProductArray($product));
$p2 = serialize(self::getCompareProductArray($p));
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren