TypeScript: Updated compile target, addressed issues

[bookstack] / app / Entities / BreadcrumbsViewComposer.php

diff --git a/app/Entities/BreadcrumbsViewComposer.php b/app/Entities/BreadcrumbsViewComposer.php
index 43d63d026021dd07edcb1165841018ee213b13a3..c9269c7c66af95029029f4e600901692d5d8e07c 100644 (file)
--- a/app/Entities/BreadcrumbsViewComposer.php
+++ b/app/Entities/BreadcrumbsViewComposer.php
@@ -1,32 +1,28 @@
-<?php namespace BookStack\Entities;
+<?php

 
 

-use BookStack\Entities\Managers\EntityContext;
+namespace BookStack\Entities;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Tools\ShelfContext;

 use Illuminate\View\View;
 
 class BreadcrumbsViewComposer
 {
 use Illuminate\View\View;
 
 class BreadcrumbsViewComposer
 {

-
-    protected $entityContextManager;
-
-    /**
-     * BreadcrumbsViewComposer constructor.
-     * @param EntityContext $entityContextManager
-     */
-    public function __construct(EntityContext $entityContextManager)
-    {
-        $this->entityContextManager = $entityContextManager;
+    public function __construct(
+        protected ShelfContext $shelfContext
+    ) {

     }
 
     /**
      * Modify data when the view is composed.
     }
 
     /**
      * Modify data when the view is composed.

-     * @param View $view

      */
      */

-    public function compose(View $view)
+    public function compose(View $view): void

     {
         $crumbs = $view->getData()['crumbs'];
         $firstCrumb = $crumbs[0] ?? null;
     {
         $crumbs = $view->getData()['crumbs'];
         $firstCrumb = $crumbs[0] ?? null;

+

         if ($firstCrumb instanceof Book) {
         if ($firstCrumb instanceof Book) {

-            $shelf = $this->entityContextManager->getContextualShelfForBook($firstCrumb);
+            $shelf = $this->shelfContext->getContextualShelfForBook($firstCrumb);

             if ($shelf) {
                 array_unshift($crumbs, $shelf);
                 $view->with('crumbs', $crumbs);
             if ($shelf) {
                 array_unshift($crumbs, $shelf);
                 $view->with('crumbs', $crumbs);