Merge branch 'feat-tweak-meta-catch' of github.com:barryvdh/laravel-ide-helper into feat-tweak-meta-catch

CHANGELOG.md

@@ -1,13 +1,5 @@
 # Changelog
 
-## v3.5.2 - 2025-01-06
-
-### Fixes
-
-Fix empty/anonymous closure in meta command.
-
-**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.5.1...v3.5.2
-
 ## v3.5.1 - 2025-01-06
 
 ### What's Changed

src/Alias.php

@@ -403,15 +403,9 @@ class Alias
                 $macros = isset($properties['macros']) ? $properties['macros'] : [];
                 foreach ($macros as $macro_name => $macro_func) {
                     if (!in_array($macro_name, $this->usedMethods)) {
-                        try {
-                            $method = $this->getMacroFunction($macro_func);
-                        } catch (Throwable $e) {
-                            // Invalid method, skip
-                            continue;
-                        }
                         // Add macros
                         $this->methods[] = new Macro(
-                            $method,
+                            $this->getMacroFunction($macro_func),
                             $this->alias,
                             $reflection,
                             $macro_name,

src/Console/MetaCommand.php

@@ -233,7 +233,12 @@ class MetaCommand extends Command
             ],
             [
                 'class' => ['\Illuminate\Support\Facades\Route', '\Illuminate\Support\Facades\Auth', 'Illuminate\Foundation\Auth\Access\Authorizable'],
-                'method' => ['can', 'cannot'],
+                'method' => ['can', 'cannot', 'cant'],
+                'argumentSet' => 'auth',
+            ],
+            [
+                'class' => ['Illuminate\Contracts\Auth\Access\Authorizable'],
+                'method' => ['can'],
                 'argumentSet' => 'auth',
             ],
             [
@@ -308,7 +313,13 @@ class MetaCommand extends Command
     {
         if (!isset($this->templateCache[$name])) {
             $file =  __DIR__ . '/../../php-templates/' . basename($name) . '.php';
-            $value = $this->files->requireOnce($file) ?: [];
+            try {
+                $value = $this->files->requireOnce($file) ?: [];
+            } catch (\Throwable $e) {
+                $value = [];
+                $this->warn('Cannot load template for ' . $name . ': ' . $e->getMessage());
+            }
+
             if (!$value instanceof Collection) {
                 $value = collect($value);
             }