Remove contracts from L4 version

More meta methods
Tweak meta methods
2026-08-18 01:57:13 +00:00 · 2015-03-16 14:28:03 +01:00 · 2015-03-16 14:25:52 +01:00 · 2015-03-16 14:16:41 +01:00 · 2015-03-16 13:12:40 +01:00 · 2015-03-16 13:06:29 +01:00
22 changed files with 1093 additions and 1529 deletions
@@ -1,15 +0,0 @@
-; 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
@@ -1,10 +0,0 @@
-# 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,4 +1,3 @@
-build
-vendor
+/vendor
 composer.lock
 .idea
@@ -1,23 +0,0 @@
-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
@@ -1 +0,0 @@
-preset: psr2
@@ -1,31 +0,0 @@
-language: php
-
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-# 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: 5.5
-      env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
-
-before_script:
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
-
-script:
-  - vendor/bin/phpcs --standard=psr2 src/
-  - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
-
-after_script:
-  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover; fi
@@ -1,21 +0,0 @@
-# The MIT License (MIT)
-
-Copyright (c) 2016 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,17 +10,14 @@
        }
    ],
    "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "^5.0,<5.4",
-        "illuminate/console": "^5.0,<5.4",
-        "illuminate/filesystem": "^5.0,<5.4",
-        "barryvdh/reflection-docblock": "^2.0.4",
-        "symfony/class-loader": "^2.3|^3.0"
+        "php": ">=5.3.0",
+        "illuminate/support": "4.x",
+        "illuminate/console": "4.x",
+        "illuminate/filesystem": "4.x",
+        "phpdocumentor/reflection-docblock": "2.0.x",
+        "symfony/class-loader": "~2.3"
    },
    "require-dev": {
-        "phpunit/phpunit" : "4.*",
-        "scrutinizer/ocular": "~1.1",
-        "squizlabs/php_codesniffer": "~2.3",
        "doctrine/dbal": "~2.3"
    },
    "suggest": {
@@ -31,18 +28,9 @@
            "Barryvdh\\LaravelIdeHelper\\": "src"
        }
    },
-    "autoload-dev": {
-        "psr-4": {
-            ":vendor\\:package_name\\": "tests"
-        }
-    },
-    "scripts": {
-        "test": "phpunit",
-        "cs": "phpcs --standard=psr2 src/"
-    },
    "extra": {
        "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "1.11-dev"
        }
    }
 }
