Merge pull request #732 from HikaruYasuda/fix/duplicateMacroMethods

fix: Macro methods are duplicated registration.
This commit is contained in:
Barry vd. Heuvel
2018-12-19 13:08:48 +01:00
committed by GitHub
+11 -8
View File
@@ -361,14 +361,17 @@ class Alias
$properties = $reflection->getStaticProperties(); $properties = $reflection->getStaticProperties();
$macros = isset($properties['macros']) ? $properties['macros'] : []; $macros = isset($properties['macros']) ? $properties['macros'] : [];
foreach ($macros as $macro_name => $macro_func) { foreach ($macros as $macro_name => $macro_func) {
// Add macros if (!in_array($macro_name, $this->usedMethods)) {
$this->methods[] = new Macro( // Add macros
$this->getMacroFunction($macro_func), $this->methods[] = new Macro(
$this->alias, $this->getMacroFunction($macro_func),
$reflection, $this->alias,
$macro_name, $reflection,
$this->interfaces $macro_name,
); $this->interfaces
);
$this->usedMethods[] = $macro_name;
}
} }
} }
} }