Merge pull request #2 from jedymatt/patch/use-regex

Patch: Remove dependency yaml and use regex to get sail services

Author: jedymatt

composer.json

@@ -38,13 +38,9 @@
     "prefer-stable": true,
     "require": {
         "php": "^7.3|^8.0",
-        "symfony/yaml": "^6.0",
         "laravel/sail": "^1.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0"
-    },
-    "scripts": {
-        "lint": "vendor/bin/pint"
     }
 }

src/Console/SailEnvCommand.php

@@ -3,7 +3,6 @@
 namespace Jedymatt\LaravelSailEnv\Console;
 
 use Laravel\Sail\Console\InstallCommand;
-use Symfony\Component\Yaml\Yaml;
 
 class SailEnvCommand extends InstallCommand
 {
@@ -68,12 +67,14 @@ public function handle()
 
     protected function servicesFromDockerCompose(): array
     {
-        $dockerCompose = Yaml::parseFile($this->laravel->basePath('docker-compose.yml'));
+        $environment = file_get_contents($this->laravel->basePath('docker-compose.yml'));
 
-        $sailServices = array_filter($dockerCompose['services'], function ($service) {
-            return in_array($service, $this->services);
-        }, ARRAY_FILTER_USE_KEY);
+        $regex = '/'.implode('|', array_map(function ($service) {
+            return '(?<=\s)'.$service.'(?=:)'; // Match service name followed by ':' (e.g. mysql:) and preceded by whitespace
+        }, $this->services)).'/';
 
-        return array_keys($sailServices);
+        preg_match_all($regex, $environment, $matches);
+
+        return array_values($matches[0]);
     }
 }