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

Change Sublime behaviour

Browse Source 
More similar to the phpStorm approach
This commit is contained in:
Barry vd. Heuvel
2013-04-27 20:05:44 +02:00
parent 3d2934b62d
commit e1dac36be8
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php
+19 -15
View File
@@ -141,17 +141,14 @@ class GeneratorCommand extends Command {
$d->analyze($root); $d->analyze($root);
$output .= "namespace $namespace {\n"; $output .= "namespace $namespace {\n";
if($sublime){
$output .= " class $alias extends \\$root{\n"; //If the root class is not the same as the facade extend it.
if($root !== $facade || in_array($alias, $onlyExtend)){
$output .= " class $alias extends $facade{\n";
}else{ }else{
//If the root class is not the same as the facade extend it. $output .= " class $alias{\n";
if($root !== $facade || in_array($alias, $onlyExtend)){
$output .= " class $alias extends $facade{\n";
}else{
$output .= " class $alias{\n";
}
$output .= "\t/**\n\t * @var \\$root \$root\n\t */\n\t static private \$root;\n\n";
} }
$output .= "\t/**\n\t * @var \\$root \$root\n\t */\n\t static private \$root;\n\n";
if(!in_array($alias, $onlyExtend) || $sublime) if(!in_array($alias, $onlyExtend) || $sublime)
{ {
@@ -159,7 +156,7 @@ class GeneratorCommand extends Command {
foreach ($methods as $method) foreach ($methods as $method)
{ {
$output .= $this->parseMethod($method, $sublime); $output .= $this->parseMethod($method, $root, $sublime);
} }
} }
$output .= " }\n}\n\n"; $output .= " }\n}\n\n";
@@ -181,7 +178,7 @@ class GeneratorCommand extends Command {
return $output; return $output;
} }
protected function parseMethod($method, $sublime=false){ protected function parseMethod($method, $root, $sublime){
if($method->name === '__clone'){ if($method->name === '__clone'){
return ''; return '';
} }
@@ -241,13 +238,20 @@ class GeneratorCommand extends Command {
} }
$output .= implode($paramsWithDefault, ", "); $output .= implode($paramsWithDefault, ", ");
$output .= "){\r\n\t\t".($returnValue !== "void" ? 'return ' : ''); $output .= "){\r\n";
$return = $returnValue !== "void" ? 'return' : '';
if($sublime){ if($sublime){
$output .= "parent::"; $output .= "\t\t\$root = new $root();\r\n";
$output .= "\t\t$return \$root->";
}else{ }else{
$output .= "self::\$root->"; $output .= "\t\t$return static::\$root->";
} }
$output .= $method->name."(".implode($params, ", ").");\r\n\t }\n\n"; $output .= $method->name."(".implode($params, ", ").");\r\n";
$output .= "\t }\n\n";
return $output; return $output;
} }