PHPStan Paypal v3.12

condor2 · Jun 4, 2024 · 59ce965 · 59ce965
1 parent f107c69
commit 59ce965
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/upload/admin/controller/extension/payment/paypal.php b/upload/admin/controller/extension/payment/paypal.php
@@ -3014,6 +3014,7 @@ public function capturePayment() {
 				$transaction_id = $paypal_order_info['transaction_id'];
 				$currency_code = $paypal_order_info['currency_code'];
 				$order_status_id = 0;
+				$transaction_status = '';
 
 				$_config = new Config();
 				$_config->load('paypal');
@@ -3635,7 +3636,7 @@ public function createTracker() {
 
 			$this->load->model('extension/payment/paypal');
 
-			$order_id = $this->request->post['order_id'];
+			$order_id = (int)$this->request->post['order_id'];
 			$country_code = $this->request->post['country_code'];
 			$tracking_number = $this->request->post['tracking_number'];
 			$carrier_name = $this->request->post['carrier_name'];
@@ -3777,7 +3778,7 @@ public function cancelTracker() {
 
 			$this->load->model('extension/payment/paypal');
 
-			$order_id = $this->request->post['order_id'];
+			$order_id = (int)$this->request->post['order_id'];
 			$tracking_number = $this->request->post['tracking_number'];
 
 			$paypal_order_info = $this->model_extension_payment_paypal->getPayPalOrder($order_id);

diff --git a/upload/catalog/controller/extension/payment/paypal.php b/upload/catalog/controller/extension/payment/paypal.php
@@ -989,7 +989,7 @@ public function createOrder() {
 				$tax_total = number_format($tax_total * $currency_value, $decimal_place, '.', '');
 				$order_total = number_format($item_total + $tax_total, $decimal_place, '.', '');
 
-				if ($page_code == 'checkout') {
+				if ($page_code == 'checkout' && isset($order_info)) {
 					$discount_total = 0;
 					$handling_total = 0;
 					$shipping_total = 0;
@@ -1025,7 +1025,7 @@ public function createOrder() {
 					'value'         => $tax_total
 				];
 
-				if ($page_code == 'checkout') {
+				if ($page_code == 'checkout' && isset($shipping_total) && isset($handling_total) && isset($discount_total) && isset($order_info) && isset($shipping_info)) {
 					$amount_info['breakdown']['shipping'] = [
 						'currency_code' => $currency_code,
 						'value'         => $shipping_total
@@ -1049,11 +1049,11 @@ public function createOrder() {
 				$paypal_order_info['purchase_units'][0]['items'] = $item_info;
 				$paypal_order_info['purchase_units'][0]['amount'] = $amount_info;
 
-				if ($page_code == 'checkout') {
+				if ($page_code == 'checkout' && isset($order_info)) {
 					$paypal_order_info['purchase_units'][0]['description'] = 'Your order ' . $order_info['order_id'];
 					$paypal_order_info['purchase_units'][0]['invoice_id'] = $order_info['order_id'] . '_' . date('Ymd_His');
 
-					if ($this->cart->hasShipping()) {
+					if ($this->cart->hasShipping() && isset($shipping_info)) {
 						$paypal_order_info['purchase_units'][0]['shipping'] = $shipping_info;
 					}
 				}
@@ -1652,6 +1652,7 @@ public function approveOrder() {
 									$card_nice_type = (!empty($this->request->post['card_nice_type']) ? $this->request->post['card_nice_type'] : '');
 									$card_last_digits = '';
 									$card_expiry = '';
+									$paypal_order_data = [];
 
 									if (!$this->cart->hasShipping()) {
 										$seller_protection_status = 'NOT_ELIGIBLE';
@@ -1785,6 +1786,7 @@ public function approveOrder() {
 									$card_nice_type = (!empty($this->request->post['card_nice_type']) ? $this->request->post['card_nice_type'] : '');
 									$card_last_digits = '';
 									$card_expiry = '';
+									$paypal_order_data = [];
 
 									if (!$this->cart->hasShipping()) {
 										$seller_protection_status = 'NOT_ELIGIBLE';
@@ -2998,6 +3000,7 @@ public function completeOrder() {
 							$card_nice_type = '';
 							$card_last_digits = '';
 							$card_expiry = '';
+							$paypal_order_data = [];
 
 							if (!$this->cart->hasShipping()) {
 								$seller_protection_status = 'NOT_ELIGIBLE';
@@ -3131,6 +3134,7 @@ public function completeOrder() {
 							$card_nice_type = '';
 							$card_last_digits = '';
 							$card_expiry = '';
+							$paypal_order_data = [];
 
 							if (!$this->cart->hasShipping()) {
 								$seller_protection_status = 'NOT_ELIGIBLE';