@@ -49,23 +49,23 @@ discard block  | 
                                                    ||
| 49 | 49 |          } catch (\Throwable $e) { | 
                                                        
| 50 | 50 | }  | 
                                                        
| 51 | 51 | |
| 52 | - return [];  | 
                                                        |
| 52 | + return [ ];  | 
                                                        |
| 53 | 53 | }  | 
                                                        
| 54 | 54 | |
| 55 | 55 | protected function getModelLabel(EloquentModel $model, string $label)  | 
                                                        
| 56 | 56 |      { | 
                                                        
| 57 | 57 | |
| 58 | 58 | $table = '<<table width="100%" height="100%" border="0" margin="0" cellborder="1" cellspacing="0" cellpadding="10">' . PHP_EOL;  | 
                                                        
| 59 | -        $table .= '<tr width="100%"><td width="100%" bgcolor="'.config('erd-generator.table.header_background_color').'"><font color="'.config('erd-generator.table.header_font_color').'">' . $label . '</font></td></tr>' . PHP_EOL; | 
                                                        |
| 59 | +        $table .= '<tr width="100%"><td width="100%" bgcolor="' . config('erd-generator.table.header_background_color') . '"><font color="' . config('erd-generator.table.header_font_color') . '">' . $label . '</font></td></tr>' . PHP_EOL; | 
                                                        |
| 60 | 60 | |
| 61 | 61 |          if (config('erd-generator.use_db_schema')) { | 
                                                        
| 62 | 62 | $columns = $this->getTableColumnsFromModel($model);  | 
                                                        
| 63 | 63 |              foreach ($columns as $column) { | 
                                                        
| 64 | 64 | $label = $column->getName();  | 
                                                        
| 65 | 65 |                  if (config('erd-generator.use_column_types')) { | 
                                                        
| 66 | -                    $label .= ' ('.$column->getType()->getName().')'; | 
                                                        |
| 66 | +                    $label .= ' (' . $column->getType()->getName() . ')'; | 
                                                        |
| 67 | 67 | }  | 
                                                        
| 68 | -                $table .= '<tr width="100%"><td port="' . $column->getName() . '" align="left" width="100%"  bgcolor="'.config('erd-generator.table.row_background_color').'"><font color="'.config('erd-generator.table.row_font_color').'" >' . $label . '</font></td></tr>' . PHP_EOL; | 
                                                        |
| 68 | +                $table .= '<tr width="100%"><td port="' . $column->getName() . '" align="left" width="100%"  bgcolor="' . config('erd-generator.table.row_background_color') . '"><font color="' . config('erd-generator.table.row_font_color') . '" >' . $label . '</font></td></tr>' . PHP_EOL; | 
                                                        |
| 69 | 69 | }  | 
                                                        
| 70 | 70 | }  | 
                                                        
| 71 | 71 | |
@@ -77,13 +77,13 @@ discard block  | 
                                                    ||
| 77 | 77 | protected function addModelsToGraph(Collection $models)  | 
                                                        
| 78 | 78 |      { | 
                                                        
| 79 | 79 | // Add models to graph  | 
                                                        
| 80 | -        $models->map(function (Model $model) { | 
                                                        |
| 80 | +        $models->map(function(Model $model) { | 
                                                        |
| 81 | 81 | $eloquentModel = app($model->getModel());  | 
                                                        
| 82 | 82 | $this->addNodeToGraph($eloquentModel, $model->getNodeName(), $model->getLabel());  | 
                                                        
| 83 | 83 | });  | 
                                                        
| 84 | 84 | |
| 85 | 85 | // Create relations  | 
                                                        
| 86 | -        $models->map(function ($model) { | 
                                                        |
| 86 | +        $models->map(function($model) { | 
                                                        |
| 87 | 87 | $this->addRelationToGraph($model);  | 
                                                        
| 88 | 88 | });  | 
                                                        
| 89 | 89 | }  | 
                                                        
@@ -132,7 +132,7 @@ discard block  | 
                                                    ||
| 132 | 132 |              $edge->{"set{$key}"}($value); | 
                                                        
| 133 | 133 | }  | 
                                                        
| 134 | 134 | |
| 135 | -        foreach (config('erd-generator.relations.' . $relation->getType(), []) as $key => $value) { | 
                                                        |
| 135 | +        foreach (config('erd-generator.relations.' . $relation->getType(), [ ]) as $key => $value) { | 
                                                        |
| 136 | 136 |              $edge->{"set{$key}"}($value); | 
                                                        
| 137 | 137 | }  | 
                                                        
| 138 | 138 | |
@@ -193,7 +193,7 @@ discard block  | 
                                                    ||
| 193 | 193 | );  | 
                                                        
| 194 | 194 | |
| 195 | 195 | $this->connectNodes($pivotModelNode, $relatedModelNode, $relation);  | 
                                                        
| 196 | -        } catch (\ReflectionException $e){} | 
                                                        |
| 196 | +        } catch (\ReflectionException $e) {} | 
                                                        |
| 197 | 197 | }  | 
                                                        
| 198 | 198 | |
| 199 | 199 | /**  | 
                                                        
@@ -24,25 +24,25 @@  | 
                                                    ||
| 24 | 24 |      { | 
                                                        
| 25 | 25 | $class = new ReflectionClass($model);  | 
                                                        
| 26 | 26 | |
| 27 | -        $traitMethods = Collection::make($class->getTraits())->map(function (ReflectionClass $trait) { | 
                                                        |
| 27 | +        $traitMethods = Collection::make($class->getTraits())->map(function(ReflectionClass $trait) { | 
                                                        |
| 28 | 28 | return Collection::make($trait->getMethods(ReflectionMethod::IS_PUBLIC));  | 
                                                        
| 29 | 29 | })->flatten();  | 
                                                        
| 30 | 30 | |
| 31 | 31 | $methods = Collection::make($class->getMethods(ReflectionMethod::IS_PUBLIC))  | 
                                                        
| 32 | 32 | ->merge($traitMethods)  | 
                                                        
| 33 | -            ->reject(function (ReflectionMethod $method) use ($model) { | 
                                                        |
| 34 | - return $method->class !== $model || $method->getNumberOfParameters() > 0 || $method->isStatic();;  | 
                                                        |
| 33 | +            ->reject(function(ReflectionMethod $method) use ($model) { | 
                                                        |
| 34 | + return $method->class !== $model || $method->getNumberOfParameters() > 0 || $method->isStatic(); ;  | 
                                                        |
| 35 | 35 | });  | 
                                                        
| 36 | 36 | |
| 37 | 37 | $relations = Collection::make();  | 
                                                        
| 38 | 38 | |
| 39 | -        $methods->map(function (ReflectionMethod $method) use ($model, &$relations) { | 
                                                        |
| 39 | +        $methods->map(function(ReflectionMethod $method) use ($model, &$relations) { | 
                                                        |
| 40 | 40 | $relations = $relations->merge($this->getRelationshipFromMethodAndModel($method, $model));  | 
                                                        
| 41 | 41 | });  | 
                                                        
| 42 | 42 | |
| 43 | 43 | $relations = $relations->filter();  | 
                                                        
| 44 | 44 | |
| 45 | -        if ($ignoreRelations = Arr::get(config('erd-generator.ignore', []),$model)) | 
                                                        |
| 45 | +        if ($ignoreRelations = Arr::get(config('erd-generator.ignore', [ ]), $model)) | 
                                                        |
| 46 | 46 |          { | 
                                                        
| 47 | 47 | $relations = $relations->diffKeys(array_flip($ignoreRelations));  | 
                                                        
| 48 | 48 | }  | 
                                                        
@@ -44,7 +44,7 @@  | 
                                                    ||
| 44 | 44 | });  | 
                                                        
| 45 | 45 | |
| 46 | 46 |          if(!count($whitelistModels)) { | 
                                                        
| 47 | - return $collection->diff($ignoreModels)->sort();  | 
                                                        |
| 47 | + return $collection->diff($ignoreModels)->sort();  | 
                                                        |
| 48 | 48 | }  | 
                                                        
| 49 | 49 | |
| 50 | 50 |          return $collection->filter(function (string $className) use ($whitelistModels) { | 
                                                        
@@ -27,27 +27,26 @@ discard block  | 
                                                    ||
| 27 | 27 | public function getModelsInDirectory(string $directory): Collection  | 
                                                        
| 28 | 28 |      { | 
                                                        
| 29 | 29 |          $files = config('erd-generator.recursive') ? | 
                                                        
| 30 | - $this->filesystem->allFiles($directory) :  | 
                                                        |
| 31 | - $this->filesystem->files($directory);  | 
                                                        |
| 30 | + $this->filesystem->allFiles($directory) : $this->filesystem->files($directory);  | 
                                                        |
| 32 | 31 | |
| 33 | -        $ignoreModels = array_filter(config('erd-generator.ignore', []), 'is_string'); | 
                                                        |
| 34 | -        $whitelistModels = array_filter(config('erd-generator.whitelist', []), 'is_string'); | 
                                                        |
| 32 | +        $ignoreModels = array_filter(config('erd-generator.ignore', [ ]), 'is_string'); | 
                                                        |
| 33 | +        $whitelistModels = array_filter(config('erd-generator.whitelist', [ ]), 'is_string'); | 
                                                        |
| 35 | 34 | |
| 36 | -        $collection = Collection::make($files)->filter(function ($path) { | 
                                                        |
| 35 | +        $collection = Collection::make($files)->filter(function($path) { | 
                                                        |
| 37 | 36 | return Str::endsWith($path, '.php');  | 
                                                        
| 38 | -        })->map(function ($path) { | 
                                                        |
| 37 | +        })->map(function($path) { | 
                                                        |
| 39 | 38 | return $this->getFullyQualifiedClassNameFromFile($path);  | 
                                                        
| 40 | -        })->filter(function (string $className) { | 
                                                        |
| 39 | +        })->filter(function(string $className) { | 
                                                        |
| 41 | 40 | return !empty($className)  | 
                                                        
| 42 | 41 | && is_subclass_of($className, EloquentModel::class)  | 
                                                        
| 43 | - && ! (new ReflectionClass($className))->isAbstract();  | 
                                                        |
| 42 | + && !(new ReflectionClass($className))->isAbstract();  | 
                                                        |
| 44 | 43 | });  | 
                                                        
| 45 | 44 | |
| 46 | -        if(!count($whitelistModels)) { | 
                                                        |
| 45 | +        if (!count($whitelistModels)) { | 
                                                        |
| 47 | 46 | return $collection->diff($ignoreModels)->sort();  | 
                                                        
| 48 | 47 | }  | 
                                                        
| 49 | 48 | |
| 50 | -        return $collection->filter(function (string $className) use ($whitelistModels) { | 
                                                        |
| 49 | +        return $collection->filter(function(string $className) use ($whitelistModels) { | 
                                                        |
| 51 | 50 | return in_array($className, $whitelistModels);  | 
                                                        
| 52 | 51 | });  | 
                                                        
| 53 | 52 | }  | 
                                                        
@@ -68,19 +67,19 @@ discard block  | 
                                                    ||
| 68 | 67 | $statements = $traverser->traverse($statements);  | 
                                                        
| 69 | 68 | |
| 70 | 69 | // get the first namespace declaration in the file  | 
                                                        
| 71 | -        $root_statement = collect($statements)->first(function ($statement) { | 
                                                        |
| 70 | +        $root_statement = collect($statements)->first(function($statement) { | 
                                                        |
| 72 | 71 | return $statement instanceof Namespace_;  | 
                                                        
| 73 | 72 | });  | 
                                                        
| 74 | 73 | |
| 75 | -        if (! $root_statement) { | 
                                                        |
| 74 | +        if (!$root_statement) { | 
                                                        |
| 76 | 75 | return '';  | 
                                                        
| 77 | 76 | }  | 
                                                        
| 78 | 77 | |
| 79 | 78 | return collect($root_statement->stmts)  | 
                                                        
| 80 | -                ->filter(function ($statement) { | 
                                                        |
| 79 | +                ->filter(function($statement) { | 
                                                        |
| 81 | 80 | return $statement instanceof Class_;  | 
                                                        
| 82 | 81 | })  | 
                                                        
| 83 | -                ->map(function (Class_ $statement) { | 
                                                        |
| 82 | +                ->map(function(Class_ $statement) { | 
                                                        |
| 84 | 83 | return $statement->namespacedName->toString();  | 
                                                        
| 85 | 84 | })  | 
                                                        
| 86 | 85 | ->first() ?? '';  |