diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-22 17:53:13 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-22 17:53:13 +0900 |
| commit | ec5f3292ac324789298c3a12972f8f78b688ca24 (patch) | |
| tree | 44580ee521df4b0416fcafa9089695c5bc550270 /crates/shirabe/src/json | |
| parent | 7286ee29637dbc694f769b618259eb9f75bab0fa (diff) | |
| download | php-shirabe-ec5f3292ac324789298c3a12972f8f78b688ca24.tar.gz php-shirabe-ec5f3292ac324789298c3a12972f8f78b688ca24.tar.zst php-shirabe-ec5f3292ac324789298c3a12972f8f78b688ca24.zip | |
feat(cli): tell the user to run `shirabe`, not `composer`
Messages that instruct the user to run a command named the Composer
binary. Shirabe ships as its own binary, so the hints now name it.
File names (composer.json, composer.lock), the "composer" repository
type and prose about Composer itself are untouched. The installer and
functional integration fixtures live in the Composer submodule and
cannot be edited, so their expected output is normalized on load.
Diffstat (limited to 'crates/shirabe/src/json')
| -rw-r--r-- | crates/shirabe/src/json/json_file.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/shirabe/src/json/json_file.rs b/crates/shirabe/src/json/json_file.rs index fed8318d..c4a06d77 100644 --- a/crates/shirabe/src/json/json_file.rs +++ b/crates/shirabe/src/json/json_file.rs @@ -490,7 +490,7 @@ impl JsonFile { php_regex!( r#"{\r?\n<<<<<<< [^\r\n]+\r?\n\s+"content-hash": *"[0-9a-f]+", *\r?\n(?:\|{7} [^\r\n]+\r?\n\s+"content-hash": *"[0-9a-f]+", *\r?\n)?=======\r?\n\s+"content-hash": *"[0-9a-f]+", *\r?\n>>>>>>> [^\r\n]+(\r?\n)}"# ), - " \"content-hash\": \"VCS merge conflict detected. Please run `composer update --lock`.\",$1", + " \"content-hash\": \"VCS merge conflict detected. Please run `shirabe update --lock`.\",$1", json, -1, Some(&mut count), |