[8.x] Support Laravel 11 (#158)

* chore: prepare for laravel 11 * fix: remove phpunit verbose flag * fix: use phpunit 10.5 as minimum * fix: run loadMigrationsFrom in defineDatabaseMigrations --------- Co-authored-by: Ricardo Gobbo de Souza <[email protected]>
cknow · Mar 16, 2024 · 799f2f3 · 799f2f3
1 parent 46ab840
commit 799f2f3
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 52 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,23 +10,23 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [7.3, 7.4, 8.0, 8.1, 8.2]
-        laravel: [7.*, 8.*, 9.*, 10.*]
+        php: [8.1, 8.2, 8.3]
+        laravel: [9.*, 10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         exclude:
-          - php: 8.1
-            stability: prefer-lowest
-          - php: 8.2
-            stability: prefer-lowest
+          - laravel: 9.*
+            php: 8.3
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache/files
           key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
@@ -42,7 +42,7 @@ jobs:
         run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
 
       - name: Coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
diff --git a/.phpunit-watcher.yml b/.phpunit-watcher.yml
diff --git a/composer.json b/composer.json
@@ -16,19 +16,18 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^8.1",
         "ext-json": "*",
         "ext-intl": "*",
-        "illuminate/support": "^7.0|^8.0|^9.0|^10.0",
-        "illuminate/view": "^7.0|^8.0|^9.0|^10.0",
-        "moneyphp/money": "^3.3|^4.2"
+        "illuminate/support": "^9.0|^10.0|^11.0",
+        "illuminate/view": "^9.0|^10.0|^11.0",
+        "moneyphp/money": "^4.2"
     },
     "require-dev": {
-        "graham-campbell/testbench": "^5.7",
-        "illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0",
+        "graham-campbell/testbench": "^6.0",
+        "illuminate/filesystem": "^9.0|^10.0|^11.0",
         "mockery/mockery": "^1.6",
-        "phpunit/phpunit": "^8.5|^9.5.10|^10.0",
-        "spatie/phpunit-watcher": "^1.23"
+        "phpunit/phpunit": "^10.5"
     },
     "autoload": {
         "psr-4": {
@@ -59,7 +58,6 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
-        "test": "vendor/bin/phpunit",
-        "watch": "vendor/bin/phpunit-watcher watch"
+        "test": "vendor/bin/phpunit"
     }
-}
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <clover outputFile="clover.xml"/>
-            <text outputFile="php://stdout"/>
-        </report>
-    </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <clover outputFile="clover.xml"/>
+      <text outputFile="php://stdout"/>
+    </report>
+  </coverage>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/MoneyCastTest.php b/tests/MoneyCastTest.php
@@ -22,12 +22,10 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->loadMigrationsFrom(__DIR__.'/Database/Migrations');
-
         Money::setCurrencies(config('money.currencies'));
     }
 
-    protected function defineDatabaseMigrations()
+    protected function defineDatabaseMigrations(): void
     {
         $this->loadMigrationsFrom(__DIR__.'/Database/Migrations');
     }

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -13,7 +13,7 @@ abstract class TestCase extends AbstractPackageTestCase
      * @param  \Illuminate\Contracts\Foundation\Application  $app
      * @return void
      */
-    protected function getEnvironmentSetUp($app)
+    protected function getEnvironmentSetUp($app): void
     {
         $app->config->set('money.locale', 'en_US');
 
@@ -25,7 +25,7 @@ protected function getEnvironmentSetUp($app)
      *
      * @return string
      */
-    protected function getServiceProviderClass()
+    protected static function getServiceProviderClass(): string
     {
         return MoneyServiceProvider::class;
     }