@@ -1,29 +0,0 @@
-<?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=":vendor Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-</phpunit>
@@ -0,0 +1,5 @@
+{
+  "providers": [
+    "Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider"
+  ]
+}
@@ -1,177 +1,112 @@
-## Laravel 5 IDE Helper Generator
+## Laravel IDE Helper Generator
+[![Latest Stable Version](https://poser.pugx.org/barryvdh/laravel-ide-helper/version.png)](https://packagist.org/packages/barryvdh/laravel-ide-helper) [![Total Downloads](https://poser.pugx.org/barryvdh/laravel-ide-helper/d/total.png)](https://packagist.org/packages/barryvdh/laravel-ide-helper)

-[![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)__
+### For Laravel 5, check the [2.0 branch](https://github.com/barryvdh/laravel-ide-helper)

 ### Complete phpDocs, directly from the source

 _Checkout [this Laracasts video](https://laracasts.com/series/how-to-be-awesome-in-phpstorm/episodes/15) for a quick introduction/explanation!_

- * [`php artisan ide-helper:generate` - phpDoc generation for Laravel Facades ](#automatic-phpdoc-generation-for-laravel-facades)
- * [`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)
+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.
+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)

-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).
-
-* 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
+* Generated version: https://gist.github.com/barryvdh/5227822

 Note: You do need CodeIntel for Sublime Text: https://github.com/SublimeCodeIntel/SublimeCodeIntel

-### Install
+### New: PhpStorm Meta for Container instances

-Require this package with composer using the following command:
+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 ann `Illuminate\Events\Dispatcher` object, so with the meta file you can call `app('events')` and it will autocomplete the Dispatcher methods.

-```bash
-composer require barryvdh/laravel-ide-helper
-```
+    php artisan ide-helper:meta
+    
+    app('events')->fire();
+    \App::make('events')->..    

-After updating composer, add the service provider to the `providers` array in `config/app.php`
+Pre-generated example: https://gist.github.com/barryvdh/bb6ffc5d11e0a75dba67    

-```php
-Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
-```
+> Note: This is only available in the `@dev` stability, until a new release is tagged.
+> Note: You might need to restart PhpStorm and make sure `.phpstorm.meta.php` is indexed.

 ### Automatic phpDoc generation for Laravel Facades

+Require this package with composer using the following command:

-You can now re-generate the docs yourself (for future updates)
+    composer require barryvdh/laravel-ide-helper ~1.11

-```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 (and `php artisan optimize` after).
+    '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:

-```js
-"scripts":{
-    "post-update-cmd": [
-        "Illuminate\\Foundation\\ComposerScripts::postUpdate",
-        "php artisan ide-helper:generate",
-        "php artisan ide-helper:meta",
-        "php artisan optimize"
-    ]
-},
-```
+    "scripts":{
+        "post-update-cmd":[
+            "php artisan clear-compiled",
+            "php artisan ide-helper:generate",
+            "php artisan optimize"
+        ]
+    },

-You can also publish the config file to change implementations (ie. interface to specific class) or set defaults for `--helpers` or `--sublime`.
+You can also publish the config-file to change implementations (ie. interface to specific class) or set defaults for --helpers or --sublime.

-```bash
-php artisan vendor:publish --provider="Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider" --tag=config
-```
+    php artisan config:publish barryvdh/laravel-ide-helper

 The generator tries to identify the real class, but if it cannot be found, you can define it in the config file.

-Some classes need a working database connection. If you do not have a default working connection, some facades will not be included.
-You can use an in-memory SQLite driver, using the -M option.
+Some classes need a working database connection. If you do not have a working default connection, some facades will not be included.
+You can use a in-memory sqlite driver, using the -M option.

-You can choose to include helper files. This is not enabled by default, but you can override it with the `--helpers (-H)` option.
-The `Illuminate/Support/helpers.php` is already set-up, but you can add/remove your own files in the config file.
+You can choose to include helper files. This is not enabled by default, but you can override this with the --helpers (-H) option.
+The Illuminate/Support/helpers.php is already set-up, but you can add/remove your own files in the config file.

-### Automatic phpDocs for models
+### Automatic phpDocs for Models

-> You need to require `doctrine/dbal: ~2.3` in your own composer.json to get database columns.
+> **Note:** Since v1.10 you need to require `doctrine/dbal: ~2.3` in your own composer.json. 

-
-```bash
-composer require doctrine/dbal
-```
-
-If you don't want to write your properties yourself, you can use the command `php artisan ide-helper:models` to generate
-phpDocs, based on table columns, relations and getters/setters. You can write the comments directly to your Model file, using the `--write (-W)` option. By default, you are asked to overwrite or write to a separate file (`_ide_helper_models.php`). You can force No with `--nowrite (-N)`.
+If you don't want to write your properties yourself, you can use the command `ide-helper:models` to generate
+phpDocs, based on table columns, relations and getters/setters. You can write the comments directly to your Model file, using the `--write (-W)` option. By default, you are asked to overwrite or write to a separate file (\_ide\_helper\_models.php) (You can force No with `--nowrite (-N)`).
 Please make sure to backup your models, before writing the info.
 It should keep the existing comments and only append new properties/methods. The existing phpdoc is replaced, or added if not found.
-With the `--reset (-R)` option, the existing phpdocs are ignored, and only the newly found columns/relations are saved as phpdocs.
+With the `--reset (-R)` option, the existing phpdocs are ignored, only the newly found columns/relations are saved as phpdocs.

-```bash
-php artisan ide-helper:models Post
-```
+    php artisan ide-helper:models Post

-```php
-/**
- * An Eloquent Model: 'Post'
- *
- * @property integer $id
- * @property integer $author_id
- * @property string $title
- * @property string $text
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property-read \User $author
- * @property-read \Illuminate\Database\Eloquent\Collection|\Comment[] $comments
- */
-```
+    /**
+     * An Eloquent Model: 'Post'
+     *
+     * @property integer $id
+     * @property integer $author_id
+     * @property string $title
+     * @property string $text
+     * @property \Carbon\Carbon $created_at
+     * @property \Carbon\Carbon $updated_at
+     * @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).

-```bash
-php artisan ide-helper:models Post User
-```
+    php artisan ide-helper:models Post User

-You can also scan a different directory, using the `--dir` option (relative from the base path):
+You can also scan a different directory, using the --dir option (relative from the base path):

-```bash
-php artisan ide-helper:models --dir="path/to/models" --dir="app/src/Model"
-```
+    php artisan ide-helper:models --dir="app/workbench/name/package/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
-
-```bash
-php artisan ide-helper:models --ignore="Post,User"
-```
+    php artisan ide-helper:models --ignore="Post,User"

 Note: With namespaces, wrap your model name in " signs: `php artisan ide-helper:models "API\User"`, or escape the slashes (`Api\\User`)

-## PhpStorm Meta for Container instances
-
-It's possible to generate a PhpStorm meta file, to [add support for factory design pattern](https://confluence.jetbrains.com/display/PhpStorm/PhpStorm+Advanced+Metadata). For Laravel, this means we can make PhpStorm understand what kind of object we are resolving from the IoC Container. For example, `events` will return an `Illuminate\Events\Dispatcher` object, so with the meta file you can call `app('events')` and it will autocomplete the Dispatcher methods.
-
-``` bash
-php artisan ide-helper:meta
-```
-
-```php
-app('events')->fire();
-\App::make('events')->fire();
-
-/** @var \Illuminate\Foundation\Application $app */
-$app->make('events')->fire();
-
-// When the key is not found, it uses the argument as class name
-app('App\SomeClass');
-```
-
-Pre-generated example: https://gist.github.com/barryvdh/bb6ffc5d11e0a75dba67
-
-> Note: You might need to restart PhpStorm and make sure `.phpstorm.meta.php` is indexed.
-> Note: When you receive a FatalException about a class that is not found, check your config (for example, remove S3 as cloud driver when you don't have S3 configured. Remove Redis ServiceProvider when you don't use it).
-
 ### License

 The Laravel IDE Helper Generator is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
-
-
-[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
@@ -1,293 +1,284 @@
-<?php
-/**
- * Laravel IDE Helper Generator
- *
- * @author    Barry vd. Heuvel <[email protected]>
- * @copyright 2014 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;
-
-class Alias
-{
-    protected $alias;
-    protected $facade;
-    protected $extends = null;
-    protected $classType = 'class';
-    protected $short;
-    protected $namespace = '__root';
-    protected $root = null;
-    protected $classes = array();
-    protected $methods = array();
-    protected $usedMethods = array();
-    protected $valid = false;
-    protected $magicMethods = array();
-    protected $interfaces = array();
-
-    /**
-     * @param string $alias
-     * @param string $facade
-     * @param array $magicMethods
-     * @param array $interfaces
-     */
-    public function __construct($alias, $facade, $magicMethods = array(), $interfaces = array())
-    {
-        $this->alias = $alias;
-        $this->magicMethods = $magicMethods;
-        $this->interfaces = $interfaces;
-
-        // Make the class absolute
-        $facade = '\\' . ltrim($facade, '\\');
-        $this->facade = $facade;
-
-        $this->detectRoot();
-
-        if ((!$this->isTrait() && $this->root)) {
-            $this->valid = true;
-        } else {
-            return;
-        }
-
-        $this->addClass($this->root);
-        $this->detectNamespace();
-        $this->detectClassType();
-        
-        if ($facade === '\Illuminate\Database\Eloquent\Model') {
-            $this->usedMethods = array('decrement', 'increment');
-        }
-    }
-
-    /**
-     * Add one or more classes to analyze
-     *
-     * @param array|string $classes
-     */
-    public function addClass($classes)
-    {
-        $classes = (array)$classes;
-        foreach ($classes as $class) {
-            if (class_exists($class) || interface_exists($class)) {
-                $this->classes[] = $class;
-            } else {
-                echo "Class not exists: $class\r\n";
-            }
-        }
-    }
-
-    /**
-     * Check if this class is valid to process.
-     * @return bool
-     */
-    public function isValid()
-    {
-        return $this->valid;
-    }
-
-    /**
-     * Get the classtype, 'interface' or 'class'
-     *
-     * @return string
-     */
-    public function getClasstype()
-    {
-        return $this->classType;
-    }
-
-    /**
-     * Get the class which this alias extends
-     *
-     * @return null|string
-     */
-    public function getExtends()
-    {
-        return $this->extends;
-    }
-
-    /**
-     * Get the Alias by which this class is called
-     *
-     * @return string
-     */
-    public function getAlias()
-    {
-        return $this->alias;
-    }
-
-    /**
-     * Return the short name (without namespace)
-     */
-    public function getShortName()
-    {
-        return $this->short;
-    }
-    /**
-     * Get the namespace from the alias
-     *
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->namespace;
-    }
-
-    /**
-     * Get the methods found by this Alias
-     *
-     * @return array
-     */
-    public function getMethods()
-    {
-        $this->addMagicMethods();
-        $this->detectMethods();
-        return $this->methods;
-    }
-
-    /**
-     * Detect the namespace
-     */
-    protected function detectNamespace()
-    {
-        if (strpos($this->alias, '\\')) {
-            $nsParts = explode('\\', $this->alias);
-            $this->short = array_pop($nsParts);
-            $this->namespace = implode('\\', $nsParts);
-        } else {
-            $this->short = $this->alias;
-        }
-    }
-
-    /**
-     * Detect the class type
-     */
-    protected function detectClassType()
-    {
-        //Some classes extend the facade
-        if (interface_exists($this->facade)) {
-            $this->classType = 'interface';
-            $this->extends = $this->facade;
-        } else {
-            $this->classType = 'class';
-            if (class_exists($this->facade)) {
-                $this->extends = $this->facade;
-            }
-        }
-    }
-
-    /**
-     * Get the real root of a facade
-     *
-     * @return bool|string
-     */
-    protected function detectRoot()
-    {
-        $facade = $this->facade;
-
-        try {
-            //If possible, get the facade root
-            if (method_exists($facade, 'getFacadeRoot')) {
-                $root = get_class($facade::getFacadeRoot());
-            } else {
-                $root = $facade;
-            }
-
-            //If it doesn't exist, skip it
-            if (!class_exists($root) && !interface_exists($root)) {
-                return;
-            }
-
-            $this->root = $root;
-
-            //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."
-            );
-        } catch (\Exception $e) {
-            $this->error("Exception: " . $e->getMessage() . "\nSkipping $facade.");
-        }
-    }
-
-    /**
-     * Detect if this class is a trait or not.
-     *
-     * @return bool
-     */
-    protected function isTrait()
-    {
-        // Check if the facade is not a Trait
-        if (function_exists('trait_exists') && trait_exists($this->facade)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Add magic methods, as defined in the configuration files
-     */
-    protected function addMagicMethods()
-    {
-        foreach ($this->magicMethods as $magic => $real) {
-            list($className, $name) = explode('::', $real);
-            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 ($class !== $this->root) {
-                    $this->methods[] = new Method($method, $this->alias, $class, $magic, $this->interfaces);
-                }
-                $this->usedMethods[] = $magic;
-            }
-        }
-    }
-
-    /**
-     * Get the methods for one or multiple classes.
-     *
-     * @return string
-     */
-    protected function detectMethods()
-    {
-
-        foreach ($this->classes as $class) {
-            $reflection = new \ReflectionClass($class);
-
-            $methods = $reflection->getMethods(\ReflectionMethod::IS_PUBLIC);
-            if ($methods) {
-                foreach ($methods as $method) {
-                    if (!in_array($method->name, $this->usedMethods)) {
-                        // 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->usedMethods[] = $method->name;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Output an error.
-     *
-     * @param  string  $string
-     * @return void
-     */
-    protected function error($string)
-    {
-        echo $string . "\r\n";
-    }
-}
+<?php
+/**
+ * Laravel IDE Helper Generator
+ *
+ * @author    Barry vd. Heuvel <[email protected]>
+ * @copyright 2014 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;
+
+class Alias
+{
+    protected $alias;
+    protected $facade;
+    protected $extends = null;
+    protected $classType = 'class';
+    protected $short;
+    protected $namespace = '__root';
+    protected $root = null;
+    protected $classes = array();
+    protected $methods = array();
+    protected $usedMethods = array();
+    protected $valid = false;
+    protected $magicMethods = array();
+    protected $interfaces = array();
+
+    /**
+     * @param string $alias
+     * @param string $facade
+     * @param array $magicMethods
+     * @param array $interfaces
+     */
+    public function __construct($alias, $facade, $magicMethods = array(), $interfaces = array())
+    {
+        $this->alias = $alias;
+        $this->magicMethods = $magicMethods;
+        $this->interfaces = $interfaces;
+
+        // Make the class absolute
+        $facade = '\\' . ltrim($facade, '\\');
+        $this->facade = $facade;
+
+        $this->detectRoot();
+
+        if ((!$this->isTrait() && $this->root)) {
+            $this->valid = true;
+        } else {
+            return;
+        }
+
+        $this->addClass($this->root);
+        $this->detectNamespace();
+        $this->detectClassType();
+        
+        if($facade === '\Illuminate\Database\Eloquent\Model'){
+            $this->usedMethods = array('decrement', 'increment');
+        }
+    }
+
+    /**
+     * Add one or more classes to analyze
+     *
+     * @param array|string $classes
+     */
+    public function addClass($classes)
+    {
+        $classes = (array)$classes;
+        foreach ($classes as $class) {
+            if (class_exists($class) || interface_exists($class)) {
+                $this->classes[] = $class;
+            }else{
+                echo "Class not exists: $class\r\n";
+            }
+        }
+    }
+
+    /**
+     * Check if this class is valid to process.
+     * @return bool
+     */
+    public function isValid()
+    {
+        return $this->valid;
+    }
+
+    /**
+     * Get the classtype, 'interface' or 'class'
+     *
+     * @return string
+     */
+    public function getClasstype()
+    {
+        return $this->classType;
+    }
+
+    /**
+     * Get the class which this alias extends
+     *
+     * @return null|string
+     */
+    public function getExtends()
+    {
+        return $this->extends;
+    }
+
+    /**
+     * Get the Alias by which this class is called
+     *
+     * @return string
+     */
+    public function getAlias()
+    {
+        return $this->alias;
+    }
+
+    /**
+     * Return the short name (without namespace)
+     */
+    public function getShortName(){
+        return $this->short;
+    }
+    /**
+     * Get the namespace from the alias
+     *
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->namespace;
+    }
+
+    /**
+     * Get the methods found by this Alias
+     *
+     * @return array
+     */
+    public function getMethods()
+    {
+        $this->addMagicMethods();
+        $this->detectMethods();
+        return $this->methods;
+    }
+
+    /**
+     * Detect the namespace
+     */
+    protected function detectNamespace()
+    {
+        if (strpos($this->alias, '\\')) {
+            $nsParts = explode('\\', $this->alias);
+            $this->short = array_pop($nsParts);
+            $this->namespace = implode('\\', $nsParts);
+        }else{
+            $this->short = $this->alias;
+        }
+    }
+
+    /**
+     * Detect the class type
+     */
+    protected function detectClassType()
+    {
+        //Some classes extend the facade
+        if (interface_exists($this->facade)) {
+            $this->classType = 'interface';
+            $this->extends = $this->facade;
+        } else {
+            $this->classType = 'class';
+            if (class_exists($this->facade)) {
+                $this->extends = $this->facade;
+            }
+        }
+    }
+
+    /**
+     * Get the real root of a facade
+     *
+     * @return bool|string
+     */
+    protected function detectRoot()
+    {
+        $facade = $this->facade;
+
+        try {
+            //If possible, get the facade root
+            if (method_exists($facade, 'getFacadeRoot')) {
+                $root = get_class($facade::getFacadeRoot());
+            } else {
+                $root = $facade;
+            }
+
+            //If it doesn't exist, skip it
+            if (!class_exists($root) && !interface_exists($root)) {
+                return;
+            }
+
+            $this->root = $root;
+
+            //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."
+            );
+        } catch (\Exception $e) {
+            $this->error("Exception: " . $e->getMessage() . "\nSkipping $facade.");
+        }
+    }
+
+    /**
+     * Detect if this class is a trait or not.
+     *
+     * @return bool
+     */
+    protected function isTrait()
+    {
+        // Check if the facade is not a Trait
+        if (function_exists('trait_exists') && trait_exists($this->facade)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Add magic methods, as defined in the configuration files
+     */
+    protected function addMagicMethods()
+    {
+        foreach($this->magicMethods as $magic => $real){
+            list($className, $name) = explode('::', $real);
+            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($class !== $this->root){
+                    $this->methods[] = new Method($method, $this->alias, $class, $magic, $this->interfaces);
+                }
+                $this->usedMethods[] = $magic;
+            }
+        }
+    }
+
+    /**
+     * Get the methods for one or multiple classes.
+     *
+     * @return string
+     */
+    protected function detectMethods()
+    {
+
+        foreach ($this->classes as $class) {
+            $reflection = new \ReflectionClass($class);
+
+            $methods = $reflection->getMethods(\ReflectionMethod::IS_PUBLIC);
+            if ($methods) {
+                foreach ($methods as $method) {
+                    if (!in_array($method->name, $this->usedMethods)) {
+                        // 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->usedMethods[] = $method->name;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Output an error.
+     *
+     * @param  string  $string
+     * @return void
+     */
+    protected function error($string)
+    {
+        echo $string . "\r\n";
+    }
+}
@@ -17,6 +17,7 @@ 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
 *
@@ -58,9 +59,8 @@ class GeneratorCommand extends Command
     * @param \Illuminate\View\Factory $view
     */
    public function __construct(
-        /*ConfigRepository */ $config,
-        Filesystem $files,
-        /* Illuminate\View\Factory */
+        ConfigRepository $config,
+        Filesystem $files, /* Illuminate\View\Factory */
        $view
    ) {
        $this->config = $config;
@@ -76,11 +76,9 @@ class GeneratorCommand extends Command
     */
    public function fire()
    {
-        if (file_exists(base_path() . '/vendor/compiled.php') ||
-            file_exists(base_path() . '/bootstrap/cache/compiled.php') ||
-            file_exists(base_path() . '/storage/framework/compiled.php')) {
+        if (file_exists($compiled = base_path() . '/bootstrap/compiled.php')) {
            $this->error(
-                'Error generating IDE Helper: first delete your compiled file (php artisan clear-compiled)'
+                'Error generating IDE Helper: first delete bootstrap/compiled.php (php artisan clear-compiled)'
            );
        } else {
            $filename = $this->argument('filename');
@@ -99,8 +97,8 @@ class GeneratorCommand extends Command


            $helpers = '';
-            if ($this->option('helpers') || ($this->config->get('ide-helper.include_helpers'))) {
-                foreach ($this->config->get('ide-helper.helper_files', array()) as $helper) {
+            if ($this->option('helpers') || ($this->config->get('laravel-ide-helper::include_helpers'))) {
+                foreach ($this->config->get('laravel-ide-helper::helper_files', array()) as $helper) {
                    if (file_exists($helper)) {
                        $helpers .= str_replace(array('<?php', '?>'), '', $this->files->get($helper));
                    }
@@ -141,7 +139,7 @@ class GeneratorCommand extends Command
     */
    protected function getArguments()
    {
-        $filename = $this->config->get('ide-helper.filename');
+        $filename = $this->config->get('laravel-ide-helper::filename');

        return array(
            array(
@@ -157,7 +155,7 @@ class GeneratorCommand extends Command
     */
    protected function getOptions()
    {
-        $format = $this->config->get('ide-helper.format');
+        $format = $this->config->get('laravel-ide-helper::format');

        return array(
            array('format', "F", InputOption::VALUE_OPTIONAL, 'The format for the IDE Helper', $format),
@@ -166,4 +164,5 @@ class GeneratorCommand extends Command
            array('sublime', "S", InputOption::VALUE_NONE, 'DEPRECATED: Use different style for SublimeText CodeIntel'),
        );
    }
+
 }
@@ -12,15 +12,13 @@ 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
-{
+class MetaCommand extends Command {

    /**
     * The console command name.
@@ -37,26 +35,25 @@ class MetaCommand extends Command
     */
    protected $description = 'Generate metadata for PhpStorm';

-    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
+    /** @var \Illuminate\Filesystem\Filesystem */
    protected $files;

-    /** @var \Illuminate\Contracts\View\Factory */
+    /** @var \Illuminate\View\Factory */
    protected $view;
    
    protected $methods = [
-      'new \Illuminate\Contracts\Container\Container',
-      '\Illuminate\Contracts\Container\Container::make(\'\')',
-      '\App::make(\'\')',
-      'app(\'\')',
+      '\Illuminate\Foundation\Application::make',
+      '\Illuminate\Container\Container::make',
+      '\App::make',
+      'app',
    ];

    /**
     *
-     * @param \Illuminate\Contracts\Filesystem\Filesystem $files
-     * @param \Illuminate\Contracts\View\Factory $view
+     * @param \Illuminate\Filesystem\Filesystem $files
+     * @param \Illuminate\View\Factory $view
     */
-    public function __construct($files, $view)
-    {
+    public function __construct($files, $view) {
        $this->files = $files;
        $this->view = $view;
        parent::__construct();
@@ -69,33 +66,26 @@ class MetaCommand extends Command
     */
    public function fire()
    {
-        $this->registerClassAutoloadExceptions();
+        $filename = $this->option('filename');

        $bindings = array();
-        foreach ($this->getAbstracts() as $abstract) {
-            // Validator and seeder cause problems
-            if (in_array($abstract, ['validator', 'seeder'])) {
-                continue;
-            }
-            
+
+        foreach ($this->laravel->getBindings() as $abstract => $options) {
            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());
-                }
+            }catch (\Exception $e) {
+                $this->error("Cannot make $abstract: ".$e->getMessage());
            }
        }
-
-        $content = $this->view->make('ide-helper::meta', [
+        
+        $content = $this->view->make('laravel-ide-helper::meta', [
          'bindings' => $bindings,
          'methods' => $this->methods,
        ])->render();
-
-        $filename = $this->option('filename');
+        
        $written = $this->files->put($filename, $content);

        if ($written !== false) {
@@ -105,29 +95,6 @@ class MetaCommand extends Command
        }
    }

-    /**
-     * Get a list of abstracts from the Laravel Application.
-     *
-     * @return array
-     */
-    protected function getAbstracts()
-    {
-        $abstracts = $this->laravel->getBindings();
-        
-        // Return the abstract names only
-        return array_keys($abstracts);
-    }
-
-    /**
-     * Register an autoloader the throws exceptions when a class is not found.
-     */
-    protected function registerClassAutoloadExceptions()
-    {
-        spl_autoload_register(function ($class) {
-            throw new \Exception("Class '$class' not found.");
-        });
-    }
-
    /**
     * Get the console command options.
     *
@@ -11,17 +11,14 @@
 namespace Barryvdh\LaravelIdeHelper\Console;

 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Str;
-use Illuminate\Filesystem\Filesystem;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\ClassLoader\ClassMapGenerator;
-use Barryvdh\Reflection\DocBlock;
-use Barryvdh\Reflection\DocBlock\Context;
-use Barryvdh\Reflection\DocBlock\Tag;
-use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
+use phpDocumentor\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock\Context;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Serializer as DocBlockSerializer;

 /**
 * A command to generate autocomplete information for your IDE
@@ -30,10 +27,6 @@ use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 */
 class ModelsCommand extends Command
 {
-    /**
-     * @var Filesystem $files
-     */
-    protected $files;

    /**
     * The console command name.
@@ -56,14 +49,6 @@ class ModelsCommand extends Command
    protected $dirs = array();
    protected $reset;

-    /**
-     * @param Filesystem $files
-     */
-    public function __construct(Filesystem $files)
-    {
-        parent::__construct();
-        $this->files = $files;
-    }

    /**
     * Execute the console command.
@@ -75,7 +60,7 @@ class ModelsCommand extends Command
        $filename = $this->option('filename');
        $this->write = $this->option('write');
        $this->dirs = array_merge(
-            $this->laravel['config']->get('ide-helper.model_locations'),
+            $this->laravel['config']->get('laravel-ide-helper::model_locations'),
            $this->option('dir')
        );
        $model = $this->argument('model');
@@ -95,7 +80,7 @@ class ModelsCommand extends Command
        $content = $this->generateDocs($model, $ignore);

        if (!$this->write) {
-            $written = $this->files->put($filename, $content);
+            $written = \File::put($filename, $content);
            if ($written !== false) {
                $this->info("Model information was written to $filename");
            } else {
@@ -113,7 +98,7 @@ class ModelsCommand extends Command
    protected function getArguments()
    {
        return array(
-          array('model', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Which models to include', array()),
+            array('model', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Which models to include', array()),
        );
    }

@@ -125,12 +110,12 @@ class ModelsCommand extends Command
    protected function getOptions()
    {
        return array(
-          array('filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the helper file', $this->filename),
-          array('dir', 'D', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The model dir', array()),
-          array('write', 'W', InputOption::VALUE_NONE, '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('ignore', 'I', InputOption::VALUE_OPTIONAL, 'Which models to ignore', ''),
+            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('write', 'W', InputOption::VALUE_NONE, '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('ignore', 'I', InputOption::VALUE_OPTIONAL, 'Which models to ignore', ''),
        );
    }

@@ -163,9 +148,7 @@ class ModelsCommand extends Command

        foreach ($models as $name) {
            if (in_array($name, $ignore)) {
-                if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
-                    $this->comment("Ignoring model '$name'");
-                }
+                $this->comment("Ignoring model '$name'");
                continue;
            }
            $this->properties = array();
@@ -179,13 +162,10 @@ class ModelsCommand extends Command
                        continue;
                    }

-                    if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
-                        $this->comment("Loading model '$name'");
-                    }
+                    $this->comment("Loading model '$name'");

                    if (!$reflectionClass->IsInstantiable()) {
-                        // ignore abstract class or interface
-                        continue;
+                        throw new \Exception($name . ' is not instantiable.');
                    }

                    $model = $this->laravel->make($name);
@@ -196,17 +176,16 @@ class ModelsCommand extends Command

                    $this->getPropertiesFromMethods($model);
                    $output .= $this->createPhpDocs($name);
-                    $ignore[] = $name;
                } catch (\Exception $e) {
                    $this->error("Exception: " . $e->getMessage() . "\nCould not analyze class $name.");
                }
            }
+
        }

        if (!$hasDoctrine) {
            $this->error(
-                'Warning: `"doctrine/dbal": "~2.3"` is required to load database information. '.
-                'Please require that in your composer.json and run `composer update`.'
+                'Warning: `"doctrine/dbal": "~2.3"` is required to load database information. Please require that in your composer.json and run `composer update`.'
            );
        }

@@ -238,21 +217,9 @@ class ModelsCommand extends Command
    {
        $table = $model->getConnection()->getTablePrefix() . $model->getTable();
        $schema = $model->getConnection()->getDoctrineSchemaManager($table);
-        $databasePlatform = $schema->getDatabasePlatform();
-        $databasePlatform->registerDoctrineTypeMapping('enum', 'string');
+        $schema->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');

-        $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);
+        $columns = $schema->listTableColumns($table);

        if ($columns) {
            foreach ($columns as $column) {
@@ -309,9 +276,9 @@ class ModelsCommand extends Command
        if ($methods) {
            foreach ($methods as $method) {
                if (Str::startsWith($method, 'get') && Str::endsWith(
-                    $method,
-                    'Attribute'
-                ) && $method !== 'getAttribute'
+                        $method,
+                        'Attribute'
+                    ) && $method !== 'getAttribute'
                ) {
                    //Magic get<name>Attribute
                    $name = Str::snake(substr($method, 3, -9));
@@ -319,9 +286,9 @@ class ModelsCommand extends Command
                        $this->setProperty($name, null, true, null);
                    }
                } elseif (Str::startsWith($method, 'set') && Str::endsWith(
-                    $method,
-                    'Attribute'
-                ) && $method !== 'setAttribute'
+                        $method,
+                        'Attribute'
+                    ) && $method !== 'setAttribute'
                ) {
                    //Magic set<name>Attribute
                    $name = Str::snake(substr($method, 3, -9));
@@ -336,11 +303,10 @@ class ModelsCommand extends Command
                        $args = $this->getParameters($reflection);
                        //Remove the first ($query) argument
                        array_shift($args);
-                        $this->setMethod($name, '\Illuminate\Database\Query\Builder|\\' . $reflection->class, $args);
+                        $this->setMethod($name, '\\' . $reflection->class, $args);
                    }
-                } elseif (!method_exists('Illuminate\Database\Eloquent\Model', $method)
-                    && !Str::startsWith($method, 'get')
-                ) {
+                } elseif (!method_exists('Eloquent', $method) && !Str::startsWith($method, 'get')) {
+
                    //Use reflection to inspect the code, based on Illuminate/Support/SerializableClosure.php
                    $reflection = new \ReflectionMethod($model, $method);

@@ -352,53 +318,39 @@ class ModelsCommand extends Command
                        $code .= $file->current();
                        $file->next();
                    }
-                    $code = trim(preg_replace('/\s\s+/', '', $code));
                    $begin = strpos($code, 'function(');
                    $code = substr($code, $begin, strrpos($code, '}') - $begin + 1);

                    foreach (array(
-                               'hasMany',
-                               'hasManyThrough',
-                               'belongsToMany',
-                               'hasOne',
-                               'belongsTo',
-                               'morphOne',
-                               'morphTo',
-                               'morphMany',
-                               'morphToMany'
+                                 'hasMany',
+                                 'belongsToMany',
+                                 'hasOne',
+                                 'belongsTo',
+                                 'morphTo',
+                                 'morphMany',
+                                 'morphToMany'
                             ) as $relation) {
                        $search = '$this->' . $relation . '(';
                        if ($pos = stripos($code, $search)) {
-                            //Resolve the relation's model to a Relation object.
-                            $relationObj = $model->$method();
-
-                            if ($relationObj instanceof Relation) {
-                                $relatedModel = '\\' . get_class($relationObj->getRelated());
-
-                                $relations = ['hasManyThrough', 'belongsToMany', 'hasMany', 'morphMany', 'morphToMany'];
-                                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);
-                                }
+                            $code = substr($code, $pos + strlen($search));
+                            $arguments = explode(',', substr($code, 0, strpos($code, ');')));
+                            //Remove quotes, ensure 1 \ in front of the model
+                            $returnModel = $this->getClassName($arguments[0], $model);
+                            if ($relation === "belongsToMany" or $relation === 'hasMany' or $relation === 'morphMany' or $relation === 'morphToMany') {
+                                //Collection or array of models (because Collection is Arrayable)
+                                $this->setProperty(
+                                    $method,
+                                    '\Illuminate\Database\Eloquent\Collection|' . $returnModel . '[]',
+                                    true,
+                                    null
+                                );
+                            } else {
+                                //Single model is returned
+                                $this->setProperty($method, $returnModel, true, null);
                            }
                        }
                    }
+
                }
            }
        }
@@ -411,7 +363,7 @@ class ModelsCommand extends Command
     * @param bool|null $write
     * @param string|null $comment
     */
-    protected function setProperty($name, $type = null, $read = null, $write = null, $comment = '')
+    protected function setProperty($name, $type = null, $read = null, $write = null, $comment='')
    {
        if (!isset($this->properties[$name])) {
            $this->properties[$name] = array();
@@ -433,9 +385,7 @@ class ModelsCommand extends Command

    protected function setMethod($name, $type = '', $arguments = array())
    {
-        $methods = array_change_key_case($this->methods, CASE_LOWER);
-
-        if (!isset($methods[strtolower($name)])) {
+        if (!isset($this->methods[$name])) {
            $this->methods[$name] = array();
            $this->methods[$name]['type'] = $type;
            $this->methods[$name]['arguments'] = $arguments;
@@ -487,8 +437,7 @@ class ModelsCommand extends Command
            } else {
                $attr = 'property-read';
            }
-            $tagLine = trim("@{$attr} {$property['type']} {$name} {$property['comment']}");
-            $tag = Tag::createInstance($tagLine, $phpdoc);
+            $tag = Tag::createInstance("@{$attr} {$property['type']} {$name} {$property['comment']}", $phpdoc);
            $phpdoc->appendTag($tag);
        }

@@ -501,10 +450,6 @@ class ModelsCommand extends Command
            $phpdoc->appendTag($tag);
        }

-        if ($this->write && ! $phpdoc->getTagsByName('mixin')) {
-            $phpdoc->appendTag(Tag::createInstance("@mixin \\Eloquent", $phpdoc));
-        }
-
        $serializer = new DocBlockSerializer();
        $serializer->getDocComment($phpdoc);
        $docComment = $serializer->getDocComment($phpdoc);
@@ -512,7 +457,7 @@ class ModelsCommand extends Command

        if ($this->write) {
            $filename = $reflection->getFileName();
-            $contents = $this->files->get($filename);
+            $contents = \File::get($filename);
            if ($originalDoc) {
                $contents = str_replace($originalDoc, $docComment, $contents);
            } else {
@@ -523,12 +468,12 @@ class ModelsCommand extends Command
                    $contents = substr_replace($contents, $replace, $pos, strlen($needle));
                }
            }
-            if ($this->files->put($filename, $contents)) {
+            if (\File::put($filename, $contents)) {
                $this->info('Written new phpDocBlock to ' . $filename);
            }
        }

-        $output = "namespace {$namespace}{\n{$docComment}\n\tclass {$classname} extends \Eloquent {}\n}\n\n";
+        $output = "namespace {$namespace}{\n{$docComment}\n\tclass {$classname} {}\n}\n\n";
        return $output;
    }

@@ -543,11 +488,10 @@ class ModelsCommand extends Command
        //Loop through the default values for paremeters, and make the correct output string
        $params = array();
        $paramsWithDefault = array();
-        /** @var \ReflectionParameter $param */
        foreach ($method->getParameters() as $param) {
            $paramStr = '$' . $param->getName();
            $params[] = $paramStr;
-            if ($param->isOptional() && $param->isDefaultValueAvailable()) {
+            if ($param->isOptional()) {
                $default = $param->getDefaultValue();
                if (is_bool($default)) {
                    $default = $default ? 'true' : 'false';
@@ -568,22 +512,23 @@ class ModelsCommand extends Command
    }

    /**
-     * Determine a model classes' collection type.
-     *
-     * @see http://laravel.com/docs/eloquent-collections#custom-collections
     * @param string $className
+     * @param \Illuminate\Database\Eloquent\Model $model
     * @return string
     */
-    private function getCollectionClass($className)
+    private function getClassName($className, $model)
    {
-        // Return something in the very very unlikely scenario the model doesn't
-        // have a newCollection() method.
-        if (!method_exists($className, 'newCollection')) {
-            return '\Illuminate\Database\Eloquent\Collection';
+        // If the class name was resolved via get_class($this) or static::class
+        if (strpos($className, 'get_class($this)') !== false || strpos($className, 'static::class') !== false) {
+            return get_class($model);
        }

-        /** @var \Illuminate\Database\Eloquent\Model $model */
-        $model = new $className;
-        return '\\' . get_class($model->newCollection());
+        // If the class name was resolved via ::class (PHP 5.5+)
+        if (strpos($className, '::class') !== false) {
+            $end = -1 * strlen('::class');
+            return substr($className, 0, $end);
+        }
+
+        return "\\" . ltrim(trim($className, " \"'"), "\\") ;
    }
 }
@@ -1,302 +1,235 @@
-<?php
-/**
- * Laravel IDE Helper Generator
- *
- * @author    Barry vd. Heuvel <[email protected]>
- * @copyright 2014 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;
-
-use Illuminate\Foundation\Application;
-use Illuminate\Foundation\AliasLoader;
-use Illuminate\Config\Repository as ConfigRepository;
-use ReflectionClass;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class Generator
-{
-    /** @var \Illuminate\Config\Repository */
-    protected $config;
-
-    /** @var \Illuminate\View\Factory */
-    protected $view;
-
-    /** @var \Symfony\Component\Console\Output\OutputInterface */
-    protected $output;
-
-    protected $extra = array();
-    protected $magic = array();
-    protected $interfaces = array();
-    protected $helpers;
-
-    /**
-     * @param \Illuminate\Config\Repository $config
-     * @param \Illuminate\View\Factory $view
-     * @param \Symfony\Component\Console\Output\OutputInterface $output
-     * @param string $helpers
-     */
-    public function __construct(
-        /*ConfigRepository */ $config,
-        /* Illuminate\View\Factory */ $view,
-        OutputInterface $output = null,
-        $helpers = ''
-    ) {
-        $this->config = $config;
-        $this->view = $view;
-
-        // Find the drivers to add to the extra/interfaces
-        $this->detectDrivers();
-
-        $this->extra = array_merge($this->extra, $this->config->get('ide-helper.extra'));
-        $this->magic = array_merge($this->magic, $this->config->get('ide-helper.magic'));
-        $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;
-    }
-
-    /**
-     * Generate the helper file contents;
-     *
-     * @param  string  $format  The format to generate the helper in (php/json)
-     * @return string;
-     */
-    public function generate($format = 'php')
-    {
-        // Check if the generator for this format exists
-        $method = 'generate'.ucfirst($format).'Helper';
-        if (method_exists($this, $method)) {
-            return $this->$method();
-        }
-
-        return $this->generatePhpHelper();
-    }
-
-    public function generatePhpHelper()
-    {
-        $app = app();
-        return $this->view->make('ide-helper::helper')
-            ->with('namespaces', $this->getNamespaces())
-            ->with('helpers', $this->helpers)
-            ->with('version', $app->version())
-            ->render();
-    }
-
-    public function generateJsonHelper()
-    {
-        $classes = array();
-        foreach ($this->getNamespaces() as $aliases) {
-            foreach ($aliases as $alias) {
-                $functions = array();
-                foreach ($alias->getMethods() as $method) {
-                    $functions[$method->getName()] = '('. $method->getParamsWithDefault().')';
-                }
-                $classes[$alias->getAlias()] = array(
-                    'functions' => $functions,
-                );
-            }
-        }
-
-        $flags = JSON_FORCE_OBJECT;
-        if (defined('JSON_PRETTY_PRINT')) {
-            $flags |= JSON_PRETTY_PRINT;
-        }
-
-        return json_encode(array(
-            'php' => array(
-                'classes' => $classes,
-            ),
-        ), $flags);
-    }
-
-    protected function detectDrivers()
-    {
-        $defaultUserModel = config('auth.providers.users.model', config('auth.model', 'App\User'));
-        $this->interfaces['\Illuminate\Contracts\Auth\Authenticatable'] = $defaultUserModel;
-        
-        try {
+<?php
+/**
+ * Laravel IDE Helper Generator
+ *
+ * @author    Barry vd. Heuvel <[email protected]>
+ * @copyright 2014 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;
+
+use Illuminate\Foundation\AliasLoader;
+use Illuminate\Config\Repository as ConfigRepository;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Generator
+{
+    /** @var \Illuminate\Config\Repository */
+    protected $config;
+
+    /** @var \Illuminate\View\Factory */
+    protected $view;
+
+    /** @var \Symfony\Component\Console\Output\OutputInterface */
+    protected $output;
+
+    protected $extra = array();
+    protected $magic = array();
+    protected $interfaces = array();
+    protected $helpers;
+
+    /**
+     * @param \Illuminate\Config\Repository $config
+     * @param \Illuminate\View\Factory $view
+     * @param \Symfony\Component\Console\Output\OutputInterface $output
+     * @param string $helpers
+     */
+    public function __construct(ConfigRepository $config,
+        /* Illuminate\View\Factory */ $view,
+        OutputInterface $output = null,
+        $helpers = ''
+    ) {
+        $this->config = $config;
+        $this->view = $view;
+
+        // 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->magic = array_merge($this->magic, $this->config->get('laravel-ide-helper::magic'));
+        $this->interfaces = array_merge($this->interfaces, $this->config->get('laravel-ide-helper::interfaces'));
+        // Make all interface classes absolute
+        foreach ($this->interfaces as &$interface) {
+            $interface = '\\' . ltrim($interface, '\\');
+        }
+        $this->helpers = $helpers;
+    }
+
+    /**
+     * Generate the helper file contents;
+     *
+     * @param  string  $format  The format to generate the helper in (php/json)
+     * @return string;
+     */
+    public function generate($format = 'php')
+    {
+        // Check if the generator for this format exists
+        $method = 'generate'.ucfirst($format).'Helper';
+        if (method_exists($this, $method)) {
+            return $this->$method();
+        }
+
+        return $this->generatePhpHelper();
+    }
+
+    public function generatePhpHelper()
+    {
+        $app = app();
+        return $this->view->make('laravel-ide-helper::ide-helper')
+            ->with('namespaces', $this->getNamespaces())
+            ->with('helpers', $this->helpers)
+            ->with('version', $app::VERSION)
+            ->render();
+    }
+
+    public function generateJsonHelper()
+    {
+        $classes = array();
+        foreach ($this->getNamespaces() as $aliases) {
+            foreach($aliases as $alias) {
+                $functions = array();
+                foreach ($alias->getMethods() as $method) {
+                    $functions[$method->getName()] = '('. $method->getParamsWithDefault().')';
+                }
+                $classes[$alias->getAlias()] = array(
+                    'functions' => $functions,
+                );
+            }
+        }
+
+        $flags = JSON_FORCE_OBJECT;
+        if (defined('JSON_PRETTY_PRINT')) {
+            $flags |= JSON_PRETTY_PRINT;
+        }
+
+        return json_encode(array(
+            'php' => array(
+                'classes' => $classes,
+            ),
+        ), $flags);
+    }
+
+    protected function detectDrivers()
+    {
+        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) {
-        }
-
-        try {
-            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) {
-        }
-
-        try {
-            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) {
-        }
-
-        try {
-            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) {
-        }
-
-        try {
-            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) {
-        }
-
-        try {
-            if (class_exists('Storage') && is_a('Storage', '\Illuminate\Support\Facades\Storage', true)) {
-                $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
-     *
-     * @return array
-     */
-    protected function getNamespaces()
-    {
-        $namespaces = array();
-
-        // Get all aliases
-        foreach ($this->getAliases() as $name => $facade) {
-            // Skip the Redis facade, if not available (otherwise Fatal PHP Error)
-            if ($facade == 'Illuminate\Support\Facades\Redis' && !class_exists('Predis\Client')) {
-                continue;
-            }
-            
-            $magicMethods = array_key_exists($name, $this->magic) ? $this->magic[$name] : array();
-            $alias = new Alias($name, $facade, $magicMethods, $this->interfaces);
-            if ($alias->isValid()) {
-                //Add extra methods, from other classes (magic static calls)
-                if (array_key_exists($name, $this->extra)) {
-                    $alias->addClass($this->extra[$name]);
-                }
-
-                $namespace = $alias->getNamespace();
-                if (!isset($namespaces[$namespace])) {
-                    $namespaces[$namespace] = array();
-                }
-                $namespaces[$namespace][] = $alias;
-            }
-        }
-
-        return $namespaces;
-    }
-
-    protected function getAliases()
-    {
-        // For Laravel, use the AliasLoader
-        if (class_exists('Illuminate\Foundation\AliasLoader')) {
-            return AliasLoader::getInstance()->getAliases();
-        }
-
-        $facades = [
-          'App' => 'Illuminate\Support\Facades\App',
-          'Auth' => 'Illuminate\Support\Facades\Auth',
-          'Bus' => 'Illuminate\Support\Facades\Bus',
-          'DB' => 'Illuminate\Support\Facades\DB',
-          'Cache' => 'Illuminate\Support\Facades\Cache',
-          'Cookie' => 'Illuminate\Support\Facades\Cookie',
-          'Crypt' => 'Illuminate\Support\Facades\Crypt',
-          'Event' => 'Illuminate\Support\Facades\Event',
-          'Hash' => 'Illuminate\Support\Facades\Hash',
-          'Log' => 'Illuminate\Support\Facades\Log',
-          'Mail' => 'Illuminate\Support\Facades\Mail',
-          'Queue' => 'Illuminate\Support\Facades\Queue',
-          'Request' => 'Illuminate\Support\Facades\Request',
-          'Schema' => 'Illuminate\Support\Facades\Schema',
-          'Session' => 'Illuminate\Support\Facades\Session',
-          'Storage' => 'Illuminate\Support\Facades\Storage',
-          //'Validator' => 'Illuminate\Support\Facades\Validator',
-        ];
-        
-        $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);
-        });
-    }
-
-    /**
-     * Get the driver/connection/store from the managers
-     *
-     * @param $alias
-     * @return array|bool|string
-     */
-    public function getDriver($alias)
-    {
-        try {
-            if ($alias == "Auth") {
-                $driver = \Auth::driver();
-            } elseif ($alias == "DB") {
-                $driver = \DB::connection();
-            } elseif ($alias == "Cache") {
-                $driver = get_class(\Cache::driver());
-                $store = get_class(\Cache::getStore());
-                return array($driver, $store);
-            } elseif ($alias == "Queue") {
-                $driver = \Queue::connection();
-            } else {
-                return false;
-            }
-
-            return get_class($driver);
-        } catch (\Exception $e) {
-            $this->error("Could not determine driver/connection for $alias.");
-            return false;
-        }
-    }
-
-    /**
-     * Write a string as error output.
-     *
-     * @param  string  $string
-     * @return void
-     */
-    protected function error($string)
-    {
-        if ($this->output) {
-            $this->output->writeln("<error>$string</error>");
-        } else {
-            echo $string . "\r\n";
-        }
-    }
-}
+                $class = get_class(\Auth::driver());
+                $this->extra['Auth'] = array($class);
+                $this->interfaces['\Illuminate\Auth\UserProviderInterface'] = $class;
+            }
+        }catch (\Exception $e) {}
+
+        try{
+            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) {}
+
+        try{
+            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) {}
+
+        try{
+            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) {}
+
+        try{
+            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) {}
+
+    }
+
+    /**
+     * Find all namespaces/aliases that are valid for us to render
+     *
+     * @return array
+     */
+    protected function getNamespaces()
+    {
+        $namespaces = array();
+
+        // Get all aliases
+        foreach (AliasLoader::getInstance()->getAliases() as $name => $facade) {
+            $magicMethods = array_key_exists($name, $this->magic) ? $this->magic[$name] : array();
+            $alias = new Alias($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();
+                if (!isset($namespaces[$namespace])) {
+                    $namespaces[$namespace] = array();
+                }
+                $namespaces[$namespace][] = $alias;
+            }
+
+        }
+
+        return $namespaces;
+    }
+
+    /**
+     * Get the driver/connection/store from the managers
+     *
+     * @param $alias
+     * @return array|bool|string
+     */
+    public function getDriver($alias)
+    {
+        try {
+            if ($alias == "Auth") {
+                $driver = \Auth::driver();
+            } elseif ($alias == "DB") {
+                $driver = \DB::connection();
+            } elseif ($alias == "Cache") {
+                $driver = get_class(\Cache::driver());
+                $store = get_class(\Cache::getStore());
+                return array($driver, $store);
+            } elseif ($alias == "Queue") {
+                $driver = \Queue::connection();
+            } else {
+                return false;
+            }
+
+            return get_class($driver);
+        } catch (\Exception $e) {
+            $this->error("Could not determine driver/connection for $alias.");
+            return false;
+        }
+    }
+
+    /**
+     * Write a string as error output.
+     *
+     * @param  string  $string
+     * @return void
+     */
+    protected function error($string)
+    {
+        if($this->output){
+            $this->output->writeln("<error>$string</error>");
+        }else{
+            echo $string . "\r\n";
+        }
+    }
+}
@@ -32,16 +32,7 @@ class IdeHelperServiceProvider extends ServiceProvider
     */
    public function boot()
    {
-        $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');
+        $this->package('barryvdh/laravel-ide-helper', 'laravel-ide-helper', __DIR__);
    }

    /**
@@ -51,9 +42,6 @@ class IdeHelperServiceProvider extends ServiceProvider
     */
    public function register()
    {
-        $configPath = __DIR__ . '/../config/ide-helper.php';
-        $this->mergeConfigFrom($configPath, 'ide-helper');
-        
        $this->app['command.ide-helper.generate'] = $this->app->share(
            function ($app) {
                return new GeneratorCommand($app['config'], $app['files'], $app['view']);
@@ -61,15 +49,15 @@ class IdeHelperServiceProvider extends ServiceProvider
        );

        $this->app['command.ide-helper.models'] = $this->app->share(
-            function ($app) {
-                return new ModelsCommand($app['files']);
+            function () {
+                return new ModelsCommand();
            }
        );
        
        $this->app['command.ide-helper.meta'] = $this->app->share(
-            function ($app) {
-                return new MetaCommand($app['files'], $app['view']);
-            }
+          function ($app) {
+              return new MetaCommand($app['files'], $app['view']);
+          }
        );

        $this->commands('command.ide-helper.generate', 'command.ide-helper.models', 'command.ide-helper.meta');
@@ -84,4 +72,37 @@ class IdeHelperServiceProvider extends ServiceProvider
    {
        return array('command.ide-helper.generate', 'command.ide-helper.models');
    }
+    
+    /**
+     * Register the package's component namespaces.
+     *
+     * @param  string  $package
+     * @param  string  $namespace
+     * @param  string  $path
+     * @return void
+     */
+    public function package($package, $namespace = null, $path = null)
+    {
+
+        // Is it possible to register the config?
+        if (method_exists($this->app['config'], 'package')) {
+            $this->app['config']->package($package, $path.'/config', $namespace);
+        } else {
+            // Load the config for now..
+            $config = $this->app['files']->getRequire($path .'/config/config.php');
+            foreach($config as $key => $value){
+                $this->app['config']->set($namespace.'::'.$key, $value);
+            }
+        }
+
+        // Register view files
+        $appView = $this->app['path']."/views/packages/{$package}";
+        if ($this->app['files']->isDirectory($appView))
+        {
+            $this->app['view']->addNamespace($namespace, $appView);
+        }
+
+        $this->app['view']->addNamespace($namespace, $path.'/views');
+    }
+
 }
@@ -1,314 +1,311 @@
-<?php
-/**
- * Laravel IDE Helper Generator
- *
- * @author    Barry vd. Heuvel <[email protected]>
- * @copyright 2014 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;
-
-use Barryvdh\Reflection\DocBlock;
-use Barryvdh\Reflection\DocBlock\Context;
-use Barryvdh\Reflection\DocBlock\Tag;
-use Barryvdh\Reflection\DocBlock\Tag\ReturnTag;
-use Barryvdh\Reflection\DocBlock\Tag\ParamTag;
-use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
-
-class Method
-{
-    /** @var \Barryvdh\Reflection\DocBlock  */
-    protected $phpdoc;
-
-    /** @var \ReflectionMethod  */
-    protected $method;
-
-    protected $output = '';
-    protected $name;
-    protected $namespace;
-    protected $params = array();
-    protected $params_with_default = array();
-    protected $interfaces = array();
-    protected $return = null;
-
-    /**
-     * @param \ReflectionMethod $method
-     * @param string $alias
-     * @param \ReflectionClass $class
-     * @param string|null $methodName
-     * @param array $interfaces
-     */
-    public function __construct(\ReflectionMethod $method, $alias, $class, $methodName = null, $interfaces = array())
-    {
-        $this->method = $method;
-        $this->interfaces = $interfaces;
-        $this->name = $methodName ?: $method->name;
-        $this->namespace = $method->getDeclaringClass()->getNamespaceName();
-
-        //Create a DocBlock and serializer instance
-        $this->phpdoc = new DocBlock($method, new Context($this->namespace));
-
-        //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) {
-        }
-
-        //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
-        $declaringClass = $method->getDeclaringClass();
-        $this->declaringClassName = '\\' . ltrim($declaringClass->name, '\\');
-        $this->root = '\\' . ltrim($class->getName(), '\\');
-    }
-
-    /**
-     * Get the class wherein the function resides
-     *
-     * @return string
-     */
-    public function getDeclaringClass()
-    {
-        return $this->declaringClassName;
-    }
-
-    /**
-     * Return the class from which this function would be called
-     *
-     * @return string
-     */
-    public function getRoot()
-    {
-        return $this->root;
-    }
-
-    /**
-     * Get the docblock for this method
-     *
-     * @param string $prefix
-     * @return mixed
-     */
-    public function getDocComment($prefix = "\t\t")
-    {
-        $serializer = new DocBlockSerializer(1, $prefix);
-        return $serializer->getDocComment($this->phpdoc);
-    }
-
-    /**
-     * Get the method name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Get the parameters for this method
-     *
-     * @param bool $implode Wether to implode the array or not
-     * @return string
-     */
-    public function getParams($implode = true)
-    {
-        return $implode ? implode(', ', $this->params) : $this->params;
-    }
-
-    /**
-     * Get the parameters for this method including default values
-     *
-     * @param bool $implode Wether to implode the array or not
-     * @return string
-     */
-    public function getParamsWithDefault($implode = true)
-    {
-        return $implode ? implode(', ', $this->params_with_default) : $this->params_with_default;
-    }
-
-    /**
-     * Get the description and get the inherited docs.
-     *
-     * @param DocBlock $phpdoc
-     */
-    protected function normalizeDescription(DocBlock $phpdoc)
-    {
-        //Get the short + long description from the DocBlock
-        $description = $phpdoc->getText();
-
-        //Loop through parents/interfaces, to fill in {@inheritdoc}
-        if (strpos($description, '{@inheritdoc}') !== false) {
-            $inheritdoc = $this->getInheritDoc($this->method);
-            $inheritDescription = $inheritdoc->getText();
-
-            $description = str_replace('{@inheritdoc}', $inheritDescription, $description);
-            $phpdoc->setText($description);
-
-            $this->normalizeParams($inheritdoc);
-            $this->normalizeReturn($inheritdoc);
-
-            //Add the tags that are inherited
-            $inheritTags = $inheritdoc->getTags();
-            if ($inheritTags) {
-                /** @var Tag $tag */
-                foreach ($inheritTags as $tag) {
-                    $tag->setDocBlock();
-                    $phpdoc->appendTag($tag);
-                }
-            }
-        }
-    }
-
-    /**
-     * Normalize the parameters
-     *
-     * @param DocBlock $phpdoc
-     */
-    protected function normalizeParams(DocBlock $phpdoc)
-    {
-        //Get the return type and adjust them for beter autocomplete
-        $paramTags = $phpdoc->getTagsByName('param');
-        if ($paramTags) {
-            /** @var ParamTag $tag */
-            foreach ($paramTags as $tag) {
-                // Convert the keywords
-                $content = $this->convertKeywords($tag->getContent());
-                $tag->setContent($content);
-
-                // Get the expanded type and re-set the content
-                $content = $tag->getType() . ' ' . $tag->getVariableName() . ' ' . $tag->getDescription();
-                $tag->setContent(trim($content));
-            }
-        }
-    }
-
-    /**
-     * Normalize the return tag (make full namespace, replace interfaces)
-     *
-     * @param DocBlock $phpdoc
-     */
-    protected function normalizeReturn(DocBlock $phpdoc)
-    {
-        //Get the return type and adjust them for beter autocomplete
-        $returnTags = $phpdoc->getTagsByName('return');
-        if ($returnTags) {
-            /** @var ReturnTag $tag */
-            $tag = reset($returnTags);
-            // Get the expanded type
-            $returnValue = $tag->getType();
-
-            // Replace the interfaces
-            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 {
-            $this->return = null;
-        }
-    }
-
-    /**
-     * Convert keywwords that are incorrect.
-     *
-     * @param  string $string
-     * @return string
-     */
-    protected function convertKeywords($string)
-    {
-        $string = str_replace('\Closure', 'Closure', $string);
-        $string = str_replace('Closure', '\Closure', $string);
-        $string = str_replace('dynamic', 'mixed', $string);
-
-        return $string;
-    }
-
-    /**
-     * Should the function return a value?
-     *
-     * @return bool
-     */
-    public function shouldReturn()
-    {
-        if ($this->return !== "void" && $this->method->name !== "__construct") {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the parameters and format them correctly
-     *
-     * @param  \ReflectionMethod $method
-     * @return array
-     */
-    public function getParameters($method)
-    {
-        //Loop through the default values for paremeters, and make the correct output string
-        $params = array();
-        $paramsWithDefault = array();
-        foreach ($method->getParameters() as $param) {
-            $paramStr = '$' . $param->getName();
-            $params[] = $paramStr;
-            if ($param->isOptional()) {
-                $default = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null;
-                if (is_bool($default)) {
-                    $default = $default ? 'true' : 'false';
-                } elseif (is_array($default)) {
-                    $default = 'array()';
-                } elseif (is_null($default)) {
-                    $default = 'null';
-                } elseif (is_int($default)) {
-                    //$default = $default;
-                } elseif (is_resource($default)) {
-                    //skip to not fail
-                } else {
-                    $default = "'" . trim($default) . "'";
-                }
-                $paramStr .= " = $default";
-            }
-            $paramsWithDefault[] = $paramStr;
-        }
-
-        $this->params = $params;
-        $this->params_with_default = $paramsWithDefault;
-    }
-
-    /**
-     * @param \ReflectionMethod $reflectionMethod
-     * @return DocBlock
-     */
-    protected function getInheritDoc($reflectionMethod)
-    {
-        $parentClass = $reflectionMethod->getDeclaringClass()->getParentClass();
-
-        //Get either a parent or the interface
-        if ($parentClass) {
-            $method = $parentClass->getMethod($reflectionMethod->getName());
-        } else {
-            $method = $reflectionMethod->getPrototype();
-        }
-        if ($method) {
-            $namespace = $method->getDeclaringClass()->getNamespaceName();
-            $phpdoc = new DocBlock($method, new Context($namespace));
-            
-            if (strpos($phpdoc->getText(), '{@inheritdoc}') !== false) {
-                //Not at the end yet, try another parent/interface..
-                return $this->getInheritDoc($method);
-            } else {
-                return $phpdoc;
-            }
-        }
-    }
-}
+<?php
+/**
+ * Laravel IDE Helper Generator
+ *
+ * @author    Barry vd. Heuvel <[email protected]>
+ * @copyright 2014 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;
+
+use phpDocumentor\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock\Context;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag\ReturnTag;
+use phpDocumentor\Reflection\DocBlock\Tag\ParamTag;
+use phpDocumentor\Reflection\DocBlock\Serializer as DocBlockSerializer;
+
+class Method
+{
+    /** @var \phpDocumentor\Reflection\DocBlock  */
+    protected $phpdoc;
+
+    /** @var \ReflectionMethod  */
+    protected $method;
+
+    protected $output = '';
+    protected $name;
+    protected $namespace;
+    protected $params = array();
+    protected $params_with_default = array();
+    protected $interfaces = array();
+    protected $return = null;
+
+    /**
+     * @param \ReflectionMethod $method
+     * @param string $alias
+     * @param string $class
+     * @param string|null $methodName
+     * @param array $interfaces
+     */
+    public function __construct(\ReflectionMethod $method, $alias, $class, $methodName = null, $interfaces = array())
+    {
+        $this->method = $method;
+        $this->interfaces = $interfaces;
+        $this->name = $methodName ?: $method->name;
+        $this->namespace = $method->getDeclaringClass()->getNamespaceName();
+
+        //Create a DocBlock and serializer instance
+        $this->phpdoc = new DocBlock($method, new Context($this->namespace));
+
+        //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) {}
+
+        //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
+        $declaringClass = $method->getDeclaringClass();
+        $this->declaringClassName = '\\' . ltrim($declaringClass->name, '\\');
+        $this->root = '\\' . ltrim($class->getName(), '\\');
+    }
+
+    /**
+     * Get the class wherein the function resides
+     *
+     * @return string
+     */
+    public function getDeclaringClass()
+    {
+        return $this->declaringClassName;
+    }
+
+    /**
+     * Return the class from which this function would be called
+     *
+     * @return string
+     */
+    public function getRoot()
+    {
+        return $this->root;
+    }
+
+    /**
+     * Get the docblock for this method
+     *
+     * @param string $prefix
+     * @return mixed
+     */
+    public function getDocComment($prefix = "\t\t")
+    {
+        $serializer = new DocBlockSerializer(1, $prefix);
+        return $serializer->getDocComment($this->phpdoc);
+    }
+
+    /**
+     * Get the method name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the parameters for this method
+     *
+     * @param bool $implode Wether to implode the array or not
+     * @return string
+     */
+    public function getParams($implode = true)
+    {
+        return $implode ? implode(', ', $this->params) : $this->params;
+    }
+
+    /**
+     * Get the parameters for this method including default values
+     *
+     * @param bool $implode Wether to implode the array or not
+     * @return string
+     */
+    public function getParamsWithDefault($implode = true)
+    {
+        return $implode ? implode(', ', $this->params_with_default) : $this->params_with_default;
+    }
+
+    /**
+     * Get the description and get the inherited docs.
+     *
+     * @param DocBlock $phpdoc
+     */
+    protected function normalizeDescription(DocBlock $phpdoc)
+    {
+        //Get the short + long description from the DocBlock
+        $description = $phpdoc->getText();
+
+        //Loop through parents/interfaces, to fill in {@inheritdoc}
+        if (strpos($description, '{@inheritdoc}') !== false) {
+            $inheritdoc = $this->getInheritDoc($this->method);
+            $inheritDescription = $inheritdoc->getText();
+
+            $description = str_replace('{@inheritdoc}', $inheritDescription, $description);
+            $phpdoc->setText($description);
+
+            $this->normalizeParams($inheritdoc);
+            $this->normalizeReturn($inheritdoc);
+
+            //Add the tags that are inherited
+            $inheritTags = $inheritdoc->getTags();
+            if ($inheritTags) {
+                /** @var Tag $tag */
+                foreach ($inheritTags as $tag) {
+                    $tag->setDocBlock();
+                    $phpdoc->appendTag($tag);
+                }
+            }
+        }
+    }
+
+    /**
+     * Normalize the parameters
+     *
+     * @param DocBlock $phpdoc
+     */
+    protected function normalizeParams(DocBlock $phpdoc)
+    {
+        //Get the return type and adjust them for beter autocomplete
+        $paramTags = $phpdoc->getTagsByName('param');
+        if ($paramTags) {
+            /** @var ParamTag $tag */
+            foreach($paramTags as $tag){
+                // Convert the keywords
+                $content = $this->convertKeywords($tag->getContent());
+                $tag->setContent($content);
+
+                // Get the expanded type and re-set the content
+                $content = $tag->getType() . ' ' . $tag->getVariableName() . ' ' . $tag->getDescription();
+                $tag->setContent(trim($content));
+            }
+        }
+    }
+
+    /**
+     * Normalize the return tag (make full namespace, replace interfaces)
+     *
+     * @param DocBlock $phpdoc
+     */
+    protected function normalizeReturn(DocBlock $phpdoc)
+    {
+        //Get the return type and adjust them for beter autocomplete
+        $returnTags = $phpdoc->getTagsByName('return');
+        if ($returnTags) {
+            /** @var ReturnTag $tag */
+            $tag = reset($returnTags);
+            // Get the expanded type
+            $returnValue = $tag->getType();
+
+            // Replace the interfaces
+            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{
+            $this->return = null;
+        }
+    }
+
+    /**
+     * Convert keywwords that are incorrect.
+     *
+     * @param  string $string
+     * @return string
+     */
+    protected function convertKeywords($string)
+    {
+        $string = str_replace('\Closure', 'Closure', $string);
+        $string = str_replace('Closure', '\Closure', $string);
+        $string = str_replace('dynamic', 'mixed', $string);
+
+        return $string;
+    }
+
+    /**
+     * Should the function return a value?
+     *
+     * @return bool
+     */
+    public function shouldReturn()
+    {
+        if($this->return !== "void" && $this->method->name !== "__construct"){
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the parameters and format them correctly
+     *
+     * @param $method
+     * @return array
+     */
+    public function getParameters($method)
+    {
+        //Loop through the default values for paremeters, and make the correct output string
+        $params = array();
+        $paramsWithDefault = array();
+        foreach ($method->getParameters() as $param) {
+            $paramStr = '$' . $param->getName();
+            $params[] = $paramStr;
+            if ($param->isOptional()) {
+                $default = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null;
+                if (is_bool($default)) {
+                    $default = $default ? 'true' : 'false';
+                } elseif (is_array($default)) {
+                    $default = 'array()';
+                } elseif (is_null($default)) {
+                    $default = 'null';
+                } elseif (is_int($default)) {
+                    //$default = $default;
+                } else {
+                    $default = "'" . trim($default) . "'";
+                }
+                $paramStr .= " = $default";
+            }
+            $paramsWithDefault[] = $paramStr;
+        }
+
+        $this->params = $params;
+        $this->params_with_default = $paramsWithDefault;
+    }
+
+    /**
+     * @param \ReflectionMethod $reflectionMethod
+     * @return DocBlock
+     */
+    protected function getInheritDoc($reflectionMethod)
+    {
+        $parentClass = $reflectionMethod->getDeclaringClass()->getParentClass();
+
+        //Get either a parent or the interface
+        if ($parentClass) {
+            $method = $parentClass->getMethod($reflectionMethod->getName());
+        } else {
+            $method = $reflectionMethod->getPrototype();
+        }
+        if ($method) {
+            $namespace = $method->getDeclaringClass()->getNamespaceName();
+            $phpdoc = new DocBlock($method, new Context($namespace));
+            
+            if (strpos($phpdoc->getText(), '{@inheritdoc}') !== false) {
+                //Not at the end yet, try another parent/interface..
+                return $this->getInheritDoc($method);
+            } else {
+                return $phpdoc;
+            }
+        }
+    }
+}
@@ -1,5 +1,7 @@
 <?php 

+use Illuminate\Support\Facades\Config;
+
 return array(

    /*
@@ -41,7 +43,7 @@ return array(
    */

    'model_locations' => array(
-        'app',
+        'app/models',
    ),


@@ -55,6 +57,7 @@ return array(
    */

    'extra' => array(
+        'Artisan' => array('Illuminate\Foundation\Artisan'),
        'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'),
        'Session' => array('Illuminate\Session\Store'),
    ),
@@ -83,37 +86,7 @@ return array(
    */
    
    'interfaces' => array(
-
-    ),
-
-    /*
-    |--------------------------------------------------------------------------
-    | 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(
-
-    ),
+        '\Illuminate\Auth\UserInterface' => Config::get('auth.model', 'User'),
+    )

 );
@@ -1,39 +1,39 @@
-<?= '<?php' ?>
-
-/**
- * A helper file for Laravel 5, to provide autocomplete information to your IDE
- * Generated for Laravel <?= $version ?> on <?= date("Y-m-d") ?>.
- *
- * @author Barry vd. Heuvel <barryvdh@gmail.com>
- * @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; ?>
+<?= '<?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 <barryvdh@gmail.com>
+ * @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; ?>
@@ -1,6 +1,4 @@
-<?= '<?php' ?>
-
-namespace PHPSTORM_META {
+<?= '<?php' ?> namespace PHPSTORM_META {

   /**
    * PhpStorm Meta file, to provide autocomplete information for PhpStorm
@@ -8,11 +6,12 @@ namespace PHPSTORM_META {
    *
    * @author Barry vd. Heuvel <barryvdh@gmail.com>
    * @see https://github.com/barryvdh/laravel-ide-helper
+    * @noinspection PhpUnusedLocalVariableInspection
+    * @noinspection PhpIllegalArrayKeyTypeInspection
    */
    $STATIC_METHOD_TYPES = [
 <?php foreach($methods as $method): ?>
-        <?= $method ?> => [
-            '' == '@',
+        <?= $method ?>('') => [
 <?php foreach($bindings as $abstract => $class): ?>
            '<?= $abstract ?>' instanceof \<?= $class ?>,
 <?php endforeach ?>        ],
@@ -1,58 +0,0 @@
-<?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;
-    }
-}
Author	SHA1	Message	Date
Barry vd. Heuvel	6eb797f5ff	Remove contracts from L4 version	2015-03-16 14:28:03 +01:00
Barry vd. Heuvel	604d327277	More meta methods	2015-03-16 14:25:52 +01:00
Barry vd. Heuvel	6ed5367f6b	Tweak meta methods	2015-03-16 14:16:41 +01:00
Barry vd. Heuvel	8c339bd6b0	Add actual command	2015-03-16 13:12:40 +01:00
Barry vd. Heuvel	52b9b52926	Add gist	2015-03-16 13:06:29 +01:00
Barry vd. Heuvel	f909c82fcc	Fix class imports	2015-03-16 12:52:26 +01:00
Barry vd. Heuvel	e88c3669b7	Add note about meta file	2015-03-16 12:40:53 +01:00
Barry vd. Heuvel	5bd7eeda23	Add meta command for phpstorm	2015-03-16 12:13:15 +01:00
Barry vd. Heuvel	dae0b55bef	Update version Fixes #164	2015-02-07 23:18:57 +01:00
Barry vd. Heuvel	3f9831c5cf	Check for correct facades	2015-02-04 09:14:36 +01:00
Barry vd. Heuvel	2cc277440a	Remove tree	2015-02-03 21:03:00 +01:00
Barry vd. Heuvel	14eab5ef84	Point to 2.0 branch	2015-01-28 09:36:05 +01:00