-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #2948. Port drush_start_browser() to a trait
- Loading branch information
Showing
5 changed files
with
101 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| <?php | ||
| namespace Drush\Exec; | ||
|
|
||
| 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. | ||
| * | ||
| * @param $uri | ||
| * Optional URI or site path to open in browser. If omitted, or if a site path | ||
| * is specified, the current site home page uri will be prepended if the sites | ||
| * hostname resolves. | ||
| * @return | ||
| * TRUE if browser was opened, FALSE if browser was disabled by the user or a, | ||
| * default browser could not be found. | ||
| */ | ||
| function startBrowser($uri = NULL, $sleep = FALSE, $port = FALSE, $browser = true) { | ||
| if ($browser) { | ||
| // We can only open a browser if we have a DISPLAY environment variable on | ||
| // POSIX or are running Windows or OS X. | ||
| if (!\Drush\Drush::simulate() && !getenv('DISPLAY') && !drush_is_windows() && !drush_is_osx()) { | ||
| drush_log(dt('No graphical display appears to be available, not starting browser.'), LogLevel::INFO); | ||
| return FALSE; | ||
| } | ||
| $host = parse_url($uri, PHP_URL_HOST); | ||
| if (!$host) { | ||
| // Build a URI for the current site, if we were passed a path. | ||
| $site = drush_get_context('DRUSH_URI'); | ||
| $host = parse_url($site, PHP_URL_HOST); | ||
| $uri = $site . '/' . ltrim($uri, '/'); | ||
| } | ||
| // Validate that the host part of the URL resolves, so we don't attempt to | ||
| // open the browser for http://default or similar invalid hosts. | ||
| $hosterror = (gethostbynamel($host) === FALSE); | ||
| $iperror = (ip2long($host) && gethostbyaddr($host) == $host); | ||
| if (!\Drush\Drush::simulate() && ($hosterror || $iperror)) { | ||
| drush_log(dt('!host does not appear to be a resolvable hostname or IP, not starting browser. You may need to use the --uri option in your command or site alias to indicate the correct URL of this site.', array('!host' => $host)), LogLevel::WARNING); | ||
| return FALSE; | ||
| } | ||
| if ($port) { | ||
| $uri = str_replace($host, "localhost:$port", $uri); | ||
| } | ||
| if ($browser === TRUE) { | ||
| // See if we can find an OS helper to open URLs in default browser. | ||
| if (drush_shell_exec('which xdg-open')) { | ||
| $browser = 'xdg-open'; | ||
| } | ||
| else if (drush_shell_exec('which open')) { | ||
| $browser = 'open'; | ||
| } | ||
| else if (!drush_has_bash()) { | ||
| $browser = 'start'; | ||
| } | ||
| else { | ||
| // Can't find a valid browser. | ||
| $browser = FALSE; | ||
| } | ||
| } | ||
| $prefix = ''; | ||
| if ($sleep) { | ||
| $prefix = 'sleep ' . $sleep . ' && '; | ||
| } | ||
| if ($browser) { | ||
| drush_log(dt('Opening browser !browser at !uri', array('!browser' => $browser, '!uri' => $uri))); | ||
| if (!\Drush\Drush::simulate()) { | ||
| $pipes = array(); | ||
| proc_close(proc_open($prefix . $browser . ' ' . drush_escapeshellarg($uri) . ' 2> ' . drush_bit_bucket() . ' &', array(), $pipes)); | ||
| } | ||
| return TRUE; | ||
| } | ||
| } | ||
| return FALSE; | ||
| } | ||
|
|
||
| } |