aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/dependency_resolver
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-07 10:33:53 +0900
committernsfisis <nsfisis@gmail.com>2026-06-07 10:33:53 +0900
commit971824aa15334fd12d08ae0f441f6bf6079344c3 (patch)
treed59892042f478c65d980d96f62ef633644fd8fea /crates/shirabe/src/dependency_resolver
parent0d45c403c20ac8950f2877a21f9cd4f0ca9bf784 (diff)
downloadphp-shirabe-971824aa15334fd12d08ae0f441f6bf6079344c3.tar.gz
php-shirabe-971824aa15334fd12d08ae0f441f6bf6079344c3.tar.zst
php-shirabe-971824aa15334fd12d08ae0f441f6bf6079344c3.zip
feat(shirabe): resolve phase-b TODOs with shared ownership
Replace TODO(phase-b) placeholders (todo!() and commented-out code) with real implementations: - Share JsonFile via Rc<RefCell<JsonFile>> so JsonConfigSource and the owning command can hold the same instance (base_config_command, config_command, repository_command, require_command, create_project, remove_command, factory) - Change InstallerInterface methods (is_installed, download, prepare, cleanup, get_install_path) to &mut self so initialize_vendor_dir can run, propagated to all installer implementations - Pass io/config/filesystem/process by clone instead of moving or stubbing (auth_helper, svn_driver, curl_downloader, library_installer) - Make TransportException Clone and store it by value in VcsRepository - Clone operations in Transaction sort, root_aliases/temporary_constraints in RepositorySet::create_pool, and share CompletePackage via handle in PlatformRepository - Wire up set_option, set_requires/set_dev_requires, installation manager setters, BumpCommand::set_composer, and clean_backups/set_local_phar
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
-rw-r--r--crates/shirabe/src/dependency_resolver/transaction.rs24
1 files changed, 7 insertions, 17 deletions
diff --git a/crates/shirabe/src/dependency_resolver/transaction.rs b/crates/shirabe/src/dependency_resolver/transaction.rs
index 874085f..f9ee5f0 100644
--- a/crates/shirabe/src/dependency_resolver/transaction.rs
+++ b/crates/shirabe/src/dependency_resolver/transaction.rs
@@ -231,10 +231,8 @@ impl Transaction {
// TODO skip updates which don't update? is this needed? we shouldn't schedule this update in the first place?
// if ('update' === $opType) { ... }
- // PHP: return $this->operations = $operations;
- // TODO(phase-b): self.operations assignment plus return — caller needs owned Vec
- self.operations = todo!("operations cloned for both assignment and return");
- todo!("return cloned operations")
+ self.operations = operations.clone();
+ operations
}
/// Determine which packages in the result are not required by any other packages in it.
@@ -339,19 +337,12 @@ impl Transaction {
// is this a plugin with no meaningful dependencies?
if is_downloads_modifying_plugin && requires.is_empty() {
// plugins with no dependencies go to the very front
- // TODO(phase-b): move ownership of operations[idx] into the new vec
- array_unshift(
- &mut dl_modifying_plugins_no_deps,
- todo!("operations[idx] moved out"),
- );
+ array_unshift(&mut dl_modifying_plugins_no_deps, operations[idx].clone());
} else {
// capture the requirements for this package so those packages will be moved up as well
dl_modifying_plugin_requires.extend(requires);
// move the operation to the front
- array_unshift(
- &mut dl_modifying_plugins_with_deps,
- todo!("operations[idx] moved out"),
- );
+ array_unshift(&mut dl_modifying_plugins_with_deps, operations[idx].clone());
}
to_remove.push(idx);
@@ -373,12 +364,12 @@ impl Transaction {
// is this a plugin with no meaningful dependencies?
if is_plugin && requires.is_empty() {
// plugins with no dependencies go to the very front
- array_unshift(&mut plugins_no_deps, todo!("operations[idx] moved out"));
+ array_unshift(&mut plugins_no_deps, operations[idx].clone());
} else {
// capture the requirements for this package so those packages will be moved up as well
plugin_requires.extend(requires);
// move the operation to the front
- array_unshift(&mut plugins_with_deps, todo!("operations[idx] moved out"));
+ array_unshift(&mut plugins_with_deps, operations[idx].clone());
}
to_remove.push(idx);
@@ -424,8 +415,7 @@ impl Transaction {
.downcast_ref::<MarkAliasUninstalledOperation>()
.is_some();
if is_uninstall {
- // TODO(phase-b): move ownership out of operations[idx]
- uninst_ops.push(todo!("operations[idx] moved out"));
+ uninst_ops.push(op.clone());
to_remove.push(idx);
}
}