Merge pull request #38 from beyondcode/laravel-11

Laravel 11 compatibility

.gitignore

@@ -4,3 +4,6 @@ composer.lock
 docs
 vendor
 coverage
+coverage.clover
+.phpunit.result.cache
+.phpunit.cache/

.scrutinizer.yml

@@ -1,19 +0,0 @@
-filter:
-    excluded_paths: [tests/*]
-
-checks:
-    php:
-        remove_extra_empty_lines: true
-        remove_php_closing_tag: true
-        remove_trailing_whitespace: true
-        fix_use_statements:
-            remove_unused: true
-            preserve_multiple: false
-            preserve_blanklines: true
-            order_alphabetically: true
-        fix_php_opening_tag: true
-        fix_linefeed: true
-        fix_line_ending: true
-        fix_identation_4spaces: true
-        fix_doc_comments: true
-

.travis.yml

@@ -1,20 +0,0 @@
-language: php
-
-php:
-  - 7.1
-  - 7.2
-
-env:
-  matrix:
-    - COMPOSER_FLAGS="--prefer-lowest"
-    - COMPOSER_FLAGS=""
-
-before_script:
-  - travis_retry composer self-update
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
-
-script:
-  - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
-
-after_script:
-  - php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover

README.md

@@ -1,8 +1,6 @@
 # Add comments to your Laravel application
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/beyondcode/laravel-comments.svg?style=flat-square)](https://packagist.org/packages/beyondcode/laravel-comments)
-[![Build Status](https://img.shields.io/travis/beyondcode/laravel-comments/master.svg?style=flat-square)](https://travis-ci.org/beyondcode/laravel-comments)
-[![Quality Score](https://img.shields.io/scrutinizer/g/beyondcode/laravel-comments.svg?style=flat-square)](https://scrutinizer-ci.com/g/beyondcode/laravel-comments)
 [![Total Downloads](https://img.shields.io/packagist/dt/beyondcode/laravel-comments.svg?style=flat-square)](https://packagist.org/packages/beyondcode/laravel-comments)
 
 Add the ability to associate comments to your Laravel Eloquent models. The comments can be approved and nested.
@@ -52,8 +50,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
 {
@@ -139,6 +137,16 @@ $approved = $post->comments()->approved()->get();
 
 ```
 
+### Nesting Comments
+
+`BeyondCode\Comments\Comment` itself implements the `HasComments` trait, so you can comment on a comment and therefore nest them:
+
+```php
+$comment = BeyondCode\Comments\Comment::first();
+$comment->commentAsUser($user, "Hey there!");
+```
+
+
 ### Testing
 
 ``` bash

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|^10.0|^11.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.6",
+        "orchestra/testbench": "^3.6|^5.0|^6.0|^7.0|^8.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

@@ -44,6 +44,15 @@ class Comment extends Model
         return $this;
     }
   
+    public function disapprove()
+    {
+        $this->update([
+            'is_approved' => false,
+        ]);
+
+        return $this;
+    }
+
     protected function getAuthModelName()
     {
         if (config('comments.user_model')) {

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']);