Merge pull request #24 from tsaiyihua/3.2.x

3.2.x

.gitignore

@@ -1,2 +1,2 @@
-.phpunit.result.cache
+/.phpunit.cache
 /vendor

composer.json

@@ -5,11 +5,11 @@
     "keywords": ["payment", "ecpay", "laravel"],
     "require": {
         "php": ">=8.0",
-        "laravel/framework": "^9.0|^10.0"
+        "laravel/framework": "^9.0|^10.0|^11.0"
     },
     "require-dev": {
-        "pestphp/pest": "^1.22",
-        "orchestra/testbench": "^7.16"
+        "pestphp/pest": "^1.0|^2.0",
+        "orchestra/testbench": "^7.0|^8.0|^9.0"
     },
     "license": "MIT",
     "authors": [

phpunit.xml

@@ -1,30 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    bootstrap="vendor/autoload.php"
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    colors="true"
-    verbose="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
->
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
-    <testsuites>
-        <testsuite name="laravel ecpay test suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <env name="DB_CONNECTION" value="testing"/>
-        <env name="APP_KEY" value="base64:GEBAnCahgsFM75gOc/dbI432LF7CgqoHeaF5ZHxOWQo="/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="laravel ecpay test suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="DB_CONNECTION" value="testing"/>
+    <env name="APP_KEY" value="base64:GEBAnCahgsFM75gOc/dbI432LF7CgqoHeaF5ZHxOWQo="/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>

tests/CheckoutCollectionTest.php

@@ -7,7 +7,7 @@
 use TsaiYiHua\ECPay\Exceptions\ECPayException;
 use TsaiYiHua\ECPay\Services\StringService;
 
-//uses(TestCase::class)->in('.');
+uses(TestCase::class)->in('.');
 
 test('set checkout post collection - setBasicInfo fail', function() {
     $checkoutPostCollection = new CheckoutPostCollection();

tests/CheckoutTest.php

@@ -11,7 +11,7 @@
 use TsaiYiHua\ECPay\Exceptions\ECPayException;
 use TsaiYiHua\ECPay\Services\StringService;
 
-uses(TestCase::class)->in('.');
+//uses(TestCase::class)->in('.');
 
 beforeEach(function () {
     /** @var TestCase $this */

tests/TestCase.php

@@ -1,7 +1,6 @@
 <?php
 namespace TsaiYiHua\ECPay\Tests;
 
-use Illuminate\Support\Str;
 use TsaiYiHua\ECPay\Checkout;
 use TsaiYiHua\ECPay\ECPayServiceProvider;