Add support for Laravel 8 (#30)

With this PR we're dropping supports for lower versions of Laravel

Author: richan-fongdasen

.travis.yml

@@ -6,13 +6,9 @@ matrix:
   fast_finish: true
   include:
     - php: 7.3
-      env: LARAVEL=^6.0 ORCHESTRA=^4.0
+      env: LARAVEL=^8.0 ORCHESTRA=^6.0
     - php: 7.4
-      env: LARAVEL=^6.0 ORCHESTRA=^4.0
-    - php: 7.3
-      env: LARAVEL=^7.0 ORCHESTRA=^5.0
-    - php: 7.4
-      env: LARAVEL=^7.0 ORCHESTRA=^5.0 COVERAGE=1
+      env: LARAVEL=^8.0 ORCHESTRA=^6.0 COVERAGE=1
 
   allow_failures:
     - env: COVERAGE=1

composer.json

@@ -22,20 +22,20 @@
   },
   "require": {
     "php": "^7.3",
-    "illuminate/database": "^6.0|^7.0",
-    "illuminate/support": "^6.0|^7.0"
+    "illuminate/database": "^8.0",
+    "illuminate/support": "^8.0"
   },
   "require-dev": {
     "ekino/phpstan-banned-code": "^0.3.1",
-    "mockery/mockery": "~1.0",
-    "orchestra/database": "~4.0|~5.0",
-    "orchestra/testbench": "~4.0|~5.0",
-    "phpmd/phpmd": "^2.8",
-    "phpstan/phpstan": "^0.11|^0.12",
-    "phpstan/phpstan-deprecation-rules": "^0.11|^0.12",
-    "phpstan/phpstan-strict-rules": "^0.11|^0.12",
-    "phpunit/phpunit": "^9.0 || ^8.0",
-    "sebastian/phpcpd": "^5.0"
+    "mockery/mockery": "^1.3",
+    "orchestra/database": "~6.0",
+    "orchestra/testbench": "~6.0",
+    "phpmd/phpmd": "^2.9",
+    "phpstan/phpstan": "^0.12",
+    "phpstan/phpstan-deprecation-rules": "^0.12",
+    "phpstan/phpstan-strict-rules": "^0.12",
+    "phpunit/phpunit": "^9.3",
+    "sebastian/phpcpd": "^6.0"
   },
   "config": {
     "sort-packages": true
@@ -50,7 +50,8 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "RichanFongdasen\\EloquentBlameableTest\\": "tests/"
+      "RichanFongdasen\\EloquentBlameableTest\\": "tests/",
+      "Database\\Factories\\": "tests/Supports/Factories/"
     }
   },
   "extra": {

phpunit.xml

@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="true">
-    <testsuites>
-        <testsuite name="Blameable Test Suite">
-            <directory suffix="Tests.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Blameable Test Suite">
+      <directory suffix="Tests.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

readme.md

@@ -37,6 +37,7 @@ $ composer require richan-fongdasen/eloquent-blameable
 | 5.5.x - 5.8.x   | 1.3.x             |
 | 6.x             | 1.4.x             |
 | 7.x             | 1.5.x             |
+| 8.x             | 1.6.x             |
 
 > If you are using Laravel version 5.5+ then you can skip registering the service provider in your Laravel application.
 

tests/ObservedModelTests.php

@@ -13,7 +13,7 @@ class ObservedModelTests extends TestCase
     public function it_works_perfectly_on_creating_a_new_post()
     {
         $this->impersonateUser();
-        $post = factory(Post::class)->create();
+        $post = Post::factory()->create();
 
         $this->assertFalse($post->isDirty('created_by'));
         $this->assertFalse($post->isDirty('updated_by'));
@@ -25,7 +25,7 @@ public function it_works_perfectly_on_creating_a_new_post()
     public function it_works_perfectly_on_updating_existing_post()
     {
         $this->impersonateUser();
-        $post = factory(Post::class)->create();
+        $post = Post::factory()->create();
 
         $this->impersonateOtherUser();
         $post->setAttribute('title', 'Another Title');
@@ -41,7 +41,7 @@ public function it_works_perfectly_on_updating_existing_post()
     public function it_works_perfectly_on_deleting_post1()
     {
         $this->impersonateUser();
-        $post = factory(Post::class)->create();
+        $post = Post::factory()->create();
 
         $post->delete();
         $deletedPost = Post::onlyTrashed()->where('id', $post->getKey())->first();
@@ -53,7 +53,7 @@ public function it_works_perfectly_on_deleting_post1()
     public function it_works_perfectly_on_deleting_post2()
     {
         $this->impersonateUser();
-        $post = factory(Post::class)->create();
+        $post = Post::factory()->create();
 
         $this->impersonateOtherUser();
         $post->delete();
@@ -67,7 +67,7 @@ public function it_works_perfectly_on_deleting_post2()
     public function it_works_perfectly_on_restoring_deleted_post()
     {
         $this->impersonateUser();
-        $post = factory(Post::class)->create();
+        $post = Post::factory()->create();
 
         $this->impersonateOtherUser();
         $post->delete();
@@ -81,7 +81,7 @@ public function it_works_perfectly_on_restoring_deleted_post()
     public function it_works_perfectly_on_creating_a_new_comment()
     {
         $this->impersonateUser();
-        $comment = factory(Comment::class)->create([
+        $comment = Comment::factory()->create([
             'post_id' => 100
         ]);
 
@@ -95,8 +95,8 @@ public function it_works_perfectly_on_creating_a_new_comment()
     public function it_works_perfectly_on_updating_existing_comment()
     {
         $this->impersonateUser();
-        $post = factory(Post::class)->create();
-        $comment = factory(Comment::class)->create([
+        $post = Post::factory()->create();
+        $comment = Comment::factory()->create([
             'post_id' => $post->getKey()
         ]);
 
@@ -119,7 +119,7 @@ public function it_works_perfectly_on_updating_existing_comment()
     public function it_works_perfectly_on_deleting_comment1()
     {
         $this->impersonateUser();
-        $comment = factory(Comment::class)->create([
+        $comment = Comment::factory()->create([
             'post_id' => 100
         ]);
 
@@ -133,7 +133,7 @@ public function it_works_perfectly_on_deleting_comment1()
     public function it_works_perfectly_on_deleting_comment2()
     {
         $this->impersonateUser();
-        $comment = factory(Comment::class)->create([
+        $comment = Comment::factory()->create([
             'post_id' => 100
         ]);
 
@@ -149,7 +149,7 @@ public function it_works_perfectly_on_deleting_comment2()
     public function it_works_perfectly_on_restoring_deleted_comment()
     {
         $this->impersonateUser();
-        $comment = factory(Comment::class)->create([
+        $comment = Comment::factory()->create([
             'post_id' => 100
         ]);
 
@@ -188,7 +188,7 @@ public function it_works_perfectly_on_creating_a_new_user2()
     public function it_works_perfectly_on_updating_existing_user()
     {
         $this->impersonateUser();
-        $user = factory(User::class)->create();
+        $user = User::factory()->create();
 
         $this->impersonateOtherUser();
         $user->setAttribute('email', '[email protected]');
@@ -204,7 +204,7 @@ public function it_works_perfectly_on_updating_existing_user()
     public function it_works_perfectly_on_deleting_user1()
     {
         $this->impersonateUser();
-        $user = factory(User::class)->create();
+        $user = User::factory()->create();
 
         $user->delete();
         $deletedUser = User::onlyTrashed()->where('id', $user->getKey())->first();
@@ -216,7 +216,7 @@ public function it_works_perfectly_on_deleting_user1()
     public function it_works_perfectly_on_deleting_user2()
     {
         $this->impersonateUser();
-        $user = factory(User::class)->create();
+        $user = User::factory()->create();
 
         $this->impersonateOtherUser();
         $user->delete();
@@ -230,7 +230,7 @@ public function it_works_perfectly_on_deleting_user2()
     public function it_works_perfectly_on_restoring_deleted_user()
     {
         $this->impersonateUser();
-        $user = factory(User::class)->create();
+        $user = User::factory()->create();
 
         $this->impersonateOtherUser();
         $user->delete();
@@ -243,7 +243,7 @@ public function it_works_perfectly_on_restoring_deleted_user()
     /** @test */
     public function it_will_set_null_creator_and_null_updater_on_unauthenticated_user()
     {
-        $post = factory(Post::class)->create();
+        $post = Post::factory()->create();
 
         $this->assertNull($post->getAttribute('created_by'));
         $this->assertNull($post->getAttribute('updated_by'));
@@ -254,7 +254,7 @@ public function it_wont_cause_any_error_when_deleting_model_without_soft_deletes
     {
         $this->impersonateAdmin();
 
-        $news = factory(News::class)->create();
+        $news = News::factory()->create();
         $news->delete();
         $news->fresh();
 

tests/Supports/Factories/AdminFactory.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Str;
+use RichanFongdasen\EloquentBlameableTest\Supports\Models\Admin;
+
+class AdminFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = Admin::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'name' => $this->faker->name,
+            'email' => $this->faker->email,
+            'password' => bcrypt(Str::random(12)),
+            'remember_token' => Str::random(12),
+        ];
+    }
+}

tests/Supports/Factories/ArticleFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use RichanFongdasen\EloquentBlameableTest\Supports\Models\Article;
+
+class ArticleFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = Article::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'title' => $this->faker->sentence,
+            'content' => $this->faker->paragraph,
+        ];
+    }
+}

tests/Supports/Factories/CommentFactory.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use RichanFongdasen\EloquentBlameableTest\Supports\Models\Comment;
+
+class CommentFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = Comment::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'content' => $this->faker->paragraph,
+        ];
+    }
+}

tests/Supports/Factories/NewsFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use RichanFongdasen\EloquentBlameableTest\Supports\Models\News;
+
+class NewsFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = News::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'title'   => $this->faker->sentence,
+            'content' => $this->faker->paragraph,
+        ];
+    }
+}

tests/Supports/Factories/PostFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use RichanFongdasen\EloquentBlameableTest\Supports\Models\Post;
+
+class PostFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = Post::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'title'   => $this->faker->sentence,
+            'content' => $this->faker->paragraph,
+        ];
+    }
+}