fix deprecated syntax

[bookstack] / app / Entities / Repos / BaseRepo.php

diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 23f07f82049bc8342346b33c8b889c11f155755e..033350743e0dd824bc259254d67e80edee3c187c 100644 (file)
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -2,41 +2,42 @@
 
 namespace BookStack\Entities\Repos;
 
 
 namespace BookStack\Entities\Repos;
 

-use BookStack\Actions\TagRepo;
-use BookStack\Entities\Book;
-use BookStack\Entities\Entity;
-use BookStack\Entities\HasCoverImage;
+use BookStack\Activity\TagRepo;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\HasCoverImage;
+use BookStack\Entities\Models\HasHtmlDescription;
+use BookStack\Entities\Queries\PageQueries;

 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\ImageUploadException;

+use BookStack\References\ReferenceStore;
+use BookStack\References\ReferenceUpdater;

 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageRepo;

+use BookStack\Util\HtmlDescriptionFilter;

 use Illuminate\Http\UploadedFile;
 use Illuminate\Http\UploadedFile;

-use Illuminate\Support\Collection;

 
 class BaseRepo
 {
 
 class BaseRepo
 {

-
-    protected $tagRepo;
-    protected $imageRepo;
-
-
-    /**
-     * BaseRepo constructor.
-     * @param $tagRepo
-     */
-    public function __construct(TagRepo $tagRepo, ImageRepo $imageRepo)
-    {
-        $this->tagRepo = $tagRepo;
-        $this->imageRepo = $imageRepo;
+    public function __construct(
+        protected TagRepo $tagRepo,
+        protected ImageRepo $imageRepo,
+        protected ReferenceUpdater $referenceUpdater,
+        protected ReferenceStore $referenceStore,
+        protected PageQueries $pageQueries,
+    ) {

     }
 
     /**
     }
 
     /**

-     * Create a new entity in the system
+     * Create a new entity in the system.

      */
     public function create(Entity $entity, array $input)
     {
         $entity->fill($input);
      */
     public function create(Entity $entity, array $input)
     {
         $entity->fill($input);

+        $this->updateDescription($entity, $input);

         $entity->forceFill([
             'created_by' => user()->id,
             'updated_by' => user()->id,
         $entity->forceFill([
             'created_by' => user()->id,
             'updated_by' => user()->id,

+            'owned_by'   => user()->id,

         ]);
         $entity->refreshSlug();
         $entity->save();
         ]);
         $entity->refreshSlug();
         $entity->save();


@@ -45,8 +46,10 @@ class BaseRepo
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);
         }
 
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);
         }
 

+        $entity->refresh();

         $entity->rebuildPermissions();
         $entity->indexForSearch();
         $entity->rebuildPermissions();
         $entity->indexForSearch();

+        $this->referenceStore->updateForEntity($entity);

     }
 
     /**
     }
 
     /**


@@ -54,10 +57,13 @@ class BaseRepo
      */
     public function update(Entity $entity, array $input)
     {
      */
     public function update(Entity $entity, array $input)
     {

+        $oldUrl = $entity->getUrl();
+

         $entity->fill($input);
         $entity->fill($input);

+        $this->updateDescription($entity, $input);

         $entity->updated_by = user()->id;
 
         $entity->updated_by = user()->id;
 

-        if ($entity->isDirty('name')) {
+        if ($entity->isDirty('name') || empty($entity->slug)) {

             $entity->refreshSlug();
         }
 
             $entity->refreshSlug();
         }
 


@@ -65,55 +71,83 @@ class BaseRepo
 
         if (isset($input['tags'])) {
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);
 
         if (isset($input['tags'])) {
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);

+            $entity->touch();

         }
 
         $entity->rebuildPermissions();
         $entity->indexForSearch();
         }
 
         $entity->rebuildPermissions();
         $entity->indexForSearch();

+        $this->referenceStore->updateForEntity($entity);
+
+        if ($oldUrl !== $entity->getUrl()) {
+            $this->referenceUpdater->updateEntityReferences($entity, $oldUrl);
+        }

     }
 
     /**
      * Update the given items' cover image, or clear it.
     }
 
     /**
      * Update the given items' cover image, or clear it.

+     *
+     * @param Entity&HasCoverImage $entity
+     *

      * @throws ImageUploadException
      * @throws \Exception
      */
      * @throws ImageUploadException
      * @throws \Exception
      */

-    public function updateCoverImage(HasCoverImage $entity, UploadedFile $coverImage = null, bool $removeImage = false)
+    public function updateCoverImage($entity, ?UploadedFile $coverImage, bool $removeImage = false)

     {
         if ($coverImage) {
     {
         if ($coverImage) {

-            $this->imageRepo->destroyImage($entity->cover);
-            $image = $this->imageRepo->saveNew($coverImage, 'cover_book', $entity->id, 512, 512, true);
+            $imageType = $entity->coverImageTypeKey();
+            $this->imageRepo->destroyImage($entity->cover()->first());
+            $image = $this->imageRepo->saveNew($coverImage, $imageType, $entity->id, 512, 512, true);

             $entity->cover()->associate($image);
             $entity->save();
         }
 
         if ($removeImage) {
             $entity->cover()->associate($image);
             $entity->save();
         }
 
         if ($removeImage) {

-            $this->imageRepo->destroyImage($entity->cover);
+            $this->imageRepo->destroyImage($entity->cover()->first());

             $entity->image_id = 0;
             $entity->save();
         }
     }
 
     /**
             $entity->image_id = 0;
             $entity->save();
         }
     }
 
     /**

-     * Update the permissions of an entity.
+     * Update the default page template used for this item.
+     * Checks that, if changing, the provided value is a valid template and the user
+     * has visibility of the provided page template id.

      */
      */

-    public function updatePermissions(Entity $entity, bool $restricted, Collection $permissions = null)
+    public function updateDefaultTemplate(Book|Chapter $entity, int $templateId): void

     {
     {

-        $entity->restricted = $restricted;
-        $entity->permissions()->delete();
-
-        if (!is_null($permissions)) {
-            $entityPermissionData = $permissions->flatMap(function ($restrictions, $roleId) {
-                return collect($restrictions)->keys()->map(function ($action) use ($roleId) {
-                    return [
-                        'role_id' => $roleId,
-                        'action' => strtolower($action),
-                    ] ;
-                });
-            });
-
-            $entity->permissions()->createMany($entityPermissionData);
+        $changing = $templateId !== intval($entity->default_template_id);
+        if (!$changing) {
+            return;
+        }
+
+        if ($templateId === 0) {
+            $entity->default_template_id = null;
+            $entity->save();
+            return;

         }
 
         }
 

+        $templateExists = $this->pageQueries->visibleTemplates()
+            ->where('id', '=', $templateId)
+            ->exists();
+
+        $entity->default_template_id = $templateExists ? $templateId : null;

         $entity->save();
         $entity->save();

-        $entity->rebuildPermissions();
+    }
+
+    protected function updateDescription(Entity $entity, array $input): void
+    {
+        if (!in_array(HasHtmlDescription::class, class_uses($entity))) {
+            return;
+        }
+
+        /** @var HasHtmlDescription $entity */
+        if (isset($input['description_html'])) {
+            $entity->description_html = HtmlDescriptionFilter::filterFromString($input['description_html']);
+            $entity->description = html_entity_decode(strip_tags($input['description_html']));
+        } else if (isset($input['description'])) {
+            $entity->description = $input['description'];
+            $entity->description_html = '';
+            $entity->description_html = $entity->descriptionHtml();
+        }

     }
 }
     }
 }