Fix macros issue

Author: erikn69

src/Alias.php

@@ -47,8 +47,6 @@ class Alias
     protected $phpdoc = null;
     protected $classAliases = [];
 
-    protected $isMacroable = false;
-
     /** @var ConfigRepository  */
     protected $config;
 
@@ -63,13 +61,12 @@ class Alias
      * @param array            $magicMethods
      * @param array            $interfaces
      */
-    public function __construct($config, $alias, $facade, $magicMethods = [], $interfaces = [], $isMacroable = false)
+    public function __construct($config, $alias, $facade, $magicMethods = [], $interfaces = [])
     {
         $this->alias = $alias;
         $this->magicMethods = $magicMethods;
         $this->interfaces = $interfaces;
         $this->config = $config;
-        $this->isMacroable = $isMacroable;
 
         // Make the class absolute
         $facade = '\\' . ltrim($facade, '\\');
@@ -431,7 +428,7 @@ protected function detectMethods()
 
             // Check if the class is macroable
             // (Eloquent\Builder is also macroable but doesn't use Macroable trait)
-            if ($this->isMacroable || $class === EloquentBuilder::class) {
+            if ($class === EloquentBuilder::class || Generator::hasMacroableTrait(array_flip($reflection->getTraitNames()))) {
                 $properties = $reflection->getStaticProperties();
                 $macros = isset($properties['macros']) ? $properties['macros'] : [];
                 foreach ($macros as $macro_name => $macro_func) {

src/Generator.php

@@ -15,6 +15,7 @@
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Facade;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
 use ReflectionClass;
@@ -35,7 +36,7 @@ class Generator
     protected $magic = [];
     protected $interfaces = [];
     protected $helpers;
-    protected array $macroableTraits = [];
+    protected static ?array $_macroableTraits = null;
 
     /**
      * @param \Illuminate\Config\Repository $config
@@ -58,9 +59,9 @@ public function __construct(
         // Find the drivers to add to the extra/interfaces
         $this->detectDrivers();
 
-        $this->extra = array_merge($this->extra, $this->config->get('ide-helper.extra'), []);
-        $this->magic = array_merge($this->magic, $this->config->get('ide-helper.magic'), []);
-        $this->interfaces = array_merge($this->interfaces, $this->config->get('ide-helper.interfaces'), []);
+        $this->extra = array_merge($this->extra, $this->config->get('ide-helper.extra', []));
+        $this->magic = array_merge($this->magic, $this->config->get('ide-helper.magic', []));
+        $this->interfaces = array_merge($this->interfaces, $this->config->get('ide-helper.interfaces', []));
         // Make all interface classes absolute
         foreach ($this->interfaces as &$interface) {
             $interface = '\\' . ltrim($interface, '\\');
@@ -360,7 +361,7 @@ protected function addMacroableClasses(Collection $aliases)
                 continue;
             }
 
-            $aliases[] = new Alias($this->config, $class, $class, [], $this->interfaces, true);
+            $aliases[] = new Alias($this->config, $class, $class, [], $this->interfaces);
         }
     }
 
@@ -379,22 +380,7 @@ protected function getMacroableClasses(Collection $aliases)
                 // Filter out internal classes and class aliases
                 return !$reflection->isInternal() && $reflection->getName() === $class;
             })
-            ->filter(function ($class) {
-                $traits = class_uses_recursive($class);
-
-                if (isset($traits[Macroable::class])) {
-                    return true;
-                }
-
-                // Filter only classes with a macroable trait
-                foreach ($this->config->get('ide-helper.macroable_traits', []) as $trait) {
-                    if (isset($traits[$trait])) {
-                        return true;
-                    }
-                }
-
-                return false;
-            })
+            ->filter(fn ($class) => static::hasMacroableTrait(class_uses_recursive($class)))
             ->filter(function ($class) use ($aliases) {
                 $class = Str::start($class, '\\');
 
@@ -404,4 +390,19 @@ protected function getMacroableClasses(Collection $aliases)
                 });
             });
     }
+
+    public static function hasMacroableTrait($traits)
+    {
+        if (!static::$_macroableTraits) {
+            static::$_macroableTraits = array_merge([Macroable::class], Config::get('ide-helper.macroable_traits', []));;
+        }
+
+        foreach (static::$_macroableTraits as $trait) {
+            if (isset($traits[$trait])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

tests/AliasTest.php

@@ -7,6 +7,7 @@
 use Barryvdh\LaravelIdeHelper\Alias;
 use Barryvdh\LaravelIdeHelper\Macro;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Arr;
 
 /**
@@ -15,6 +16,31 @@
  */
 class AliasTest extends TestCase
 {
+    /**
+     * @covers ::detectMethods
+     */
+    public function testDetectMethodsMacroableMacros(): void
+    {
+        // Mock
+        $macro = __FUNCTION__;
+        $alias = new AliasMock();
+
+        // Macros
+        Builder::macro(
+            $macro,
+            function () {
+                // empty
+            }
+        );
+
+        // Prepare
+        $alias->setClasses([Builder::class]);
+        $alias->detectMethods();
+
+        // Test
+        $this->assertNotNull($this->getAliasMacro($alias, Builder::class, $macro));
+    }
+
     /**
      * @covers ::detectMethods
      */
@@ -24,7 +50,7 @@ public function testDetectMethodsEloquentBuilderMacros(): void
         $macro = __FUNCTION__;
         $alias = new AliasMock();
 
-        // Macrosx
+        // Macros
         EloquentBuilder::macro(
             $macro,
             function () {