Skip decrement/increment

They are a bit weird.

src/Alias.php

@@ -12,11 +12,11 @@ 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();
@@ -42,7 +42,6 @@ class Alias
         $facade = '\\' . ltrim($facade, '\\');
         $this->facade = $facade;
 
-
         $this->detectRoot();
 
         if ((!$this->isTrait() && $this->root)) {
@@ -55,7 +54,9 @@ class Alias
         $this->detectNamespace();
         $this->detectClassType();
         
-
+        if($facade === '\Illuminate\Database\Eloquent\Model'){
+            $this->usedMethods = array('decrement', 'increment');
+        }
     }
 
     /**
@@ -114,6 +115,12 @@ class Alias
         return $this->alias;
     }
 
+    /**
+     * Return the short name (without namespace)
+     */
+    public function getShortName(){
+        return $this->short;
+    }
     /**
      * Get the namespace from the alias
      *
@@ -145,6 +152,8 @@ class Alias
             $nsParts = explode('\\', $this->alias);
             $this->short = array_pop($nsParts);
             $this->namespace = implode('\\', $nsParts);
+        }else{
+            $this->short = $this->alias;
         }
     }
 
@@ -184,7 +193,6 @@ class Alias
 
             //If it doesn't exist, skip it
             if (!class_exists($root) && !interface_exists($root)) {
-                $this->error("Class $root is not found.");
                 return;
             }
 
@@ -253,7 +261,7 @@ class Alias
                     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 && $method->name !== '__clone') {
+                        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;

src/Console/GeneratorCommand.php

@@ -82,6 +82,14 @@ class GeneratorCommand extends Command
             );
         } else {
             $filename = $this->argument('filename');
+            $format = $this->option('format');
+
+            // Strip the php extension
+            if (substr($filename, -4, 4) == '.php') {
+                $filename = substr($filename, 0, -4);
+            }
+
+            $filename .= '.' . $format;
 
             if ($this->option('memory')) {
                 $this->useMemoryDriver();
@@ -100,7 +108,7 @@ class GeneratorCommand extends Command
             }
 
             $generator = new Generator($this->config, $this->view, $this->getOutput(), $helpers);
-            $content = $generator->generate();
+            $content = $generator->generate($format);
             $written = $this->files->put($filename, $content);
 
             if ($written !== false) {
@@ -131,12 +139,11 @@ class GeneratorCommand extends Command
      */
     protected function getArguments()
     {
+        $filename = $this->config->get('laravel-ide-helper::filename');
+
         return array(
             array(
-                'filename',
-                InputArgument::OPTIONAL,
-                'The path to the helper file',
-                $this->config->get('laravel-ide-helper::filename')
+                'filename', InputArgument::OPTIONAL, 'The path to the helper file', $filename
             ),
         );
     }
@@ -148,7 +155,10 @@ class GeneratorCommand extends Command
      */
     protected function getOptions()
     {
+        $format = $this->config->get('laravel-ide-helper::format');
+
         return array(
+            array('format', "F", InputOption::VALUE_OPTIONAL, 'The format for the IDE Helper', $format),
             array('helpers', "H", InputOption::VALUE_NONE, 'Include the helper files'),
             array('memory', "M", InputOption::VALUE_NONE, 'Use sqlite memory driver'),
             array('sublime', "S", InputOption::VALUE_NONE, 'DEPRECATED: Use different style for SublimeText CodeIntel'),

src/Console/ModelsCommand.php

@@ -175,6 +175,8 @@ class ModelsCommand extends Command
                 } catch (\Exception $e) {
                     $this->error("Exception: " . $e->getMessage() . "\nCould not analyze class $name.");
                 }
+            } elseif (interface_exists($name) || (function_exists('trait_exists') && trait_exists($name))) {
+                $this->info("Skipping interface/trait $name");
             } else {
                 $this->error("Class $name does not exist");
             }

src/Generator.php

@@ -56,9 +56,21 @@ class Generator
     /**
      * Generate the helper file contents;
      *
+     * @param  string  $format  The format to generate the helper in (php/json)
      * @return string;
      */
