Fix for L10 installation (#318)

protonemedia · Feb 15, 2023 · 80c920e · 80c920e
1 parent c381332
commit 80c920e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Commands/InstallsSpladeExceptionHandler.php b/src/Commands/InstallsSpladeExceptionHandler.php
@@ -17,7 +17,9 @@ protected function installExceptionHandler()
 
         $exceptionHandler = file_get_contents(app_path('Exceptions/Handler.php'));
 
-        $search = 'public function register()' . $eol . '    {';
+        $search = version_compare(app()->version(), '10.0', '>=')
+            ? 'public function register(): void' . $eol . '    {'
+            : 'public function register()' . $eol . '    {';
 
         $registerMethodAfter = Str::after($exceptionHandler, $search);
 

diff --git a/src/Commands/InstallsSpladeRouteMiddleware.php b/src/Commands/InstallsSpladeRouteMiddleware.php
@@ -15,7 +15,11 @@ protected function installRouteMiddleware()
     {
         $httpKernel = file_get_contents(app_path('Http/Kernel.php'));
 
-        $search = 'protected $routeMiddleware = [' . SpladeInstallCommand::eol();
+        $eol = SpladeInstallCommand::eol();
+
+        $search = version_compare(app()->version(), '10.0', '>=')
+            ? 'protected $middlewareAliases = [' . $eol
+            : 'protected $routeMiddleware = [' . $eol;
 
         $routeMiddlewareAfter = Str::after($httpKernel, $search);
 
@@ -29,7 +33,7 @@ protected function installRouteMiddleware()
             app_path('Http/Kernel.php'),
             str_replace(
                 $routeMiddlewareAfter,
-                '        ' . $routeMiddleware . ',' . SpladeInstallCommand::eol() . $routeMiddlewareAfter,
+                '        ' . $routeMiddleware . ',' . $eol . $routeMiddlewareAfter,
                 $httpKernel
             )
         );