mirrors/barryvdh_laravel-ide-helper
1
0
Fork 0
mirror of https://github.com/barryvdh/laravel-ide-helper.git synced 2026-08-19 10:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert #1629 - _Allow adding custom Macroable classes_ (#1707)

Browse Source 
* Revert #1629 - Allow adding custom Macroable classes

* Add Macros test
This commit is contained in:
erikn69
2025-05-14 20:21:17 +02:00
committed by GitHub
parent 0fa96e572d
commit c775aec1bb
6 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Generator.php
+3 -14
View File
@@ -35,7 +35,6 @@ class Generator
protected $magic = [];
protected $interfaces = [];
protected $helpers;
protected array $macroableTraits = [];
/**
* @param \Illuminate\Config\Repository $config
@@ -360,7 +359,7 @@ class Generator
continue;
}
$aliases[] = new Alias($this->config, $class, $class, [], $this->interfaces, true);
$aliases[] = new Alias($this->config, $class, $class, [], $this->interfaces);
}
}
@@ -382,18 +381,8 @@ class Generator
->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 only classes with the macroable trait
return isset($traits[Macroable::class]);
})
->filter(function ($class) use ($aliases) {
$class = Str::start($class, '\\');