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/tests/installer/library_installer_test.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/tests/installer/library_installer_test.rs')
| -rw-r--r-- | crates/shirabe/tests/installer/library_installer_test.rs | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/crates/shirabe/tests/installer/library_installer_test.rs b/crates/shirabe/tests/installer/library_installer_test.rs index 8a063941..baa4f13a 100644 --- a/crates/shirabe/tests/installer/library_installer_test.rs +++ b/crates/shirabe/tests/installer/library_installer_test.rs @@ -200,19 +200,31 @@ fn test_is_installed() { let package = get_package("test/pkg", "1.0.0"); let mut repository = InstalledArrayRepository::new().unwrap(); - assert!(!library.is_installed(&repository, package.clone())); + assert!( + !library + .is_installed(&mut repository, package.clone()) + .unwrap() + ); // package being in repo is not enough to be installed repository.add_package(package.clone()).unwrap(); - assert!(!library.is_installed(&repository, package.clone())); + assert!( + !library + .is_installed(&mut repository, package.clone()) + .unwrap() + ); // package being in repo and vendor/pkg/foo dir present means it is seen as installed let pkg_dir = format!("{}/{}", setup.vendor_dir, package.get_pretty_name()); fs::create_dir_all(&pkg_dir).unwrap(); - assert!(library.is_installed(&repository, package.clone())); + assert!( + library + .is_installed(&mut repository, package.clone()) + .unwrap() + ); repository.remove_package(package.clone()).unwrap(); - assert!(!library.is_installed(&repository, package)); + assert!(!library.is_installed(&mut repository, package).unwrap()); tear_down(&mut setup); } @@ -249,7 +261,7 @@ fn test_install() { .unwrap(); // PHP asserts repository->addPackage was called once with $package. - assert!(repository.has_package(package)); + assert!(repository.has_package(package).unwrap()); assert!( std::path::Path::new(&setup.vendor_dir).exists(), @@ -317,8 +329,8 @@ fn test_update() { ); assert!(!std::path::Path::new(&old_target_dir).exists()); - assert!(!repository.has_package(initial.clone())); - assert!(repository.has_package(target.clone())); + assert!(!repository.has_package(initial.clone()).unwrap()); + assert!(repository.has_package(target.clone()).unwrap()); assert!( std::path::Path::new(&setup.vendor_dir).exists(), @@ -379,7 +391,7 @@ fn test_uninstall() { )) .unwrap(); - assert!(!repository.has_package(package.clone())); + assert!(!repository.has_package(package.clone()).unwrap()); // Uninstalling again, with the package no longer installed, fails. assert!( |
