Changes Processor from static to an instantiatable class

craigpaul · Oct 25, 2016 · ebf3791 · ebf3791
1 parent 6f056d6
commit ebf3791
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/src/Gateway.php b/src/Gateway.php
@@ -182,7 +182,9 @@ public function purchase(array $params = [])
      */
     protected function process(Transaction $transaction)
     {
-        return Processor::process($transaction);
+        $processor = new Processor();
+
+        return $processor->process($transaction);
     }
 
     /**

diff --git a/src/Processor.php b/src/Processor.php
@@ -9,7 +9,7 @@ class Processor
      *
      * @var array
      */
-    protected static $config = [
+    protected $config = [
         'protocol' => 'https',
         'host' => 'esqa.moneris.com',
         'port' => '443',
@@ -23,7 +23,7 @@ class Processor
      *
      * @var string
      */
-    protected static $error = "<?xml version=\"1.0\"?><response><receipt><ReceiptId>Global Error Receipt</ReceiptId><ReferenceNum>null</ReferenceNum><ResponseCode>null</ResponseCode><ISO>null</ISO> <AuthCode>null</AuthCode><TransTime>null</TransTime><TransDate>null</TransDate><TransType>null</TransType><Complete>false</Complete><Message>null</Message><TransAmount>null</TransAmount><CardType>null</CardType><TransID>null</TransID><TimedOut>null</TimedOut></receipt></response>";
+    protected $error = "<?xml version=\"1.0\"?><response><receipt><ReceiptId>Global Error Receipt</ReceiptId><ReferenceNum>null</ReferenceNum><ResponseCode>null</ResponseCode><ISO>null</ISO> <AuthCode>null</AuthCode><TransTime>null</TransTime><TransDate>null</TransDate><TransType>null</TransType><Complete>false</Complete><Message>null</Message><TransAmount>null</TransAmount><CardType>null</CardType><TransID>null</TransID><TimedOut>null</TimedOut></receipt></response>";
 
     /**
      * Retrieve the API configuration.
@@ -32,13 +32,13 @@ class Processor
      *
      * @return array
      */
-    public static function config(string $environment)
+    public function config(string $environment)
     {
         if ($environment === Moneris::ENV_LIVE) {
-            self::$config['host'] = 'www3.moneris.com';
+            $this->config['host'] = 'www3.moneris.com';
         }
 
-        return self::$config;
+        return $this->config;
     }
 
     /**
@@ -49,7 +49,7 @@ public static function config(string $environment)
      *
      * @return \CraigPaul\Moneris\Response
      */
-    public static function process(Transaction $transaction)
+    public function process(Transaction $transaction)
     {
         if ($transaction->invalid()) {
             $response = new Response($transaction);
@@ -60,7 +60,7 @@ public static function process(Transaction $transaction)
             return $response;
         }
 
-        $response = self::submit($transaction);
+        $response = $this->submit($transaction);
 
         return $transaction->validate($response);
     }
@@ -70,9 +70,9 @@ public static function process(Transaction $transaction)
      *
      * @return \SimpleXMLElement
      */
-    protected static function error()
+    protected function error()
     {
-        return simplexml_load_string(self::$error);
+        return simplexml_load_string($this->error);
     }
 
     /**
@@ -84,7 +84,7 @@ protected static function error()
      *
      * @return string
      */
-    protected static function send(array $config, string $url, string $xml)
+    protected function send(array $config, string $url, string $xml)
     {
         $curl = curl_init();
 
@@ -111,24 +111,24 @@ protected static function send(array $config, string $url, string $xml)
      *
      * @return \SimpleXMLElement|string
      */
-    protected static function submit(Transaction $transaction)
+    protected function submit(Transaction $transaction)
     {
-        $config = self::config($transaction->gateway->environment);
+        $config = $this->config($transaction->gateway->environment);
 
         $url = $config['protocol'].'://'.$config['host'].':'.$config['port'].$config['url'];
 
         $xml = str_replace(' </', '</', $transaction->toXml());
 
-        $response = self::send($config, $url, $xml);
+        $response = $this->send($config, $url, $xml);
 
         if (!$response) {
-            return self::error();
+            return $this->error();
         }
 
         $response = @simplexml_load_string($response);
 
         if ($response === false) {
-            return self::error();
+            return $this->error();
         }
 
         return $response;