Skip to content

Commit

Permalink
Merge pull request #26 from KundKMC/master
Browse files Browse the repository at this point in the history 
Another PHP 8 issue in Backend
  • Loading branch information
@tobischo
tobischo authored Oct 30, 2023
2 parents 87c2a72 + 3dad13f commit 90f9ab3
Showing 1 changed file with 33 additions and 33 deletions.
66 changes: 33 additions & 33 deletions src/Request/Validate.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Barzahlen\Request;

use Barzahlen\Exception\ApiException;
Expand All @@ -17,7 +18,7 @@ public function checkSlipType($sSlipType)
//Only payment, payout, refund
$aSlipTypes = array('payment', 'payout', 'refund');

if(in_array($sSlipType, $aSlipTypes)) {
if (in_array($sSlipType, $aSlipTypes)) {
return true;
}

Expand All @@ -34,14 +35,13 @@ public function checkSlipType($sSlipType)
public function checkCustomerKey($sKey)
{
//Check length and only allowed characters, numbers and special chars
if(mb_strlen($sKey) > 80) {
if (mb_strlen($sKey) > 80) {
return false;
}

$sPattern = '/^[a-zA-Z0-9!"#$%&\'()*+,-.\/:;<=>?@\[\]^_{|}~]+$/m';

if(!preg_match($sPattern, $sKey))
{
if (!preg_match($sPattern, $sKey)) {
return false;
}

Expand All @@ -60,20 +60,20 @@ public function checkCustomerKey($sKey)
public function checkTransaction($fAmount, $sIso3Currency, $bThrowException = false)
{
//amount
if(!preg_match('/^[0-9]+\.[0-9]{2}$/', $fAmount)) {
if($bThrowException)
if (!preg_match('/^[0-9]+\.[0-9]{2}$/', $fAmount)) {
if ($bThrowException)
throw new ApiException('%s is not a valid float format for the amount like 13.23', 'N/A', array($fAmount), true);
return false;
}

if($fAmount > 1000.00) {
if($bThrowException)
if ($fAmount > 1000.00) {
if ($bThrowException)
throw new ApiException('%s is exceeding the amount limit of 999', 'N/A', array($fAmount), true);
return false;
}

if(!preg_match('/^[a-zA-Z]{3}$/', $sIso3Currency)) {
if($bThrowException)
if (!preg_match('/^[a-zA-Z]{3}$/', $sIso3Currency)) {
if ($bThrowException)
throw new ApiException('%s. Not a valid format for the currency setting like or EUR, USD', 'N/A', array($fAmount), true);
return false;
}
Expand All @@ -92,16 +92,16 @@ public function checkTransaction($fAmount, $sIso3Currency, $bThrowException = fa
public function checkHookUrl($sUrl, $bThrowException = false)
{
//check if is https://
if(mb_strpos($sUrl, 'https') === false) {
if($bThrowException)
if (mb_strpos($sUrl, 'https') === false) {
if ($bThrowException)
throw new ApiException('%s. A secure url (https) is essential.', 'N/A', array($sUrl), true);
return false;
}

//check if valid URL
$sPattern = '_^(?:(?:https?|ftp)://)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\x{00a1}-\x{ffff}0-9]+-?)*[a-z\x{00a1}-\x{ffff}0-9]+)(?:\.(?:[a-z\x{00a1}-\x{ffff}0-9]+-?)*[a-z\x{00a1}-\x{ffff}0-9]+)*(?:\.(?:[a-z\x{00a1}-\x{ffff}]{2,})))(?::\d{2,5})?(?:/[^\s]*)?$_iuS';
if(!preg_match($sPattern, $sUrl)) {
if($bThrowException)
if (!preg_match($sPattern, $sUrl)) {
if ($bThrowException)
throw new ApiException('%s is not a valid url format. ', 'N/A', array($sUrl), true);
return false;
}
Expand All @@ -122,8 +122,8 @@ public function checkExpiresAt($sDate, $bThrowException = false)
//check if is in future
try {
$oDate = new \DateTime($sDate);
if($oDate->format('Y-m-d\TH:i:s\Z') != $sDate) {
if($bThrowException)
if ($oDate->format('Y-m-d\TH:i:s\Z') != $sDate) {
if ($bThrowException)
throw new ApiException("%s is not a valid date format. 'Y-m-d\TH:i:s\Z'", 'N/A', array($sDate), true);
return false;
}
Expand All @@ -146,20 +146,20 @@ public function checkCustomer(array $aCustomerData, $bThrowException = false)
{
$aCustomerData['key'];

if(!preg_match("/^(\+[0-9]{2,3}|0+[0-9]{2,5}).+[\d\s\/()-]/", $aCustomerData['cell_phone'])) {
if($bThrowException)
if (!preg_match("/^(\+[0-9]{2,3}|0+[0-9]{2,5}).+[\d\s\/()-]/", $aCustomerData['cell_phone'])) {
if ($bThrowException)
throw new ApiException('%s. Not a valid phone number like +492211234567. Check length and digit.', 'N/A', array($aCustomerData['cell_phone']), false);
return false;
}

if (!filter_var($aCustomerData['email'], FILTER_VALIDATE_EMAIL)) {
if($bThrowException)
if ($bThrowException)
throw new ApiException('%s. Not a valid email address like email@email.com.', 'N/A', array($aCustomerData['email']), false);
return false;
}

if (!preg_match ("/[a-zA-Z]{2}/", $aCustomerData['country'])) {
if($bThrowException)
if (!preg_match("/[a-zA-Z]{2}/", $aCustomerData['country'])) {
if ($bThrowException)
throw new ApiException('%s. Not a valid email iso2 country DE or GB.', 'N/A', array($aCustomerData['country']), false);
return false;
}
Expand All @@ -175,20 +175,20 @@ public function checkCustomer(array $aCustomerData, $bThrowException = false)
*/
public function checkAddress($aAddress, $bThrowException = true)
{
if(mb_strlen($aAddress['zipcode']) < 4 && preg_match('/\d/', $aAddress['zipcode'])) {
if($bThrowException)
if (mb_strlen($aAddress['zipcode']) < 4 && preg_match('/\d/', $aAddress['zipcode'])) {
if ($bThrowException)
throw new ApiException('%s. Not a valid zipcode like 50679. Check length and digit.', 'N/A', array($aAddress['zipcode']), true);
return false;
}

if(mb_strlen($aAddress['city']) < 3 && !is_numeric($aAddress['street_and_no'])) {
if($bThrowException)
if (mb_strlen($aAddress['city']) < 3 && !is_numeric($aAddress['street_and_no'])) {
if ($bThrowException)
throw new ApiException('%s. Not a valid city like Berlin. Check length.', 'N/A', array($aAddress['zipcode']), true);
return false;
}

if(mb_strlen($aAddress['street_and_no']) < 5 && !is_numeric($aAddress['street_and_no'])) {
if($bThrowException)
if (mb_strlen($aAddress['street_and_no']) < 5 && !is_numeric($aAddress['street_and_no'])) {
if ($bThrowException)
throw new ApiException('%s. Not a valid street name and number like Wiener Platz 12.', 'N/A', array($aAddress['zipcode']), true);
return false;
}
Expand All @@ -205,20 +205,20 @@ public function checkAddress($aAddress, $bThrowException = true)
*/
public function checkLanguage($sLang, $bThrowException = true)
{
if(mb_strlen($sLang) != 5) {
if($bThrowException)
if (mb_strlen($sLang) != 5) {
if ($bThrowException)
throw new ApiException('%s. Not a valid language like de_DE or en_GB. Check string length.', 'N/A', array($sLang), true);
return false;
}

if($sLang{2} != '_') {
if($bThrowException)
if (substr($sLang, 2, 1) != '_') {
if ($bThrowException)
throw new ApiException('%s. Not a valid language like de_DE or en_GB. Missing _.', 'N/A', array($sLang), true);
return false;
}

if(!file_exists(getcwd() . DIRECTORY_SEPARATOR . Translate::LANGUAGE_FOLDER . DIRECTORY_SEPARATOR . $sLang . '.csv')) {
if($bThrowException)
if (!file_exists(getcwd() . DIRECTORY_SEPARATOR . Translate::LANGUAGE_FOLDER . DIRECTORY_SEPARATOR . $sLang . '.csv')) {
if ($bThrowException)
throw new ApiException('%s. Not a valid language like de_DE or en_GB. Missing language file.', 'N/A', array($sLang), true);
return false;
}
Expand Down

0 comments on commit 90f9ab3

Please sign in to comment.