Merge pull request #28 from laravel-shift/l9-compatibility

Laravel 9.x Compatibility

.gitignore

@@ -3,4 +3,5 @@ build
 composer.lock
 docs
 vendor
-coverage
+coverage
+coverage.clover

.travis.yml

@@ -1,8 +1,9 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 env:
   matrix:

README.md

@@ -52,8 +52,8 @@ To let your models be able to receive comments, add the `HasComments` trait to t
 ``` php
 namespace App\Models;
 
-use Beyondcode\Comments\HasComments;
 use Illuminate\Database\Eloquent\Model;
+use BeyondCode\Comments\Traits\HasComments;
 
 class Post extends Model
 {

composer.json

@@ -17,11 +17,12 @@
         }
     ],
     "require": {
-        "php": "^7.1"
+        "php": "^7.2.5|^8.0",
+        "illuminate/support": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.6",
+        "orchestra/testbench": "^3.6|^5.0|^6.0|^7.0",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^7.0|^8.0|9.2.*|^9.5.10"
     },
     "autoload": {
         "psr-4": {
@@ -36,7 +37,6 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
     },
     "config": {
         "sort-packages": true

database/migrations/create_comments_table.php.stub

@@ -16,7 +16,7 @@ class CreateCommentsTable extends Migration
             $table->morphs('commentable');
             $table->text('comment');
             $table->boolean('is_approved')->default(false);
-            $table->unsignedInteger('user_id')->nullable();
+            $table->unsignedBigInteger('user_id')->nullable();
             $table->timestamps();
         });
     }

phpunit.xml.dist

@@ -20,9 +20,8 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage" />
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>

src/Comment.php

@@ -43,6 +43,15 @@ class Comment extends Model
 
         return $this;
     }
+  
+    public function disapprove()
+    {
+        $this->update([
+            'is_approved' => false,
+        ]);
+
+        return $this;
+    }
 
     protected function getAuthModelName()
     {
@@ -57,4 +66,4 @@ class Comment extends Model
         throw new Exception('Could not determine the commentator model name.');
     }
 
-}
+}

tests/TestCase.php

@@ -9,7 +9,7 @@ use BeyondCode\Comments\CommentsServiceProvider;
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->loadLaravelMigrations(['--database' => 'sqlite']);