Merge branch 'master' of https://github.com/ashtru/sdk-php into loggingObjects

Conflicts:
	lib/net/authorize/util/Log.php

Author: Vyoam

lib/net/authorize/api/controller/base/ApiOperationBase.php

@@ -111,8 +111,7 @@ public function executeWithApiResponse($endPoint = \net\authorize\api\constants\
     public function execute($endPoint = \net\authorize\api\constants\ANetEnvironment::CUSTOM)
     {
         $this->beforeExecute();
-//        $this->logger->debugFormat("Request object :%s", $this->apiRequest);
-        $this->logger->debug($this->apiRequest);
+
         $this->logger->info("Request Serialization Begin");
         $xmlRequest = $this->serializer->serialize($this->apiRequest, 'xml');
         $this->logger->info("Request  Serialization End");

lib/net/authorize/util/ANetSensitiveFields.php

@@ -19,21 +19,25 @@ private static function getDefaulSensitiveXmlTags(){
     }
     public static function getSensitiveXmlTags(){
         $sensitiveTags = array();
-        if (file_exists(ANET_SENSITIVE_XMLTAGS_JSON_FILE)) {
+        $configFilePath = dirname(__FILE__) . "/" . ANET_SENSITIVE_XMLTAGS_JSON_FILE;
+        $userConfigFilePath = ANET_SENSITIVE_XMLTAGS_JSON_FILE;
+        if (file_exists($userConfigFilePath)) { //client config for tags
             //read list of tags(and associate regex-patterns and replacements) from .json file
-            $sensitiveTags = json_decode(file_get_contents(ANET_SENSITIVE_XMLTAGS_JSON_FILE));
-            if (json_last_error() === JSON_ERROR_NONE) {
-                // JSON is valid
+            $sensitiveTags = json_decode(file_get_contents($configFilePath));
+            if (json_last_error() === JSON_ERROR_NONE) {// JSON is valid
             }
             else{
-                echo "ERROR: Invalid json in: " . ANET_SENSITIVE_XMLTAGS_JSON_FILE  . " json_last_error_msg : " . json_last_error_msg();
+                echo "ERROR: Invalid json in: " . $userConfigFilePath  . " json_last_error_msg : " . json_last_error_msg();
                 return self::getDefaulSensitiveXmlTags();
             }
         }
-        else {
-            // if not present, create a local config file
-            $sensitiveTags = self::getDefaulSensitiveXmlTags();
-            file_put_contents(ANET_SENSITIVE_XMLTAGS_JSON_FILE, json_encode($sensitiveTags, JSON_PRETTY_PRINT));
+        else if (file_exists($configFilePath)) { //default sdk config for tags
+            $sensitiveTags = json_decode(file_get_contents($configFilePath));
+            if (json_last_error() === JSON_ERROR_NONE) {
+            }
+            else{
+                exit("ERROR: Invalid json in: " . $configFilePath  . " json_last_error_msg : " . json_last_error_msg());
+            }
         }
         //Check for disableMask flag in case of client json.
         $applySensitiveTags = array();

lib/net/authorize/util/AuthorizedNetSensitiveTagsConfig.json

@@ -0,0 +1,20 @@
+[
+    {
+        "tagName": "cardCode",
+        "pattern": "",
+        "replacement": "",
+        "disableMask": false
+    },
+    {
+        "tagName": "cardNumber",
+        "pattern": "^(\\d+)(\\d{4})$",
+        "replacement": "$xxxx-$3$4",
+        "disableMask": false
+    },
+    {
+        "tagName": "expirationDate",
+        "pattern": "",
+        "replacement": "",
+        "disableMask": false
+    }
+]