Merge pull request #31 from diogogomeswww/enhancement/minor-perfomance-improvements

Minor performance improvements and some docblocks

Author: mpociot

src/Edge.php

@@ -10,6 +10,11 @@ class Edge extends \phpDocumentor\GraphViz\Edge
 
     protected $toPort = null;
 
+    /**
+     * @param Node $from
+     * @param Node $to
+     * @return Edge|\phpDocumentor\GraphViz\Edge
+     */
     public static function create(Node $from, Node $to) {
         return new static($from, $to);
     }

src/ModelFinder.php

@@ -34,9 +34,7 @@ public function getModelsInDirectory(string $directory): Collection
         })->map(function ($path) {
             return $this->getFullyQualifiedClassNameFromFile($path);
         })->filter(function (string $className) {
-            return !empty($className);
-        })->filter(function (string $className) {
-            return is_subclass_of($className, EloquentModel::class);
+            return !empty($className) && is_subclass_of($className, EloquentModel::class);
         });
     }
 
@@ -53,9 +51,9 @@ protected function getFullyQualifiedClassNameFromFile(string $path): string
         $statements = $traverser->traverse($statements);
 
         // get the first namespace declaration in the file
-        $root_statement = collect($statements)->filter(function ($statement) {
+        $root_statement = collect($statements)->first(function ($statement) {
             return $statement instanceof Namespace_;
-        })->first();
+        });
 
         if (! $root_statement) {
             return '';

src/RelationFinder.php

@@ -7,9 +7,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class RelationFinder
 {
@@ -18,21 +16,20 @@ class RelationFinder
      *
      * @param string $model
      * @return Collection
+     * @throws \ReflectionException
      */
     public function getModelRelations(string $model)
     {
         $class = new ReflectionClass($model);
 
-        $traitMethods = Collection::make($class->getTraits())->map(function ($trait) {
+        $traitMethods = Collection::make($class->getTraits())->map(function (ReflectionClass $trait) {
             return Collection::make($trait->getMethods(ReflectionMethod::IS_PUBLIC));
         })->flatten();
 
         $methods = Collection::make($class->getMethods(ReflectionMethod::IS_PUBLIC))
             ->merge($traitMethods)
             ->reject(function (ReflectionMethod $method) use ($model) {
-                return $method->class !== $model;
-            })->reject(function (ReflectionMethod $method) use ($model) {
-                return $method->getNumberOfParameters() > 0;
+                return $method->class !== $model || $method->getNumberOfParameters() > 0;
             });
 
         $relations = Collection::make();
@@ -46,13 +43,22 @@ public function getModelRelations(string $model)
         return $relations;
     }
 
+    /**
+     * @param string $qualifiedKeyName
+     * @return mixed
+     */
     protected function getParentKey(string $qualifiedKeyName)
     {
         $segments = explode('.', $qualifiedKeyName);
 
         return end($segments);
     }
 
+    /**
+     * @param ReflectionMethod $method
+     * @param string $model
+     * @return array|null
+     */
     protected function getRelationshipFromMethodAndModel(ReflectionMethod $method, string $model)
     {
         try {