5.3 array syntax

Fixes #183

composer.json

@@ -11,9 +11,9 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "4.x|5.0.x",
-        "illuminate/console": "4.x|5.0.x",
-        "illuminate/filesystem": "4.x|5.0.x",
+        "illuminate/support": "4.x",
+        "illuminate/console": "4.x",
+        "illuminate/filesystem": "4.x",
         "phpdocumentor/reflection-docblock": "2.0.x",
         "symfony/class-loader": "~2.3"
     },

readme.md

@@ -1,6 +1,8 @@
 ## Laravel IDE Helper Generator
 [![Latest Stable Version](https://poser.pugx.org/barryvdh/laravel-ide-helper/version.png)](https://packagist.org/packages/barryvdh/laravel-ide-helper) [![Total Downloads](https://poser.pugx.org/barryvdh/laravel-ide-helper/d/total.png)](https://packagist.org/packages/barryvdh/laravel-ide-helper)
 
+### For Laravel 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!_
@@ -12,11 +14,27 @@ If you don't want to generate it, you can add a pre-generated file to the root f
 
 Note: You do need CodeIntel for Sublime Text: https://github.com/SublimeCodeIntel/SublimeCodeIntel
 
+### New: 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 ann `Illuminate\Events\Dispatcher` object, so with the meta file you can call `app('events')` and it will autocomplete the Dispatcher methods.
+
+    php artisan ide-helper:meta
+    
+    app('events')->fire();
+    \App::make('events')->fire();
+    
+    /** @var \Illuminate\Foundation\Application $app */
+    $app->make('events')->fire();
+
+Pre-generated example: https://gist.github.com/barryvdh/bb6ffc5d11e0a75dba67    
+
+> 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:
 
-    composer require barryvdh/laravel-ide-helper
+    composer require barryvdh/laravel-ide-helper ~1.11
 
 After updating composer, add the ServiceProvider to the providers array in app/config/app.php
 
@@ -50,7 +68,6 @@ 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 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
 
 > **Note:** Since v1.10 you need to require `doctrine/dbal: ~2.3` in your own composer.json. 

src/Console/MetaCommand.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * Laravel IDE Helper Generator
+ *
+ * @author    Barry vd. Heuvel <[email protected]>
+ * @copyright 2015 Barry vd. Heuvel / Fruitcake Studio (http://www.fruitcakestudio.nl)
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT
+ * @link      https://github.com/barryvdh/laravel-ide-helper
+ */
+
+namespace Barryvdh\LaravelIdeHelper\Console;
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * A command to generate phpstorm meta data
+ *
+ * @author Barry vd. Heuvel <[email protected]>
+ */
+class MetaCommand extends Command {
+
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'ide-helper:meta';
+    protected $filename = '.phpstorm.meta.php';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Generate metadata for PhpStorm';
+
+    /** @var \Illuminate\Filesystem\Filesystem */
+    protected $files;
+
+    /** @var \Illuminate\View\Factory */
+    protected $view;
+    
+    protected $methods = array(
+      '\Illuminate\Foundation\Application::make',
+      '\Illuminate\Container\Container::make',
+      '\App::make',
+      'app',
+    );
+
+    /**
+     *
+     * @param \Illuminate\Filesystem\Filesystem $files
+     * @param \Illuminate\View\Factory $view
+     */
+    public function __construct($files, $view) {
+        $this->files = $files;
+        $this->view = $view;
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        $filename = $this->option('filename');
+
+        $bindings = array();
+
+        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) {
+                $this->error("Cannot make $abstract: ".$e->getMessage());
+            }
+        }
+        
+        $content = $this->view->make('laravel-ide-helper::meta', array(
+          'bindings' => $bindings,
+          'methods' => $this->methods,
+        ))->render();
+        
+        $written = $this->files->put($filename, $content);
+
+        if ($written !== false) {
+            $this->info("A new meta file was written to $filename");
+        } else {
+            $this->error("The meta file could not be created at $filename");
+        }
+    }
+
+    /**
+     * Get the console command options.
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return array(
+            array('filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the meta file', $this->filename),
+        );
+    }
+}

src/Generator.php

@@ -113,8 +113,8 @@ class Generator
 
     protected function detectDrivers()
     {
-        try{
-            if (class_exists('Auth')) {
+        try{
+            if (class_exists('Auth') && is_a('Auth', '\Illuminate\Support\Facades\Auth', true)) {
                 $class = get_class(\Auth::driver());
                 $this->extra['Auth'] = array($class);
                 $this->interfaces['\Illuminate\Auth\UserProviderInterface'] = $class;
@@ -122,7 +122,7 @@ class Generator
         }catch (\Exception $e) {}
 
         try{
-            if (class_exists('DB')) {
+            if (class_exists('DB') && is_a('DB', '\Illuminate\Support\Facades\DB', true)) {
                 $class = get_class(\DB::connection());
                 $this->extra['DB'] = array($class);
                 $this->interfaces['\Illuminate\Database\ConnectionInterface'] = $class;
@@ -130,7 +130,7 @@ class Generator
         }catch (\Exception $e) {}
 
         try{
-            if (class_exists('Cache')) {
+            if (class_exists('Cache') && is_a('Cache', '\Illuminate\Support\Facades\Cache', true)) {
                 $driver = get_class(\Cache::driver());
                 $store = get_class(\Cache::getStore());
                 $this->extra['Cache'] = array($driver, $store);
@@ -139,7 +139,7 @@ class Generator
         }catch (\Exception $e) {}
 
         try{
-            if (class_exists('Queue')) {
+            if (class_exists('Queue') && is_a('Queue', '\Illuminate\Support\Facades\Queue', true)) {
                 $class = get_class(\Queue::connection());
                 $this->extra['Queue'] = array($class);
                 $this->interfaces['\Illuminate\Queue\QueueInterface'] = $class;
@@ -147,7 +147,7 @@ class Generator
         }catch (\Exception $e) {}
 
         try{
-            if (class_exists('SSH')){
+            if (class_exists('SSH') && is_a('SSH', '\Illuminate\Support\Facades\SSH', true)){
                 $class = get_class(\SSH::connection());
                 $this->extra['SSH'] = array($class);
                 $this->interfaces['\Illuminate\Remote\ConnectionInterface'] = $class;

src/IdeHelperServiceProvider.php

@@ -11,8 +11,9 @@
 namespace Barryvdh\LaravelIdeHelper;
 
 use Illuminate\Support\ServiceProvider;
-use Barryvdh\LaravelIdeHelper\Console\GeneratorCommand;
+use Barryvdh\LaravelIdeHelper\Console\MetaCommand;
 use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
+use Barryvdh\LaravelIdeHelper\Console\GeneratorCommand;
 
 class IdeHelperServiceProvider extends ServiceProvider
 {
@@ -52,8 +53,14 @@ class IdeHelperServiceProvider extends ServiceProvider
                 return new ModelsCommand();
             }
         );
+        
+        $this->app['command.ide-helper.meta'] = $this->app->share(
+          function ($app) {
+              return new MetaCommand($app['files'], $app['view']);
+          }
+        );
 
-        $this->commands('command.ide-helper.generate', 'command.ide-helper.models');
+        $this->commands('command.ide-helper.generate', 'command.ide-helper.models', 'command.ide-helper.meta');
     }
 
     /**

src/views/meta.php

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