Environment simplified to use uri as an environement parameter

mkorkmaz · mkorkmaz · commit f1f4ff44aef1 · 2017-03-30T22:01:18.000+03:00
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ composer require mkorkmaz/msu-php-sdk
 ## Basic Usage
 
 ```php
-$env = 'test'; // Options: 'test', 'production'
+$env = 'https://test.merchantsafeunipay.com/msu/api/v2'; 
 $merchant = 'COMPANYNAME'; // Given by Asseco
 $merchantUser = 'apiuser@companyname.com'; // Created on MSU Panel
 $merchantPassword = 'u+B56?mcjh23'; // Created on MSU Panel
diff --git a/src/SDK/Client.php b/src/SDK/Client.php
@@ -11,7 +11,8 @@
 namespace MerchantSafeUnipay\SDK;
 
 use GuzzleHttp\Client as GuzzleClient;
-use MerchantSafeUnipay\SDK\Environment\EnvironmentInterface as Environment;
+use function MerchantSafeUnipay\convertSnakeCase;
+use MerchantSafeUnipay\SDK\Environment;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
 use MerchantSafeUnipay\SDK\Action\ActionInterface;
@@ -146,7 +147,7 @@ public function query(string $name, array $arguments)
     private function getCallAction(string $name, array $arguments)
     {
         $namespace = '\\MerchantSafeUnipay\\SDK\\Action';
-        $actionClass =  $namespace . '\\'. ucfirst($name);
+        $actionClass =  $namespace . '\\'. convertSnakeCase($name);
         if (!in_array($name, self::$validActions, true) || !class_exists($actionClass)) {
             $message = sprintf('%s is not valid MerchantSafeUnipay API action.', $name);
             throw new BadMethodCallException($message);
@@ -157,7 +158,7 @@ private function getQueryAction(string $name, array $arguments)
     {
         $name = str_replace(' ', '', ucwords(str_replace('_', '', $name)));
         $namespace = '\\MerchantSafeUnipay\\SDK\\Action\\Query';
-        $actionClass =  $namespace . '\\'. ucfirst($name);
+        $actionClass =  $namespace . '\\'. convertSnakeCase($name);
         if (!in_array($name, self::$validQueryActions, true) || !class_exists($actionClass)) {
             $message = sprintf('%s is not valid MerchantSafeUnipay API query action.', $name);
             throw new BadMethodCallException($message);
@@ -175,7 +176,7 @@ private function getQueryAction(string $name, array $arguments)
      */
     private function actionFactory(string $name, array $arguments, string $namespace)
     {
-        $actionClass =  $namespace . '\\'. ucfirst($name);
+        $actionClass =  $namespace . '\\'. convertSnakeCase($name);
         $actionName = $arguments[0];
         $actionObject = new $actionClass($this->environment->getMerchantData());
         if (!method_exists($actionObject, $actionName)) {
diff --git a/src/SDK/ClientBuilder.php b/src/SDK/ClientBuilder.php
@@ -16,27 +16,19 @@ final class ClientBuilder
     private $environment;
     private $logger;
 
-    static private $validEnvironments = ['Test', 'Production'];
 
     public static function create()
     {
         return new static();
     }
 
     public function setEnvironment(
-        string $environment,
+        string $apiUrl,
         string $merchant,
         string $merchantUser,
         string $merchantPassword
     ) {
-    
-        $environment = ucfirst(strtolower($environment));
-        if (!in_array($environment, self::$validEnvironments, true)) {
-            $message = sprintf('%s is not valid environment.', $environment);
-            throw new InvalidArgumentException($message);
-        }
-        $environmentClass = "\\MerchantSafeUnipay\\SDK\\Environment\\{$environment}";
-        $this->environment = new $environmentClass($merchant, $merchantUser, $merchantPassword);
+        $this->environment = new Environment($apiUrl, $merchant, $merchantUser, $merchantPassword);
         return $this;
     }
 
diff --git a/src/SDK/Environment.php b/src/SDK/Environment.php
@@ -1,23 +1,24 @@
 <?php declare(strict_types=1);
 
-namespace MerchantSafeUnipay\SDK\Environment;
+namespace MerchantSafeUnipay\SDK;
 
-abstract class EnvironmentAbstract
+class Environment
 {
     protected $merchant;
     protected $merchantUser;
     protected $merchantPassword;
 
-    public function __construct(string $merchant, string $merchantUser, string $merchantPassword)
+    public function __construct(string $apiUrl, string $merchant, string $merchantUser, string $merchantPassword)
     {
+        $this->apiUrl = $apiUrl;
         $this->merchant = $merchant;
         $this->merchantUser = $merchantUser;
         $this->merchantPassword = $merchantPassword;
     }
 
     public function getUrl()
     {
-        return static::$apiUrl;
+        return $this->apiUrl;
     }
 
     public function getMerchantData()
diff --git a/src/SDK/Environment/EnvironmentInterface.php b/src/SDK/Environment/EnvironmentInterface.php
diff --git a/src/SDK/Environment/Integration.php b/src/SDK/Environment/Integration.php
diff --git a/src/SDK/Environment/Production.php b/src/SDK/Environment/Production.php
diff --git a/src/SDK/Environment/Test.php b/src/SDK/Environment/Test.php
diff --git a/src/functions.php b/src/functions.php
@@ -24,3 +24,8 @@ function ($match) use ($separator) {
         $str
     );
 }
+
+function convertSnakeCase(string $str)
+{
+    return str_replace(' ','', ucwords(str_replace('_', ' ', $str)));
+}
diff --git a/tests/SDK/Actions/FinancialTransactionsClassTest.php b/tests/SDK/Actions/FinancialTransactionsClassTest.php
@@ -24,7 +24,7 @@ public function setUp()
         }
         $this->client = ClientBuilder::create()
             ->setEnvironment(
-                'test',
+                'https://test.merchantsafeunipay.com/msu/api/v2',
                 $MSUPHPSDK_M,
                 $MSUPHPSDK_U,
                 $MSUPHPSDK_P
diff --git a/tests/SDK/ClientBuilderClassTest.php b/tests/SDK/ClientBuilderClassTest.php
@@ -6,7 +6,6 @@
 
 use PHPUnit\Framework\TestCase;
 use MerchantSafeUnipay\SDK;
-use MerchantSafeUnipay\SDK\Exception\InvalidArgumentException;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
 
@@ -35,23 +34,11 @@ public function shouldReturnClientObjectSuccessfullyForDifferentEnvironments(
     public function environmentDataProvider()
     {
         return [
-            ['test', 'm', 'mu', 'mp'],
-            ['production', 'm', 'mu', 'mp']
+            ['https://test.merchantsafeunipay.com/msu/api/v2', 'm', 'mu', 'mp'],
+            ['https://merchantsafeunipay.com/msu/api/v2', 'm', 'mu', 'mp']
         ];
     }
 
-    /**
-     * @test
-     * @expectedException InvalidArgumentException
-     */
-    public function shouldFailToInstantiateClientObjectSuccessfullyForInvalidEnvironment()
-    {
-        SDK\ClientBuilder::create()
-            ->setEnvironment('invalid_env', 'm', 'mu', 'mp')
-            ->build();
-    }
-
-
     /**
      * @test
      */
@@ -64,7 +51,6 @@ public function shouldInstantiateClientObjectSuccessfullyForNullLogger()
         $this->assertInstanceOf(SDK\Client::class, $client);
     }
 
-
     /**
      * @test
      */
diff --git a/tests/SDK/EnvironmentClassTest.php b/tests/SDK/EnvironmentClassTest.php
@@ -6,67 +6,43 @@
 use PHPUnit\Framework\TestCase;
 use MerchantSafeUnipay\SDK\Environment;
 
-class EnvironmentClassesTest extends TestCase
+class EnvironmentClassTest extends TestCase
 {
+    static protected $apiUrl = 'https://test.merchantsafeunipay.com/msu/api/v2';
     static protected $merchantData = [
         'merchant' => 'MKorkmaz',
         'merchantUsername' => 'MKorkmazUserName',
         'merchantPassword' => 'Passwd',
     ];
-
-    static protected $apiTestUrl = 'https://test.merchantsafeunipay.com/msu/api/v2';
-    static protected $apiIntegrationUrl = 'https://entegrasyon.asseco-see.com.tr/msu/api/v2';
-    static protected $apiProductionUrl = 'https://merchantsafeunipay.com/msu/api/v2';
-
-
-    protected $testEnv;
-    protected $productionEnv;
+    protected $environment;
 
     public function setUp()
     {
-        $this->testEnv = new Environment\Test(
-            self::$merchantData['merchant'],
-            self::$merchantData['merchantUsername'],
-            self::$merchantData['merchantPassword']
-        );
-
-        $this->productionEnv = new Environment\Production(
+        $this->environment = new Environment(
+            self::$apiUrl,
             self::$merchantData['merchant'],
             self::$merchantData['merchantUsername'],
             self::$merchantData['merchantPassword']
         );
     }
 
-
     /**
      * @test
      */
-    public function shouldReturnTestUrlSuccessfully()
+    public function shouldReturnApiUrlSuccessfully()
     {
-        $this->assertEquals(self::$apiTestUrl, $this->testEnv->getUrl());
+        $this->assertEquals(self::$apiUrl, $this->environment->getUrl());
     }
 
-
-    /**
-     * @test
-     */
-    public function shouldReturnProductionUrlSuccessfully()
-    {
-        $this->assertEquals(self::$apiProductionUrl, $this->productionEnv->getUrl());
-    }
-
-
     /**
      * @test
      */
     public function shouldReturnMerchantDataSuccessfully()
     {
-        $merchantData = $this->testEnv->getMerchantData();
-
+        $merchantData = $this->environment->getMerchantData();
         $this->assertArrayHasKey('MERCHANT', $merchantData);
         $this->assertArrayHasKey('MERCHANTUSER', $merchantData);
         $this->assertArrayHasKey('MERCHANTPASSWORD', $merchantData);
-
         $this->assertEquals(self::$merchantData['merchant'], $merchantData['MERCHANT']);
         $this->assertEquals(self::$merchantData['merchantUsername'], $merchantData['MERCHANTUSER']);
         $this->assertEquals(self::$merchantData['merchantPassword'], $merchantData['MERCHANTPASSWORD']);
diff --git a/tests/functionsTest.php b/tests/functionsTest.php
@@ -52,4 +52,16 @@ public function shouldChangeCamelCaseSuccessfully()
         $convertedString = MerchantSafeUnipay\convertCamelCase($str, ' ');
         $this->assertEquals('camel case string', $convertedString);
     }
+
+
+    /**
+     * @test
+     */
+
+    public function shouldChangeSnakeCaseSuccessfully()
+    {
+        $str = 'snake_case_string';
+        $convertedString = MerchantSafeUnipay\convertSnakeCase($str);
+        $this->assertEquals('SnakeCaseString', $convertedString);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,24 @@`
`1`	`1`	`<?php declare(strict_types=1);`
`2`	`2`
`3`		`-namespace MerchantSafeUnipay\SDK\Environment;`
	`3`	`+namespace MerchantSafeUnipay\SDK;`
