Add support for invokable classes as macro function (#765 )

Macros can be used with invokable classes, like so. ``` <?php namespace App\Providers; use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Response; class ResponseMacroServiceProvider extends ServiceProvider { public function boot() { Response::macro('foo', new Foo()); } } class Foo { public function __invoke() { return 'foobar'; } } ``` When running `ide-helper:generate` the following fatal error was thrown. ``` Symfony\Component\Debug\Exception\FatalThrowableError : ReflectionFunction::__construct() expects parameter 1 to be string, object given``` This commit fixes this error.
Nested relations detection. (#763 )
2026-08-18 18:13:11 +00:00 · 2019-02-18 20:54:27 +01:00 · 2019-02-03 16:59:09 +01:00 · 2019-01-28 21:38:57 +01:00 · 2019-01-28 21:25:55 +01:00 · 2019-01-28 21:24:50 +01:00
28 changed files with 2832 additions and 1150 deletions
@@ -0,0 +1,15 @@
 ; This file is for unifying the coding style for different editors and IDEs.
 ; More information at http://editorconfig.org
 root = true
 [*]
 charset = utf-8
 indent_size = 4
 indent_style = space
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
@@ -0,0 +1,10 @@
 # Path-based git attributes
 # https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
 # Ignore all test and documentation with "export-ignore".
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
 /.travis.yml        export-ignore
 /phpunit.xml.dist   export-ignore
 /.scrutinizer.yml   export-ignore
 /tests              export-ignore
@@ -1,3 +1,4 @@
-/vendor
+build
 vendor
 composer.lock
 .idea
@@ -0,0 +1,23 @@
 filter:
    excluded_paths: [tests/*]
 checks:
    php:
        remove_extra_empty_lines: true
        remove_php_closing_tag: true
        remove_trailing_whitespace: true
        fix_use_statements:
            remove_unused: true
            preserve_multiple: false
            preserve_blanklines: true
            order_alphabetically: true
        fix_php_opening_tag: true
        fix_linefeed: true
        fix_line_ending: true
        fix_identation_4spaces: true
        fix_doc_comments: true
 tools:
    external_code_coverage:
        timeout: 600
        runs: 3
@@ -0,0 +1 @@
 preset: psr2
@@ -0,0 +1,27 @@
 language: php
 php:
  - 7.0
  - 7.1
  - 7.2
 # This triggers builds to run on the new TravisCI infrastructure.
 # See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
 sudo: false
 ## Cache composer
 cache:
  directories:
    - $HOME/.composer/cache
 matrix:
  include:
    - php: 7.0
      env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
 before_script:
  - travis_wait 20 travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
 script:
  - vendor/bin/phpcs --standard=psr2 src/
  - vendor/bin/phpunit
@@ -0,0 +1,21 @@
 # The MIT License (MIT)
 Copyright (c) Barry vd. Heuvel <barryvdh@gmail.com>
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal
 > in the Software without restriction, including without limitation the rights
 > to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 > copies of the Software, and to permit persons to whom the Software is
 > furnished to do so, subject to the following conditions:
 >
 > The above copyright notice and this permission notice shall be included in
 > all copies or substantial portions of the Software.
 >
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 > IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 > FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 > AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 > LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 > OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 > THE SOFTWARE.
@@ -10,14 +10,20 @@
        }
    ],
    "require": {
-        "php": ">=5.3.0",
+        "php": ">=7",
-        "illuminate/support": "4.x",
+        "illuminate/support": "^5.5,<5.9",
-        "illuminate/console": "4.x",
+        "illuminate/console": "^5.5,<5.9",
-        "illuminate/filesystem": "4.x",
+        "illuminate/filesystem": "^5.5,<5.9",
-        "phpdocumentor/reflection-docblock": "2.0.x",
+        "barryvdh/reflection-docblock": "^2.0.6",
-        "symfony/class-loader": "~2.3"
+        "composer/composer": "^1.6"
    },
    "require-dev": {
        "illuminate/config": "^5.1,<5.9",
        "illuminate/view": "^5.1,<5.9",
        "phpro/grumphp": "^0.14",
        "phpunit/phpunit" : "4.*",
        "scrutinizer/ocular": "~1.1",
        "squizlabs/php_codesniffer": "^3",
        "doctrine/dbal": "~2.3"
    },
    "suggest": {
@@ -28,9 +34,24 @@
            "Barryvdh\\LaravelIdeHelper\\": "src"
        }
    },
    "autoload-dev": {
        "psr-4": {
            "Barryvdh\\LaravelIdeHelper\\": "tests"
        }
    },
    "scripts": {
        "test": "phpunit",
        "check-style": "phpcs -p --standard=PSR2 src/",
        "fix-style": "phpcbf -p --standard=PSR2 src/"
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.11-dev"
+            "dev-master": "2.6-dev"
        },
        "laravel": {
            "providers": [
                "Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider"
            ]
        }
    }
 }
@@ -0,0 +1,208 @@
 <?php
 return array(
    /*
    |--------------------------------------------------------------------------
    | Filename & Format
    |--------------------------------------------------------------------------
    |
    | The default filename (without extension) and the format (php or json)
    |
    */
    'filename'  => '_ide_helper',
    'format'    => 'php',
    'meta_filename' => '.phpstorm.meta.php',
    /*
    |--------------------------------------------------------------------------
    | Fluent helpers
    |--------------------------------------------------------------------------
    |
    | Set to true to generate commonly used Fluent methods
    |
    */
    'include_fluent' => false,
    /*
    |--------------------------------------------------------------------------
    | Write Model Magic methods
    |--------------------------------------------------------------------------
    |
    | Set to false to disable write magic methods of model
    |
    */
    'write_model_magic_where' => true,
    /*
    |--------------------------------------------------------------------------
    | Write Eloquent Model Mixins
    |--------------------------------------------------------------------------
    |
    | This will add the necessary DocBlock mixins to the model class
    | contained in the Laravel Framework. This helps the IDE with
    | auto-completion.
    |
    | Please be aware that this setting changes a file within the /vendor directory.
    |
    */
    'write_eloquent_model_mixins' => false,
    /*
    |--------------------------------------------------------------------------
    | Helper files to include
    |--------------------------------------------------------------------------
    |
    | Include helper files. By default not included, but can be toggled with the
    | -- helpers (-H) option. Extra helper files can be included.
    |
    */
    'include_helpers' => false,
    'helper_files' => array(
        base_path().'/vendor/laravel/framework/src/Illuminate/Support/helpers.php',
    ),
    /*
    |--------------------------------------------------------------------------
    | Model locations to include
    |--------------------------------------------------------------------------
    |
    | Define in which directories the ide-helper:models command should look
    | for models.
    |
    */
    'model_locations' => array(
        'app',
    ),
    /*
    |--------------------------------------------------------------------------
    | Extra classes
    |--------------------------------------------------------------------------
    |
    | These implementations are not really extended, but called with magic functions
    |
    */
    'extra' => array(
        'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'),
        'Session' => array('Illuminate\Session\Store'),
    ),
    'magic' => array(
        'Log' => array(
            'debug'     => 'Monolog\Logger::addDebug',
            'info'      => 'Monolog\Logger::addInfo',
            'notice'    => 'Monolog\Logger::addNotice',
            'warning'   => 'Monolog\Logger::addWarning',
            'error'     => 'Monolog\Logger::addError',
            'critical'  => 'Monolog\Logger::addCritical',
            'alert'     => 'Monolog\Logger::addAlert',
            'emergency' => 'Monolog\Logger::addEmergency',
        )
    ),
    /*
    |--------------------------------------------------------------------------
    | Interface implementations
    |--------------------------------------------------------------------------
    |
    | These interfaces will be replaced with the implementing class. Some interfaces
    | are detected by the helpers, others can be listed below.
    |
    */
    'interfaces' => array(
    ),
    /*
    |--------------------------------------------------------------------------
    | 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(
    ),
    /*
     |--------------------------------------------------------------------------
     | Support for camel cased models
     |--------------------------------------------------------------------------
     |
     | There are some Laravel packages (such as Eloquence) that allow for accessing
     | Eloquent model properties via camel case, instead of snake case.
     |
     | Enabling this option will support these packages by saving all model
     | properties as camel case, instead of snake case.
     |
     | For example, normally you would see this:
     |
     |  * @property \Illuminate\Support\Carbon $created_at
     |  * @property \Illuminate\Support\Carbon $updated_at
     |
     | With this enabled, the properties will be this:
     |
     |  * @property \Illuminate\Support\Carbon $createdAt
     |  * @property \Illuminate\Support\Carbon $updatedAt
     |
     | Note, it is currently an all-or-nothing option.
     |
     */
    'model_camel_case_properties' => false,
    /*
    |--------------------------------------------------------------------------
    | Property Casts
    |--------------------------------------------------------------------------
    |
    | Cast the given "real type" to the given "type".
    |
    */
   'type_overrides' => array(
        'integer' => 'int',
        'boolean' => 'bool',
   ),
    /*
    |--------------------------------------------------------------------------
    | Include DocBlocks from classes
    |--------------------------------------------------------------------------
    |
    | Include DocBlocks from classes to allow additional code inspection for
    | magic methods and properties.
    |
    */
    'include_class_docblocks' => false,
 );
@@ -0,0 +1,15 @@
 parameters:
    git_dir: .
    bin_dir: vendor/bin
    tasks:
        phpunit:
            config_file: ~
            testsuite: ~
            group: []
            always_execute: false
        phpcs:
            standard: PSR2
            warning_severity: ~
            ignore_patterns:
              - tests/
            triggered_by: [php]
@@ -0,0 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="vendor/autoload.php"
         backupGlobals="false"
         backupStaticAttributes="false"
         colors="true"
         verbose="true"
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
         processIsolation="false"
         stopOnFailure="false">
    <testsuites>
        <testsuite name="Unit Tests">
            <directory>tests</directory>
        </testsuite>
    </testsuites>
    <filter>
        <whitelist>
            <directory suffix=".php">src/</directory>
        </whitelist>
    </filter>
 </phpunit>
@@ -1,5 +0,0 @@
 {
  "providers": [
    "Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider"
  ]
 }
@@ -1,97 +1,262 @@
-## Laravel IDE Helper Generator
+## Laravel 5 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)
+
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Software License][ico-license]](LICENSE.md)
 [![Build Status][ico-travis]][link-travis]
 [![Total Downloads][ico-downloads]][link-downloads]
 __For Laravel 4.x, check [version 1.11](https://github.com/barryvdh/laravel-ide-helper/tree/1.11)__
 ### 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!_
+_Check out [this Laracasts video](https://laracasts.com/series/how-to-be-awesome-in-phpstorm/episodes/15) for a quick introduction/explanation!_
-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:generate` - phpDoc generation for Laravel Facades ](#automatic-phpdoc-generation-for-laravel-facades)
-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:models` - phpDocs for models](#automatic-phpdocs-for-models)
 * [`php artisan ide-helper:meta` - PhpStorm Meta file](#phpstorm-meta-for-container-instances)
-* Generated version: https://gist.github.com/barryvdh/5227822
+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.
 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).
-Note: You do need CodeIntel for Sublime Text: https://github.com/SublimeCodeIntel/SublimeCodeIntel
+* 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 CodeComplice for Sublime Text: https://github.com/spectacles/CodeComplice
 ### Install
 Require this package with composer using the following command:
 ```bash
 composer require barryvdh/laravel-ide-helper
 ```
 After updating composer, add the service provider to the `providers` array in `config/app.php`
 ```php
 Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
 ```
 **Laravel 5.5** uses Package Auto-Discovery, so doesn't require you to manually add the ServiceProvider.
 To install this package on only development systems, add the `--dev` flag to your composer command:
 ```bash
 composer require --dev barryvdh/laravel-ide-helper
 ```
 In Laravel, instead of adding the service provider in the `config/app.php` file, you can add the following code to your `app/Providers/AppServiceProvider.php` file, within the `register()` method:
 ```php
 public function register()
 {
    if ($this->app->environment() !== 'production') {
        $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
    }
    // ...
 }
 ```
 This will allow your application to load the Laravel IDE Helper on non-production enviroments.
 ### Automatic phpDoc generation for Laravel Facades
-Require this package in your composer.json and run composer update (or run `composer require barryvdh/laravel-ide-helper:1.*` directly):
+You can now re-generate the docs yourself (for future updates)
-    "barryvdh/laravel-ide-helper": "1.*"
+```bash
 php artisan ide-helper:generate
 ```
-After updating composer, add the ServiceProvider to the providers array in app/config/app.php
+Note: `bootstrap/compiled.php` has to be cleared first, so run `php artisan clear-compiled` before generating.
    'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
 You can now re-generate the docs yourself (for future updates) in artisan
    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:
-    "scripts":{
+```js
-        "post-update-cmd":[
+"scripts":{
-            "php artisan clear-compiled",
+    "post-update-cmd": [
-            "php artisan ide-helper:generate",
+        "Illuminate\\Foundation\\ComposerScripts::postUpdate",
-            "php artisan optimize",
+        "php artisan ide-helper:generate",
-        ]
+        "php artisan ide-helper:meta"
-    },
+    ]
 },
 ```
-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`.
-    php artisan config:publish barryvdh/laravel-ide-helper
+```bash
 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 working default connection, some facades will not be included.
+Some classes need a working database connection. If you do not have a default working connection, some facades will not be included.
-You can use a in-memory sqlite driver, using the -M option.
+You can use an in-memory SQLite driver by adding the `-M` option.
-You can choose to include helper files. This is not enabled by default, but you can override this with the --helpers (-H) option.
+You can choose to include helper files. This is not enabled by default, but you can override it 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 add `doctrine/dbal: ~2.3` to require-dev in your own composer.json to get database columns.
-### Automatic phpDocs for Models
+```bash
 composer require --dev doctrine/dbal
 ```
-> **Note:** Since v1.10 you need to require `doctrine/dbal: ~2.3` in your own composer.json. 
+If you don't want to write your properties yourself, you can use the command `php artisan 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)`.
 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, only the newly found columns/relations are saved as phpdocs.
+With the `--reset (-R)` option, the existing phpdocs are ignored, and only the newly found columns/relations are saved as phpdocs.
-    php artisan ide-helper:models Post
+```bash
 php artisan ide-helper:models Post
 ```
-    /**
+```php
-     * An Eloquent Model: 'Post'
+/**
-     *
+ * An Eloquent Model: 'Post'
-     * @property integer $id
+ *
-     * @property integer $author_id
+ * @property integer $id
-     * @property string $title
+ * @property integer $author_id
-     * @property string $text
+ * @property string $title
-     * @property \Carbon\Carbon $created_at
+ * @property string $text
-     * @property \Carbon\Carbon $updated_at
+ * @property \Illuminate\Support\Carbon $created_at
-     * @property-read \User $author
+ * @property \Illuminate\Support\Carbon $updated_at
-     * @property-read \Illuminate\Database\Eloquent\Collection|\Comment[] $comments
+ * @property-read \User $author
-     */
+ * @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).
-    php artisan ide-helper:models Post User
+```bash
 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):
-    php artisan ide-helper:models --dir="app/workbench/name/package/models" --dir="app/src/Model"
+```bash
 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`)
+Note: With namespaces, wrap your model name in double-quotes (`"`): `php artisan ide-helper:models "API\User"`, or escape the slashes (`Api\\User`)
 For properly recognition of `Model` methods (i.e. `paginate`, `findOrFail`) you should extend `\Eloquent` or add
 ```php
 /** @mixin \Eloquent */
 ```
 for your model class.
 ### Automatic phpDocs generation for Laravel Fluent methods
 If you need phpDocs support for Fluent methods in migration, for example
 ```php
 $table->string("somestring")->nullable()->index();
 ```
 After publishing vendor, simply change the `include_fluent` line your `config/ide-helper.php` file into:
 ```php
 'include_fluent' => true,
 ```
 And then run `php artisan ide-helper:generate` , you will now see all of the Fluent methods are recognized by your IDE.
 ## 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).
 ## Lumen Install
 This package is focused on Laravel development, but it can also be used in Lumen with some workarounds. Because Lumen works a little different, as it is like a barebone version of Laravel and the main configuration parameters are instead located in `bootstrap/app.php`, some alterations must be made.
 #### Enabling Facades
 While Laravel IDE Helper can generate automatically default Facades for code hinting, Lumen doesn't come with Facades activated. If you plan in using them, you must enable them under the `Create The Application` section, uncommenting this line:
 ```php
 // $app->withFacades();
 ```
 From there, you should be able to use the `create_alias()` function to add additional Facades into your application.
 #### Adding the Service Provider
 You can install Laravel IDE Helper in `app/Providers/AppServiceProvider.php`, and uncommenting this line that registers the App Service Providers so it can properly load.
 ```php
 // $app->register(App\Providers\AppServiceProvider::class);
 ```
 If you are not using that line, that is usually handy to manage gracefully multiple Laravel/Lumen installations, you will have to add this line of code under the `Register Service Providers` section of your `bootstrap/app.php`.
 ```php
 if ($app->environment() !== 'production') {
    $app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
 }
 ```
 After that, Laravel IDE Helper should work correctly. During the generation process, the script may throw exceptions saying that some Class(s) doesn't exist or there are some undefined indexes. This is normal, as Lumen has some default packages stripped away, like Cookies, Storage and Session. If you plan to add these packages, you will have to add them manually and create additional Facades if needed.
 #### Adding Additional Facades
 Currently Lumen IDE Helper doesn't take into account additional Facades created under `bootstrap/app.php` using `create_alias()`, so you need to create a `config/app.php` file and add your custom aliases under an `aliases` array again, like so:
 ```php
 return [
    'aliases' => [
        'CustomAliasOne' => Example\Support\Facades\CustomAliasOne::class,
        'CustomAliasTwo' => Example\Support\Facades\CustomAliasTwo::class,
        //...
    ]
 ];
 ```
 After you run ```php artisan ide-helper:generate```, it's recommended (but not mandatory) to rename `config/app.php` to something else until you have to re-generate the docs or after passing to production enviroment. Lumen 5.1+ will read this file for configuration parameters if it is present, and may overlap some configurations if it is completely populated.
 ### License
 The Laravel IDE Helper Generator is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
 [ico-version]: https://img.shields.io/packagist/v/barryvdh/laravel-ide-helper.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square
 [ico-travis]: https://img.shields.io/travis/barryvdh/laravel-ide-helper/master.svg?style=flat-square
 [ico-scrutinizer]: https://img.shields.io/scrutinizer/coverage/g/barryvdh/laravel-ide-helper.svg?style=flat-square
 [ico-code-quality]: https://img.shields.io/scrutinizer/g/barryvdh/laravel-ide-helper.svg?style=flat-square
 [ico-downloads]: https://img.shields.io/packagist/dt/barryvdh/laravel-ide-helper.svg?style=flat-square
 [link-packagist]: https://packagist.org/packages/barryvdh/laravel-ide-helper
 [link-travis]: https://travis-ci.org/barryvdh/laravel-ide-helper
 [link-scrutinizer]: https://scrutinizer-ci.com/g/barryvdh/laravel-ide-helper/code-structure
 [link-code-quality]: https://scrutinizer-ci.com/g/barryvdh/laravel-ide-helper
 [link-downloads]: https://packagist.org/packages/barryvdh/laravel-ide-helper
 [link-author]: https://github.com/barryvdh
 [link-contributors]: ../../contributors
@@ -0,0 +1,107 @@
 <?= '<?php' ?>
 <?php
 /**
 * @var \Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_alias_ns
 * @var \Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_extends_ns
 * @var bool $include_fluent
 * @var string $helpers
 */
 ?>
 // @formatter:off
 /**
 * A helper file for Laravel 5, to provide autocomplete information to your IDE
 * Generated for Laravel <?= $version ?> on <?= date("Y-m-d H:i:s") ?>.
 *
 * This file should not be included in your code, only analyzed by your IDE!
 *
 * @author Barry vd. Heuvel <[email protected]>
 * @see https://github.com/barryvdh/laravel-ide-helper
 */
 <?php foreach($namespaces_by_extends_ns as $namespace => $aliases): ?>
 <?php if ($namespace == '\Illuminate\Database\Eloquent'): continue; endif; ?>
 namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> { 
 <?php foreach($aliases as $alias): ?>
    <?= trim($alias->getDocComment('    ')) ?> 
    <?= $alias->getClassType() ?> <?= $alias->getExtendsClass() ?> {
        <?php foreach($alias->getMethods() as $method): ?>
        <?= trim($method->getDocComment('        ')) ?> 
        public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
        {<?php if($method->getDeclaringClass() !== $method->getRoot()): ?>
            //Method inherited from <?= $method->getDeclaringClass() ?>
            <?php endif; ?>
            <?php if($method->isInstanceCall()):?>
            /** @var <?=$method->getRoot()?> $instance */
            <?php endif?>
            <?= $method->shouldReturn() ? 'return ': '' ?><?= $method->getRootMethodCall() ?>;
        }
        <?php endforeach; ?> 
    }
 <?php endforeach; ?> 
 }
 <?php endforeach; ?>
 <?php foreach($namespaces_by_alias_ns as $namespace => $aliases): ?>
 namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> { 
 <?php foreach($aliases as $alias): ?>
    <?= $alias->getClassType() ?> <?= $alias->getShortName() ?> extends <?= $alias->getExtends() ?> {<?php if ($alias->getExtendsNamespace() == '\Illuminate\Database\Eloquent'): ?>
        <?php foreach($alias->getMethods() as $method): ?> 
            <?= trim($method->getDocComment('            ')) ?> 
            public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
            {<?php if($method->getDeclaringClass() !== $method->getRoot()): ?>
                //Method inherited from <?= $method->getDeclaringClass() ?>
                <?php endif; ?>
                <?php if($method->isInstanceCall()):?>
                /** @var <?=$method->getRoot()?> $instance */
                <?php endif?>
                <?= $method->shouldReturn() ? 'return ': '' ?><?= $method->getRootMethodCall() ?>;
            }
        <?php endforeach; ?>
 <?php endif; ?>}
 <?php endforeach; ?> 
 }
 <?php endforeach; ?>
 <?php if($helpers): ?>
 namespace {
 <?= $helpers ?> 
 }
 <?php endif; ?>
 <?php if($include_fluent): ?>
 namespace Illuminate\Support {
    /**
     * Methods commonly used in migrations
     *
     * @method Fluent after(string $column) Add the after modifier
     * @method Fluent charset(string $charset) Add the character set modifier
     * @method Fluent collation(string $collation) Add the collation modifier
     * @method Fluent comment(string $comment) Add comment
     * @method Fluent default($value) Add the default modifier
     * @method Fluent first() Select first row
     * @method Fluent index(string $name = null) Add the in dex clause
     * @method Fluent on(string $table) `on` of a foreign key
     * @method Fluent onDelete(string $action) `on delete` of a foreign key
     * @method Fluent onUpdate(string $action) `on update` of a foreign key
     * @method Fluent primary() Add the primary key modifier
     * @method Fluent references(string $column) `references` of a foreign key
     * @method Fluent nullable(bool $value = true) Add the nullable modifier
     * @method Fluent unique(string $name = null) Add unique index clause
     * @method Fluent unsigned() Add the unsigned modifier
     * @method Fluent useCurrent() Add the default timestamp value
     * @method Fluent change() Add the change modifier
     */
    class Fluent {}
 }
 <?php endif ?>
@@ -0,0 +1,53 @@
 <?= '<?php' ?>
 // @formatter:off
 namespace PHPSTORM_META {
   /**
    * PhpStorm Meta file, to provide autocomplete information for PhpStorm
    * Generated on <?= date("Y-m-d H:i:s") ?>.
    *
    * @author Barry vd. Heuvel <[email protected]>
    * @see https://github.com/barryvdh/laravel-ide-helper
    */
 <?php foreach ($methods as $method): ?>
    override(<?= $method ?>, map([
        '' => '@',
 <?php foreach($bindings as $abstract => $class): ?>
        '<?= $abstract ?>' => \<?= $class ?>::class,
 <?php endforeach; ?>
    ]));
 <?php endforeach; ?>
    override(\Illuminate\Support\Arr::add(0), type(0));
    override(\Illuminate\Support\Arr::except(0), type(0));
    override(\Illuminate\Support\Arr::first(0), elementType(0));
    override(\Illuminate\Support\Arr::last(0), elementType(0));
    override(\Illuminate\Support\Arr::get(0), elementType(0));
    override(\Illuminate\Support\Arr::only(0), type(0));
    override(\Illuminate\Support\Arr::prepend(0), type(0));
    override(\Illuminate\Support\Arr::pull(0), elementType(0));
    override(\Illuminate\Support\Arr::set(0), type(0));
    override(\Illuminate\Support\Arr::shuffle(0), type(0));
    override(\Illuminate\Support\Arr::sort(0), type(0));
    override(\Illuminate\Support\Arr::sortRecursive(0), type(0));
    override(\Illuminate\Support\Arr::where(0), type(0));
    override(\array_add(0), type(0));
    override(\array_except(0), type(0));
    override(\array_first(0), elementType(0));
    override(\array_last(0), elementType(0));
    override(\array_get(0), elementType(0));
    override(\array_only(0), type(0));
    override(\array_prepend(0), type(0));
    override(\array_pull(0), elementType(0));
    override(\array_set(0), type(0));
    override(\array_sort(0), type(0));
    override(\array_sort_recursive(0), type(0));
    override(\array_where(0), type(0));
    override(\head(0), elementType(0));
    override(\last(0), elementType(0));
    override(\with(0), type(0));
    override(\tap(0), type(0));
 }
@@ -10,11 +10,20 @@
 namespace Barryvdh\LaravelIdeHelper;
 use ReflectionClass;
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Context;
 use Barryvdh\Reflection\DocBlock\Tag\MethodTag;
 use Illuminate\Config\Repository as ConfigRepository;
 use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 class Alias
 {
    protected $alias;
    protected $facade;
    protected $extends = null;
    protected $extendsClass = null;
    protected $extendsNamespace = null;
    protected $classType = 'class';
    protected $short;
    protected $namespace = '__root';
@@ -25,18 +34,24 @@ class Alias
    protected $valid = false;
    protected $magicMethods = array();
    protected $interfaces = array();
    protected $phpdoc = null;
    /** @var ConfigRepository  */
    protected $config;
    /**
-     * @param string $alias
+     * @param ConfigRepository $config
-     * @param string $facade
+     * @param string           $alias
-     * @param array $magicMethods
+     * @param string           $facade
-     * @param array $interfaces
+     * @param array            $magicMethods
     * @param array            $interfaces
     */
-    public function __construct($alias, $facade, $magicMethods = array(), $interfaces = array())
+    public function __construct($config, $alias, $facade, $magicMethods = array(), $interfaces = array())
    {
        $this->alias = $alias;
        $this->magicMethods = $magicMethods;
        $this->interfaces = $interfaces;
        $this->config = $config;
        // Make the class absolute
        $facade = '\\' . ltrim($facade, '\\');
@@ -51,10 +66,18 @@ class Alias
        }
        $this->addClass($this->root);
        $this->detectFake();
        $this->detectNamespace();
        $this->detectClassType();
        $this->detectExtendsNamespace();
-        if($facade === '\Illuminate\Database\Eloquent\Model'){
+        if (!empty($this->namespace)) {
            //Create a DocBlock and serializer instance
            $this->phpdoc = new DocBlock(new ReflectionClass($alias), new Context($this->namespace));
        }
        if ($facade === '\Illuminate\Database\Eloquent\Model') {
            $this->usedMethods = array('decrement', 'increment');
        }
    }
@@ -70,7 +93,7 @@ class Alias
        foreach ($classes as $class) {
            if (class_exists($class) || interface_exists($class)) {
                $this->classes[] = $class;
-            }else{
+            } else {
                echo "Class not exists: $class\r\n";
            }
        }
@@ -105,6 +128,26 @@ class Alias
        return $this->extends;
    }
    /**
     * Get the class short name which this alias extends
     *
     * @return null|string
     */
    public function getExtendsClass()
    {
        return $this->extendsClass;
    }
    /**
     * Get the namespace of the class which this alias extends
     *
     * @return null|string
     */
    public function getExtendsNamespace()
    {
        return $this->extendsNamespace;
    }
    /**
     * Get the Alias by which this class is called
     *
@@ -118,7 +161,8 @@ class Alias
    /**
     * Return the short name (without namespace)
     */
-    public function getShortName(){
+    public function getShortName()
    {
        return $this->short;
    }
    /**
@@ -134,15 +178,43 @@ class Alias
    /**
     * Get the methods found by this Alias
     *
-     * @return array
+     * @return array|Method[]
     */
    public function getMethods()
    {
        if (count($this->methods) > 0) {
            return $this->methods;
        }
        $this->addMagicMethods();
        $this->detectMethods();
        return $this->methods;
    }
    /**
     * Detect class returned by ::fake()
     */
    protected function detectFake()
    {
        $facade = $this->facade;
        if (!method_exists($facade, 'fake')) {
            return;
        }
        $real = $facade::getFacadeRoot();
        try {
            $facade::fake();
            $fake = $facade::getFacadeRoot();
            if ($fake !== $real) {
                $this->addClass(get_class($fake));
            }
        } finally {
            $facade::swap($real);
        }
    }
    /**
     * Detect the namespace
     */
@@ -152,11 +224,23 @@ class Alias
            $nsParts = explode('\\', $this->alias);
            $this->short = array_pop($nsParts);
            $this->namespace = implode('\\', $nsParts);
-        }else{
+        } else {
            $this->short = $this->alias;
        }
    }
    /**
     * Detect the extends namespace
     */
    protected function detectExtendsNamespace()
    {
        if (strpos($this->extends, '\\') !== false) {
            $nsParts = explode('\\', $this->extends);
            $this->extendsClass = array_pop($nsParts);
            $this->extendsNamespace = implode('\\', $nsParts);
        }
    }
    /**
     * Detect the class type
     */
@@ -201,7 +285,9 @@ class Alias
            //When the database connection is not set, some classes will be skipped
        } catch (\PDOException $e) {
            $this->error(
-                "PDOException: " . $e->getMessage() . "\nPlease configure your database connection correctly, or use the sqlite memory driver (-M). Skipping $facade."
+                "PDOException: " . $e->getMessage() .
                "\nPlease configure your database connection correctly, or use the sqlite memory driver (-M)." .
                " Skipping $facade."
            );
        } catch (\Exception $e) {
            $this->error("Exception: " . $e->getMessage() . "\nSkipping $facade.");
@@ -227,16 +313,16 @@ class Alias
     */
    protected function addMagicMethods()
    {
-        foreach($this->magicMethods as $magic => $real){
+        foreach ($this->magicMethods as $magic => $real) {
            list($className, $name) = explode('::', $real);
-            if(!class_exists($className) && !interface_exists($className)){
+            if (!class_exists($className) && !interface_exists($className)) {
                continue;
            }
            $method = new \ReflectionMethod($className, $name);
            $class = new \ReflectionClass($className);
-            if(!in_array($method->name, $this->usedMethods)){
+            if (!in_array($magic, $this->usedMethods)) {
-                if($class !== $this->root){
+                if ($class !== $this->root) {
                    $this->methods[] = new Method($method, $this->alias, $class, $magic, $this->interfaces);
                }
                $this->usedMethods[] = $magic;
@@ -262,12 +348,104 @@ class Alias
                        // Only add the methods to the output when the root is not the same as the class.
                        // And don't add the __*() methods
                        if ($this->extends !== $class && substr($method->name, 0, 2) !== '__') {
-                            $this->methods[] = new Method($method, $this->alias, $reflection, $method->name, $this->interfaces);
+                            $this->methods[] = new Method(
                                $method,
                                $this->alias,
                                $reflection,
                                $method->name,
                                $this->interfaces
                            );
                        }
                        $this->usedMethods[] = $method->name;
                    }
                }
            }
            // Check if the class is macroable
            $traits = collect($reflection->getTraitNames());
            if ($traits->contains('Illuminate\Support\Traits\Macroable')) {
                $properties = $reflection->getStaticProperties();
                $macros = isset($properties['macros']) ? $properties['macros'] : [];
                foreach ($macros as $macro_name => $macro_func) {
                    if (!in_array($macro_name, $this->usedMethods)) {
                        // Add macros
                        $this->methods[] = new Macro(
                            $this->getMacroFunction($macro_func),
                            $this->alias,
                            $reflection,
                            $macro_name,
                            $this->interfaces
                        );
                        $this->usedMethods[] = $macro_name;
                    }
                }
            }
        }
    }
    /**
     * @param $macro_func
     *
     * @return \ReflectionFunctionAbstract
     * @throws \ReflectionException
     */
    protected function getMacroFunction($macro_func)
    {
        if (is_array($macro_func) && is_callable($macro_func)) {
            return new \ReflectionMethod($macro_func[0], $macro_func[1]);
        }
        if (is_object($macro_func) && is_callable($macro_func)) {
            return new \ReflectionMethod($macro_func, '__invoke');
        }
        return new \ReflectionFunction($macro_func);
    }
    /*
     * Get the docblock for this alias
     *
     * @param string $prefix
     * @return mixed
     */
    public function getDocComment($prefix = "\t\t")
    {
        $serializer = new DocBlockSerializer(1, $prefix);
        if ($this->phpdoc) {
            if ($this->config->get('ide-helper.include_class_docblocks')) {
                // if a class doesn't expose any DocBlock tags
                // we can perform reflection on the class and
                // add in the original class DocBlock
                if (count($this->phpdoc->getTags()) === 0) {
                    $class = new ReflectionClass($this->root);
                    $this->phpdoc = new DocBlock($class->getDocComment());
                }
            }
            $this->removeDuplicateMethodsFromPhpDoc();
            return $serializer->getDocComment($this->phpdoc);
        }
        return '';
    }
    /**
     * Removes method tags from the doc comment that already appear as functions inside the class.
     * This prevents duplicate function errors in the IDE.
     *
     * @return void
     */
    protected function removeDuplicateMethodsFromPhpDoc()
    {
        $methodNames = array_map(function (Method $method) {
            return $method->getName();
        }, $this->getMethods());
        foreach ($this->phpdoc->getTags() as $tag) {
            if ($tag instanceof MethodTag && in_array($tag->getMethodName(), $methodNames)) {
                $this->phpdoc->deleteTag($tag);
            }
        }
    }
@@ -0,0 +1,61 @@
 <?php
 /**
 * Laravel IDE Helper Generator - Eloquent Model Mixin
 *
 * @author    Charles A. Peterson <[email protected]>
 * @copyright 2017 Charles A. Peterson / 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 Barryvdh\LaravelIdeHelper\Eloquent;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
 /**
 * A command to add \Eloquent mixin to Eloquent\Model
 *
 * @author Charles A. Peterson <[email protected]>
 */
 class EloquentCommand extends Command
 {
    /**
     * The console command name.
     *
     * @var string
     */
    protected $name = 'ide-helper:eloquent';
    /**
     * @var Filesystem $files
     */
    protected $files;
    /**
     * The console command description.
     *
     * @var string
     */
    protected $description = 'Add \Eloquent helper to \Eloquent\Model';
    /**
     * @param Filesystem $files
     */
    public function __construct(Filesystem $files)
    {
        parent::__construct();
        $this->files = $files;
    }
    /**
     * Execute the console command.
     *
     * @return void
     */
    public function handle()
    {
        Eloquent::writeEloquentModelHelper($this, $this->files);
    }
 }
@@ -10,14 +10,13 @@
 namespace Barryvdh\LaravelIdeHelper\Console;
 use Barryvdh\LaravelIdeHelper\Eloquent;
 use Barryvdh\LaravelIdeHelper\Generator;
 use Illuminate\Config\Repository as ConfigRepository;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 /**
 * A command to generate autocomplete information for your IDE
 *
@@ -59,8 +58,9 @@ class GeneratorCommand extends Command
     * @param \Illuminate\View\Factory $view
     */
    public function __construct(
-        ConfigRepository $config,
+        /*ConfigRepository */ $config,
-        Filesystem $files, /* Illuminate\View\Factory */
+        Filesystem $files,
        /* Illuminate\View\Factory */
        $view
    ) {
        $this->config = $config;
@@ -74,11 +74,13 @@ class GeneratorCommand extends Command
     *
     * @return void
     */
-    public function fire()
+    public function handle()
    {
-        if (file_exists($compiled = base_path() . '/bootstrap/compiled.php')) {
+        if (file_exists(base_path() . '/vendor/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 bootstrap/compiled.php (php artisan clear-compiled)'
+                'Error generating IDE Helper: first delete your compiled file (php artisan clear-compiled)'
            );
        } else {
            $filename = $this->argument('filename');
@@ -97,8 +99,8 @@ class GeneratorCommand extends Command
            $helpers = '';
-            if ($this->option('helpers') || ($this->config->get('laravel-ide-helper::include_helpers'))) {
+            if ($this->option('helpers') || ($this->config->get('ide-helper.include_helpers'))) {
-                foreach ($this->config->get('laravel-ide-helper::helper_files', array()) as $helper) {
+                foreach ($this->config->get('ide-helper.helper_files', array()) as $helper) {
                    if (file_exists($helper)) {
                        $helpers .= str_replace(array('<?php', '?>'), '', $this->files->get($helper));
                    }
@@ -113,6 +115,10 @@ class GeneratorCommand extends Command
            if ($written !== false) {
                $this->info("A new helper file was written to $filename");
                if ($this->option('write_mixins')) {
                    Eloquent::writeEloquentModelHelper($this, $this->files);
                }
            } else {
                $this->error("The helper file could not be created at $filename");
            }
@@ -139,7 +145,7 @@ class GeneratorCommand extends Command
     */
    protected function getArguments()
    {
-        $filename = $this->config->get('laravel-ide-helper::filename');
+        $filename = $this->config->get('ide-helper.filename');
        return array(
            array(
@@ -155,14 +161,15 @@ class GeneratorCommand extends Command
     */
    protected function getOptions()
    {
-        $format = $this->config->get('laravel-ide-helper::format');
+        $format = $this->config->get('ide-helper.format');
        $writeMixins = $this->config->get('ide-helper.write_eloquent_model_mixins');
        return array(
            array('format', "F", InputOption::VALUE_OPTIONAL, 'The format for the IDE Helper', $format),
            array('write_mixins', "W", InputOption::VALUE_OPTIONAL, 'Write mixins to Laravel Model?', $writeMixins),
            array('helpers', "H", InputOption::VALUE_NONE, 'Include the helper files'),
            array('memory', "M", InputOption::VALUE_NONE, 'Use sqlite memory driver'),
            array('sublime', "S", InputOption::VALUE_NONE, 'DEPRECATED: Use different style for SublimeText CodeIntel'),
        );
    }
 }
@@ -0,0 +1,155 @@
 <?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';
    /**
     * 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;
    /** @var \Illuminate\Contracts\Config */
    protected $config;
    protected $methods = [
      'new \Illuminate\Contracts\Container\Container',
      '\Illuminate\Contracts\Container\Container::make(0)',
      '\Illuminate\Contracts\Container\Container::makeWith(0)',
      '\App::make(0)',
      '\App::makeWith(0)',
      '\app(0)',
      '\resolve(0)',
    ];
    /**
     *
     * @param \Illuminate\Contracts\Filesystem\Filesystem $files
     * @param \Illuminate\Contracts\View\Factory $view
     * @param \Illuminate\Contracts\Config $config
     */
    public function __construct($files, $view, $config)
    {
        $this->files = $files;
        $this->view = $view;
        $this->config = $config;
        parent::__construct();
    }
    /**
     * Execute the console command.
     *
     * @return void
     */
    public function handle()
    {
        $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('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
        $keys = array_keys($abstracts);
        sort($keys);
        return $keys;
    }
    /**
     * 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()
    {
        $filename = $this->config->get('ide-helper.meta_filename');
        return array(
            array('filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the meta file', $filename),
        );
    }
 }
@@ -10,15 +10,19 @@
 namespace Barryvdh\LaravelIdeHelper\Console;
 use Composer\Autoload\ClassMapGenerator;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Str;
 use Illuminate\Filesystem\Filesystem;
 use ReflectionClass;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\ClassLoader\ClassMapGenerator;
+use Symfony\Component\Console\Output\OutputInterface;
-use phpDocumentor\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock;
-use phpDocumentor\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\Context;
-use phpDocumentor\Reflection\DocBlock\Tag;
+use Barryvdh\Reflection\DocBlock\Tag;
-use phpDocumentor\Reflection\DocBlock\Serializer as DocBlockSerializer;
+use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 /**
 * A command to generate autocomplete information for your IDE
@@ -27,6 +31,10 @@ use phpDocumentor\Reflection\DocBlock\Serializer as DocBlockSerializer;
 */
 class ModelsCommand extends Command
 {
    /**
     * @var Filesystem $files
     */
    protected $files;
    /**
     * The console command name.
@@ -43,34 +51,52 @@ class ModelsCommand extends Command
     */
    protected $description = 'Generate autocompletion for models';
    protected $write_model_magic_where;
    protected $properties = array();
    protected $methods = array();
    protected $write = false;
    protected $dirs = array();
    protected $reset;
    protected $keep_text;
    /**
     * @var bool[string]
     */
    protected $nullableColumns = [];
    /**
     * @param Filesystem $files
     */
    public function __construct(Filesystem $files)
    {
        parent::__construct();
        $this->files = $files;
    }
    /**
     * Execute the console command.
     *
     * @return void
     */
-    public function fire()
+    public function handle()
    {
        $filename = $this->option('filename');
        $this->write = $this->option('write');
        $this->dirs = array_merge(
-            $this->laravel['config']->get('laravel-ide-helper::model_locations'),
+            $this->laravel['config']->get('ide-helper.model_locations'),
            $this->option('dir')
        );
        $model = $this->argument('model');
        $ignore = $this->option('ignore');
        $this->reset = $this->option('reset');
        if ($this->option('smart-reset')) {
            $this->keep_text = $this->reset = true;
        }
        $this->write_model_magic_where = $this->laravel['config']->get('ide-helper.write_model_magic_where', true);
        //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?"
            )
            ) {
                $this->write = true;
@@ -80,7 +106,7 @@ class ModelsCommand extends Command
        $content = $this->generateDocs($model, $ignore);
        if (!$this->write) {
-            $written = \File::put($filename, $content);
+            $written = $this->files->put($filename, $content);
            if ($written !== false) {
                $this->info("Model information was written to $filename");
            } else {
@@ -98,7 +124,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()),
        );
    }
@@ -110,12 +136,13 @@ 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('smart-reset', 'r', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'),
          array('ignore', 'I', InputOption::VALUE_OPTIONAL, 'Which models to ignore', ''),
        );
    }
@@ -124,8 +151,10 @@ class ModelsCommand extends Command
        $output = "<?php
 // @formatter:off
 /**
- * An helper file for your Eloquent Models
+ * A helper file for your Eloquent Models
 * Copy the phpDocs from this file to the correct Model,
 * And remove them from this file, to prevent double declarations.
 *
@@ -148,49 +177,60 @@ class ModelsCommand extends Command
        foreach ($models as $name) {
            if (in_array($name, $ignore)) {
-                $this->comment("Ignoring model '$name'");
+                if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
                    $this->comment("Ignoring model '$name'");
                }
                continue;
            } else {
                $this->comment("Loading model '$name'");
            }
            $this->properties = array();
            $this->methods = array();
            if (class_exists($name)) {
                try {
                    // handle abstract classes, interfaces, ...
-                    $reflectionClass = new \ReflectionClass($name);
+                    $reflectionClass = new ReflectionClass($name);
-                    if (!$reflectionClass->IsInstantiable()) {
+
-                        throw new \Exception($name . ' is not instanciable.');
+                    if (!$reflectionClass->isSubclassOf('Illuminate\Database\Eloquent\Model')) {
                    } elseif (!$reflectionClass->isSubclassOf('Illuminate\Database\Eloquent\Model')) {
                        $this->comment("Class '$name' is not a model");
                        continue;
                    }
-                    $model = new $name();
+                    if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
                        $this->comment("Loading model '$name'");
                    }
                    if (!$reflectionClass->IsInstantiable()) {
                        // ignore abstract class or interface
                        continue;
                    }
                    $model = $this->laravel->make($name);
                    if ($hasDoctrine) {
                        $this->getPropertiesFromTable($model);
                    }
                    if (method_exists($model, 'getCasts')) {
                        $this->castPropertiesType($model);
                    }
                    $this->getPropertiesFromMethods($model);
-                    $output .= $this->createPhpDocs($name);
+                    $this->getSoftDeleteMethods($model);
                    $output                .= $this->createPhpDocs($name);
                    $ignore[]              = $name;
                    $this->nullableColumns = [];
                } catch (\Exception $e) {
                    $this->error("Exception: " . $e->getMessage() . "\nCould not analyze class $name.");
                }
            } elseif (interface_exists($name) || (function_exists('trait_exists') && trait_exists($name))) {
                $this->info("Skipping interface/trait $name");
            } else {
                $this->error("Class $name does not exist");
            }
        }
        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`.'
            );
        }
        return $output;
    }
@@ -208,6 +248,77 @@ class ModelsCommand extends Command
        return $models;
    }
    /**
     * cast the properties's type from $casts.
     *
     * @param \Illuminate\Database\Eloquent\Model $model
     */
    protected function castPropertiesType($model)
    {
        $casts = $model->getCasts();
        foreach ($casts as $name => $type) {
            switch ($type) {
                case 'boolean':
                case 'bool':
                    $realType = 'boolean';
                    break;
                case 'string':
                    $realType = 'string';
                    break;
                case 'array':
                case 'json':
                    $realType = 'array';
                    break;
                case 'object':
                    $realType = 'object';
                    break;
                case 'int':
                case 'integer':
                case 'timestamp':
                    $realType = 'integer';
                    break;
                case 'real':
                case 'double':
                case 'float':
                    $realType = 'float';
                    break;
                case 'date':
                case 'datetime':
                    $realType = '\Illuminate\Support\Carbon';
                    break;
                case 'collection':
                    $realType = '\Illuminate\Support\Collection';
                    break;
                default:
                    $realType = 'mixed';
                    break;
            }
            if (!isset($this->properties[$name])) {
                continue;
            } else {
                $this->properties[$name]['type'] = $this->getTypeOverride($realType);
                if (isset($this->nullableColumns[$name])) {
                    $this->properties[$name]['type'] .= '|null';
                }
            }
        }
    }
    /**
     * Returns the overide type for the give type.
     *
     * @param string $type
     * @return string
     */
    protected function getTypeOverride($type)
    {
        $typeOverrides = $this->laravel['config']->get('ide-helper.type_overrides', array());
        return isset($typeOverrides[$type]) ? $typeOverrides[$type] : $type;
    }
    /**
     * Load the properties from the database table.
     *
@@ -217,15 +328,27 @@ class ModelsCommand extends Command
    {
        $table = $model->getConnection()->getTablePrefix() . $model->getTable();
        $schema = $model->getConnection()->getDoctrineSchemaManager($table);
-        $schema->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
+        $databasePlatform = $schema->getDatabasePlatform();
        $databasePlatform->registerDoctrineTypeMapping('enum', 'string');
-        $columns = $schema->listTableColumns($table);
+        $platformName = $databasePlatform->getName();
        $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) {
                $name = $column->getName();
                if (in_array($name, $model->getDates())) {
-                    $type = '\Carbon\Carbon';
+                    $type = '\Illuminate\Support\Carbon';
                } else {
                    $type = $column->getType()->getName();
                    switch ($type) {
@@ -243,26 +366,39 @@ class ModelsCommand extends Command
                        case 'smallint':
                            $type = 'integer';
                            break;
                        case 'boolean':
                            switch (config('database.default')) {
                                case 'sqlite':
                                case 'mysql':
                                    $type = 'integer';
                                    break;
                                default:
                                    $type = 'boolean';
                                    break;
                            }
                            break;
                        case 'decimal':
                        case 'float':
                            $type = 'float';
                            break;
                        case 'boolean':
                            $type = 'boolean';
                            break;
                        default:
                            $type = 'mixed';
                            break;
                    }
                }
-
+                $comment = $column->getComment();
-                $this->setProperty($name, $type, true, true);
+                if (!$column->getNotnull()) {
-                $this->setMethod(
+                    $this->nullableColumns[$name] = true;
-                    Str::camel("where_" . $name),
+                }
-                    '\Illuminate\Database\Query\Builder|\\' . get_class($model),
+                $this->setProperty($name, $type, true, true, $comment, !$column->getNotnull());
-                    array('$value')
+                if ($this->write_model_magic_where) {
-                );
+                    $this->setMethod(
                        Str::camel("where_" . $name),
                        '\Illuminate\Database\Eloquent\Builder|\\' . get_class($model),
                        array('$value')
                    );
                }
            }
        }
    }
@@ -274,21 +410,24 @@ class ModelsCommand extends Command
    {
        $methods = get_class_methods($model);
        if ($methods) {
            sort($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));
                    if (!empty($name)) {
-                        $this->setProperty($name, null, true, null);
+                        $reflection = new \ReflectionMethod($model, $method);
                        $type = $this->getReturnTypeFromDocBlock($reflection);
                        $this->setProperty($name, $type, 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));
@@ -303,12 +442,18 @@ class ModelsCommand extends Command
                        $args = $this->getParameters($reflection);
                        //Remove the first ($query) argument
                        array_shift($args);
-                        $this->setMethod($name, '\\' . $reflection->class, $args);
+                        $this->setMethod($name, '\Illuminate\Database\Eloquent\Builder|\\' . $reflection->class, $args);
                    }
-                } elseif (!method_exists('Eloquent', $method) && !Str::startsWith($method, 'get')) {
+                } elseif (in_array($method, ['query', 'newQuery', 'newModelQuery'])) {
-
+                    $reflection = new \ReflectionClass($model);
                    $this->setMethod($method, '\Illuminate\Database\Eloquent\Builder|\\' . $reflection->getName());
                } elseif (!method_exists('Illuminate\Database\Eloquent\Model', $method)
                    && !Str::startsWith($method, 'get')
                ) {
                    //Use reflection to inspect the code, based on Illuminate/Support/SerializableClosure.php
                    $reflection = new \ReflectionMethod($model, $method);
                    // php 7.x type or fallback to docblock
                    $type = (string) $reflection->getReturnType() ?: $this->getReturnTypeFromDocBlock($reflection);
                    $file = new \SplFileObject($reflection->getFileName());
                    $file->seek($reflection->getStartLine() - 1);
@@ -318,60 +463,120 @@ 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' => '\Illuminate\Database\Eloquent\Relations\HasMany',
-                                 'belongsToMany',
+                               'hasManyThrough' => '\Illuminate\Database\Eloquent\Relations\HasManyThrough',
-                                 'hasOne',
+                               'belongsToMany' => '\Illuminate\Database\Eloquent\Relations\BelongsToMany',
-                                 'belongsTo',
+                               'hasOne' => '\Illuminate\Database\Eloquent\Relations\HasOne',
-                                 'morphTo',
+                               'belongsTo' => '\Illuminate\Database\Eloquent\Relations\BelongsTo',
-                                 'morphMany',
+                               'morphOne' => '\Illuminate\Database\Eloquent\Relations\MorphOne',
-                                 'morphToMany'
+                               'morphTo' => '\Illuminate\Database\Eloquent\Relations\MorphTo',
-                             ) as $relation) {
+                               'morphMany' => '\Illuminate\Database\Eloquent\Relations\MorphMany',
                               'morphToMany' => '\Illuminate\Database\Eloquent\Relations\MorphToMany',
                               'morphedByMany' => '\Illuminate\Database\Eloquent\Relations\MorphToMany'
                             ) as $relation => $impl) {
                        $search = '$this->' . $relation . '(';
-                        if ($pos = stripos($code, $search)) {
+                        if (stripos($code, $search) || stripos($impl, $type) !== false) {
-                            $code = substr($code, $pos + strlen($search));
+                            //Resolve the relation's model to a Relation object.
-                            $arguments = explode(',', substr($code, 0, stripos($code, ')')));
+                            $methodReflection = new \ReflectionMethod($model, $method);
-                            //Remove quotes, ensure 1 \ in front of the model
+                            if ($methodReflection->getNumberOfParameters()) {
-                            $returnModel = "\\" . ltrim(trim($arguments[0], " \"'"), "\\");
+                                continue;
-                            if ($relation === "belongsToMany" or $relation === 'hasMany' or $relation === 'morphMany' or $relation === 'morphToMany') {
+                            }
-                                //Collection or array of models (because Collection is Arrayable)
+
-                                $this->setProperty(
+                            $relationObj = $model->$method();
-                                    $method,
+
-                                    '\Illuminate\Database\Eloquent\Collection|' . $returnModel . '[]',
+                            if ($relationObj instanceof Relation) {
-                                    true,
+                                $relatedModel = '\\' . get_class($relationObj->getRelated());
-                                    null
+
-                                );
+                                $relations = [
-                            } else {
+                                    'hasManyThrough',
-                                //Single model is returned
+                                    'belongsToMany',
-                                $this->setProperty($method, $returnModel, true, null);
+                                    'hasMany',
                                    'morphMany',
                                    'morphToMany',
                                    'morphedByMany',
                                ];
                                if (in_array($relation, $relations)) {
                                    //Collection or array of models (because Collection is Arrayable)
                                    $this->setProperty(
                                        $method,
                                        $this->getCollectionClass($relatedModel) . '|' . $relatedModel . '[]',
                                        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,
                                        '',
                                        $this->isRelationForeignKeyNullable($relationObj)
                                    );
                                }
                            }
                        }
                    }
                }
            }
        }
    }
    /**
-     * @param string $name
+     * Check if the foreign key of the relation is nullable
-     * @param string|null $type
+     *
-     * @param bool|null $read
+     * @param Relation $relation
-     * @param bool|null $write
+     *
     * @return bool
     */
-    protected function setProperty($name, $type = null, $read = null, $write = null)
+    private function isRelationForeignKeyNullable(Relation $relation)
    {
        $reflectionObj = new \ReflectionObject($relation);
        if (!$reflectionObj->hasProperty('foreignKey')) {
            return false;
        }
        $fkProp = $reflectionObj->getProperty('foreignKey');
        $fkProp->setAccessible(true);
        return isset($this->nullableColumns[$fkProp->getValue($relation)]);
    }
    /**
     * @param string      $name
     * @param string|null $type
     * @param bool|null   $read
     * @param bool|null   $write
     * @param string|null $comment
     * @param bool        $nullable
     */
    protected function setProperty($name, $type = null, $read = null, $write = null, $comment = '', $nullable = false)
    {
        if (!isset($this->properties[$name])) {
            $this->properties[$name] = array();
            $this->properties[$name]['type'] = 'mixed';
            $this->properties[$name]['read'] = false;
            $this->properties[$name]['write'] = false;
            $this->properties[$name]['comment'] = (string) $comment;
        }
        if ($type !== null) {
-            $this->properties[$name]['type'] = $type;
+            $newType = $this->getTypeOverride($type);
            if ($nullable) {
                $newType .='|null';
            }
            $this->properties[$name]['type'] = $newType;
        }
        if ($read !== null) {
            $this->properties[$name]['read'] = $read;
@@ -383,7 +588,9 @@ class ModelsCommand extends Command
    protected function setMethod($name, $type = '', $arguments = array())
    {
-        if (!isset($this->methods[$name])) {
+        $methods = array_change_key_case($this->methods, CASE_LOWER);
        if (!isset($methods[strtolower($name)])) {
            $this->methods[$name] = array();
            $this->methods[$name]['type'] = $type;
            $this->methods[$name]['arguments'] = $arguments;
@@ -397,13 +604,19 @@ class ModelsCommand extends Command
    protected function createPhpDocs($class)
    {
-        $reflection = new \ReflectionClass($class);
+        $reflection = new ReflectionClass($class);
        $namespace = $reflection->getNamespaceName();
        $classname = $reflection->getShortName();
        $originalDoc = $reflection->getDocComment();
        $keyword = $this->getClassKeyword($reflection);
        if ($this->reset) {
            $phpdoc = new DocBlock('', new Context($namespace));
            if ($this->keep_text) {
                $phpdoc->setText(
                    (new DocBlock($reflection, new Context($namespace)))->getText()
                );
            }
        } else {
            $phpdoc = new DocBlock($reflection, new Context($namespace));
        }
@@ -435,19 +648,31 @@ class ModelsCommand extends Command
            } else {
                $attr = 'property-read';
            }
-            $tag = Tag::createInstance("@{$attr} {$property['type']} {$name}", $phpdoc);
+
            if ($this->hasCamelCaseModelProperties()) {
                $name = Str::camel($name);
            }
            $tagLine = trim("@{$attr} {$property['type']} {$name} {$property['comment']}");
            $tag = Tag::createInstance($tagLine, $phpdoc);
            $phpdoc->appendTag($tag);
        }
        ksort($this->methods);
        foreach ($this->methods as $name => $method) {
            if (in_array($name, $methods)) {
                continue;
            }
            $arguments = implode(', ', $method['arguments']);
-            $tag = Tag::createInstance("@method static {$method['type']} {$name}({$arguments}) ", $phpdoc);
+            $tag = Tag::createInstance("@method static {$method['type']} {$name}({$arguments})", $phpdoc);
            $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);
@@ -455,7 +680,7 @@ class ModelsCommand extends Command
        if ($this->write) {
            $filename = $reflection->getFileName();
-            $contents = \File::get($filename);
+            $contents = $this->files->get($filename);
            if ($originalDoc) {
                $contents = str_replace($originalDoc, $docComment, $contents);
            } else {
@@ -466,12 +691,12 @@ class ModelsCommand extends Command
                    $contents = substr_replace($contents, $replace, $pos, strlen($needle));
                }
            }
-            if (\File::put($filename, $contents)) {
+            if ($this->files->put($filename, $contents)) {
                $this->info('Written new phpDocBlock to ' . $filename);
            }
        }
-        $output = "namespace {$namespace}{\n{$docComment}\n\tclass {$classname} {}\n}\n\n";
+        $output = "namespace {$namespace}{\n{$docComment}\n\t{$keyword}class {$classname} extends \Eloquent {}\n}\n\n";
        return $output;
    }
@@ -486,10 +711,12 @@ 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();
+            $paramClass = $param->getClass();
            $paramStr = (!is_null($paramClass) ? '\\' . $paramClass->getName() . ' ' : '') . '$' . $param->getName();
            $params[] = $paramStr;
-            if ($param->isOptional()) {
+            if ($param->isOptional() && $param->isDefaultValueAvailable()) {
                $default = $param->getDefaultValue();
                if (is_bool($default)) {
                    $default = $default ? 'true' : 'false';
@@ -509,4 +736,84 @@ class ModelsCommand extends Command
        return $paramsWithDefault;
    }
    /**
     * Determine a model classes' collection type.
     *
     * @see http://laravel.com/docs/eloquent-collections#custom-collections
     * @param string $className
     * @return string
     */
    private function getCollectionClass($className)
    {
        // Return something in the very very unlikely scenario the model doesn't
        // have a newCollection() method.
        if (!method_exists($className, 'newCollection')) {
            return '\Illuminate\Database\Eloquent\Collection';
        }
        /** @var \Illuminate\Database\Eloquent\Model $model */
        $model = new $className;
        return '\\' . get_class($model->newCollection());
    }
    /**
     * @return bool
     */
    protected function hasCamelCaseModelProperties()
    {
        return $this->laravel['config']->get('ide-helper.model_camel_case_properties', false);
    }
    /**
     * Get method return type based on it DocBlock comment
     *
     * @param \ReflectionMethod $reflection
     *
     * @return null|string
     */
    protected function getReturnTypeFromDocBlock(\ReflectionMethod $reflection)
    {
        $type = null;
        $phpdoc = new DocBlock($reflection);
        if ($phpdoc->hasTag('return')) {
            $type = $phpdoc->getTagsByName('return')[0]->getType();
        }
        return $type;
    }
    /**
     * Generates methods provided by the SoftDeletes trait
     * @param \Illuminate\Database\Eloquent\Model $model
     */
    protected function getSoftDeleteMethods($model)
    {
        $traits = class_uses(get_class($model), true);
        if (in_array('Illuminate\\Database\\Eloquent\\SoftDeletes', $traits)) {
            $this->setMethod('forceDelete', 'bool|null', []);
            $this->setMethod('restore', 'bool|null', []);
            $this->setMethod('withTrashed', '\Illuminate\Database\Query\Builder|\\' . get_class($model), []);
            $this->setMethod('withoutTrashed', '\Illuminate\Database\Query\Builder|\\' . get_class($model), []);
            $this->setMethod('onlyTrashed', '\Illuminate\Database\Query\Builder|\\' . get_class($model), []);
        }
    }
    /**
     * @param ReflectionClass $reflection
     * @return string
     */
    private function getClassKeyword(ReflectionClass $reflection)
    {
        if ($reflection->isFinal()) {
            $keyword = 'final ';
        } elseif ($reflection->isAbstract()) {
            $keyword = 'abstract ';
        } else {
            $keyword = '';
        }
        return $keyword;
    }
 }
@@ -0,0 +1,108 @@
 <?php
 /**
 * Laravel IDE Helper to add \Eloquent mixin to Eloquent\Model
 *
 * @author Charles A. Peterson <[email protected]>
 */
 namespace Barryvdh\LaravelIdeHelper;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Context;
 use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 use Barryvdh\Reflection\DocBlock\Tag;
 class Eloquent
 {
    /**
     * Write mixin helper to the Eloquent\Model
     * This is needed since laravel/framework v5.4.29
     *
     * @param Command    $command
     * @param Filesystem $files
     *
     * @return void
     */
    public static function writeEloquentModelHelper(Command $command, Filesystem $files)
    {
        $class = 'Illuminate\Database\Eloquent\Model';
        $reflection  = new \ReflectionClass($class);
        $namespace   = $reflection->getNamespaceName();
        $originalDoc = $reflection->getDocComment();
        if (!$originalDoc) {
            $command->info('Unexpected no document on ' . $class);
        }
        $phpdoc = new DocBlock($reflection, new Context($namespace));
        $mixins = $phpdoc->getTagsByName('mixin');
        $expectedMixins = [
            '\Eloquent'                             => false,
            '\Illuminate\Database\Eloquent\Builder' => false,
            '\Illuminate\Database\Query\Builder'    => false,
        ];
        foreach ($mixins as $m) {
            $mixin = $m->getContent();
            if (isset($expectedMixins[$mixin])) {
                $command->info('Tag Exists: @mixin ' . $mixin . ' in ' . $class);
                $expectedMixins[$mixin] = true;
            }
        }
        $changed = false;
        foreach ($expectedMixins as $expectedMixin => $present) {
            if ($present === false) {
                $phpdoc->appendTag(Tag::createInstance('@mixin ' . $expectedMixin, $phpdoc));
                $changed = true;
            }
        }
        // If nothing's changed, stop here.
        if (!$changed) {
            return;
        }
        $serializer = new DocBlockSerializer();
        $serializer->getDocComment($phpdoc);
        $docComment = $serializer->getDocComment($phpdoc);
        /*
            The new DocBlock is appended to the beginning of the class declaration.
            Since there is no DocBlock, the declaration is used as a guide.
        */
        if (!$originalDoc) {
            $originalDoc = 'abstract class Model implements';
            $docComment .= "\nabstract class Model implements";
        }
        $filename = $reflection->getFileName();
        if ($filename) {
            $contents = $files->get($filename);
            if ($contents) {
                $count    = 0;
                $contents = str_replace($originalDoc, $docComment, $contents, $count);
                if ($count > 0) {
                    if ($files->put($filename, $contents)) {
                        $command->info('Wrote expected docblock to ' . $filename);
                    } else {
                        $command->error('File write failed to ' . $filename);
                    }
                } else {
                    $command->error('Content did not change ' . $contents);
                }
            } else {
                $command->error('No file contents found ' . $filename);
            }
        } else {
            $command->error('Filename not found ' . $class);
        }
    }
 }
@@ -10,8 +10,10 @@
 namespace Barryvdh\LaravelIdeHelper;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\AliasLoader;
-use Illuminate\Config\Repository as ConfigRepository;
+use Illuminate\Support\Collection;
 use ReflectionClass;
 use Symfony\Component\Console\Output\OutputInterface;
 class Generator
@@ -36,7 +38,8 @@ 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 = ''
@@ -47,9 +50,13 @@ class Generator
        // Find the drivers to add to the extra/interfaces
        $this->detectDrivers();
-        $this->extra = array_merge($this->extra, $this->config->get('laravel-ide-helper::extra'));
+        $this->extra = array_merge($this->extra, $this->config->get('ide-helper.extra'));
-        $this->magic = array_merge($this->magic, $this->config->get('laravel-ide-helper::magic'));
+        $this->magic = array_merge($this->magic, $this->config->get('ide-helper.magic'));
-        $this->interfaces = array_merge($this->interfaces, $this->config->get('laravel-ide-helper::interfaces'));
+        $this->interfaces = array_merge($this->interfaces, $this->config->get('ide-helper.interfaces'));
        // Make all interface classes absolute
        foreach ($this->interfaces as &$interface) {
            $interface = '\\' . ltrim($interface, '\\');
        }
        $this->helpers = $helpers;
    }
@@ -73,18 +80,20 @@ class Generator
    public function generatePhpHelper()
    {
        $app = app();
-        return $this->view->make('laravel-ide-helper::ide-helper')
+        return $this->view->make('helper')
-            ->with('namespaces', $this->getNamespaces())
+            ->with('namespaces_by_extends_ns', $this->getAliasesByExtendsNamespace())
            ->with('namespaces_by_alias_ns', $this->getAliasesByAliasNamespace())
            ->with('helpers', $this->helpers)
-            ->with('version', $app::VERSION)
+            ->with('version', $app->version())
            ->with('include_fluent', $this->config->get('ide-helper.include_fluent', true))
            ->render();
    }
    public function generateJsonHelper()
    {
        $classes = array();
-        foreach ($this->getNamespaces() as $aliases) {
+        foreach ($this->getValidAliases() as $aliases) {
-            foreach($aliases as $alias) {
+            foreach ($aliases as $alias) {
                $functions = array();
                foreach ($alias->getMethods() as $method) {
                    $functions[$method->getName()] = '('. $method->getParamsWithDefault().')';
@@ -109,83 +118,167 @@ class Generator
    protected function detectDrivers()
    {
-        try{
+        $defaultUserModel = config('auth.providers.users.model', config('auth.model', 'App\User'));
-            if (class_exists('Auth')) {
+        $this->interfaces['\Illuminate\Contracts\Auth\Authenticatable'] = $defaultUserModel;
-                $class = get_class(\Auth::driver());
+
        try {
            if (class_exists('Auth') && is_a('Auth', '\Illuminate\Support\Facades\Auth', true)) {
                if (class_exists('\Illuminate\Foundation\Application')) {
                    $authMethod = version_compare(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;
            }
-        }catch (\Exception $e) {}
+        } catch (\Exception $e) {
        }
-        try{
+        try {
-            if (class_exists('DB')) {
+            if (class_exists('DB') && is_a('DB', '\Illuminate\Support\Facades\DB', true)) {
                $class = get_class(\DB::connection());
                $this->extra['DB'] = array($class);
                $this->interfaces['\Illuminate\Database\ConnectionInterface'] = $class;
            }
-        }catch (\Exception $e) {}
+        } catch (\Exception $e) {
        }
-        try{
+        try {
-            if (class_exists('Cache')) {
+            if (class_exists('Cache') && is_a('Cache', '\Illuminate\Support\Facades\Cache', true)) {
                $driver = get_class(\Cache::driver());
                $store = get_class(\Cache::getStore());
                $this->extra['Cache'] = array($driver, $store);
                $this->interfaces['\Illuminate\Cache\StoreInterface'] = $store;
            }
-        }catch (\Exception $e) {}
+        } catch (\Exception $e) {
        }
-        try{
+        try {
-            if (class_exists('Queue')) {
+            if (class_exists('Queue') && is_a('Queue', '\Illuminate\Support\Facades\Queue', true)) {
                $class = get_class(\Queue::connection());
                $this->extra['Queue'] = array($class);
                $this->interfaces['\Illuminate\Queue\QueueInterface'] = $class;
            }
-        }catch (\Exception $e) {}
+        } catch (\Exception $e) {
        }
-        try{
+        try {
-            if (class_exists('SSH')){
+            if (class_exists('SSH') && is_a('SSH', '\Illuminate\Support\Facades\SSH', true)) {
                $class = get_class(\SSH::connection());
                $this->extra['SSH'] = array($class);
                $this->interfaces['\Illuminate\Remote\ConnectionInterface'] = $class;
            }
-        }catch (\Exception $e) {}
+        } catch (\Exception $e) {
        }
-        // Make all interface classes absolute
+        try {
-        foreach ($this->interfaces as &$interface) {
+            if (class_exists('Storage') && is_a('Storage', '\Illuminate\Support\Facades\Storage', true)) {
-            $interface = '\\' . ltrim($interface, '\\');
+                $class = get_class(\Storage::disk());
                $this->extra['Storage'] = array($class);
                $this->interfaces['\Illuminate\Contracts\Filesystem\Filesystem'] = $class;
            }
        } catch (\Exception $e) {
        }
    }
    /**
-     * Find all namespaces/aliases that are valid for us to render
+     * Find all aliases that are valid for us to render
     *
-     * @return array
+     * @return Collection
     */
-    protected function getNamespaces()
+    protected function getValidAliases()
    {
-        $namespaces = array();
+        $aliases = new Collection();
        // Get all aliases
-        foreach (AliasLoader::getInstance()->getAliases() as $name => $facade) {
+        foreach ($this->getAliases() as $name => $facade) {
-            $magicMethods = array_key_exists($name, $this->magic) ? $this->magic[$name] : array();
+            // Skip the Redis facade, if not available (otherwise Fatal PHP Error)
-            $alias = new Alias($name, $facade, $magicMethods, $this->interfaces);
+            if ($facade == 'Illuminate\Support\Facades\Redis' && $name == 'Redis' && !class_exists('Predis\Client')) {
-            if ($alias->isValid()) {
+                continue;
            }
            $magicMethods = array_key_exists($name, $this->magic) ? $this->magic[$name] : array();
            $alias = new Alias($this->config, $name, $facade, $magicMethods, $this->interfaces);
            if ($alias->isValid()) {
                //Add extra methods, from other classes (magic static calls)
                if (array_key_exists($name, $this->extra)) {
                    $alias->addClass($this->extra[$name]);
                }
-                $namespace = $alias->getNamespace();
+                $aliases[] = $alias;
                if (!isset($namespaces[$namespace])) {
                    $namespaces[$namespace] = array();
                }
                $namespaces[$namespace][] = $alias;
            }
        }
-        return $namespaces;
+        return $aliases;
    }
    /**
     * Regroup aliases by namespace of extended classes
     *
     * @return Collection
     */
    protected function getAliasesByExtendsNamespace()
    {
        return $this->getValidAliases()->groupBy(function (Alias $alias) {
            return $alias->getExtendsNamespace();
        });
    }
    /**
     * Regroup aliases by namespace of alias
     *
     * @return Collection
     */
    protected function getAliasesByAliasNamespace()
    {
        return $this->getValidAliases()->groupBy(function (Alias $alias) {
            return $alias->getNamespace();
        });
    }
    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',
          'Gate' => 'Illuminate\Support\Facades\Gate',
        ];
        $facades = array_merge($facades, $this->config->get('app.aliases', []));
        // Only return the ones that actually exist
        return array_filter(
            $facades,
            function ($alias) {
                return class_exists($alias);
            },
            ARRAY_FILTER_USE_KEY
        );
    }
    /**
@@ -226,9 +319,9 @@ class Generator
     */
    protected function error($string)
    {
-        if($this->output){
+        if ($this->output) {
            $this->output->writeln("<error>$string</error>");
-        }else{
+        } else {
            echo $string . "\r\n";
        }
    }
@@ -10,10 +10,15 @@
 namespace Barryvdh\LaravelIdeHelper;
-use Illuminate\Support\ServiceProvider;
+use Barryvdh\LaravelIdeHelper\Console\EloquentCommand;
 use Barryvdh\LaravelIdeHelper\Console\GeneratorCommand;
-use Barryvdh\LaravelIdeHelper\Console\Generator2Command;
+use Barryvdh\LaravelIdeHelper\Console\MetaCommand;
-Use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
+use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Engines\EngineResolver;
 use Illuminate\View\Engines\PhpEngine;
 use Illuminate\View\Factory;
 use Illuminate\View\FileViewFinder;
 class IdeHelperServiceProvider extends ServiceProvider
 {
@@ -32,7 +37,18 @@ class IdeHelperServiceProvider extends ServiceProvider
     */
    public function boot()
    {
-        $this->package('barryvdh/laravel-ide-helper', 'laravel-ide-helper', __DIR__);
+        if ($this->app->has('view')) {
            $viewPath = __DIR__ . '/../resources/views';
            $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');
    }
    /**
@@ -42,19 +58,44 @@ class IdeHelperServiceProvider extends ServiceProvider
     */
    public function register()
    {
-        $this->app['command.ide-helper.generate'] = $this->app->share(
+        $configPath = __DIR__ . '/../config/ide-helper.php';
        $this->mergeConfigFrom($configPath, 'ide-helper');
        $localViewFactory = $this->createLocalViewFactory();
        $this->app->singleton(
            'command.ide-helper.generate',
            function ($app) use ($localViewFactory) {
                return new GeneratorCommand($app['config'], $app['files'], $localViewFactory);
            }
        );
        $this->app->singleton(
            'command.ide-helper.models',
            function ($app) {
-                return new GeneratorCommand($app['config'], $app['files'], $app['view']);
+                return new ModelsCommand($app['files']);
            }
        );
-        $this->app['command.ide-helper.models'] = $this->app->share(
+        $this->app->singleton(
-            function () {
+            'command.ide-helper.meta',
-                return new ModelsCommand();
+            function ($app) use ($localViewFactory) {
                return new MetaCommand($app['files'], $localViewFactory, $app['config']);
            }
        );
-        $this->commands('command.ide-helper.generate', 'command.ide-helper.models');
+        $this->app->singleton(
            'command.ide-helper.eloquent',
            function ($app) use ($localViewFactory) {
                return new EloquentCommand($app['files']);
            }
        );
        $this->commands(
            'command.ide-helper.generate',
            'command.ide-helper.models',
            'command.ide-helper.meta',
            'command.ide-helper.eloquent'
        );
    }
    /**
@@ -67,4 +108,19 @@ class IdeHelperServiceProvider extends ServiceProvider
        return array('command.ide-helper.generate', 'command.ide-helper.models');
    }
    /**
     * @return Factory
     */
    private function createLocalViewFactory()
    {
        $resolver = new EngineResolver();
        $resolver->register('php', function () {
            return new PhpEngine();
        });
        $finder = new FileViewFinder($this->app['files'], [__DIR__ . '/../resources/views']);
        $factory = new Factory($resolver, $finder, $this->app['events']);
        $factory->addExtension('php', 'php');
        return $factory;
    }
 }
@@ -0,0 +1,46 @@
 <?php
 namespace Barryvdh\LaravelIdeHelper;
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Tag;
 class Macro extends Method
 {
    /**
     * Macro constructor.
     *
     * @param \ReflectionFunctionAbstract $method
     * @param string              $alias
     * @param \ReflectionClass    $class
     * @param null                $methodName
     * @param array               $interfaces
     */
    public function __construct(
        $method,
        $alias,
        $class,
        $methodName = null,
        $interfaces = array()
    ) {
        parent::__construct($method, $alias, $class, $methodName, $interfaces);
    }
    /**
     * @param \ReflectionFunctionAbstract $method
     */
    protected function initPhpDoc($method)
    {
        $this->phpdoc = new DocBlock($method);
    }
    /**
     * @param \ReflectionFunctionAbstract $method
     * @param \ReflectionClass $class
     */
    protected function initClassDefinedProperties($method, \ReflectionClass $class)
    {
        $this->namespace = $class->getNamespaceName();
        $this->declaringClassName = '\\' . ltrim($class->name, '\\');
    }
 }
@@ -10,63 +10,85 @@
 namespace Barryvdh\LaravelIdeHelper;
-use phpDocumentor\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock;
-use phpDocumentor\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\Context;
-use phpDocumentor\Reflection\DocBlock\Tag;
+use Barryvdh\Reflection\DocBlock\Tag;
-use phpDocumentor\Reflection\DocBlock\Tag\ReturnTag;
+use Barryvdh\Reflection\DocBlock\Tag\ReturnTag;
-use phpDocumentor\Reflection\DocBlock\Tag\ParamTag;
+use Barryvdh\Reflection\DocBlock\Tag\ParamTag;
-use phpDocumentor\Reflection\DocBlock\Serializer as DocBlockSerializer;
+use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 class Method
 {
-    /** @var \phpDocumentor\Reflection\DocBlock  */
+    /** @var \Barryvdh\Reflection\DocBlock  */
    protected $phpdoc;
    /** @var \ReflectionMethod  */
    protected $method;
    protected $output = '';
    protected $declaringClassName;
    protected $name;
    protected $namespace;
    protected $params = array();
    protected $params_with_default = array();
    protected $interfaces = array();
    protected $real_name;
    protected $return = null;
    protected $root;
    /**
-     * @param \ReflectionMethod $method
+     * @param \ReflectionMethod|\ReflectionFunctionAbstract $method
     * @param string $alias
-     * @param string $class
+     * @param \ReflectionClass $class
     * @param string|null $methodName
     * @param array $interfaces
     */
-    public function __construct(\ReflectionMethod $method, $alias, $class, $methodName = null, $interfaces = array())
+    public function __construct($method, $alias, $class, $methodName = null, $interfaces = array())
    {
        $this->method = $method;
        $this->interfaces = $interfaces;
        $this->name = $methodName ?: $method->name;
-        $this->namespace = $method->getDeclaringClass()->getNamespaceName();
+        $this->real_name = $method->isClosure() ? $this->name : $method->name;
        $this->initClassDefinedProperties($method, $class);
        //Reference the 'real' function in the declaring class
        $this->root = '\\' . ltrim($class->getName(), '\\');
        //Create a DocBlock and serializer instance
-        $this->phpdoc = new DocBlock($method, new Context($this->namespace));
+        $this->initPhpDoc($method);
        //Normalize the description and inherit the docs from parents/interfaces
        try {
            $this->normalizeParams($this->phpdoc);
            $this->normalizeReturn($this->phpdoc);
            $this->normalizeDescription($this->phpdoc);
-        } catch (\Exception $e) {}
+        } catch (\Exception $e) {
        }
        //Get the parameters, including formatted default values
        $this->getParameters($method);
        //Make the method static
        $this->phpdoc->appendTag(Tag::createInstance('@static', $this->phpdoc));
    }
-        //Reference the 'real' function in the declaringclass
+    /**
     * @param \ReflectionMethod $method
     */
    protected function initPhpDoc($method)
    {
        $this->phpdoc = new DocBlock($method, new Context($this->namespace));
    }
    /**
     * @param \ReflectionMethod $method
     * @param \ReflectionClass $class
     */
    protected function initClassDefinedProperties($method, \ReflectionClass $class)
    {
        $declaringClass = $method->getDeclaringClass();
        $this->namespace = $declaringClass->getNamespaceName();
        $this->declaringClassName = '\\' . ltrim($declaringClass->name, '\\');
        $this->root = '\\' . ltrim($class->getName(), '\\');
    }
    /**
@@ -89,6 +111,26 @@ class Method
        return $this->root;
    }
    /**
     * @return bool
     */
    public function isInstanceCall()
    {
        return ! ($this->method->isClosure() || $this->method->isStatic());
    }
    /**
     * @return string
     */
    public function getRootMethodCall()
    {
        if ($this->isInstanceCall()) {
            return "\$instance->{$this->getRealName()}({$this->getParams()})";
        } else {
            return "{$this->getRoot()}::{$this->getRealName()}({$this->getParams()})";
        }
    }
    /**
     * Get the docblock for this method
     *
@@ -111,6 +153,16 @@ class Method
        return $this->name;
    }
    /**
     * Get the real method name
     *
     * @return string
     */
    public function getRealName()
    {
        return $this->real_name;
    }
    /**
     * Get the parameters for this method
     *
@@ -177,7 +229,7 @@ class Method
        $paramTags = $phpdoc->getTagsByName('param');
        if ($paramTags) {
            /** @var ParamTag $tag */
-            foreach($paramTags as $tag){
+            foreach ($paramTags as $tag) {
                // Convert the keywords
                $content = $this->convertKeywords($tag->getContent());
                $tag->setContent($content);
@@ -205,14 +257,18 @@ class Method
            $returnValue = $tag->getType();
            // Replace the interfaces
-            foreach($this->interfaces as $interface => $real){
+            foreach ($this->interfaces as $interface => $real) {
                $returnValue = str_replace($interface, $real, $returnValue);
            }
            // Set the changed content
            $tag->setContent($returnValue . ' ' . $tag->getDescription());
            $this->return = $returnValue;
-        }else{
+
            if ($tag->getType() === '$this') {
                $tag->setType($this->root);
            }
        } else {
            $this->return = null;
        }
    }
@@ -239,7 +295,7 @@ class Method
     */
    public function shouldReturn()
    {
-        if($this->return !== "void" && $this->method->name !== "__construct"){
+        if ($this->return !== "void" && $this->method->name !== "__construct") {
            return true;
        }
@@ -249,7 +305,7 @@ class Method
    /**
     * Get the parameters and format them correctly
     *
-     * @param $method
+     * @param  \ReflectionMethod $method
     * @return array
     */
    public function getParameters($method)
@@ -261,7 +317,7 @@ class Method
            $paramStr = '$' . $param->getName();
            $params[] = $paramStr;
            if ($param->isOptional()) {
-                $default = $param->getDefaultValue();
+                $default = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null;
                if (is_bool($default)) {
                    $default = $default ? 'true' : 'false';
                } elseif (is_array($default)) {
@@ -270,6 +326,8 @@ class Method
                    $default = 'null';
                } elseif (is_int($default)) {
                    //$default = $default;
                } elseif (is_resource($default)) {
                    //skip to not fail
                } else {
                    $default = "'" . trim($default) . "'";
                }
@@ -1,90 +0,0 @@
 <?php
 return array(
    /*
    |--------------------------------------------------------------------------
    | Filename & Format
    |--------------------------------------------------------------------------
    |
    | The default filename (without extension) and the format (php or json)
    |
    */
    'filename'  => '_ide_helper',
    'format'    => 'php',
    /*
    |--------------------------------------------------------------------------
    | Helper files to include
    |--------------------------------------------------------------------------
    |
    | Include helper files. By default not included, but can be toggled with the
    | -- helpers (-H) option. Extra helper files can be included.
    |
    */
    'include_helpers' => false,
    'helper_files' => array(
        base_path().'/vendor/laravel/framework/src/Illuminate/Support/helpers.php',
    ),
    /*
    |--------------------------------------------------------------------------
    | Model locations to include
    |--------------------------------------------------------------------------
    |
    | Define in which directories the ide-helper:models command should look
    | for models.
    |
    */
    'model_locations' => array(
        'app/models',
    ),
    /*
    |--------------------------------------------------------------------------
    | Extra classes
    |--------------------------------------------------------------------------
    |
    | These implementations are not really extended, but called with magic functions
    |
    */
    'extra' => array(
        'Artisan' => array('Illuminate\Foundation\Artisan'),
        'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'),
        'Session' => array('Illuminate\Session\Store'),
    ),
    'magic' => array(
        'Log' => array(
            'debug'     => 'Monolog\Logger::addDebug',
            'info'      => 'Monolog\Logger::addInfo',
            'notice'    => 'Monolog\Logger::addNotice',
            'warning'   => 'Monolog\Logger::addWarning',
            'error'     => 'Monolog\Logger::addError',
            'critical'  => 'Monolog\Logger::addCritical',
            'alert'     => 'Monolog\Logger::addAlert',
            'emergency' => 'Monolog\Logger::addEmergency',
        )
    ),
    /*
    |--------------------------------------------------------------------------
    | Interface implementations
    |--------------------------------------------------------------------------
    |
    | These interfaces will be replaced with the implementing class. Some interfaces
    | are detected by the helpers, others can be listed below.
    |
    */
    'interfaces' => array(
        '\Illuminate\Auth\UserInterface' => '\User',
    )
 );
@@ -1,39 +0,0 @@
 <?= '<?php' ?>
 /**
 * An helper file for Laravel 4, to provide autocomplete information to your IDE
 * Generated for Laravel <?= $version ?> on <?= date("Y-m-d") ?>.
 *
 * @author Barry vd. Heuvel <[email protected]>
 * @see https://github.com/barryvdh/laravel-ide-helper
 */
 <?php foreach($namespaces as $namespace => $aliases): ?>
 namespace <?= $namespace == '__root' ? '' : $namespace ?>{
 <?php if($namespace == '__root'): ?>
    exit("This file should not be included, only analyzed by your IDE");
 <?= $helpers ?>
 <?php endif; ?>
 <?php foreach($aliases as $alias): ?>
    <?= $alias->getClassType() ?> <?= $alias->getShortName() ?> <?= $alias->getExtends() ? 'extends ' . $alias->getExtends() : '' ?>{
        <?php foreach($alias->getMethods() as $method): ?>
        <?= trim($method->getDocComment('        ')) ?>
        public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>){<?php if($method->getDeclaringClass() !== $method->getRoot()): ?>
            //Method inherited from <?= $method->getDeclaringClass() ?>
            <?php endif; ?>
            <?= $method->shouldReturn() ? 'return ': '' ?><?= $method->getRoot() ?>::<?= $method->getName() ?>(<?= $method->getParams() ?>);
        }
        <?php endforeach; ?>
    }
 <?php endforeach; ?>
 }
 <?php endforeach; ?>
@@ -0,0 +1,58 @@
 <?php
 namespace Barryvdh\LaravelIdeHelper;
 class ExampleTest extends \PHPUnit_Framework_TestCase
 {
    /**
     * Test that we can actually instantiate the class
     */
    public function testCanInstantiate()
    {
        $reflectionClass = new \ReflectionClass(ExampleClass::class);
        $reflectionMethod = $reflectionClass->getMethod('setName');
        $method = new Method($reflectionMethod, 'Example', $reflectionClass);
        $this->assertInstanceOf(Method::class, $method);
    }
    /**
     * Test the output of a class
     */
    public function testOutput()
    {
        $reflectionClass = new \ReflectionClass(ExampleClass::class);
        $reflectionMethod = $reflectionClass->getMethod('setName');
        $method = new Method($reflectionMethod, 'Example', $reflectionClass);
        $output = '/**
 * 
 *
 * @param string $last
 * @param string $first
 * @static 
 */';
        $this->assertEquals($output, $method->getDocComment(''));
        $this->assertEquals('setName', $method->getName());
        $this->assertEquals('\\'.ExampleClass::class, $method->getDeclaringClass());
        $this->assertEquals('$last, $first', $method->getParams(true));
        $this->assertEquals(['$last', '$first'], $method->getParams(false));
        $this->assertEquals('$last, $first = \'Barry\'', $method->getParamsWithDefault(true));
        $this->assertEquals(['$last', '$first = \'Barry\''], $method->getParamsWithDefault(false));
        $this->assertEquals(true, $method->shouldReturn());
    }
 }
 class ExampleClass
 {
    /**
     * @param string $last
     * @param string $first
     */
    public function setName($last, $first = 'Barry')
    {
        return;
    }
 }