2.12.0 incl laravel 11 support (#229)

mollie · Mar 27, 2024 · ff8a0b8 · ff8a0b8
1 parent 20f8f5d
commit ff8a0b8
Show file tree

Hide file tree

Showing 75 changed files with 160 additions and 244 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -14,17 +14,9 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ ubuntu-latest ]
-                php: [ 8.2, 8.1, 8.0]
-                laravel: [ 10.*, 9.* ]
+                php: [8.3, 8.2, 8.1]
+                laravel: [ 11.*, 10.* ]
                 dependency-version: [ prefer-stable ]
-                include:
-                  - laravel: 9.*
-                    testbench: 7.*
-                  - laravel: 10.*
-                    testbench: 8.*
-                exclude:
-                  - laravel: 10.*
-                    php: 8.0
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -30,22 +30,22 @@
     }
   ],
   "require": {
-    "php": "^8.0",
+    "php": "^8.1",
     "ext-json": "*",
     "ext-intl": "*",
     "dompdf/dompdf": "^2.0",
-    "illuminate/database": "^9.0|^10",
-    "illuminate/support": "^9.0|^10",
-    "mollie/laravel-mollie": "^2.22",
-    "mollie/mollie-api-php": "^2.27",
+    "illuminate/database": "^10|^11",
+    "illuminate/support": "^10|^11",
+    "mollie/laravel-mollie": "^3.0",
+    "mollie/mollie-api-php": "^2.65",
     "moneyphp/money": "^4.1",
-    "nesbot/carbon": "^2.31"
+    "nesbot/carbon": "^2.72|^3.0"
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^7.0",
     "mockery/mockery": "^1.4",
-    "orchestra/testbench": "^7.0|^8.0",
-    "phpunit/phpunit": "^9.5"
+    "orchestra/testbench": "^8.0|^9.0",
+    "phpunit/phpunit": "^10.0"
   },
   "autoload": {
     "files": [

diff --git a/database/migrations/create_applied_coupons_table.php.stub b/database/migrations/create_applied_coupons_table.php.stub
@@ -11,7 +11,7 @@ class CreateAppliedCouponsTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('applied_coupons', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -26,7 +26,7 @@ class CreateAppliedCouponsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('applied_coupons');
     }

diff --git a/database/migrations/create_credits_table.php.stub b/database/migrations/create_credits_table.php.stub
@@ -11,7 +11,7 @@ class CreateCreditsTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('credits', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -28,7 +28,7 @@ class CreateCreditsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('credits');
     }

diff --git a/database/migrations/create_order_items_table.php.stub b/database/migrations/create_order_items_table.php.stub
@@ -11,7 +11,7 @@ class CreateOrderItemsTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('order_items', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -36,7 +36,7 @@ class CreateOrderItemsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('order_items');
     }

diff --git a/database/migrations/create_orders_table.php.stub b/database/migrations/create_orders_table.php.stub
@@ -11,7 +11,7 @@ class CreateOrdersTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('orders', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -39,7 +39,7 @@ class CreateOrdersTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('orders');
     }

diff --git a/database/migrations/create_payments_table.php.stub b/database/migrations/create_payments_table.php.stub
@@ -11,7 +11,7 @@ class CreatePaymentsTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('payments', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -35,7 +35,7 @@ class CreatePaymentsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('payments');
     }

diff --git a/database/migrations/create_redeemed_coupons_table.php.stub b/database/migrations/create_redeemed_coupons_table.php.stub
@@ -11,7 +11,7 @@ class CreateRedeemedCouponsTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('redeemed_coupons', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -30,7 +30,7 @@ class CreateRedeemedCouponsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('redeemed_coupons');
     }

diff --git a/database/migrations/create_refund_items_table.php.stub b/database/migrations/create_refund_items_table.php.stub
@@ -11,7 +11,7 @@ class CreateRefundItemsTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('refund_items', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -34,7 +34,7 @@ class CreateRefundItemsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('refund_items');
     }

diff --git a/database/migrations/create_refunds_table.php.stub b/database/migrations/create_refunds_table.php.stub
@@ -11,7 +11,7 @@ class CreateRefundsTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('refunds', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -32,7 +32,7 @@ class CreateRefundsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('refunds');
     }

diff --git a/database/migrations/create_subscriptions_table.php.stub b/database/migrations/create_subscriptions_table.php.stub
@@ -11,7 +11,7 @@ class CreateSubscriptionsTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('subscriptions', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -36,7 +36,7 @@ class CreateSubscriptionsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('subscriptions');
     }

diff --git a/database/migrations/upgrade_to_cashier_v2.php.stub b/database/migrations/upgrade_to_cashier_v2.php.stub
@@ -11,7 +11,7 @@ class UpgradeToCashierV2 extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('orders', function (Blueprint $table) {
             $table->unsignedInteger('amount_refunded')->after('total_due')->default(0);
@@ -67,9 +67,8 @@ class UpgradeToCashierV2 extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
-        // Requires "doctrine/dbal" in composer.json
         // Schema::table('orders', function (Blueprint $table) {
         //     $table->dropColumn(['amount_refunded', 'amount_charged_back']);
         // });

diff --git a/docs/01-installation.md b/docs/01-installation.md
@@ -70,7 +70,7 @@ Once you have pulled in the package:
         {
             return [$this->name, $this->email];
         }
-        
+
         /**
         * Get additional information to be displayed on the invoice. Typically a note provided by the customer.
         *
@@ -82,10 +82,13 @@ Once you have pulled in the package:
         }
     ```
 
-6. Schedule a periodic job to execute the `cashier:run` command. When processing lots of orders, consider increasing the job frequency to prevent hitting Mollie's rate limiter.
+6. Schedule a periodic command to execute the `CashierRun` command. When processing lots of orders, consider increasing the job frequency to prevent hitting Mollie's rate limiter.
 
     ```php
-    $schedule->command('cashier:run')
+    use Illuminate\Support\Facades\Schedule;
+    use Laravel\Cashier\Console\Commands\CashierRun;
+
+    Schedule::command(CashierRun::class)
         ->hourly() // run as often as you like (daily, monthly, every minute, ...)
         ->withoutOverlapping(); // make sure to include this
     ```

diff --git a/resources/lang/en/order_item.php → lang/en/order_item.php b/resources/lang/en/order_item.php → lang/en/order_item.php
diff --git a/resources/lang/en/payment.php → lang/en/payment.php b/resources/lang/en/payment.php → lang/en/payment.php
diff --git a/resources/lang/en/receipt.php → lang/en/receipt.php b/resources/lang/en/receipt.php → lang/en/receipt.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,5 @@
 <?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>
+<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="Test Suite">
       <directory>tests</directory>
@@ -34,4 +29,9 @@
     <!--        <env name="PAYMENT_PAID_ID" value=""/>-->
     <!--        <env name="PAYMENT_FAILED_ID" value=""/>-->
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>