added basic index generation

Author: mkusher

.gitignore

@@ -1,2 +1,2 @@
+vendor/
 tests/
-phpcompletePSR.rar

README.md

@@ -107,13 +107,13 @@ To enable omni complete add following line to `.vimrc`,
 
 Then issuing `<C-X><C-O>` in insert mode will open the completion pop-up menu.
 
-This plugin is tested in Windows and Linux. It should work in OSX also. 
+This plugin is tested in Windows and Linux. It should work in OSX also.
 
 For now this plugin supports [Composer](http://getcomposer.org/) PHP projects.
 Upon detecting a composer project the plugin scans classmap generated by `php
 composer.phar dumpautoload --optimize` command. By default composer command is
 set to `php composer.phar`. The command can be changed by setting
-`g:phpcomplete_index_composer_command` global variable. 
+`g:phpcomplete_index_composer_command` global variable.
 
 The plugin is dependent on `@var`, `@param`, `@return` doc-comments to give proper context aware
 autocomplete. So documenting your class will help tremendously. It does not
@@ -155,7 +155,7 @@ Extensions
 Phpcomplete Extended pluign exposes api hooks so that it can be possible to
 provide framework specific autocomplete suggestion. For example facades in
 laravel, DIC services in Symfony2 etc. The plugin api divided in two part, `PHP`
-and `vim`. PHP part is responsible for creating index related to the framework, 
+and `vim`. PHP part is responsible for creating index related to the framework,
 and vim part is responsible for providing autocomplete menu entries based on the
 index. For reference see
 [phpcomplete-extended-symfony](https://github.com/m2mdas/phpcomplete-extended-symfony)
@@ -166,10 +166,11 @@ License
 -------
 MIT licensed.
 
-Acknowledgement 
---------------- 
+Acknowledgement
+---------------
 
-This plugin would not be possible without the works of 
+This plugin would not be possible without the works of
+[M2mdas](https://github.com/m2mdas),
 [Shougo](https://github.com/Shougo),
 [shawncplus](https://github.com/shawncplus/),
 [tpope](https://github.com/tpope/), [vim-jp](https://github.com/vim-jp),

bin/indexer.php

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require(__DIR__ . "/vendor/autoload.php");
+require(dirname(__DIR__) . "/vendor/autoload.php");
 
 set_time_limit(0);
 ini_set('memory_limit','1000M');
@@ -24,5 +24,4 @@
 } else {
     $command = new \Command\ErrorCommand;
 }
-
 $command->run($arguments);

bin/src/Command/GenerateCommand.php

@@ -10,14 +10,11 @@ public function run(array $arguments = []){
         $generator = $this->get("IndexGenerator");
 
         $index = $generator->generateIndex($this->get("Index"));
-        printf("Parsed: %d, time: %f\n", count($index->getClassMap()), microtime(true) - $time);
         $index = $this->prepareIndex($index);
-        printf("time: %f\n", microtime(true) - $time);
-        return;
         $indexWriter = $this->get('IndexWriter');
 
         $indexWriter->writeIndex($index);
-        $indexWriter->writeReport($generator->getInvalidClasses());
+        //$indexWriter->writeReport($generator->getInvalidClasses());
     }
     protected function prepareIndex($index){
         $jsonIndex = json_encode($index->toArray());

bin/src/DI/Container.php

@@ -9,17 +9,16 @@ public function __construct(){
         $this->loadBasicServices();
         $this->loadParser();
         $this->map['Composer'] = new \Utils\Composer($this->get("Path"));
-        $this->map['ClassUtils'] = new \Utils\ClassUtils(
+        $this->map["ClassUtils"] = new \Utils\ClassUtils(
             $this->get("Path"),
-            $this->get("ClassParser")
+            $this->get("Parser")
         );
         $this->map["IndexGenerator"] = new \IndexGenerator(
             $this->get("Path"),
             $this->get("Composer"),
             $this->get("ClassUtils")
         );
         $this->map["IndexWriter"] = new \Utils\IndexWriter(
-            $this->get("IndexGenerator"),
             $this->get("Path")
         );
     }
@@ -28,7 +27,7 @@ public function get($service){
             return $this->map[$service];
         }
         else {
-            throw new \Exception("Unknown service \"{$service}\"");
+            throw new ServiceNotFoundException("Unknown service \"{$service}\"");
         }
     }
     public function set($serviceName, $service, $overwrite = false){
@@ -42,7 +41,7 @@ public function set($serviceName, $service, $overwrite = false){
     }
     private function loadBasicServices(){
         $this->map = [
-            'Index' => new \DTO\Index(),
+            'Index' => new \Entity\Index(),
             'PathUtils' => new \Phine\Path\Path(),
             'PhpParser' => new \PhpParser\Parser(new \PhpParser\Lexer),
             'Traverser' => new \PhpParser\NodeTraverser(),
@@ -51,11 +50,36 @@ private function loadBasicServices(){
         $this->map['Path'] = new \Utils\PathResolver($this->get("PathUtils"));
     }
     private function loadParser(){
-        $this->map['ClassParser'] = new \Parser\ClassParser(
+        $this->set("UseParser", new \Parser\UseParser);
+        $this->set("MethodParser", new \Parser\MethodParser(
+            $this->get("UseParser")
+        ));
+        $this->set("PropertyParser", new \Parser\PropertyParser(
+            $this->get("UseParser")
+        ));
+        $this->set("CommentParser", new \Parser\CommentParser(
+            $this->get("UseParser")
+        ));
+        $this->map["ClassParser"] = new \Parser\ClassParser(
+            $this->get("CommentParser"),
+            $this->get("MethodParser"),
+            $this->get("PropertyParser"),
+            $this->get("UseParser")
+        );
+        $this->map["InterfaceParser"] = new \Parser\InterfaceParser(
+            $this->get("CommentParser"),
+            $this->get("MethodParser"),
+            $this->get("PropertyParser")
+        );
+
+        $this->map['Parser'] = new \Parser\Parser(
             $this->get("PhpParser"),
+            $this->get("ClassParser"),
+            $this->get("InterfaceParser"),
+            $this->get("UseParser"),
             $this->get("Path")
         );
-        $this->map['ClassParser']->setTraverser($this->get('Traverser'));
-        $this->map['ClassParser']->setVisitor($this->get('Visitor'));
+        $this->map['Parser']->setTraverser($this->get('Traverser'));
+        $this->map['Parser']->setVisitor($this->get('Visitor'));
     }
 }

bin/src/DI/ServiceNotFoundException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace DI;
+
+class ServiceNotFoundException extends \Exception {
+
+}

bin/src/DTO/FQCN.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Entity;
+
+class ClassData{
+    const MODIFIER_PUBLIC    =  1;
+    const MODIFIER_PROTECTED =  2;
+    const MODIFIER_PRIVATE   =  4;
+    const MODIFIER_STATIC    =  8;
+    const MODIFIER_ABSTRACT  = 16;
+    const MODIFIER_FINAL     = 32;
+    public $interfaces      = [];
+    public $parentClasses   = [];
+    public $methods;
+    public $properties;
+    public $constants       = [];
+    /** @var Uses */
+    public $uses;
+
+    /**
+     *
+     * @var FQCN
+     */
+    public $fqcn;
+    public $doc             = "";
+    public $startLine       = 0;
+    public $file            = "";
+    public function __construct(FQCN $fqcn, $file){
+        $this->fqcn = $fqcn;
+        $this->file = $file;
+        $this->methods = new MethodsCollection();
+        $this->properties = new PropertiesCollection();
+    }
+    public function getParentClass(){
+        return "";
+    }
+    public function setParentClass($parentClass){
+        if(!in_array($parentClass, $this->parentClasses)){
+            array_unshift($this->parentClasses, $parentClass);
+        }
+    }
+    public function addInterface($interface){
+        if(!in_array($interface, $this->interfaces)){
+            $this->interfaces[] = $interface;
+        }
+    }
+    public function addMethod(MethodData $method){
+        $this->methods->add($method);
+    }
+    public function addProp(ClassProperty $prop){
+        $this->properties->add($prop);
+    }
+    public function addConst($constName){
+        if(!in_array($constName, $this->constants)){
+            $this->constants[] = $constName;
+        }
+    }
+    public function toArray(){
+        return [
+            "methods"       => $this->methods->toArray(),
+            "namespaces"    => $this->uses->toArray(),
+            "properties"    => $this->properties->toArray(),
+            "constants"     => $this->constants,
+            "interfaces"    => $this->interfaces,
+            "classname"     => $this->fqcn->className,
+            "parentclasses" => $this->parentClasses,
+            "docComment"    => $this->doc,
+            "startLine"     => $this->startLine,
+            "file"          => $this->file,
+            "parentclass"   => $this->getParentClass()
+        ];
+    }
+}

bin/src/DTO/MethodData.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Entity;
+
+class ClassProperty {
+    public $name        = "";
+    public $modifier    = 0;
+    public $type        = "";
+    public $defauls     = "";
+    public $doc         = "";
+
+    public function isPublic() {
+        return (bool) ($this->modifier & ClassData::MODIFIER_PUBLIC);
+    }
+
+    public function isProtected() {
+        return (bool) ($this->modifier & ClassData::MODIFIER_PROTECTED);
+    }
+
+    public function isPrivate() {
+        return (bool) ($this->modifier & ClassData::MODIFIER_PRIVATE);
+    }
+
+    public function isStatic() {
+        return (bool) ($this->modifier & ClassData::MODIFIER_STATIC);
+    }
+
+    public function setModifier($modifier){
+        $this->modifier = $modifier;
+    }
+    
+    public function toArray(){
+        return [
+            'type' => $this->type,
+            'docComment' => $this->doc,
+            'array_type' => 0,
+            'inheritdoc' => 0
+        ];
+    }
+}