Merge pull request #381 from N1ebieski/Fix-Middleware-handle-does-not-exist-on-invokable-middleware-files-#39

Fix Middleware "handle" does not exist on invokable middleware files

Author: joetannenbaum

php-templates/middleware.php

@@ -1,5 +1,12 @@
 <?php
 
+function vsCodeGetReflectionMethod(ReflectionClass $reflected): ReflectionMethod {
+  return match (true) {
+    $reflected->hasMethod('__invoke') => $reflected->getMethod('__invoke'),
+    default => $reflected->getMethod('handle'),
+  };
+}
+
 echo collect(app("Illuminate\Contracts\Http\Kernel")->getMiddlewareGroups())
   ->merge(app("Illuminate\Contracts\Http\Kernel")->getRouteMiddleware())
   ->map(function ($middleware, $key) {
@@ -22,7 +29,7 @@
         }
 
         $reflected = new ReflectionClass($m);
-        $reflectedMethod = $reflected->getMethod("handle");
+        $reflectedMethod = vsCodeGetReflectionMethod($reflected);
 
         return [
           "class" => $m,
@@ -38,7 +45,7 @@
     }
 
     $reflected = new ReflectionClass($middleware);
-    $reflectedMethod = $reflected->getMethod("handle");
+    $reflectedMethod = vsCodeGetReflectionMethod($reflected);
 
     $result = array_merge($result, [
       "class" => $middleware,

src/templates/middleware.ts

@@ -1,5 +1,12 @@
 // This file was generated from php-templates/middleware.php, do not edit directly
 export default `
+function vsCodeGetReflectionMethod(ReflectionClass $reflected): ReflectionMethod {
+  return match (true) {
+    $reflected->hasMethod('__invoke') => $reflected->getMethod('__invoke'),
+    default => $reflected->getMethod('handle'),
+  };
+}
+
 echo collect(app("Illuminate\\Contracts\\Http\\Kernel")->getMiddlewareGroups())
   ->merge(app("Illuminate\\Contracts\\Http\\Kernel")->getRouteMiddleware())
   ->map(function ($middleware, $key) {
@@ -22,7 +29,7 @@ echo collect(app("Illuminate\\Contracts\\Http\\Kernel")->getMiddlewareGroups())
         }
 
         $reflected = new ReflectionClass($m);
-        $reflectedMethod = $reflected->getMethod("handle");
+        $reflectedMethod = vsCodeGetReflectionMethod($reflected);
 
         return [
           "class" => $m,
@@ -38,7 +45,7 @@ echo collect(app("Illuminate\\Contracts\\Http\\Kernel")->getMiddlewareGroups())
     }
 
     $reflected = new ReflectionClass($middleware);
-    $reflectedMethod = $reflected->getMethod("handle");
+    $reflectedMethod = vsCodeGetReflectionMethod($reflected);
 
     $result = array_merge($result, [
       "class" => $middleware,