diff options
Diffstat (limited to 'crates/shirabe-external-packages/src/symfony/console')
3 files changed, 34 insertions, 8 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/console/cursor.rs b/crates/shirabe-external-packages/src/symfony/console/cursor.rs index 9b031ab..42efff7 100644 --- a/crates/shirabe-external-packages/src/symfony/console/cursor.rs +++ b/crates/shirabe-external-packages/src/symfony/console/cursor.rs @@ -192,7 +192,7 @@ impl Cursor { let is_tty_supported = if shirabe_php_shim::function_exists("proc_open") { *IS_TTY_SUPPORTED.get_or_init(|| { let mut pipes = shirabe_php_shim::PhpMixed::Null; - shirabe_php_shim::proc_open( + shirabe_php_shim::php_truthy(&shirabe_php_shim::proc_open( "echo 1 >/dev/null", &vec![ shirabe_php_shim::PhpMixed::List(vec![ @@ -212,7 +212,10 @@ impl Cursor { ]), ], &mut pipes, - ) + None, + None, + None, + )) }) } else { false diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs index a32c95d..e62b9ac 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs @@ -85,7 +85,13 @@ impl ProcessHelper { ProcessHelperCmdElement::Process(_) => unreachable!(), }) .collect(); - process = Process::new(command, None, None, None, Some(60.0)); + process = Process::new( + command, + None, + None, + shirabe_php_shim::PhpMixed::Null, + Some(60.0), + )?; cmd = vec![]; } Some(ProcessHelperCmdElement::Process(_)) => { @@ -124,7 +130,23 @@ impl ProcessHelper { }; // PHP passes the remaining `$cmd` array as the `$env` argument to Process::run. - process.run(callback); + let env: indexmap::IndexMap<String, shirabe_php_shim::PhpMixed> = cmd + .iter() + .enumerate() + .filter_map(|(i, element)| match element { + ProcessHelperCmdElement::String(s) => { + Some((i.to_string(), shirabe_php_shim::PhpMixed::String(s.clone()))) + } + ProcessHelperCmdElement::Process(_) => None, + }) + .collect(); + let callback: Option<Box<dyn FnMut(&str, &str) -> bool>> = callback.map(|mut cb| { + Box::new(move |r#type: &str, buffer: &str| -> bool { + cb(r#type, buffer); + false + }) as Box<dyn FnMut(&str, &str) -> bool> + }); + process.run(callback, env)?; if verbosity <= output.borrow().get_verbosity() { let message = if process.is_successful() { @@ -183,7 +205,7 @@ impl ProcessHelper { error: Option<&str>, callback: Option<Box<dyn FnMut(&str, &str)>>, ) -> anyhow::Result<Process> { - let process = self.run( + let mut process = self.run( output, cmd, error, @@ -192,7 +214,7 @@ impl ProcessHelper { )?; if !process.is_successful() { - anyhow::bail!(ProcessFailedException::new(&process)); + anyhow::bail!(ProcessFailedException::new(&mut process)?); } Ok(process) diff --git a/crates/shirabe-external-packages/src/symfony/console/terminal.rs b/crates/shirabe-external-packages/src/symfony/console/terminal.rs index 377d344..e0de3f2 100644 --- a/crates/shirabe-external-packages/src/symfony/console/terminal.rs +++ b/crates/shirabe-external-packages/src/symfony/console/terminal.rs @@ -226,8 +226,9 @@ impl Terminal { }; let mut pipes = PhpMixed::Null; - let process = shirabe_php_shim::proc_open(command, &descriptorspec, &mut pipes); - if !process { + let process = + shirabe_php_shim::proc_open(command, &descriptorspec, &mut pipes, None, None, None); + if !shirabe_php_shim::php_truthy(&process) { return None; } |