Merge pull request #45 from bryceray1121/master

Removing \r from generator in order to prevent ^M from being inserted in...

composer.json

@@ -15,7 +15,8 @@
         "illuminate/console": "4.x",
         "illuminate/filesystem": "4.x",
         "phpdocumentor/reflection-docblock": "2.0.0",
-        "symfony/class-loader": "~2.3"
+        "symfony/class-loader": "~2.3",
+        "doctrine/dbal": "~2.3"
     },
     "autoload": {
         "psr-0": {

readme.md

@@ -52,9 +52,9 @@ The Illuminate/Support/helpers.php is already set-up, but you can add/remove you
 
 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. Still in beta, so please provide feedback if you want.
-Docs are written to a phpfile (_ide_helper_models.php) in the root of the project, so you can move the docs to the real model.
+You can now also write the comments directly to your Model file, using the `--write (-W)` option. By default, you are asked to overwrite or
-
+write to a seperate file (_ide_helper_models.php) (You can force No with `--nowrite (-N)`).
-You can now also write the comments directly to your Model file, using the `--write (-W)` option. Please make sure to backup your models, before writing the info.
+Please make sure to backup your models, before writing the info.
 It should keep the existing comments and only append new properties/methods. The existing phpdoc is replaced, or added if not found.
 With the `--reset (-R)` option, the existing phpdocs are ignored, only the newly found columns/relations are saved as phpdocs.
 
@@ -81,6 +81,10 @@ You can also scan a different directory, using the --dir option (relative from t
 
     php artisan ide-helper:models --dir="app/workbench/name/package/models"
 
+Models can be ignored using the --ignore (-I) option
+
+    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`)
 
 ### License

src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php

@@ -147,7 +147,9 @@ exit('Only to be used as an helper for your IDE');\n\n";
             try{
 
                 //Some classes extend the facade
-                if(class_exists($facade)){
+                if(interface_exists($facade)){
+                    $output .= "interface $alias extends $facade{\n";
+                }elseif(class_exists($facade)){
                     $output .= "class $alias extends $facade{\n";
                 }else{
                     $output .= "class $alias{\n";
@@ -324,6 +326,8 @@ exit('Only to be used as an helper for your IDE');\n\n";
     /**
      * @param \ReflectionMethod $method
      * @param string $alias
+     * @param $class
+     * @param null $methodName
      * @return string
      */
     protected function parseMethod($method, $alias, $class, $methodName = null){
@@ -357,7 +361,7 @@ exit('Only to be used as an helper for your IDE');\n\n";
         $output .= $serializer->getDocComment($phpdoc) ."\n\t public static function ".$methodName."(";
 
         $output .= implode($paramsWithDefault, ", ");
-        $output .= "){\r\n";
+        $output .= "){\n";
 
         //Only return when not a constructor and not void.
         $return = ($returnValue && $returnValue !== "void" && $method->name !== "__construct") ? 'return' : '';
@@ -367,13 +371,13 @@ exit('Only to be used as an helper for your IDE');\n\n";
         $root = $class->getName();
 
         if($declaringClass->name != $root){
-            $output .= "\t\t//Method inherited from $declaringClass->name\r\n";
+            $output .= "\t\t//Method inherited from $declaringClass->name\n";
         }
 
         $output .=  "\t\t$return $root::";
 
         //Write the default parameters in the function call
-        $output .=  $method->name."(".implode($params, ", ").");\r\n";
+        $output .=  $method->name."(".implode($params, ", ").");\n";
         $output .= "\t }\n\n";
 
         return $output;

src/Barryvdh/LaravelIdeHelper/ModelsCommand.php

@@ -13,10 +13,10 @@ use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\ClassLoader\ClassMapGenerator;
-use Barryvdh\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock;
-use Barryvdh\Reflection\DocBlock\Context;
+use phpDocumentor\Reflection\DocBlock\Context;
-use Barryvdh\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag;
-use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
+use phpDocumentor\Reflection\DocBlock\Serializer as DocBlockSerializer;
 /**
  * A command to generate autocomplete information for your IDE
  *
@@ -30,6 +30,7 @@ class ModelsCommand extends Command {
      * @var string
      */
     protected $name = 'ide-helper:models';
+    protected $filename = '_ide_helper_models.php';
 
     /**
      * The console command description.
@@ -57,9 +58,17 @@ class ModelsCommand extends Command {
         $this->write = $this->option('write');
         $this->dir = $this->option('dir');
         $model = $this->argument('model');
+        $ignore = $this->option('ignore');
         $this->reset = $this->option('reset');
 
-        $content = $this->generateDocs($model);
+        //If filename is default and Write is not specified, ask what to do
+        if(!$this->write && $filename === $this->filename && !$this->option('nowrite')){
+            if($this->confirm("Do you want to overwrite the existing model files for '$model'? Choose no to write to $filename instead? (Yes/No): ")){
+                $this->write = true;
+            }
+        }
+
+        $content = $this->generateDocs($model, $ignore);
 
         if(!$this->write){
             $written = \File::put($filename, $content);
@@ -69,7 +78,6 @@ class ModelsCommand extends Command {
                 $this->error("Failed to write model information to $filename");
             }
         }
-
     }
 
 
@@ -82,7 +90,6 @@ class ModelsCommand extends Command {
     {
         return array(
             array('model', InputArgument::OPTIONAL, 'Which models to include', '*'),
-
         );
     }
 
@@ -94,14 +101,16 @@ class ModelsCommand extends Command {
     protected function getOptions()
     {
         return array(
-            array('filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the helper file', '_ide_helper_models.php'),
+            array('filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the helper file', $this->filename),
             array('dir', 'D', InputOption::VALUE_OPTIONAL, 'The model dir','app/models'),
             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', ''),
         );
     }
 
-    protected function generateDocs($model){
+    protected function generateDocs($model, $ignore = ''){
 
 
         $output = "<?php
@@ -120,7 +129,15 @@ class ModelsCommand extends Command {
             $models = explode(',', $model);
         }
 
+        $ignore = explode(',', $ignore);
+
         foreach($models as $name){
+            if(in_array($name, $ignore)){
+                $this->comment("Ignoring model '$name'");
+                continue;
+            }else{
+                $this->comment("Loading model '$name'");
+            }
             $this->properties = array();
             $this->methods = array();
             if(class_exists($name)){
@@ -225,9 +242,13 @@ class ModelsCommand extends Command {
                    }
                }elseif(\Str::startsWith($method, 'scope') && $method !== 'scopeQuery'){
                    //Magic set<name>Attribute
-                   $name =  \Str::snake(substr($method, 5));
+                   $name =  \Str::camel(substr($method, 5));
                    if(!empty($name)){
-                       $this->setMethod($name, 'static');
+                       $reflection = new \ReflectionMethod($model, $method);
+                       $args = $this->getParameters($reflection);
+                       //Remove the first ($query) argument
+                       array_shift($args);
+                       $this->setMethod($name, $reflection->class, $args);
                    }
                }elseif(!method_exists('Eloquent', $method) && !\Str::startsWith($method, 'get')){
 
@@ -293,13 +314,11 @@ class ModelsCommand extends Command {
         }
     }
 
-    protected function setMethod($name, $type = null){
+    protected function setMethod($name, $type = '', $arguments=array()){
         if(!isset($this->methods[$name])){
             $this->methods[$name] = array();
-            $this->methods[$name]['type'] = 'static';
-        }
-        if($type !== null){
             $this->methods[$name]['type'] = $type;
+            $this->methods[$name]['arguments'] = $arguments;
         }
     }
 
@@ -355,8 +374,8 @@ class ModelsCommand extends Command {
             if(in_array($name, $methods)){
                 continue;
             }
-            $name = "$name()";
+            $arguments = implode(', ',$method['arguments']);
-            $tag = Tag::createInstance("@method {$method['type']} {$name}", $phpdoc);
+            $tag = Tag::createInstance("@method static {$method['type']} {$name}({$arguments}) ", $phpdoc);
             $phpdoc->appendTag($tag);
         }
 
@@ -387,4 +406,37 @@ class ModelsCommand extends Command {
         return $output;
     }
 
+    /**
+     * 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->getDefaultValue();
+                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;
+        }
+        return $paramsWithDefault;
+    }
+
 }

src/config/config.php

@@ -40,7 +40,9 @@ return array(
     */
 
     'extra' => array(
-        'Eloquent'  => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'),
+        'Artisan' => array('Illuminate\Foundation\Artisan'),
+        'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'),
+        'Session' => array('Illuminate\Session\Store'),
     ),
 
     'magic' => array(