Fixes - Code review #1

MichaelRotaru · MichaelRotaru · commit 63fe6db21903 · 2020-06-12T12:47:28.000+03:00
diff --git a/upload/admin/includes/modules/payment/paylike/composer.json b/upload/admin/includes/modules/payment/paylike/composer.json
@@ -1,15 +1,15 @@
 {
-  "name": "esparks/module-paylike",
-  "description": "Paylike integration with payment gateway prestashop",
-  "type": "prestashop-module",
+  "name": "paylike/module-paylike",
+  "description": "Paylike integration with payment gateway oscommerce",
+  "type": "oscommerce-module",
   "version": "1.0.6",
   "license": [
       "GPL-3.0-or-later"
   ],
   "authors": [
     {
-      "name": "Ionut Calara",
-      "email": "ionut.calara@gmail.com"
+      "name": "Genuineq",
+      "email": "office@genuineq.com"
     }
   ],
   "require": {
diff --git a/upload/admin/includes/modules/payment/paylike/helpers/Paylike_Keys_Validator.php b/upload/admin/includes/modules/payment/paylike/helpers/Paylike_Keys_Validator.php
@@ -27,7 +27,7 @@ public function validateAppKeyField($value, $mode)
                 /** Load the identity from API**/
                 $identity = $paylikeClient->apps()->fetch();
             } catch (\Paylike\Exception\ApiException $exception) {
-                $this->logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
+                self::logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
                 return sprintf(ERROR_APP_KEY_INVALID, $mode);
             }
 
@@ -43,13 +43,13 @@ public function validateAppKeyField($value, $mode)
                     }
                 }
             } catch (\Paylike\Exception\ApiException $exception) {
-                $this->logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
+                self::logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
             }
             /** Check if public keys array for the current mode is populated **/
             if (empty($this->validationPublicKeys[$mode])) {
                 /** Generate the error based on the current mode **/
                 $error = sprintf(ERROR_APP_KEY_INVALID_MODE, $mode, array_values(array_diff(array_keys($this->validationPublicKeys), array($mode)))[0]);
-                $this->logMessage($error);
+                self::logMessage($error);
                 return $error;
             }
         }
@@ -71,7 +71,7 @@ public function validatePublicKeyField($value, $mode)
             /** Check if the local stored public keys array is empty OR the key is not in public keys list **/
             if (empty($this->validationPublicKeys[$mode]) || ! in_array($value, $this->validationPublicKeys[$mode])) {
                 $error = sprintf(ERROR_PUBLIC_KEY_INVALID, $mode);
-                $this->logMessage($error);
+                self::logMessage($error);
                 return $error;
             }
         }
diff --git a/upload_CE-Phoenix-2341-Frozen/admin/includes/modules/payment/paylike/composer.json b/upload_CE-Phoenix-2341-Frozen/admin/includes/modules/payment/paylike/composer.json
@@ -1,15 +1,15 @@
 {
-  "name": "esparks/module-paylike",
-  "description": "Paylike integration with payment gateway prestashop",
-  "type": "prestashop-module",
+  "name": "paylike/module-paylike",
+  "description": "Paylike integration with payment gateway oscommerce",
+  "type": "oscommerce-module",
   "version": "1.0.6",
   "license": [
       "GPL-3.0-or-later"
   ],
   "authors": [
     {
-      "name": "Ionut Calara",
-      "email": "ionut.calara@gmail.com"
+      "name": "Genuineq",
+      "email": "office@genuineq.com"
     }
   ],
   "require": {
diff --git a/upload_CE-Phoenix-2341-Frozen/admin/includes/modules/payment/paylike/helpers/Paylike_Keys_Validator.php b/upload_CE-Phoenix-2341-Frozen/admin/includes/modules/payment/paylike/helpers/Paylike_Keys_Validator.php
@@ -27,7 +27,7 @@ public function validateAppKeyField($value, $mode)
                 /** Load the identity from API**/
                 $identity = $paylikeClient->apps()->fetch();
             } catch (\Paylike\Exception\ApiException $exception) {
-                $this->logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
+                self::logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
                 return sprintf(ERROR_APP_KEY_INVALID, $mode);
             }
 
@@ -43,13 +43,13 @@ public function validateAppKeyField($value, $mode)
                     }
                 }
             } catch (\Paylike\Exception\ApiException $exception) {
-                $this->logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
+                self::logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
             }
             /** Check if public keys array for the current mode is populated **/
             if (empty($this->validationPublicKeys[$mode])) {
                 /** Generate the error based on the current mode **/
                 $error = sprintf(ERROR_APP_KEY_INVALID_MODE, $mode, array_values(array_diff(array_keys($this->validationPublicKeys), array($mode)))[0]);
-                $this->logMessage($error);
+                self::logMessage($error);
                 return $error;
             }
         }
@@ -71,7 +71,7 @@ public function validatePublicKeyField($value, $mode)
             /** Check if the local stored public keys array is empty OR the key is not in public keys list **/
             if (empty($this->validationPublicKeys[$mode]) || ! in_array($value, $this->validationPublicKeys[$mode])) {
                 $error = sprintf(ERROR_PUBLIC_KEY_INVALID, $mode);
-                $this->logMessage($error);
+                self::logMessage($error);
                 return $error;
             }
         }
