aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/loader
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-25 17:49:35 +0900
committernsfisis <nsfisis@gmail.com>2026-06-26 00:20:05 +0900
commitd4ec1dcb6fc04ff029ded35cc2fcc14f3bbc02ad (patch)
tree0a85bd085961fcdfd5570cafc3b44ba5eb8cb152 /crates/shirabe/src/package/loader
parent22d0b327368e5f39de6f381046c081d08efdba15 (diff)
downloadphp-shirabe-d4ec1dcb6fc04ff029ded35cc2fcc14f3bbc02ad.tar.gz
php-shirabe-d4ec1dcb6fc04ff029ded35cc2fcc14f3bbc02ad.tar.zst
php-shirabe-d4ec1dcb6fc04ff029ded35cc2fcc14f3bbc02ad.zip
test: port 32 command/repository/downloader tests
Add create_installed_json/create_composer_lock test helpers. Port command (8), repository path/forgejo/perforce/vcs (11), and fossil/hg/download_manager (13) tests. Fix production porting bugs: root_package_loader/forgejo_url/version_bumper regex delimiters, repository_manager create_repository_by_class, array_loader isset, licenses_command RefCell borrow; implement disk_free_space and touch2/touch3 via libc. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/package/loader')
-rw-r--r--crates/shirabe/src/package/loader/array_loader.rs22
-rw-r--r--crates/shirabe/src/package/loader/root_package_loader.rs14
2 files changed, 21 insertions, 15 deletions
diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs
index 844b3ef..20280e0 100644
--- a/crates/shirabe/src/package/loader/array_loader.rs
+++ b/crates/shirabe/src/package/loader/array_loader.rs
@@ -370,7 +370,7 @@ impl ArrayLoader {
package.package_mut().set_is_default_branch(true);
}
- if let Some(source) = config.get("source").cloned() {
+ if let Some(source) = config.get("source").filter(|v| !v.is_null()).cloned() {
let source_map = match &source {
PhpMixed::Array(m) => Some(m.clone()),
_ => None,
@@ -404,9 +404,12 @@ impl ArrayLoader {
package
.package_mut()
.set_source_url(source_map.get("url").map(|v| strval(v)));
- package
- .package_mut()
- .set_source_reference(source_map.get("reference").map(|v| strval(v)));
+ package.package_mut().set_source_reference(
+ source_map
+ .get("reference")
+ .filter(|v| !v.is_null())
+ .map(|v| strval(v)),
+ );
if let Some(mirrors) = source_map.get("mirrors") {
package
.package_mut()
@@ -414,7 +417,7 @@ impl ArrayLoader {
}
}
- if let Some(dist) = config.get("dist").cloned() {
+ if let Some(dist) = config.get("dist").filter(|v| !v.is_null()).cloned() {
let dist_map = match &dist {
PhpMixed::Array(m) => Some(m.clone()),
_ => None,
@@ -446,9 +449,12 @@ impl ArrayLoader {
package
.package_mut()
.set_dist_url(dist_map.get("url").map(|v| strval(v)));
- package
- .package_mut()
- .set_dist_reference(dist_map.get("reference").map(|v| strval(v)));
+ package.package_mut().set_dist_reference(
+ dist_map
+ .get("reference")
+ .filter(|v| !v.is_null())
+ .map(|v| strval(v)),
+ );
package
.package_mut()
.set_dist_sha1_checksum(dist_map.get("shasum").map(|v| strval(v)));
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs
index 9cd1eac..308706f 100644
--- a/crates/shirabe/src/package/loader/root_package_loader.rs
+++ b/crates/shirabe/src/package/loader/root_package_loader.rs
@@ -266,7 +266,7 @@ impl RootPackageLoader {
for (req_name, req_version) in requires {
let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
if Preg::is_match3(
- r"(?:^|\| *|, *)([^,\s#|]+)(?:#[^ ]+)? +as +([^,\s|]+)(?:$| *\|| *)",
+ r"{(?:^|\| *|, *)([^,\s#|]+)(?:#[^ ]+)? +as +([^,\s|]+)(?:$| *\|| *,)}",
req_version,
Some(&mut m),
) {
@@ -320,7 +320,7 @@ impl RootPackageLoader {
for (req_name, req_version) in requires {
let mut constraints: Vec<String> = vec![];
- let or_split = Preg::split(r"\s*\|\|?\s*", req_version.trim());
+ let or_split = Preg::split(r"{\s*\|\|?\s*}", req_version.trim());
for or_constraint in &or_split {
let and_split = shirabe_semver::split_and_constraints(or_constraint);
for and_constraint in and_split {
@@ -329,7 +329,7 @@ impl RootPackageLoader {
}
let stability_names: Vec<&str> = stabilities.keys().copied().collect();
- let pattern = format!("^[^@]*?@({})$", stability_names.join("|"));
+ let pattern = format!("{{^[^@]*?@({})$}}i", stability_names.join("|"));
let mut matched = false;
for constraint in &constraints {
@@ -353,8 +353,8 @@ impl RootPackageLoader {
}
for constraint in &constraints {
- let req_version_stripped = Preg::replace(r"^([^,\s@]+) as .+$", "$1", constraint);
- if Preg::is_match(r"^[^,\s@]+$", &req_version_stripped) {
+ let req_version_stripped = Preg::replace(r"{^([^,\s@]+) as .+$}", "$1", constraint);
+ if Preg::is_match(r"{^[^,\s@]+$}", &req_version_stripped) {
let stability_name = VersionParser::parse_stability(&req_version_stripped);
if stability_name != "stable" {
let name = strtolower(req_name);
@@ -378,9 +378,9 @@ impl RootPackageLoader {
mut references: IndexMap<String, String>,
) -> IndexMap<String, String> {
for (req_name, req_version) in requires {
- let req_version = Preg::replace(r"^([^,\s@]+) as .+$", "$1", req_version);
+ let req_version = Preg::replace(r"{^([^,\s@]+) as .+$}", "$1", req_version);
let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
- if Preg::is_match3(r"^[^,\s@]+?#([a-f0-9]+)$", &req_version, Some(&mut m))
+ if Preg::is_match3(r"{^[^,\s@]+?#([a-f0-9]+)$}", &req_version, Some(&mut m))
&& VersionParser::parse_stability(&req_version) == "dev"
{
let name = strtolower(req_name);