Open generated file in editor - and misc (#3829)

* Remove commented out config.yml code.

* Open generated file in editor

* Update doxygen for startBrowser()

* Update code comments

Author: weitzman

.circleci/config.yml

@@ -158,13 +158,3 @@ workflows:
       - test_72_highest
       - test_71_sqlite
       - test_71_postgres
-#          pre-steps:
-#            - run:
-#                name: install dockerize
-#                command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && tar -C . -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-#                environment:
-#                  DOCKERIZE_VERSION: v0.3.0
-#            - run:
-#                name: Wait for db
-#                command: ./dockerize -wait tcp://localhost:5432 -timeout 1m
-

src/Commands/generate/Helper/OutputHandler.php

@@ -2,7 +2,9 @@
 
 namespace Drush\Commands\generate\Helper;
 
+use Consolidation\SiteProcess\Util\Escape;
 use DrupalCodeGenerator\Helper\OutputHandler as BaseOutputHandler;
+use Drush\Drush;
 use Symfony\Component\Console\Output\OutputInterface;
 use Webmozart\PathUtil\Path;
 
@@ -26,13 +28,12 @@ public function printSummary(OutputInterface $output, array $dumped_files)
             $file = Path::join($directory, $file);
         }
 
-        // @todo fix this.
-        if (false && defined('DRUPAL_ROOT') && $dumped_files) {
-            // @todo Below code is forking new process well but current process is not shutting down fully.
+        if (defined('DRUPAL_ROOT') && $dumped_files) {
             $exec = drush_get_editor();
-            $exec = str_replace('%s', drush_escapeshellarg(Path::makeAbsolute($dumped_files[0], DRUPAL_ROOT)), $exec);
-            $pipes = [];
-            proc_close(proc_open($exec . ' 2> ' . drush_bit_bucket() . ' &', [], $pipes));
+            $exec = str_replace('%s', Escape::shellArg(Path::makeAbsolute($dumped_files[0], DRUPAL_ROOT)), $exec);
+            $process = Drush::process($exec);
+            // Use start() in order to get an async fork.
+            $process->start();
         }
         parent::printSummary($output, $dumped_files);
     }

src/Exec/ExecTrait.php

@@ -9,7 +9,7 @@ trait ExecTrait
     /**
      * Starts a background browser/tab for the current site or a specified URL.
      *
-     * Uses a non-blocking proc_open call, so Drush execution will continue.
+     * Uses a non-blocking Process call, so Drush execution will continue.
      *
      * @param $uri
      *   Optional URI or site path to open in browser. If omitted, or if a site path
@@ -18,8 +18,8 @@ trait ExecTrait
      * @param int $sleep
      * @param bool $port
      * @param bool $browser
-     * @return bool TRUE if browser was opened, FALSE if browser was disabled by the user or a,
-     *   TRUE if browser was opened, FALSE if browser was disabled by the user or a,
+     * @return bool
+     *   TRUE if browser was opened. FALSE if browser was disabled by the user or a
      *   default browser could not be found.
      */
     public function startBrowser($uri = null, $sleep = 0, $port = false, $browser = true)
@@ -72,7 +72,6 @@ public function startBrowser($uri = null, $sleep = 0, $port = false, $browser =
                     }
                     // @todo We implode because quoting is messing up the sleep.
                     $process = Drush::process(implode(' ', array_merge($args, [$browser, $uri])));
-                    $process->setTty(true);
                     $process->run();
                 }
                 return true;

src/Sql/SqlBase.php

@@ -252,7 +252,7 @@ public function query($query, $input_file = null, $result_file = '')
     /**
      * Execute a SQL query. Always execute regardless of simulate mode.
      *
-     * If you don't want query to print during --debug then
+     * If you don't want results to print during --debug then
      * provide a $result_file whose value can be drush_bit_bucket().
      *
      * @param string $query
@@ -302,7 +302,7 @@ public function alwaysQuery($query, $input_file = null, $result_file = '')
             $exec .= ' > '. Escape::shellArg($result_file);
         }
 
-        // In --verbose mode, drush_shell_exec() will show the call to mysql/psql/sqlite,
+        // In --verbose mode, Process will show the call to mysql/psql/sqlite,
         // but the sql query itself is stored in a temp file and not displayed.
         // We show the query when --debug is used and this function created the temp file.
         $this->logQueryInDebugMode($query, $input_file_original);