1 files changed, 12 insertions, 21 deletions
diff --git a/crates/shirabe/tests/common/process_executor_mock.rs b/crates/shirabe/tests/common/process_executor_mock.rs
index 33d9dfba..eb39b9c6 100644
--- a/crates/shirabe/tests/common/process_executor_mock.rs
+++ b/crates/shirabe/tests/common/process_executor_mock.rs
@@ -1,7 +1,6 @@
 //! ref: composer/tests/Composer/Test/Mock/ProcessExecutorMock.php
 
-use shirabe::util::process_executor::{MockExpectation, MockHandler, ProcessExecutor};
-use shirabe_php_shim::PhpMixed;
+use shirabe::util::process_executor::{CommandLine, MockExpectation, MockHandler, ProcessExecutor};
 
 // A command expectation as written in the PHP tests: either a bare command
 // (`'git command'` / `['git', '--version']`) or the full
@@ -29,44 +28,36 @@ pub fn cmd_full(
 // string args. Comparison against the executed command is exact (PHP `===`), so
 // the form here must match the form the code under test passes to `execute`.
 pub trait IntoMockCmd {
-    fn into_mock_cmd(self) -> PhpMixed;
+    fn into_mock_cmd(self) -> CommandLine;
 }
 
 impl IntoMockCmd for &str {
-    fn into_mock_cmd(self) -> PhpMixed {
-        PhpMixed::String(self.to_string())
+    fn into_mock_cmd(self) -> CommandLine {
+        CommandLine::Shell(self.to_string())
     }
 }
 
 impl IntoMockCmd for String {
-    fn into_mock_cmd(self) -> PhpMixed {
-        PhpMixed::String(self)
+    fn into_mock_cmd(self) -> CommandLine {
+        CommandLine::Shell(self)
     }
 }
 
 impl IntoMockCmd for Vec<&str> {
-    fn into_mock_cmd(self) -> PhpMixed {
-        PhpMixed::List(
-            self.into_iter()
-                .map(|s| PhpMixed::String(s.to_string()))
-                .collect(),
-        )
+    fn into_mock_cmd(self) -> CommandLine {
+        CommandLine::Args(self.into_iter().map(|s| s.to_string()).collect())
     }
 }
 
 impl IntoMockCmd for Vec<String> {
-    fn into_mock_cmd(self) -> PhpMixed {
-        PhpMixed::List(self.into_iter().map(PhpMixed::String).collect())
+    fn into_mock_cmd(self) -> CommandLine {
+        CommandLine::Args(self)
     }
 }
 
 impl<const N: usize> IntoMockCmd for [&str; N] {
-    fn into_mock_cmd(self) -> PhpMixed {
-        PhpMixed::List(
-            self.iter()
-                .map(|s| PhpMixed::String(s.to_string()))
-                .collect(),
-        )
+    fn into_mock_cmd(self) -> CommandLine {
+        CommandLine::Args(self.iter().map(|s| s.to_string()).collect())
     }
 }