[RF/EH] refactor almost everything

Author: tswonke

config/generators.php

@@ -6,14 +6,14 @@
      * have to implement Webfactor\Laravel\Generators\Contracts\MakeServiceInterface.
      */
     'services' => [
-        /*Webfactor\Laravel\Generators\Services\MakeMigrationService::class,
-        Webfactor\Laravel\Generators\Services\MakeLanguageService::class,
-        Webfactor\Laravel\Generators\Services\MakeBackpackCrudModelService::class,
-        Webfactor\Laravel\Generators\Services\MakeBackpackCrudControllerService::class,
-        Webfactor\Laravel\Generators\Services\MakeBackpackCrudRequestService::class,
-        Webfactor\Laravel\Generators\Services\MakeFactoryService::class,
-        Webfactor\Laravel\Generators\Services\MakeSeederService::class,
-        Webfactor\Laravel\Generators\Services\MakeRouteService::class,*/
+        Webfactor\Laravel\Generators\Services\MigrationService::class,
+        Webfactor\Laravel\Generators\Services\LanguageService::class,
+        Webfactor\Laravel\Generators\Services\BackpackCrudModelService::class,
+        Webfactor\Laravel\Generators\Services\BackpackCrudControllerService::class,
+        Webfactor\Laravel\Generators\Services\BackpackCrudRequestService::class,
+        Webfactor\Laravel\Generators\Services\FactoryService::class,
+        Webfactor\Laravel\Generators\Services\SeederService::class,
+        Webfactor\Laravel\Generators\Services\RouteService::class,
         Webfactor\Laravel\Generators\Services\OpenIdeService::class,
     ],
 

src/Commands/MakeEntity.php

@@ -3,6 +3,7 @@
 namespace Webfactor\Laravel\Generators\Commands;
 
 use Illuminate\Console\Command;
+use Symfony\Component\Finder\SplFileInfo;
 use Webfactor\Laravel\Generators\MakeServices;
 use Webfactor\Laravel\Generators\MigrationSchema;
 
@@ -56,4 +57,15 @@ public function handle()
 
         (new MakeServices($this))->call();
     }
+
+    /**
+     * Adds file to $filesToBeOpened stack.
+     *
+     * @param $file
+     * @return void
+     */
+    public function addFile(SplFileInfo $file): void
+    {
+        array_push($this->filesToBeOpened, $file);
+    }
 }

src/Contracts/ServiceAbstract.php

@@ -2,14 +2,42 @@
 
 namespace Webfactor\Laravel\Generators\Contracts;
 
+use Illuminate\Filesystem\Filesystem;
+use Symfony\Component\Finder\SplFileInfo;
 use Webfactor\Laravel\Generators\Commands\MakeEntity;
 
 abstract class ServiceAbstract
 {
     protected $command;
 
+    protected $filesystem;
+
+    protected $relativeToBasePath;
+
     public function __construct(MakeEntity $command)
     {
         $this->command = $command;
+        $this->filesystem = new Filesystem();
+    }
+
+    protected function addLatestFileToIdeStack()
+    {
+        $this->command->addFile($this->latestCreatedFileIn(base_path($this->relativeToBasePath)));
+    }
+
+    /**
+     * Returns the latest created File in given Path to use it for $filesToBeOpened stack
+     *
+     * @param string $path
+     *
+     * @return SplFileInfo
+     */
+    protected function latestCreatedFileIn(string $path): SplFileInfo
+    {
+        $sortedByMTime = array_sort($this->filesystem->files($path), function ($file) {
+            return $file->getMTime();
+        });
+
+        return end($sortedByMTime);
     }
 }

src/Recipes/PhpStormOpener.php

@@ -10,7 +10,7 @@ class PhpStormOpener extends OpenInIdeAbstract implements OpenInIdeInterface
     public function open()
     {
         foreach ($this->files as $file) {
-            exec('pstorm ' . $file);
+            exec('pstorm ' . $file->getPathname());
         }
     }
 }

