mirrors/barryvdh_laravel-ide-helper
1
0
Fork 0
mirror of https://github.com/barryvdh/laravel-ide-helper.git synced 2026-08-18 01:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #740 from JeppeKnockaert/fix-cannot-redeclare-method

Browse Source 
bugfix - Prevent redeclaring methods inside Aliases
This commit is contained in:
Barry vd. Heuvel
2018-12-17 17:40:51 +01:00
committed by GitHub
parent 99226c92b7 001719245c
commit aeae59d0af
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Alias.php
+5 -2
View File
@@ -176,6 +176,10 @@ class Alias
*/ */
public function getMethods() public function getMethods()
{ {
if (count($this->methods) > 0) {
return $this->methods;
}
$this->addMagicMethods(); $this->addMagicMethods();
$this->detectMethods(); $this->detectMethods();
return $this->methods; return $this->methods;
@@ -411,10 +415,9 @@ class Alias
*/ */
protected function removeDuplicateMethodsFromPhpDoc() protected function removeDuplicateMethodsFromPhpDoc()
{ {
$methods = count($this->methods) > 0 ? $this->methods : $this->getMethods();
$methodNames = array_map(function (Method $method) { $methodNames = array_map(function (Method $method) {
return $method->getName(); return $method->getName();
}, $methods); }, $this->getMethods());
foreach ($this->phpdoc->getTags() as $tag) { foreach ($this->phpdoc->getTags() as $tag) {
if ($tag instanceof MethodTag && in_array($tag->getMethodName(), $methodNames)) { if ($tag instanceof MethodTag && in_array($tag->getMethodName(), $methodNames)) {