Fixed failing test after drawio default url change

[bookstack] / app / Actions / CommentRepo.php

diff --git a/app/Actions/CommentRepo.php b/app/Actions/CommentRepo.php
index 13a83e7fdd247064983c64928811b49db2ba4ca1..2f2dd658a3c754294e8e45735ba183c5e2cc4d55 100644 (file)
--- a/app/Actions/CommentRepo.php
+++ b/app/Actions/CommentRepo.php
@@ -1,21 +1,21 @@
-<?php namespace BookStack\Actions;
+<?php
+
+namespace BookStack\Actions;

 
 use BookStack\Entities\Models\Entity;
 
 use BookStack\Entities\Models\Entity;

-use League\CommonMark\CommonMarkConverter;

 use BookStack\Facades\Activity as ActivityService;
 use BookStack\Facades\Activity as ActivityService;

+use League\CommonMark\CommonMarkConverter;

 
 /**
 
 /**

- * Class CommentRepo
+ * Class CommentRepo.

  */
 class CommentRepo
 {
  */
 class CommentRepo
 {

-

     /**
     /**

-     * @var Comment $comment
+     * @var Comment

      */
     protected $comment;
 
      */
     protected $comment;
 

-

     public function __construct(Comment $comment)
     {
         $this->comment = $comment;
     public function __construct(Comment $comment)
     {
         $this->comment = $comment;


@@ -45,7 +45,8 @@ class CommentRepo
         $comment->parent_id = $parent_id;
 
         $entity->comments()->save($comment);
         $comment->parent_id = $parent_id;
 
         $entity->comments()->save($comment);

-        ActivityService::addForEntity($entity, ActivityType::COMMENTED_ON);
+        ActivityService::add(ActivityType::COMMENTED_ON, $entity);
+

         return $comment;
     }
 
         return $comment;
     }
 


@@ -58,25 +59,26 @@ class CommentRepo
         $comment->text = $text;
         $comment->html = $this->commentToHtml($text);
         $comment->save();
         $comment->text = $text;
         $comment->html = $this->commentToHtml($text);
         $comment->save();

+

         return $comment;
     }
 
     /**
      * Delete a comment from the system.
      */
         return $comment;
     }
 
     /**
      * Delete a comment from the system.
      */

-    public function delete(Comment $comment)
+    public function delete(Comment $comment): void

     {
         $comment->delete();
     }
 
     /**
     {
         $comment->delete();
     }
 
     /**

-     * Convert the given comment markdown text to HTML.
+     * Convert the given comment Markdown to HTML.

      */
     public function commentToHtml(string $commentText): string
     {
         $converter = new CommonMarkConverter([
      */
     public function commentToHtml(string $commentText): string
     {
         $converter = new CommonMarkConverter([

-            'html_input' => 'strip',
-            'max_nesting_level' => 10,
+            'html_input'         => 'strip',
+            'max_nesting_level'  => 10,

             'allow_unsafe_links' => false,
         ]);
 
             'allow_unsafe_links' => false,
         ]);
 


@@ -88,7 +90,9 @@ class CommentRepo
      */
     protected function getNextLocalId(Entity $entity): int
     {
      */
     protected function getNextLocalId(Entity $entity): int
     {

-        $comments = $entity->comments(false)->orderBy('local_id', 'desc')->first();
-        return ($comments->local_id ?? 0) + 1;
+        /** @var Comment $comment */
+        $comment = $entity->comments(false)->orderBy('local_id', 'desc')->first();
+
+        return ($comment->local_id ?? 0) + 1;

     }
 }
     }
 }