src/Services/BackpackCrudControllerService.php

@@ -7,11 +7,15 @@
 
 class BackpackCrudControllerService extends ServiceAbstract implements ServiceInterface
 {
+    protected $relativeToBasePath = 'app/Http/Controllers/Admin';
+
     public function call()
     {
         $this->command->call('make:crud-controller', [
             'name' => $this->getName($this->command->entity),
         ]);
+
+        $this->addLatestFileToIdeStack();
     }
 
     public function getName(string $entity): string

src/Services/BackpackCrudModelService.php

@@ -7,11 +7,15 @@
 
 class BackpackCrudModelService extends ServiceAbstract implements ServiceInterface
 {
+    protected $relativeToBasePath = 'app/Models';
+
     public function call()
     {
         $this->command->call('make:crud-model', [
             'name' => $this->getName($this->command->entity),
         ]);
+
+        $this->addLatestFileToIdeStack();
     }
 
     public function getName(string $entity): string

src/Services/BackpackCrudRequestService.php

@@ -7,11 +7,15 @@
 
 class BackpackCrudRequestService extends ServiceAbstract implements ServiceInterface
 {
+    protected $relativeToBasePath = 'app/Http/Requests/Admin';
+
     public function call()
     {
         $this->command->call('make:crud-request', [
             'name' => $this->getName($this->command->entity),
         ]);
+
+        $this->addLatestFileToIdeStack();
     }
 
     public function getName(string $entity): string

src/Services/FactoryService.php

@@ -7,12 +7,16 @@
 
 class FactoryService extends ServiceAbstract implements ServiceInterface
 {
+    protected $relativeToBasePath = 'database/factories';
+
     public function call()
     {
         $this->command->call('make:factory', [
             'name'    => $this->getName($this->command->entity),
             '--model' => 'Models\\' . $this->getModelName($this->command->entity),
         ]);
+
+        $this->addLatestFileToIdeStack();
     }
 
     public function getName(string $entity): string

src/Services/LanguageService.php

@@ -15,21 +15,15 @@ class LanguageService extends ServiceAbstract implements ServiceInterface
 
     private $currentLanguage;
 
-    private $files;
-
-    public function __construct(MakeEntity $command)
-    {
-        parent::__construct($command);
-
-        $this->files = new Filesystem();
-    }
-
     public function call()
     {
         $this->currentLanguage = \Lang::locale();
+        $this->relativeToBasePath = 'resources/lang/' . $this->currentLanguage;
         $this->languageFile = $this->getFilePath();
 
         $this->writeFile($this->getName($this->command->entity));
+
+        $this->addLatestFileToIdeStack();
     }
 
     public function getName(string $entity): string
@@ -46,7 +40,7 @@ public function getName(string $entity): string
      */
     private function writeFile($name)
     {
-        if ($this->files->exists($this->languageFile)) {
+        if ($this->filesystem->exists($this->languageFile)) {
             $this->translation = include $this->languageFile;
         }
 
@@ -55,7 +49,7 @@ private function writeFile($name)
             'plural'   => ucfirst(str_plural($name)),
         ]);
 
-        return $this->files->put($this->languageFile, $this->getTranslationFileContent());
+        return $this->filesystem->put($this->languageFile, $this->getTranslationFileContent());
     }
 
     private function getFilePath()

src/Services/MigrationService.php

@@ -8,15 +8,17 @@
 
 class MigrationService extends ServiceAbstract implements ServiceInterface
 {
+    protected $relativeToBasePath = 'database/migrations';
+
     public function call()
     {
-        dd($this->command->schema);
-
         $this->command->call('make:migration:schema', [
             'name' => $this->getName($this->command->entity),
             '--model' => 0,
             '--schema' => $this->command->option('schema'),
         ]);
+
+        $this->addLatestFileToIdeStack();
     }
 
     public function getName(string $entity): string