Update MerchantConfiguration.php

kikmak42 · web-flow · commit 7c5ebbb38633 · 2018-11-02T23:27:04.000+05:30
diff --git a/lib/Authentication/Core/MerchantConfiguration.php b/lib/Authentication/Core/MerchantConfiguration.php
@@ -770,16 +770,6 @@ public static function validateMerchantData($config)
             }
         }
 
-        if(empty($config->getCurlProxyHost())){
-            $warning_message .= GlobalParameter::INVALID_PROXY_URL.GlobalParameter::DEFAULT_PROXY_URL;
-            $config = $config->setCurlProxyHost(GlobalParameter::DEFAULT_PROXY_URL);
-        }
-
-        if(empty($config->getCurlProxyPort())){
-            $warning_message .= GlobalParameter::INVALID_PROXY_PORT.GlobalParameter::DEFAULT_PROXY_PORT;
-            $config = $config->setCurlProxyPort(GlobalParameter::DEFAULT_PROXY_PORT);
-        }
-
         if(empty($config->getKeyAlias()) && $config->getAuthenticationType() == GlobalParameter::JWT){
 
             $warning_message .= GlobalParameter::KEY_ALIAS_NULL_EMPTY;
@@ -832,4 +822,4 @@ public static function validateMerchantData($config)
 
 }
 
-?>
+?>

Original file line number	Diff line number	Diff line change
`@@ -770,16 +770,6 @@ public static function validateMerchantData($config)`
`770`	`770`	`}`
`771`	`771`	`}`
`772`	`772`
`773`		`- if(empty($config->getCurlProxyHost())){`
`774`		`- $warning_message .= GlobalParameter::INVALID_PROXY_URL.GlobalParameter::DEFAULT_PROXY_URL;`
`775`		`- $config = $config->setCurlProxyHost(GlobalParameter::DEFAULT_PROXY_URL);`
`776`		`- }`
`777`		`-`
`778`		`- if(empty($config->getCurlProxyPort())){`
`779`		`- $warning_message .= GlobalParameter::INVALID_PROXY_PORT.GlobalParameter::DEFAULT_PROXY_PORT;`
`780`		`- $config = $config->setCurlProxyPort(GlobalParameter::DEFAULT_PROXY_PORT);`
`781`		`- }`
`782`		`-`
`783`	`773`	`if(empty($config->getKeyAlias()) && $config->getAuthenticationType() == GlobalParameter::JWT){`
`784`	`774`
`785`	`775`	`$warning_message .= GlobalParameter::KEY_ALIAS_NULL_EMPTY;`
`@@ -832,4 +822,4 @@ public static function validateMerchantData($config)`
`832`	`822`
`833`	`823`	`}`
`834`	`824`
`835`		`-?>`
	`825`	`+?>`