`4`	`4`
`5`		`-abstract class EnvironmentAbstract`
	`5`	`+class Environment`
`6`	`6`	`{`
`7`	`7`	`protected $merchant;`
`8`	`8`	`protected $merchantUser;`
`9`	`9`	`protected $merchantPassword;`
`10`	`10`
`11`		`- public function __construct(string $merchant, string $merchantUser, string $merchantPassword)`
	`11`	`+ public function __construct(string $apiUrl, string $merchant, string $merchantUser, string $merchantPassword)`
`12`	`12`	`{`
	`13`	`+ $this->apiUrl = $apiUrl;`
`13`	`14`	`$this->merchant = $merchant;`
`14`	`15`	`$this->merchantUser = $merchantUser;`
`15`	`16`	`$this->merchantPassword = $merchantPassword;`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`public function getUrl()`
`19`	`20`	`{`
`20`		`- return static::$apiUrl;`
	`21`	`+ return $this->apiUrl;`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`public function getMerchantData()`
Original file line number	Diff line number	Diff line change
`@@ -24,3 +24,8 @@ function ($match) use ($separator) {`
`24`	`24`	`$str`
`25`	`25`	`);`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+function convertSnakeCase(string $str)`
	`29`	`+{`
	`30`	`+ return str_replace(' ','', ucwords(str_replace('_', ' ', $str)));`
	`31`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function setUp()`
`24`	`24`	`}`
`25`	`25`	`$this->client = ClientBuilder::create()`
`26`	`26`	`->setEnvironment(`
`27`		`- 'test',`
	`27`	`+ 'https://test.merchantsafeunipay.com/msu/api/v2',`
`28`	`28`	`$MSUPHPSDK_M,`
`29`	`29`	`$MSUPHPSDK_U,`
`30`	`30`	`$MSUPHPSDK_P`