fix issues prompting for horizon

Author: jasonmccallister

src/LaravelPreset.php

@@ -5,6 +5,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Filesystem\Filesystem;
 use sixlive\DotenvEditor\DotenvEditor;
+use Illuminate\Support\Facades\Log;
 
 class LaravelPreset
 {
@@ -16,6 +17,8 @@ class LaravelPreset
 
     protected $packages = [];
 
+    protected $useHorizon = false;
+
     public function __construct($command)
     {
         $this->command = $command;
@@ -38,6 +41,8 @@ public function run()
 
         // prompt for installing horizon
         if ($this->command->confirm('Are you going to use Laravel Horizon?')) {
+            $this->useHorizon = $this->command->confirm('Use horizon instead of queue:work?');
+
             array_push($this->packages, 'laravel/horizon');
         }
 
@@ -98,23 +103,17 @@ protected function publishStubs()
             }
         });
 
-        if (Arr::has($this->packages, 'laravel/horizon')) {
-            $useHorizon = $this->command->confirm(' Use horizon instead of queue:work?');
-        } else {
-            $useHorizon = false;
-        }
-
         switch ($this->options['database']) {
             case 'PostgreSQL':
-                if ($useHorizon) {
+                if ($this->useHorizon) {
                     copy(__DIR__ . '/stubs/postgres/docker-compose-horizon.yaml', base_path('docker-compose.yaml'));
                 } else {
                     copy(__DIR__ . '/stubs/postgres/docker-compose.yaml', base_path('docker-compose.yaml'));
                 }
                 copy(__DIR__ . '/stubs/postgres/Dockerfile', base_path('Dockerfile'));
                 break;
             default:
-                if ($useHorizon) {
+                if ($this->useHorizon) {
                     copy(__DIR__ . '/stubs/mysql/docker-compose-horizon.yaml', base_path('docker-compose.yaml'));
                 } else {
                     copy(__DIR__ . '/stubs/mysql/docker-compose.yaml', base_path('docker-compose.yaml'));
@@ -130,7 +129,7 @@ protected function publishStubs()
         copy(__DIR__ . '/stubs/phpunit.xml', base_path('phpunit.xml'));
     }
 
-    protected function updateDotEnv(string $file)
+    protected function updateDotEnv(string $file, bool $copyFile = false)
     {
         $editor = new DotenvEditor;
         $editor->load(base_path($file));

src/stubs/Makefile

@@ -7,6 +7,8 @@ composer:
 	docker run --interactive --tty --volume $(PWD):/app composer install --ignore-platform-reqs --no-interaction --no-plugins --prefer-dist
 down:
 	docker-compose down
+horizon:
+	docker-compose exec app php artisan horizon:install
 logs:
 	docker-compose logs -f
 migrate:
@@ -31,6 +33,8 @@ ssh-queue:
 	docker-compose exec queue bash
 tag:
 	docker tag "$(IMAGE):$(TAG)" "$(IMAGE):$(TAG)"
+telescope:
+	docker-compose exec app php artisan telescope:install
 testdox:
 	docker-compose exec app ./vendor/bin/phpunit --testdox
 tinker:

src/stubs/mysql/docker-compose.horizon.yaml renamed to src/stubs/mysql/docker-compose-horizon.yaml

@@ -3,6 +3,8 @@ FROM composer as vendor
 COPY database/ database/
 # uncomment if using nova
 # COPY nova/ nova/
+# uncomment when developing packages locally
+# COPY packages/ packages/
 COPY composer.json composer.json
 COPY composer.lock composer.lock
 RUN composer install --ignore-platform-reqs --no-interaction --no-plugins --no-scripts --prefer-dist