Laravel 10.x Compatibility (#8)

* Bump dependencies for Laravel 10 * Update GitHub Actions for Laravel 10 * Update test matrix * update matrix * fix * Revert "fix" This reverts commit a81a1b5. * Migrate PHPUnit config * Fix * WIP --------- Co-authored-by: Jacob Bennett <jacob.j.bennett@gmail.com> Co-authored-by: Luke Bouch <luke@lukebouch.com>
asantibanez · Apr 17, 2023 · 945c9e4 · 945c9e4
1 parent f7b2dcb
commit 945c9e4
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 31 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,9 +13,14 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 php: [8.0, 8.1]
-                laravel: [9.*]
+                laravel: [9.*, 10.*]
                 stability: [prefer-stable]
+                exclude:
+                    - laravel: 10.*
+                      php: 8.0
                 include:
+                    - laravel: 10.*
+                      testbench: ^8.0
                     - laravel: 9.*
                       testbench: ^7.6
 

diff --git a/composer.json b/composer.json
@@ -17,11 +17,11 @@
     ],
     "require": {
         "php": "^7.4|^8.0|^8.1",
-        "illuminate/support": "^7.0|^8.0|^9.0",
+        "illuminate/support": "^7.0|^8.0|^9.0|^10.0",
         "laravel/legacy-factories": "^1.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.0",
+        "orchestra/testbench": "^6.0|^8.0",
         "phpunit/phpunit": "^9.5"
     },
     "autoload": {
@@ -38,7 +38,6 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
     },
     "config": {
         "sort-packages": true

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,27 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        bootstrap="vendor/autoload.php"
-        backupGlobals="false"
-        backupStaticAttributes="false"
-        colors="true"
-        verbose="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        processIsolation="false"
-        stopOnFailure="false"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="DB_CONNECTION" value="testing"/>
-    </php>
+<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="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="DB_CONNECTION" value="testing"/>
+  </php>
 </phpunit>
diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+        bootstrap="vendor/autoload.php"
+        backupGlobals="false"
+        backupStaticAttributes="false"
+        colors="true"
+        verbose="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false"
+>
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <env name="DB_CONNECTION" value="testing"/>
+    </php>
+</phpunit>
diff --git a/tests/Feature/DispatchesNotifiableTest.php b/tests/Feature/DispatchesNotifiableTest.php
@@ -43,7 +43,7 @@ public function should_dispatch_notifiable_for_subscribed_user()
         SalesOrderApprovedNotification::dispatch($payload = [1, 2, 3]);
 
         //Assert
-        Notification::assertTimesSent(1, SalesOrderApprovedNotification::class);
+        Notification::assertSentTimes(SalesOrderApprovedNotification::class, 1);
 
         Notification::assertSentTo($user, SalesOrderApprovedNotification::class, function ($notification) use ($payload) {
             $this->assertEquals($payload, $notification->payload);
@@ -87,6 +87,6 @@ public function should_not_dispatch_notifiable_for_not_found_users()
         SalesOrderApprovedNotification::dispatch();
 
         //Assert
-        Notification::assertTimesSent(1, SalesOrderApprovedNotification::class);
+        Notification::assertSentTimes(SalesOrderApprovedNotification::class, 1);
     }
 }