danog/parallel
1
0
Fork 0
mirror of https://github.com/danog/parallel.git synced 2024-11-30 04:39:01 +01:00
Code Issues Projects Releases Wiki Activity

cs-fix

Browse Source
This commit is contained in:
Daniil Gentili 2020-02-11 23:41:45 +01:00
parent a5d4270acb
commit 7ee97e2ef0
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Context/Internal/Runner/WebRunner.php
View File

@ -5,7 +5,6 @@ namespace Amp\Parallel\Context\Internal\Runner;
use Amp\ByteStream\ResourceOutputStream; use Amp\ByteStream\ResourceOutputStream;
use Amp\Parallel\Context\ContextException; use Amp\Parallel\Context\ContextException;
use Amp\Parallel\Context\Internal\ProcessHub; use Amp\Parallel\Context\Internal\ProcessHub;
use Amp\Parallel\Context\Internal\Runner\RunnerAbstract;
use Amp\Promise; use Amp\Promise;
use Amp\Success; use Amp\Success;
@ -33,7 +32,7 @@ final class WebRunner extends RunnerAbstract
private $running = false; private $running = false;
/** /**
* Socket * Socket.
* *
* @var ResourceOutputStream * @var ResourceOutputStream
*/ */
@ -59,7 +58,7 @@ final class WebRunner extends RunnerAbstract
if (\substr($uri, -1) === '/') { // http://example.com/path/ (assumed index.php) if (\substr($uri, -1) === '/') { // http://example.com/path/ (assumed index.php)
$uri .= 'index'; // Add fake file name $uri .= 'index'; // Add fake file name
} }
$uri = str_replace('//', '/', $uri); $uri = \str_replace('//', '/', $uri);
$rootDir = \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); $rootDir = \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
$rootDir = \end($rootDir)['file'] ?? ''; $rootDir = \end($rootDir)['file'] ?? '';
@ -106,7 +105,7 @@ final class WebRunner extends RunnerAbstract
if (!\is_array($script)) { if (!\is_array($script)) {
$script = [$script]; $script = [$script];
} }
array_unshift($script, $hub->getUri()); \array_unshift($script, $hub->getUri());
$this->params = [ $this->params = [
'cwd' => $cwd, 'cwd' => $cwd,
'env' => $env, 'env' => $env,

8
lib/Context/Internal/Runner/process-runner.php
View File

@ -39,8 +39,8 @@ if (\function_exists("cli_set_process_title")) {
$fromWeb = false; $fromWeb = false;
if (!isset($argv)) { // Running from web if (!isset($argv)) { // Running from web
$argv = $_REQUEST['argv'] ?? []; $argv = $_REQUEST['argv'] ?? [];
array_unshift($argv, __DIR__); \array_unshift($argv, __DIR__);
$argc = count($argv); $argc = \count($argv);
$fromWeb = true; $fromWeb = true;
@\ini_set('html_errors', 0); @\ini_set('html_errors', 0);
@ -135,9 +135,9 @@ if (!isset($argv)) { // Running from web
if ($fromWeb) { // Set environment variables only after auth if ($fromWeb) { // Set environment variables only after auth
if (isset($_REQUEST['cwd'])) { if (isset($_REQUEST['cwd'])) {
chdir($_REQUEST['cwd']); \chdir($_REQUEST['cwd']);
} }
if (isset($_REQUEST['env']) && is_array($_REQUEST['env'])) { if (isset($_REQUEST['env']) && \is_array($_REQUEST['env'])) {
foreach ($_REQUEST['env'] as $key => $value) { foreach ($_REQUEST['env'] as $key => $value) {
@\putenv("$key=$value"); @\putenv("$key=$value");
} }