mirror of
https://github.com/barryvdh/laravel-ide-helper.git
synced 2026-08-18 01:57:13 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77c8bfa05a | ||
|
|
62deba4171 | ||
|
|
32918908fc | ||
|
|
cca1b5896e |
@@ -53,7 +53,7 @@ class GeneratorCommand extends Command {
|
||||
public function fire()
|
||||
{
|
||||
if (file_exists($compiled = base_path().'/bootstrap/compiled.php')){
|
||||
$this->error('Error: first delete bootstrap/compiled.php (php artisan clear-compiled)');
|
||||
$this->error('Error generating IDE Helper: first delete bootstrap/compiled.php (php artisan clear-compiled)');
|
||||
}else{
|
||||
$filename = $this->argument('filename');
|
||||
|
||||
@@ -318,6 +318,8 @@ namespace {\n\tdie('Only to be used as an helper for your IDE');\n}\n\n";
|
||||
$returnValue = "static";
|
||||
}elseif(!$this->sublime and $alias == 'Eloquent' and in_array($method->name, array('all', 'get'))){
|
||||
$returnValue .= "|\Eloquent[]|static[]";
|
||||
}elseif($alias == 'Eloquent' and in_array($method->name, array('hasOne', 'hasMany', 'belongsTo', 'belongsToMany', 'morphOne', 'morphTo', 'morphMany'))){
|
||||
$returnValue .= "|\Eloquent";
|
||||
}
|
||||
$tag->setContent($returnValue . " ". $tag->getDescription());
|
||||
}else{
|
||||
|
||||
@@ -93,7 +93,7 @@ class ModelsCommand extends Command {
|
||||
{
|
||||
return array(
|
||||
array('filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the helper file', '_ide_helper_models.php'),
|
||||
array('dir', 'D', InputOption::VALUE_OPTIONAL, 'The model dir', app_path().'/models'),
|
||||
array('dir', 'D', InputOption::VALUE_OPTIONAL, 'The model dir','app/models'),
|
||||
array('write', 'W', InputOption::VALUE_NONE, 'Write to Model file'),
|
||||
);
|
||||
}
|
||||
@@ -141,13 +141,12 @@ class ModelsCommand extends Command {
|
||||
|
||||
|
||||
protected function loadModels(){
|
||||
$dir = $this->dir;
|
||||
if(!file_exists($dir)){
|
||||
$dir = base_path().'/'.$dir;
|
||||
}
|
||||
$dir = base_path().'/'.$this->dir;
|
||||
$models = array();
|
||||
foreach(ClassMapGenerator::createMap($dir) as $model=> $path){
|
||||
$models[] = $model;
|
||||
if(file_exists($dir)){
|
||||
foreach(ClassMapGenerator::createMap($dir) as $model=> $path){
|
||||
$models[] = $model;
|
||||
}
|
||||
}
|
||||
return $models;
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ return array(
|
||||
*/
|
||||
|
||||
'nonstatic' => array(
|
||||
'Eloquent' => array('freshTimestamp', 'newCollection', 'toArray', 'toJson', 'toSql'),
|
||||
'Eloquent' => array('freshTimestamp', 'newCollection', 'toArray', 'toJson', 'toSql', 'delete'),
|
||||
),
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user