2.x Fix: Adjust config setting to make sure it does not cause other e…

…rrors (#300) * Adjust config setting to make sure it does not cause other errors * Also check for all features to still be able to make the view finder
tenancy · May 12, 2024 · 8feca65 · 8feca65
1 parent b10d92b
commit 8feca65
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/Affects/Views/Events/ConfigureViews.php b/src/Affects/Views/Events/ConfigureViews.php
@@ -37,7 +37,7 @@ public function addNamespace(string $path, string $namespace = 'tenant'): static
     public function addPath(string $path, bool $replace = false): static
     {
         if ($replace) {
-            config(['view.paths' => $path]);
+            config(['view.paths' => [$path]]);
             $finder = $this->view->getFinder();
 
             $finder->prependLocation($path);

diff --git a/tests/Affects/Views/Feature/ConfigureViewsNamespaceDefaultTest.php b/tests/Affects/Views/Feature/ConfigureViewsNamespaceDefaultTest.php
@@ -17,6 +17,7 @@
 namespace Tenancy\Tests\Affects\Views\Feature;
 
 use Illuminate\Contracts\View\Factory;
+use Illuminate\View\ViewFinderInterface;
 use Tenancy\Affects\Views\Provider;
 use Tenancy\Identification\Contracts\Tenant;
 use Tenancy\Tests\Affects\AffectsFeatureTestCase;
@@ -33,6 +34,6 @@ protected function isAffected(Tenant $tenant): bool
         /** @var Factory $views */
         $views = $this->app->make(Factory::class);
 
-        return $views->exists('tenant::test');
+        return $views->exists('tenant::test') && $this->app->make('view.finder') instanceof ViewFinderInterface;
     }
 }
diff --git a/tests/Affects/Views/Feature/ConfigureViewsPathReplaceTest.php b/tests/Affects/Views/Feature/ConfigureViewsPathReplaceTest.php
@@ -17,6 +17,7 @@
 namespace Tenancy\Tests\Affects\Views\Feature;
 
 use Illuminate\Contracts\View\Factory;
+use Illuminate\View\ViewFinderInterface;
 use Tenancy\Affects\Views\Provider;
 use Tenancy\Identification\Contracts\Tenant;
 use Tenancy\Tests\Affects\AffectsFeatureTestCase;
@@ -33,6 +34,6 @@ protected function isAffected(Tenant $tenant): bool
         /** @var Factory $views */
         $views = $this->app->make(Factory::class);
 
-        return $views->exists('test') && $views->exists('welcome');
+        return $views->exists('test') && $views->exists('welcome') && $this->app->make('view.finder') instanceof ViewFinderInterface;
     }
 }
diff --git a/tests/Affects/Views/Feature/ConfigureViewsPathTest.php b/tests/Affects/Views/Feature/ConfigureViewsPathTest.php
@@ -17,6 +17,7 @@
 namespace Tenancy\Tests\Affects\Views\Feature;
 
 use Illuminate\Contracts\View\Factory;
+use Illuminate\View\ViewFinderInterface;
 use Tenancy\Affects\Views\Provider;
 use Tenancy\Identification\Contracts\Tenant;
 use Tenancy\Tests\Affects\AffectsFeatureTestCase;
@@ -33,6 +34,6 @@ protected function isAffected(Tenant $tenant): bool
         /** @var Factory $views */
         $views = $this->app->make(Factory::class);
 
-        return $views->exists('test');
+        return $views->exists('test') && $this->app->make('view.finder') instanceof ViewFinderInterface;
     }
 }