Validate the base template

Author: elnurvl

src/Console/Concerns/InteractsWithDockerComposeServices.php

@@ -39,13 +39,21 @@ protected function buildDockerCompose(array $services)
         $composePath = base_path('docker-compose.yml');
         $appService = 'laravel.test';
 
-        $compose = file_exists($composePath)
-            ? Yaml::parseFile($composePath)
-            : Yaml::parse(str_replace(
-                'APP_SERVICE',
-                $appService,
-                file_get_contents(Sail::baseTemplate())
-            ));
+        if (file_exists($composePath)) {
+            $compose = Yaml::parseFile($composePath);
+        } else {
+            $template = str_replace(
+                '{{APP}}:',
+                $appService.':',
+                file_get_contents(Sail::baseTemplate()),
+                $count
+            );
+            if ($count === 0) {
+                $this->error('Missing app service in the base template. Make sure you have it with the {{APP}} placeholder.');
+                exit(1);
+            }
+            $compose = Yaml::parse($template);
+        }
 
         // Prepare the installation of the "mariadb-client" package if the MariaDB service is used...
         if (in_array('mariadb', $services)) {
@@ -166,7 +174,7 @@ protected function installDevContainer()
         file_put_contents(
             $this->laravel->basePath('.devcontainer/devcontainer.json'),
             str_replace(
-                'APP_SERVICE',
+                '{{APP}}',
                 'laravel.test',
                 file_get_contents(__DIR__.'/../../../stubs/devcontainer.stub') ?: ''
             )

src/Services.php

@@ -174,7 +174,7 @@ public function __construct()
     }
 
     /**
-     * Set the base Docker Compose template containing a php service named as 'APP_SERVICE'
+     * Set the base Docker Compose template containing a php service named as '{{APP}}'
      *
      * @param string $stub Path to the base Docker Compose stub
      * @return $this
@@ -324,7 +324,7 @@ public function isPersistent(string $service): bool
     }
 
     /**
-     * Check if a service is required by APP_SERVICE
+     * Check if a service is required by {{APP}} service
      *
      * @param string $service
      * @return bool

stubs/devcontainer.stub

@@ -4,7 +4,7 @@
 	"dockerComposeFile": [
 		"../docker-compose.yml"
 	],
-	"service": "APP_SERVICE",
+	"service": "{{APP}}",
 	"workspaceFolder": "/var/www/html",
 	"customizations": {
 		"vscode": {

stubs/docker-compose.stub

@@ -1,6 +1,6 @@
 # For more information: https://laravel.com/docs/sail
 services:
-    APP_SERVICE:
+    {{APP}}:
         build:
             context: ./vendor/laravel/sail/runtimes/{{PHP_VERSION}}
             dockerfile: Dockerfile