Add Laravel v10 support (#234)

Author: antonkomarev

.github/workflows/tests.yml

@@ -9,13 +9,19 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest ]
-        php: [ 8.0, 8.1 ]
-        laravel: [ 9.* ]
+        php: [ 8.0, 8.1, 8.2 ]
+        laravel: [ 9.*, 10.* ]
         dependency-version: [ prefer-lowest, prefer-stable ]
+        exclude:
+          - laravel: 9.*
+            php: 8.2
+          - laravel: 10.*
+            php: 8.0
         include:
           - laravel: 9.*
             testbench: 7.*
-            legacy-factories: 1.*
+          - laravel: 10.*
+            testbench: 8.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
@@ -42,10 +48,5 @@ jobs:
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
-      - name: Install legacy factories dependency
-        run: |
-          composer require "laravel/legacy-factories:${{ matrix.legacy-factories }}" --no-interaction
-        if: matrix.legacy-factories
-
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit --testdox

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to `laravel-love` will be documented in this file.
 
 ### Added
 
+- ([#234]) Added Laravel 10 support
 - ([#216]) Added Docker Compose to quick development build
 - ([#188]) Added `whereReactedTo` model scope to Reacterable models
 - ([#188]) Added `whereNotReactedTo` model scope to Reacterable models
@@ -568,6 +569,7 @@ Follow [upgrade instructions](UPGRADING.md#from-v5-to-v6) to migrate database to
 [1.1.1]: https://github.com/cybercog/laravel-love/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/cybercog/laravel-love/compare/1.0.0...1.1.0
 
+[#234]: https://github.com/cybercog/laravel-love/pull/234
 [#233]: https://github.com/cybercog/laravel-love/pull/233
 [#231]: https://github.com/cybercog/laravel-love/pull/231
 [#222]: https://github.com/cybercog/laravel-love/pull/222

composer.json

@@ -47,15 +47,15 @@
     },
     "require": {
         "php": "^8.0",
-        "illuminate/database": "^9.0",
-        "illuminate/support": "^9.0"
+        "illuminate/database": "^9.0|^10.1.3",
+        "illuminate/support": "^9.0|^10.1.3"
     },
     "require-dev": {
+        "laravel/legacy-factories": "^1.3",
         "mockery/mockery": "^1.0",
-        "orchestra/database": "^7.0",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^7.0|^8.0",
         "phpstan/phpstan": "^1.9",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.6"
     },
     "autoload": {
         "psr-4": {

tests/TestCase.php

@@ -21,7 +21,6 @@
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Filesystem\Filesystem;
 use Mockery;
-use Orchestra\Database\ConsoleServiceProvider;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
 
 abstract class TestCase extends OrchestraTestCase
@@ -64,7 +63,6 @@ protected function getPackageProviders($app): array
         return [
             LoveServiceProvider::class,
             LoveEventServiceProvider::class,
-            ConsoleServiceProvider::class,
         ];
     }
 

tests/Unit/Reaction/Events/ReactionHasBeenAddedTest.php

@@ -18,21 +18,20 @@
 use Cog\Laravel\Love\Reaction\Events\ReactionHasBeenAdded;
 use Cog\Laravel\Love\ReactionType\Models\ReactionType;
 use Cog\Tests\Laravel\Love\TestCase;
-use Illuminate\Foundation\Testing\Concerns\MocksApplicationServices;
+use Illuminate\Support\Facades\Event;
 
 final class ReactionHasBeenAddedTest extends TestCase
 {
-    use MocksApplicationServices;
-
     /** @test */
     public function it_fires_reaction_has_been_added_event(): void
     {
-        $this->expectsEvents(ReactionHasBeenAdded::class);
-
+        Event::fake([ReactionHasBeenAdded::class]);
         $reactionType = factory(ReactionType::class)->create();
         $reacter = factory(Reacter::class)->create();
         $reactant = factory(Reactant::class)->create();
 
         $reacter->reactTo($reactant, $reactionType);
+
+        Event::assertDispatched(ReactionHasBeenAdded::class);
     }
 }

tests/Unit/Reaction/Events/ReactionHasBeenRemovedTest.php

@@ -11,30 +11,28 @@
 
 declare(strict_types=1);
 
-namespace Cog\Laravel\Love\Tests\Unit\Reaction\Events;
+namespace Cog\Tests\Laravel\Love\Unit\Reaction\Events;
 
 use Cog\Laravel\Love\Reactant\Models\Reactant;
 use Cog\Laravel\Love\Reacter\Models\Reacter;
 use Cog\Laravel\Love\Reaction\Events\ReactionHasBeenRemoved;
 use Cog\Laravel\Love\ReactionType\Models\ReactionType;
 use Cog\Tests\Laravel\Love\TestCase;
-use Illuminate\Foundation\Testing\Concerns\MocksApplicationServices;
+use Illuminate\Support\Facades\Event;
 
 final class ReactionHasBeenRemovedTest extends TestCase
 {
-    use MocksApplicationServices;
-
     /** @test */
     public function it_fire_reaction_has_been_removed_event(): void
     {
-        $this->expectsEvents(ReactionHasBeenRemoved::class);
-
+        Event::fake([ReactionHasBeenRemoved::class]);
         $reactionType = factory(ReactionType::class)->create();
         $reacter = factory(Reacter::class)->create();
         $reactant = factory(Reactant::class)->create();
-
         $reacter->reactTo($reactant, $reactionType);
 
         $reacter->unreactTo($reactant, $reactionType);
+
+        Event::assertDispatched(ReactionHasBeenRemoved::class);
     }
 }