Merge branch 'develop'

Author: MouseEatsCat

find-usable-php.php

@@ -5,18 +5,23 @@
 //check for valet
 //$use_valet = !empty(shell_exec('command -v valet'));
 $use_valet = false;
+$use_ddev  = false;
 
 // First, check if the system's linked "php" is 7.4+; if so, return that. This
 // is the most likely, most ideal, and fastest possible case
 if ($use_valet) {
     $linkedPhpVersion = shell_exec('valet php -r "echo phpversion();"');
+} else if ($use_ddev) {
+    $linkedPhpVersion = shell_exec('ddev php -r "echo phpversion();"');
 } else {
     $linkedPhpVersion = shell_exec('php -r "echo phpversion();"');
 }
 
 if (version_compare($linkedPhpVersion, $minimumPhpVersion) >= 0) {
     if ($use_valet) {
         echo exec('valet php -dxdebug.remote_enable=true -dxdebug.mode=debug -dxdebug.start_with_request=yes -r \'echo $_SERVER["_"];\'');
+    } else if ($use_ddev) {
+        echo exec('ddev php -r \'echo $_SERVER["_"];\'');
     } else {
         echo exec('which php');
     }

src/Command/AbstractCommand.php

@@ -83,6 +83,17 @@ public function getAppConfig(bool $new = false)
                 ]
             ]);
 
+            if ($this->isDdevSupported()) {
+                // Replace internal DB hostname with external hostname
+                $config->merge([
+                    'databases' => [
+                        $config->defaultDatabase() => [
+                            'hostname' => $this->getDdevDbHostname(),
+                        ]
+                    ]
+                ]);
+            }
+
             $this->appConfig = $config;
         }
 
@@ -201,6 +212,10 @@ public function getPhpBinaryForCharcoal(OutputInterface $output)
             $phpBinary = $this->getPhpBinaryFromScript('cd ' . __DIR__ . '/../../;valet link;valet which-php', $output);
         }
 
+        if ($this->isDdevSupported()) {
+            $phpBinary = 'ddev php';
+        }
+
         return $phpBinary;
     }
 
@@ -221,6 +236,30 @@ public function isValetSupported()
         return !empty(shell_exec(sprintf("which %s", escapeshellarg('valet'))));
     }
 
+    public function isDdevSupported()
+    {
+        $path = $this->getProjectDir() . '/.ddev/.webimageBuild/Dockerfile';
+        $dockerfile_exists   = file_exists($path);
+        $ddev_command_exists = !empty(shell_exec(sprintf("which %s", escapeshellarg('ddev'))));
+
+        return $dockerfile_exists && $ddev_command_exists;
+    }
+
+    function getDdevDbHostname(): ?string {
+        try {
+            $ddevJson = json_decode(trim(shell_exec('ddev describe -j')), true);
+
+            $dbHost = $ddevJson['raw']['dbinfo']['host'];
+            $dbHost = $dbHost === 'db' ? '127.0.0.1' : $dbHost;
+
+            $dbPort = $ddevJson['raw']['dbinfo']['published_port'];
+
+            return $dbHost . ':' . $dbPort;
+        } catch (\Throwable $th) {
+            //throw $th;
+        }
+    }
+
     protected function getQuestionHelper(): QuestionHelper
     {
         return $this->getHelper('question');