Merge pull request #168 from ashtru/future

Allow setLogLevel. Added dependency, unit testing updates, default credentials for unit tests.

Author: ashtru

composer.json

@@ -11,9 +11,11 @@
         "ext-json": "*",
         "ext-simplexml": "*",
         "ext-xmlwriter": "*",
+        "goetas/xsd2php": "^2.0", 
         "goetas-webservices/xsd2php-runtime":"^0.2",
         "goetas-webservices/xsd-reader": "^0.1",
-        "jms/serializer": "serializer-master-dev as 1.0"
+        "jms/serializer": "serializer-master-dev as 1.0",
+        "symfony/yaml": "^3.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",

lib/AuthorizeNetAIM.php

@@ -475,7 +475,7 @@ public function __construct($response, $delimiter, $encap_char, $custom_fields)
 
             // Set custom fields
             if ($count = count($custom_fields)) {
-                $custom_fields_response = array_slice($this->_response_array, -$count, $count);
+                $custom_fields_response = array_slice($this->_response_array, -$count-1, $count);
                 $i = 0;
                 foreach ($custom_fields as $key => $value) {
                     $this->$key = $custom_fields_response[$i];

lib/net/authorize/util/Log.php

@@ -30,6 +30,7 @@ class Log
 {
     private $sensitiveXmlTags = NULL;
     private $logFile = '';
+    private $logLevel = ANET_LOG_LEVEL;
 
 	/**
 	* Takes a regex pattern (string) as argument and adds the forward slash delimiter.
@@ -270,25 +271,25 @@ private function log($logLevelPrefix, $logMessage, $flags){
 
     public function debug($logMessage, $flags=FILE_APPEND)
     {
-        if(ANET_LOG_DEBUG >= ANET_LOG_LEVEL){
+        if(ANET_LOG_DEBUG >= $this->logLevel){
             $this->log(ANET_LOG_DEBUG_PREFIX, $logMessage,$flags);
         }
     }
 
     public function info($logMessage, $flags=FILE_APPEND){
-        if(ANET_LOG_INFO >= ANET_LOG_LEVEL) {
+        if(ANET_LOG_INFO >= $this->logLevel) {
             $this->log(ANET_LOG_INFO_PREFIX, $logMessage,$flags);
         }
     }
 
 	public function warn($logMessage, $flags=FILE_APPEND){
-        if(ANET_LOG_WARN >= ANET_LOG_LEVEL) {
+        if(ANET_LOG_WARN >= $this->logLevel) {
             $this->log(ANET_LOG_WARN_PREFIX, $logMessage,$flags);
         }
     }
 
     public function error($logMessage, $flags=FILE_APPEND){
-        if(ANET_LOG_ERROR >= ANET_LOG_LEVEL) {
+        if(ANET_LOG_ERROR >= $this->logLevel) {
             $this->log(ANET_LOG_ERROR_PREFIX, $logMessage,$flags);
         }
     }
@@ -308,29 +309,44 @@ private function logFormat($logLevelPrefix, $format, $objects, $flags){
 
 	public function debugFormat($format, $args=array(),  $flags=FILE_APPEND)
     {
-        if(ANET_LOG_DEBUG >= ANET_LOG_LEVEL){
+        if(ANET_LOG_DEBUG >= $this->logLevel){
             $this->logFormat(ANET_LOG_DEBUG_PREFIX, $format, $args , $flags);
         }
     }
 
 	public function infoFormat($format, $args=array(),  $flags=FILE_APPEND){
-        if(ANET_LOG_INFO >= ANET_LOG_LEVEL) {
+        if(ANET_LOG_INFO >= $this->logLevel) {
             $this->logFormat(ANET_LOG_INFO_PREFIX, $format, $args , $flags);
         }
     }
 
 	public function warnFormat($format, $args=array(),  $flags=FILE_APPEND){
-        if(ANET_LOG_WARN >= ANET_LOG_LEVEL) {
+        if(ANET_LOG_WARN >= $this->logLevel) {
             $this->logFormat(ANET_LOG_WARN_PREFIX, $format, $args , $flags);
         }
     }
 
     public function errorFormat($format, $args=array(),  $flags=FILE_APPEND){
-        if(ANET_LOG_ERROR >= ANET_LOG_LEVEL) {
+        if(ANET_LOG_ERROR >= $this->logLevel) {
 			$this->logFormat(ANET_LOG_ERROR_PREFIX, $format, $args , $flags);
         }
     }
 
+    /**
+     * @param string $logLevel
+     * possible values = ANET_LOG_DEBUG, ANET_LOG_INFO, ANET_LOG_WARN, ANET_LOG_ERROR
+     */
+    public function setLogLevel($logLevel){
+        $this->logLevel = $logLevel;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogLevel(){
+        return $this->logLevel;
+    }
+
     /**
      * @param string $logFile
      */
@@ -350,4 +366,4 @@ public function __construct(){
         $this->sensitiveStringRegexes = ANetSensitiveFields::getSensitiveStringRegexes();
     }
 }
-?>
+?>

phpunit.xml.dist

@@ -32,7 +32,7 @@
 
         <!-- Enter your test account credentials to run tests against sandbox. -->
         <const name="AUTHORIZENET_API_LOGIN_ID" value="5KP3u95bQpv" />
-        <const name="AUTHORIZENET_TRANSACTION_KEY" value="4Ktq966gC55GAX7S" />
+        <const name="AUTHORIZENET_TRANSACTION_KEY" value="346HZ32z3fP4hTG2" />
         <const name="AUTHORIZENET_MD5_SETTING" value="" />
 
         <!-- Enter your live account credentials to run tests against production gateway. -->

tests/AuthorizeNetCIM_Test.php

@@ -448,7 +448,7 @@ public function testGetCustomerProfileIds()
   {
     // A valid response should be received when a merchant has zero customer profiles...
     // Hence, first testing using specific credentials for a merchant which has zero customer profiles...  
-    $request = new AuthorizeNetCIM('5KP3u95bQpv','4Ktq966gC55GAX7S');
+    $request = new AuthorizeNetCIM('5KP3u95bQpv','346HZ32z3fP4hTG2');
     $response = $request->getCustomerProfileIds();