diff --git a/upload_ce_phoenix/admin/includes/modules/payment/paylike/composer.json b/upload_ce_phoenix/admin/includes/modules/payment/paylike/composer.json
@@ -1,15 +1,15 @@
 {
-  "name": "esparks/module-paylike",
-  "description": "Paylike integration with payment gateway prestashop",
-  "type": "prestashop-module",
+  "name": "paylike/module-paylike",
+  "description": "Paylike integration with payment gateway oscommerce",
+  "type": "oscommerce-module",
   "version": "1.0.6",
   "license": [
       "GPL-3.0-or-later"
   ],
   "authors": [
     {
-      "name": "Ionut Calara",
-      "email": "ionut.calara@gmail.com"
+      "name": "Genuineq",
+      "email": "office@genuineq.com"
     }
   ],
   "require": {
diff --git a/upload_ce_phoenix/admin/includes/modules/payment/paylike/helpers/Paylike_Keys_Validator.php b/upload_ce_phoenix/admin/includes/modules/payment/paylike/helpers/Paylike_Keys_Validator.php
@@ -27,7 +27,7 @@ public function validateAppKeyField($value, $mode)
                 /** Load the identity from API**/
                 $identity = $paylikeClient->apps()->fetch();
             } catch (\Paylike\Exception\ApiException $exception) {
-                $this->logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
+                self::logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
                 return sprintf(ERROR_APP_KEY_INVALID, $mode);
             }
 
@@ -43,13 +43,13 @@ public function validateAppKeyField($value, $mode)
                     }
                 }
             } catch (\Paylike\Exception\ApiException $exception) {
-                $this->logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
+                self::logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));
             }
             /** Check if public keys array for the current mode is populated **/
             if (empty($this->validationPublicKeys[$mode])) {
                 /** Generate the error based on the current mode **/
                 $error = sprintf(ERROR_APP_KEY_INVALID_MODE, $mode, array_values(array_diff(array_keys($this->validationPublicKeys), array($mode)))[0]);
-                $this->logMessage($error);
+                self::logMessage($error);
                 return $error;
             }
         }
@@ -71,7 +71,7 @@ public function validatePublicKeyField($value, $mode)
             /** Check if the local stored public keys array is empty OR the key is not in public keys list **/
             if (empty($this->validationPublicKeys[$mode]) || ! in_array($value, $this->validationPublicKeys[$mode])) {
                 $error = sprintf(ERROR_PUBLIC_KEY_INVALID, $mode);
-                $this->logMessage($error);
+                self::logMessage($error);
                 return $error;
             }
         }
diff --git a/upload_ce_phoenix/admin/includes/modules/payment/paylike/validate.php b/upload_ce_phoenix/admin/includes/modules/payment/paylike/validate.php
@@ -19,15 +19,11 @@
 /* Validate module keys */
 function validate($vars)
 {
-
     global $validation_keys;
     $mode = $vars['MODULE_PAYMENT_PAYLIKE_TRANSACTION_MODE'];
     $payment_paylike_app_key = $mode == "Live"?$vars[$validation_keys['LIVE_APP_KEY']]:$vars[$validation_keys['TEST_APP_KEY']];
     $payment_paylike_public_key = $mode == "Live"?$vars[$validation_keys['LIVE_PUBLIC_KEY']]:$vars[$validation_keys['TEST_PUBLIC_KEY']];
 
-	$payment_paylike_app_key;
-	$payment_paylike_public_key;
-	
     /* Initialize validator object */
     $validator = new PaylikeValidator();
     $errors = array();

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function validateAppKeyField($value, $mode)`
`27`	`27`	`/ Load the identity from API/`
`28`	`28`	`$identity = $paylikeClient->apps()->fetch();`
`29`	`29`	`} catch (\Paylike\Exception\ApiException $exception) {`
`30`		`- $this->logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));`
	`30`	`+ self::logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));`
`31`	`31`	`return sprintf(ERROR_APP_KEY_INVALID, $mode);`
`32`	`32`	`}`
`33`	`33`
`@@ -43,13 +43,13 @@ public function validateAppKeyField($value, $mode)`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`} catch (\Paylike\Exception\ApiException $exception) {`
`46`		`- $this->logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));`
	`46`	`+ self::logMessage(sprintf(ERROR_APP_KEY_INVALID, $mode));`
`47`	`47`	`}`
`48`	`48`	`/ Check if public keys array for the current mode is populated /`
`49`	`49`	`if (empty($this->validationPublicKeys[$mode])) {`
`50`	`50`	`/ Generate the error based on the current mode /`
`51`	`51`	`$error = sprintf(ERROR_APP_KEY_INVALID_MODE, $mode, array_values(array_diff(array_keys($this->validationPublicKeys), array($mode)))[0]);`
`52`		`- $this->logMessage($error);`
	`52`	`+ self::logMessage($error);`
`53`	`53`	`return $error;`
`54`	`54`	`}`
`55`	`55`	`}`
`@@ -71,7 +71,7 @@ public function validatePublicKeyField($value, $mode)`
`71`	`71`	`/ Check if the local stored public keys array is empty OR the key is not in public keys list /`
`72`	`72`	`if (empty($this->validationPublicKeys[$mode]) \|\| ! in_array($value, $this->validationPublicKeys[$mode])) {`
`73`	`73`	`$error = sprintf(ERROR_PUBLIC_KEY_INVALID, $mode);`
`74`		`- $this->logMessage($error);`
	`74`	`+ self::logMessage($error);`
`75`	`75`	`return $error;`
`76`	`76`	`}`
`77`	`77`	`}`