Improved namespace structure.

AmazonPay/Client.php

@@ -7,17 +7,6 @@
  * returns Response Object
  */
 
-require_once 'ResponseParser.php';
-require_once 'HttpCurl.php';
-require_once 'ClientInterface.php';
-require_once 'Regions.php';
-if (!interface_exists('\Psr\Log\LoggerAwareInterface')) {
-    require_once(__DIR__.'/../Psr/Log/LoggerAwareInterface.php');
-}
-
-if (!interface_exists('\Psr\Log\LoggerInterface')) {
-    require_once(__DIR__.'/../Psr/Log/LoggerInterface.php');
-}
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 

AmazonPay/HttpCurl.php

@@ -5,8 +5,6 @@
  * Handles Curl POST function for all requests
  */
 
-require_once 'HttpCurlInterface.php';
-
 class HttpCurl implements HttpCurlInterface
 {
     private $config = array();

AmazonPay/IpnHandler.php

@@ -1,19 +1,12 @@
 <?php
+
 namespace AmazonPay;
 
 /* Class IPN_Handler
  * Takes headers and body of the IPN message as input in the constructor
  * verifies that the IPN is from the right resource and has the valid data
  */
 
-require_once 'HttpCurl.php';
-require_once 'IpnHandlerInterface.php';
-if (!interface_exists('\Psr\Log\LoggerAwareInterface')) {
-    require_once(__DIR__.'/../Psr/Log/LoggerAwareInterface.php');
-}
-if (!interface_exists('\Psr\Log\LoggerInterface')) {
-    require_once(__DIR__.'/../Psr/Log/LoggerInterface.php');
-}
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 

AmazonPay/Regions.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace AmazonPay;
 
 /* Class Regions

AmazonPay/ResponseParser.php

@@ -1,12 +1,11 @@
 <?php
+
 namespace AmazonPay;
 
 /* ResponseParser
  * Methods provided to convert the Response from the POST to XML, Array or JSON
  */
 
-require_once 'ResponseInterface.php';
-
 class ResponseParser implements ResponseInterface
 {
     public $response = null;

composer.json

@@ -22,7 +22,13 @@
    ],
    "autoload": {
       "psr-4": {
-         "AmazonPay\\": "AmazonPay/"
+         "AmazonPay\\": "AmazonPay/",
+         "Psr\\": "Psr/"
+      }
+   },
+   "autoload-dev": {
+      "psr-4": {
+         "AmazonPayTest\\":"test/"
       }
    },
    "require": {

phpunit.xml

@@ -0,0 +1,11 @@
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd"
+        verbose="true"
+        checkForUnintentionallyCoveredCode="true">
+    <testsuites>
+        <testsuite name="Test Amazon Pay Sdk PHP">
+            <directory>Test/Unit</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

tst/unit/ClientTest.php → test/Unit/ClientTest.php

@@ -1,9 +1,9 @@
 <?php
-namespace AmazonPay;
 
-require_once 'AmazonPay/Client.php';
-require_once 'AmazonPay/ResponseParser.php';
-require_once 'Signature.php';
+namespace AmazonPayTest\Unit;
+
+use AmazonPay\Client;
+use AmazonPay\ResponseParser;
 
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
@@ -94,7 +94,7 @@ public function testConfigArray()
 
     public function testJsonFile()
     {
-        $configParams = "tst/unit/config/sandbox_true_bool.json";
+        $configParams = "test/Unit/config/sandbox_true_bool.json";
         $client = new Client($configParams);
 
         $this->assertTrue((bool)$client->__get('sandbox'));
@@ -108,22 +108,22 @@ public function testJsonFile()
         $this->assertEquals('1.0', $client->__get('application_version'));
 
         try {
-            $configParams = "tst/unit/config/sandbox_true_string.json";
+            $configParams = "test/Unit/config/sandbox_true_string.json";
             $client = new Client($configParams);
         } catch (\Exception $expected) {
             $this->assertRegExp('/should be a boolean value/i', strval($expected));
         }
 
-        $configParams = "tst/unit/config/sandbox_false_bool.json";
+        $configParams = "test/Unit/config/sandbox_false_bool.json";
         $client = new Client($configParams);
         $this->assertFalse((bool)$client->__get('sandbox'));
 
-        $configParams = "tst/unit/config/sandbox_none.json";
+        $configParams = "test/Unit/config/sandbox_none.json";
         $client = new Client($configParams);
         $this->assertFalse((bool)$client->__get('sandbox'));
 
         try {
-            $configParams = "tst/unit/config/sandbox_false_string.json";
+            $configParams = "test/unit/config/sandbox_false_string.json";
             $client = new Client($configParams);
         } catch (\Exception $expected) {
             $this->assertRegExp('/should be a boolean value/i', strval($expected));

tst/unit/IpnHandlerTest.php → test/Unit/IpnHandlerTest.php

@@ -1,7 +1,8 @@
 <?php
-namespace AmazonPay;
 
-require_once 'AmazonPay/IpnHandler.php';
+namespace AmazonPayTest\Unit;
+
+use AmazonPay\IpnHandler;
 
 class IpnHandlertest extends \PHPUnit_Framework_TestCase
 {

tst/unit/Signature.php → test/Unit/Signature.php

@@ -1,5 +1,6 @@
 <?php
-namespace AmazonPay;
+
+namespace AmazonPayTest\Unit;
 
 class Signature
 {