diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-02 08:42:55 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-02 08:42:55 +0900 |
| commit | b5d6d91054b9ceef95aef0819bb5c4ef7db1abdd (patch) | |
| tree | 0bd12e599f48fcc63375363363416ca48766c698 /crates/shirabe/src/repository/composite_repository.rs | |
| parent | 3e367f78eec3521106979461fda717926717515a (diff) | |
| download | php-shirabe-b5d6d91054b9ceef95aef0819bb5c4ef7db1abdd.tar.gz php-shirabe-b5d6d91054b9ceef95aef0819bb5c4ef7db1abdd.tar.zst php-shirabe-b5d6d91054b9ceef95aef0819bb5c4ef7db1abdd.zip | |
fix(repository): run lazy initialization in count/has_package
PHP's ArrayRepository::count()/hasPackage() call $this->initialize(),
which late-binds to the concrete repository class and lazily loads its
packages. The Rust pass-throughs skipped that: they ran ArrayRepository's
stub initialize instead, returning 0/false and marking the repository
initialized with an empty package list, which made ensure_initialized()
skip the real initialization forever after.
Take &mut self in RepositoryInterface::count/has_package so the lazy
repositories (Filesystem, Platform, Composer) can guard with their real
initialize, and return Result from has_package since that initialization
can fail (PHP propagates the exception). InstallerInterface::is_installed
and InstallationManager::is_package_installed/mark_alias_installed
propagate the same way, which also resolves the TODO(phase-d) markers on
Package/Path/Artifact/Vcs repositories about initialization errors being
swallowed.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/repository/composite_repository.rs')
| -rw-r--r-- | crates/shirabe/src/repository/composite_repository.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/shirabe/src/repository/composite_repository.rs b/crates/shirabe/src/repository/composite_repository.rs index 9e5c9757..a9c55a0f 100644 --- a/crates/shirabe/src/repository/composite_repository.rs +++ b/crates/shirabe/src/repository/composite_repository.rs @@ -60,7 +60,7 @@ impl CompositeRepository { } impl RepositoryInterface for CompositeRepository { - fn count(&self) -> anyhow::Result<usize> { + fn count(&mut self) -> anyhow::Result<usize> { let mut total = 0; for repository in &self.repositories { total += repository.count()?; @@ -78,13 +78,13 @@ impl RepositoryInterface for CompositeRepository { format!("composite repo ({})", names.join(", ")) } - fn has_package(&self, package: PackageInterfaceHandle) -> bool { + fn has_package(&mut self, package: PackageInterfaceHandle) -> anyhow::Result<bool> { for repository in &self.repositories { - if repository.has_package(package.clone()) { - return true; + if repository.has_package(package.clone())? { + return Ok(true); } } - false + Ok(false) } fn find_package( |
