aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-27 17:21:00 +0900
committernsfisis <nsfisis@gmail.com>2026-06-27 17:26:28 +0900
commite98823e599eb375b30037cc714710e3309d927d1 (patch)
treee1689ec164086798fc46aa6a58d1e914cf4873b2 /crates/shirabe/src/package
parent20f620bdd0b5764ed2e9812dc0772f907b0d6f29 (diff)
downloadphp-shirabe-e98823e599eb375b30037cc714710e3309d927d1.tar.gz
php-shirabe-e98823e599eb375b30037cc714710e3309d927d1.tar.zst
php-shirabe-e98823e599eb375b30037cc714710e3309d927d1.zip
test: port Composer tests unblocked by mockall, add seams
Port 11 categories of previously-ignored Composer tests now reachable with the mockall crate: DownloadManager, VCS/Perforce/File downloaders, VersionSelector, PlatformRepository, Auditor, installer/FilesystemRepository, RootPackageLoader, util auth/http, commands, and Cache. Extract test seams additively on concrete structs as *Interface traits (Runtime, HhvmDetector, VersionGuesser, RepositorySet, Perforce, BinaryInstaller) plus mock-field seams (Cache, Filesystem); consumers take trait objects. Mocks are defined locally in the test crates via mockall::mock!, since automock-generated mocks are cfg(test)-gated and invisible across the integration-test boundary. dataProviders are ported in full; tests blocked by unported shims stay #[ignore] with documented reasons rather than reduced or weakened. Fix product bugs surfaced by the ports: - util/github: use the exception code, not the HTTP status, for 401/403 - advisory: serialize empty audit maps as [] to match PHP json_encode - repository/filesystem and downloader/file: fix RefCell double-borrow panics Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/package')
-rw-r--r--crates/shirabe/src/package/loader/root_package_loader.rs9
-rw-r--r--crates/shirabe/src/package/version/version_guesser.rs27
-rw-r--r--crates/shirabe/src/package/version/version_selector.rs6
3 files changed, 35 insertions, 7 deletions
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs
index 556f36e..c0101ac 100644
--- a/crates/shirabe/src/package/loader/root_package_loader.rs
+++ b/crates/shirabe/src/package/loader/root_package_loader.rs
@@ -11,6 +11,7 @@ use crate::package::loader::ArrayLoader;
use crate::package::loader::LoaderInterface;
use crate::package::loader::ValidatingArrayLoader;
use crate::package::version::VersionGuesser;
+use crate::package::version::VersionGuesserInterface;
use crate::package::version::VersionParser;
use crate::package::{RootPackage, STABILITIES, SUPPORTED_LINK_TYPES};
use crate::repository::RepositoryFactory;
@@ -23,7 +24,7 @@ pub struct RootPackageLoader {
inner: ArrayLoader,
manager: std::rc::Rc<std::cell::RefCell<RepositoryManager>>,
config: std::rc::Rc<std::cell::RefCell<Config>>,
- version_guesser: VersionGuesser,
+ version_guesser: Box<dyn VersionGuesserInterface>,
io: Option<std::rc::Rc<std::cell::RefCell<dyn IOInterface>>>,
}
@@ -32,19 +33,19 @@ impl RootPackageLoader {
manager: std::rc::Rc<std::cell::RefCell<RepositoryManager>>,
config: std::rc::Rc<std::cell::RefCell<Config>>,
parser: Option<VersionParser>,
- version_guesser: Option<VersionGuesser>,
+ version_guesser: Option<Box<dyn VersionGuesserInterface>>,
io: Option<std::rc::Rc<std::cell::RefCell<dyn IOInterface>>>,
) -> Self {
let inner = ArrayLoader::new(parser, true);
let version_guesser = version_guesser.unwrap_or_else(|| {
let mut process_executor = ProcessExecutor::new(io.clone());
process_executor.enable_async();
- VersionGuesser::new(
+ Box::new(VersionGuesser::new(
config.clone(),
std::rc::Rc::new(std::cell::RefCell::new(process_executor)),
inner.version_parser.clone(),
io.clone(),
- )
+ ))
});
Self {
inner,
diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs
index c5bf4c2..6642201 100644
--- a/crates/shirabe/src/package/version/version_guesser.rs
+++ b/crates/shirabe/src/package/version/version_guesser.rs
@@ -20,6 +20,19 @@ use crate::util::Platform;
use crate::util::ProcessExecutor;
use crate::util::Svn as SvnUtil;
+/// Seam over the parts of [`VersionGuesser`] that consumers depend on, so they can be exercised
+/// with a test double. PHP has no such interface; this exists only to allow mocking the concrete
+/// `VersionGuesser` (a Phase C seam).
+pub trait VersionGuesserInterface: std::fmt::Debug {
+ fn guess_version(
+ &mut self,
+ package_config: &IndexMap<String, PhpMixed>,
+ path: &str,
+ ) -> Result<Option<VersionData>>;
+
+ fn get_root_version_from_env(&self) -> Result<String>;
+}
+
/// Try to guess the current version number based on different VCS configuration.
///
/// @phpstan-type Version array{version: string, commit: string|null, pretty_version: string|null}|array{version: string, commit: string|null, pretty_version: string|null, feature_version: string|null, feature_pretty_version: string|null}
@@ -747,6 +760,20 @@ impl VersionGuesser {
}
}
+impl VersionGuesserInterface for VersionGuesser {
+ fn guess_version(
+ &mut self,
+ package_config: &IndexMap<String, PhpMixed>,
+ path: &str,
+ ) -> Result<Option<VersionData>> {
+ VersionGuesser::guess_version(self, package_config, path)
+ }
+
+ fn get_root_version_from_env(&self) -> Result<String> {
+ VersionGuesser::get_root_version_from_env(self)
+ }
+}
+
#[derive(Debug)]
pub struct FeatureVersionResult {
pub version: Option<String>,
diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs
index 793dd4e..8a0d037 100644
--- a/crates/shirabe/src/package/version/version_selector.rs
+++ b/crates/shirabe/src/package/version/version_selector.rs
@@ -23,18 +23,18 @@ use crate::package::loader::ArrayLoader;
use crate::package::version::VersionParser;
use crate::repository::PlatformRepository;
use crate::repository::RepositoryInterface;
-use crate::repository::RepositorySet;
+use crate::repository::RepositorySetInterface;
#[derive(Debug)]
pub struct VersionSelector {
- repository_set: std::rc::Rc<std::cell::RefCell<RepositorySet>>,
+ repository_set: std::rc::Rc<std::cell::RefCell<dyn RepositorySetInterface>>,
platform_constraints: IndexMap<String, Vec<AnyConstraint>>,
parser: Option<VersionParser>,
}
impl VersionSelector {
pub fn new(
- repository_set: std::rc::Rc<std::cell::RefCell<RepositorySet>>,
+ repository_set: std::rc::Rc<std::cell::RefCell<dyn RepositorySetInterface>>,
platform_repo: Option<&mut crate::repository::PlatformRepository>,
) -> anyhow::Result<Self> {
let mut platform_constraints: IndexMap<String, Vec<AnyConstraint>> = IndexMap::new();