Merge branch 'main' of https://github.com/laravel/vs-code-extension

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,

php-templates/translations.php

@@ -298,6 +298,10 @@ protected function fromJsonFile($file, $path, $namespace)
             [$json, $lines] = $this->linesFromJsonFile($file);
 
             foreach ($json as $key => $value) {
+                if (!array_key_exists($key, $lines) || is_array($value)) {
+                    continue;
+                }
+
                 yield [
                     "k" => $key,
                     "la" => $lang,

src/completion/Blade.ts

@@ -129,6 +129,8 @@ export default class Blade implements vscode.CompletionItemProvider {
             "@slot(...)": "@slot(${1})",
             "@stack(...)": "@stack(${1})",
             "@push(...)": ["@push(${1})", indent("${2}"), "@endpush"],
+            "@pushIf(...)": ["@pushIf(${1})", indent("${2}"), "@endPushIf"],
+            "@pushOnce(...)": ["@pushOnce(${1})", indent("${2}"), "@endPushOnce"],
             "@prepend(...)": ["@prepend(${1})", indent("${2}"), "@endprepend"],
             "@php": ["@php", indent("${1}"), "@endphp"],
             "@component(...)": ["@component(${1})", "${2}", "@endcomponent"],
@@ -139,6 +141,7 @@ export default class Blade implements vscode.CompletionItemProvider {
             ],
             "@section(...)": "@section(${1})",
             "@props(...)": "@props(${1})",
+            "@use(...)": "@use(${1})",
             "@show": "@show",
             "@stop": "@stop",
             "@parent": "@parent",
@@ -165,6 +168,8 @@ export default class Blade implements vscode.CompletionItemProvider {
             "@endenv": "@endenv",
             "@endonce": "@endonce",
             "@endpush": "@endpush",
+            "@endpushIf": "@endPushIf",
+            "@endpushOnce": "@endPushOnce",
             "@endprepend": "@endprepend",
             "@endphp": "@endphp",
             "@endcomponent": "@endcomponent",

src/repositories/middleware.ts

@@ -40,7 +40,10 @@ export const getMiddleware = repository<MiddlewareItem>({
             return items;
         });
     },
-    pattern: "app/Http/Kernel.php",
+    pattern: [
+        "app/Http/Kernel.php",
+        "bootstrap/app.php"
+    ],
     itemsDefault: {},
     fileWatcherEvents: ["change"],
 });

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,

src/templates/translations.ts

@@ -298,6 +298,10 @@ $translator = new class
             [$json, $lines] = $this->linesFromJsonFile($file);
 
             foreach ($json as $key => $value) {
+                if (!array_key_exists($key, $lines) || is_array($value)) {
+                    continue;
+                }
+
                 yield [
                     "k" => $key,
                     "la" => $lang,