Merge pull request #52 from Xaxxis/master

v2.4.3 - Fix bug missing namespace in unit test class
Midtrans · Aug 4, 2021 · 41520bf · 41520bf
2 parents bc26f9c + cf8ee9b
commit 41520bf
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 37 deletions.
diff --git a/Midtrans/ApiRequestor.php b/Midtrans/ApiRequestor.php
@@ -3,7 +3,6 @@
 namespace Midtrans;
 
 use Exception;
-use MT_Tests;
 /**
  * Send request to Midtrans API
  * Better don't use this class directly, please use CoreApi, Snap, and Transaction instead
@@ -126,7 +125,7 @@ public static function remoteCall($url, $server_key, $data_hash, $post = true)
         curl_setopt_array($ch, $curl_options);
 
         // For testing purpose
-        if (class_exists('MT_Tests') && MT_Tests::$stubHttp) {
+        if (class_exists('\Midtrans\MT_Tests') && MT_Tests::$stubHttp) {
             $result = self::processStubed($curl_options, $url, $server_key, $data_hash, $post);
         } else {
             $result = curl_exec($ch);

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "midtrans/midtrans-php",
     "description": "PHP Wrapper for Midtrans Payment API.",
     "homepage": "https://midtrans.com",
-    "version": "2.4.2",
+    "version": "2.4.3",
     "type": "library",
     "license":"MIT",
     "authors": [
@@ -32,5 +32,15 @@
         "psr-4": {
             "Midtrans\\": "Midtrans/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Midtrans\\":[
+                "tests/",
+                "test/integration",
+                "tests/utility",
+                "tests/utility/fixture"
+            ]
+        }
     }
 }
diff --git a/tests/MT_Tests.php b/tests/MT_Tests.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Midtrans;
+
 class MT_Tests
 {
     public static $stubHttp = false;
@@ -9,21 +11,21 @@ class MT_Tests
 
     public static function reset()
     {
-            MT_Tests::$stubHttp = false;
-            MT_Tests::$stubHttpResponse = null;
-            MT_Tests::$lastHttpRequest = null;
+        MT_Tests::$stubHttp = false;
+        MT_Tests::$stubHttpResponse = null;
+        MT_Tests::$lastHttpRequest = null;
     }
 
     public static function lastReqOptions()
     {
         $consts = array(
-        CURLOPT_URL => "URL",
-        CURLOPT_HTTPHEADER => "HTTPHEADER",
-        CURLOPT_RETURNTRANSFER => "RETURNTRANSFER",
-        CURLOPT_CAINFO => "CAINFO",
-        CURLOPT_POST => "POST",
-        CURLOPT_POSTFIELDS => "POSTFIELDS",
-        CURLOPT_PROXY => "PROXY"
+            CURLOPT_URL => "URL",
+            CURLOPT_HTTPHEADER => "HTTPHEADER",
+            CURLOPT_RETURNTRANSFER => "RETURNTRANSFER",
+            CURLOPT_CAINFO => "CAINFO",
+            CURLOPT_POST => "POST",
+            CURLOPT_POSTFIELDS => "POSTFIELDS",
+            CURLOPT_PROXY => "PROXY"
         );
 
         $options = array();

diff --git a/tests/MidtransApiRequestorTest.php b/tests/MidtransApiRequestorTest.php
@@ -1,7 +1,6 @@
 <?php
 
-use Midtrans\ApiRequestor;
-use Midtrans\Config;
+namespace Midtrans;
 
 class MidtransApiRequestorTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/MidtransConfigTest.php b/tests/MidtransConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Midtrans\Config;
+namespace Midtrans;
 
 class MidtransConfigTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/MidtransCoreApiTest.php b/tests/MidtransCoreApiTest.php
@@ -1,7 +1,6 @@
 <?php
 
-use Midtrans\Config;
-use Midtrans\CoreApi;
+namespace Midtrans;
 
 class MidtransCoreApiTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/MidtransNotificationTest.php b/tests/MidtransNotificationTest.php
@@ -1,7 +1,6 @@
 <?php
 
-use Midtrans\Config;
-use Midtrans\Notification;
+namespace Midtrans;
 
 require_once dirname(__FILE__) . '/../Midtrans.php';
 

diff --git a/tests/MidtransSnapApiRequestorTest.php b/tests/MidtransSnapApiRequestorTest.php
@@ -1,7 +1,6 @@
 <?php
 
-use Midtrans\ApiRequestor;
-use Midtrans\Config;
+namespace Midtrans;
 
 class MidtransSnapApiRequestorTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/MidtransSnapTest.php b/tests/MidtransSnapTest.php
@@ -1,7 +1,6 @@
 <?php
 
-use Midtrans\Config;
-use Midtrans\Snap;
+namespace Midtrans;
 
 class MidtransSnapTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/MidtransTransactionTest.php b/tests/MidtransTransactionTest.php
@@ -1,7 +1,5 @@
 <?php
-
-use Midtrans\Config;
-use Midtrans\Transaction;
+namespace Midtrans;
 
 class MidtransTransactionTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/integration/CoreApiIntegrationTest.php b/tests/integration/CoreApiIntegrationTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace integration;
+namespace Midtrans\integration;
 
 use Midtrans\CoreApi;
-use utility\MtChargeFixture;
+use Midtrans\utility\MtChargeFixture;
+
 require_once 'IntegrationTest.php';
 
 class CoreApiIntegrationTest extends IntegrationTest

diff --git a/tests/integration/IntegrationTest.php b/tests/integration/IntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace integration;
+namespace Midtrans\integration;
 
 use Midtrans\Config;
 

diff --git a/tests/integration/NotificationIntegrationTest.php b/tests/integration/NotificationIntegrationTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace integration;
+namespace Midtrans\integration;
 
 use Midtrans\CoreApi;
-use utility\MtChargeFixture;
 use Midtrans\Notification;
 use Midtrans\Transaction;
+use Midtrans\utility\MtChargeFixture;
+
 require_once 'IntegrationTest.php';
 
 

diff --git a/tests/integration/SnapIntegrationTest.php b/tests/integration/SnapIntegrationTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace integration;
+namespace Midtrans\integration;
 
 use Midtrans\Snap;
-use utility\MtChargeFixture;
+use Midtrans\utility\MtChargeFixture;
+
 require_once 'IntegrationTest.php';
 
 class SnapIntegrationTest extends IntegrationTest

diff --git a/tests/integration/TransactionIntegrationTest.php b/tests/integration/TransactionIntegrationTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace integration;
+namespace Midtrans\integration;
 
 use Midtrans\CoreApi;
 use Midtrans\Transaction;
-use utility\MtChargeFixture;
+use Midtrans\utility\MtChargeFixture;
+
 require_once 'IntegrationTest.php';
 
 class TransactionIntegrationTest extends IntegrationTest

diff --git a/tests/utility/MtFixture.php b/tests/utility/MtFixture.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace utility;
+namespace Midtrans\utility;
 
 class MtFixture
 {