Merge pull request #26 from AJenbo/phpstan

Fix for remaning level 0 issues
condor2 · Dec 22, 2023 · b9763f2 · b9763f2
2 parents 199e02b + bae776b
commit b9763f2
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 30 deletions.
diff --git a/upload/admin/model/extension/payment/divido.php b/upload/admin/model/extension/payment/divido.php
@@ -18,8 +18,6 @@ public function getAllPlans() {
 			throw new Exception("No Divido api-key defined");
 		}
 
-		Divido::setMerchant($api_key);
-
 		$response = Divido_Finances::all();
 		if ($response->status != 'ok') {
 			throw new Exception("Can't get list of finance plans from Divido!");

diff --git a/upload/admin/model/extension/payment/pp_express.php b/upload/admin/model/extension/payment/pp_express.php
@@ -56,7 +56,7 @@ public function addTransaction($transaction_data, $request_data = array()) {
 		if ($request_data) {
 			$serialized_data = json_encode($request_data);
 
-			$this->db->query("UPDATE " . DB_PREFIX . "paypal_order_transaction SET call_data = '" . $this->db->escape($serialized_data) . "' WHERE paypal_order_transaction_id = " . (int)$paypal_order_transaction_id . " LIMIT 1");
+			$this->db->query("UPDATE " . DB_PREFIX . "paypal_order_transaction SET call_data = '" . $this->db->escape($serialized_data) . "' WHERE paypal_order_transaction_id = " . (int)$transaction_data['transaction_id'] . " LIMIT 1");
 		}
 
 

diff --git a/upload/catalog/controller/extension/module/ebay_listing.php b/upload/catalog/controller/extension/module/ebay_listing.php
@@ -11,14 +11,8 @@ public function index() {
 
 			$data['products'] = array();
 
-			$products = $this->cache->get('ebay_listing.' . md5(serialize($products)));
-
-			if (!$products) {
 				$products = $this->model_extension_openbay_ebay_product->getDisplayProducts();
 
-				$this->cache->set('ebay_listing.' . md5(serialize($products)), $products);
-			}
-
 			foreach($products['products'] as $product) {
 				if (isset($product['pictures'][0])) {
 					$image = $this->model_extension_openbay_ebay_product->resize($product['pictures'][0], $this->config->get('ebay_listing_width'), $this->config->get('ebay_listing_height'));

diff --git a/upload/catalog/controller/startup/router.php b/upload/catalog/controller/startup/router.php
@@ -11,6 +11,7 @@ public function index() {
 		// Sanitize the call
 		$route = preg_replace('/[^a-zA-Z0-9_\/]/', '', (string)$route);
 
+		$data = [];
 		// Trigger the pre events
 		$result = $this->event->trigger('controller/' . $route . '/before', array(&$route, &$data));
 

diff --git a/upload/catalog/model/extension/payment/divido.php b/upload/catalog/model/extension/payment/divido.php
@@ -3,9 +3,6 @@ class ModelExtensionPaymentDivido extends Model {
 	const CACHE_KEY_PLANS = 'divido_plans';
 
 	public function setMerchant($api_key) {
-		if ($api_key) {
-			Divido::setMerchant($api_key);
-		}
 	}
 
 	public function getMethod($payment_address, $total) {
@@ -153,8 +150,6 @@ public function getAllPlans() {
 			throw new Exception("No Divido api-key defined");
 		}
 
-		Divido::setMerchant($api_key);
-
 		$response = Divido_Finances::all();
 		if ($response->status != 'ok') {
 			throw new Exception("Can't get list of finance plans from Divido!");

diff --git a/upload/system/engine/event.php b/upload/system/engine/event.php
@@ -1,4 +1,5 @@
 <?php
+namespace Opencart\System\Engine;
 /*
 * Event System Userguide
 * 
@@ -12,7 +13,7 @@ public function __construct($registry) {
 		$this->registry = $registry;
 	}
 
-	public function register($trigger, Action $action) {
+	public function register($trigger, \Action $action) {
 		$this->data[$trigger][] = $action;
 	}
 
@@ -22,7 +23,7 @@ public function trigger($event, array $args = array()) {
 				foreach ($actions as $action) {
 					$result = $action->execute($this->registry, $args);
 
-					if (!is_null($result) && !($result instanceof Exception)) {
+					if (!is_null($result) && !($result instanceof \Exception)) {
 						return $result;
 					}
 				}

diff --git a/upload/system/engine/front.php b/upload/system/engine/front.php
@@ -61,7 +61,7 @@ public function dispatch(Action $action, Action $error) {
 	 *
 	 *
 	 * @param	object	$action
-	 * @return	object
+	 * @return	?object
  	*/
 	private function execute(Action $action) {
 		$result = $action->execute($this->registry);
@@ -77,5 +77,7 @@ private function execute(Action $action) {
 
 			return $action;
 		}
+
+		return null;
 	}
 }
diff --git a/upload/system/engine/proxy.php b/upload/system/engine/proxy.php
@@ -37,12 +37,8 @@ public function __call($key, $args) {
 		$args = func_get_args();
 
 		foreach ($args as $arg) {
-			if ($arg instanceof Ref) {
-				$arg_data[] =& $arg->getRef();
-			} else {
 				$arg_data[] =& $arg;
 			}
-		}
 
 		if (isset($this->data[$key])) {
 			return call_user_func_array($this->data[$key], $arg_data);

diff --git a/upload/system/framework.php b/upload/system/framework.php
@@ -53,7 +53,7 @@
 });
 
 // Event
-$event = new Event($registry);
+$event = new \Opencart\System\Engine\Event($registry);
 $registry->set('event', $event);
 
 // Event Register

diff --git a/upload/system/helper/json.php b/upload/system/helper/json.php
@@ -123,13 +123,6 @@ function json_decode($json, $assoc = false) {
 
 		$json = strtr($json, array_map('stripcslashes', $m2s));
 
-		$function = @create_function('', "return {$json};");
-		$return = ($function) ? $function() : null;
-
-		unset($s2m);
-		unset($m2s);
-		unset($function);
-
-		return $return;
+		return eval('return {'.$json.'}');
 	}
 }
diff --git a/upload/system/library/session/file.php b/upload/system/library/session/file.php
@@ -58,5 +58,7 @@ public function destroy($session_id) {
 		if (is_file($file)) {
 			unlink($file);
 		}
+
+		return true;
     }
 }