move/rename

statamic · Nov 1, 2024 · ea12e81 · ea12e81
1 parent 3b0a1ba
commit ea12e81
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/config/routes.php b/config/routes.php
@@ -53,14 +53,4 @@
 
     'middleware' => 'web',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Layout
-    |--------------------------------------------------------------------------
-    |
-    | Define the default layout that will be used by front end routes.
-    |
-    */
-
-    'layout' => env('STATAMIC_FRONTEND_ROUTES_LAYOUT', 'layout'),
 ];
diff --git a/config/system.php b/config/system.php
@@ -194,4 +194,15 @@
 
     'fake_sql_queries' => config('app.debug'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Layout
+    |--------------------------------------------------------------------------
+    |
+    | Define the default layout that will be used by views.
+    |
+    */
+
+    'layout' => env('STATAMIC_LAYOUT', 'layout'),
+
 ];
diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
@@ -442,7 +442,7 @@ public function layout($layout = null)
         return $this
             ->fluentlyGetOrSet('layout')
             ->getter(function ($layout) {
-                return $layout ?? config('statamic.routes.layout', 'layout');
+                return $layout ?? config('statamic.system.layout', 'layout');
             })
             ->args(func_get_args());
     }

diff --git a/src/Http/Controllers/FrontendController.php b/src/Http/Controllers/FrontendController.php
@@ -45,7 +45,7 @@ public function route(Request $request, ...$args)
 
         $view = app(View::class)
             ->template($view)
-            ->layout(Arr::get($data, 'layout', config('statamic.routes.layout', 'layout')))
+            ->layout(Arr::get($data, 'layout', config('statamic.system.layout', 'layout')))
             ->with($data)
             ->cascadeContent($this->getLoadedRouteItem($data));
 

diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php
@@ -436,7 +436,7 @@ public function layout($layout = null)
         return $this
             ->fluentlyGetOrSet('layout')
             ->getter(function ($layout) {
-                return $layout ?? config('statamic.routes.layout', 'layout');
+                return $layout ?? config('statamic.system.layout', 'layout');
             })
             ->args(func_get_args());
     }

diff --git a/tests/Routing/RoutesTest.php b/tests/Routing/RoutesTest.php
@@ -345,7 +345,7 @@ public function it_loads_term_by_binding()
     #[Test]
     public function it_uses_a_non_default_layout()
     {
-        config()->set('statamic.routes.layout', 'custom-layout');
+        config()->set('statamic.system.layout', 'custom-layout');
         $this->viewShouldReturnRaw('custom-layout', 'Custom layout {{ template_content }}');
         $this->viewShouldReturnRaw('test', 'Hello {{ hello }}');