Bump version

Trim tag text.…

composer.json

@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "2.1-dev"
         }
     }
 }

readme.md

@@ -10,7 +10,9 @@ _Checkout [this Laracasts video](https://laracasts.com/series/how-to-be-awesome-
 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: https://gist.github.com/barryvdh/5227822
+* Generated version for L5: https://gist.github.com/barryvdh/5227822
+* Generated version for Lumen: https://gist.github.com/barryvdh/be17164b0ad51f832f20
+* Generated Phpstorm Meta file: https://gist.github.com/barryvdh/bb6ffc5d11e0a75dba67
 
 Note: You do need CodeIntel for Sublime Text: https://github.com/SublimeCodeIntel/SublimeCodeIntel
 
@@ -26,6 +28,9 @@ It's possible to generate a PhpStorm meta file, to [add support for factory desi
     /** @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.
@@ -39,7 +44,7 @@ Require this package with composer using the following command:
 
 After updating composer, add the service provider to the `providers` array in `config/app.php`
 
-    'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
+    Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
 
 You can now re-generate the docs yourself (for future updates)
 
@@ -59,7 +64,7 @@ You can configure your composer.json to do this after each commit:
 
 You can also publish the config file to change implementations (ie. interface to specific class) or set defaults for `--helpers` or `--sublime`.
 
-    php artisan vendor:publish --provider=barryvdh/laravel-ide-helper --tag=config
+    php artisan vendor:publish --provider="Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider" --tag=config
 
 The generator tries to identify the real class, but if it cannot be found, you can define it in the config file.
 

resources/views/meta.php

@@ -1,4 +1,6 @@
-<?= '<?php' ?> namespace PHPSTORM_META {
+<?= '<?php' ?>
+
+namespace PHPSTORM_META {
 
    /**
     * PhpStorm Meta file, to provide autocomplete information for PhpStorm
@@ -7,13 +9,10 @@
     * @author Barry vd. Heuvel <[email protected]>
     * @see https://github.com/barryvdh/laravel-ide-helper
     */
-
-    /** @noinspection PhpIllegalArrayKeyTypeInspection */
-    /** @noinspection PhpUnusedLocalVariableInspection */
-    /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
     $STATIC_METHOD_TYPES = [
 <?php foreach($methods as $method): ?>
-        <?= $method ?>('') => [
+        <?= $method ?> => [
+            '' == '@',
 <?php foreach($bindings as $abstract => $class): ?>
             '<?= $abstract ?>' instanceof \<?= $class ?>,
 <?php endforeach ?>        ],

src/Console/GeneratorCommand.php

@@ -76,9 +76,11 @@ class GeneratorCommand extends Command
      */
     public function fire()
     {
-        if (file_exists($compiled = base_path() . '/bootstrap/compiled.php')) {
+        if (file_exists(base_path() . '/vendor/compiled.php') ||
+            file_exists(base_path() . '/bootstrap/cache/compiled.php') ||
+            file_exists(base_path() . '/storage/framework/compiled.php')) {
             $this->error(
-                'Error generating IDE Helper: first delete bootstrap/compiled.php (php artisan clear-compiled)'
+                'Error generating IDE Helper: first delete your compiled file (php artisan clear-compiled)'
             );
         } else {
             $filename = $this->argument('filename');

src/Console/MetaCommand.php

@@ -12,6 +12,7 @@ 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
@@ -42,12 +43,10 @@ class MetaCommand extends Command {
     protected $view;
     
     protected $methods = [
-      '\Illuminate\Foundation\Application::make',
+      'new \Illuminate\Contracts\Container\Container',
-      '\Illuminate\Contracts\Foundation\Application::make',
+      '\Illuminate\Contracts\Container\Container::make(\'\')',
-      '\Illuminate\Contracts\Container\Container::make',
+      '\App::make(\'\')',
-      '\Illuminate\Container\Container::make',
+      'app(\'\')',
-      '\App::make',
-      'app',
     ];
 
     /**
@@ -72,15 +71,22 @@ class MetaCommand extends Command {
 
         $bindings = array();
         foreach ($this->getAbstracts() as $abstract) {
+            // Validator causes problems in Lumen
+            if ($abstract == 'validator') {
+                continue;
+            }
+            
             try {
                 $concrete = $this->laravel->make($abstract);
                 if (is_object($concrete)) {
                     $bindings[$abstract] = get_class($concrete);
                 }
             }catch (\Exception $e) {
+                if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
                     $this->comment("Cannot make '$abstract': ".$e->getMessage());
                 }
             }
+        }
 
         $content = $this->view->make('ide-helper::meta', [
           'bindings' => $bindings,

src/Console/ModelsCommand.php

@@ -12,8 +12,10 @@ namespace Barryvdh\LaravelIdeHelper\Console;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
+use Illuminate\Filesystem\Filesystem;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\ClassLoader\ClassMapGenerator;
 use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Context;
@@ -27,6 +29,10 @@ use phpDocumentor\Reflection\DocBlock\Serializer as DocBlockSerializer;
  */
 class ModelsCommand extends Command
 {
+    /**
+     * @var Filesystem $files
+     */
+    protected $files;
 
     /**
      * The console command name.
@@ -49,6 +55,14 @@ 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.
@@ -80,7 +94,7 @@ class ModelsCommand extends Command
         $content = $this->generateDocs($model, $ignore);
 
         if (!$this->write) {
-            $written = \File::put($filename, $content);
+            $written = $this->files->put($filename, $content);
             if ($written !== false) {
                 $this->info("Model information was written to $filename");
             } else {
@@ -148,7 +162,9 @@ 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'");
+                }
                 continue;
             }
             $this->properties = array();
@@ -162,7 +178,9 @@ class ModelsCommand extends Command
                         continue;
                     }
 
+                    if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
                         $this->comment("Loading model '$name'");
+                    }
 
                     if (!$reflectionClass->IsInstantiable()) {
                         throw new \Exception($name . ' is not instantiable.');
@@ -176,6 +194,7 @@ 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.");
                 }
@@ -330,6 +349,7 @@ 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);
 
@@ -345,7 +365,12 @@ class ModelsCommand extends Command
                         $search = '$this->' . $relation . '(';
                         if ($pos = stripos($code, $search)) {
                             $code = substr($code, $pos + strlen($search));
-                            $arguments = explode(',', substr($code, 0, strpos($code, ')')));
+                            $end = strpos($code, ')->') ?:strpos($code, ');');
+                            if (false !== $end) {
+                                $arguments = substr($code, 0, $end);
+                                $arguments = array_map(function($item) {
+                                    return trim($item, ' \'\"');
+                                }, explode(',', $arguments));
                                 //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') {
@@ -362,7 +387,7 @@ class ModelsCommand extends Command
                                 }
                             }
                         }
-
+                    }
                 }
             }
         }
@@ -449,7 +474,8 @@ class ModelsCommand extends Command
             } else {
                 $attr = 'property-read';
             }
-            $tag = Tag::createInstance("@{$attr} {$property['type']} {$name} {$property['comment']}", $phpdoc);
+            $tagLine = trim("@{$attr} {$property['type']} {$name} {$property['comment']}");
+            $tag = Tag::createInstance($tagLine, $phpdoc);
             $phpdoc->appendTag($tag);
         }
 
@@ -469,7 +495,7 @@ class ModelsCommand extends Command
 
         if ($this->write) {
             $filename = $reflection->getFileName();
-            $contents = \File::get($filename);
+            $contents = $this->files->get($filename);
             if ($originalDoc) {
                 $contents = str_replace($originalDoc, $docComment, $contents);
             } else {
@@ -480,7 +506,7 @@ class ModelsCommand extends Command
                     $contents = substr_replace($contents, $replace, $pos, strlen($needle));
                 }
             }
-            if (\File::put($filename, $contents)) {
+            if ($this->files->put($filename, $contents)) {
                 $this->info('Written new phpDocBlock to ' . $filename);
             }
         }
@@ -532,7 +558,7 @@ class ModelsCommand extends Command
     {
         // 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);
+            return "\\" . get_class($model);
         }
 
         // If the class name was resolved via ::class (PHP 5.5+)

src/Generator.php

@@ -80,7 +80,7 @@ class Generator
         return $this->view->make('ide-helper::helper')
             ->with('namespaces', $this->getNamespaces())
             ->with('helpers', $this->helpers)
-            ->with('version', $app::VERSION)
+            ->with('version', $app->version())
             ->render();
     }
 
@@ -166,8 +166,7 @@ class Generator
         $namespaces = array();
 
         // Get all aliases
-        foreach (AliasLoader::getInstance()->getAliases() as $name => $facade) {
+        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;
@@ -194,6 +193,39 @@ class Generator
         return $namespaces;
     }
 
+    protected function getAliases()
+    {
+        // For Laravel, use the AliasLoader
+        if (class_exists('Illuminate\Foundation\AliasLoader')) {
+            return AliasLoader::getInstance()->getAliases();
+        }
+
+        $facades = [
+            'Illuminate\Support\Facades\App' => 'App',
+            'Illuminate\Support\Facades\Auth' => 'Auth',
+            'Illuminate\Support\Facades\Bus' => 'Bus',
+            'Illuminate\Support\Facades\DB' => 'DB',
+            'Illuminate\Support\Facades\Cache' => 'Cache',
+            'Illuminate\Support\Facades\Cookie' => 'Cookie',
+            'Illuminate\Support\Facades\Crypt' => 'Crypt',
+            'Illuminate\Support\Facades\Event' => 'Event',
+            'Illuminate\Support\Facades\Hash' => 'Hash',
+            'Illuminate\Support\Facades\Log' => 'Log',
+            'Illuminate\Support\Facades\Mail' => 'Mail',
+            'Illuminate\Support\Facades\Queue' => 'Queue',
+            'Illuminate\Support\Facades\Request' => 'Request',
+            'Illuminate\Support\Facades\Schema' => 'Schema',
+            'Illuminate\Support\Facades\Session' => 'Session',
+            'Illuminate\Support\Facades\Storage' => 'Storage',
+          //  'Illuminate\Support\Facades\Validator' => 'Validator',
+        ];
+
+        // Only return the ones that actually exist
+        return array_filter($facades, function($alias){
+            return class_exists($alias);
+        });
+    }
+
     /**
      * Get the driver/connection/store from the managers
      *

src/IdeHelperServiceProvider.php

@@ -36,7 +36,12 @@ class IdeHelperServiceProvider extends ServiceProvider
         $this->loadViewsFrom($viewPath, 'ide-helper');
         
         $configPath = __DIR__ . '/../config/ide-helper.php';
-        $this->publishes([$configPath => config_path('ide-helper.php')], 'config');
+        if (function_exists('config_path')) {
+            $publishPath = config_path('ide-helper.php');
+        } else {
+            $publishPath = base_path('config/ide-helper.php');
+        }
+        $this->publishes([$configPath => $publishPath], 'config');
     }
 
     /**
@@ -56,8 +61,8 @@ class IdeHelperServiceProvider extends ServiceProvider
         );
 
         $this->app['command.ide-helper.models'] = $this->app->share(
-            function () {
+            function ($app) {
-                return new ModelsCommand();
+                return new ModelsCommand($app['files']);
             }
         );