Issue : 115

Removed date_default_timezone_set usages.

Author: lakshmisundar

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "sample-code-php"]
 	path = sample-code-php
-	url = https://github.com/Authorizenet/sample-code-php.git
+	url = https://github.com/AuthorizeNet/sample-code-php.git

.travis.yml

@@ -3,19 +3,20 @@ language: php
 php:
     - 5.6
     - 7.0
-    
+
 sudo: false
 
 before_script:
     - pecl install xmldiff
     - composer install --prefer-dist --ignore-platform-reqs
-    - chmod +x ./test-sample-codes.sh
-    - git submodule update --recursive
-    
+    - git submodule update --remote --recursive
+
 script:
     - vendor/phpunit/phpunit/phpunit --coverage-clover=coverage.clover
+    - cd sample-code-php
+    - composer install --prefer-dist --ignore-platform-reqs
+    - vendor/phpunit/phpunit/phpunit test-runner.php .
 
 after_script:
     - wget https://scrutinizer-ci.com/ocular.phar
     - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-    - ./test-sample-codes.sh

README.md

@@ -1,7 +1,7 @@
 Authorize.Net PHP SDK
 ======================
 
-[![Build Status] (https://travis-ci.org/AuthorizeNet/sdk-php.png?branch=master)]
+[![Build Status] (https://travis-ci.org/AuthorizeNet/sdk-php.png?branch=future)]
 (https://travis-ci.org/AuthorizeNet/sdk-php)
 
 

doc/SIM.markdown

@@ -11,9 +11,9 @@ a Server Integration Method solution.
 Hosted Order/Receipt Page
 -------------------------
 
-The AuthorizeNetSIM_Form class aims to make it easier to setup the hidden
+The `AuthorizeNetSIM_Form` class aims to make it easier to setup the hidden
 fields necessary for creating a SIM experience. While it is not necessary
-to use the AuthorizeNetSIM_Form class to implement SIM, it may be handy for
+to use the `AuthorizeNetSIM_Form` class to implement SIM, it may be handy for
 reference.
 
 The code below will generate a buy now button that leads to a hosted order page:
@@ -44,7 +44,7 @@ echo $sim->getHiddenFieldString();?>
 Fingerprint Generation
 ----------------------
 
-To generate the fingerprint needed for a SIM transaction call the getFingerprint method:
+To generate the fingerprint needed for a SIM transaction call the `getFingerprint` method:
 
 ```PHP
 $fingerprint = AuthorizeNetSIM_Form::getFingerprint($api_login_id, $transaction_key, $amount, $fp_sequence, $fp_timestamp);
@@ -53,15 +53,15 @@ $fingerprint = AuthorizeNetSIM_Form::getFingerprint($api_login_id, $transaction_
 Relay Response
 --------------
 
-The PHP SDK includes a AuthorizeNetSIM class for handling a relay response from
+The PHP SDK includes a `AuthorizeNetSIM` class for handling a relay response from
 Authorize.Net.
 
 To receive a relay response from Authorize.Net you can either configure the
 url in the Merchant Interface or specify the url when submitting a transaction
 with SIM using the "x_relay_url" field.
 
 When a transaction occurs, Authorize.Net will post the transaction details to
-this url. You can then craete a page on your server at a url such as
+this url. You can then create a page on your server at a url such as
 http://yourdomain.com/response_handler.php and execute any logic you want
 when a transaction occurs. The AuthorizeNetSIM class makes it easy to verify
 the transaction came from Authorize.Net and parse the response:

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

@@ -48,7 +48,6 @@ abstract class ApiOperationBase implements IApiOperation
      */
     public function __construct(\net\authorize\api\contract\v1\AnetApiRequestType $request, $responseType)
     {
-        date_default_timezone_set('UTC');
         $this->logger = LogFactory::getLog(get_class($this));
 
         if ( null == $request)

lib/net/authorize/util/Helpers.php

@@ -19,7 +19,6 @@ public static function now()
         //init only once
         if ( ! self::$initialized)
         {
-            date_default_timezone_set('UTC');
             self::$initialized = true;
         }
         return date( DATE_RFC2822);

lib/net/authorize/util/HttpClient.php

@@ -15,17 +15,14 @@ class HttpClient
     private $_Url = "";
 
     public $VERIFY_PEER = true; // attempt trust validation of SSL certificates when establishing secure connections.
-    private $_log_file = false;
     private $logger = NULL;
     /**
      * Constructor.
      *
      */
     public function __construct()
     {
-        $this->_log_file = (defined('AUTHORIZENET_LOG_FILE') ? AUTHORIZENET_LOG_FILE : false);
         $this->logger = LogFactory::getLog(get_class($this));
-        date_default_timezone_set('UTC');
     }
 
     /**
@@ -54,7 +51,7 @@ public function _getPostUrl()
      */
     public function setLogFile($filepath)
     {
-        $this->_log_file = $filepath;
+        $this->logger->setLogFile($filepath);
     }
 
     /**
@@ -82,7 +79,7 @@ public function _sendRequest($xmlRequest)
         if ($this->VERIFY_PEER) {
             curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)) . '/../../ssl/cert.pem');
         } else {
-            $this->logger("Invalid SSL option for the request");
+            $this->logger->error("Invalid SSL option for the request");
             return false;
         }
 
@@ -104,7 +101,7 @@ public function _sendRequest($xmlRequest)
                 $this->now(), $ex->getCode(), $ex->getMessage(), $ex->getTraceAsString(), $ex->getFile(), $ex->getLine() );
             $this->logger->error($errorMessage);
         }
-        if ($this->_log_file) {
+        if ($this->logger && $this->logger->getLogFile()) {
             if ($curl_error = curl_error($curl_request)) {
                 $this->logger->error("CURL ERROR: $curl_error");
             }

lib/net/authorize/util/Log.php

@@ -4,7 +4,6 @@
 use net\authorize\util\ANetSensitiveFields;
 
 define ("ANET_LOG_FILES_APPEND",true);
-define ("ANET_LOG_FILE","phplog");
 
 define("ANET_LOG_DEBUG_PREFIX","DEBUG");
 define("ANET_LOG_INFO_PREFIX","INFO");
@@ -30,6 +29,7 @@
 class Log
 {
     private $sensitiveXmlTags = NULL;
+    private $logFile = '';
 
 	/**
 	* Takes a regex pattern (string) as argument and adds the forward slash delimiter.
@@ -247,6 +247,7 @@ private function getMasked($raw)
     }
 
 	private function log($logLevelPrefix, $logMessage, $flags){
+        if (!$this->logFile) return;
         //masking
         $logMessage = $this->getMasked($logMessage);
 
@@ -264,7 +265,7 @@ private function log($logLevelPrefix, $logMessage, $flags){
         //Add timestamp, log level, method, file, line
         $logString = sprintf("\n %s %s : [%s] (%s : %s) - %s", \net\authorize\util\Helpers::now(), $logLevelPrefix,
             $methodName, $fileName, $lineNumber, $logMessage);
-        file_put_contents(ANET_LOG_FILE, $logString, $flags);
+        file_put_contents($this->logFile, $logString, $flags);
     }
 
     public function debug($logMessage, $flags=FILE_APPEND)
@@ -298,9 +299,9 @@ private function logFormat($logLevelPrefix, $format, $objects, $flags){
                 $objects[$i] = $this->getMasked($testObject);
             }
             $logMessage = vsprintf($format, $objects);
-            log($logLevelPrefix, $logMessage, $flags);
+            $this->log($logLevelPrefix, $logMessage, $flags);
         }
-        catch(Exception $e){
+        catch(\Exception $e){
             $this->debug("Incorrect log message format: " . $e->getMessage());
         }
     }
@@ -329,6 +330,20 @@ public function errorFormat($format, $args=array(),  $flags=FILE_APPEND){
 			$this->logFormat(ANET_LOG_ERROR_PREFIX, $format, $args , $flags);
         }
     }
+
+    /**
+     * @param string $logFile
+     */
+    public function setLogFile($logFile){
+        $this->logFile = $logFile;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogFile(){
+        return $this->logFile;
+    }
 
     public function __construct(){
         $this->sensitiveXmlTags = ANetSensitiveFields::getSensitiveXmlTags();

lib/net/authorize/util/LogFactory.php

@@ -7,6 +7,9 @@ class LogFactory
     public static function getLog($classType){
         if(NULL == self::$logger){
             self::$logger = new Log();
+            if(defined('AUTHORIZENET_LOG_FILE')){
+                self::$logger->setLogFile(AUTHORIZENET_LOG_FILE);
+            }
         }
         return self::$logger;
     }

lib/shared/AuthorizeNetRequest.php

@@ -1,4 +1,6 @@
 <?php
+use net\authorize\util\LogFactory;
+
 /**
  * Sends requests to the Authorize.Net gateways.
  *
@@ -13,7 +15,7 @@ abstract class AuthorizeNetRequest
     protected $_post_string; 
     public $VERIFY_PEER = true; // attempt trust validation of SSL certificates when establishing secure connections.
     protected $_sandbox = true;
-    protected $_log_file = false;
+    protected $_logger = null;
 
     /**
      * Set the _post_string
@@ -42,7 +44,7 @@ public function __construct($api_login_id = false, $transaction_key = false)
         $this->_api_login = ($api_login_id ? $api_login_id : (defined('AUTHORIZENET_API_LOGIN_ID') ? AUTHORIZENET_API_LOGIN_ID : ""));
         $this->_transaction_key = ($transaction_key ? $transaction_key : (defined('AUTHORIZENET_TRANSACTION_KEY') ? AUTHORIZENET_TRANSACTION_KEY : ""));
         $this->_sandbox = (defined('AUTHORIZENET_SANDBOX') ? AUTHORIZENET_SANDBOX : true);
-        $this->_log_file = (defined('AUTHORIZENET_LOG_FILE') ? AUTHORIZENET_LOG_FILE : false);
+        $this->_logger = LogFactory::getLog(get_class($this));
     }
 
     /**
@@ -62,7 +64,7 @@ public function setSandbox($bool)
      */
     public function setLogFile($filepath)
     {
-        $this->_log_file = $filepath;
+        $this->_logger->setLogFile($filepath);
     }
 
     /**
@@ -94,9 +96,9 @@ protected function _sendRequest()
         if ($this->VERIFY_PEER) {
             curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)) . '/ssl/cert.pem');
         } else {
-			if ($this->_log_file) {
-				file_put_contents($this->_log_file, "----Request----\nInvalid SSL option\n", FILE_APPEND);
-			}
+            if ($this->_logger) {
+                $this->_logger->error("----Request----\nInvalid SSL option\n");
+            }
 			return false;
         }
 
@@ -106,15 +108,13 @@ protected function _sendRequest()
 
         $response = curl_exec($curl_request);
 
-        if ($this->_log_file) {
-        
+        if ($this->_logger) {
             if ($curl_error = curl_error($curl_request)) {
-                file_put_contents($this->_log_file, "----CURL ERROR----\n$curl_error\n\n", FILE_APPEND);
+                $this->_logger->error("----CURL ERROR----\n$curl_error\n\n");
             }
             // Do not log requests that could contain CC info.
-             file_put_contents($this->_log_file, "----Request----\n{$this->_post_string}\n", FILE_APPEND);
-            
-            file_put_contents($this->_log_file, "----Response----\n$response\n\n", FILE_APPEND);
+            $this->_logger->info("----Request----\n{$this->_post_string}\n");
+            $this->_logger->info("----Response----\n$response\n\n");
         }
         curl_close($curl_request);