From df8852e8dd6719ff1356c034226a96a28be5fdb6 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Tue, 18 Mar 2014 14:22:52 +0100 Subject: [PATCH] Use FQN for extending/root Otherwise it doesn't work in namespaces. --- src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php b/src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php index d6b84fd..e9ab652 100755 --- a/src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php +++ b/src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php @@ -138,14 +138,13 @@ class GeneratorCommand extends Command { $aliases = $aliasLoader->getAliases(); foreach($aliases as $alias => $facade){ - + $facade = '\\'.ltrim($facade, '\\'); $root = $this->getRoot($facade); if(!$root){ continue; } try{ - if (strpos($alias, '\\')){ $nsParts = explode('\\', $alias); $alias = array_pop($nsParts); @@ -396,10 +395,11 @@ class GeneratorCommand extends Command { //Reference the 'real' function in the declaringclass $declaringClass = $method->getDeclaringClass(); - $root = $class->getName(); + $declaringClassName = '\\'.ltrim($declaringClass->name, '\\'); + $root = '\\'.ltrim($class->getName(), '\\'); if($declaringClass->name != $root){ - $output .= "\t\t\t//Method inherited from $declaringClass->name\n"; + $output .= "\t\t\t//Method inherited from $declaringClassName\n"; } $output .= "\t\t\t$return $root::";