Merge pull request #32 from webfactor/segmentations

Segmentations for better reuse options

Author: tswonke

src/Commands/MakeEntity.php

@@ -2,13 +2,13 @@
 
 namespace Webfactor\Laravel\Generators\Commands;
 
-use Illuminate\Console\Command;
+use Webfactor\Laravel\Generators\Contracts\CommandAbstract;
 use Webfactor\Laravel\Generators\Contracts\ServiceInterface;
 use Webfactor\Laravel\Generators\Schemas\Schema;
 use Webfactor\Laravel\Generators\Services\AddToGitService;
 use Webfactor\Laravel\Generators\Services\OpenIdeService;
 
-class MakeEntity extends Command
+class MakeEntity extends CommandAbstract
 {
     /**
      * The name and signature of the console command.
@@ -24,35 +24,13 @@ class MakeEntity extends Command
      */
     protected $description = 'Make Entity';
 
-    /**
-     * Paths to files which should automatically be opened in IDE if the
-     * option --ide is set (and IDE capable).
-     *
-     * @var array
-     */
-    public $filesToBeOpened = [];
-
-    /**
-     * The name of the entity being created.
-     *
-     * @var string
-     */
-    public $entity;
-
     /**
      * The Schema object.
      *
      * @var Schema
      */
     public $schema;
 
-    /**
-     * The naming schema object.
-     *
-     * @var array
-     */
-    public $naming = [];
-
     /**
      * Execute the console command.
      *
@@ -124,17 +102,4 @@ private function executeService(ServiceInterface $service)
     {
         $service->call();
     }
-
-    /**
-     * Adds file to $filesToBeOpened stack.
-     *
-     * @param $file
-     * @return void
-     */
-    public function addFile(?\SplFileInfo $file): void
-    {
-        if ($file) {
-            array_push($this->filesToBeOpened, $file);
-        }
-    }
 }

src/Contracts/CommandAbstract.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Webfactor\Laravel\Generators\Contracts;
+
+use Illuminate\Console\Command;
+
+abstract class CommandAbstract extends Command
+{
+    /**
+     * Paths to files which should automatically be opened in IDE if the
+     * option --ide is set (and IDE capable).
+     *
+     * @var array
+     */
+    public $filesToBeOpened = [];
+
+    /**
+     * The name of the entity being created.
+     *
+     * @var string
+     */
+    public $entity;
+
+    /**
+     * The naming classes.
+     *
+     * @var array
+     */
+    public $naming = [];
+
+    /**
+     * Adds file to $filesToBeOpened stack.
+     *
+     * @param $file
+     * @return void
+     */
+    public function addFile(?\SplFileInfo $file): void
+    {
+        if ($file) {
+            array_push($this->filesToBeOpened, $file);
+        }
+    }
+}

src/Contracts/ServiceAbstract.php

@@ -3,7 +3,6 @@
 namespace Webfactor\Laravel\Generators\Contracts;
 
 use Illuminate\Filesystem\Filesystem;
-use Webfactor\Laravel\Generators\Commands\MakeEntity;
 
 abstract class ServiceAbstract
 {
@@ -15,12 +14,14 @@ abstract class ServiceAbstract
 
     protected $filesystem;
 
-    public function __construct(MakeEntity $command)
+    public function __construct(CommandAbstract $command, ?NamingAbstract $naming = null)
     {
         $this->command = $command;
         $this->filesystem = new Filesystem();
 
-        if ($this->key) {
+        $this->naming = $naming;
+
+        if (is_null($naming) && $this->key) {
             $this->naming = $this->command->naming[$this->key];
         }
     }

src/Services/SidebarService.php

@@ -2,8 +2,6 @@
 
 namespace Webfactor\Laravel\Generators\Services;
 
-use Illuminate\Filesystem\Filesystem;
-use Webfactor\Laravel\Generators\Commands\MakeEntity;
 use Webfactor\Laravel\Generators\Contracts\ServiceAbstract;
 use Webfactor\Laravel\Generators\Contracts\ServiceInterface;