Merge branch 'master' into update-readme-badges-to-lead-to-something

Author: caendesilva

packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php

@@ -7,14 +7,14 @@
 use Hyde\Facades\Config;
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 
 use function explode;
 use function in_array;
 use function str_contains;
 use function trim;
-use function view;
 
 /**
  * Class to make Hyde documentation pages smarter,
@@ -135,7 +135,7 @@ protected function addDynamicFooterContent(): static
 
     protected function renderSourceLink(): string
     {
-        return view('hyde::components.docs.edit-source-button', [
+        return View::make('hyde::components.docs.edit-source-button', [
             'href' => $this->page->getOnlineSourcePath(),
         ])->render();
     }

packages/framework/src/Framework/Views/Components/BreadcrumbsComponent.php

@@ -6,13 +6,12 @@
 
 use Hyde\Hyde;
 use Hyde\Foundation\Facades\Routes;
-use Illuminate\Contracts\View\Factory;
-use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\View;
+use Illuminate\Contracts\View\View as ViewContract;
 use Illuminate\View\Component;
 
 use function count;
 use function explode;
-use function view;
 
 class BreadcrumbsComponent extends Component
 {
@@ -24,9 +23,9 @@ public function __construct()
     }
 
     /** @interitDoc */
-    public function render(): Factory|View
+    public function render(): ViewContract
     {
-        return view('hyde::components.breadcrumbs');
+        return View::make('hyde::components.breadcrumbs');
     }
 
     protected function makeBreadcrumbs(): array

packages/framework/src/Framework/Views/Components/LinkComponent.php

@@ -5,12 +5,10 @@
 namespace Hyde\Framework\Views\Components;
 
 use Hyde\Hyde;
-use Illuminate\Contracts\View\Factory;
-use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\View;
+use Illuminate\Contracts\View\View as ViewContract;
 use Illuminate\View\Component;
 
-use function view;
-
 class LinkComponent extends Component
 {
     public readonly string $href;
@@ -21,8 +19,8 @@ public function __construct(string $href)
     }
 
     /** @interitDoc */
-    public function render(): Factory|View
+    public function render(): ViewContract
     {
-        return view('hyde::components.link');
+        return View::make('hyde::components.link');
     }
 }

packages/framework/src/Markdown/Processing/CodeblockFilepathProcessor.php

@@ -7,6 +7,7 @@
 use Hyde\Facades\Config;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 use Hyde\Markdown\Contracts\MarkdownPreProcessorContract;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\HtmlString;
 
 use function preg_replace;
@@ -19,7 +20,6 @@
 use function implode;
 use function sprintf;
 use function trim;
-use function view;
 
 /**
  * Resolves file path comments found in Markdown code blocks into a neat badge shown in the top right corner.
@@ -110,7 +110,7 @@ protected static function trimHydeDirective(string $line): string
 
     protected static function resolveTemplate(string $path): string
     {
-        return view('hyde::components.filepath-label', [
+        return View::make('hyde::components.filepath-label', [
             'path' => Config::getBool('markdown.allow_html', false) ? new HtmlString($path) : $path,
         ])->render();
     }

packages/framework/tests/Unit/BreadcrumbsComponentTest.php

@@ -9,8 +9,8 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\Route;
 use Hyde\Testing\UnitTestCase;
-use Illuminate\Contracts\View\Factory as ViewFactory;
 use Illuminate\Support\Facades\Facade;
+use Illuminate\Support\Facades\View;
 use Illuminate\View\Factory;
 use Mockery;
 
@@ -44,11 +44,15 @@ public function testCanRender()
     {
         $this->mockPage(new MarkdownPage());
 
-        app()->instance(ViewFactory::class, Mockery::mock(Factory::class, function ($mock) {
-            $mock->shouldReceive('make')->once()->andReturn($mock);
-        }));
+        $view = Mockery::mock(\Illuminate\View\View::class);
+        $mock = Mockery::mock(Factory::class);
+        $mock->shouldReceive('make')->once()->with('hyde::components.breadcrumbs')->andReturn($view);
+        app()->singleton('view', fn () =>$mock);
+        View::swap($mock);
 
-        $this->assertInstanceOf(Factory::class, (new BreadcrumbsComponent())->render());
+        $this->assertSame($view, (new BreadcrumbsComponent())->render());
+
+        Mockery::close();
     }
 
     public function testCanGenerateBreadcrumbs()