Merge pull request #241 from clementbirkle/main

Add Lando compatibility for the extension

Author: joetannenbaum

package.json

@@ -77,20 +77,23 @@
                         "herd",
                         "valet",
                         "sail",
+                        "lando",
                         "local"
                     ],
                     "enumItemLabels": [
                         "Auto Detect",
                         "Herd",
                         "Valet",
                         "Sail",
+                        "Lando",
                         "Local"
                     ],
                     "markdownEnumDescriptions": [
                         "Auto detect the local PHP environment.",
                         "Auto detect PHP version Herd is using for the project.",
                         "Auto detect PHP version Valet is using for the project.",
                         "Sail",
+                        "Lando",
                         "Use PHP installed on the local machine."
                     ],
                     "default": "auto",

src/support/config.ts

@@ -22,4 +22,10 @@ export const configAffected = (
     ...keys: ConfigKey[]
 ): boolean => keys.some((key) => event.affectsConfiguration(configKey(key)));
 
-export type PhpEnvironment = "auto" | "herd" | "valet" | "sail" | "local";
+export type PhpEnvironment =
+    | "auto"
+    | "herd"
+    | "valet"
+    | "sail"
+    | "local"
+    | "lando";

src/support/php.ts

@@ -30,7 +30,7 @@ let hasVendor = projectPathExists("vendor/autoload.php");
 const hasBootstrap = projectPathExists("bootstrap/app.php");
 
 let phpEnvKey: PhpEnvironment | null = null;
-const phpEnvsThatUseRelativePaths: PhpEnvironment[] = ["sail"];
+const phpEnvsThatUseRelativePaths: PhpEnvironment[] = ["sail", "lando"];
 
 export const initVendorWatchers = () => {
     // fs.readdirSync(internalVendorPath()).forEach((file) => {
@@ -109,16 +109,21 @@ const getPhpCommand = (): string => {
         command: `"{binaryPath}"`,
     });
 
-    options.set("local", {
-        check: "php -r 'echo PHP_BINARY;'",
-        command: `"{binaryPath}"`,
-    });
-
     options.set("sail", {
         check: "./vendor/bin/sail ps",
         command: "./vendor/bin/sail php",
     });
 
+    options.set("lando", {
+        check: "lando php -r 'echo PHP_BINARY;'",
+        command: "lando php",
+    });
+
+    options.set("local", {
+        check: "php -r 'echo PHP_BINARY;'",
+        command: `"{binaryPath}"`,
+    });
+
     for (const [key, option] of options.entries()) {
         if (phpEnv !== "auto" && phpEnv !== key) {
             continue;