Check for correct facades

composer.json

@@ -10,12 +10,12 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.3.0",
-        "illuminate/support": "5.0.x|5.1.x|5.2.x",
+        "illuminate/support": "4.x",
-        "illuminate/console": "5.0.x|5.1.x|5.2.x",
+        "illuminate/console": "4.x",
-        "illuminate/filesystem": "5.0.x|5.1.x|5.2.x",
+        "illuminate/filesystem": "4.x",
-        "phpdocumentor/reflection-docblock": "^2.0.4",
+        "phpdocumentor/reflection-docblock": "2.0.x",
-        "symfony/class-loader": "~2.3|~3.0"
+        "symfony/class-loader": "~2.3"
     },
     "require-dev": {
         "doctrine/dbal": "~2.3"
@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "1.11-dev"
         }
     }
 }

provides.json

@@ -0,0 +1,5 @@
+{
+  "providers": [
+    "Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider"
+  ]
+}

readme.md

@@ -1,156 +1,99 @@
-## Laravel 5 IDE Helper Generator
+## Laravel IDE Helper Generator
 [![Latest Stable Version](https://poser.pugx.org/barryvdh/laravel-ide-helper/version.png)](https://packagist.org/packages/barryvdh/laravel-ide-helper) [![Total Downloads](https://poser.pugx.org/barryvdh/laravel-ide-helper/d/total.png)](https://packagist.org/packages/barryvdh/laravel-ide-helper)
 
-__For Laravel 4.x, check [version 1.11](https://github.com/barryvdh/laravel-ide-helper/tree/1.11)__
+### For Laravel 5, check the [2.0 branch](https://github.com/barryvdh/laravel-ide-helper)
 
 ### Complete phpDocs, directly from the source
 
 _Checkout [this Laracasts video](https://laracasts.com/series/how-to-be-awesome-in-phpstorm/episodes/15) for a quick introduction/explanation!_
 
- * [`php artisan ide-helper:generate` - phpDoc generation for Laravel Facades ](#automatic-phpdoc-generation-for-laravel-facades)
+This packages generates a file that your IDE can understand, so it can provide accurate autocompletion. Generation is done, based on the files in your project, so they are alway up-to-date.
- * [`php artisan ide-helper:models` - phpDocs for models](#automatic-phpdocs-for-models)
+If you don't want to generate it, you can add a pre-generated file to the root folder of your laravel project. (But this isn't as up-to-date as self generated files)
- * [`php artisan ide-helper:meta` - PhpStorm Meta file](#phpstorm-meta-for-container-instances)
 
-This package generates a file that your IDE understands, so it can provide accurate autocompletion. Generation is done based on the files in your project, so they are always up-to-date.
+* Generated version: https://gist.github.com/barryvdh/5227822
-If you don't want to generate it, you can add a pre-generated file to the root folder of your Laravel project (but this isn't as up-to-date as self generated files).
-
-* Generated version for L5: https://gist.github.com/barryvdh/5227822
-* Generated version for Lumen: https://gist.github.com/barryvdh/be17164b0ad51f832f20
-* Generated Phpstorm Meta file: https://gist.github.com/barryvdh/bb6ffc5d11e0a75dba67
 
 Note: You do need CodeIntel for Sublime Text: https://github.com/SublimeCodeIntel/SublimeCodeIntel
 
-### Install
+### Automatic phpDoc generation for Laravel Facades
 
 Require this package with composer using the following command:
 
-```bash
+    composer require barryvdh/laravel-ide-helper
-composer require barryvdh/laravel-ide-helper
-```
 
-After updating composer, add the service provider to the `providers` array in `config/app.php`
+After updating composer, add the ServiceProvider to the providers array in app/config/app.php
 
-```php
+    'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
-Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
-```
 
-### Automatic phpDoc generation for Laravel Facades
+You can now re-generate the docs yourself (for future updates) in artisan
 
+    php artisan ide-helper:generate
 
-You can now re-generate the docs yourself (for future updates)
+Note: bootstrap/compiled.php has to be cleared first, so run `php artisan clear-compiled` before generating (and `php artisan optimize` after..)
-
-```bash
-php artisan ide-helper:generate
-```
-
-Note: `bootstrap/compiled.php` has to be cleared first, so run `php artisan clear-compiled` before generating (and `php artisan optimize` after).
 
 You can configure your composer.json to do this after each commit:
 
-```js
+    "scripts":{
-"scripts":{
+        "post-update-cmd":[
-    "post-update-cmd": [
+            "php artisan clear-compiled",
-        "php artisan clear-compiled",
+            "php artisan ide-helper:generate",
-        "php artisan ide-helper:generate",
+            "php artisan optimize"
-        "php artisan optimize"
+        ]
-    ]
+    },
-},
-```
 
-You can also publish the config file to change implementations (ie. interface to specific class) or set defaults for `--helpers` or `--sublime`.
+You can also publish the config-file to change implementations (ie. interface to specific class) or set defaults for --helpers or --sublime.
 
-```bash
+    php artisan config:publish barryvdh/laravel-ide-helper
-php artisan vendor:publish --provider="Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider" --tag=config
-```
 
 The generator tries to identify the real class, but if it cannot be found, you can define it in the config file.
 
-Some classes need a working database connection. If you do not have a default working connection, some facades will not be included.
+Some classes need a working database connection. If you do not have a working default connection, some facades will not be included.
-You can use an in-memory SQLite driver, using the -M option.
+You can use a in-memory sqlite driver, using the -M option.
 
-You can choose to include helper files. This is not enabled by default, but you can override it with the `--helpers (-H)` option.
+You can choose to include helper files. This is not enabled by default, but you can override this with the --helpers (-H) option.
-The `Illuminate/Support/helpers.php` is already set-up, but you can add/remove your own files in the config file.
+The Illuminate/Support/helpers.php is already set-up, but you can add/remove your own files in the config file.
-
-### Automatic phpDocs for models
-
-> You need to require `doctrine/dbal: ~2.3` in your own composer.json to get database columns.
 
 
-```bash
+### Automatic phpDocs for Models
-composer require doctrine/dbal
-```
 
-If you don't want to write your properties yourself, you can use the command `php artisan ide-helper:models` to generate
+> **Note:** Since v1.10 you need to require `doctrine/dbal: ~2.3` in your own composer.json. 
-phpDocs, based on table columns, relations and getters/setters. You can write the comments directly to your Model file, using the `--write (-W)` option. By default, you are asked to overwrite or write to a separate file (`_ide_helper_models.php`). You can force No with `--nowrite (-N)`.
+
+If you don't want to write your properties yourself, you can use the command `ide-helper:models` to generate
+phpDocs, based on table columns, relations and getters/setters. You can write the comments directly to your Model file, using the `--write (-W)` option. By default, you are asked to overwrite or write to a separate file (\_ide\_helper\_models.php) (You can force No with `--nowrite (-N)`).
 Please make sure to backup your models, before writing the info.
 It should keep the existing comments and only append new properties/methods. The existing phpdoc is replaced, or added if not found.
-With the `--reset (-R)` option, the existing phpdocs are ignored, and only the newly found columns/relations are saved as phpdocs.
+With the `--reset (-R)` option, the existing phpdocs are ignored, only the newly found columns/relations are saved as phpdocs.
 
-```bash
+    php artisan ide-helper:models Post
-php artisan ide-helper:models Post
-```
 
-```php
+    /**
-/**
+     * An Eloquent Model: 'Post'
- * An Eloquent Model: 'Post'
+     *
- *
+     * @property integer $id
- * @property integer $id
+     * @property integer $author_id
- * @property integer $author_id
+     * @property string $title
- * @property string $title
+     * @property string $text
- * @property string $text
+     * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $created_at
+     * @property \Carbon\Carbon $updated_at
- * @property \Carbon\Carbon $updated_at
+     * @property-read \User $author
- * @property-read \User $author
+     * @property-read \Illuminate\Database\Eloquent\Collection|\Comment[] $comments
- * @property-read \Illuminate\Database\Eloquent\Collection|\Comment[] $comments
+     */
- */
-```
 
-By default, models in `app/models` are scanned. The optional argument tells what models to use (also outside app/models).
+By default, models in app/models are scanned. The optional argument tells what models to use (also outside app/models).
 
-```bash
+    php artisan ide-helper:models Post User
-php artisan ide-helper:models Post User
-```
 
-You can also scan a different directory, using the `--dir` option (relative from the base path):
+You can also scan a different directory, using the --dir option (relative from the base path):
 
-```bash
+    php artisan ide-helper:models --dir="app/workbench/name/package/models" --dir="app/src/Model"
-php artisan ide-helper:models --dir="path/to/models" --dir="app/src/Model"
+   
-```
+You can publish the config file (`php artisan config:publish barryvdh/laravel-ide-helper`) and set the default directories.
 
-You can publish the config file (`php artisan vendor:publish`) and set the default directories.
+Models can be ignored using the --ignore (-I) option
 
-Models can be ignored using the `--ignore (-I)` option
+    php artisan ide-helper:models --ignore="Post,User"
-
-```bash
-php artisan ide-helper:models --ignore="Post,User"
-```
 
 Note: With namespaces, wrap your model name in " signs: `php artisan ide-helper:models "API\User"`, or escape the slashes (`Api\\User`)
 
-## PhpStorm Meta for Container instances
-
-It's possible to generate a PhpStorm meta file, to [add support for factory design pattern](https://confluence.jetbrains.com/display/PhpStorm/PhpStorm+Advanced+Metadata). For Laravel, this means we can make PhpStorm understand what kind of object we are resolving from the IoC Container. For example, `events` will return an `Illuminate\Events\Dispatcher` object, so with the meta file you can call `app('events')` and it will autocomplete the Dispatcher methods.
-
-``` bash
-php artisan ide-helper:meta
-```
-
-```php
-app('events')->fire();
-\App::make('events')->fire();
-
-/** @var \Illuminate\Foundation\Application $app */
-$app->make('events')->fire();
-
-// When the key is not found, it uses the argument as class name
-app('App\SomeClass');
-```
-
-Pre-generated example: https://gist.github.com/barryvdh/bb6ffc5d11e0a75dba67
-
-> Note: You might need to restart PhpStorm and make sure `.phpstorm.meta.php` is indexed.
-> Note: When you receive a FatalException about a class that is not found, check your config (for example, remove S3 as cloud driver when you don't have S3 configured. Remove Redis ServiceProvider when you don't use it).
-
 ### License
 
 The Laravel IDE Helper Generator is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

resources/views/meta.php

@@ -1,21 +0,0 @@
-<?= '<?php' ?>
-
-namespace PHPSTORM_META {
-
-   /**
-    * PhpStorm Meta file, to provide autocomplete information for PhpStorm
-    * Generated on <?= date("Y-m-d") ?>.
-    *
-    * @author Barry vd. Heuvel <[email protected]>
-    * @see https://github.com/barryvdh/laravel-ide-helper
-    */
-    $STATIC_METHOD_TYPES = [
-<?php foreach($methods as $method): ?>
-        <?= $method ?> => [
-            '' == '@',
-<?php foreach($bindings as $abstract => $class): ?>
-            '<?= $abstract ?>' instanceof \<?= $class ?>,
-<?php endforeach ?>        ],
-<?php endforeach ?>
-    ];
-}

src/Console/GeneratorCommand.php

@@ -59,7 +59,7 @@ class GeneratorCommand extends Command
      * @param \Illuminate\View\Factory $view
      */
     public function __construct(
-        /*ConfigRepository */ $config,
+        ConfigRepository $config,
         Filesystem $files, /* Illuminate\View\Factory */
         $view
     ) {
@@ -76,11 +76,9 @@ class GeneratorCommand extends Command
      */
     public function fire()
     {
-        if (file_exists(base_path() . '/vendor/compiled.php') ||
+        if (file_exists($compiled = base_path() . '/bootstrap/compiled.php')) {
-            file_exists(base_path() . '/bootstrap/cache/compiled.php') ||
-            file_exists(base_path() . '/storage/framework/compiled.php')) {
             $this->error(
-                'Error generating IDE Helper: first delete your compiled file (php artisan clear-compiled)'
+                'Error generating IDE Helper: first delete bootstrap/compiled.php (php artisan clear-compiled)'
             );
         } else {
             $filename = $this->argument('filename');
@@ -99,8 +97,8 @@ class GeneratorCommand extends Command
 
 
             $helpers = '';
-            if ($this->option('helpers') || ($this->config->get('ide-helper.include_helpers'))) {
+            if ($this->option('helpers') || ($this->config->get('laravel-ide-helper::include_helpers'))) {
-                foreach ($this->config->get('ide-helper.helper_files', array()) as $helper) {
+                foreach ($this->config->get('laravel-ide-helper::helper_files', array()) as $helper) {
                     if (file_exists($helper)) {
                         $helpers .= str_replace(array('<?php', '?>'), '', $this->files->get($helper));
                     }
@@ -141,7 +139,7 @@ class GeneratorCommand extends Command
      */
     protected function getArguments()
     {
-        $filename = $this->config->get('ide-helper.filename');
+        $filename = $this->config->get('laravel-ide-helper::filename');
 
         return array(
             array(
@@ -157,7 +155,7 @@ class GeneratorCommand extends Command
      */
     protected function getOptions()
     {
-        $format = $this->config->get('ide-helper.format');
+        $format = $this->config->get('laravel-ide-helper::format');
 
         return array(
             array('format', "F", InputOption::VALUE_OPTIONAL, 'The format for the IDE Helper', $format),

src/Console/MetaCommand.php

@@ -1,140 +0,0 @@
-<?php
-/**
- * Laravel IDE Helper Generator
- *
- * @author    Barry vd. Heuvel <[email protected]>
- * @copyright 2015 Barry vd. Heuvel / Fruitcake Studio (http://www.fruitcakestudio.nl)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      https://github.com/barryvdh/laravel-ide-helper
- */
-
-namespace Barryvdh\LaravelIdeHelper\Console;
-
-use Illuminate\Console\Command;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * A command to generate phpstorm meta data
- *
- * @author Barry vd. Heuvel <[email protected]>
- */
-class MetaCommand extends Command {
-
-    /**
-     * The console command name.
-     *
-     * @var string
-     */
-    protected $name = 'ide-helper:meta';
-    protected $filename = '.phpstorm.meta.php';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Generate metadata for PhpStorm';
-
-    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
-    protected $files;
-
-    /** @var \Illuminate\Contracts\View\Factory */
-    protected $view;
-    
-    protected $methods = [
-      'new \Illuminate\Contracts\Container\Container',
-      '\Illuminate\Contracts\Container\Container::make(\'\')',
-      '\App::make(\'\')',
-      'app(\'\')',
-    ];
-
-    /**
-     *
-     * @param \Illuminate\Contracts\Filesystem\Filesystem $files
-     * @param \Illuminate\Contracts\View\Factory $view
-     */
-    public function __construct($files, $view) {
-        $this->files = $files;
-        $this->view = $view;
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function fire()
-    {
-        $this->registerClassAutoloadExceptions();
-
-        $bindings = array();
-        foreach ($this->getAbstracts() as $abstract) {
-            // Validator and seeder cause problems
-            if (in_array($abstract, ['validator', 'seeder'])) {
-                continue;
-            }
-            
-            try {
-                $concrete = $this->laravel->make($abstract);
-                if (is_object($concrete)) {
-                    $bindings[$abstract] = get_class($concrete);
-                }
-            }catch (\Exception $e) {
-                if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
-                    $this->comment("Cannot make '$abstract': ".$e->getMessage());
-                }
-            }
-        }
-
-        $content = $this->view->make('ide-helper::meta', [
-          'bindings' => $bindings,
-          'methods' => $this->methods,
-        ])->render();
-
-        $filename = $this->option('filename');
-        $written = $this->files->put($filename, $content);
-
-        if ($written !== false) {
-            $this->info("A new meta file was written to $filename");
-        } else {
-            $this->error("The meta file could not be created at $filename");
-        }
-    }
-
-    /**
-     * Get a list of abstracts from the Laravel Application.
-     * 
-     * @return array
-     */
-    protected function getAbstracts()
-    {
-        $abstracts = $this->laravel->getBindings();
-        
-        // Return the abstract names only
-        return array_keys($abstracts);
-    }
-
-    /**
-     * Register an autoloader the throws exceptions when a class is not found.
-     */
-    protected function registerClassAutoloadExceptions()
-    {
-        spl_autoload_register(function ($class) {
-            throw new \Exception("Class '$class' not found.");
-        });
-    }
-
-    /**
-     * Get the console command options.
-     *
-     * @return array
-     */
-    protected function getOptions()
-    {
-        return array(
-            array('filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the meta file', $this->filename),
-        );
-    }
-}

src/Console/ModelsCommand.php

@@ -11,12 +11,9 @@
 namespace Barryvdh\LaravelIdeHelper\Console;
 
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Str;
-use Illuminate\Filesystem\Filesystem;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\ClassLoader\ClassMapGenerator;
 use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Context;
@@ -30,10 +27,6 @@ use phpDocumentor\Reflection\DocBlock\Serializer as DocBlockSerializer;
  */
 class ModelsCommand extends Command
 {
-    /**
-     * @var Filesystem $files
-     */
-    protected $files;
 
     /**
      * The console command name.
@@ -56,14 +49,6 @@ class ModelsCommand extends Command
     protected $dirs = array();
     protected $reset;
 
-    /**
-     * @param Filesystem $files
-     */
-    public function __construct(Filesystem $files)
-    {
-        parent::__construct();
-        $this->files = $files;
-    }
 
     /**
      * Execute the console command.
@@ -75,8 +60,8 @@ class ModelsCommand extends Command
         $filename = $this->option('filename');
         $this->write = $this->option('write');
         $this->dirs = array_merge(
-          $this->laravel['config']->get('ide-helper.model_locations'),
+            $this->laravel['config']->get('laravel-ide-helper::model_locations'),
-          $this->option('dir')
+            $this->option('dir')
         );
         $model = $this->argument('model');
         $ignore = $this->option('ignore');
@@ -85,7 +70,7 @@ class ModelsCommand extends Command
         //If filename is default and Write is not specified, ask what to do
         if (!$this->write && $filename === $this->filename && !$this->option('nowrite')) {
             if ($this->confirm(
-              "Do you want to overwrite the existing model files? Choose no to write to $filename instead? (Yes/No): "
+                "Do you want to overwrite the existing model files? Choose no to write to $filename instead? (Yes/No): "
             )
             ) {
                 $this->write = true;
@@ -95,7 +80,7 @@ class ModelsCommand extends Command
         $content = $this->generateDocs($model, $ignore);
 
         if (!$this->write) {
-            $written = $this->files->put($filename, $content);
+            $written = \File::put($filename, $content);
             if ($written !== false) {
                 $this->info("Model information was written to $filename");
             } else {
@@ -113,7 +98,7 @@ class ModelsCommand extends Command
     protected function getArguments()
     {
         return array(
-          array('model', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Which models to include', array()),
+            array('model', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Which models to include', array()),
         );
     }
 
@@ -125,12 +110,12 @@ class ModelsCommand extends Command
     protected function getOptions()
     {
         return array(
-          array('filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the helper file', $this->filename),
+            array('filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the helper file', $this->filename),
-          array('dir', 'D', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The model dir', array()),
+            array('dir', 'D', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The model dir', array()),
-          array('write', 'W', InputOption::VALUE_NONE, 'Write to Model file'),
+            array('write', 'W', InputOption::VALUE_NONE, 'Write to Model file'),
-          array('nowrite', 'N', InputOption::VALUE_NONE, 'Don\'t write to Model file'),
+            array('nowrite', 'N', InputOption::VALUE_NONE, 'Don\'t write to Model file'),
-          array('reset', 'R', InputOption::VALUE_NONE, 'Remove the original phpdocs instead of appending'),
+            array('reset', 'R', InputOption::VALUE_NONE, 'Remove the original phpdocs instead of appending'),
-          array('ignore', 'I', InputOption::VALUE_OPTIONAL, 'Which models to ignore', ''),
+            array('ignore', 'I', InputOption::VALUE_OPTIONAL, 'Which models to ignore', ''),
         );
     }
 
@@ -163,9 +148,7 @@ class ModelsCommand extends Command
 
         foreach ($models as $name) {
             if (in_array($name, $ignore)) {
-                if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
+                $this->comment("Ignoring model '$name'");
-                    $this->comment("Ignoring model '$name'");
-                }
                 continue;
             }
             $this->properties = array();
@@ -179,13 +162,10 @@ class ModelsCommand extends Command
                         continue;
                     }
 
-                    if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
+                    $this->comment("Loading model '$name'");
-                        $this->comment("Loading model '$name'");
-                    }
 
                     if (!$reflectionClass->IsInstantiable()) {
-                        // ignore abstract class or interface
+                        throw new \Exception($name . ' is not instantiable.');
-                        continue;
                     }
 
                     $model = $this->laravel->make($name);
@@ -196,7 +176,6 @@ class ModelsCommand extends Command
 
                     $this->getPropertiesFromMethods($model);
                     $output .= $this->createPhpDocs($name);
-                    $ignore[] = $name;
                 } catch (\Exception $e) {
                     $this->error("Exception: " . $e->getMessage() . "\nCould not analyze class $name.");
                 }
@@ -206,7 +185,7 @@ class ModelsCommand extends Command
 
         if (!$hasDoctrine) {
             $this->error(
-              'Warning: `"doctrine/dbal": "~2.3"` is required to load database information. Please require that in your composer.json and run `composer update`.'
+                'Warning: `"doctrine/dbal": "~2.3"` is required to load database information. Please require that in your composer.json and run `composer update`.'
             );
         }
 
@@ -238,21 +217,9 @@ class ModelsCommand extends Command
     {
         $table = $model->getConnection()->getTablePrefix() . $model->getTable();
         $schema = $model->getConnection()->getDoctrineSchemaManager($table);
-        $databasePlatform = $schema->getDatabasePlatform();
+        $schema->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-        $databasePlatform->registerDoctrineTypeMapping('enum', 'string');
 
-        $platformName = $databasePlatform->getName();
+        $columns = $schema->listTableColumns($table);
-        $customTypes = $this->laravel['config']->get("ide-helper.custom_db_types.{$platformName}", array());
-        foreach ($customTypes as $yourTypeName => $doctrineTypeName) {
-            $databasePlatform->registerDoctrineTypeMapping($yourTypeName, $doctrineTypeName);
-        }
-
-        $database = null;
-        if (strpos($table, '.')) {
-            list($database, $table) = explode('.', $table);
-        }
-
-        $columns = $schema->listTableColumns($table, $database);
 
         if ($columns) {
             foreach ($columns as $column) {
@@ -291,7 +258,11 @@ class ModelsCommand extends Command
 
                 $comment = $column->getComment();
                 $this->setProperty($name, $type, true, true, $comment);
-                $this->setMethod(Str::camel("where_" . $name), '\Illuminate\Database\Query\Builder|\\' . get_class($model), array('$value'));
+                $this->setMethod(
+                    Str::camel("where_" . $name),
+                    '\Illuminate\Database\Query\Builder|\\' . get_class($model),
+                    array('$value')
+                );
             }
         }
     }
@@ -305,9 +276,9 @@ class ModelsCommand extends Command
         if ($methods) {
             foreach ($methods as $method) {
                 if (Str::startsWith($method, 'get') && Str::endsWith(
-                    $method,
+                        $method,
-                    'Attribute'
+                        'Attribute'
-                  ) && $method !== 'getAttribute'
+                    ) && $method !== 'getAttribute'
                 ) {
                     //Magic get<name>Attribute
                     $name = Str::snake(substr($method, 3, -9));
@@ -315,9 +286,9 @@ class ModelsCommand extends Command
                         $this->setProperty($name, null, true, null);
                     }
                 } elseif (Str::startsWith($method, 'set') && Str::endsWith(
-                    $method,
+                        $method,
-                    'Attribute'
+                        'Attribute'
-                  ) && $method !== 'setAttribute'
+                    ) && $method !== 'setAttribute'
                 ) {
                     //Magic set<name>Attribute
                     $name = Str::snake(substr($method, 3, -9));
@@ -332,9 +303,9 @@ class ModelsCommand extends Command
                         $args = $this->getParameters($reflection);
                         //Remove the first ($query) argument
                         array_shift($args);
-                        $this->setMethod($name, '\Illuminate\Database\Query\Builder|\\' . $reflection->class, $args);
+                        $this->setMethod($name, '\\' . $reflection->class, $args);
                     }
-                } elseif (!method_exists('Illuminate\Database\Eloquent\Model', $method) && !Str::startsWith($method, 'get')) {
+                } elseif (!method_exists('Eloquent', $method) && !Str::startsWith($method, 'get')) {
 
                     //Use reflection to inspect the code, based on Illuminate/Support/SerializableClosure.php
                     $reflection = new \ReflectionMethod($model, $method);
@@ -347,47 +318,39 @@ class ModelsCommand extends Command
                         $code .= $file->current();
                         $file->next();
                     }
-                    $code = trim(preg_replace('/\s\s+/', '', $code));
                     $begin = strpos($code, 'function(');
                     $code = substr($code, $begin, strrpos($code, '}') - $begin + 1);
 
                     foreach (array(
-                               'hasMany',
+                                 'hasMany',
-                               'belongsToMany',
+                                 'belongsToMany',
-                               'hasOne',
+                                 'hasOne',
-                               'belongsTo',
+                                 'belongsTo',
-                               'morphOne',
+                                 'morphTo',
-                               'morphTo',
+                                 'morphMany',
-                               'morphMany',
+                                 'morphToMany'
-                               'morphToMany'
                              ) as $relation) {
                         $search = '$this->' . $relation . '(';
                         if ($pos = stripos($code, $search)) {
-
+                            $code = substr($code, $pos + strlen($search));
-                            //Resolve the relation's model to a Relation object.
+                            $arguments = explode(',', substr($code, 0, strpos($code, ');')));
-                            $relationObj = $model->$method();
+                            //Remove quotes, ensure 1 \ in front of the model
-
+                            $returnModel = $this->getClassName($arguments[0], $model);
-                            if ($relationObj instanceof Relation) {
+                            if ($relation === "belongsToMany" or $relation === 'hasMany' or $relation === 'morphMany' or $relation === 'morphToMany') {
-                                $relatedModel = '\\' . get_class($relationObj->getRelated());
+                                //Collection or array of models (because Collection is Arrayable)
-
+                                $this->setProperty(
-                                if (in_array($relation, ['belongsToMany', 'hasMany', 'morphMany', 'morphToMany'])) {
+                                    $method,
-                                    //Collection or array of models (because Collection is Arrayable)
+                                    '\Illuminate\Database\Eloquent\Collection|' . $returnModel . '[]',
-                                    $this->setProperty(
+                                    true,
-                                      $method,
+                                    null
-                                      $this->getCollectionClass($relatedModel) . '|' . $relatedModel . '[]',
+                                );
-                                      true,
+                            } else {
-                                      null
+                                //Single model is returned
-                                    );
+                                $this->setProperty($method, $returnModel, true, null);
-                                } elseif ($relation === "morphTo") {
-                                    // Model isn't specified because relation is polymorphic
-                                    $this->setProperty($method, '\Illuminate\Database\Eloquent\Model|\Eloquent', true, null);
-                                } else {
-                                    //Single model is returned
-                                    $this->setProperty($method, $relatedModel, true, null);
-                                }
                             }
                         }
                     }
+
                 }
             }
         }
@@ -422,9 +385,7 @@ class ModelsCommand extends Command
 
     protected function setMethod($name, $type = '', $arguments = array())
     {
-        $methods = array_change_key_case($this->methods, CASE_LOWER);
+        if (!isset($this->methods[$name])) {
-
-        if (!isset($methods[strtolower($name)])) {
             $this->methods[$name] = array();
             $this->methods[$name]['type'] = $type;
             $this->methods[$name]['arguments'] = $arguments;
@@ -476,8 +437,7 @@ class ModelsCommand extends Command
             } else {
                 $attr = 'property-read';
             }
-            $tagLine = trim("@{$attr} {$property['type']} {$name} {$property['comment']}");
+            $tag = Tag::createInstance("@{$attr} {$property['type']} {$name} {$property['comment']}", $phpdoc);
-            $tag = Tag::createInstance($tagLine, $phpdoc);
             $phpdoc->appendTag($tag);
         }
 
@@ -490,10 +450,6 @@ class ModelsCommand extends Command
             $phpdoc->appendTag($tag);
         }
 
-        if ($this->write && ! $phpdoc->getTagsByName('mixin')) {
-            $phpdoc->appendTag(Tag::createInstance("@mixin \\Eloquent", $phpdoc));
-        }
-
         $serializer = new DocBlockSerializer();
         $serializer->getDocComment($phpdoc);
         $docComment = $serializer->getDocComment($phpdoc);
@@ -501,7 +457,7 @@ class ModelsCommand extends Command
 
         if ($this->write) {
             $filename = $reflection->getFileName();
-            $contents = $this->files->get($filename);
+            $contents = \File::get($filename);
             if ($originalDoc) {
                 $contents = str_replace($originalDoc, $docComment, $contents);
             } else {
@@ -512,12 +468,12 @@ class ModelsCommand extends Command
                     $contents = substr_replace($contents, $replace, $pos, strlen($needle));
                 }
             }
-            if ($this->files->put($filename, $contents)) {
+            if (\File::put($filename, $contents)) {
                 $this->info('Written new phpDocBlock to ' . $filename);
             }
         }
 
-        $output = "namespace {$namespace}{\n{$docComment}\n\tclass {$classname} extends \Eloquent {}\n}\n\n";
+        $output = "namespace {$namespace}{\n{$docComment}\n\tclass {$classname} {}\n}\n\n";
         return $output;
     }
 
@@ -532,11 +488,10 @@ class ModelsCommand extends Command
         //Loop through the default values for paremeters, and make the correct output string
         $params = array();
         $paramsWithDefault = array();
-        /** @var \ReflectionParameter $param */
         foreach ($method->getParameters() as $param) {
             $paramStr = '$' . $param->getName();
             $params[] = $paramStr;
-            if ($param->isOptional() && $param->isDefaultValueAvailable()) {
+            if ($param->isOptional()) {
                 $default = $param->getDefaultValue();
                 if (is_bool($default)) {
                     $default = $default ? 'true' : 'false';
@@ -557,22 +512,23 @@ class ModelsCommand extends Command
     }
 
     /**
-     * Determine a model classes' collection type.
-     *
-     * @see http://laravel.com/docs/eloquent-collections#custom-collections
      * @param string $className
+     * @param \Illuminate\Database\Eloquent\Model $model
      * @return string
      */
-    private function getCollectionClass($className)
+    private function getClassName($className, $model)
     {
-        // Return something in the very very unlikely scenario the model doesn't
+        // If the class name was resolved via get_class($this) or static::class
-        // have a newCollection() method.
+        if (strpos($className, 'get_class($this)') !== false || strpos($className, 'static::class') !== false) {
-        if (!method_exists($className, 'newCollection')) {
+            return get_class($model);
-            return '\Illuminate\Database\Eloquent\Collection';
         }
 
-        /** @var \Illuminate\Database\Eloquent\Model $model */
+        // If the class name was resolved via ::class (PHP 5.5+)
-        $model = new $className;
+        if (strpos($className, '::class') !== false) {
-        return '\\' . get_class($model->newCollection());
+            $end = -1 * strlen('::class');
+            return substr($className, 0, $end);
+        }
+
+        return "\\" . ltrim(trim($className, " \"'"), "\\") ;
     }
 }

src/Generator.php

@@ -12,7 +12,6 @@ namespace Barryvdh\LaravelIdeHelper;
 
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Config\Repository as ConfigRepository;
-use ReflectionClass;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Generator
@@ -37,7 +36,7 @@ class Generator
      * @param \Symfony\Component\Console\Output\OutputInterface $output
      * @param string $helpers
      */
-    public function __construct(/*ConfigRepository */ $config,
+    public function __construct(ConfigRepository $config,
         /* Illuminate\View\Factory */ $view,
         OutputInterface $output = null,
         $helpers = ''
@@ -48,9 +47,9 @@ class Generator
         // Find the drivers to add to the extra/interfaces
         $this->detectDrivers();
 
-        $this->extra = array_merge($this->extra, $this->config->get('ide-helper.extra'));
+        $this->extra = array_merge($this->extra, $this->config->get('laravel-ide-helper::extra'));
-        $this->magic = array_merge($this->magic, $this->config->get('ide-helper.magic'));
+        $this->magic = array_merge($this->magic, $this->config->get('laravel-ide-helper::magic'));
-        $this->interfaces = array_merge($this->interfaces, $this->config->get('ide-helper.interfaces'));
+        $this->interfaces = array_merge($this->interfaces, $this->config->get('laravel-ide-helper::interfaces'));
         // Make all interface classes absolute
         foreach ($this->interfaces as &$interface) {
             $interface = '\\' . ltrim($interface, '\\');
@@ -78,10 +77,10 @@ class Generator
     public function generatePhpHelper()
     {
         $app = app();
-        return $this->view->make('ide-helper::helper')
+        return $this->view->make('laravel-ide-helper::ide-helper')
             ->with('namespaces', $this->getNamespaces())
             ->with('helpers', $this->helpers)
-            ->with('version', $app->version())
+            ->with('version', $app::VERSION)
             ->render();
     }
 
@@ -114,18 +113,9 @@ class Generator
 
     protected function detectDrivers()
     {
-        $this->interfaces['\Illuminate\Contracts\Auth\Authenticatable'] = config('auth.providers.users.model', config('auth.model', 'App\User'));
+        try{
-        
+            if (class_exists('Auth') && is_a('Auth', '\Illuminate\Support\Facades\Auth', true)) {
-        try{
+                $class = get_class(\Auth::driver());
-            if (class_exists('Auth') && is_a('Auth', '\Illuminate\Support\Facades\Auth', true)) {
-				if (class_exists('\Illuminate\Foundation\Application')) {
-					$authMethod = version_compare(\Illuminate\Foundation\Application::VERSION, '5.2', '>=') ? 'guard' : 'driver';
-				} else {
-                    $refClass = new ReflectionClass('\Laravel\Lumen\Application');
-                    $versionStr = $refClass->newInstanceWithoutConstructor()->version();
-					$authMethod = strpos($versionStr, 'Lumen (5.0') === 0 ? 'driver' : (strpos($versionStr, 'Lumen (5.1') === 0 ? 'driver' : 'guard');
-				}
-                $class = get_class(\Auth::$authMethod());
                 $this->extra['Auth'] = array($class);
                 $this->interfaces['\Illuminate\Auth\UserProviderInterface'] = $class;
             }
@@ -176,12 +166,7 @@ class Generator
         $namespaces = array();
 
         // Get all aliases
-        foreach ($this->getAliases() as $name => $facade) {
+        foreach (AliasLoader::getInstance()->getAliases() as $name => $facade) {
-            // Skip the Redis facade, if not available (otherwise Fatal PHP Error)
-            if ($facade == 'Illuminate\Support\Facades\Redis' && !class_exists('Predis\Client')) {
-                continue;
-            }
-            
             $magicMethods = array_key_exists($name, $this->magic) ? $this->magic[$name] : array();
             $alias = new Alias($name, $facade, $magicMethods, $this->interfaces);
             if ($alias->isValid()) {
@@ -203,39 +188,6 @@ class Generator
         return $namespaces;
     }
 
-    protected function getAliases()
-    {
-        // For Laravel, use the AliasLoader
-        if (class_exists('Illuminate\Foundation\AliasLoader')) {
-            return AliasLoader::getInstance()->getAliases();
-        }
-
-        $facades = [
-          'App' => 'Illuminate\Support\Facades\App',
-          'Auth' => 'Illuminate\Support\Facades\Auth',
-          'Bus' => 'Illuminate\Support\Facades\Bus',
-          'DB' => 'Illuminate\Support\Facades\DB',
-          'Cache' => 'Illuminate\Support\Facades\Cache',
-          'Cookie' => 'Illuminate\Support\Facades\Cookie',
-          'Crypt' => 'Illuminate\Support\Facades\Crypt',
-          'Event' => 'Illuminate\Support\Facades\Event',
-          'Hash' => 'Illuminate\Support\Facades\Hash',
-          'Log' => 'Illuminate\Support\Facades\Log',
-          'Mail' => 'Illuminate\Support\Facades\Mail',
-          'Queue' => 'Illuminate\Support\Facades\Queue',
-          'Request' => 'Illuminate\Support\Facades\Request',
-          'Schema' => 'Illuminate\Support\Facades\Schema',
-          'Session' => 'Illuminate\Support\Facades\Session',
-          'Storage' => 'Illuminate\Support\Facades\Storage',
-          //'Validator' => 'Illuminate\Support\Facades\Validator',
-        ];
-
-        // Only return the ones that actually exist
-        return array_filter($facades, function($alias){
-            return class_exists($alias);
-        });
-    }
-
     /**
      * Get the driver/connection/store from the managers
      *

src/IdeHelperServiceProvider.php

@@ -11,9 +11,8 @@
 namespace Barryvdh\LaravelIdeHelper;
 
 use Illuminate\Support\ServiceProvider;
-use Barryvdh\LaravelIdeHelper\Console\MetaCommand;
-use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
 use Barryvdh\LaravelIdeHelper\Console\GeneratorCommand;
+use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
 
 class IdeHelperServiceProvider extends ServiceProvider
 {
@@ -32,16 +31,7 @@ class IdeHelperServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $viewPath = __DIR__.'/../resources/views';
+        $this->package('barryvdh/laravel-ide-helper', 'laravel-ide-helper', __DIR__);
-        $this->loadViewsFrom($viewPath, 'ide-helper');
-        
-        $configPath = __DIR__ . '/../config/ide-helper.php';
-        if (function_exists('config_path')) {
-            $publishPath = config_path('ide-helper.php');
-        } else {
-            $publishPath = base_path('config/ide-helper.php');
-        }
-        $this->publishes([$configPath => $publishPath], 'config');
     }
 
     /**
@@ -51,9 +41,6 @@ class IdeHelperServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $configPath = __DIR__ . '/../config/ide-helper.php';
-        $this->mergeConfigFrom($configPath, 'ide-helper');
-        
         $this->app['command.ide-helper.generate'] = $this->app->share(
             function ($app) {
                 return new GeneratorCommand($app['config'], $app['files'], $app['view']);
@@ -61,18 +48,12 @@ class IdeHelperServiceProvider extends ServiceProvider
         );
 
         $this->app['command.ide-helper.models'] = $this->app->share(
-            function ($app) {
+            function () {
-                return new ModelsCommand($app['files']);
+                return new ModelsCommand();
             }
         );
-        
-        $this->app['command.ide-helper.meta'] = $this->app->share(
-          function ($app) {
-              return new MetaCommand($app['files'], $app['view']);
-          }
-        );
 
-        $this->commands('command.ide-helper.generate', 'command.ide-helper.models', 'command.ide-helper.meta');
+        $this->commands('command.ide-helper.generate', 'command.ide-helper.models');
     }
 
     /**
@@ -84,5 +65,37 @@ class IdeHelperServiceProvider extends ServiceProvider
     {
         return array('command.ide-helper.generate', 'command.ide-helper.models');
     }
+    
+    /**
+     * Register the package's component namespaces.
+     *
+     * @param  string  $package
+     * @param  string  $namespace
+     * @param  string  $path
+     * @return void
+     */
+    public function package($package, $namespace = null, $path = null)
+    {
+
+        // Is it possible to register the config?
+        if (method_exists($this->app['config'], 'package')) {
+            $this->app['config']->package($package, $path.'/config', $namespace);
+        } else {
+            // Load the config for now..
+            $config = $this->app['files']->getRequire($path .'/config/config.php');
+            foreach($config as $key => $value){
+                $this->app['config']->set($namespace.'::'.$key, $value);
+            }
+        }
+
+        // Register view files
+        $appView = $this->app['path']."/views/packages/{$package}";
+        if ($this->app['files']->isDirectory($appView))
+        {
+            $this->app['view']->addNamespace($namespace, $appView);
+        }
+
+        $this->app['view']->addNamespace($namespace, $path.'/views');
+    }
 
 }

src/Method.php

@@ -270,8 +270,6 @@ class Method
                     $default = 'null';
                 } elseif (is_int($default)) {
                     //$default = $default;
-                } elseif (is_resource($default)) {
-                    //skip to not fail
                 } else {
                     $default = "'" . trim($default) . "'";
                 }

src/config/config.php

@@ -1,5 +1,7 @@
 <?php 
 
+use Illuminate\Support\Facades\Config;
+
 return array(
 
     /*
@@ -41,7 +43,7 @@ return array(
     */
 
     'model_locations' => array(
-        'app',
+        'app/models',
     ),
 
 
@@ -55,6 +57,7 @@ return array(
     */
 
     'extra' => array(
+        'Artisan' => array('Illuminate\Foundation\Artisan'),
         'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'),
         'Session' => array('Illuminate\Session\Store'),
     ),
@@ -83,37 +86,7 @@ return array(
     */
     
     'interfaces' => array(
-
+        '\Illuminate\Auth\UserInterface' => Config::get('auth.model', 'User'),
-    ),
+    )
-
-    /*
-    |--------------------------------------------------------------------------
-    | Support for custom DB types
-    |--------------------------------------------------------------------------
-    |
-    | This setting allow you to map any custom database type (that you may have
-    | created using CREATE TYPE statement or imported using database plugin
-    | / extension to a Doctrine type.
-    |
-    | Each key in this array is a name of the Doctrine2 DBAL Platform. Currently valid names are:
-    | 'postgresql', 'db2', 'drizzle', 'mysql', 'oracle', 'sqlanywhere', 'sqlite', 'mssql'
-    |
-    | This name is returned by getName() method of the specific Doctrine/DBAL/Platforms/AbstractPlatform descendant
-    |
-    | The value of the array is an array of type mappings. Key is the name of the custom type,
-    | (for example, "jsonb" from Postgres 9.4) and the value is the name of the corresponding Doctrine2 type (in
-    | our case it is 'json_array'. Doctrine types are listed here:
-    | http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html
-    |
-    | So to support jsonb in your models when working with Postgres, just add the following entry to the array below:
-    |
-    | "postgresql" => array(
-    |       "jsonb" => "json_array",
-    |  ),
-    |
-    */
-    'custom_db_types' => array(
-
-    ),
 
 );

src/views/ide-helper.php

@@ -1,39 +1,39 @@
-<?= '<?php' ?>
+<?= '<?php' ?>
-
+
-/**
+/**
- * A helper file for Laravel 5, to provide autocomplete information to your IDE
+ * An helper file for Laravel 4, to provide autocomplete information to your IDE
- * Generated for Laravel <?= $version ?> on <?= date("Y-m-d") ?>.
+ * Generated for Laravel <?= $version ?> on <?= date("Y-m-d") ?>.
- *
+ *
- * @author Barry vd. Heuvel <barryvdh@gmail.com>
+ * @author Barry vd. Heuvel <barryvdh@gmail.com>
- * @see https://github.com/barryvdh/laravel-ide-helper
+ * @see https://github.com/barryvdh/laravel-ide-helper
- */
+ */
-
+
-<?php foreach($namespaces as $namespace => $aliases): ?>
+<?php foreach($namespaces as $namespace => $aliases): ?>
-namespace <?= $namespace == '__root' ? '' : $namespace ?>{
+namespace <?= $namespace == '__root' ? '' : $namespace ?>{
-<?php if($namespace == '__root'): ?>
+<?php if($namespace == '__root'): ?>
-    exit("This file should not be included, only analyzed by your IDE");
+    exit("This file should not be included, only analyzed by your IDE");
-<?= $helpers ?>
+<?= $helpers ?>
-<?php endif; ?>
+<?php endif; ?>
-<?php foreach($aliases as $alias): ?>
+<?php foreach($aliases as $alias): ?>
-
+
-    <?= $alias->getClassType() ?> <?= $alias->getShortName() ?> <?= $alias->getExtends() ? 'extends ' . $alias->getExtends() : '' ?>{
+    <?= $alias->getClassType() ?> <?= $alias->getShortName() ?> <?= $alias->getExtends() ? 'extends ' . $alias->getExtends() : '' ?>{
-        <?php foreach($alias->getMethods() as $method): ?>
+        <?php foreach($alias->getMethods() as $method): ?>
-
+
-        <?= trim($method->getDocComment('        ')) ?>
+        <?= trim($method->getDocComment('        ')) ?>
-
+
-        public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>){<?php if($method->getDeclaringClass() !== $method->getRoot()): ?>
+        public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>){<?php if($method->getDeclaringClass() !== $method->getRoot()): ?>
-
+
-            //Method inherited from <?= $method->getDeclaringClass() ?>
+            //Method inherited from <?= $method->getDeclaringClass() ?>
-            <?php endif; ?>
+            <?php endif; ?>
-
+
-            <?= $method->shouldReturn() ? 'return ': '' ?><?= $method->getRoot() ?>::<?= $method->getName() ?>(<?= $method->getParams() ?>);
+            <?= $method->shouldReturn() ? 'return ': '' ?><?= $method->getRoot() ?>::<?= $method->getName() ?>(<?= $method->getParams() ?>);
-        }
+        }
-        <?php endforeach; ?>
+        <?php endforeach; ?>
-
+
-    }
+    }
-
+
-<?php endforeach; ?>
+<?php endforeach; ?>
-
+
-}
+}
-
+
-<?php endforeach; ?>
+<?php endforeach; ?>