diff options
Diffstat (limited to 'crates/shirabe-external-packages')
3 files changed, 4 insertions, 11 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs index fa63557..f517cbe 100644 --- a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs +++ b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs @@ -35,9 +35,7 @@ impl StreamOutput { ) -> anyhow::Result<Result<Self, InvalidArgumentException>> { let verbosity = verbosity.unwrap_or(VERBOSITY_NORMAL); - if !shirabe_php_shim::is_resource_value(&stream) - || "stream" != shirabe_php_shim::get_resource_type(&stream) - { + if shirabe_php_shim::get_resource_type(&stream) != "stream" { return Ok(Err(InvalidArgumentException( shirabe_php_shim::InvalidArgumentException { message: "The StreamOutput class needs a stream as its first argument." diff --git a/crates/shirabe-external-packages/src/symfony/process/pipes/abstract_pipes.rs b/crates/shirabe-external-packages/src/symfony/process/pipes/abstract_pipes.rs index 5b85813..bafd146 100644 --- a/crates/shirabe-external-packages/src/symfony/process/pipes/abstract_pipes.rs +++ b/crates/shirabe-external-packages/src/symfony/process/pipes/abstract_pipes.rs @@ -17,11 +17,9 @@ impl AbstractPipes { pub fn new(input: PhpMixed) -> Self { let mut input_buffer = String::new(); let stored_input; - // TODO(plugin): `$input instanceof \Iterator` is not modeled. `is_resource` on a PhpMixed is - // always false, so the resource branch never stores input here. - if php::is_resource(&input) { - stored_input = input; - } else if let PhpMixed::String(s) = &input { + // TODO(plugin): `$input instanceof \Iterator` is not modeled. The PHP `is_resource($input)` + // branch never applies: a PhpMixed is never a resource, so input is never stored as-is here. + if let PhpMixed::String(s) = &input { input_buffer = s.clone(); stored_input = PhpMixed::Null; } else { diff --git a/crates/shirabe-external-packages/src/symfony/process/process_utils.rs b/crates/shirabe-external-packages/src/symfony/process/process_utils.rs index aec326f..7287b28 100644 --- a/crates/shirabe-external-packages/src/symfony/process/process_utils.rs +++ b/crates/shirabe-external-packages/src/symfony/process/process_utils.rs @@ -12,9 +12,6 @@ impl ProcessUtils { /// Validates and normalizes a Process input. pub fn validate_input(caller: &str, input: PhpMixed) -> anyhow::Result<PhpMixed> { if !input.is_null() { - if php::is_resource(&input) { - return Ok(input); - } if php::is_string(&input) { return Ok(input); } |