-    public function generate()
+    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')
@@ -68,10 +80,37 @@ class Generator
             ->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('Cache')) {
+            if (class_exists('Auth')) {
                 $class = get_class(\Auth::driver());
                 $this->extra['Auth'] = array($class);
                 $this->interfaces['\Illuminate\Auth\UserProviderInterface'] = $class;

src/Method.php

@@ -52,9 +52,9 @@ class Method
 
         //Normalize the description and inherit the docs from parents/interfaces
         try {
-            $this->normalizeDescription();
-            $this->normalizeParams();
-            $this->normalizeReturn();
+            $this->normalizeParams($this->phpdoc);
+            $this->normalizeReturn($this->phpdoc);
+            $this->normalizeDescription($this->phpdoc);
         } catch (\Exception $e) {}
 
         //Get the parameters, including formatted default values
@@ -136,11 +136,12 @@ class Method
     /**
      * Get the description and get the inherited docs.
      *
+     * @param DocBlock $phpdoc
      */
-    protected function normalizeDescription()
+    protected function normalizeDescription(DocBlock $phpdoc)
     {
         //Get the short + long description from the DocBlock
-        $description = $this->phpdoc->getText();
+        $description = $phpdoc->getText();
 
         //Loop through parents/interfaces, to fill in {@inheritdoc}
         if (strpos($description, '{@inheritdoc}') !== false) {
@@ -148,14 +149,18 @@ class Method
             $inheritDescription = $inheritdoc->getText();
 
             $description = str_replace('{@inheritdoc}', $inheritDescription, $description);
-            $this->phpdoc->setText($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();
-                    $this->phpdoc->appendTag($tag);
+                    $phpdoc->appendTag($tag);
                 }
             }
         }
@@ -163,11 +168,13 @@ class Method
 
     /**
      * Normalize the parameters
+     *
+     * @param DocBlock $phpdoc
      */
-    protected function normalizeParams()
+    protected function normalizeParams(DocBlock $phpdoc)
     {
         //Get the return type and adjust them for beter autocomplete
-        $paramTags = $this->phpdoc->getTagsByName('param');
+        $paramTags = $phpdoc->getTagsByName('param');
         if ($paramTags) {
             /** @var ParamTag $tag */
             foreach($paramTags as $tag){
@@ -184,11 +191,13 @@ class Method
 
     /**
      * Normalize the return tag (make full namespace, replace interfaces)
+     *
+     * @param DocBlock $phpdoc
      */
-    protected function normalizeReturn()
+    protected function normalizeReturn(DocBlock $phpdoc)
     {
         //Get the return type and adjust them for beter autocomplete
-        $returnTags = $this->phpdoc->getTagsByName('return');
+        $returnTags = $phpdoc->getTagsByName('return');
         if ($returnTags) {
             /** @var ReturnTag $tag */
             $tag = reset($returnTags);
@@ -275,7 +284,7 @@ class Method
 
     /**
      * @param \ReflectionMethod $reflectionMethod
-     * @return string
+     * @return DocBlock
      */
     protected function getInheritDoc($reflectionMethod)
     {
@@ -288,7 +297,9 @@ class Method
             $method = $reflectionMethod->getPrototype();
         }
         if ($method) {
-            $phpdoc = new DocBlock($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);

src/config/config.php

@@ -4,14 +4,15 @@ return array(
 
     /*
     |--------------------------------------------------------------------------
-    | Filename
+    | Filename & Format
     |--------------------------------------------------------------------------
     |
-    | The default path to the helper file
+    | The default filename (without extension) and the format (php or json)
     |
     */
 
-    'filename' => '_ide_helper.php',
+    'filename'  => '_ide_helper',
+    'format'    => 'php',
 
     /*
     |--------------------------------------------------------------------------
@@ -71,6 +72,17 @@ return array(
             'emergency' => 'Monolog\Logger::addEmergency',
         )
     ),
+    
+    /*
+    |--------------------------------------------------------------------------
+    | Interface implementations
+    |--------------------------------------------------------------------------
+    |
+    | These interfaces will be replaced with the implementing class. Some interfaces
+    | are detected by the helpers, others can be listed below.
+    |
+    */
+    
     'interfaces' => array(
         '\Illuminate\Auth\UserInterface' => '\User',
     )

src/views/ide-helper.php

@@ -16,10 +16,10 @@ namespace <?= $namespace == '__root' ? '' : $namespace ?>{
 <?php endif; ?>
 <?php foreach($aliases as $alias): ?>
 
-    <?= $alias->getClassType() ?> <?= $alias->getAlias() ?> <?= $alias->getExtends() ? 'extends ' . $alias->getExtends() : '' ?>{
+    <?= $alias->getClassType() ?> <?= $alias->getShortName() ?> <?= $alias->getExtends() ? 'extends ' . $alias->getExtends() : '' ?>{
         <?php foreach($alias->getMethods() as $method): ?>
 
-        <?= trim($method->getDocComment()) ?>
+        <?= trim($method->getDocComment('        ')) ?>
 
         public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>){<?php if($method->getDeclaringClass() !== $method->getRoot()): ?>