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 | |
| 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')
8 files changed, 49 insertions, 37 deletions
diff --git a/crates/shirabe/tests/advisory/auditor_test.rs b/crates/shirabe/tests/advisory/auditor_test.rs index adc90a4d..65e848dd 100644 --- a/crates/shirabe/tests/advisory/auditor_test.rs +++ b/crates/shirabe/tests/advisory/auditor_test.rs @@ -144,10 +144,10 @@ impl AdvisoryProviderInterface for MockAdvisoryRepository { } impl RepositoryInterface for MockAdvisoryRepository { - fn count(&self) -> anyhow::Result<usize> { + fn count(&mut self) -> anyhow::Result<usize> { unimplemented!("not used by Auditor") } - fn has_package(&self, _package: PackageInterfaceHandle) -> bool { + fn has_package(&mut self, _package: PackageInterfaceHandle) -> anyhow::Result<bool> { unimplemented!("not used by Auditor") } fn find_package( diff --git a/crates/shirabe/tests/autoload/autoload_generator_test.rs b/crates/shirabe/tests/autoload/autoload_generator_test.rs index 09ff2101..5f0629dd 100644 --- a/crates/shirabe/tests/autoload/autoload_generator_test.rs +++ b/crates/shirabe/tests/autoload/autoload_generator_test.rs @@ -39,10 +39,10 @@ impl InstallerInterface for InstallPathStubInstaller { fn is_installed( &self, - _repo: &dyn InstalledRepositoryInterface, + _repo: &mut dyn InstalledRepositoryInterface, _package: PackageInterfaceHandle, - ) -> bool { - true + ) -> anyhow::Result<bool> { + Ok(true) } async fn download( diff --git a/crates/shirabe/tests/installer/installation_manager_test.rs b/crates/shirabe/tests/installer/installation_manager_test.rs index 3f18e925..6cc231f5 100644 --- a/crates/shirabe/tests/installer/installation_manager_test.rs +++ b/crates/shirabe/tests/installer/installation_manager_test.rs @@ -75,10 +75,10 @@ impl InstallerInterface for MockInstaller { fn is_installed( &self, - _repo: &dyn InstalledRepositoryInterface, + _repo: &mut dyn InstalledRepositoryInterface, _package: PackageInterfaceHandle, - ) -> bool { - false + ) -> anyhow::Result<bool> { + Ok(false) } async fn download( @@ -175,10 +175,10 @@ impl InstallerInterface for BinaryInstaller { fn is_installed( &self, - _repo: &dyn InstalledRepositoryInterface, + _repo: &mut dyn InstalledRepositoryInterface, _package: PackageInterfaceHandle, - ) -> bool { - false + ) -> anyhow::Result<bool> { + Ok(false) } async fn download( 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!( diff --git a/crates/shirabe/tests/installer/metapackage_installer_test.rs b/crates/shirabe/tests/installer/metapackage_installer_test.rs index 86013871..b87fdebd 100644 --- a/crates/shirabe/tests/installer/metapackage_installer_test.rs +++ b/crates/shirabe/tests/installer/metapackage_installer_test.rs @@ -30,7 +30,7 @@ fn test_install() { )) .unwrap(); - assert!(repository.has_package(package)); + assert!(repository.has_package(package).unwrap()); } #[test] @@ -50,8 +50,8 @@ fn test_update() { )) .unwrap(); - 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()); // Updating again, with the initial package no longer installed, fails. assert!( @@ -81,7 +81,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!( diff --git a/crates/shirabe/tests/repository/array_repository_test.rs b/crates/shirabe/tests/repository/array_repository_test.rs index 069e9113..e3fbf93c 100644 --- a/crates/shirabe/tests/repository/array_repository_test.rs +++ b/crates/shirabe/tests/repository/array_repository_test.rs @@ -48,7 +48,7 @@ fn reprs(results: &[SearchResult]) -> Vec<(String, Option<String>, Abandoned)> { #[test] fn test_add_package() { - let repo = ArrayRepository::new(vec![]).unwrap(); + let mut repo = ArrayRepository::new(vec![]).unwrap(); repo.add_package(get_package("foo", "1")).unwrap(); assert_eq!(1, repo.count().unwrap()); @@ -74,12 +74,12 @@ fn test_remove_package() { #[test] fn test_has_package() { - let repo = ArrayRepository::new(vec![]).unwrap(); + let mut repo = ArrayRepository::new(vec![]).unwrap(); repo.add_package(get_package("foo", "1")).unwrap(); repo.add_package(get_package("bar", "2")).unwrap(); - assert!(repo.has_package(get_package("foo", "1"))); - assert!(!repo.has_package(get_package("bar", "1"))); + assert!(repo.has_package(get_package("foo", "1")).unwrap()); + assert!(!repo.has_package(get_package("bar", "1")).unwrap()); } #[test] @@ -100,7 +100,7 @@ fn test_find_packages() { #[test] fn test_automatically_add_aliased_package_but_not_remove() { - let repo = ArrayRepository::new(vec![]).unwrap(); + let mut repo = ArrayRepository::new(vec![]).unwrap(); let package = get_package("foo", "1"); let alias = get_alias_package(&package, "2"); @@ -108,8 +108,8 @@ fn test_automatically_add_aliased_package_but_not_remove() { repo.add_package(alias.clone()).unwrap(); assert_eq!(2, repo.count().unwrap()); - assert!(repo.has_package(get_package("foo", "1"))); - assert!(repo.has_package(get_package("foo", "2"))); + assert!(repo.has_package(get_package("foo", "1")).unwrap()); + assert!(repo.has_package(get_package("foo", "2")).unwrap()); repo.remove_package(alias); diff --git a/crates/shirabe/tests/repository/composite_repository_test.rs b/crates/shirabe/tests/repository/composite_repository_test.rs index 5fa0fb8d..60408b5d 100644 --- a/crates/shirabe/tests/repository/composite_repository_test.rs +++ b/crates/shirabe/tests/repository/composite_repository_test.rs @@ -13,16 +13,16 @@ fn array_repo(packages: Vec<PackageInterfaceHandle>) -> RepositoryInterfaceHandl #[test] fn test_has_package() { - let repo = CompositeRepository::new(vec![ + let mut repo = CompositeRepository::new(vec![ array_repo(vec![get_package("foo", "1")]), array_repo(vec![get_package("bar", "1")]), ]); - assert!(repo.has_package(get_package("foo", "1"))); - assert!(repo.has_package(get_package("bar", "1"))); + assert!(repo.has_package(get_package("foo", "1")).unwrap()); + assert!(repo.has_package(get_package("bar", "1")).unwrap()); - assert!(!repo.has_package(get_package("foo", "2"))); - assert!(!repo.has_package(get_package("bar", "2"))); + assert!(!repo.has_package(get_package("foo", "2")).unwrap()); + assert!(!repo.has_package(get_package("bar", "2")).unwrap()); } #[test] @@ -111,7 +111,7 @@ fn test_add_repository() { #[test] fn test_count() { - let repo = CompositeRepository::new(vec![ + let mut repo = CompositeRepository::new(vec![ array_repo(vec![get_package("foo", "1")]), array_repo(vec![get_package("bar", "1")]), ]); diff --git a/crates/shirabe/tests/repository/filesystem_repository_test.rs b/crates/shirabe/tests/repository/filesystem_repository_test.rs index 054a6d7c..c7b8f9a6 100644 --- a/crates/shirabe/tests/repository/filesystem_repository_test.rs +++ b/crates/shirabe/tests/repository/filesystem_repository_test.rs @@ -99,7 +99,7 @@ mockall::mock! { fn disable_plugins(&mut self); fn is_package_installed( &mut self, - repo: &dyn InstalledRepositoryInterface, + repo: &mut dyn InstalledRepositoryInterface, package: PackageInterfaceHandle, ) -> anyhow::Result<bool>; fn ensure_binaries_presence(&mut self, package: PackageInterfaceHandle); |
