Fix basic PhpStan errors.

baraja-core · Sep 12, 2022 · 16f0ca6 · 16f0ca6
1 parent 66c3945
commit 16f0ca6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/src/Api/CmsOrderEndpoint.php b/src/Api/CmsOrderEndpoint.php
@@ -119,11 +119,9 @@ public function actionDefault(
 		$sum = [];
 		$return = [];
 		foreach ($feed['orders'] as $order) {
-			assert($order instanceof Order);
 			$documents = [];
 			if (isset($feed['invoices'][$order->getId()])) {
 				$invoice = $feed['invoices'][$order->getId()];
-				assert($invoice instanceof InvoiceInterface);
 				$documents[] = new CmsOrderFeedDocument(
 					url: $invoice->getDownloadLink(),
 					label: '🧾',
@@ -160,18 +158,20 @@ public function actionDefault(
 					premium: $order->getCustomer()->isPremium(),
 					ban: $order->getCustomer()->isBan(),
 				),
-				delivery: new CmsOrderFeedDelivery(
-					id: $deliveryItem?->getId(),
-					name: $deliveryItem?->getLabel(),
-					price: $order->getDeliveryPrice()->render(true),
-					color: $deliveryItem?->getColor(),
-				),
-				payment: new CmsOrderFeedPayment(
-					id: $paymentItem?->getId(),
-					name: $paymentItem?->getName(),
-					price: $order->getPaymentPrice()->render(true),
-					color: $paymentItem?->getColor(),
-				),
+				delivery: $deliveryItem !== null
+					? new CmsOrderFeedDelivery(
+						id: $deliveryItem->getId(),
+						name: $deliveryItem->getLabel(),
+						price: $order->getDeliveryPrice()->render(true),
+						color: $deliveryItem->getColor(),
+					) : null,
+				payment: $paymentItem !== null
+					? new CmsOrderFeedPayment(
+						id: $paymentItem->getId(),
+						name: $paymentItem->getName(),
+						price: $order->getPaymentPrice()->render(true),
+						color: $paymentItem->getColor(),
+					) : null,
 				items: (static function ($items): array {
 					$return = [];
 					foreach ($items as $item) {
@@ -194,7 +194,6 @@ public function actionDefault(
 				payments: (static function ($items): array {
 					$return = [];
 					foreach ($items as $item) {
-						assert($item instanceof OrderOnlinePayment);
 						$return[] = [
 							'id' => $item->getId(),
 						];

diff --git a/src/Api/DTO/CmsOrderFeedList.php b/src/Api/DTO/CmsOrderFeedList.php
@@ -30,8 +30,8 @@ public function __construct(
 		public string $updatedDate,
 		public int $package,
 		public CmsOrderFeedCustomer $customer,
-		public CmsOrderFeedDelivery $delivery,
-		public CmsOrderFeedPayment $payment,
+		public ?CmsOrderFeedDelivery $delivery,
+		public ?CmsOrderFeedPayment $payment,
 		public array $items,
 		public array $documents,
 		public array $payments,

diff --git a/src/Notification/OrderNotification.php b/src/Notification/OrderNotification.php
@@ -83,7 +83,7 @@ public function sendNotification(
 		}
 		if ($notification->getType()->value === OrderNotificationType::Email->value) {
 			$this->sendEmail($order, $notification->getStatus(), $attachments);
-		} elseif ($notification->getType()->value === OrderNotificationType::Sms->value) {
+		} else {
 			$this->sendSms($order, $notification->getStatus());
 		}
 	}