cleanup soapclient constructor

dandb · Sep 9, 2015 · 1309e5f · 1309e5f
1 parent 5ac580c
commit 1309e5f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 25 deletions.
diff --git a/src/Credibility/LaravelCybersource/SOAPClient.php b/src/Credibility/LaravelCybersource/SOAPClient.php
@@ -2,16 +2,9 @@
 
 use BeSimple\SoapClient\SoapClient as BeSimpleSoapClient;
 use Credibility\LaravelCybersource\Exceptions\CybersourceException;
-use Illuminate\Foundation\Application;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Log;
 
 class SOAPClient extends BeSimpleSoapClient {
 
-    /**
-     * @var Illuminate\Foundation\Application
-     */
     public static $app;
 
     const DOM_VERSION = '1.0';
@@ -31,19 +24,15 @@ class SOAPClient extends BeSimpleSoapClient {
      * Constructs a client off of the
      * configured WSDL
      */
-    public function __construct(Application $app, $options = null)
+    public function __construct($app, array $options = [])
     {
         static::$app = $app;
 
         $this->wsdl = static::$app->make('config')->get('laravel-cybersource::wsdl_endpoint');
         $this->merchantId = static::$app->make('config')->get('laravel-cybersource::merchant_id');
         $this->transactionId = static::$app->make('config')->get('laravel-cybersource::transaction_id');
 
-        if(is_null($options)) {
-            parent::__construct($this->wsdl);
-        } else {
-            parent::__construct($this->wsdl, $options);
-        }
+        parent::__construct($this->wsdl, $options);
     }
 
     public function addWSSEToken()
@@ -70,10 +59,10 @@ public function addWSSEToken()
 
     /**
      * Static getInstance Method for updating SOAP options
-     * @param null $options
+     * @param array $options
      * @return SOAPClient
      */
-    public static function getInstance($options = null)
+    public static function getInstance(array $options = [])
     {
         $factory = new SOAPClientFactory(static::$app);
         return $factory->getInstance($options);

diff --git a/src/Credibility/LaravelCybersource/SOAPClientFactory.php b/src/Credibility/LaravelCybersource/SOAPClientFactory.php
@@ -4,10 +4,9 @@
 
 class SOAPClientFactory {
 
-    /** @var Illuminate\Foundation\Application */
     protected $app;
 
-    public function __construct(Application $app)
+    public function __construct($app)
     {
         $this->app = $app;
     }
@@ -17,7 +16,7 @@ public function __construct(Application $app)
      * @param null $options
      * @return SOAPClient
      */
-    public function getInstance($options = null)
+    public function getInstance(array $options = [])
     {
         return new SOAPClient($this->app, $options);
     }

diff --git a/src/Credibility/LaravelCybersource/SOAPRequester.php b/src/Credibility/LaravelCybersource/SOAPRequester.php
@@ -37,22 +37,22 @@ public function send(CybersourceSOAPModel $request)
 
     public function convertToStdClass(CybersourceSOAPModel $request)
     {
-        $contextOpts = array(
-            'http' => array(
+        $contextOpts = [
+            'http' => [
                 'timeout' => $this->timeout
-            )
-        );
+            ]
+        ];
 
         $context = stream_context_create($contextOpts);
 
-        $soapOts = array(
+        $soapOts = [
             'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP | SOAP_COMPRESSION_DEFLATE,
             'encoding' => 'utf-8',
             'exceptions' => true,
             'connection_timeout' => $this->timeout,
             'stream_context' => $context,
             'cache_wsdl' => WSDL_CACHE_MEMORY
-        );
+        ];
 
         try {
             $this->soapClient = $this->clientFactory->getInstance($soapOts);

diff --git a/tests/SOAPClientTest.php b/tests/SOAPClientTest.php
@@ -11,7 +11,7 @@ class SOAPClientTest extends TestCase {
     public function setUp()
     {
         parent::setUp();
-        $this->client = new SOAPClient($this->mockApp, null);
+        $this->client = new SOAPClient($this->mockApp);
     }
 
     public function testConstruct()