Register the svg blade directive on CP routes only ...

Prevents conflicts with blade ui kit, or if you were to have a custom svg directive for your own app.

Also gives us a place to register CP-only things in the future.

Ref #956

Author: jasonvarga

src/Http/Middleware/CP/ControlPanel.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Http\Middleware\CP;
+
+use Closure;
+use Illuminate\Support\Facades\Blade;
+
+class ControlPanel
+{
+    public function handle($request, Closure $next)
+    {
+        Blade::directive('svg', function ($expression) {
+            return "<?php echo Statamic::svg({$expression}) ?>";
+        });
+
+        return $next($request);
+    }
+}

src/Providers/AppServiceProvider.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Routing\Router;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 use Statamic\Facades\Preference;
 use Statamic\Sites\Sites;
@@ -60,10 +59,6 @@ public function boot()
             "{$this->root}/resources/views/extend/forms" => resource_path('views/vendor/statamic/forms'),
         ], 'statamic-forms');
 
-        Blade::directive('svg', function ($expression) {
-            return "<?php echo Statamic::svg({$expression}) ?>";
-        });
-
         $this->app['redirect']->macro('cpRoute', function ($route, $parameters = []) {
             return $this->to(cp_route($route, $parameters));
         });

src/Providers/CpServiceProvider.php

@@ -68,6 +68,7 @@ protected function registerMiddlewareGroups()
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \Illuminate\Foundation\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \Statamic\Http\Middleware\CP\ControlPanel::class,
             \Statamic\Http\Middleware\CP\ContactOutpost::class,
         ]);