diff options
184 files changed, 8513 insertions, 5488 deletions
@@ -916,6 +916,7 @@ dependencies = [ "anyhow", "indexmap", "shirabe-php-shim", + "shirabe-semver", ] [[package]] diff --git a/crates/shirabe-external-packages/Cargo.toml b/crates/shirabe-external-packages/Cargo.toml index 2c32ed3..952f263 100644 --- a/crates/shirabe-external-packages/Cargo.toml +++ b/crates/shirabe-external-packages/Cargo.toml @@ -7,3 +7,4 @@ edition.workspace = true anyhow.workspace = true indexmap.workspace = true shirabe-php-shim = { path = "../shirabe-php-shim" } +shirabe-semver = { path = "../shirabe-semver" } diff --git a/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs b/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs index 5a8f09d..dc27a32 100644 --- a/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs +++ b/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs @@ -1,16 +1,18 @@ +use shirabe_semver::constraint::constraint_interface::ConstraintInterface; + #[derive(Debug)] pub struct CompilingMatcher; impl CompilingMatcher { - pub fn r#match(_constraint: &dyn std::any::Any, _package: &dyn std::any::Any) -> bool { + pub fn r#match(_constraint: &dyn ConstraintInterface, _package: &dyn std::any::Any) -> bool { todo!() } - pub fn matches(_constraint: &dyn std::any::Any, _operator: &str, _version: &str) -> bool { + pub fn matches(_constraint: &dyn ConstraintInterface, _operator: i64, _version: &str) -> bool { todo!() } - pub fn match_(_constraint: &dyn std::any::Any, _operator: &str, _version: &str) -> bool { + pub fn match_(_constraint: &dyn ConstraintInterface, _operator: i64, _version: &str) -> bool { todo!() } diff --git a/crates/shirabe-external-packages/src/composer/semver/intervals.rs b/crates/shirabe-external-packages/src/composer/semver/intervals.rs index d0a736c..04f7ee7 100644 --- a/crates/shirabe-external-packages/src/composer/semver/intervals.rs +++ b/crates/shirabe-external-packages/src/composer/semver/intervals.rs @@ -1,25 +1,28 @@ use shirabe_php_shim::PhpMixed; +use shirabe_semver::constraint::constraint_interface::ConstraintInterface; #[derive(Debug)] pub struct Intervals; impl Intervals { pub fn is_subset_of( - _constraint_a: &dyn std::any::Any, - _constraint_b: &dyn std::any::Any, + _constraint_a: &dyn ConstraintInterface, + _constraint_b: &dyn ConstraintInterface, ) -> anyhow::Result<bool> { todo!() } - pub fn compact_constraint(_constraint: &dyn std::any::Any) -> Box<dyn std::any::Any> { + pub fn compact_constraint( + _constraint: Box<dyn ConstraintInterface>, + ) -> Box<dyn ConstraintInterface> { todo!() } - pub fn compact(_constraint: &dyn std::any::Any) -> Box<dyn std::any::Any> { + pub fn compact(_constraint: &dyn ConstraintInterface) -> Box<dyn ConstraintInterface> { todo!() } - pub fn get(_constraint: &dyn std::any::Any) -> anyhow::Result<PhpMixed> { + pub fn get(_constraint: &dyn ConstraintInterface) -> anyhow::Result<PhpMixed> { todo!() } diff --git a/crates/shirabe-external-packages/src/composer/util/composer_mirror.rs b/crates/shirabe-external-packages/src/composer/util/composer_mirror.rs index 66e363c..147abd1 100644 --- a/crates/shirabe-external-packages/src/composer/util/composer_mirror.rs +++ b/crates/shirabe-external-packages/src/composer/util/composer_mirror.rs @@ -3,12 +3,12 @@ pub struct ComposerMirror; impl ComposerMirror { pub fn process_url( - _mirror: &str, + _mirror_url: &str, _package_name: &str, _version: &str, _reference: Option<&str>, - _url: &str, - _custom_filename: Option<&str>, + _r_type: Option<&str>, + _pretty_version: Option<&str>, ) -> String { todo!() } diff --git a/crates/shirabe-external-packages/src/react/promise/promise_interface.rs b/crates/shirabe-external-packages/src/react/promise/promise_interface.rs index bb604a8..5836945 100644 --- a/crates/shirabe-external-packages/src/react/promise/promise_interface.rs +++ b/crates/shirabe-external-packages/src/react/promise/promise_interface.rs @@ -6,4 +6,33 @@ pub trait PromiseInterface { on_fulfilled: Option<Box<dyn FnOnce(Option<PhpMixed>) -> Option<PhpMixed>>>, on_rejected: Option<Box<dyn FnOnce(Option<PhpMixed>) -> Option<PhpMixed>>>, ) -> Box<dyn PromiseInterface>; + + /// PHP closure shape: `fn(mixed): mixed`. Convenience wrapper around `then` + /// for call sites that don't deal in `Option<PhpMixed>`. + fn then_with( + &self, + _on_fulfilled: Option<Box<dyn FnOnce(PhpMixed) -> PhpMixed>>, + _on_rejected: Option<Box<dyn FnOnce(PhpMixed) -> PhpMixed>>, + ) -> Box<dyn PromiseInterface> { + todo!() + } + + /// PHP closure shape: `fn(mixed): mixed`, returning a `Box<dyn PromiseInterface>`. + fn then_boxed( + &self, + _on_fulfilled: Option<Box<dyn FnOnce(PhpMixed) -> Box<dyn PromiseInterface>>>, + _on_rejected: Option<Box<dyn FnOnce(PhpMixed) -> Box<dyn PromiseInterface>>>, + ) -> Box<dyn PromiseInterface> { + todo!() + } + + /// Variant used by composer_repository where accept returns PhpMixed but reject returns + /// an error/PhpMixed and the result is the same Promise pipeline. + fn then_with_reject_boxed( + &self, + _on_fulfilled: Box<dyn FnOnce(PhpMixed) -> anyhow::Result<PhpMixed>>, + _on_rejected: Box<dyn FnOnce(anyhow::Error) -> anyhow::Result<PhpMixed>>, + ) -> Box<dyn PromiseInterface> { + todo!() + } } diff --git a/crates/shirabe-external-packages/src/seld/json_lint/duplicate_key_exception.rs b/crates/shirabe-external-packages/src/seld/json_lint/duplicate_key_exception.rs index 9e35396..df61a91 100644 --- a/crates/shirabe-external-packages/src/seld/json_lint/duplicate_key_exception.rs +++ b/crates/shirabe-external-packages/src/seld/json_lint/duplicate_key_exception.rs @@ -1,7 +1,17 @@ +use indexmap::IndexMap; +use shirabe_php_shim::PhpMixed; + #[derive(Debug)] pub struct DuplicateKeyException { pub message: String, pub code: i64, + pub details: IndexMap<String, PhpMixed>, +} + +impl DuplicateKeyException { + pub fn get_details(&self) -> &IndexMap<String, PhpMixed> { + &self.details + } } impl std::fmt::Display for DuplicateKeyException { diff --git a/crates/shirabe-external-packages/src/seld/json_lint/json_parser.rs b/crates/shirabe-external-packages/src/seld/json_lint/json_parser.rs index 31f64df..dbff9a0 100644 --- a/crates/shirabe-external-packages/src/seld/json_lint/json_parser.rs +++ b/crates/shirabe-external-packages/src/seld/json_lint/json_parser.rs @@ -19,4 +19,12 @@ impl JsonParser { pub fn parse(&self, _json: &str, _flags: u32) -> anyhow::Result<PhpMixed> { todo!() } + + /// PHP: JsonParser::lint() — returns null on success, ParsingException on failure. + pub fn lint( + &mut self, + _json: &str, + ) -> Option<crate::seld::json_lint::parsing_exception::ParsingException> { + todo!() + } } diff --git a/crates/shirabe-external-packages/src/seld/json_lint/parsing_exception.rs b/crates/shirabe-external-packages/src/seld/json_lint/parsing_exception.rs index 3ec6b6b..b756c1b 100644 --- a/crates/shirabe-external-packages/src/seld/json_lint/parsing_exception.rs +++ b/crates/shirabe-external-packages/src/seld/json_lint/parsing_exception.rs @@ -4,6 +4,21 @@ pub struct ParsingException { pub code: i64, } +impl ParsingException { + pub fn new(message: String, _details: Option<shirabe_php_shim::PhpMixed>) -> Self { + Self { message, code: 0 } + } + + pub fn get_message(&self) -> &str { + &self.message + } + + pub fn get_details(&self) -> indexmap::IndexMap<String, shirabe_php_shim::PhpMixed> { + // TODO(phase-b): PHP ParsingException exposes ['text', 'line', 'token'] details + indexmap::IndexMap::new() + } +} + impl std::fmt::Display for ParsingException { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!(f, "{}", self.message) diff --git a/crates/shirabe-external-packages/src/seld/signal/signal_handler.rs b/crates/shirabe-external-packages/src/seld/signal/signal_handler.rs index 3c53066..5b5254a 100644 --- a/crates/shirabe-external-packages/src/seld/signal/signal_handler.rs +++ b/crates/shirabe-external-packages/src/seld/signal/signal_handler.rs @@ -13,4 +13,12 @@ impl SignalHandler { pub fn unregister(&self) { todo!() } + + pub fn exit_with_last_signal(&self) { + todo!() + } + + pub fn is_triggered(&self) -> bool { + todo!() + } } diff --git a/crates/shirabe-external-packages/src/symfony/component/console/application.rs b/crates/shirabe-external-packages/src/symfony/component/console/application.rs index bc64521..1197792 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/application.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/application.rs @@ -89,4 +89,16 @@ impl Application { pub fn is_single_command(&self) -> bool { todo!() } + + pub fn render_throwable(&self, _exception: &anyhow::Error, _output: &mut dyn OutputInterface) { + todo!() + } + + pub fn set_catch_errors(&mut self, _catch_errors: bool) { + todo!() + } + + pub fn has(&self, _name: &str) -> bool { + todo!() + } } diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/helper_set.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/helper_set.rs index f8b2e24..26af492 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/helper/helper_set.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/helper/helper_set.rs @@ -8,7 +8,7 @@ impl HelperSet { todo!() } - pub fn get(&self, _name: &str) -> Option<PhpMixed> { + pub fn get(&self, _name: &str) -> PhpMixed { todo!() } diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs index 64835bb..b3aefef 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs @@ -31,4 +31,8 @@ impl ProgressBar { pub fn get_max_steps(&self) -> i64 { todo!() } + + pub fn set_progress(&mut self, _step: i64) { + todo!() + } } diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs b/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs index 73c5c46..f9792f0 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs @@ -19,13 +19,13 @@ impl ConsoleOutput { } impl OutputInterface for ConsoleOutput { - fn write(&mut self, _messages: &str, _newline: bool, _type: i64) { + fn write(&self, _messages: &str, _newline: bool, _type: i64) { todo!() } - fn writeln(&mut self, _messages: &str, _type: i64) { + fn writeln(&self, _messages: &str, _type: i64) { todo!() } - fn set_verbosity(&mut self, _level: i64) { + fn set_verbosity(&self, _level: i64) { todo!() } fn get_verbosity(&self) -> i64 { @@ -43,13 +43,13 @@ impl OutputInterface for ConsoleOutput { fn is_debug(&self) -> bool { todo!() } - fn set_decorated(&mut self, _decorated: bool) { + fn set_decorated(&self, _decorated: bool) { todo!() } fn is_decorated(&self) -> bool { todo!() } - fn set_formatter(&mut self, _formatter: OutputFormatter) { + fn set_formatter(&self, _formatter: OutputFormatter) { todo!() } fn get_formatter(&self) -> &OutputFormatter { diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs b/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs index 62a95bb..22a4b17 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs @@ -1,18 +1,30 @@ use crate::symfony::component::console::formatter::output_formatter::OutputFormatter; pub trait OutputInterface { - fn write(&mut self, messages: &str, newline: bool, r#type: i64); - fn writeln(&mut self, messages: &str, r#type: i64); - fn set_verbosity(&mut self, level: i64); + // PHP class semantics: OutputInterface methods take &self with interior mutability, + // because output objects are shared by reference across the PHP code. + fn write(&self, messages: &str, newline: bool, r#type: i64); + fn writeln(&self, messages: &str, r#type: i64); + fn set_verbosity(&self, level: i64); fn get_verbosity(&self) -> i64; fn is_quiet(&self) -> bool; fn is_verbose(&self) -> bool; fn is_very_verbose(&self) -> bool; fn is_debug(&self) -> bool; - fn set_decorated(&mut self, decorated: bool); + fn set_decorated(&self, decorated: bool); fn is_decorated(&self) -> bool; - fn set_formatter(&mut self, formatter: OutputFormatter); + fn set_formatter(&self, formatter: OutputFormatter); fn get_formatter(&self) -> &OutputFormatter; + + /// PHP: `$output instanceof ConsoleOutputInterface`. Default false; ConsoleOutput overrides. + fn is_console_output_interface(&self) -> bool { + false + } + + /// PHP: only StreamOutput exposes `getStream()`. Default panics for outputs without one. + fn get_stream(&self) -> shirabe_php_shim::PhpResource { + todo!("get_stream not available on this OutputInterface implementation") + } } pub const VERBOSITY_QUIET: i64 = 16; diff --git a/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/io_exception.rs b/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/io_exception.rs index 3ffcc9c..a5f2844 100644 --- a/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/io_exception.rs +++ b/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/io_exception.rs @@ -5,6 +5,21 @@ pub struct IOException { pub path: Option<String>, } +impl IOException { + pub fn new( + message: String, + code: i64, + _previous: Option<Box<dyn std::error::Error + Send + Sync>>, + path: Option<String>, + ) -> Self { + Self { + message, + code, + path, + } + } +} + impl std::fmt::Display for IOException { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!(f, "{}", self.message) diff --git a/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs b/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs index 8437ba6..466f17e 100644 --- a/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs +++ b/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs @@ -1,5 +1,15 @@ use crate::symfony::component::finder::spl_file_info::SplFileInfo; +/// Helper trait so `Finder::exclude` accepts both single strings and slices +/// (PHP's variadic / array argument compatibility). +pub trait IntoFinderExclude {} +impl IntoFinderExclude for &str {} +impl IntoFinderExclude for String {} +impl IntoFinderExclude for &String {} +impl IntoFinderExclude for &[String] {} +impl IntoFinderExclude for &Vec<String> {} +impl IntoFinderExclude for Vec<String> {} + #[derive(Debug)] pub struct Finder; @@ -38,7 +48,7 @@ impl Finder { todo!() } - pub fn exclude(&mut self, _exclude: &[String]) -> &mut Self { + pub fn exclude<E: IntoFinderExclude>(&mut self, _exclude: E) -> &mut Self { todo!() } @@ -54,10 +64,21 @@ impl Finder { todo!() } + pub fn not_path(&mut self, _pattern: &str) -> &mut Self { + todo!() + } + pub fn name(&mut self, _pattern: &str) -> &mut Self { todo!() } + pub fn sort<F>(&mut self, _comparator: F) -> &mut Self + where + F: FnMut(&SplFileInfo, &SplFileInfo) -> i64, + { + todo!() + } + pub fn sort_by_name(&mut self) -> &mut Self { todo!() } @@ -78,6 +99,24 @@ impl Finder { todo!(); std::iter::empty() } + + /// PHP: Finder implements Countable. + pub fn len(&self) -> usize { + todo!() + } + + pub fn is_empty(&self) -> bool { + self.len() == 0 + } +} + +impl IntoIterator for &Finder { + type Item = SplFileInfo; + type IntoIter = std::vec::IntoIter<SplFileInfo>; + + fn into_iter(self) -> Self::IntoIter { + todo!() + } } #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony/component/process/process.rs b/crates/shirabe-external-packages/src/symfony/component/process/process.rs index d0cc249..227606b 100644 --- a/crates/shirabe-external-packages/src/symfony/component/process/process.rs +++ b/crates/shirabe-external-packages/src/symfony/component/process/process.rs @@ -109,4 +109,8 @@ impl Process { pub fn set_working_directory(&mut self, _cwd: &str) -> &mut Self { todo!() } + + pub fn set_tty(&mut self, _tty: bool) -> anyhow::Result<&mut Self> { + todo!() + } } diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/helper_set.rs b/crates/shirabe-external-packages/src/symfony/console/helper/helper_set.rs index f8b2e24..26af492 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/helper_set.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/helper_set.rs @@ -8,7 +8,7 @@ impl HelperSet { todo!() } - pub fn get(&self, _name: &str) -> Option<PhpMixed> { + pub fn get(&self, _name: &str) -> PhpMixed { todo!() } diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs index f5e7e0c..aeb01d8 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs @@ -1,10 +1,15 @@ +use crate::symfony::component::console::output::output_interface::OutputInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] pub struct Table; impl Table { - pub fn new(_output: &dyn std::any::Any) -> Self { + pub fn new(_output: &dyn OutputInterface) -> Self { + todo!() + } + + pub fn set_style(&mut self, _style: &str) -> &mut Self { todo!() } diff --git a/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs b/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs index 65c2026..1f2a12d 100644 --- a/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs +++ b/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs @@ -13,6 +13,16 @@ pub trait OutputInterface { fn is_decorated(&self) -> bool; fn set_formatter(&mut self, formatter: OutputFormatter); fn get_formatter(&mut self) -> &mut OutputFormatter; + + /// PHP: `$output instanceof ConsoleOutputInterface`. Default false; ConsoleOutput overrides. + fn is_console_output_interface(&self) -> bool { + false + } + + /// PHP: only StreamOutput exposes `getStream()`. Default panics for outputs without one. + fn get_stream(&self) -> shirabe_php_shim::PhpResource { + todo!("get_stream not available on this OutputInterface implementation") + } } pub const VERBOSITY_QUIET: i64 = 16; diff --git a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs index 4269337..c3ab54e 100644 --- a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs +++ b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs @@ -1,5 +1,5 @@ -use crate::symfony::console::input::input_interface::InputInterface; -use crate::symfony::console::output::output_interface::OutputInterface; +use crate::symfony::component::console::input::input_interface::InputInterface; +use crate::symfony::component::console::output::output_interface::OutputInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe-php-shim/src/lib.rs b/crates/shirabe-php-shim/src/lib.rs index 6b2d790..f01f16c 100644 --- a/crates/shirabe-php-shim/src/lib.rs +++ b/crates/shirabe-php-shim/src/lib.rs @@ -1,7 +1,8 @@ use indexmap::IndexMap; -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Default)] pub enum PhpMixed { + #[default] Null, Bool(bool), Int(i64), @@ -84,6 +85,15 @@ impl PhpMixed { matches!(self, PhpMixed::Null) } + /// Treats PhpMixed::Null as None, everything else as Some. + pub fn is_none(&self) -> bool { + self.is_null() + } + + pub fn is_some(&self) -> bool { + !self.is_null() + } + pub fn as_string_opt(&self) -> Option<&str> { self.as_string() } @@ -100,6 +110,49 @@ impl PhpMixed { pub fn unwrap_or(self, default: PhpMixed) -> PhpMixed { if self.is_null() { default } else { self } } + + pub fn unwrap_or_default(self) -> PhpMixed { + if self.is_null() { PhpMixed::Null } else { self } + } + + pub fn unwrap(self) -> PhpMixed { + if self.is_null() { + panic!("called `PhpMixed::unwrap()` on a `Null` value"); + } + self + } + + pub fn as_ref(&self) -> Option<&PhpMixed> { + self.as_opt() + } + + /// Treats PhpMixed::Null as None and applies the function for chaining. + pub fn and_then<U, F: FnOnce(&PhpMixed) -> Option<U>>(&self, f: F) -> Option<U> { + self.as_opt().and_then(f) + } + + /// Counterpart to `Any::as_any` for trait-object call sites that downcast. + pub fn as_any(&self) -> &dyn std::any::Any { + self + } + + /// Treats `Null` and `Bool(false)` as the falsy case, anything else as Some. + pub fn ok_or_else<E, F: FnOnce() -> E>(self, err: F) -> Result<PhpMixed, E> { + match self { + PhpMixed::Null | PhpMixed::Bool(false) => Err(err()), + v => Ok(v), + } + } + + /// PHP duck-typed helper-set entry. Real implementation lives in QuestionHelper. + pub fn ask( + &self, + _input: &dyn std::any::Any, + _output: &mut dyn std::any::Any, + _question: &dyn std::any::Any, + ) -> PhpMixed { + todo!() + } } impl From<bool> for PhpMixed { @@ -167,6 +220,15 @@ where } } +impl<T> From<Box<T>> for PhpMixed +where + T: Into<PhpMixed>, +{ + fn from(value: Box<T>) -> Self { + (*value).into() + } +} + impl std::fmt::Display for PhpMixed { fn fmt(&self, _f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { todo!() @@ -428,6 +490,18 @@ pub fn get_class(_object: &PhpMixed) -> String { todo!() } +// Overload accepting an `anyhow::Error` (PHP's `get_class($e)` is commonly used on exceptions). +pub fn get_class_err(_e: &anyhow::Error) -> String { + todo!() +} + +/// Overload accepting any object reference. PHP's `get_class($obj)` returns the +/// class name; in Rust we don't have a runtime class name, so this stub is left +/// as `todo!()`. +pub fn get_class_obj<T: ?Sized>(_object: &T) -> String { + todo!() +} + pub fn get_debug_type(_value: &PhpMixed) -> String { todo!() } @@ -1387,9 +1461,9 @@ pub fn reset<T: Clone>(_array: &[T]) -> Option<T> { pub const OPENSSL_ALGO_SHA384: i64 = 9; pub fn array_intersect_key( - _array1: &IndexMap<String, Box<PhpMixed>>, - _array2: &IndexMap<String, Box<PhpMixed>>, -) -> IndexMap<String, Box<PhpMixed>> { + _array1: &IndexMap<String, PhpMixed>, + _array2: &IndexMap<String, PhpMixed>, +) -> IndexMap<String, PhpMixed> { todo!() } @@ -1658,6 +1732,16 @@ where todo!() } +pub fn array_filter_map<F>( + _array: &IndexMap<String, Box<PhpMixed>>, + _callback: F, +) -> IndexMap<String, PhpMixed> +where + F: Fn(&PhpMixed) -> bool, +{ + todo!() +} + pub fn array_all<T, F>(_array: &[T], _callback: F) -> bool where F: Fn(&T) -> bool, @@ -1695,6 +1779,10 @@ pub fn clearstatcache() { todo!() } +pub fn clearstatcache2(_clear_realpath_cache: bool, _filename: &str) { + todo!() +} + pub fn disk_free_space(_directory: &str) -> Option<f64> { todo!() } @@ -1717,6 +1805,10 @@ pub fn array_flip(_array: &PhpMixed) -> PhpMixed { todo!() } +pub fn array_flip_strings(_array: &[String]) -> IndexMap<String, PhpMixed> { + todo!() +} + pub fn max(_a: i64, _b: i64) -> i64 { todo!() } @@ -1945,6 +2037,44 @@ pub struct RecursiveIteratorIterator; impl RecursiveIteratorIterator { pub const SELF_FIRST: i64 = 0; pub const CHILD_FIRST: i64 = 16; + + pub fn get_sub_pathname(&self) -> String { + todo!() + } +} + +impl IntoIterator for &RecursiveIteratorIterator { + type Item = RecursiveIteratorFileInfo; + type IntoIter = std::vec::IntoIter<RecursiveIteratorFileInfo>; + + fn into_iter(self) -> Self::IntoIter { + todo!() + } +} + +#[derive(Debug)] +pub struct RecursiveIteratorFileInfo; + +impl RecursiveIteratorFileInfo { + pub fn is_dir(&self) -> bool { + todo!() + } + + pub fn is_file(&self) -> bool { + todo!() + } + + pub fn is_link(&self) -> bool { + todo!() + } + + pub fn get_pathname(&self) -> String { + todo!() + } + + pub fn get_size(&self) -> i64 { + todo!() + } } pub fn recursive_directory_iterator(_path: &str, _flags: i64) -> RecursiveDirectoryIterator { @@ -2161,6 +2291,10 @@ impl ArrayObject { pub fn new(_array: Option<PhpMixed>) -> Self { todo!() } + + pub fn to_array(&self) -> IndexMap<String, Box<PhpMixed>> { + self.data.clone() + } } #[derive(Debug)] @@ -2175,3 +2309,23 @@ pub struct StdClass { #[derive(Debug)] pub struct PhpResource; + +pub fn gethostbyname(_hostname: &str) -> String { + todo!() +} + +pub fn http_get_last_response_headers() -> Option<Vec<String>> { + todo!() +} + +pub fn http_clear_last_response_headers() { + todo!() +} + +pub fn zlib_decode(_data: &str) -> Option<String> { + todo!() +} + +pub const STREAM_NOTIFY_FAILURE: i64 = 9; +pub const STREAM_NOTIFY_FILE_SIZE_IS: i64 = 5; +pub const STREAM_NOTIFY_PROGRESS: i64 = 7; diff --git a/crates/shirabe-semver/src/constraint/constraint.rs b/crates/shirabe-semver/src/constraint/constraint.rs index d64c0a0..4ac4cda 100644 --- a/crates/shirabe-semver/src/constraint/constraint.rs +++ b/crates/shirabe-semver/src/constraint/constraint.rs @@ -387,6 +387,18 @@ impl ConstraintInterface for Constraint { fn as_any(&self) -> &dyn std::any::Any { self } + + fn is_constraint(&self) -> bool { + true + } + + fn get_operator(&self) -> &'static str { + Self::trans_op_int(self.operator) + } + + fn get_version(&self) -> &str { + &self.version + } } impl std::fmt::Display for Constraint { diff --git a/crates/shirabe-semver/src/constraint/constraint_interface.rs b/crates/shirabe-semver/src/constraint/constraint_interface.rs index 09536e6..f4bd905 100644 --- a/crates/shirabe-semver/src/constraint/constraint_interface.rs +++ b/crates/shirabe-semver/src/constraint/constraint_interface.rs @@ -22,6 +22,21 @@ pub trait ConstraintInterface: std::fmt::Debug { false } + /// Rust-specific helper: PHP `$c instanceof Constraint` check. + fn is_constraint(&self) -> bool { + false + } + + /// Rust-specific helper: PHP `$c->getOperator()`. Only meaningful when `is_constraint()` is true. + fn get_operator(&self) -> &'static str { + "" + } + + /// Rust-specific helper: PHP `$c->getVersion()`. Only meaningful when `is_constraint()` is true. + fn get_version(&self) -> &str { + "" + } + fn clone_box(&self) -> Box<dyn ConstraintInterface>; fn as_any(&self) -> &dyn std::any::Any; diff --git a/crates/shirabe-semver/src/version_parser.rs b/crates/shirabe-semver/src/version_parser.rs index 359beec..39000e7 100644 --- a/crates/shirabe-semver/src/version_parser.rs +++ b/crates/shirabe-semver/src/version_parser.rs @@ -20,7 +20,7 @@ const MODIFIER_REGEX: &str = const STABILITIES_REGEX: &str = "stable|RC|beta|alpha|dev"; -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct VersionParser; impl VersionParser { diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs index 68bedb0..8a2f624 100644 --- a/crates/shirabe/src/advisory/auditor.rs +++ b/crates/shirabe/src/advisory/auditor.rs @@ -11,7 +11,6 @@ use shirabe_php_shim::{ }; use crate::advisory::ignored_security_advisory::IgnoredSecurityAdvisory; -use crate::advisory::partial_security_advisory::PartialSecurityAdvisory; use crate::advisory::security_advisory::SecurityAdvisory; use crate::io::console_io::ConsoleIO; use crate::io::io_interface::IOInterface; @@ -19,6 +18,7 @@ use crate::json::json_file::JsonFile; use crate::package::base_package::{self, BasePackage}; use crate::package::complete_package_interface::CompletePackageInterface; use crate::package::package_interface::PackageInterface; +use crate::repository::advisory_provider_interface::PartialOrSecurityAdvisory; use crate::repository::repository_set::RepositorySet; use crate::util::package_info::PackageInfo; @@ -184,7 +184,7 @@ impl Auditor { let error_or_warn = if warning_only { "warning" } else { "error" }; if affected_packages_count > 0 || ignored_advisories.len() > 0 { let passes: Vec<( - &IndexMap<String, Vec<PartialSecurityAdvisory>>, + &IndexMap<String, Vec<PartialOrSecurityAdvisory>>, String, )> = vec![ ( @@ -245,12 +245,12 @@ impl Auditor { Ok(audit_bitmask) } - /// @param array<string, array<SecurityAdvisory|PartialSecurityAdvisory>> $advisories + /// @param array<string, array<SecurityAdvisory|PartialOrSecurityAdvisory>> $advisories /// @param array<string, string|null> $ignoreList /// @return bool pub fn needs_complete_advisory_load( &self, - advisories: &IndexMap<String, Vec<PartialSecurityAdvisory>>, + advisories: &IndexMap<String, Vec<PartialOrSecurityAdvisory>>, ignore_list: &IndexMap<String, Option<String>>, ) -> bool { if advisories.len() == 0 { @@ -258,14 +258,14 @@ impl Auditor { } // no partial advisories present - let advisories_values: Vec<&Vec<PartialSecurityAdvisory>> = advisories.values().collect(); + let advisories_values: Vec<&Vec<PartialOrSecurityAdvisory>> = advisories.values().collect(); if array_all( &advisories_values, - |pkg_advisories: &&Vec<PartialSecurityAdvisory>| { - array_all(pkg_advisories, |_advisory: &PartialSecurityAdvisory| { + |pkg_advisories: &&Vec<PartialOrSecurityAdvisory>| { + array_all(pkg_advisories, |_advisory: &PartialOrSecurityAdvisory| { // TODO(phase-b): `$advisory instanceof SecurityAdvisory` — needs an advisory // enum or trait downcast; SecurityAdvisoriesResult currently only holds - // PartialSecurityAdvisory so this is hard-coded to false + // PartialOrSecurityAdvisory so this is hard-coded to false false }) }, @@ -306,13 +306,13 @@ impl Auditor { vec![] } - /// @phpstan-param array<string, array<PartialSecurityAdvisory|SecurityAdvisory>> $allAdvisories + /// @phpstan-param array<string, array<PartialOrSecurityAdvisory|SecurityAdvisory>> $allAdvisories /// @param array<string, string|null> $ignoreList List of advisory IDs, remote IDs, CVE IDs or package names that reported but not listed as vulnerabilities. /// @param array<string, string|null> $ignoredSeverities List of ignored severity levels - /// @phpstan-return array{advisories: array<string, array<PartialSecurityAdvisory|SecurityAdvisory>>, ignoredAdvisories: array<string, array<PartialSecurityAdvisory|SecurityAdvisory>>} + /// @phpstan-return array{advisories: array<string, array<PartialOrSecurityAdvisory|SecurityAdvisory>>, ignoredAdvisories: array<string, array<PartialOrSecurityAdvisory|SecurityAdvisory>>} pub fn process_advisories( &self, - all_advisories: IndexMap<String, Vec<PartialSecurityAdvisory>>, + all_advisories: IndexMap<String, Vec<PartialOrSecurityAdvisory>>, ignore_list: &IndexMap<String, Option<String>>, ignored_severities: &IndexMap<String, Option<String>>, ) -> ProcessAdvisoriesResult { @@ -323,8 +323,8 @@ impl Auditor { }; } - let mut advisories: IndexMap<String, Vec<PartialSecurityAdvisory>> = IndexMap::new(); - let mut ignored: IndexMap<String, Vec<PartialSecurityAdvisory>> = IndexMap::new(); + let mut advisories: IndexMap<String, Vec<PartialOrSecurityAdvisory>> = IndexMap::new(); + let mut ignored: IndexMap<String, Vec<PartialOrSecurityAdvisory>> = IndexMap::new(); let mut ignore_reason: Option<String> = None; for (package, pkg_advisories) in all_advisories { @@ -336,17 +336,17 @@ impl Auditor { ignore_reason = ignore_list.get(&package).cloned().unwrap_or(None); } - if array_key_exists(&advisory.advisory_id, ignore_list) { + if array_key_exists(advisory.advisory_id(), ignore_list) { is_active = false; ignore_reason = ignore_list - .get(&advisory.advisory_id) + .get(advisory.advisory_id()) .cloned() .unwrap_or(None); } // TODO(phase-b): `$advisory instanceof SecurityAdvisory` — needs an advisory enum // or trait downcast; the block below is skipped while SecurityAdvisoriesResult - // only holds PartialSecurityAdvisory + // only holds PartialOrSecurityAdvisory let advisory_as_full: Option<&SecurityAdvisory> = None; if let Some(full) = advisory_as_full { if is_string(&PhpMixed::String(full.severity.clone().unwrap_or_default())) @@ -410,11 +410,11 @@ impl Auditor { } } - /// @param array<string, array<PartialSecurityAdvisory>> $advisories + /// @param array<string, array<PartialOrSecurityAdvisory>> $advisories /// @return array{int, int} Count of affected packages and total count of advisories fn count_advisories( &self, - advisories: &IndexMap<String, Vec<PartialSecurityAdvisory>>, + advisories: &IndexMap<String, Vec<PartialOrSecurityAdvisory>>, ) -> (i64, i64) { let mut count: i64 = 0; for package_advisories in advisories.values() { @@ -429,7 +429,7 @@ impl Auditor { fn output_advisories( &self, io: &mut dyn IOInterface, - advisories: &IndexMap<String, Vec<PartialSecurityAdvisory>>, + advisories: &IndexMap<String, Vec<PartialOrSecurityAdvisory>>, format: &str, ) -> Result<()> { match format { @@ -468,7 +468,7 @@ impl Auditor { fn output_advisories_table( &self, io: &ConsoleIO, - advisories: &IndexMap<String, Vec<PartialSecurityAdvisory>>, + advisories: &IndexMap<String, Vec<PartialOrSecurityAdvisory>>, ) { for package_advisories in advisories.values() { for advisory in package_advisories { @@ -482,7 +482,7 @@ impl Auditor { "Affected versions".to_string(), "Reported at".to_string(), ]; - // TODO(phase-b): advisory typed PartialSecurityAdvisory; PHP accesses + // TODO(phase-b): advisory typed PartialOrSecurityAdvisory; PHP accesses // SecurityAdvisory fields (title, link, reportedAt, etc.) let _ = advisory; let row: Vec<String> = vec![ @@ -518,7 +518,7 @@ impl Auditor { fn output_advisories_plain( &self, io: &mut dyn IOInterface, - advisories: &IndexMap<String, Vec<PartialSecurityAdvisory>>, + advisories: &IndexMap<String, Vec<PartialOrSecurityAdvisory>>, ) { let mut error: Vec<String> = vec![]; let mut first_advisory = true; @@ -527,7 +527,7 @@ impl Auditor { if !first_advisory { error.push("--------".to_string()); } - // TODO(phase-b): advisory typed PartialSecurityAdvisory; PHP accesses + // TODO(phase-b): advisory typed PartialOrSecurityAdvisory; PHP accesses // SecurityAdvisory fields let _ = advisory; error.push(format!("Package: {}", /* advisory.packageName */ "")); @@ -623,9 +623,8 @@ impl Auditor { .into()); } - let table = io_as_console - .unwrap() - .get_table() + let mut table = io_as_console.unwrap().get_table(); + table .set_headers(vec![ "Abandoned Package".to_string().into(), "Suggested Replacement".to_string().into(), @@ -689,7 +688,7 @@ impl Auditor { } fn get_advisory_id(&self, advisory: &SecurityAdvisory) -> String { - // TODO(phase-b): advisory.advisory_id lives on inner PartialSecurityAdvisory + // TODO(phase-b): advisory.advisory_id lives on inner PartialOrSecurityAdvisory let advisory_id: &str = ""; let _ = advisory; if str_starts_with(advisory_id, "PKSA-") { @@ -749,6 +748,6 @@ impl Auditor { #[derive(Debug)] pub struct ProcessAdvisoriesResult { - pub advisories: IndexMap<String, Vec<PartialSecurityAdvisory>>, - pub ignored_advisories: IndexMap<String, Vec<PartialSecurityAdvisory>>, + pub advisories: IndexMap<String, Vec<PartialOrSecurityAdvisory>>, + pub ignored_advisories: IndexMap<String, Vec<PartialOrSecurityAdvisory>>, } diff --git a/crates/shirabe/src/advisory/security_advisory.rs b/crates/shirabe/src/advisory/security_advisory.rs index 1b1ff64..bf10c2a 100644 --- a/crates/shirabe/src/advisory/security_advisory.rs +++ b/crates/shirabe/src/advisory/security_advisory.rs @@ -44,6 +44,10 @@ impl SecurityAdvisory { } } + pub fn advisory_id(&self) -> &str { + &self.inner.advisory_id + } + pub fn affected_versions(&self) -> &dyn ConstraintInterface { &*self.inner.affected_versions } diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs index 7708eb5..3477226 100644 --- a/crates/shirabe/src/autoload/autoload_generator.rs +++ b/crates/shirabe/src/autoload/autoload_generator.rs @@ -39,7 +39,7 @@ use crate::util::platform::Platform; #[derive(Debug)] pub struct AutoloadGenerator { - event_dispatcher: EventDispatcher, + event_dispatcher: std::rc::Rc<std::cell::RefCell<EventDispatcher>>, io: Box<dyn IOInterface>, dev_mode: Option<bool>, class_map_authoritative: bool, @@ -51,7 +51,10 @@ pub struct AutoloadGenerator { } impl AutoloadGenerator { - pub fn new(event_dispatcher: EventDispatcher, io: Option<Box<dyn IOInterface>>) -> Self { + pub fn new( + event_dispatcher: std::rc::Rc<std::cell::RefCell<EventDispatcher>>, + io: Option<Box<dyn IOInterface>>, + ) -> Self { let io: Box<dyn IOInterface> = io.unwrap_or_else(|| Box::new(NullIO::new())); Self { @@ -122,11 +125,11 @@ impl AutoloadGenerator { config: &Config, local_repo: &dyn InstalledRepositoryInterface, root_package: &dyn RootPackageInterface, - installation_manager: &InstallationManager, + installation_manager: &mut InstallationManager, target_dir: &str, scan_psr_packages: bool, suffix: Option<String>, - locker: Option<&Locker>, + locker: Option<&mut Locker>, strict_ambiguous: bool, ) -> anyhow::Result<ClassMap> { let mut scan_psr_packages = scan_psr_packages; @@ -140,7 +143,7 @@ impl AutoloadGenerator { // we assume no-dev mode if no vendor dir is present or it is too old to contain dev information self.dev_mode = Some(false); - let installed_json = JsonFile::new( + let mut installed_json = JsonFile::new( format!( "{}/composer/installed.json", config.get("vendor-dir").as_string().unwrap_or("") @@ -173,7 +176,7 @@ impl AutoloadGenerator { let mut additional_args: IndexMap<String, PhpMixed> = IndexMap::new(); additional_args.insert("optimize".to_string(), PhpMixed::Bool(scan_psr_packages)); - self.event_dispatcher.dispatch_script( + self.event_dispatcher.borrow_mut().dispatch_script( ScriptEvents::PRE_AUTOLOAD_DUMP, self.dev_mode.unwrap_or(false), vec![], @@ -185,7 +188,7 @@ impl AutoloadGenerator { ClassMapGenerator::new(vec!["php".to_string(), "inc".to_string(), "hh".to_string()]); class_map_generator.avoid_duplicate_scans(None); - let filesystem = Filesystem::new(None); + let mut filesystem = Filesystem::new(None); filesystem.ensure_directory_exists(config.get("vendor-dir").as_string().unwrap_or(""))?; // Do not remove double realpath() calls. // Fixes failing Windows realpath() implementation. @@ -417,11 +420,12 @@ impl AutoloadGenerator { .to_string(); for dir in &paths { let dir_str = dir.as_string().unwrap_or("").to_string(); + let joined = format!("{}/{}", base_path, dir_str); let dir_str = filesystem.normalize_path(if filesystem.is_absolute_path(&dir_str) { &dir_str } else { - &format!("{}/{}", base_path, dir_str) + &joined }); if !shirabe_php_shim::is_dir(&dir_str) { continue; @@ -666,7 +670,7 @@ impl AutoloadGenerator { if self.run_scripts { let mut additional_args: IndexMap<String, PhpMixed> = IndexMap::new(); additional_args.insert("optimize".to_string(), PhpMixed::Bool(scan_psr_packages)); - self.event_dispatcher.dispatch_script( + self.event_dispatcher.borrow_mut().dispatch_script( ScriptEvents::POST_AUTOLOAD_DUMP, self.dev_mode.unwrap_or(false), vec![], @@ -735,7 +739,7 @@ impl AutoloadGenerator { pub fn build_package_map( &self, - installation_manager: &InstallationManager, + installation_manager: &mut InstallationManager, root_package: &dyn RootPackageInterface, packages: Vec<Box<dyn PackageInterface>>, ) -> anyhow::Result<Vec<(Box<dyn PackageInterface>, Option<String>)>> { @@ -1731,12 +1735,13 @@ impl AutoloadGenerator { }); // add support for up-level relative paths - let mut updir: Option<String> = None; + let updir_cell: std::cell::RefCell<Option<String>> = + std::cell::RefCell::new(None); let p = Preg::replace_callback( "{^((?:(?:\\\\\\.){1,2}+/)+)}", |matches: &IndexMap<CaptureKey, String>| -> String { // undo preg_quote for the matched string - updir = Some(str_replace( + *updir_cell.borrow_mut() = Some(str_replace( "\\.", ".", matches @@ -1750,6 +1755,7 @@ impl AutoloadGenerator { &p, ) .unwrap_or_default(); + let updir: Option<String> = updir_cell.into_inner(); let install_path_for_resolve = if install_path.is_empty() { strtr(&Platform::get_cwd(false).unwrap_or_default(), "\\", "/") } else { diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index 7cdcbcf..4f97c4c 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -62,7 +62,11 @@ impl ArchiveCommand { ); } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> Result<i64> { + pub fn execute( + &mut self, + input: &dyn InputInterface, + output: &dyn OutputInterface, + ) -> Result<i64> { let composer = self.try_composer(None, None); let mut config: Option<std::rc::Rc<std::cell::RefCell<Config>>> = None; @@ -71,8 +75,10 @@ impl ArchiveCommand { // TODO(plugin): dispatch CommandEvent let command_event = CommandEvent::new(PluginEvents::COMMAND, "archive", input, output); let event_dispatcher = composer.get_event_dispatcher(); - event_dispatcher.dispatch(Some(command_event.get_name()), None); - event_dispatcher.dispatch_script( + event_dispatcher + .borrow_mut() + .dispatch(Some(command_event.get_name()), None); + event_dispatcher.borrow_mut().dispatch_script( ScriptEvents::PRE_ARCHIVE_CMD, true, vec![], @@ -111,8 +117,10 @@ impl ArchiveCommand { .to_string() }); + // TODO(phase-b): clone_box to release self borrow held by get_io. + let mut io_box = self.get_io().clone_box(); let return_code = self.archive( - self.get_io(), + io_box.as_mut(), &config, input .get_argument("package") @@ -137,12 +145,15 @@ impl ArchiveCommand { if return_code == 0 { if let Some(ref composer) = composer { - composer.get_event_dispatcher().dispatch_script( - ScriptEvents::POST_ARCHIVE_CMD, - true, - vec![], - indexmap::IndexMap::new(), - ); + composer + .get_event_dispatcher() + .borrow_mut() + .dispatch_script( + ScriptEvents::POST_ARCHIVE_CMD, + true, + vec![], + indexmap::IndexMap::new(), + ); } } @@ -150,8 +161,8 @@ impl ArchiveCommand { } pub fn archive( - &self, - io: &dyn IOInterface, + &mut self, + io: &mut dyn IOInterface, config: &std::rc::Rc<std::cell::RefCell<Config>>, package_name: Option<String>, version: Option<String>, @@ -166,7 +177,7 @@ impl ArchiveCommand { composer.get_archive_manager() } else { let factory = Factory; - let process = std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(None))); + let process = std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(()))); let http_downloader = std::rc::Rc::new(std::cell::RefCell::new( Factory::create_http_downloader(io, config, indexmap::IndexMap::new())?, )); @@ -221,8 +232,8 @@ impl ArchiveCommand { } pub fn select_package( - &self, - io: &dyn IOInterface, + &mut self, + io: &mut dyn IOInterface, package_name: &str, version: Option<&str>, ) -> Result<Option<Box<dyn CompletePackageInterface>>> { @@ -248,12 +259,12 @@ impl ArchiveCommand { min_stability = composer.get_package().get_minimum_stability().to_string(); } else { let default_repos = RepositoryFactory::default_repos_with_default_manager(io)?; - let repo_names: Vec<String> = default_repos.iter().map(|r| r.get_repo_name()).collect(); + let repo_names: Vec<String> = default_repos.keys().cloned().collect(); io.write_error(&format!( "No composer.json found in the current directory, searching packages from {}", repo_names.join(", ") )); - repo = CompositeRepository::new(default_repos); + repo = CompositeRepository::new(default_repos.into_values().collect()); min_stability = "stable".to_string(); } diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs index 1ced26a..052bf0b 100644 --- a/crates/shirabe/src/command/audit_command.rs +++ b/crates/shirabe/src/command/audit_command.rs @@ -51,8 +51,8 @@ impl AuditCommand { input: &dyn InputInterface, _output: &dyn OutputInterface, ) -> Result<i64> { - let composer = self.require_composer(None, None)?; - let packages = self.get_packages(&composer, input)?; + let mut composer = self.require_composer(None, None)?; + let packages = self.get_packages(&mut composer, input)?; if packages.is_empty() { self.get_io().write_error("No packages - skipping audit."); @@ -139,17 +139,17 @@ impl AuditCommand { fn get_packages( &self, - composer: &Composer, + composer: &mut Composer, input: &dyn InputInterface, ) -> Result<Vec<Box<dyn PackageInterface>>> { if input.get_option("locked").as_bool().unwrap_or(false) { - if !composer.get_locker().is_locked() { + let locker = composer.get_locker_mut(); + if !locker.is_locked() { return Err(UnexpectedValueException { message: "Valid composer.json and composer.lock files are required to run this command with --locked".to_string(), code: 0, }.into()); } - let locker = composer.get_locker(); return Ok(CanonicalPackagesTrait::get_packages( &locker.get_locked_repository( !input.get_option("no-dev").as_bool().unwrap_or(false), diff --git a/crates/shirabe/src/command/base_config_command.rs b/crates/shirabe/src/command/base_config_command.rs index c63f63c..9a599f6 100644 --- a/crates/shirabe/src/command/base_config_command.rs +++ b/crates/shirabe/src/command/base_config_command.rs @@ -36,9 +36,10 @@ pub trait BaseConfigCommand: BaseCommand { return Err(anyhow::anyhow!("--file and --global can not be combined")); } - let io = self.get_io(); + // TODO(phase-b): clone_box to release the &mut self borrow held by get_io. + let io = self.get_io().clone_box(); *self.config_mut() = Some(std::rc::Rc::new(std::cell::RefCell::new( - Factory::create_config(Some(&*io), None)?, + Factory::create_config(Some(io.as_ref()), None)?, ))); let config_rc = std::rc::Rc::clone(self.config().unwrap()); diff --git a/crates/shirabe/src/command/base_dependency_command.rs b/crates/shirabe/src/command/base_dependency_command.rs index b0dcf98..316b1cc 100644 --- a/crates/shirabe/src/command/base_dependency_command.rs +++ b/crates/shirabe/src/command/base_dependency_command.rs @@ -24,11 +24,16 @@ use crate::repository::repository_interface::{FindPackageConstraint, RepositoryI use crate::repository::root_package_repository::RootPackageRepository; use crate::util::package_info::PackageInfo; +pub const ARGUMENT_PACKAGE: &str = "package"; +pub const ARGUMENT_CONSTRAINT: &str = "version"; +pub const OPTION_RECURSIVE: &str = "recursive"; +pub const OPTION_TREE: &str = "tree"; + pub trait BaseDependencyCommand: BaseCommand { - const ARGUMENT_PACKAGE: &'static str = "package"; - const ARGUMENT_CONSTRAINT: &'static str = "version"; - const OPTION_RECURSIVE: &'static str = "recursive"; - const OPTION_TREE: &'static str = "tree"; + const ARGUMENT_PACKAGE: &'static str = ARGUMENT_PACKAGE; + const ARGUMENT_CONSTRAINT: &'static str = ARGUMENT_CONSTRAINT; + const OPTION_RECURSIVE: &'static str = OPTION_RECURSIVE; + const OPTION_TREE: &'static str = OPTION_TREE; fn colors(&self) -> &[String]; fn colors_mut(&mut self) -> &mut Vec<String>; @@ -42,7 +47,7 @@ pub trait BaseDependencyCommand: BaseCommand { output: &dyn OutputInterface, inverted: bool, ) -> anyhow::Result<i64> { - let composer = self.require_composer(None, None)?; + let mut composer = self.require_composer(None, None)?; // TODO(plugin): dispatch CommandEvent(PluginEvents::COMMAND, self.get_name(), input, output) via composer.get_event_dispatcher() let mut repos: Vec<Box<dyn RepositoryInterface>> = vec![]; @@ -51,7 +56,7 @@ pub trait BaseDependencyCommand: BaseCommand { ))); if input.get_option("locked").as_bool().unwrap_or(false) { - let locker = composer.get_locker(); + let locker = composer.get_locker_mut(); if !locker.is_locked() { return Err(anyhow::anyhow!(UnexpectedValueException { @@ -134,11 +139,16 @@ pub trait BaseDependencyCommand: BaseCommand { FindPackageConstraint::String(text_constraint.clone()), ); if matched_package.is_none() { - let default_repos = CompositeRepository::new(RepositoryFactory::default_repos( - Some(self.get_io()), - Some(std::rc::Rc::clone(composer.get_config())), - Some(&mut composer.get_repository_manager()), - )?); + let default_repos = CompositeRepository::new( + RepositoryFactory::default_repos( + Some(self.get_io()), + Some(std::rc::Rc::clone(composer.get_config())), + // TODO(phase-b): get_repository_manager returns &; default_repos needs &mut + Some(todo!("share repository_manager as &mut")), + )? + .into_values() + .collect(), + ); if let Some(r#match) = default_repos.find_package( &needle, FindPackageConstraint::String(text_constraint.clone()), @@ -384,7 +394,7 @@ pub trait BaseDependencyCommand: BaseCommand { } } - fn print_tree(&self, results: &[DependentsEntry], prefix: &str, level: i64) { + fn print_tree(&mut self, results: &[DependentsEntry], prefix: &str, level: i64) { let count = results.len() as i64; let mut idx: i64 = 0; let colors_len = self.colors().len() as i64; @@ -448,7 +458,7 @@ pub trait BaseDependencyCommand: BaseCommand { } } - fn write_tree_line(&self, line: &str) { + fn write_tree_line(&mut self, line: &str) { let io = self.get_io(); let line = if !io.is_decorated() { line.replace('└', "`-") diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs index fb32979..9bfee8b 100644 --- a/crates/shirabe/src/command/bump_command.rs +++ b/crates/shirabe/src/command/bump_command.rs @@ -56,7 +56,7 @@ impl BumpCommand { } pub fn execute( - &self, + &mut self, input: &dyn InputInterface, _output: &dyn OutputInterface, ) -> Result<i64> { @@ -70,18 +70,23 @@ impl BumpCommand { }) .unwrap_or_default(); + let dev_only = input.get_option("dev-only").as_bool().unwrap_or(false); + let no_dev_only = input.get_option("no-dev-only").as_bool().unwrap_or(false); + let dry_run = input.get_option("dry-run").as_bool().unwrap_or(false); + // TODO(phase-b): do_bump expects &dyn IOInterface but get_io() requires &mut self; needs IO sharing refactor + let io_ref: &dyn IOInterface = todo!("share IOInterface across calls in do_bump"); self.do_bump( - self.get_io(), - input.get_option("dev-only").as_bool().unwrap_or(false), - input.get_option("no-dev-only").as_bool().unwrap_or(false), - input.get_option("dry-run").as_bool().unwrap_or(false), + io_ref, + dev_only, + no_dev_only, + dry_run, packages_filter, "--dev-only".to_string(), ) } pub fn do_bump( - &self, + &mut self, io: &dyn IOInterface, dev_only: bool, no_dev_only: bool, @@ -100,7 +105,7 @@ impl BumpCommand { return Ok(Self::ERROR_GENERIC); } - let composer_json = JsonFile::new(composer_json_path.clone(), None, None)?; + let mut composer_json = JsonFile::new(composer_json_path.clone(), None, None)?; let contents = match file_get_contents(&composer_json.get_path()) { Some(c) => c, None => { @@ -129,7 +134,7 @@ impl BumpCommand { return Ok(Self::ERROR_GENERIC); } - let composer = self.require_composer(None, None)?; + let mut composer = self.require_composer(None, None)?; let has_lock_file_disabled = !composer.get_config().borrow().has("lock") || composer .get_config() @@ -139,9 +144,9 @@ impl BumpCommand { .unwrap_or(true); let repo: Box<dyn crate::repository::repository_interface::RepositoryInterface> = if !has_lock_file_disabled { - Box::new(composer.get_locker().get_locked_repository(true)?) - } else if composer.get_locker().is_locked() { - if !composer.get_locker().is_fresh()? { + Box::new(composer.get_locker_mut().get_locked_repository(true)?) + } else if composer.get_locker_mut().is_locked() { + if !composer.get_locker_mut().is_fresh()? { io.write_error3( "<error>The lock file is not up to date with the latest changes in composer.json. Run the appropriate `update` to fix that before you use the `bump` command.</error>", true, @@ -149,7 +154,7 @@ impl BumpCommand { ); return Ok(Self::ERROR_LOCK_OUTDATED); } - Box::new(composer.get_locker().get_locked_repository(true)?) + Box::new(composer.get_locker_mut().get_locked_repository(true)?) } else { // TODO(phase-b): get_local_repository returns &dyn InstalledRepositoryInterface; // cloning into an owned Box requires clone_box on that trait. @@ -304,7 +309,7 @@ impl BumpCommand { } if !dry_run - && composer.get_locker().is_locked() + && composer.get_locker_mut().is_locked() && composer .get_config() .borrow_mut() @@ -314,7 +319,7 @@ impl BumpCommand { && change_count > 0 { composer - .get_locker() + .get_locker_mut() .update_hash(&composer_json, None::<fn(_) -> _>)?; } diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs index dae4ec0..73a1f50 100644 --- a/crates/shirabe/src/command/check_platform_reqs_command.rs +++ b/crates/shirabe/src/command/check_platform_reqs_command.rs @@ -50,11 +50,11 @@ impl CheckPlatformReqsCommand { } pub fn execute( - &self, + &mut self, input: &dyn InputInterface, _output: &dyn OutputInterface, ) -> Result<i64> { - let composer = self.require_composer(None, None)?; + let mut composer = self.require_composer(None, None)?; let io = self.get_io(); let no_dev = input.get_option("no-dev").as_bool().unwrap_or(false); @@ -69,7 +69,7 @@ impl CheckPlatformReqsCommand { "<info>Checking {}platform requirements using the lock file</info>", if no_dev { "non-dev " } else { "" } )); - Box::new(composer.get_locker().get_locked_repository(!no_dev)?) + Box::new(composer.get_locker_mut().get_locked_repository(!no_dev)?) } else { let local_repo = composer.get_repository_manager().get_local_repository(); if local_repo.get_packages().is_empty() { @@ -77,7 +77,7 @@ impl CheckPlatformReqsCommand { "<warning>No vendor dir present, checking {}platform requirements from the lock file</warning>", if no_dev { "non-dev " } else { "" } )); - Box::new(composer.get_locker().get_locked_repository(!no_dev)?) + Box::new(composer.get_locker_mut().get_locked_repository(!no_dev)?) as Box<dyn crate::repository::repository_interface::RepositoryInterface> } else { if no_dev { @@ -232,7 +232,7 @@ impl CheckPlatformReqsCommand { Ok(exit_code) } - fn print_table(&self, output: &dyn OutputInterface, results: &[CheckResult], format: &str) { + fn print_table(&mut self, output: &dyn OutputInterface, results: &[CheckResult], format: &str) { let io = self.get_io(); if format == "json" { diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs index bef9d47..89cfeba 100644 --- a/crates/shirabe/src/command/config_command.rs +++ b/crates/shirabe/src/command/config_command.rs @@ -228,31 +228,49 @@ impl ConfigCommand { } if input.get_option("global").as_bool() != Some(true) { - self.config.as_mut().unwrap().borrow_mut().merge( - self.config_file.as_ref().unwrap().read()?, - self.config_file.as_ref().unwrap().get_path(), - ); + let config_read = self.config_file.as_mut().unwrap().read()?; + let config_map = match config_read { + PhpMixed::Array(m) => m + .into_iter() + .map(|(k, v)| (k, *v)) + .collect::<IndexMap<String, PhpMixed>>(), + _ => IndexMap::new(), + }; + self.config + .as_mut() + .unwrap() + .borrow_mut() + .merge(&config_map, self.config_file.as_ref().unwrap().get_path()); let auth_data: PhpMixed = if self.auth_config_file.as_ref().unwrap().exists() { - self.auth_config_file.as_ref().unwrap().read()? + self.auth_config_file.as_mut().unwrap().read()? } else { PhpMixed::Array(IndexMap::new()) }; - let mut wrap: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); - wrap.insert("config".to_string(), Box::new(auth_data)); - self.config.as_mut().unwrap().borrow_mut().merge( - PhpMixed::Array(wrap), - self.auth_config_file.as_ref().unwrap().get_path(), - ); + let mut wrap: IndexMap<String, PhpMixed> = IndexMap::new(); + wrap.insert("config".to_string(), auth_data); + self.config + .as_mut() + .unwrap() + .borrow_mut() + .merge(&wrap, self.auth_config_file.as_ref().unwrap().get_path()); } - self.get_io() - .load_configuration(&mut *self.config.as_ref().unwrap().borrow_mut())?; + { + let config_rc = self.config.as_ref().unwrap().clone(); + self.get_io() + .load_configuration(&mut *config_rc.borrow_mut())?; + } // List the configuration of the file settings if input.get_option("list").as_bool() == Some(true) { + let all_map = self.config.as_ref().unwrap().borrow_mut().all(0)?; + let raw_map = self.config.as_ref().unwrap().borrow().raw(); + let to_mixed = |m: IndexMap<String, PhpMixed>| -> PhpMixed { + PhpMixed::Array(m.into_iter().map(|(k, v)| (k, Box::new(v))).collect()) + }; self.list_configuration( - self.config.as_ref().unwrap().borrow_mut().all(0)?, - self.config.as_ref().unwrap().borrow().raw(), + to_mixed(all_map), + to_mixed(raw_map), output, None, input.get_option("source").as_bool() == Some(true), @@ -301,12 +319,13 @@ impl ConfigCommand { properties_defaults.insert("license".to_string(), PhpMixed::List(vec![])); properties_defaults.insert("suggest".to_string(), PhpMixed::List(vec![])); properties_defaults.insert("extra".to_string(), PhpMixed::List(vec![])); - let raw_data = self.config_file.as_ref().unwrap().read()?; + let raw_data = self.config_file.as_mut().unwrap().read()?; let mut data = self.config.as_ref().unwrap().borrow_mut().all(0)?; let mut source = self .config .as_ref() .unwrap() + .borrow_mut() .get_source_of_value(&setting_key); let mut value: PhpMixed; @@ -320,19 +339,15 @@ impl ConfigCommand { { if matches.get(&CaptureKey::ByIndex(1)).is_none() { value = data - .as_array() - .and_then(|a| a.get("repositories")) - .map(|v| (**v).clone()) + .get("repositories") + .cloned() .unwrap_or_else(|| PhpMixed::Array(IndexMap::new())); } else { let repo_key = matches .get(&CaptureKey::ByIndex(1)) .cloned() .unwrap_or_default(); - let repos = data - .as_array() - .and_then(|a| a.get("repositories")) - .map(|v| (**v).clone()); + let repos = data.get("repositories").cloned(); value = match repos .as_ref() .and_then(|r| r.as_array().and_then(|a| a.get(&repo_key))) @@ -349,15 +364,17 @@ impl ConfigCommand { } } else if strpos(&setting_key, ".").is_some() { let bits = explode(".", &setting_key); - if bits[0] == "extra" || bits[0] == "suggest" { - data = raw_data.clone(); + // PHP: $data here is the mixed dot-segment cursor; the rest of the loop walks it. + let mut cursor: PhpMixed = if bits[0] == "extra" || bits[0] == "suggest" { + PhpMixed::Array( + raw_data + .as_array() + .map(|a| a.clone()) + .unwrap_or_else(IndexMap::new), + ) } else { - data = data - .as_array() - .and_then(|a| a.get("config")) - .map(|v| (**v).clone()) - .unwrap_or(PhpMixed::Null); - } + data.get("config").cloned().unwrap_or(PhpMixed::Null) + }; let mut r#match = false; let mut key_acc: Option<String> = None; for bit in &bits { @@ -367,10 +384,10 @@ impl ConfigCommand { }; key_acc = Some(new_key.clone()); r#match = false; - if let Some(arr) = data.as_array() { + if let Some(arr) = cursor.as_array() { if let Some(v) = arr.get(&new_key) { r#match = true; - data = (**v).clone(); + cursor = (**v).clone(); key_acc = None; } } @@ -384,10 +401,9 @@ impl ConfigCommand { .into()); } - value = data; + value = cursor; } else if data - .as_array() - .and_then(|a| a.get("config")) + .get("config") .and_then(|c| c.as_array()) .map(|c| c.contains_key(&setting_key)) .unwrap_or(false) @@ -399,12 +415,13 @@ impl ConfigCommand { } else { Config::RELATIVE_PATHS }, - ); + )?; // ensure we get {} output for properties which are objects if value.as_array().map(|a| a.is_empty()).unwrap_or(false) { let schema = JsonFile::parse_json( Some( - &file_get_contents(JsonFile::COMPOSER_SCHEMA_PATH).unwrap_or_default(), + &file_get_contents(&JsonFile::composer_schema_path()) + .unwrap_or_default(), ), Some("composer.schema.json"), )?; @@ -425,18 +442,15 @@ impl ConfigCommand { PhpMixed::List(_) | PhpMixed::Array(_) => tv, other => PhpMixed::List(vec![Box::new(other.clone())]), }; - if in_array( - "object", - &type_array - .as_list() - .map(|l| { - l.iter() - .filter_map(|v| v.as_string().map(|s| s.to_string())) - .collect::<Vec<_>>() - }) - .unwrap_or_default(), - true, - ) { + let type_strings: Vec<String> = type_array + .as_list() + .map(|l| { + l.iter() + .filter_map(|v| v.as_string().map(|s| s.to_string())) + .collect::<Vec<_>>() + }) + .unwrap_or_default(); + if type_strings.iter().any(|s| s == "object") { value = PhpMixed::Object(ArrayObject::new(None)); } } @@ -445,7 +459,7 @@ impl ConfigCommand { .as_array() .and_then(|a| a.get(&setting_key)) .is_some() - && in_array(setting_key.as_str(), &properties, true) + && in_array(setting_key.as_str().into(), &properties.into(), true) { value = (**raw_data.as_array().unwrap().get(&setting_key).unwrap()).clone(); source = self.config_file.as_ref().unwrap().get_path().to_string(); @@ -484,13 +498,14 @@ impl ConfigCommand { let boolean_validator = |val: &PhpMixed| -> bool { in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ "true".to_string(), "false".to_string(), "1".to_string(), "0".to_string(), - ], + ] + .into(), true, ) }; @@ -522,6 +537,7 @@ impl ConfigCommand { .config .as_ref() .unwrap() + .borrow() .get("disable-tls") .as_bool() .unwrap_or(false) @@ -679,7 +695,7 @@ impl ConfigCommand { return Ok(0); } - if 2 == count(&values) { + if 2 == values.len() { let mut repo: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); repo.insert( "type".to_string(), @@ -698,7 +714,7 @@ impl ConfigCommand { return Ok(0); } - if 1 == count(&values) { + if 1 == values.len() { let value = strtolower(&values[0]); if boolean_validator(&PhpMixed::String(value.clone())) { if !boolean_normalizer(&PhpMixed::String(value.clone())) @@ -748,7 +764,7 @@ impl ConfigCommand { if input.get_option("json").as_bool() == Some(true) { value = JsonFile::parse_json(Some(&values[0]), Some("composer.json"))?; if input.get_option("merge").as_bool() == Some(true) { - let current_value_outer = self.config_file.as_ref().unwrap().read()?; + let current_value_outer = self.config_file.as_mut().unwrap().read()?; let bits = explode(".", &setting_key); let mut current_value: PhpMixed = current_value_outer; for bit in &bits { @@ -760,10 +776,12 @@ impl ConfigCommand { } if is_array(¤t_value) && is_array(&value) { if array_is_list(¤t_value) && array_is_list(&value) { - value = PhpMixed::List(array_merge( - current_value.as_list().cloned().unwrap_or_default(), - value.as_list().cloned().unwrap_or_default(), - )); + value = array_merge( + PhpMixed::List( + current_value.as_list().cloned().unwrap_or_default(), + ), + PhpMixed::List(value.as_list().cloned().unwrap_or_default()), + ); } else { // PHP "+" operator on arrays: keep keys from left, fill from right let mut merged: IndexMap<String, Box<PhpMixed>> = @@ -810,8 +828,8 @@ impl ConfigCommand { // handle unsetting extra/suggest if in_array( - setting_key.as_str(), - &vec!["suggest".to_string(), "extra".to_string()], + setting_key.as_str().into(), + &vec!["suggest".to_string(), "extra".to_string()].into(), true, ) && input.get_option("unset").as_bool() == Some(true) { @@ -861,11 +879,12 @@ impl ConfigCommand { // handle audit.ignore and audit.ignore-abandoned with --merge support if in_array( - setting_key.as_str(), + setting_key.as_str().into(), &vec![ "audit.ignore".to_string(), "audit.ignore-abandoned".to_string(), - ], + ] + .into(), true, ) { if input.get_option("unset").as_bool() == Some(true) { @@ -895,7 +914,7 @@ impl ConfigCommand { } if input.get_option("merge").as_bool() == Some(true) { - let current_config = self.config_file.as_ref().unwrap().read()?; + let current_config = self.config_file.as_mut().unwrap().read()?; let key_suffix = str_replace("audit.", "", &setting_key); let current_value = current_config .as_array() @@ -910,10 +929,10 @@ impl ConfigCommand { if !current_value.is_null() && is_array(¤t_value) && is_array(&value) { if array_is_list(¤t_value) && array_is_list(&value) { // Both are lists, merge them - value = PhpMixed::List(array_merge( - current_value.as_list().cloned().unwrap_or_default(), - value.as_list().cloned().unwrap_or_default(), - )); + value = array_merge( + PhpMixed::List(current_value.as_list().cloned().unwrap_or_default()), + PhpMixed::List(value.as_list().cloned().unwrap_or_default()), + ); } else if !array_is_list(¤t_value) && !array_is_list(&value) { // Both are associative arrays (objects), merge them let mut merged: IndexMap<String, Box<PhpMixed>> = @@ -956,9 +975,9 @@ impl ConfigCommand { let key = format!("{}.{}", matches[1], matches[2]); if matches[1] == "bitbucket-oauth" { - if 2 != count(&values) { + if 2 != values.len() { return Err(RuntimeException { - message: format!("Expected two arguments (consumer-key, consumer-secret), got {}", count(&values)), + message: format!("Expected two arguments (consumer-key, consumer-secret), got {}", values.len()), code: 0, } .into()); @@ -968,18 +987,14 @@ impl ConfigCommand { obj.insert("consumer-key".to_string(), Box::new(PhpMixed::String(values[0].clone()))); obj.insert("consumer-secret".to_string(), Box::new(PhpMixed::String(values[1].clone()))); self.auth_config_source.as_mut().unwrap().add_config_setting(&key, PhpMixed::Array(obj)); - } else if matches[1] == "gitlab-token" && 2 == count(&values) { + } else if matches[1] == "gitlab-token" && 2 == values.len() { self.config_source.as_mut().unwrap().remove_config_setting(&key); let mut obj: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); obj.insert("username".to_string(), Box::new(PhpMixed::String(values[0].clone()))); obj.insert("token".to_string(), Box::new(PhpMixed::String(values[1].clone()))); self.auth_config_source.as_mut().unwrap().add_config_setting(&key, PhpMixed::Array(obj)); - } else if in_array( - matches[1].as_str(), - &vec!["github-oauth".to_string(), "gitlab-oauth".to_string(), "gitlab-token".to_string(), "bearer".to_string()], - true, - ) { - if 1 != count(&values) { + } else if in_array(matches[1].as_str().into(), &vec!["github-oauth".to_string(), "gitlab-oauth".to_string(), "gitlab-token".to_string(), "bearer".to_string()].into(), true) { + if 1 != values.len() { return Err(RuntimeException { message: "Too many arguments, expected only one token".to_string(), code: 0, @@ -989,9 +1004,9 @@ impl ConfigCommand { self.config_source.as_mut().unwrap().remove_config_setting(&key); self.auth_config_source.as_mut().unwrap().add_config_setting(&key, PhpMixed::String(values[0].clone())); } else if matches[1] == "http-basic" { - if 2 != count(&values) { + if 2 != values.len() { return Err(RuntimeException { - message: format!("Expected two arguments (username, password), got {}", count(&values)), + message: format!("Expected two arguments (username, password), got {}", values.len()), code: 0, } .into()); @@ -1002,7 +1017,7 @@ impl ConfigCommand { obj.insert("password".to_string(), Box::new(PhpMixed::String(values[1].clone()))); self.auth_config_source.as_mut().unwrap().add_config_setting(&key, PhpMixed::Array(obj)); } else if matches[1] == "custom-headers" { - if count(&values) == 0 { + if values.len() == 0 { return Err(RuntimeException { message: "Expected at least one argument (header), got none".to_string(), code: 0, @@ -1037,9 +1052,9 @@ impl ConfigCommand { self.config_source.as_mut().unwrap().remove_config_setting(&key); self.auth_config_source.as_mut().unwrap().add_config_setting(&key, PhpMixed::List(formatted_headers)); } else if matches[1] == "forgejo-token" { - if 2 != count(&values) { + if 2 != values.len() { return Err(RuntimeException { - message: format!("Expected two arguments (username, access token), got {}", count(&values)), + message: format!("Expected two arguments (username, access token), got {}", values.len()), code: 0, } .into()); @@ -1066,7 +1081,7 @@ impl ConfigCommand { return Ok(0); } - let value: PhpMixed = if count(&values) > 1 { + let value: PhpMixed = if values.len() > 1 { PhpMixed::List( values .iter() @@ -1112,7 +1127,7 @@ impl ConfigCommand { method: &str, ) -> anyhow::Result<()> { let (validator, normalizer) = callbacks; - if 1 != count(values) { + if 1 != values.len() { return Err(RuntimeException { message: "You can only pass one value. Example: php composer.phar config process-timeout 300".to_string(), code: 0, @@ -1145,6 +1160,7 @@ impl ConfigCommand { .config .as_ref() .unwrap() + .borrow() .get("disable-tls") .as_bool() .unwrap_or(false) @@ -1157,6 +1173,7 @@ impl ConfigCommand { .config .as_ref() .unwrap() + .borrow() .get("disable-tls") .as_bool() .unwrap_or(false) @@ -1165,10 +1182,11 @@ impl ConfigCommand { } } - call_user_func( - self.config_source.as_mut().unwrap(), + // TODO(phase-b): port PHP `call_user_func([$this->configSource, $method], $key, $normalizedValue)` + let _ = (method, key, normalized_value); + let _: PhpMixed = call_user_func( method, - vec![PhpMixed::String(key.to_string()), normalized_value], + &[/* PhpMixed::String(key.to_string()), normalized_value */], ); Ok(()) } @@ -1197,24 +1215,25 @@ impl ConfigCommand { return Err(RuntimeException { message: sprintf( &format!("%s is an invalid value{}", suffix), - &[json_encode(&values_mixed, 0).into()], + &[json_encode(&values_mixed).into()], ), code: 0, } .into()); } - call_user_func( - self.config_source.as_mut().unwrap(), + // TODO(phase-b): port PHP `call_user_func([$this->configSource, $method], $key, $normalizer($valuesMixed))` + let _ = (method, key, normalizer(&values_mixed)); + let _: PhpMixed = call_user_func( method, - vec![PhpMixed::String(key.to_string()), normalizer(&values_mixed)], + &[/* PhpMixed::String(key.to_string()), normalizer(&values_mixed) */], ); Ok(()) } /// Display the contents of the file in a pretty formatted way pub(crate) fn list_configuration( - &self, + &mut self, contents: PhpMixed, raw_contents: PhpMixed, output: &dyn OutputInterface, @@ -1222,15 +1241,14 @@ impl ConfigCommand { show_source: bool, ) { let orig_k = k.clone(); - let io = self.get_io(); let contents_arr = contents.as_array().cloned().unwrap_or_default(); let raw_contents_arr = raw_contents.as_array().cloned().unwrap_or_default(); let mut k = k; for (key, value) in &contents_arr { if k.is_none() && !in_array( - key.as_str(), - &vec!["config".to_string(), "repositories".to_string()], + key.as_str().into(), + &vec!["config".to_string(), "repositories".to_string()].into(), true, ) { @@ -1245,7 +1263,7 @@ impl ConfigCommand { let value_inner = (**value).clone(); if is_array(&value_inner) - && (!is_numeric(&key_first_key(&value_inner).unwrap_or_default()) + && (!is_numeric(&key_first_key(&value_inner).unwrap_or_default().into()) || (key == "repositories" && k.is_none())) { let mut new_k = k.clone().unwrap_or_default(); @@ -1266,7 +1284,7 @@ impl ConfigCommand { l.iter() .map(|val| { if is_array(val) { - json_encode(val, 0) + json_encode(val).unwrap_or_default() } else { val.as_string().unwrap_or("").to_string() } @@ -1307,7 +1325,7 @@ impl ConfigCommand { let id = Preg::replace( "{[^a-z0-9]}i", "-", - &strtolower(&shirabe_php_shim::trim(&id, " \t\n\r\0\u{0B}")), + &strtolower(&shirabe_php_shim::trim(&id, Some(" \t\n\r\0\u{0B}"))), ) .unwrap_or_default(); let id = Preg::replace("{-+}", "-", &id).unwrap_or_default(); @@ -1320,7 +1338,7 @@ impl ConfigCommand { .unwrap_or_default() != value_display { - io.write3( + self.get_io().write3( &format!( "[<fg=yellow;href={}>{}{}</>] <info>{} ({})</info>{}", link, @@ -1334,7 +1352,7 @@ impl ConfigCommand { io_interface::QUIET, ); } else { - io.write3( + self.get_io().write3( &format!( "[<fg=yellow;href={}>{}{}</>] <info>{}</info>{}", link, @@ -1359,13 +1377,14 @@ pub type NormalizerFn = Box<dyn Fn(&PhpMixed) -> PhpMixed>; fn boolean_validator(val: &PhpMixed) -> PhpMixed { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ "true".to_string(), "false".to_string(), "1".to_string(), "0".to_string(), - ], + ] + .into(), true, )) } @@ -1383,8 +1402,12 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> m.insert( "process-timeout".to_string(), ( - Box::new(|val| PhpMixed::Bool(is_numeric(val.as_string().unwrap_or("")))), - Box::new(|val| PhpMixed::Int(shirabe_php_shim::intval(val.as_string().unwrap_or("0")))), + Box::new(|val| PhpMixed::Bool(is_numeric(&val.as_string().unwrap_or("").into()))), + Box::new(|val| { + PhpMixed::Int(shirabe_php_shim::intval( + &val.as_string().unwrap_or("0").into(), + )) + }), ), ); m.insert( @@ -1400,8 +1423,8 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> ( Box::new(|val| { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), - &vec!["auto".to_string(), "source".to_string(), "dist".to_string()], + val.as_string().unwrap_or("").into(), + &vec!["auto".to_string(), "source".to_string(), "dist".to_string()].into(), true, )) }), @@ -1413,8 +1436,8 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> ( Box::new(|val| { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), - &vec!["git".to_string(), "http".to_string(), "https".to_string()], + val.as_string().unwrap_or("").into(), + &vec!["git".to_string(), "http".to_string(), "https".to_string()].into(), true, )) }), @@ -1426,12 +1449,13 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> ( Box::new(|val| { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ "true".to_string(), "false".to_string(), "prompt".to_string(), - ], + ] + .into(), true, )) }), @@ -1515,15 +1539,23 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> m.insert( "cache-ttl".to_string(), ( - Box::new(|val| PhpMixed::Bool(is_numeric(val.as_string().unwrap_or("")))), - Box::new(|val| PhpMixed::Int(shirabe_php_shim::intval(val.as_string().unwrap_or("0")))), + Box::new(|val| PhpMixed::Bool(is_numeric(&val.as_string().unwrap_or("").into()))), + Box::new(|val| { + PhpMixed::Int(shirabe_php_shim::intval( + &val.as_string().unwrap_or("0").into(), + )) + }), ), ); m.insert( "cache-files-ttl".to_string(), ( - Box::new(|val| PhpMixed::Bool(is_numeric(val.as_string().unwrap_or("")))), - Box::new(|val| PhpMixed::Int(shirabe_php_shim::intval(val.as_string().unwrap_or("0")))), + Box::new(|val| PhpMixed::Bool(is_numeric(&val.as_string().unwrap_or("").into()))), + Box::new(|val| { + PhpMixed::Int(shirabe_php_shim::intval( + &val.as_string().unwrap_or("0").into(), + )) + }), ), ); m.insert( @@ -1547,13 +1579,14 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> ( Box::new(|val| { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ "auto".to_string(), "full".to_string(), "proxy".to_string(), "symlink".to_string(), - ], + ] + .into(), false, )) }), @@ -1565,14 +1598,15 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> ( Box::new(|val| { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ "stash".to_string(), "true".to_string(), "false".to_string(), "1".to_string(), "0".to_string(), - ], + ] + .into(), true, )) }), @@ -1636,7 +1670,7 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> ( Box::new(|val| { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ "dev".to_string(), "no-dev".to_string(), @@ -1644,7 +1678,8 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> "false".to_string(), "1".to_string(), "0".to_string(), - ], + ] + .into(), true, )) }), @@ -1715,14 +1750,15 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> ( Box::new(|val| { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ "php-only".to_string(), "true".to_string(), "false".to_string(), "1".to_string(), "0".to_string(), - ], + ] + .into(), true, )) }), @@ -1741,12 +1777,13 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> ( Box::new(|val| { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ "true".to_string(), "false".to_string(), "prompt".to_string(), - ], + ] + .into(), true, )) }), @@ -1765,12 +1802,13 @@ fn build_unique_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> ( Box::new(|val| { PhpMixed::Bool(in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ Auditor::ABANDONED_IGNORE.to_string(), Auditor::ABANDONED_REPORT.to_string(), Auditor::ABANDONED_FAIL.to_string(), - ], + ] + .into(), true, )) }), @@ -1806,8 +1844,8 @@ fn build_multi_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> if let Some(list) = vals.as_list() { for val in list { if !in_array( - val.as_string().unwrap_or(""), - &vec!["git".to_string(), "https".to_string(), "ssh".to_string()], + val.as_string().unwrap_or("").into(), + &vec!["git".to_string(), "https".to_string(), "ssh".to_string()].into(), false, ) { return PhpMixed::String( @@ -1855,13 +1893,14 @@ fn build_multi_config_values() -> IndexMap<String, (ValidatorFn, NormalizerFn)> if let Some(list) = vals.as_list() { for val in list { if !in_array( - val.as_string().unwrap_or(""), + val.as_string().unwrap_or("").into(), &vec![ "low".to_string(), "medium".to_string(), "high".to_string(), "critical".to_string(), - ], + ] + .into(), true, ) { return PhpMixed::String( @@ -1919,13 +1958,15 @@ fn build_unique_props() -> IndexMap<String, (ValidatorFn, NormalizerFn)> { "minimum-stability".to_string(), ( Box::new(|val| { - let normalized = VersionParser::normalize_stability(val.as_string().unwrap_or("")); + let normalized = VersionParser::normalize_stability(val.as_string().unwrap_or("")) + .unwrap_or_default(); PhpMixed::Bool(base_package::STABILITIES.contains_key(normalized.as_str())) }), Box::new(|val| { - PhpMixed::String(VersionParser::normalize_stability( - val.as_string().unwrap_or(""), - )) + PhpMixed::String( + VersionParser::normalize_stability(val.as_string().unwrap_or("")) + .unwrap_or_default(), + ) }), ), ); @@ -1986,7 +2027,7 @@ fn flatten_setting_keys(config: PhpMixed, prefix: &str) -> Vec<String> { let mut merged: Vec<String> = vec![]; for k in keys { - merged = array_merge(merged, k); + merged.extend(k); } merged } diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index bd4a92a..8e27ab4 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -113,10 +113,11 @@ impl CreateProjectCommand { _output: &dyn OutputInterface, ) -> Result<i64> { let config = std::rc::Rc::new(std::cell::RefCell::new(Factory::create_config(None, None)?)); - let io = self.get_io(); + // TODO(phase-b): get_io returns &mut Self-borrow; clone_box for an owned Box to dodge. + let io: Box<dyn IOInterface> = self.get_io().clone_box(); let (prefer_source, prefer_dist) = - self.get_preferred_install_options(&config, input, true)?; + self.get_preferred_install_options(&config.borrow(), input, true)?; if input.get_option("dev").as_bool().unwrap_or(false) { io.write_error("<warning>You are using the deprecated option \"dev\". Dev packages are installed by default now.</warning>"); @@ -160,8 +161,9 @@ impl CreateProjectCommand { Some(repository_url_opt) }; + let mut io = io; self.install_project( - io, + &mut *io, config, input, input @@ -206,7 +208,7 @@ impl CreateProjectCommand { #[allow(clippy::too_many_arguments)] pub fn install_project( &mut self, - io: &dyn IOInterface, + io: &mut dyn IOInterface, config: std::rc::Rc<std::cell::RefCell<Config>>, input: &dyn InputInterface, package_name: Option<String>, @@ -248,7 +250,7 @@ impl CreateProjectCommand { // we need to manually load the configuration to pass the auth credentials to the io interface! io.load_configuration(&mut *config.borrow_mut())?; - self.suggested_packages_reporter = Some(SuggestedPackagesReporter::new(io)); + self.suggested_packages_reporter = Some(SuggestedPackagesReporter::new(io.clone_box())); let installed_from_vcs = if let Some(package_name) = package_name.as_ref() { self.install_root_package( @@ -292,16 +294,22 @@ impl CreateProjectCommand { )?; let composer_json_repositories_config = composer.get_config().borrow().get_repositories(); + // TODO(phase-b): generate_repository_name expects existing repos as + // IndexMap<String, Box<dyn RepositoryInterface>>; pass empty placeholder. + let _ = &composer_json_repositories_config; + let placeholder_existing: IndexMap< + String, + Box<dyn crate::repository::repository_interface::RepositoryInterface>, + > = IndexMap::new(); let name = RepositoryFactory::generate_repository_name( - PhpMixed::Int(index as i64), + &PhpMixed::Int(index as i64), &repo_config, - &composer_json_repositories_config, + &placeholder_existing, + ); + let mut config_source = JsonConfigSource::new( + JsonFile::new("composer.json".to_string(), None, None)?, + false, ); - let config_source = JsonConfigSource::new(JsonFile::new( - "composer.json".to_string(), - None, - None, - )?); let is_packagist_disabled = (repo_config.contains_key("packagist") && repo_config.len() == 1 @@ -336,13 +344,18 @@ impl CreateProjectCommand { .borrow() .get_process_executor() .map(std::rc::Rc::clone); - let fs = Filesystem::new(process); + let mut fs = Filesystem::new(process); // dispatch event - composer.get_event_dispatcher().dispatch_script( - ScriptEvents::POST_ROOT_PACKAGE_INSTALL, - install_dev_packages, - ); + composer + .get_event_dispatcher() + .borrow_mut() + .dispatch_script( + ScriptEvents::POST_ROOT_PACKAGE_INSTALL, + install_dev_packages, + vec![], + IndexMap::new(), + ); // use the new config including the newly installed project let config = std::rc::Rc::clone(composer.get_config()); @@ -353,18 +366,18 @@ impl CreateProjectCommand { // install dependencies of the created project if no_install == false { composer - .get_installation_manager() + .get_installation_manager_mut() .set_output_progress(!no_progress); - let mut installer = Installer::create(io, &composer); + let mut installer = Installer::create(io.clone_box(), &composer); + // TODO(phase-b): set_suggested_packages_reporter takes by value but PHP class + // means shared ownership; needs Rc<SuggestedPackagesReporter> for proper sharing. installer .set_prefer_source(prefer_source) .set_prefer_dist(prefer_dist) .set_dev_mode(install_dev_packages) .set_platform_requirement_filter(platform_requirement_filter.clone_box()) - .set_suggested_packages_reporter( - self.suggested_packages_reporter.as_ref().unwrap().clone(), - ) + .set_suggested_packages_reporter(SuggestedPackagesReporter::new(io.clone_box())) .set_optimize_autoloader( config .borrow_mut() @@ -389,7 +402,7 @@ impl CreateProjectCommand { ) .set_audit_config(self.create_audit_config(&mut *config.borrow_mut(), input)?); - if !composer.get_locker().is_locked() { + if !composer.get_locker_mut().is_locked() { installer.set_update(true); } @@ -453,7 +466,7 @@ impl CreateProjectCommand { } // PHP: try { $dirs = iterator_to_array($finder); ... } catch (\Exception $e) { ... } - let dirs: Vec<String> = finder.iter().collect(); + let dirs: Vec<String> = finder.iter().map(|f| f.get_pathname()).collect(); drop(finder); let mut had_error: Option<anyhow::Error> = None; for dir in &dirs { @@ -481,15 +494,17 @@ impl CreateProjectCommand { // rewriting self.version dependencies with explicit version numbers if the package's vcs metadata is gone if !has_vcs { let package = composer.get_package(); - let config_source = - JsonConfigSource::new(JsonFile::new("composer.json".to_string(), None, None)?); + let mut config_source = JsonConfigSource::new( + JsonFile::new("composer.json".to_string(), None, None)?, + false, + ); for (r#type, meta) in SUPPORTED_LINK_TYPES.iter() { // PHP: $package->{'get'.$meta['method']}() — dynamic getter dispatch // TODO(phase-b): dynamic getter dispatch by name let _method = format!("get{}", meta.method); let links: Vec<crate::package::link::Link> = vec![]; for link in links { - if link.get_pretty_constraint().as_deref() == Some("self.version") { + if link.get_pretty_constraint().as_deref().ok() == Some("self.version") { config_source.add_link( r#type, link.get_target(), @@ -501,12 +516,15 @@ impl CreateProjectCommand { } // dispatch event - composer.get_event_dispatcher().dispatch_script( - ScriptEvents::POST_CREATE_PROJECT_CMD, - install_dev_packages, - vec![], - indexmap::IndexMap::new(), - ); + composer + .get_event_dispatcher() + .borrow_mut() + .dispatch_script( + ScriptEvents::POST_CREATE_PROJECT_CMD, + install_dev_packages, + vec![], + indexmap::IndexMap::new(), + ); chdir(&old_cwd); @@ -564,10 +582,10 @@ impl CreateProjectCommand { directory = rtrim(&directory, Some("/\\")); let process = std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(Some( - Box::new(io), + io.clone_box(), )))); - let fs = Filesystem::new(Some(process)); - if !fs.is_absolute_path(&directory) { + let fs = std::rc::Rc::new(std::cell::RefCell::new(Filesystem::new(Some(process)))); + if !fs.borrow().is_absolute_path(&directory) { directory = format!( "{}{}{}", Platform::get_cwd(false)?, @@ -599,7 +617,8 @@ impl CreateProjectCommand { io.write_error(&format!( "<info>Creating a \"{}\" project at \"{}\"</info>", package_name, - fs.find_shortest_path(&Platform::get_cwd(false)?, &directory, true, false) + fs.borrow() + .find_shortest_path(&Platform::get_cwd(false)?, &directory, true, false) )); if file_exists(&directory) { @@ -613,7 +632,7 @@ impl CreateProjectCommand { } .into()); } - if !fs.is_dir_empty(&directory) { + if !fs.borrow().is_dir_empty(&directory) { return Err(InvalidArgumentException { message: format!("Project directory \"{}\" is not empty.", directory), code: 0, @@ -660,7 +679,8 @@ impl CreateProjectCommand { } } - let stability = VersionParser::normalize_stability(stability.as_deref().unwrap_or("")); + let stability = VersionParser::normalize_stability(stability.as_deref().unwrap_or("")) + .unwrap_or_default(); if !STABILITIES.contains_key(stability.as_str()) { return Err(InvalidArgumentException { @@ -692,14 +712,26 @@ impl CreateProjectCommand { config.borrow_mut().set_base_dir(Some(directory.clone())); let rm = composer.get_repository_manager(); - let mut repository_set = RepositorySet::new(&stability); + let mut repository_set = RepositorySet::new( + &stability, + indexmap::IndexMap::new(), + vec![], + indexmap::IndexMap::new(), + indexmap::IndexMap::new(), + indexmap::IndexMap::new(), + ); if repositories.is_none() { + // TODO(phase-b): default_repos needs &mut RepositoryManager but we hold &RepositoryManager. + let _ = rm; repository_set.add_repository(Box::new(CompositeRepository::new( RepositoryFactory::default_repos( Some(io), Some(std::rc::Rc::clone(&config)), - Some(rm), - )?, + None, + )? + .into_iter() + .map(|(_, v)| v) + .collect(), ))); } else { for repo in repositories.unwrap() { @@ -739,7 +771,7 @@ impl CreateProjectCommand { io, &config, repo_config.clone(), - Some(rm), + None, )?); } } @@ -750,21 +782,30 @@ impl CreateProjectCommand { match platform_overrides { PhpMixed::Array(m) => m .iter() - .map(|(k, v)| (k.clone(), v.as_string().unwrap_or("").to_string())) + .map(|(k, v)| { + ( + k.clone(), + PhpMixed::String(v.as_string().unwrap_or("").to_string()), + ) + }) .collect(), _ => indexmap::IndexMap::new(), }, - ); + )?; // find the latest version if there are multiple - let version_selector = VersionSelector::new(repository_set, Some(platform_repo)); + let mut version_selector = VersionSelector::new(repository_set, Some(&platform_repo))?; + // TODO(phase-b): platform_requirement_filter is &dyn here but VersionSelector expects + // Option<Box<dyn ...>>; pass None as placeholder. + let _ = platform_requirement_filter; let package = version_selector.find_best_candidate( &name, package_version.as_deref(), &stability, - platform_requirement_filter, + None, 0, Some(io), + PhpMixed::Bool(true), )?; if package.is_none() { @@ -785,9 +826,10 @@ impl CreateProjectCommand { &name, package_version.as_deref(), &stability, - &*PlatformRequirementFilterFactory::ignore_all(), + Some(PlatformRequirementFilterFactory::ignore_all()), 0, None, + PhpMixed::Bool(true), )? .is_some() { @@ -816,14 +858,14 @@ impl CreateProjectCommand { let real_dir_clone = real_dir.clone(); signal_handler = Some(SignalHandler::create( vec![ - SignalHandler::SIGINT, - SignalHandler::SIGTERM, - SignalHandler::SIGHUP, + SignalHandler::SIGINT.to_string(), + SignalHandler::SIGTERM.to_string(), + SignalHandler::SIGHUP.to_string(), ], Box::new(move |signal: String, handler: &SignalHandler| { // TODO(phase-b): self.get_io().write_error(...) inside the closure let _ = &signal; - let fs = Filesystem::new(None); + let mut fs = Filesystem::new(None); fs.remove_directory(&real_dir_clone).ok(); handler.exit_with_last_signal(); }), @@ -831,12 +873,14 @@ impl CreateProjectCommand { } // avoid displaying 9999999-dev as version if default-branch was selected - // TODO(phase-b): `$package instanceof AliasPackage` downcast + // TODO(phase-b): `$package instanceof AliasPackage` downcast and reassigning + // `package` to its alias-of requires Rc<dyn PackageInterface> sharing. Skipped. let package_as_alias: Option<&AliasPackage> = None; if package_as_alias.is_some() && package.get_pretty_version() == VersionParser::DEFAULT_BRANCH_ALIAS { - package = package_as_alias.unwrap().get_alias_of(); + // package = package_as_alias.unwrap().get_alias_of(); + todo!("phase-b: reassigning package to alias_of needs Rc-shared ownership"); } io.write_error(&format!( @@ -852,10 +896,12 @@ impl CreateProjectCommand { io.write_error("<info>Plugins have been disabled.</info>"); } - // TODO(phase-b): `$package instanceof AliasPackage` downcast + // TODO(phase-b): `$package instanceof AliasPackage` downcast and reassigning + // `package` to its alias-of requires Rc<dyn PackageInterface> sharing. Skipped. let package_as_alias: Option<&AliasPackage> = None; - if let Some(alias) = package_as_alias { - package = alias.get_alias_of(); + if let Some(_alias) = package_as_alias { + // package = alias.get_alias_of(); + todo!("phase-b: reassigning package to alias_of needs Rc-shared ownership"); } let dm = composer.get_download_manager(); @@ -863,13 +909,17 @@ impl CreateProjectCommand { .set_prefer_source(prefer_source) .set_prefer_dist(prefer_dist); - let project_installer = ProjectInstaller::new(&directory, dm.clone(), &fs); + let project_installer = ProjectInstaller::new(&directory, dm.clone(), fs.clone()); let im = composer.get_installation_manager(); im.set_output_progress(!no_progress); im.add_installer(Box::new(project_installer)); + let mut installed_repo = InstalledArrayRepository::new()?; im.execute( - Box::new(InstalledArrayRepository::new()?), - vec![Box::new(InstallOperation::new(package.clone()))], + &mut installed_repo, + vec![Box::new(InstallOperation::new(package.clone_package_box()))], + true, + true, + false, )?; im.notify_installs(io); @@ -886,7 +936,7 @@ impl CreateProjectCommand { // as it is probably not meant to be used here, so we do not use it if a composer.json can be found // in the project if file_exists(&format!("{}/composer.json", directory)) - && Platform::get_env("COMPOSER") != PhpMixed::Bool(false) + && Platform::get_env("COMPOSER").is_some() { Platform::clear_env("COMPOSER"); } diff --git a/crates/shirabe/src/command/depends_command.rs b/crates/shirabe/src/command/depends_command.rs index 1cfcc04..b5901c1 100644 --- a/crates/shirabe/src/command/depends_command.rs +++ b/crates/shirabe/src/command/depends_command.rs @@ -23,7 +23,7 @@ impl DependsCommand { .set_description("Shows which packages cause the given package to be installed") .set_definition(&[ InputArgument::new( - <Self as BaseDependencyCommand>::ARGUMENT_PACKAGE, + crate::command::base_dependency_command::ARGUMENT_PACKAGE, Some(InputArgument::REQUIRED), "Package to inspect", None, @@ -31,7 +31,7 @@ impl DependsCommand { .unwrap() .into(), InputOption::new( - <Self as BaseDependencyCommand>::OPTION_RECURSIVE, + crate::command::base_dependency_command::OPTION_RECURSIVE, Some(shirabe_php_shim::PhpMixed::String("r".to_string())), Some(InputOption::VALUE_NONE), "Recursively resolves up to the root package", @@ -40,7 +40,7 @@ impl DependsCommand { .unwrap() .into(), InputOption::new( - <Self as BaseDependencyCommand>::OPTION_TREE, + crate::command::base_dependency_command::OPTION_TREE, Some(shirabe_php_shim::PhpMixed::String("t".to_string())), Some(InputOption::VALUE_NONE), "Prints the results as a nested tree", @@ -65,7 +65,7 @@ impl DependsCommand { ); } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> i64 { + pub fn execute(&mut self, input: &dyn InputInterface, output: &dyn OutputInterface) -> i64 { // TODO(phase-b): wire `do_execute` from BaseDependencyCommand trait without conflicting with // BaseCommand blanket impl let _ = (input, output); diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs index 49b926d..161f47d 100644 --- a/crates/shirabe/src/command/diagnose_command.rs +++ b/crates/shirabe/src/command/diagnose_command.rs @@ -12,10 +12,10 @@ use shirabe_php_shim::{ FILTER_VALIDATE_BOOLEAN, INFO_GENERAL, InvalidArgumentException, OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, PHP_BINARY, PHP_EOL, PHP_VERSION, PHP_VERSION_ID, PHP_WINDOWS_VERSION_BUILD, PhpMixed, RuntimeException, count, curl_version, defined, - disk_free_space, extension_loaded, file_exists, filter_var, function_exists, get_class, hash, - implode, ini_get, ioncube_loader_iversion, ioncube_loader_version, is_array, is_string, key, - max_i64, ob_get_clean, ob_start, phpinfo, reset, rtrim, sprintf, str_contains, str_replace, - str_starts_with, strpos, strstr, strtolower, trim, version_compare, + disk_free_space, extension_loaded, file_exists, filter_var, function_exists, get_class, + get_class_err, hash, implode, ini_get, ioncube_loader_iversion, ioncube_loader_version, + is_array, is_string, key, max_i64, ob_get_clean, ob_start, phpinfo, reset, rtrim, sprintf, + str_contains, str_replace, str_starts_with, strpos, strstr, strtolower, trim, version_compare, }; use crate::advisory::auditor::Auditor; @@ -76,11 +76,11 @@ impl DiagnoseCommand { input: &dyn InputInterface, output: &dyn OutputInterface, ) -> anyhow::Result<i64> { - let composer = self.try_composer(None, None); - let io = self.get_io(); + let mut composer = self.try_composer(None, None); + let io_boxed: Box<dyn IOInterface> = self.get_io().clone_box(); let config: std::rc::Rc<std::cell::RefCell<Config>>; - if let Some(ref c) = composer { + if let Some(ref mut c) = composer { config = c.get_config().clone(); let command_event = CommandEvent::new6( @@ -92,6 +92,7 @@ impl DiagnoseCommand { IndexMap::new(), ); c.get_event_dispatcher() + .borrow_mut() .dispatch(Some(command_event.get_name()), None); self.process = Some( c.get_loop() @@ -100,7 +101,7 @@ impl DiagnoseCommand { .map(std::rc::Rc::clone) .unwrap_or_else(|| { std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(Some( - io.clone_box(), + io_boxed.clone_box(), )))) }), ); @@ -108,9 +109,12 @@ impl DiagnoseCommand { config = std::rc::Rc::new(std::cell::RefCell::new(Factory::create_config(None, None)?)); self.process = Some(std::rc::Rc::new(std::cell::RefCell::new( - ProcessExecutor::new(Some(io.clone_box())), + ProcessExecutor::new(Some(io_boxed.clone_box())), ))); } + // TODO(phase-b): clone_box to release self borrow held by get_io. + let io_box = self.get_io().clone_box(); + let io: &dyn IOInterface = io_box.as_ref(); let mut config_inner: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); config_inner.insert("secure-http".to_string(), Box::new(PhpMixed::Bool(false))); @@ -120,9 +124,11 @@ impl DiagnoseCommand { config .borrow_mut() .merge(&secure_http_wrap, Config::SOURCE_COMMAND); - config - .borrow_mut() - .prohibit_url_by_config("http://repo.packagist.org", &NullIO::new()); + let _ = config.borrow_mut().prohibit_url_by_config( + "http://repo.packagist.org", + Some(&NullIO::new()), + &IndexMap::new(), + ); self.http_downloader = Some(std::rc::Rc::new(std::cell::RefCell::new( Factory::create_http_downloader(io, &config, indexmap::IndexMap::new())?, @@ -130,7 +136,7 @@ impl DiagnoseCommand { if strpos(file!(), "phar:") == Some(0) { io.write_no_newline("Checking pubkeys: "); - let r = self.check_pub_keys(&*config.borrow()); + let r = self.check_pub_keys(&*config.borrow())?; self.output_result(r); io.write_no_newline("Checking Composer version: "); @@ -153,8 +159,16 @@ impl DiagnoseCommand { .as_array() .cloned() .unwrap_or_default(); - let platform_repo = PlatformRepository::new(vec![], platform_overrides); - let php_pkg = platform_repo.find_package("php", "*").unwrap(); + let platform_overrides_unboxed: indexmap::IndexMap<String, PhpMixed> = platform_overrides + .into_iter() + .map(|(k, v)| (k, *v)) + .collect(); + let platform_repo = PlatformRepository::new(vec![], platform_overrides_unboxed).unwrap(); + let php_pkg = <PlatformRepository as crate::repository::repository_interface::RepositoryInterface>::find_package( + &platform_repo, + "php", + crate::repository::repository_interface::FindPackageConstraint::String("*".to_string()), + ).unwrap(); let mut php_version = php_pkg.get_pretty_version().to_string(); if let Some(cp) = php_pkg.as_complete_package_interface() { if str_contains(&cp.get_description().unwrap_or_default(), "overridden") { @@ -186,18 +200,18 @@ impl DiagnoseCommand { io.write(&format!("curl version: {}", self.get_curl_version())); let finder = ExecutableFinder::new(); - let has_system_unzip = finder.find("unzip", None, vec![]).is_some(); + let has_system_unzip = finder.find("unzip", None, &[]).is_some(); let mut bin_7zip = String::new(); let has_system_7zip = if finder - .find("7z", None, vec!["C:\\Program Files\\7-Zip".to_string()]) + .find("7z", None, &["C:\\Program Files\\7-Zip".to_string()]) .is_some() { bin_7zip = "7z".to_string(); true - } else if !Platform::is_windows() && finder.find("7zz", None, vec![]).is_some() { + } else if !Platform::is_windows() && finder.find("7zz", None, &[]).is_some() { bin_7zip = "7zz".to_string(); true - } else if !Platform::is_windows() && finder.find("7za", None, vec![]).is_some() { + } else if !Platform::is_windows() && finder.find("7za", None, &[]).is_some() { bin_7zip = "7za".to_string(); true } else { @@ -228,7 +242,7 @@ impl DiagnoseCommand { } )); - if let Some(ref c) = composer { + if let Some(ref mut c) = composer { io.write(&format!( "Active plugins: {}", implode(", ", &c.get_plugin_manager().get_registered_plugins()) @@ -238,9 +252,9 @@ impl DiagnoseCommand { let r = self.check_composer_schema()?; self.output_result(r); - if c.get_locker().is_locked() { + if c.get_locker_mut().is_locked() { io.write_no_newline("Checking composer.lock: "); - let r = self.check_composer_lock_schema(c.get_locker())?; + let r = self.check_composer_lock_schema(c.get_locker_mut())?; self.output_result(r); } } @@ -262,16 +276,22 @@ impl DiagnoseCommand { self.output_result(r); for repo in config.borrow().get_repositories() { - let repo_arr = repo.as_array().cloned().unwrap_or_default(); + let repo_arr = repo.1.as_array().cloned().unwrap_or_default(); if repo_arr.get("type").and_then(|v| v.as_string()) == Some("composer") && repo_arr.get("url").is_some() { + let repo_arr_unboxed: indexmap::IndexMap<String, PhpMixed> = repo_arr + .iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect(); let composer_repo = ComposerRepository::new( - PhpMixed::Array(repo_arr.clone()), + repo_arr_unboxed, self.get_io().clone_box(), &*config.borrow(), self.http_downloader.clone().unwrap(), - ); + None, + ) + .unwrap(); // PHP: ReflectionMethod($composerRepo, 'getPackagesJsonUrl') // We surface the same internal call by directly invoking the equivalent method. // TODO(plugin): support reflection-based access if plugin code requires it. @@ -302,9 +322,14 @@ impl DiagnoseCommand { }; let proxy_check_result: Result<(), anyhow::Error> = (|| -> anyhow::Result<()> { for proto in &protos { - let proxy = - proxy_manager.get_proxy_for_request(&format!("{}://repo.packagist.org", proto)); - if !proxy.get_status().is_empty() { + let proxy = proxy_manager + .lock() + .unwrap() + .as_ref() + .unwrap() + .get_proxy_for_request(&format!("{}://repo.packagist.org", proto)) + .map_err(|e| anyhow::anyhow!(e))?; + if !proxy.get_status(None)?.is_empty() { let r#type = if proxy.is_secure() { "HTTPS" } else { "HTTP" }; io.write_no_newline(&format!("Checking {} proxy with {}: ", r#type, proto)); let r = self.check_http_proxy(&proxy, proto)?; @@ -322,7 +347,7 @@ impl DiagnoseCommand { } else { PhpMixed::String(format!( "<error>[{}] {}</error>", - get_class(&e), + get_class_err(&e), e.to_string() )) }); @@ -337,7 +362,7 @@ impl DiagnoseCommand { .as_array() .cloned() .unwrap_or_default(); - if count(&oauth) > 0 { + if oauth.len() as i64 > 0 { for (domain, token) in &oauth { io.write_no_newline(&format!("Checking {} oauth access: ", domain)); let r = self.check_github_oauth(domain, token.as_string().unwrap_or(""))?; @@ -370,14 +395,14 @@ impl DiagnoseCommand { } else { self.output_result(PhpMixed::String(format!( "<error>[{}] {}</error>", - get_class(&e), + get_class_err(&e), e.to_string() ))); } } else { self.output_result(PhpMixed::String(format!( "<error>[{}] {}</error>", - get_class(&e), + get_class_err(&e), e.to_string() ))); } @@ -392,9 +417,9 @@ impl DiagnoseCommand { Ok(self.exit_code) } - fn check_composer_schema(&self) -> anyhow::Result<PhpMixed> { + fn check_composer_schema(&mut self) -> anyhow::Result<PhpMixed> { let validator = ConfigValidator::new(self.get_io().clone_box()); - let (errors, _, warnings) = validator.validate(&Factory::get_composer_file()); + let (errors, _, warnings) = validator.validate(&Factory::get_composer_file()?, 0, 0); if !errors.is_empty() || !warnings.is_empty() { let mut messages: IndexMap<String, Vec<String>> = IndexMap::new(); @@ -408,7 +433,7 @@ impl DiagnoseCommand { } } - return Ok(PhpMixed::String(rtrim(&output, " \t\n\r\0\u{0B}"))); + return Ok(PhpMixed::String(rtrim(&output, Some(" \t\n\r\0\u{0B}")))); } Ok(PhpMixed::Bool(true)) @@ -426,7 +451,7 @@ impl DiagnoseCommand { output.push_str(&format!("<error>{}</error>{}", error, PHP_EOL)); } - return Ok(PhpMixed::String(trim(&output, " \t\n\r\0\u{0B}"))); + return Ok(PhpMixed::String(trim(&output, Some(" \t\n\r\0\u{0B}")))); } return Err(e); } @@ -441,15 +466,16 @@ impl DiagnoseCommand { } let mut output = String::new(); - self.process.as_mut().unwrap().borrow_mut().execute( + let _ = self.process.as_mut().unwrap().borrow_mut().execute( &vec![ "git".to_string(), "config".to_string(), "color.ui".to_string(), ], &mut output, + (), ); - if strtolower(&trim(&output, " \t\n\r\0\u{0B}")) == "always" { + if strtolower(&trim(&output, Some(" \t\n\r\0\u{0B}"))) == "always" { return "<comment>Your git color.ui setting is set to always, this is known to create issues. Use \"git config --global color.ui true\" to set it correctly.</comment>".to_string(); } @@ -488,7 +514,7 @@ impl DiagnoseCommand { Ok(_) => {} Err(e) => { if let Some(te) = e.downcast_ref::<TransportException>() { - let hints = HttpDownloader::get_exception_hints(te).unwrap_or_default(); + let hints = HttpDownloader::get_exception_hints(&e).unwrap_or_default(); if !hints.is_empty() { for hint in hints { result_list.push(Box::new(PhpMixed::String(hint))); @@ -497,7 +523,7 @@ impl DiagnoseCommand { result_list.push(Box::new(PhpMixed::String(format!( "<error>[{}] {}</error>", - get_class(te), + std::any::type_name_of_val(te), te.message )))); } else { @@ -510,7 +536,7 @@ impl DiagnoseCommand { result_list.push(Box::new(PhpMixed::String(w))); } - if count(&result_list) > 0 { + if result_list.len() > 0 { return Ok(PhpMixed::List(result_list)); } @@ -539,7 +565,7 @@ impl DiagnoseCommand { Ok(_) => {} Err(e) => { if let Some(te) = e.downcast_ref::<TransportException>() { - let hints = HttpDownloader::get_exception_hints(te).unwrap_or_default(); + let hints = HttpDownloader::get_exception_hints(&e).unwrap_or_default(); if !hints.is_empty() { for hint in hints { result_list.push(Box::new(PhpMixed::String(hint))); @@ -548,7 +574,7 @@ impl DiagnoseCommand { result_list.push(Box::new(PhpMixed::String(format!( "<error>[{}] {}</error>", - get_class(te), + std::any::type_name_of_val(te), te.message )))); } else { @@ -561,7 +587,7 @@ impl DiagnoseCommand { result_list.push(Box::new(PhpMixed::String(w))); } - if count(&result_list) > 0 { + if result_list.len() > 0 { return Ok(PhpMixed::List(result_list)); } @@ -612,19 +638,18 @@ impl DiagnoseCommand { let path = str_replace( "%hash%", hash_val.as_string().unwrap_or(""), - &key(&provider_includes.as_array().cloned().unwrap_or_default()) - .unwrap_or_default(), + &key(provider_includes + .as_array() + .cloned() + .unwrap_or_default() + .into()) + .unwrap_or_default(), ); - let provider = self - .http_downloader - .as_ref() - .unwrap() - .borrow_mut() - .get( - &format!("{}://repo.packagist.org/{}", protocol, path), - IndexMap::new(), - )? - .get_body(); + let response = self.http_downloader.as_ref().unwrap().borrow_mut().get( + &format!("{}://repo.packagist.org/{}", protocol, path), + IndexMap::new(), + )?; + let provider = response.get_body().unwrap_or_default().to_string(); if hash("sha256", &provider) != hash_val.as_string().unwrap_or("") { return Ok(PhpMixed::String(format!( @@ -657,11 +682,8 @@ impl DiagnoseCommand { format!("https://{}/api/v3/", domain) }; - let mut opts: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); - opts.insert( - "retry-auth-failure".to_string(), - Box::new(PhpMixed::Bool(false)), - ); + let mut opts: IndexMap<String, PhpMixed> = IndexMap::new(); + opts.insert("retry-auth-failure".to_string(), PhpMixed::Bool(false)); match self .http_downloader @@ -695,7 +717,7 @@ impl DiagnoseCommand { } Ok(PhpMixed::String(format!( "<error>[{}] {}</error>", - get_class(&e), + get_class_err(&e), e.to_string() ))) } @@ -725,11 +747,8 @@ impl DiagnoseCommand { } else { format!("https://{}/api/rate_limit", domain) }; - let mut opts: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); - opts.insert( - "retry-auth-failure".to_string(), - Box::new(PhpMixed::Bool(false)), - ); + let mut opts: IndexMap<String, PhpMixed> = IndexMap::new(); + opts.insert("retry-auth-failure".to_string(), PhpMixed::Bool(false)); let data = self .http_downloader .as_ref() @@ -752,7 +771,7 @@ impl DiagnoseCommand { return PhpMixed::Bool(true); } - let min_space_free = 1024 * 1024; + let min_space_free: f64 = (1024 * 1024) as f64; let home_dir = config.get("home").as_string().unwrap_or("").to_string(); let vendor_dir = config .get("vendor-dir") @@ -773,7 +792,7 @@ impl DiagnoseCommand { PhpMixed::Bool(true) } - fn check_pub_keys(&self, config: &Config) -> PhpMixed { + fn check_pub_keys(&mut self, config: &Config) -> anyhow::Result<PhpMixed> { let home = config.get("home").as_string().unwrap_or("").to_string(); let mut errors: Vec<Box<PhpMixed>> = vec![]; let io = self.get_io(); @@ -787,7 +806,7 @@ impl DiagnoseCommand { if file_exists(&format!("{}/keys.tags.pub", home)) { io.write(&format!( "Tags Public Key Fingerprint: {}", - Keys::fingerprint(&format!("{}/keys.tags.pub", home)) + Keys::fingerprint(&format!("{}/keys.tags.pub", home))? )); } else { errors.push(Box::new(PhpMixed::String( @@ -798,7 +817,7 @@ impl DiagnoseCommand { if file_exists(&format!("{}/keys.dev.pub", home)) { io.write(&format!( "Dev Public Key Fingerprint: {}", - Keys::fingerprint(&format!("{}/keys.dev.pub", home)) + Keys::fingerprint(&format!("{}/keys.dev.pub", home))? )); } else { errors.push(Box::new(PhpMixed::String( @@ -812,11 +831,11 @@ impl DiagnoseCommand { ))); } - if !errors.is_empty() { + Ok(if !errors.is_empty() { PhpMixed::List(errors) } else { PhpMixed::Bool(true) - } + }) } fn check_version( @@ -828,7 +847,7 @@ impl DiagnoseCommand { return Ok(result); } - let versions_util = Versions::new( + let mut versions_util = Versions::new( std::rc::Rc::clone(config), self.http_downloader.clone().unwrap(), ); @@ -843,7 +862,7 @@ impl DiagnoseCommand { Err(e) => { return Ok(PhpMixed::String(format!( "<error>[{}] {}</error>", - get_class(&e), + get_class_err(&e), e.to_string() ))); } @@ -857,7 +876,7 @@ impl DiagnoseCommand { if Composer::VERSION != latest_version && Composer::VERSION != "@package_version@" { return Ok(PhpMixed::String(format!( "<comment>You are not running the latest {} version, run `composer self-update` to update ({} => {})</comment>", - versions_util.get_channel(), + versions_util.get_channel()?, Composer::VERSION, latest_version ))); @@ -874,7 +893,7 @@ impl DiagnoseCommand { let auditor = Auditor; let mut repo_set = RepositorySet::new( - "stable".to_string(), + "stable", IndexMap::new(), vec![], IndexMap::new(), @@ -891,9 +910,9 @@ impl DiagnoseCommand { return Ok(PhpMixed::String("<warning>Could not find Composer's installed.json, this must be a non-standard Composer installation.</>".to_string())); } - let local_repo = FilesystemRepository::new(installed_json, false, None); + let local_repo = FilesystemRepository::new(installed_json, false, None, None)?; let version = Composer::get_version(); - let mut packages = local_repo.get_canonical_packages(); + let mut packages = local_repo.inner.get_canonical_packages(); if version != "@package_version@" { let version_parser = VersionParser::new(); let normalized_version = version_parser.normalize(&version, None)?; @@ -904,34 +923,37 @@ impl DiagnoseCommand { ); packages.push(Box::new(root_pkg)); } - let mut repo_config: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); - repo_config.insert( - "type".to_string(), - Box::new(PhpMixed::String("composer".to_string())), - ); + let mut repo_config: IndexMap<String, PhpMixed> = IndexMap::new(); + repo_config.insert("type".to_string(), PhpMixed::String("composer".to_string())); repo_config.insert( "url".to_string(), - Box::new(PhpMixed::String("https://packagist.org".to_string())), + PhpMixed::String("https://packagist.org".to_string()), ); - repo_set.add_repository(Box::new(ComposerRepository::new( - PhpMixed::Array(repo_config), + // TODO(phase-b): ComposerRepository does not implement RepositoryInterface yet + let _composer_repo = ComposerRepository::new( + repo_config, Box::new(NullIO::new()), - config.clone(), + config, self.http_downloader.clone().unwrap(), - ))); + None, + )?; + let composer_repo_as_repo: Box< + dyn crate::repository::repository_interface::RepositoryInterface, + > = todo!("ComposerRepository as RepositoryInterface"); + repo_set.add_repository(composer_repo_as_repo)?; - let io = BufferIO::new(); + let mut io = BufferIO::new(String::new(), 0, None)?; let result = match auditor.audit( - &io, + &mut io, &repo_set, - &packages, + packages, Auditor::FORMAT_TABLE, true, - &IndexMap::new(), + IndexMap::new(), Auditor::ABANDONED_IGNORE, - &IndexMap::new(), + IndexMap::new(), false, - &IndexMap::new(), + IndexMap::new(), ) { Ok(r) => r, Err(e) => { @@ -1021,6 +1043,7 @@ impl DiagnoseCommand { } fn output_result(&mut self, result: PhpMixed) { + let prev_exit_code = self.exit_code; let io = self.get_io(); if result.as_bool() == Some(true) { io.write("<info>OK</info>"); @@ -1032,7 +1055,8 @@ impl DiagnoseCommand { let mut had_warning = false; let mut result = result; // PHP: $result instanceof \Exception → already converted to string at call sites here - if !result.as_bool().unwrap_or(true) && !result.is_string() && !is_array(&result) { + if !result.as_bool().unwrap_or(true) && !result.as_string().is_some() && !is_array(&result) + { // falsey results should be considered as an error, even if there is nothing to output had_error = true; } else { @@ -1054,10 +1078,8 @@ impl DiagnoseCommand { if had_error { io.write("<error>FAIL</error>"); - self.exit_code = max_i64(self.exit_code, 2); } else if had_warning { io.write("<warning>WARNING</warning>"); - self.exit_code = max_i64(self.exit_code, 1); } if !result.as_bool().unwrap_or(false) { @@ -1065,9 +1087,18 @@ impl DiagnoseCommand { } if let Some(list) = result.as_list() { for message in list { - io.write(&trim(message.as_string().unwrap_or(""), " \t\n\r\0\u{0B}")); + io.write(&trim( + message.as_string().unwrap_or(""), + Some(" \t\n\r\0\u{0B}"), + )); } } + // Apply exit code updates after io borrow ends + if had_error { + self.exit_code = max_i64(prev_exit_code, 2); + } else if had_warning { + self.exit_code = max_i64(prev_exit_code, 1); + } } fn check_platform(&mut self) -> anyhow::Result<PhpMixed> { @@ -1100,10 +1131,10 @@ impl DiagnoseCommand { errors.insert("iconv_mbstring".to_string(), PhpMixed::Bool(true)); } - if !filter_var(&ini_get("allow_url_fopen"), FILTER_VALIDATE_BOOLEAN) - .as_bool() - .unwrap_or(false) - { + if !filter_var( + ini_get("allow_url_fopen").as_deref().unwrap_or(""), + FILTER_VALIDATE_BOOLEAN, + ) { errors.insert("allow_url_fopen".to_string(), PhpMixed::Bool(true)); } @@ -1128,9 +1159,10 @@ impl DiagnoseCommand { if !defined("HHVM_VERSION") && !extension_loaded("apcu") - && filter_var(&ini_get("apc.enable_cli"), FILTER_VALIDATE_BOOLEAN) - .as_bool() - .unwrap_or(false) + && filter_var( + ini_get("apc.enable_cli").as_deref().unwrap_or(""), + FILTER_VALIDATE_BOOLEAN, + ) { warnings.insert("apc_cli".to_string(), PhpMixed::Bool(true)); } @@ -1166,10 +1198,10 @@ impl DiagnoseCommand { } } - if filter_var(&ini_get("xdebug.profiler_enabled"), FILTER_VALIDATE_BOOLEAN) - .as_bool() - .unwrap_or(false) - { + if filter_var( + ini_get("xdebug.profiler_enabled").as_deref().unwrap_or(""), + FILTER_VALIDATE_BOOLEAN, + ) { warnings.insert("xdebug_profile".to_string(), PhpMixed::Bool(true)); } else if XdebugHandler::is_xdebug_active() { warnings.insert("xdebug_loaded".to_string(), PhpMixed::Bool(true)); @@ -1188,12 +1220,13 @@ impl DiagnoseCommand { } if extension_loaded("uopz") - && !(filter_var(&ini_get("uopz.disable"), FILTER_VALIDATE_BOOLEAN) - .as_bool() - .unwrap_or(false) - || filter_var(&ini_get("uopz.exit"), FILTER_VALIDATE_BOOLEAN) - .as_bool() - .unwrap_or(false)) + && !(filter_var( + ini_get("uopz.disable").as_deref().unwrap_or(""), + FILTER_VALIDATE_BOOLEAN, + ) || filter_var( + ini_get("uopz.exit").as_deref().unwrap_or(""), + FILTER_VALIDATE_BOOLEAN, + )) { warnings.insert("uopz".to_string(), PhpMixed::Bool(true)); } @@ -1297,7 +1330,7 @@ impl DiagnoseCommand { // Attempt to parse version number out, fallback to whole string value. let openssl_trimmed = trim( &strstr(OPENSSL_VERSION_TEXT, " ").unwrap_or_default(), - " \t\n\r\0\u{0B}", + Some(" \t\n\r\0\u{0B}"), ); let mut openssl_version = strstr(&openssl_trimmed, " ").unwrap_or_default(); if openssl_version.is_empty() { @@ -1362,7 +1395,7 @@ impl DiagnoseCommand { ); } - Ok(if count(&warnings) == 0 && count(&errors) == 0 { + Ok(if warnings.len() == 0 && errors.len() == 0 { PhpMixed::Bool(true) } else { PhpMixed::String(output) @@ -1371,8 +1404,11 @@ impl DiagnoseCommand { /// Check if allow_url_fopen is ON fn check_connectivity(&self) -> PhpMixed { - if !ini_get("allow_url_fopen").parse::<bool>().unwrap_or(false) - && ini_get("allow_url_fopen") != "1" + if !ini_get("allow_url_fopen") + .as_deref() + .and_then(|s| s.parse::<bool>().ok()) + .unwrap_or(false) + && ini_get("allow_url_fopen").as_deref() != Some("1") { return PhpMixed::String( "<info>SKIP</> <comment>Because allow_url_fopen is missing.</>".to_string(), diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs index 7322322..a8bef5d 100644 --- a/crates/shirabe/src/command/dump_autoload_command.rs +++ b/crates/shirabe/src/command/dump_autoload_command.rs @@ -42,28 +42,36 @@ impl DumpAutoloadCommand { ); } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> Result<i64> { - let composer = self.require_composer(None, None)?; + pub fn execute( + &mut self, + input: &dyn InputInterface, + output: &dyn OutputInterface, + ) -> Result<i64> { + let mut composer = self.require_composer(None, None)?; // TODO(plugin): dispatch CommandEvent let command_event = CommandEvent::new(PluginEvents::COMMAND, "dump-autoload", input, output); composer .get_event_dispatcher() + .borrow_mut() .dispatch(Some(command_event.get_name()), None); - let installation_manager = composer.get_installation_manager(); - let local_repo = composer.get_repository_manager().get_local_repository(); - let package = composer.get_package(); - let config = composer.get_config(); + // Clone the Rc<RefCell<Config>> so we can take mutable borrows of composer later + let config = std::rc::Rc::clone(composer.get_config()); let mut missing_dependencies = false; - for local_pkg in local_repo.get_canonical_packages() { - let install_path = installation_manager.get_install_path(&*local_pkg); - if install_path.as_deref().is_some_and(|p| !file_exists(p)) { - missing_dependencies = true; - self.get_io().write("<warning>Not all dependencies are installed. Make sure to run a \"composer install\" to install missing dependencies</warning>"); - break; + { + let local_repo = composer.get_repository_manager().get_local_repository(); + for local_pkg in local_repo.get_canonical_packages() { + // TODO(phase-b): get_install_path takes &mut self on installation_manager which conflicts with the &local_repo borrow held by this loop; needs shared-ownership refactor + let install_path: Option<String> = + todo!("InstallationManager::get_install_path requires &mut self"); + if install_path.as_deref().is_some_and(|p| !file_exists(p)) { + missing_dependencies = true; + self.get_io().write("<warning>Not all dependencies are installed. Make sure to run a \"composer install\" to install missing dependencies</warning>"); + break; + } } } @@ -127,12 +135,12 @@ impl DumpAutoloadCommand { .write("<info>Generating autoload files</info>"); } - let generator = composer.get_autoload_generator(); + let platform_requirement_filter = self.get_platform_requirement_filter(input)?; if input.get_option("dry-run").as_bool().unwrap_or(false) { - generator.set_dry_run(true); + composer.get_autoload_generator_mut().set_dry_run(true); } if input.get_option("no-dev").as_bool().unwrap_or(false) { - generator.set_dev_mode(false); + composer.get_autoload_generator_mut().set_dev_mode(false); } if input.get_option("dev").as_bool().unwrap_or(false) { if input.get_option("no-dev").as_bool().unwrap_or(false) { @@ -144,27 +152,22 @@ impl DumpAutoloadCommand { } .into()); } - generator.set_dev_mode(true); + composer.get_autoload_generator_mut().set_dev_mode(true); } - generator.set_class_map_authoritative(authoritative); - generator.set_run_scripts(true); - generator.set_apcu(apcu, apcu_prefix.as_deref()); - generator.set_platform_requirement_filter(self.get_platform_requirement_filter(input)?); - let class_map = generator.dump( - &*config.borrow(), - &local_repo, - package, - installation_manager, - "composer", - optimize, - None, - composer.get_locker(), - input - .get_option("strict-ambiguous") - .as_bool() - .unwrap_or(false), - )?; - let number_of_classes = class_map.len(); + composer + .get_autoload_generator_mut() + .set_class_map_authoritative(authoritative); + composer.get_autoload_generator_mut().set_run_scripts(true); + composer + .get_autoload_generator_mut() + .set_apcu(apcu, apcu_prefix); + composer + .get_autoload_generator_mut() + .set_platform_requirement_filter(platform_requirement_filter); + // TODO(phase-b): dump requires multiple borrows of composer simultaneously (autoload generator mut, repository, package, installation manager, locker); needs shared-ownership refactor + let class_map: shirabe_class_map_generator::class_map::ClassMap = + todo!("AutoloadGenerator::dump requires concurrent borrows of Composer subsystems"); + let number_of_classes = class_map.map.len(); if authoritative { self.get_io().write(&format!("<info>Generated optimized autoload files (authoritative) containing {} classes</info>", number_of_classes)); @@ -188,7 +191,7 @@ impl DumpAutoloadCommand { .get_option("strict-ambiguous") .as_bool() .unwrap_or(false) - && !class_map.get_ambiguous_classes(false)?.is_empty() + && !class_map.get_ambiguous_classes(None)?.is_empty() { return Ok(2); } diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs index 59d2290..c6322ab 100644 --- a/crates/shirabe/src/command/exec_command.rs +++ b/crates/shirabe/src/command/exec_command.rs @@ -143,7 +143,12 @@ impl ExecCommand { }) .unwrap_or_default(); - Ok(dispatcher.dispatch_script("__exec_command", true, args, indexmap::IndexMap::new())?) + Ok(dispatcher.borrow_mut().dispatch_script( + "__exec_command", + true, + args, + indexmap::IndexMap::new(), + )?) } fn get_binaries(&mut self, for_display: bool) -> Result<Vec<String>> { diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs index 18b62c4..e7de085 100644 --- a/crates/shirabe/src/command/fund_command.rs +++ b/crates/shirabe/src/command/fund_command.rs @@ -9,6 +9,7 @@ use shirabe_external_packages::symfony::component::console::input::input_interfa use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; use shirabe_php_shim::PhpMixed; +use shirabe_semver::constraint::constraint_interface::ConstraintInterface; use shirabe_semver::constraint::match_all_constraint::MatchAllConstraint; use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; @@ -45,34 +46,44 @@ impl FundCommand { } pub fn execute( - &self, + &mut self, input: &dyn InputInterface, _output: &dyn OutputInterface, ) -> Result<i64> { let composer = self.require_composer(None, None)?; let repo = composer.get_repository_manager().get_local_repository(); - let remote_repos = - CompositeRepository::new(composer.get_repository_manager().get_repositories()); + let remote_repos = CompositeRepository::new( + composer + .get_repository_manager() + .get_repositories() + .iter() + .map(|r| r.clone_box()) + .collect(), + ); let mut fundings: IndexMap<String, IndexMap<String, Vec<String>>> = IndexMap::new(); - let mut packages_to_load: IndexMap<String, Box<MatchAllConstraint>> = IndexMap::new(); + let mut packages_to_load: IndexMap<String, Option<Box<dyn ConstraintInterface>>> = + IndexMap::new(); + let mut packages_to_load_names: indexmap::IndexSet<String> = indexmap::IndexSet::new(); for package in repo.get_packages() { if package.as_any().downcast_ref::<AliasPackage>().is_some() { continue; } packages_to_load.insert( package.get_name().to_string(), - Box::new(MatchAllConstraint::new()), + Some(Box::new(MatchAllConstraint::new())), ); + packages_to_load_names.insert(package.get_name().to_string()); } // load all packages dev versions in parallel let result = remote_repos.load_packages( - &packages_to_load, - &IndexMap::from([("dev".to_string(), base_package::STABILITY_DEV)]), - &IndexMap::new(), - )?; + packages_to_load, + IndexMap::from([("dev".to_string(), base_package::STABILITY_DEV)]), + IndexMap::new(), + IndexMap::new(), + ); // collect funding data from default branches for package in &result.packages { @@ -81,10 +92,10 @@ impl FundCommand { if let Some(complete_pkg) = package.as_any().downcast_ref::<CompletePackage>() { if complete_pkg.is_default_branch() && !complete_pkg.get_funding().is_empty() - && packages_to_load.contains_key(complete_pkg.get_name()) + && packages_to_load_names.contains(complete_pkg.get_name()) { Self::insert_funding_data(&mut fundings, complete_pkg)?; - packages_to_load.remove(complete_pkg.get_name()); + packages_to_load_names.shift_remove(complete_pkg.get_name()); } } } @@ -93,7 +104,7 @@ impl FundCommand { // collect funding from installed packages if none was found in the default branch above for package in repo.get_packages() { if package.as_any().downcast_ref::<AliasPackage>().is_some() - || !packages_to_load.contains_key(package.get_name()) + || !packages_to_load_names.contains(package.get_name()) { continue; } diff --git a/crates/shirabe/src/command/global_command.rs b/crates/shirabe/src/command/global_command.rs index 9be6b43..613d6e4 100644 --- a/crates/shirabe/src/command/global_command.rs +++ b/crates/shirabe/src/command/global_command.rs @@ -72,9 +72,11 @@ impl GlobalCommand { return self.run(input, output); } - let sub_input = self.prepare_subcommand_input(input, false)?; + // TODO(phase-b): sub_input/output need to be &mut for Application::run; placeholder marks. + let mut sub_input = self.prepare_subcommand_input(input, false)?; let mut app = self.get_application()?; - Ok(app.run(Some(&sub_input), Some(output))?) + let _ = output; + Ok(app.run(Some(&mut sub_input), None)?) } fn prepare_subcommand_input( diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs index 4f6fab3..cd13962 100644 --- a/crates/shirabe/src/command/home_command.rs +++ b/crates/shirabe/src/command/home_command.rs @@ -73,7 +73,9 @@ impl HomeCommand { _output: &dyn OutputInterface, ) -> Result<i64> { let repos = self.initialize_repos()?; - let io = self.get_io(); + // TODO(phase-b): clone_box to release self borrow held by get_io. + let io_box = self.get_io().clone_box(); + let io: &dyn IOInterface = io_box.as_ref(); let mut return_code: i64 = 0; let packages: Vec<String> = input @@ -178,23 +180,23 @@ impl HomeCommand { if Platform::is_windows() { let _ = process.execute( PhpMixed::from(vec!["start", "\"web\"", "explorer", url]), - None, - None, + (), + (), ); return; } let linux = process - .execute(PhpMixed::from(vec!["which", "xdg-open"]), None, None) + .execute(PhpMixed::from(vec!["which", "xdg-open"]), (), ()) .unwrap_or(1); let osx = process - .execute(PhpMixed::from(vec!["which", "open"]), None, None) + .execute(PhpMixed::from(vec!["which", "open"]), (), ()) .unwrap_or(1); if linux == 0 { - let _ = process.execute(PhpMixed::from(vec!["xdg-open", url]), None, None); + let _ = process.execute(PhpMixed::from(vec!["xdg-open", url]), (), ()); } else if osx == 0 { - let _ = process.execute(PhpMixed::from(vec!["open", url]), None, None); + let _ = process.execute(PhpMixed::from(vec!["open", url]), (), ()); } else { self.get_io().write_error(&format!( "No suitable browser opening command found, open yourself: {}", @@ -216,6 +218,7 @@ impl HomeCommand { } RepositoryFactory::default_repos_with_default_manager(self.get_io()) + .map(|m| m.into_iter().map(|(_, v)| v).collect()) } } diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index 1f8f595..9e9bad0 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -11,10 +11,10 @@ use shirabe_external_packages::symfony::component::console::input::input_interfa use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; use shirabe_php_shim::{ FILE_IGNORE_NEW_LINES, FILTER_VALIDATE_EMAIL, InvalidArgumentException, PHP_EOL, PhpMixed, - array_filter, array_flip, array_intersect_key, array_keys, array_map, basename, empty, explode, - file, file_exists, file_get_contents, file_put_contents, function_exists, get_current_user, - implode, is_dir, is_string, preg_quote, realpath, server_get, sprintf, str_replace, strpos, - strtolower, trim, ucwords, + array_filter, array_flip, array_flip_strings, array_intersect_key, array_keys, array_map, + basename, empty, explode, file, file_exists, file_get_contents, file_put_contents, + function_exists, get_current_user, implode, is_dir, is_string, preg_quote, realpath, + server_get, sprintf, str_replace, strpos, strtolower, trim, ucwords, }; use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; @@ -115,7 +115,7 @@ impl InitCommand { input: &dyn InputInterface, output: &dyn OutputInterface, ) -> Result<i64> { - let io = self.get_io(); + let io = PackageDiscoveryTrait::get_io(self); let allowlist: Vec<String> = vec![ "name".to_string(), @@ -129,12 +129,15 @@ impl InitCommand { "license".to_string(), "autoload".to_string(), ]; - let mut options = array_filter( - &array_intersect_key(&input.get_options(), &array_flip(&allowlist)), - |val: &PhpMixed| { - !matches!(val, PhpMixed::Null) && !matches!(val, PhpMixed::List(l) if l.is_empty()) - }, - ); + // TODO(phase-b): adapt PhpMixed<->Box<PhpMixed> for array_filter_map + let filtered_input: IndexMap<String, Box<PhpMixed>> = + array_intersect_key(&input.get_options(), &array_flip_strings(&allowlist)) + .into_iter() + .map(|(k, v)| (k, Box::new(v))) + .collect(); + let mut options = shirabe_php_shim::array_filter_map(&filtered_input, |val: &PhpMixed| { + !matches!(val, PhpMixed::Null) && !matches!(val, PhpMixed::List(l) if l.is_empty()) + }); if options.contains_key("name") && !Preg::is_match( @@ -287,24 +290,16 @@ impl InitCommand { options.insert("autoload".to_string(), PhpMixed::Array(autoload_obj)); } - let file_obj = JsonFile::new(Factory::get_composer_file(), None, None)?; + let file_obj = JsonFile::new(Factory::get_composer_file()?, None, None)?; let options_for_encode: IndexMap<String, Box<PhpMixed>> = options .clone() .into_iter() .map(|(k, v)| (k, Box::new(v))) .collect(); - let json = JsonFile::encode(&options_for_encode, 448); + let json = JsonFile::encode(&PhpMixed::Array(options_for_encode.clone()), 448); if input.is_interactive() { - io.write_error3( - PhpMixed::List(vec![ - Box::new(PhpMixed::String(String::new())), - Box::new(PhpMixed::String(json)), - Box::new(PhpMixed::String(String::new())), - ]), - true, - io_interface::NORMAL, - ); + io.write_error3(&format!("\n{}\n", json), true, io_interface::NORMAL); if !io.ask_confirmation( "Do you confirm generation [<comment>yes</comment>]? ".to_string(), true, @@ -321,7 +316,7 @@ impl InitCommand { ); } - file_obj.write(&PhpMixed::Array(options_for_encode.clone()))?; + file_obj.write(PhpMixed::Array(options_for_encode.clone()))?; let validate_result = file_obj.validate_schema(JsonFile::LAX_SCHEMA, None); if let Err(e) = validate_result { // try to downcast to JsonValidationException @@ -336,7 +331,7 @@ impl InitCommand { implode(&format!("{} - ", PHP_EOL), &json_err.get_errors()) ); io.write_error3( - &format!("{}:{}{}", json_err.message, PHP_EOL, errors), + &format!("{}:{}{}", json_err.get_message(), PHP_EOL, errors), true, io_interface::NORMAL, ); @@ -353,7 +348,7 @@ impl InitCommand { // --autoload - Create src folder if let Some(ref ap) = autoload_path { - let filesystem = Filesystem::new(None); + let mut filesystem = Filesystem::new(None); filesystem.ensure_directory_exists(ap); // dump-autoload only for projects without added dependencies. @@ -416,16 +411,11 @@ impl InitCommand { if !input.is_interactive() { if input.get_option("name").is_null() { - input.set_option("name", PhpMixed::String(self.get_default_package_name())); + // TODO(phase-b): input.set_option requires &mut; signature passes &dyn here } if input.get_option("author").is_null() { - input.set_option( - "author", - self.get_default_author() - .map(PhpMixed::String) - .unwrap_or(PhpMixed::Null), - ); + // TODO(phase-b): input.set_option requires &mut; signature passes &dyn here } } } @@ -437,7 +427,10 @@ impl InitCommand { ) -> Result<()> { let io = self.get_io(); // @var FormatterHelper $formatter - let formatter: &FormatterHelper = self.get_helper_set().get("formatter"); + // TODO(phase-b): get_helper_set returns PhpMixed; the helper set needs proper typing. + let formatter: FormatterHelper = todo!(); + let _ = &formatter; + let _ = self.get_helper_set(); // initialize repos if configured let repositories: Vec<String> = input @@ -480,7 +473,7 @@ impl InitCommand { repos.push(RepositoryFactory::create_repo( io, &config, - &repo_config, + repo_config, Some(&mut repo_manager), )?); } @@ -495,7 +488,7 @@ impl InitCommand { repos.push(RepositoryFactory::create_repo( io, &config, - &default_config, + default_config, Some(&mut repo_manager), )?); } @@ -505,29 +498,21 @@ impl InitCommand { } io.write_error3( - PhpMixed::List(vec![ - Box::new(PhpMixed::String(String::new())), - Box::new(PhpMixed::String(formatter.format_block( - "Welcome to the Composer config generator", + &format!( + "\n{}\n", + formatter.format_block( + &["Welcome to the Composer config generator"], "bg=blue;fg=white", true, - ))), - Box::new(PhpMixed::String(String::new())), - ]), + ) + ), true, io_interface::NORMAL, ); // namespace io.write_error3( - PhpMixed::List(vec![ - Box::new(PhpMixed::String(String::new())), - Box::new(PhpMixed::String( - "This command will guide you through creating your composer.json config." - .to_string(), - )), - Box::new(PhpMixed::String(String::new())), - ]), + "\nThis command will guide you through creating your composer.json config.\n", true, io_interface::NORMAL, ); @@ -730,15 +715,7 @@ impl InitCommand { } input.set_option("license", license); - io.write_error3( - PhpMixed::List(vec![ - Box::new(PhpMixed::String(String::new())), - Box::new(PhpMixed::String("Define your dependencies.".to_string())), - Box::new(PhpMixed::String(String::new())), - ]), - true, - io_interface::NORMAL, - ); + io.write_error3("\nDefine your dependencies.\n", true, io_interface::NORMAL); // prepare to resolve dependencies let repos = self.get_repos(); @@ -768,7 +745,7 @@ impl InitCommand { input, _output, require, - _platform_repo.unwrap_or(&PlatformRepository::new(vec![], PhpMixed::Null)), + _platform_repo, &preferred_stability, false, false, @@ -802,7 +779,7 @@ impl InitCommand { input, _output, require_dev, - _platform_repo.unwrap_or(&PlatformRepository::new(vec![], PhpMixed::Null)), + _platform_repo, &preferred_stability, false, false, @@ -950,7 +927,7 @@ impl InitCommand { let namespace: Vec<String> = array_map( |part: &String| { - let part = Preg::replace(r"/[^a-z0-9]/i", " ", &part); + let part = Preg::replace(r"/[^a-z0-9]/i", " ", &part).unwrap_or_default(); let part = ucwords(&part); str_replace(" ", "", &part) }, @@ -966,13 +943,13 @@ impl InitCommand { return self.git_config.clone().unwrap_or_default(); } - let mut process = ProcessExecutor::new(self.get_io()); + let mut process = ProcessExecutor::new(Some(self.get_io().clone_box())); let mut output = String::new(); if process.execute_args( &vec!["git".to_string(), "config".to_string(), "-l".to_string()], &mut output, - None, + (), ) == 0 { self.git_config = Some(IndexMap::new()); @@ -1037,7 +1014,7 @@ impl InitCommand { } } - file_put_contents(ignore_file, &format!("{}{}\n", contents, vendor)); + file_put_contents(ignore_file, format!("{}{}\n", contents, vendor).as_bytes()); } pub(crate) fn is_valid_email(&self, email: &str) -> bool { @@ -1051,10 +1028,12 @@ impl InitCommand { fn update_dependencies(&self, output: &dyn OutputInterface) { // PHP try/catch: catch \Exception - let result = self.get_application().and_then(|app| { - let update_command = app.find("update")?; - app.reset_composer()?; - update_command.run(ArrayInput::new(IndexMap::new()), output)?; + let result = self.get_application().and_then(|mut app| { + let _update_command = app.find("update")?; + app.reset_composer(); + // TODO(phase-b): invoke update_command.run; currently update_command is a PhpMixed. + let _ = ArrayInput::new(IndexMap::new(), None); + let _ = output; Ok(()) }); if let Err(_e) = result { @@ -1067,10 +1046,12 @@ impl InitCommand { } fn run_dump_autoload_command(&self, output: &dyn OutputInterface) { - let result = self.get_application().and_then(|app| { - let command = app.find("dump-autoload")?; - app.reset_composer()?; - command.run(ArrayInput::new(IndexMap::new()), output)?; + let result = self.get_application().and_then(|mut app| { + let _command = app.find("dump-autoload")?; + app.reset_composer(); + // TODO(phase-b): invoke command.run; currently command is a PhpMixed. + let _ = ArrayInput::new(IndexMap::new(), None); + let _ = output; Ok(()) }); if let Err(_e) = result { diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs index 1dcdcee..02ba28d 100644 --- a/crates/shirabe/src/command/install_command.rs +++ b/crates/shirabe/src/command/install_command.rs @@ -61,8 +61,14 @@ impl InstallCommand { ); } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> Result<i64> { - let io = self.get_io(); + pub fn execute( + &mut self, + input: &dyn InputInterface, + output: &dyn OutputInterface, + ) -> Result<i64> { + // TODO(phase-b): clone_box to release self borrow held by get_io. + let io_box = self.get_io().clone_box(); + let io: &dyn IOInterface = io_box.as_ref(); if input.get_option("dev").as_bool().unwrap_or(false) { io.write_error("<warning>You are using the deprecated option \"--dev\". It has no effect and will break in Composer 3.</warning>"); @@ -94,9 +100,9 @@ impl InstallCommand { return Ok(1); } - let composer = self.require_composer(None, None)?; + let mut composer = self.require_composer(None, None)?; - if !composer.get_locker().is_locked() && !HttpDownloader::is_curl_enabled() { + if !composer.get_locker_mut().is_locked() && !HttpDownloader::is_curl_enabled() { io.write_error("<warning>Composer is operating significantly slower than normal because you do not have the PHP curl extension enabled.</warning>"); } @@ -104,9 +110,10 @@ impl InstallCommand { let command_event = CommandEvent::new(PluginEvents::COMMAND, "install", input, output); composer .get_event_dispatcher() + .borrow_mut() .dispatch(Some(command_event.get_name()), None); - let install = Installer::create(io.clone_box(), &composer); + let mut install = Installer::create(io.clone_box(), &composer); let config = std::rc::Rc::clone(composer.get_config()); let (prefer_source, prefer_dist) = @@ -146,7 +153,7 @@ impl InstallCommand { .unwrap_or(false); composer - .get_installation_manager() + .get_installation_manager_mut() .set_output_progress(!input.get_option("no-progress").as_bool().unwrap_or(false)); install diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs index a35b4c5..e041f5c 100644 --- a/crates/shirabe/src/command/licenses_command.rs +++ b/crates/shirabe/src/command/licenses_command.rs @@ -16,10 +16,14 @@ use crate::composer::Composer; use crate::console::input::input_option::InputOption; use crate::io::io_interface::IOInterface; use crate::json::json_file::JsonFile; +use crate::package::base_package::BasePackage; use crate::package::complete_package::CompletePackage; use crate::package::complete_package_interface::CompletePackageInterface; +use crate::package::package_interface::PackageInterface; use crate::plugin::command_event::CommandEvent; use crate::plugin::plugin_events::PluginEvents; +use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; +use crate::repository::repository_interface::RepositoryInterface; use crate::repository::repository_utils::RepositoryUtils; use crate::util::package_info::PackageInfo; use crate::util::package_sorter::PackageSorter; @@ -71,38 +75,57 @@ impl LicensesCommand { ); } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> Result<i64> { - let composer = self.require_composer(None, None)?; + pub fn execute( + &mut self, + input: &dyn InputInterface, + output: &dyn OutputInterface, + ) -> Result<i64> { + let mut composer = self.require_composer(None, None)?; // TODO(plugin): dispatch COMMAND event for plugin hooks let command_event = CommandEvent::new(PluginEvents::COMMAND, "licenses", input, output); composer .get_event_dispatcher() + .borrow_mut() .dispatch(Some(command_event.get_name()), None); - let root = composer.get_package(); + // TODO(phase-b): snapshot root package fields up-front to release the immutable borrow. + let root_name = composer.get_package().get_pretty_name().to_string(); + let root_version = composer.get_package().get_pretty_version().to_string(); + let root_licenses_snap = composer.get_package().get_license().clone(); let packages = if input.get_option("locked").as_bool().unwrap_or(false) { - if !composer.get_locker().is_locked() { + let locker = composer.get_locker_mut(); + if !locker.is_locked() { return Err(UnexpectedValueException { message: "Valid composer.json and composer.lock files are required to run this command with --locked".to_string(), code: 0, }.into()); } - let locker = composer.get_locker(); let no_dev = input.get_option("no-dev").as_bool().unwrap_or(false); let repo = locker.get_locked_repository(!no_dev)?; - repo.get_packages() + <crate::repository::lock_array_repository::LockArrayRepository as crate::repository::repository_interface::RepositoryInterface>::get_packages(&repo) } else { let repo = composer.get_repository_manager().get_local_repository(); if input.get_option("no-dev").as_bool().unwrap_or(false) { - RepositoryUtils::filter_required_packages(repo.get_packages(), root) + RepositoryUtils::filter_required_packages( + &repo.get_packages(), + composer.get_package(), + false, + vec![], + ) } else { repo.get_packages() } }; + let _ = composer.get_package(); - let packages = PackageSorter::sort_packages_alphabetically(packages); + // TODO(phase-b): convert BasePackage trait objects to PackageInterface for sorting. + let pkg_pi: Vec<Box<dyn crate::package::package_interface::PackageInterface>> = packages + .into_iter() + .map(|p| p.clone_package_box()) + .collect(); + let packages = PackageSorter::sort_packages_alphabetically(pkg_pi); let io = self.get_io(); let format = input @@ -112,20 +135,14 @@ impl LicensesCommand { .to_string(); match format.as_str() { "text" => { - let root_licenses = root.get_license(); + let root_licenses = root_licenses_snap.clone(); let licenses_str = if root_licenses.is_empty() { "none".to_string() } else { root_licenses.join(", ") }; - io.write(&format!( - "Name: <comment>{}</comment>", - root.get_pretty_name() - )); - io.write(&format!( - "Version: <comment>{}</comment>", - root.get_full_pretty_version() - )); + io.write(&format!("Name: <comment>{}</comment>", root_name)); + io.write(&format!("Version: <comment>{}</comment>", root_version)); io.write(&format!("Licenses: <comment>{}</comment>", licenses_str)); io.write("Dependencies:"); io.write(""); @@ -133,9 +150,9 @@ impl LicensesCommand { let mut table = Table::new(output); table.set_style("compact"); table.set_headers(vec![ - "Name".to_string(), - "Version".to_string(), - "Licenses".to_string(), + PhpMixed::String("Name".to_string()), + PhpMixed::String("Version".to_string()), + PhpMixed::String("Licenses".to_string()), ]); for package in &packages { let link = PackageInfo::get_view_source_or_homepage_url(package.as_ref()); @@ -160,11 +177,18 @@ impl LicensesCommand { } else { pkg_licenses.join(", ") }; - table.add_row(vec![ - name, - package.get_full_pretty_version().to_string(), - licenses_str, - ]); + table.add_row(PhpMixed::List(vec![ + Box::new(PhpMixed::String(name)), + Box::new(PhpMixed::String( + package + .get_full_pretty_version( + false, + <dyn PackageInterface>::DISPLAY_SOURCE_REF_IF_DEV, + ) + .to_string(), + )), + Box::new(PhpMixed::String(licenses_str)), + ])); } table.render(); } @@ -197,15 +221,12 @@ impl LicensesCommand { } let mut output_map: IndexMap<String, PhpMixed> = IndexMap::new(); - output_map.insert( - "name".to_string(), - PhpMixed::String(root.get_pretty_name().to_string()), - ); + output_map.insert("name".to_string(), PhpMixed::String(root_name.clone())); output_map.insert( "version".to_string(), - PhpMixed::String(root.get_full_pretty_version(true, 0).to_string()), + PhpMixed::String(root_version.clone()), ); - let root_licenses = root.get_license(); + let root_licenses = root_licenses_snap.clone(); output_map.insert( "license".to_string(), PhpMixed::List( @@ -231,7 +252,15 @@ impl LicensesCommand { .collect(), ), ); - io.write(&JsonFile::encode(&output_map, 448)); + io.write(&JsonFile::encode( + &PhpMixed::Array( + output_map + .into_iter() + .map(|(k, v)| (k, Box::new(v))) + .collect(), + ), + 448, + )); } "summary" => { let mut used_licenses: IndexMap<String, i64> = IndexMap::new(); @@ -254,14 +283,22 @@ impl LicensesCommand { let mut entries: Vec<(String, i64)> = used_licenses.into_iter().collect(); entries.sort_by(|a, b| b.1.cmp(&a.1)); - let rows: Vec<Vec<String>> = entries + let rows: Vec<PhpMixed> = entries .iter() - .map(|(license, count)| vec![license.clone(), count.to_string()]) + .map(|(license, count)| { + PhpMixed::List(vec![ + Box::new(PhpMixed::String(license.clone())), + Box::new(PhpMixed::String(count.to_string())), + ]) + }) .collect(); - let symfony_io = SymfonyStyle::new(input, output); + let mut symfony_io = SymfonyStyle::new(input, output); symfony_io.table( - vec!["License".to_string(), "Number of dependencies".to_string()], + vec![ + PhpMixed::String("License".to_string()), + PhpMixed::String("Number of dependencies".to_string()), + ], rows, ); } diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index f9aa811..886c243 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -63,8 +63,11 @@ pub trait PackageDiscoveryTrait { // TODO(phase-b): PlatformRepository::new() signature Box::new(todo!("PlatformRepository::new()") as PlatformRepository), ]; - let io_owned: Box<dyn IOInterface> = todo!("clone self.get_io() into a Box"); - for repo in RepositoryFactory::default_repos_with_default_manager(io_owned) { + let mut io_owned: Box<dyn IOInterface> = todo!("clone self.get_io() into a Box"); + for (_, repo) in RepositoryFactory::default_repos_with_default_manager(&mut *io_owned) + .unwrap() + .into_iter() + { repos.push(repo); } *self.get_repos_mut() = Some(CompositeRepository::new(repos)); @@ -113,11 +116,12 @@ pub trait PackageDiscoveryTrait { .as_string() .map(|s| s.to_string()) .unwrap_or_else(|| "stable".to_string()), - ); + ) + .unwrap_or_default(); } // @phpstan-ignore-next-line as RequireCommand does not have the option above so this code is reachable there - let file = Factory::get_composer_file(); + let file = Factory::get_composer_file().unwrap_or_default(); if is_file(&file) && Filesystem::is_readable(&file) { let contents = file_get_contents(&file).unwrap_or_default(); let composer = json_decode(&contents, true).unwrap_or(PhpMixed::Null); @@ -125,7 +129,7 @@ pub trait PackageDiscoveryTrait { if let Some(arr) = composer.as_array() { if let Some(ms) = arr.get("minimum-stability") { if let Some(s) = ms.as_string() { - return VersionParser::normalize_stability(s); + return VersionParser::normalize_stability(s).unwrap_or_default(); } } } @@ -160,6 +164,7 @@ pub trait PackageDiscoveryTrait { r"{^\d+(\.\d+)?$}", requirement.get("version").map(|s| s.as_str()).unwrap_or(""), ) + .unwrap_or(false) { io.write_error3( &format!( @@ -174,14 +179,10 @@ pub trait PackageDiscoveryTrait { if !requirement.contains_key("version") { // determine the best version automatically - let (name, version) = self.find_best_version_and_name_for_package( - self.get_io(), - input, - requirement.get("name").map(|s| s.as_str()).unwrap_or(""), - platform_repo, - preferred_stability, - fixed, - )?; + // TODO(phase-b): self.get_io() borrow conflicts with self.find_best_version_and_name_for_package + let (name, version): (String, String) = todo!( + "borrow conflict between get_io and find_best_version_and_name_for_package" + ); // replace package name from packagist.org requirement.insert("name".to_string(), name); @@ -219,7 +220,7 @@ pub trait PackageDiscoveryTrait { let version_parser = VersionParser::new(); // Collect existing packages - let composer = self.try_composer(None, None); + let composer = self.try_composer(); let mut installed_repo: Option<_> = None; if let Some(c) = &composer { installed_repo = Some(c.get_repository_manager().get_local_repository()); @@ -231,8 +232,8 @@ pub trait PackageDiscoveryTrait { } } // PHP: unset($composer, $installedRepo); - drop(composer); drop(installed_repo); + drop(composer); let io = self.get_io(); loop { @@ -241,7 +242,8 @@ pub trait PackageDiscoveryTrait { Some(s) => s.to_string(), None => break, }; - let mut matches = self.get_repos().search(package.clone(), 0, None); + // TODO(phase-b): self.get_repos() (&mut self) conflicts with io borrow (&self) + let mut matches: Vec<SearchResult> = todo!("self.get_repos().search()"); if count(&PhpMixed::List( matches.iter().map(|_| Box::new(PhpMixed::Null)).collect(), @@ -271,7 +273,11 @@ pub trait PackageDiscoveryTrait { // no match, prompt which to pick if !exact_match { - let providers = self.get_repos().get_providers(package.clone()); + // TODO(phase-b): self.get_repos() (&mut self) conflicts with io borrow (&self) + let providers: IndexMap< + String, + crate::repository::repository_interface::ProviderInfo, + > = todo!("self.get_repos().get_providers()"); if count(&PhpMixed::List( providers.iter().map(|_| Box::new(PhpMixed::Null)).collect(), )) > 0 @@ -424,14 +430,10 @@ pub trait PackageDiscoveryTrait { let constraint: String = match &constraint_mixed { PhpMixed::Bool(false) => { - let (_name, c) = self.find_best_version_and_name_for_package( - self.get_io(), - input, - &package, - platform_repo, - preferred_stability, - fixed, - )?; + // TODO(phase-b): self.get_io() borrow conflicts with self.find_best_version_and_name_for_package + let (_name, c): (String, String) = todo!( + "borrow conflict between get_io and find_best_version_and_name_for_package" + ); io.write_error3( &sprintf( @@ -490,16 +492,21 @@ pub trait PackageDiscoveryTrait { // find the latest version allowed in this repo set let repo_set = self.get_repository_set(input, None); - let version_selector = VersionSelector::new_with_platform_repo(repo_set, platform_repo); + // TODO(phase-b): VersionSelector::new takes owned RepositorySet; we have a shared reference + let mut version_selector: VersionSelector = + todo!("VersionSelector::new with owned repo_set"); let effective_minimum_stability = self.get_minimum_stability(input); let package = version_selector.find_best_candidate( name, None, preferred_stability, - &*platform_requirement_filter, - // TODO(phase-b): extra optional arguments (0, $this->getIO()) - ); + // TODO(phase-b): Box<dyn ...> cannot be cloned; original PHP shares reference + Some(PlatformRequirementFilterFactory::ignore_nothing()), + 0, + None, + shirabe_php_shim::PhpMixed::Null, + )?; if package.is_none() { // platform packages can not be found in the pool in versions other than the local platform's has @@ -557,8 +564,11 @@ pub trait PackageDiscoveryTrait { name, None, preferred_stability, - &*PlatformRequirementFilterFactory::ignore_all(), - ); + Some(PlatformRequirementFilterFactory::ignore_all()), + 0, + None, + shirabe_php_shim::PhpMixed::Null, + )?; if let Some(candidate) = candidate { return Err(InvalidArgumentException { message: sprintf( @@ -574,22 +584,27 @@ pub trait PackageDiscoveryTrait { } } // Check whether the minimum stability was the problem but the package exists - let package_at_unacceptable = version_selector.find_best_candidate_with_flags( + let package_at_unacceptable = version_selector.find_best_candidate( name, None, preferred_stability, - &*platform_requirement_filter, + // TODO(phase-b): Box<dyn ...> cannot be cloned; reusing factory result + Some(PlatformRequirementFilterFactory::ignore_nothing()), RepositorySet::ALLOW_UNACCEPTABLE_STABILITIES, - ); + None, + shirabe_php_shim::PhpMixed::Null, + )?; if let Some(package) = package_at_unacceptable { // we must first verify if a valid package would be found in a lower priority repository - let all_repos_package = version_selector.find_best_candidate_with_flags( + let all_repos_package = version_selector.find_best_candidate( name, None, preferred_stability, - &*platform_requirement_filter, + Some(PlatformRequirementFilterFactory::ignore_nothing()), RepositorySet::ALLOW_SHADOWED_REPOSITORIES, - ); + None, + shirabe_php_shim::PhpMixed::Null, + )?; if let Some(all_repos_package) = all_repos_package { return Err(InvalidArgumentException { message: format!( @@ -617,21 +632,26 @@ pub trait PackageDiscoveryTrait { } // Check whether the PHP version was the problem for all versions if !is_ignore_all { - let candidate = version_selector.find_best_candidate_with_flags( + let candidate = version_selector.find_best_candidate( name, None, preferred_stability, - &*PlatformRequirementFilterFactory::ignore_all(), + Some(PlatformRequirementFilterFactory::ignore_all()), RepositorySet::ALLOW_UNACCEPTABLE_STABILITIES, - ); + None, + shirabe_php_shim::PhpMixed::Null, + )?; if let Some(candidate) = candidate { let mut additional = String::new(); let no_match = version_selector.find_best_candidate( name, None, preferred_stability, - &*PlatformRequirementFilterFactory::ignore_all(), - ); + Some(PlatformRequirementFilterFactory::ignore_all()), + 0, + None, + shirabe_php_shim::PhpMixed::Null, + )?; if no_match.is_none() { additional = format!( "{}{}Additionally, the package was only found with a stability of \"{}\" while your minimum stability is \"{}\".", @@ -691,12 +711,9 @@ pub trait PackageDiscoveryTrait { "<error>Could not find package {}.</error>\nPick one of these or leave empty to abort:", name, ), - similar - .iter() - .map(|s| (s.clone(), s.clone())) - .collect(), - false, - 1, + similar.iter().map(|s| s.clone()).collect(), + PhpMixed::Bool(false), + PhpMixed::Int(1), "No package named \"%s\" is installed.".to_string(), false, ); @@ -755,7 +772,7 @@ pub trait PackageDiscoveryTrait { if fixed { package.get_pretty_version().to_string() } else { - version_selector.find_recommended_require_version(&*package) + version_selector.find_recommended_require_version(&*package)? }, )) } @@ -793,8 +810,8 @@ pub trait PackageDiscoveryTrait { }; let mut similar_packages: IndexMap<String, i64> = IndexMap::new(); - let installed_repo = self - .require_composer(None, None) + let composer_for_installed = self.require_composer(None, None); + let installed_repo = composer_for_installed .get_repository_manager() .get_local_repository(); @@ -802,7 +819,7 @@ pub trait PackageDiscoveryTrait { // TODO(phase-b): installed_repo.find_package signature mismatch with FindPackageConstraint if installed_repo .find_package( - result.name.clone(), + &result.name, crate::repository::repository_interface::FindPackageConstraint::String( "*".to_string(), ), @@ -835,7 +852,7 @@ pub trait PackageDiscoveryTrait { continue; } let platform_pkg = platform_repo.find_package( - link.get_target().to_string(), + link.get_target(), crate::repository::repository_interface::FindPackageConstraint::String( "*".to_string(), ), @@ -873,10 +890,7 @@ pub trait PackageDiscoveryTrait { let mut platform_pkg_version = platform_pkg.get_pretty_version().to_string(); let platform_extra = platform_pkg.get_extra(); let has_config_platform = platform_extra.contains_key("config.platform"); - let is_complete = platform_pkg - .as_any() - .downcast_ref::<dyn CompletePackageInterface>() - .is_some(); + let is_complete = platform_pkg.as_complete_package_interface().is_some(); if has_config_platform && is_complete { // TODO(phase-b): platform_pkg.get_description() via CompletePackageInterface platform_pkg_version = format!( diff --git a/crates/shirabe/src/command/prohibits_command.rs b/crates/shirabe/src/command/prohibits_command.rs index 80f1ed2..15f74fd 100644 --- a/crates/shirabe/src/command/prohibits_command.rs +++ b/crates/shirabe/src/command/prohibits_command.rs @@ -73,7 +73,7 @@ impl ProhibitsCommand { ); } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> i64 { + pub fn execute(&mut self, input: &dyn InputInterface, output: &dyn OutputInterface) -> i64 { // TODO(phase-b): wire `do_execute` from BaseDependencyCommand trait let _ = (input, output); todo!() diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs index 4ffad79..807183b 100644 --- a/crates/shirabe/src/command/reinstall_command.rs +++ b/crates/shirabe/src/command/reinstall_command.rs @@ -20,6 +20,7 @@ use crate::io::io_interface::IOInterface; use crate::package::alias_package::AliasPackage; use crate::package::base_package; use crate::package::base_package::BasePackage; +use crate::package::package_interface::PackageInterface; use crate::plugin::command_event::CommandEvent; use crate::plugin::plugin_events::PluginEvents; use crate::script::script_events::ScriptEvents; @@ -37,19 +38,19 @@ impl ReinstallCommand { .set_name("reinstall") .set_description("Uninstalls and reinstalls the given package names") .set_definition(&[ - InputOption::new("prefer-source", None, Some(InputOption::VALUE_NONE), "Forces installation from package sources when possible, including VCS information.", None).unwrap().into().unwrap().into(), - InputOption::new("prefer-dist", None, Some(InputOption::VALUE_NONE), "Forces installation from package dist (default behavior).", None).unwrap().into().unwrap().into(), - InputOption::new("prefer-install", None, Some(InputOption::VALUE_REQUIRED), "Forces installation from package dist|source|auto (auto chooses source for dev versions, dist for the rest).", None).unwrap().into().unwrap().into(), - InputOption::new("no-autoloader", None, Some(InputOption::VALUE_NONE), "Skips autoloader generation", None).unwrap().into().unwrap().into(), - InputOption::new("no-progress", None, Some(InputOption::VALUE_NONE), "Do not output download progress.", None).unwrap().into().unwrap().into(), - InputOption::new("optimize-autoloader", Some(shirabe_php_shim::PhpMixed::String("o".to_string())), Some(InputOption::VALUE_NONE), "Optimize autoloader during autoloader dump", None).unwrap().into().unwrap().into(), - InputOption::new("classmap-authoritative", Some(shirabe_php_shim::PhpMixed::String("a".to_string())), Some(InputOption::VALUE_NONE), "Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.", None).unwrap().into().unwrap().into(), - InputOption::new("apcu-autoloader", None, Some(InputOption::VALUE_NONE), "Use APCu to cache found/not-found classes.", None).unwrap().into().unwrap().into(), - InputOption::new("apcu-autoloader-prefix", None, Some(InputOption::VALUE_REQUIRED), "Use a custom prefix for the APCu autoloader cache. Implicitly enables --apcu-autoloader", None).unwrap().into().unwrap().into(), - InputOption::new("ignore-platform-req", None, Some(InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY), "Ignore a specific platform requirement (php & ext- packages).", None).unwrap().into().unwrap().into(), - InputOption::new("ignore-platform-reqs", None, Some(InputOption::VALUE_NONE), "Ignore all platform requirements (php & ext- packages).", None).unwrap().into().unwrap().into(), - InputOption::new("type", None, Some(InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY), "Filter packages to reinstall by type(s)", None).unwrap().into().unwrap().into(), - InputArgument::new("packages", Some(InputArgument::IS_ARRAY), "List of package names to reinstall, can include a wildcard (*) to match any substring.", None).unwrap().into().unwrap().into(), + InputOption::new("prefer-source", None, Some(InputOption::VALUE_NONE), "Forces installation from package sources when possible, including VCS information.", None).unwrap().into(), + InputOption::new("prefer-dist", None, Some(InputOption::VALUE_NONE), "Forces installation from package dist (default behavior).", None).unwrap().into(), + InputOption::new("prefer-install", None, Some(InputOption::VALUE_REQUIRED), "Forces installation from package dist|source|auto (auto chooses source for dev versions, dist for the rest).", None).unwrap().into(), + InputOption::new("no-autoloader", None, Some(InputOption::VALUE_NONE), "Skips autoloader generation", None).unwrap().into(), + InputOption::new("no-progress", None, Some(InputOption::VALUE_NONE), "Do not output download progress.", None).unwrap().into(), + InputOption::new("optimize-autoloader", Some(shirabe_php_shim::PhpMixed::String("o".to_string())), Some(InputOption::VALUE_NONE), "Optimize autoloader during autoloader dump", None).unwrap().into(), + InputOption::new("classmap-authoritative", Some(shirabe_php_shim::PhpMixed::String("a".to_string())), Some(InputOption::VALUE_NONE), "Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.", None).unwrap().into(), + InputOption::new("apcu-autoloader", None, Some(InputOption::VALUE_NONE), "Use APCu to cache found/not-found classes.", None).unwrap().into(), + InputOption::new("apcu-autoloader-prefix", None, Some(InputOption::VALUE_REQUIRED), "Use a custom prefix for the APCu autoloader cache. Implicitly enables --apcu-autoloader", None).unwrap().into(), + InputOption::new("ignore-platform-req", None, Some(InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY), "Ignore a specific platform requirement (php & ext- packages).", None).unwrap().into(), + InputOption::new("ignore-platform-reqs", None, Some(InputOption::VALUE_NONE), "Ignore all platform requirements (php & ext- packages).", None).unwrap().into(), + InputOption::new("type", None, Some(InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY), "Filter packages to reinstall by type(s)", None).unwrap().into(), + InputArgument::new("packages", Some(InputArgument::IS_ARRAY), "List of package names to reinstall, can include a wildcard (*) to match any substring.", None).unwrap().into(), ]) .set_help( "The <info>reinstall</info> command looks up installed packages by name,\n\ @@ -61,10 +62,13 @@ impl ReinstallCommand { ); } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> Result<i64> { - let io = self.get_io(); - + pub fn execute( + &mut self, + input: &dyn InputInterface, + output: &dyn OutputInterface, + ) -> Result<i64> { let composer = self.require_composer(None, None)?; + let io = self.get_io(); let local_repo = composer.get_repository_manager().get_local_repository(); let mut packages_to_reinstall: Vec< @@ -145,10 +149,14 @@ impl ReinstallCommand { } let present_packages = local_repo.get_packages(); - let result_packages = present_packages.clone(); - let present_packages: Vec<_> = present_packages + let result_packages: Vec<Box<dyn PackageInterface>> = present_packages + .iter() + .map(|p| p.clone_package_box()) + .collect(); + let present_packages: Vec<Box<dyn PackageInterface>> = present_packages .into_iter() .filter(|package| !package_names_to_reinstall.contains(&package.get_name().to_string())) + .map(|p| p.clone_package_box()) .collect(); let transaction = Transaction::new(present_packages, result_packages); @@ -183,21 +191,21 @@ impl ReinstallCommand { // TODO(plugin): dispatch CommandEvent let command_event = CommandEvent::new(PluginEvents::COMMAND, "reinstall", input, output); let event_dispatcher = composer.get_event_dispatcher(); - event_dispatcher.dispatch(Some(command_event.get_name()), None); + event_dispatcher + .borrow_mut() + .dispatch(Some(command_event.get_name()), None); let config = std::rc::Rc::clone(composer.get_config()); let (prefer_source, prefer_dist) = - self.get_preferred_install_options(&*config.borrow(), input)?; + self.get_preferred_install_options(&*config.borrow(), input, false)?; let installation_manager = composer.get_installation_manager(); let download_manager = composer.get_download_manager(); let package = composer.get_package(); - installation_manager - .set_output_progress(!input.get_option("no-progress").as_bool().unwrap_or(false)); - if input.get_option("no-plugins").as_bool().unwrap_or(false) { - installation_manager.disable_plugins(); - } + // TODO(phase-b): InstallationManager setters need &mut self; conflicts with the &installation_manager / &local_repo / &package borrows held below; needs shared-ownership refactor + let _no_progress = !input.get_option("no-progress").as_bool().unwrap_or(false); + let _no_plugins = input.get_option("no-plugins").as_bool().unwrap_or(false); download_manager .borrow_mut() @@ -207,15 +215,24 @@ impl ReinstallCommand { let dev_mode = local_repo.get_dev_mode().unwrap_or(true); Platform::put_env("COMPOSER_DEV_MODE", if dev_mode { "1" } else { "0" }); - event_dispatcher.dispatch_script( + event_dispatcher.borrow_mut().dispatch_script( ScriptEvents::PRE_INSTALL_CMD, dev_mode, vec![], indexmap::IndexMap::new(), ); - installation_manager.execute(local_repo, uninstall_operations, dev_mode); - installation_manager.execute(local_repo, install_operations, dev_mode); + // TODO(phase-b): InstallationManager::execute needs `&mut dyn InstalledRepositoryInterface`; + // local_repo is borrowed shared from RepositoryManager. Needs Rc<RefCell<dyn ...>> migration. + let _ = ( + uninstall_operations, + install_operations, + dev_mode, + local_repo, + &installation_manager, + ); + // installation_manager.execute(local_repo_mut, uninstall_ops_boxed, dev_mode, true, false); + // installation_manager.execute(local_repo_mut, install_ops_boxed, dev_mode, true, false); if !input.get_option("no-autoloader").as_bool().unwrap_or(false) { let optimize = input @@ -251,23 +268,25 @@ impl ReinstallCommand { .as_bool() .unwrap_or(false); - let generator = composer.get_autoload_generator(); - generator.set_class_map_authoritative(authoritative); - generator.set_apcu(apcu, apcu_prefix.as_deref()); - generator.set_platform_requirement_filter(self.get_platform_requirement_filter(input)?); - generator.dump( + // TODO(phase-b): AutoloadGenerator setters/dump need &mut self; conflicts with concurrent borrows of composer subsystems; needs shared-ownership refactor + let _ = ( + authoritative, + apcu, + apcu_prefix.clone(), + self.get_platform_requirement_filter(input)?, + optimize, &*config.borrow(), local_repo, package, installation_manager, - "composer", - optimize, - None, - composer.get_locker(), ); + // composer.get_autoload_generator_mut().set_class_map_authoritative(authoritative); + // composer.get_autoload_generator_mut().set_apcu(apcu, apcu_prefix.clone()); + // composer.get_autoload_generator_mut().set_platform_requirement_filter(...); + // composer.get_autoload_generator_mut().dump(...); } - event_dispatcher.dispatch_script( + event_dispatcher.borrow_mut().dispatch_script( ScriptEvents::POST_INSTALL_CMD, dev_mode, vec![], diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs index b25a499..8e2eac2 100644 --- a/crates/shirabe/src/command/remove_command.rs +++ b/crates/shirabe/src/command/remove_command.rs @@ -183,18 +183,23 @@ impl RemoveCommand { .unwrap_or_default(); if input.get_option("unused").as_bool().unwrap_or(false) { - let composer = self.require_composer(None, None)?; - let locker = composer.get_locker(); - if !locker.is_locked() { - return Err(anyhow::anyhow!(UnexpectedValueException { - message: - "A valid composer.lock file is required to run this command with --unused" - .to_string(), - code: 0, - })); + let mut composer = self.require_composer(None, None)?; + { + let locker = composer.get_locker_mut(); + if !locker.is_locked() { + return Err(anyhow::anyhow!(UnexpectedValueException { + message: + "A valid composer.lock file is required to run this command with --unused" + .to_string(), + code: 0, + })); + } } - let locked_packages = locker.get_locked_repository(true)?.get_packages(); + let locked_packages = composer + .get_locker_mut() + .get_locked_repository(true)? + .get_packages(); let mut required: IndexMap<String, bool> = IndexMap::new(); for link in composer @@ -245,12 +250,12 @@ impl RemoveCommand { let file = Factory::get_composer_file()?; - let json_file = JsonFile::new(file.clone(), None, None)?; + let mut json_file = JsonFile::new(file.clone(), None, None)?; let composer_data = json_file.read()?; let composer_backup = std::fs::read_to_string(json_file.get_path())?; - let json_file_for_source = JsonFile::new(file, None, None)?; - let json = JsonConfigSource::new(json_file_for_source, false); + let json_file_for_source = JsonFile::new(file.clone(), None, None)?; + let mut json = JsonConfigSource::new(json_file_for_source, false); let r#type = if input.get_option("dev").as_bool().unwrap_or(false) { "require-dev" @@ -325,7 +330,7 @@ impl RemoveCommand { )); if io.is_interactive() { if io.ask_confirmation( - &format!( + format!( "Do you want to remove it from {} [<comment>yes</comment>]? ", alt_type ), @@ -388,7 +393,7 @@ impl RemoveCommand { )); if io.is_interactive() { if io.ask_confirmation( - &format!( + format!( "Do you want to remove it from {} [<comment>yes</comment>]? ", alt_type ), @@ -421,16 +426,17 @@ impl RemoveCommand { } // TODO(plugin): deactivate installed plugins - if let Some(composer_opt) = self.try_composer(None, None) { + if let Some(mut composer_opt) = self.try_composer(None, None) { composer_opt - .get_plugin_manager() + .get_plugin_manager_mut() .deactivate_installed_plugins(); } self.reset_composer(); - let composer = self.require_composer(None, None)?; + let mut composer = self.require_composer(None, None)?; if dry_run { + // TODO(phase-b): composer.get_package() returns &dyn RootPackageInterface; set_requires/set_dev_requires need &mut self; needs shared-ownership refactor let root_package = composer.get_package(); let mut links: IndexMap<String, IndexMap<String, _>> = IndexMap::new(); links.insert("require".to_string(), root_package.get_requires().clone()); @@ -445,8 +451,10 @@ impl RemoveCommand { } } } - root_package.set_requires(links.remove("require").unwrap_or_default()); - root_package.set_dev_requires(links.remove("require-dev").unwrap_or_default()); + let _ = links.remove("require").unwrap_or_default(); + let _ = links.remove("require-dev").unwrap_or_default(); + // root_package.set_requires(links.remove("require").unwrap_or_default().into_values().collect()); + // root_package.set_dev_requires(links.remove("require-dev").unwrap_or_default().into_values().collect()); } // TODO(plugin): dispatch CommandEvent(PluginEvents::COMMAND, 'remove', input, output) @@ -458,7 +466,9 @@ impl RemoveCommand { ); composer .get_event_dispatcher() - .dispatch(command_event.get_name(), command_event); + .borrow_mut() + // TODO(phase-b): dispatch expects Option<Event>; CommandEvent is a different type + .dispatch(Some(command_event.get_name()), None); let allow_plugins = composer.get_config().borrow_mut().get("allow-plugins"); let removed_plugins: Vec<String> = @@ -491,10 +501,12 @@ impl RemoveCommand { } composer - .get_installation_manager() + .get_installation_manager_mut() .set_output_progress(!input.get_option("no-progress").as_bool().unwrap_or(false)); - let mut install = Installer::create(io, &composer); + // TODO(phase-b): Installer::create expects Box<dyn IOInterface>; io here is &mut dyn IOInterface + let io_box: Box<dyn IOInterface> = todo!("share IOInterface as Box<dyn IOInterface>"); + let mut install = Installer::create(io_box, &composer); let update_dev_mode = !input.get_option("update-no-dev").as_bool().unwrap_or(false); let optimize = input @@ -580,16 +592,16 @@ impl RemoveCommand { install.set_update(true); install.set_install(!input.get_option("no-install").as_bool().unwrap_or(false)); install.set_update_allow_transitive_dependencies(update_allow_transitive_dependencies); - install.set_platform_requirement_filter(self.get_platform_requirement_filter(input)); + install.set_platform_requirement_filter(self.get_platform_requirement_filter(input)?); install.set_dry_run(dry_run); install.set_audit_config( - self.create_audit_config(&mut *composer.get_config().borrow_mut(), input), + self.create_audit_config(&mut *composer.get_config().borrow_mut(), input)?, ); install.set_minimal_update(minimal_changes); // if no lock is present, we do not do a partial update as // this is not supported by the Installer - if composer.get_locker().is_locked() { + if composer.get_locker_mut().is_locked() { install.set_update_allow_list(packages.clone()); } diff --git a/crates/shirabe/src/command/repository_command.rs b/crates/shirabe/src/command/repository_command.rs index 279e9de..306c52f 100644 --- a/crates/shirabe/src/command/repository_command.rs +++ b/crates/shirabe/src/command/repository_command.rs @@ -164,33 +164,21 @@ impl RepositoryCommand { } let reference_name = before.as_deref().or(after.as_deref()).unwrap(); let offset: i64 = if after.is_some() { 1 } else { 0 }; - let repo_config_opt: Option<IndexMap<String, PhpMixed>> = match &repo_config { - PhpMixed::Array(m) => { - Some(m.iter().map(|(k, v)| (k.clone(), *v.clone())).collect()) - } - _ => None, - }; self.config_source.as_mut().unwrap().insert_repository( name.as_deref().unwrap(), - repo_config_opt, + repo_config.clone(), reference_name, offset, - ); + )?; return Ok(0); } let append = input.get_option("append").as_bool().unwrap_or(false); - let repo_config_opt: Option<IndexMap<String, PhpMixed>> = match &repo_config { - PhpMixed::Array(m) => { - Some(m.iter().map(|(k, v)| (k.clone(), *v.clone())).collect()) - } - _ => None, - }; self.config_source.as_mut().unwrap().add_repository( name.as_deref().unwrap(), - repo_config_opt, + repo_config.clone(), append, - ); + )?; Ok(0) } "remove" | "rm" | "delete" => { @@ -204,13 +192,13 @@ impl RepositoryCommand { self.config_source .as_mut() .unwrap() - .remove_repository(name_str); + .remove_repository(name_str)?; if ["packagist", "packagist.org"].contains(&name_str) { self.config_source.as_mut().unwrap().add_repository( "packagist.org", - None, + PhpMixed::Null, false, - ); + )?; } Ok(0) } @@ -326,7 +314,7 @@ impl RepositoryCommand { } } - fn list_repositories(&self, mut repos: IndexMap<String, PhpMixed>) { + fn list_repositories(&mut self, mut repos: IndexMap<String, PhpMixed>) { let io = self.get_io(); let mut packagist_present = false; diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs index a49428d..e5963e4 100644 --- a/crates/shirabe/src/command/require_command.rs +++ b/crates/shirabe/src/command/require_command.rs @@ -39,6 +39,7 @@ use crate::plugin::command_event::CommandEvent; use crate::plugin::plugin_events::PluginEvents; use crate::repository::composite_repository::CompositeRepository; use crate::repository::platform_repository::PlatformRepository; +use crate::repository::repository_interface::RepositoryInterface; use crate::repository::repository_set::RepositorySet; use crate::util::filesystem::Filesystem; use crate::util::package_sorter::PackageSorter; @@ -155,35 +156,28 @@ impl RequireCommand { input: &dyn InputInterface, output: &dyn OutputInterface, ) -> Result<i64> { - self.file = Factory::get_composer_file(); - let io = self.get_io(); + self.file = Factory::get_composer_file()?; if input.get_option("no-suggest").as_bool().unwrap_or(false) { - io.write_error3("<warning>You are using the deprecated option \"--no-suggest\". It has no effect and will break in Composer 3.</warning>", true, io_interface::NORMAL); + self.get_io().write_error3("<warning>You are using the deprecated option \"--no-suggest\". It has no effect and will break in Composer 3.</warning>", true, io_interface::NORMAL); } self.newly_created = !file_exists(&self.file); - if self.newly_created && file_put_contents(&self.file, b"{\n}\n").is_none() { - io.write_error3( - &format!("<error>{} could not be created.</error>", self.file), - true, - io_interface::NORMAL, - ); + let write_failed = self.newly_created && file_put_contents(&self.file, b"{\n}\n").is_none(); + if write_failed { + let msg = format!("<error>{} could not be created.</error>", self.file); + self.get_io().write_error3(&msg, true, io_interface::NORMAL); return Ok(1); } if !Filesystem::is_readable(&self.file) { - io.write_error3( - &format!("<error>{} is not readable.</error>", self.file), - true, - io_interface::NORMAL, - ); + let msg = format!("<error>{} is not readable.</error>", self.file); + self.get_io().write_error3(&msg, true, io_interface::NORMAL); return Ok(1); } - - if filesize(&self.file) == 0 { - file_put_contents(&self.file, "{\n}\n"); + if filesize(&self.file) == Some(0) { + file_put_contents(&self.file, b"{\n}\n"); } self.json = Some(JsonFile::new(self.file.clone(), None, None)?); @@ -200,9 +194,9 @@ impl RequireCommand { // to call self.get_io().write_error(...), self.revert_composer_file(), and handler.exit_with_last_signal() let signal_handler = SignalHandler::create( vec![ - SignalHandler::SIGINT, - SignalHandler::SIGTERM, - SignalHandler::SIGHUP, + SignalHandler::SIGINT.to_string(), + SignalHandler::SIGTERM.to_string(), + SignalHandler::SIGHUP.to_string(), ], Box::new(move |signal: String, handler: &SignalHandler| { // TODO(phase-b): self.get_io().write_error('Received '.$signal.', aborting', true, io_interface::DEBUG); @@ -224,17 +218,14 @@ impl RequireCommand { .ok() == Some(false) { - io.write_error3( - &format!("<error>{} is not writable.</error>", self.file), - true, - io_interface::NORMAL, - ); + let msg = format!("<error>{} is not writable.</error>", self.file); + self.get_io().write_error3(&msg, true, io_interface::NORMAL); return Ok(1); } if input.get_option("fixed").as_bool() == Some(true) { - let config = self.json.as_ref().unwrap().read()?; + let config = self.json.as_mut().unwrap().read()?; let package_type = if empty(&config.get("type").cloned().unwrap_or(PhpMixed::Null)) { "library".to_string() @@ -248,10 +239,10 @@ impl RequireCommand { /// @see https://github.com/composer/composer/pull/8313#issuecomment-532637955 if package_type != "project" && !input.get_option("dev").as_bool().unwrap_or(false) { - io.write_error3("<error>The \"--fixed\" option is only allowed for packages with a \"project\" type or for dev dependencies to prevent possible misuses.</error>", true, io_interface::NORMAL); + self.get_io().write_error3("<error>The \"--fixed\" option is only allowed for packages with a \"project\" type or for dev dependencies to prevent possible misuses.</error>", true, io_interface::NORMAL); if config.get("type").is_none() { - io.write_error3("<error>If your package is not a library, you can explicitly specify the \"type\" by using \"composer config type project\".</error>", true, io_interface::NORMAL); + self.get_io().write_error3("<error>If your package is not a library, you can explicitly specify the \"type\" by using \"composer config type project\".</error>", true, io_interface::NORMAL); } return Ok(1); @@ -262,13 +253,22 @@ impl RequireCommand { let repos = composer.get_repository_manager().get_repositories(); let platform_overrides = composer.get_config().borrow_mut().get("platform"); + let platform_overrides_map: IndexMap<String, PhpMixed> = platform_overrides + .as_array() + .map(|m| m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) + .unwrap_or_default(); // initialize self.repos as it is used by the PackageDiscoveryTrait - let platform_repo = PlatformRepository::new(vec![], platform_overrides); + let platform_repo = PlatformRepository::new(vec![], platform_overrides_map)?; let mut combined: Vec< Box<dyn crate::repository::repository_interface::RepositoryInterface>, - > = vec![Box::new(platform_repo.clone())]; - for repo in repos { - combined.push(repo); + > = vec![ + // TODO(phase-b): PlatformRepository should be shared via Rc; use placeholder until + // CompositeRepository accepts shared references + Box::new(todo!("share platform_repo with PlatformRepository") as PlatformRepository), + ]; + for _repo in repos { + // TODO(phase-b): repos are borrowed from RepositoryManager; need to take ownership + combined.push(todo!("take ownership of repo from RepositoryManager")); } *self.get_repos_mut() = Some(CompositeRepository::new(combined)); @@ -290,7 +290,7 @@ impl RequireCommand { .collect() }) .unwrap_or_default(), - &platform_repo, + Some(&platform_repo), &preferred_stability, // if there is no update, we need to use the best possible version constraint directly as we cannot rely on the solver to guess the best constraint input.get_option("no-update").as_bool().unwrap_or(false), @@ -320,7 +320,7 @@ impl RequireCommand { let mut requirements = self.format_requirements(requirements)?; if !input.get_option("dev").as_bool().unwrap_or(false) - && io.is_interactive() + && self.get_io().is_interactive() && !composer.is_global() { let mut dev_packages: Vec<Vec<String>> = vec![]; @@ -336,9 +336,14 @@ impl RequireCommand { continue; } - let pkg = PackageSorter::get_most_current_version( - self.get_repos().find_packages(name, None), - ); + // TODO(phase-b): find_packages returns Vec<Box<dyn BasePackage>> but + // get_most_current_version expects Vec<Box<dyn PackageInterface>>; needs trait + // upcasting once Rust supports it stably or an adapter. + let _ = self.get_repos().find_packages(name, None); + let pkg: Option<Box<dyn PackageInterface>> = + PackageSorter::get_most_current_version(todo!( + "convert Vec<Box<dyn BasePackage>> to Vec<Box<dyn PackageInterface>>" + )); // TODO(phase-b): instanceof CompletePackageInterface downcast let pkg_as_complete: Option<&dyn CompletePackageInterface> = None; if let Some(pkg_complete) = pkg_as_complete { @@ -368,26 +373,19 @@ impl RequireCommand { } else { "it is" }; - let pkg_dev_tags: Vec<String> = array_unique(&array_merge_recursive( - dev_packages - .iter() - .map(|v| { - PhpMixed::List( - v.iter() - .map(|s| Box::new(PhpMixed::String(s.clone()))) - .collect(), - ) - }) - .collect(), - )); - io.warning(format!( + // TODO(phase-b): PHP's array_merge_recursive + array_unique on a list of + // string lists; collapsed here to a flat unique Vec<String>. + let merged: Vec<String> = dev_packages.iter().flatten().cloned().collect(); + let pkg_dev_tags: Vec<String> = array_unique(&merged); + let warn_msg = format!( "The package{} you required {} recommended to be placed in require-dev (because {} tagged as \"{}\") but you did not use --dev.", plural, plural2, plural3, implode("\", \"", &pkg_dev_tags), - )); - if io.ask_confirmation( + ); + self.get_io().warning(&warn_msg, &[]); + if self.get_io().ask_confirmation( "<info>Do you want to re-run the command with --dev?</> [<comment>yes</>]? " .to_string(), true, @@ -423,10 +421,11 @@ impl RequireCommand { let version_parser = VersionParser::new(); for (package, constraint) in &requirements { if strtolower(package) == composer.get_package().get_name() { - io.write_error3(&sprintf( + let msg = sprintf( "<error>Root package '%s' cannot require itself in its composer.json</error>", &[PhpMixed::String(package.clone())], - ), true, io_interface::NORMAL); + ); + self.get_io().write_error3(&msg, true, io_interface::NORMAL); return Ok(1); } @@ -440,7 +439,7 @@ impl RequireCommand { self.get_inconsistent_require_keys(&requirements, require_key); if (inconsistent_require_keys.len() as i64) > 0 { for package in &inconsistent_require_keys { - io.warning(sprintf( + let warn_msg = sprintf( "%s is currently present in the %s key and you ran the command %s the --dev flag, which will move it to the %s key.", &[ PhpMixed::String(package.clone()), @@ -455,38 +454,35 @@ impl RequireCommand { ), PhpMixed::String(require_key.to_string()), ], - )); + ); + self.get_io().warning(&warn_msg, &[]); } - if io.is_interactive() { - if !io.ask_confirmation( - sprintf( - "<info>Do you want to move %s?</info> [<comment>no</comment>]? ", + if self.get_io().is_interactive() { + let q1 = sprintf( + "<info>Do you want to move %s?</info> [<comment>no</comment>]? ", + &[PhpMixed::String( + if (inconsistent_require_keys.len() as i64) > 1 { + "these requirements" + } else { + "this requirement" + } + .to_string(), + )], + ); + if !self.get_io().ask_confirmation(q1, false) { + let q2 = sprintf( + "<info>Do you want to re-run the command %s --dev?</info> [<comment>yes</comment>]? ", &[PhpMixed::String( - if (inconsistent_require_keys.len() as i64) > 1 { - "these requirements" + if input.get_option("dev").as_bool().unwrap_or(false) { + "without" } else { - "this requirement" + "with" } .to_string(), )], - ), - false, - ) { - if !io.ask_confirmation( - sprintf( - "<info>Do you want to re-run the command %s --dev?</info> [<comment>yes</comment>]? ", - &[PhpMixed::String( - if input.get_option("dev").as_bool().unwrap_or(false) { - "without" - } else { - "with" - } - .to_string(), - )], - ), - true, - ) { + ); + if !self.get_io().ask_confirmation(q2, true) { return Ok(0); } @@ -508,7 +504,7 @@ impl RequireCommand { self.first_require = self.newly_created; if !self.first_require { - let composer_definition = self.json.as_ref().unwrap().read()?; + let composer_definition = self.json.as_mut().unwrap().read()?; let require_count = composer_definition .get("require") .and_then(|v| v.as_array()) @@ -534,19 +530,17 @@ impl RequireCommand { ); } - io.write_error3( - &format!( - "<info>{} has been {}</info>", - self.file, - if self.newly_created { - "created" - } else { - "updated" - } - ), - true, - io_interface::NORMAL, + let updated_msg = format!( + "<info>{} has been {}</info>", + self.file, + if self.newly_created { + "created" + } else { + "updated" + } ); + self.get_io() + .write_error3(&updated_msg, true, io_interface::NORMAL); if input.get_option("no-update").as_bool().unwrap_or(false) { return Ok(0); @@ -555,8 +549,16 @@ impl RequireCommand { composer.get_plugin_manager().deactivate_installed_plugins(); // try/catch/finally - let do_update_result = - self.do_update(input, output, io, &requirements, require_key, remove_key); + // TODO(phase-b): do_update borrows io from self while also needing &mut self for state + // mutations; needs an Rc<dyn IOInterface> on self for clean sharing. + let do_update_result = self.do_update( + input, + output, + todo!("share io reference for do_update"), + &requirements, + require_key, + remove_key, + ); let dry_run = input.get_option("dry-run").as_bool().unwrap_or(false); let result = match do_update_result { @@ -596,7 +598,7 @@ impl RequireCommand { /// @param array<string, string> $newRequirements /// @return string[] fn get_inconsistent_require_keys( - &self, + &mut self, new_requirements: &IndexMap<String, String>, require_key: &str, ) -> Vec<String> { @@ -615,8 +617,8 @@ impl RequireCommand { } /// @return array<string, string> - fn get_packages_by_require_key(&self) -> IndexMap<String, String> { - let composer_definition = self.json.as_ref().unwrap().read().unwrap_or_default(); + fn get_packages_by_require_key(&mut self) -> IndexMap<String, String> { + let composer_definition = self.json.as_mut().unwrap().read().unwrap_or_default(); let mut require: IndexMap<String, PhpMixed> = IndexMap::new(); let mut require_dev: IndexMap<String, PhpMixed> = IndexMap::new(); @@ -682,14 +684,14 @@ impl RequireCommand { ) -> Result<i64> { // Update packages self.reset_composer()?; - let composer = self.require_composer(None, None)?; + let mut composer = self.require_composer(None, None)?; self.dependency_resolution_completed = false; - composer.get_event_dispatcher().add_listener( + // TODO(phase-b): add_listener expects a Callable enum; PHP closure should set + // self.dependency_resolution_completed = true when invoked. + composer.get_event_dispatcher().borrow_mut().add_listener( InstallerEvents::PRE_OPERATIONS_EXEC, - Box::new(move || { - // TODO(phase-b): self.dependency_resolution_completed = true; - }), + crate::event_dispatcher::event_dispatcher::Callable::Closure, 10000, ); @@ -699,7 +701,11 @@ impl RequireCommand { IndexMap::new(); links.insert("require".to_string(), root_package.get_requires()); links.insert("require-dev".to_string(), root_package.get_dev_requires()); - let loader = ArrayLoader::new(None, None, false); + let loader = ArrayLoader::new(None, false); + let requirements_mixed: IndexMap<String, PhpMixed> = requirements + .iter() + .map(|(k, v)| (k.clone(), PhpMixed::String(v.clone()))) + .collect(); let new_links = loader.parse_links( root_package.get_name(), root_package.get_pretty_version(), @@ -707,8 +713,8 @@ impl RequireCommand { .get(require_key) .map(|t| t.method) .unwrap_or_default(), - requirements, - ); + requirements_mixed, + )?; if let Some(section) = links.get_mut(require_key) { for (k, v) in new_links { section.insert(k, v); @@ -719,20 +725,20 @@ impl RequireCommand { section.shift_remove(package); } } - root_package.set_requires(links.get("require").cloned().unwrap_or_default()); - root_package.set_dev_requires(links.get("require-dev").cloned().unwrap_or_default()); - - // extract stability flags & references as they weren't present when loading the unmodified composer.json - let mut references = root_package.get_references(); - references = RootPackageLoader::extract_references(requirements, references); - root_package.set_references(references); - let mut stability_flags = root_package.get_stability_flags(); - stability_flags = RootPackageLoader::extract_stability_flags( + // TODO(phase-b): root_package mutation requires &mut RootPackageInterface but + // Composer::get_package() exposes only & dyn; needs accessor returning &mut for + // the dry-run case to update requires/dev-requires/stability flags/references. + let _ = &links; + let _ = root_package.get_references().clone(); + let _ = RootPackageLoader::extract_references( + requirements, + root_package.get_references().clone(), + ); + let _ = RootPackageLoader::extract_stability_flags( requirements, root_package.get_minimum_stability(), - stability_flags, + root_package.get_stability_flags().clone(), ); - root_package.set_stability_flags(stability_flags); // unset($stabilityFlags, $references); } @@ -828,16 +834,19 @@ impl RequireCommand { let command_event = CommandEvent::new(PluginEvents::COMMAND, "require", input, output); composer .get_event_dispatcher() + .borrow_mut() .dispatch(Some(command_event.get_name()), None); composer - .get_installation_manager() + .get_installation_manager_mut() .set_output_progress(!input.get_option("no-progress").as_bool().unwrap_or(false)); - let install = Installer::create(io, &composer); + // TODO(phase-b): Installer::create takes Box<dyn IOInterface> for ownership but io is a + // borrowed &dyn here; needs Rc<dyn IOInterface> for proper sharing. + let mut install = Installer::create(todo!("share io as Box<dyn IOInterface>"), &composer); let (prefer_source, prefer_dist) = - self.get_preferred_install_options(&*composer.get_config().borrow(), input)?; + self.get_preferred_install_options(&*composer.get_config().borrow(), input, false)?; install .set_dry_run(input.get_option("dry-run").as_bool().unwrap_or(false)) @@ -847,10 +856,10 @@ impl RequireCommand { .set_dev_mode(update_dev_mode) .set_optimize_autoloader(optimize) .set_class_map_authoritative(authoritative) - .set_apcu_autoloader(apcu, apcu_prefix.as_deref()) + .set_apcu_autoloader(apcu, apcu_prefix.clone()) .set_update(true) .set_install(!input.get_option("no-install").as_bool().unwrap_or(false)) - .set_update_allow_transitive_dependencies(update_allow_transitive_dependencies) + .set_update_allow_transitive_dependencies(update_allow_transitive_dependencies)? .set_platform_requirement_filter(BaseCommand::get_platform_requirement_filter( self, input, )?) @@ -912,22 +921,43 @@ impl RequireCommand { dry_run: bool, fixed: bool, ) -> Result<i64> { - let composer = self.require_composer(None, None)?; - let locker = composer.get_locker(); + let mut composer = self.require_composer(None, None)?; + let locker_is_locked = composer.get_locker_mut().is_locked(); let mut requirements: IndexMap<String, String> = IndexMap::new(); - let version_selector = VersionSelector::new(RepositorySet::new(None, None), None); - let repo = if locker.is_locked() { - composer.get_locker().get_locked_repository(Some(true))? + let mut version_selector = VersionSelector::new( + RepositorySet::new( + "stable", + IndexMap::new(), + vec![], + IndexMap::new(), + IndexMap::new(), + IndexMap::new(), + ), + None, + )?; + // TODO(phase-b): get_locked_repository returns LockArrayRepository (owned) and + // get_local_repository returns &dyn InstalledRepositoryInterface; need a common + // interface for find_package. + let locked_repo; + let repo: &dyn RepositoryInterface = if locker_is_locked { + locked_repo = composer.get_locker_mut().get_locked_repository(true)?; + &locked_repo } else { - composer.get_repository_manager().get_local_repository() + todo!("convert &dyn InstalledRepositoryInterface to &dyn RepositoryInterface") }; for package_name in requirements_to_update { - let mut package = repo.find_package(package_name, "*"); + let mut package = repo.find_package( + package_name, + crate::repository::repository_interface::FindPackageConstraint::String( + "*".to_string(), + ), + ); // TODO(phase-b): `$package instanceof AliasPackage` downcast - let mut package_as_alias: Option<&AliasPackage> = None; - while let Some(alias) = package_as_alias { - package = Some(Box::new(alias.get_alias_of().clone()) as Box<dyn PackageInterface>); - package_as_alias = None; + let package_as_alias: Option<&AliasPackage> = None; + while let Some(_alias) = package_as_alias { + // TODO(phase-b): get_alias_of returns &dyn BasePackage; clone is not available + // and BasePackage is not PackageInterface (the latter is a super-trait). + package = todo!("upcast alias.get_alias_of() to Box<dyn BasePackage>"); } let package = match package { @@ -941,9 +971,13 @@ impl RequireCommand { package.get_pretty_version().to_string(), ); } else { + // TODO(phase-b): trait upcast from &dyn BasePackage to &dyn PackageInterface + // is not yet stable in Rust; use explicit as_package_interface() when available. + let pkg_as_pi: &dyn PackageInterface = + todo!("upcast &dyn BasePackage to &dyn PackageInterface"); requirements.insert( package_name.clone(), - version_selector.find_recommended_require_version(&*package), + version_selector.find_recommended_require_version(pkg_as_pi)?, ); } self.get_io().write_error3( @@ -969,10 +1003,13 @@ impl RequireCommand { ) .unwrap_or(false) { - self.get_io().warning(format!( - "Version {} looks like it may be a feature branch which is unlikely to keep working in the long run and may be in an unstable state", - requirements.get(package_name).cloned().unwrap_or_default(), - )); + self.get_io().warning( + &format!( + "Version {} looks like it may be a feature branch which is unlikely to keep working in the long run and may be in an unstable state", + requirements.get(package_name).cloned().unwrap_or_default(), + ), + &[], + ); if self.get_io().is_interactive() && !self.get_io().ask_confirmation( "Are you sure you want to use this constraint (<comment>y</comment>) or would you rather abort (<comment>n</comment>) the whole operation [<comment>y,n</comment>]? " @@ -988,14 +1025,19 @@ impl RequireCommand { } if !dry_run { - self.update_file( - self.json.as_ref().unwrap(), + // TODO(phase-b): update_file takes &mut self while self.json is borrowed; needs + // refactor to pass the JsonFile owned/cloned or use interior mutability. + let json_path = self.json.as_ref().unwrap().get_path().to_string(); + let _ = ( + json_path, &requirements, require_key, remove_key, sort_packages, ); - if locker.is_locked() + todo!("call self.update_file without overlapping borrows of self.json"); + #[allow(unreachable_code)] + if locker_is_locked && composer .get_config() .borrow_mut() @@ -1009,21 +1051,9 @@ impl RequireCommand { IndexMap::new(), ); let stability_flags_clone = stability_flags.clone(); - locker.update_hash( - self.json.as_ref().unwrap(), - Box::new(move |mut lock_data: IndexMap<String, PhpMixed>| { - for (package_name, flag) in &stability_flags_clone { - let entry = lock_data - .entry("stability-flags".to_string()) - .or_insert_with(|| PhpMixed::Array(IndexMap::new())); - if let PhpMixed::Array(m) = entry { - m.insert(package_name.clone(), Box::new(PhpMixed::Int(*flag))); - } - } - - lock_data - }), - ); + // TODO(phase-b): get_locker_mut needs update_hash with stability flags rewriter. + let _ = &stability_flags_clone; + todo!("update locker hash with stability flags rewriter"); } } @@ -1032,7 +1062,7 @@ impl RequireCommand { /// @param array<string, string> $new fn update_file( - &self, + &mut self, json: &JsonFile, new: &IndexMap<String, String>, require_key: &str, @@ -1043,13 +1073,16 @@ impl RequireCommand { return; } - let mut composer_definition = self.json.as_ref().unwrap().read().unwrap_or_default(); + let composer_definition_mixed = self.json.as_mut().unwrap().read().unwrap_or_default(); + let mut composer_definition: IndexMap<String, Box<PhpMixed>> = composer_definition_mixed + .as_array() + .cloned() + .unwrap_or_default(); for (package, version) in new { - if let Some(section) = composer_definition + let section = composer_definition .entry(require_key.to_string()) - .or_insert_with(|| PhpMixed::Array(IndexMap::new())) - .as_array_mut() - { + .or_insert_with(|| Box::new(PhpMixed::Array(IndexMap::new()))); + if let Some(section) = section.as_array_mut() { section.insert(package.clone(), Box::new(PhpMixed::String(version.clone()))); } if let Some(section) = composer_definition @@ -1067,12 +1100,11 @@ impl RequireCommand { composer_definition.shift_remove(remove_key); } } - let _ = self.json.as_ref().unwrap().write(PhpMixed::Array( - composer_definition - .into_iter() - .map(|(k, v)| (k, Box::new(v))) - .collect(), - )); + let _ = self + .json + .as_ref() + .unwrap() + .write(PhpMixed::Array(composer_definition)); } /// @param array<string, string> $new @@ -1086,20 +1118,29 @@ impl RequireCommand { ) -> bool { let contents = file_get_contents(json.get_path()).unwrap_or_default(); - let manipulator = JsonManipulator::new(&contents); + let mut manipulator = match JsonManipulator::new(contents) { + Ok(m) => m, + Err(_) => return false, + }; for (package, constraint) in new { - if !manipulator.add_link(require_key, package, constraint, sort_packages) { + if !manipulator + .add_link(require_key, package, constraint, sort_packages) + .unwrap_or(false) + { return false; } - if !manipulator.remove_sub_node(remove_key, package) { + if !manipulator + .remove_sub_node(remove_key, package) + .unwrap_or(false) + { return false; } } - manipulator.remove_main_key_if_empty(remove_key); + let _ = manipulator.remove_main_key_if_empty(remove_key); - file_put_contents(json.get_path(), &manipulator.get_contents()); + file_put_contents(json.get_path(), manipulator.get_contents().as_bytes()); true } @@ -1107,41 +1148,33 @@ impl RequireCommand { pub(crate) fn interact(&self, _input: &dyn InputInterface, _output: &dyn OutputInterface) {} fn revert_composer_file(&mut self) { - let io = self.get_io(); - if self.newly_created { - io.write_error3( - &format!( - "\n<error>Installation failed, deleting {}.</error>", - self.file - ), - true, - io_interface::NORMAL, + let msg = format!( + "\n<error>Installation failed, deleting {}.</error>", + self.file ); + self.get_io().write_error3(&msg, true, io_interface::NORMAL); unlink(self.json.as_ref().unwrap().get_path()); if file_exists(&self.lock) { unlink(&self.lock); } } else { - let msg = if self.lock_backup.is_some() { + let extra = if self.lock_backup.is_some() { format!(" and {} to their ", self.lock) } else { " to its ".to_string() }; - io.write_error3( - &format!( - "\n<error>Installation failed, reverting {}{}original content.</error>", - self.file, msg - ), - true, - io_interface::NORMAL, + let msg = format!( + "\n<error>Installation failed, reverting {}{}original content.</error>", + self.file, extra ); + self.get_io().write_error3(&msg, true, io_interface::NORMAL); file_put_contents( self.json.as_ref().unwrap().get_path(), - &self.composer_backup, + self.composer_backup.as_bytes(), ); if let Some(ref lock_backup) = self.lock_backup { - file_put_contents(&self.lock, lock_backup); + file_put_contents(&self.lock, lock_backup.as_bytes()); } } } diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs index 6fa7646..ff48658 100644 --- a/crates/shirabe/src/command/run_script_command.rs +++ b/crates/shirabe/src/command/run_script_command.rs @@ -1,6 +1,7 @@ //! ref: composer/src/Composer/Command/RunScriptCommand.php use anyhow::Result; +use indexmap::IndexMap; use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, RuntimeException}; @@ -25,7 +26,10 @@ pub struct RunScriptCommand { impl RunScriptCommand { pub fn new() -> Self { Self { - inner: BaseCommand::new(), + base_command_data: BaseCommandData { + composer: None, + io: None, + }, script_events: vec![ ScriptEvents::PRE_INSTALL_CMD, ScriptEvents::POST_INSTALL_CMD, @@ -110,7 +114,7 @@ impl RunScriptCommand { } pub fn interact( - &self, + &mut self, input: &mut dyn InputInterface, _output: &dyn OutputInterface, ) -> Result<()> { @@ -141,13 +145,18 @@ impl RunScriptCommand { ); if let Some(selected) = script.as_string() { - input.set_argument("script", selected); + // TODO(phase-b): input is &dyn InputInterface but set_argument needs &mut. + let _ = selected; } Ok(()) } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> Result<i64> { + pub fn execute( + &mut self, + input: &dyn InputInterface, + output: &dyn OutputInterface, + ) -> Result<i64> { if input.get_option("list").as_bool().unwrap_or(false) { return self.list_scripts(output); } @@ -217,10 +226,11 @@ impl RunScriptCommand { Ok(composer .get_event_dispatcher() - .dispatch_script(&script, dev_mode, args)?) + .borrow_mut() + .dispatch_script(&script, dev_mode, args, IndexMap::new())?) } - fn list_scripts(&self, output: &dyn OutputInterface) -> Result<i64> { + fn list_scripts(&mut self, output: &dyn OutputInterface) -> Result<i64> { let scripts = self.get_scripts()?; if scripts.is_empty() { return Ok(0); @@ -228,9 +238,14 @@ impl RunScriptCommand { let io = self.get_io(); io.write_error("<info>scripts:</info>"); - let table: Vec<Vec<String>> = scripts + let table: Vec<PhpMixed> = scripts .iter() - .map(|(name, desc)| vec![format!(" {}", name), desc.clone()]) + .map(|(name, desc)| { + PhpMixed::List(vec![ + Box::new(PhpMixed::String(format!(" {}", name))), + Box::new(PhpMixed::String(desc.clone())), + ]) + }) .collect(); self.render_table(table, output); @@ -238,7 +253,7 @@ impl RunScriptCommand { Ok(0) } - fn get_scripts(&self) -> Result<Vec<(String, String)>> { + fn get_scripts(&mut self) -> Result<Vec<(String, String)>> { let scripts = self .require_composer(None, None)? .get_package() @@ -249,11 +264,9 @@ impl RunScriptCommand { let mut result: Vec<(String, String)> = vec![]; for (name, _script) in scripts { - let description = self - .get_application() - .find(&name) - .map(|cmd| cmd.get_description().unwrap_or("").to_string()) - .unwrap_or_default(); + // TODO(phase-b): Application::find returns PhpMixed; placeholder description. + let _ = self.get_application()?.find(&name); + let description = String::new(); result.push((name, description)); } diff --git a/crates/shirabe/src/command/script_alias_command.rs b/crates/shirabe/src/command/script_alias_command.rs index 982ed84..e0ab5c9 100644 --- a/crates/shirabe/src/command/script_alias_command.rs +++ b/crates/shirabe/src/command/script_alias_command.rs @@ -38,11 +38,12 @@ impl ScriptAliasCommand { } } - let mut inner = BaseCommand::new(); - inner.ignore_validation_errors(); - + // TODO(phase-b): BaseCommand::new() / ignore_validation_errors() not yet ported Ok(Self { - inner, + base_command_data: BaseCommandData { + composer: None, + io: None, + }, script, description, aliases, @@ -50,9 +51,12 @@ impl ScriptAliasCommand { } pub fn configure(&mut self) { - self.set_name(&self.script) - .set_description(&self.description) - .set_aliases(self.aliases.clone()) + let script = self.script.clone(); + let description = self.description.clone(); + let aliases = self.aliases.clone(); + self.set_name(&script) + .set_description(&description) + .set_aliases(&aliases) .set_definition(&[ InputOption::new( "dev", @@ -97,13 +101,11 @@ impl ScriptAliasCommand { let args = input.get_arguments(); + // TODO(phase-b): InputInterface has_to_string/get_class_name not modeled in Rust // TODO remove for Symfony 6+ as it is then in the interface - if !input.has_to_string() { + if false { return Err(LogicException { - message: format!( - "Expected an Input instance that is stringable, got {}", - input.get_class_name() - ), + message: "Expected an Input instance that is stringable".to_string(), code: 0, } .into()); @@ -114,21 +116,30 @@ impl ScriptAliasCommand { Platform::put_env("COMPOSER_DEV_MODE", if dev_mode { "1" } else { "0" }); - let script_alias_input = Preg::replace4(r"{^\S+ ?}", "", &input.to_string(), 1)?; + // TODO(phase-b): InputInterface lacks to_string; use a placeholder + let input_as_string = String::new(); + let _ = input; + let script_alias_input = Preg::replace4(r"{^\S+ ?}", "", &input_as_string, 1)?; let mut flags = indexmap::IndexMap::new(); flags.insert( "script-alias-input".to_string(), PhpMixed::String(script_alias_input), ); - let args_value = args.get("args").cloned().unwrap_or(PhpMixed::Null); + let args_value: Vec<String> = args + .get("args") + .and_then(|v| v.as_list()) + .map(|l| { + l.iter() + .filter_map(|v| v.as_string().map(|s| s.to_string())) + .collect() + }) + .unwrap_or_default(); - Ok(composer.get_event_dispatcher().dispatch_script( - &self.script, - dev_mode, - args_value, - flags, - )?) + Ok(composer + .get_event_dispatcher() + .borrow_mut() + .dispatch_script(&self.script, dev_mode, args_value, flags)?) } } diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs index 2532f87..0b5cc21 100644 --- a/crates/shirabe/src/command/search_command.rs +++ b/crates/shirabe/src/command/search_command.rs @@ -47,7 +47,7 @@ impl SearchCommand { input: &dyn InputInterface, output: &dyn OutputInterface, ) -> Result<i64> { - let platform_repo = PlatformRepository::new(vec![], IndexMap::new(), None, None)?; + let platform_repo = PlatformRepository::new4(vec![], IndexMap::new(), None, None)?; let io = self.get_io(); let format = input @@ -73,19 +73,26 @@ impl SearchCommand { let composer = if let Some(c) = self.try_composer(None, None) { c } else { - self.create_composer_instance(input, self.get_io(), vec![])? + // TODO(phase-b): clone_box to release self borrow held by get_io. + let io_box = self.get_io().clone_box(); + self.create_composer_instance(input, io_box.as_ref(), None, false, None)? }; - let local_repo = composer.get_repository_manager().get_local_repository(); - let installed_repo = - CompositeRepository::new(vec![Box::new(local_repo), Box::new(platform_repo)]); + // TODO(phase-b): get_local_repository returns &dyn InstalledRepositoryInterface but we need Box<dyn RepositoryInterface> + let local_repo: Box<dyn RepositoryInterface> = + todo!("share local_repo as RepositoryInterface"); + let installed_repo = CompositeRepository::new(vec![local_repo, Box::new(platform_repo)]); let mut all_repos: Vec<Box<dyn RepositoryInterface>> = vec![Box::new(installed_repo)]; - all_repos.extend(composer.get_repository_manager().get_repositories()); + // TODO(phase-b): get_repositories returns &Vec<Box<...>>; needs ownership reshape + for r in composer.get_repository_manager().get_repositories() { + all_repos.push(r.clone_box()); + } let repos = CompositeRepository::new(all_repos); // TODO(plugin): dispatch CommandEvent for search command let command_event = CommandEvent::new(PluginEvents::COMMAND, "search", input, output); composer .get_event_dispatcher() + .borrow_mut() .dispatch(Some(command_event.get_name()), None); let mut mode: i64 = repository_interface::SEARCH_FULLTEXT; @@ -165,7 +172,9 @@ impl SearchCommand { } } } else if format == "json" { - io.write(&JsonFile::encode(&results, 448)); + // TODO(phase-b): JsonFile::encode takes &PhpMixed; convert Vec<SearchResult> into PhpMixed + let _ = &results; + io.write(&JsonFile::encode(&PhpMixed::Null, 448)); } Ok(0) diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs index ae1f217..f0b0ca3 100644 --- a/crates/shirabe/src/command/self_update_command.rs +++ b/crates/shirabe/src/command/self_update_command.rs @@ -84,39 +84,27 @@ impl SelfUpdateCommand { if str_contains(&strtr(dir_path, "\\", "/"), "vendor/composer/composer") { let proj_dir = shirabe_php_shim::dirname_levels(dir_path, 6); output.writeln( - PhpMixed::String( - "<error>This instance of Composer does not have the self-update command.</error>" - .to_string(), - ), + "<error>This instance of Composer does not have the self-update command.</error>", io_interface::NORMAL, ); output.writeln( - PhpMixed::String(format!( + &format!( "<comment>You are running Composer installed as a package in your current project (\"{}\").</comment>", proj_dir - )), + ), io_interface::NORMAL, ); output.writeln( - PhpMixed::String( - "<comment>To update Composer, download a composer.phar from https://getcomposer.org and then run `composer.phar update composer/composer` in your project.</comment>" - .to_string(), - ), + "<comment>To update Composer, download a composer.phar from https://getcomposer.org and then run `composer.phar update composer/composer` in your project.</comment>", io_interface::NORMAL, ); } else { output.writeln( - PhpMixed::String( - "<error>This instance of Composer does not have the self-update command.</error>" - .to_string(), - ), + "<error>This instance of Composer does not have the self-update command.</error>", io_interface::NORMAL, ); output.writeln( - PhpMixed::String( - "<comment>This could be due to a number of reasons, such as Composer being installed as a system package on your OS, or Composer being installed as a package in the current project.</comment>" - .to_string(), - ), + "<comment>This could be due to a number of reasons, such as Composer being installed as a system package on your OS, or Composer being installed as a package in the current project.</comment>", io_interface::NORMAL, ); } @@ -197,8 +185,8 @@ impl SelfUpdateCommand { } if input.get_option("update-keys").as_bool().unwrap_or(false) { - self.fetch_keys(io, &*config.borrow())?; - + // TODO(phase-b): re-borrow `io` after fetch_keys conflicts with the earlier `let io = self.get_io()` borrow + let _ = io; return Ok(0); } @@ -239,7 +227,7 @@ impl SelfUpdateCommand { if function_exists("posix_getpwuid") && function_exists("posix_geteuid") { let composer_user = posix_getpwuid(posix_geteuid()); let home_dir_owner_id = fileowner(&home); - if is_array(composer_user.clone()) && home_dir_owner_id.is_some() { + if is_array(&composer_user) && home_dir_owner_id.is_some() { let home_owner = posix_getpwuid(home_dir_owner_id.unwrap_or(0)); let composer_user_name = composer_user .as_array() @@ -253,7 +241,7 @@ impl SelfUpdateCommand { .and_then(|v| v.as_string()) .unwrap_or("") .to_string(); - if is_array(home_owner.clone()) && composer_user_name != home_owner_name { + if is_array(&home_owner) && composer_user_name != home_owner_name { io.write_error3( &format!( "<warning>You are running Composer as \"{}\", while \"{}\" is owned by \"{}\"</warning>", @@ -273,7 +261,7 @@ impl SelfUpdateCommand { if input.get_argument("command").as_string() == Some("self") && input.get_argument("version").as_string() == Some("update") { - input.set_argument("version", PhpMixed::Null); + // TODO(phase-b): set_argument requires &mut InputInterface; input is &dyn here } let latest = versions_util.get_latest(None)??; @@ -345,7 +333,7 @@ impl SelfUpdateCommand { None => versions_util.get_channel()?, Some(c) => c.to_string(), }; - if is_numeric(&effective_channel) + if is_numeric(&PhpMixed::String(effective_channel.clone())) && strpos( latest_stable .get("version") @@ -390,7 +378,7 @@ impl SelfUpdateCommand { } let mut channel_string = versions_util.get_channel()?; - if is_numeric(&channel_string) { + if is_numeric(&PhpMixed::String(channel_string.clone())) { channel_string.push_str(".x"); } @@ -457,11 +445,12 @@ impl SelfUpdateCommand { ); let signature = match http_downloader.borrow_mut().get( &format!("{}.sig", remote_filename), - &PhpMixed::Array(indexmap::IndexMap::new()), + indexmap::IndexMap::new(), ) { Ok(r) => r.get_body().map(|s| s.to_string()), Err(e) => { - if e.get_status_code() == Some(404) { + // TODO(phase-b): TransportException::get_status_code mapping from anyhow::Error + if false && e.to_string().contains("404") { return Err(InvalidArgumentException { message: format!("Version \"{}\" could not be found.", update_version), code: 0, @@ -472,9 +461,11 @@ impl SelfUpdateCommand { } }; io.write_error3(" ", false, io_interface::NORMAL); - http_downloader - .borrow_mut() - .copy(&remote_filename, &temp_filename)?; + http_downloader.borrow_mut().copy( + &remote_filename, + &temp_filename, + indexmap::IndexMap::new(), + )?; io.write_error3("", true, io_interface::NORMAL); if !file_exists(&temp_filename) || signature.is_none() || signature.as_deref() == Some("") { @@ -518,7 +509,7 @@ impl SelfUpdateCommand { if !file_exists(&sig_file) { file_put_contents( &format!("{}/keys.dev.pub", home), - "-----BEGIN PUBLIC KEY-----\n\ + b"-----BEGIN PUBLIC KEY-----\n\ MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnBDHjZS6e0ZMoK3xTD7f\n\ FNCzlXjX/Aie2dit8QXA03pSrOTbaMnxON3hUL47Lz3g1SC6YJEMVHr0zYq4elWi\n\ i3ecFEgzLcj+pZM5X6qWu2Ozz4vWx3JYo1/a/HYdOuW9e3lwS8VtS0AVJA+U8X0A\n\ @@ -536,7 +527,7 @@ wSEuAuRm+pRqi8BRnQ/GKUcCAwEAAQ==\n\ file_put_contents( &format!("{}/keys.tags.pub", home), - "-----BEGIN PUBLIC KEY-----\n\ + b"-----BEGIN PUBLIC KEY-----\n\ MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0Vi/2K6apCVj76nCnCl2\n\ MQUPdK+A9eqkYBacXo2wQBYmyVlXm2/n/ZsX6pCLYPQTHyr5jXbkQzBw8SKqPdlh\n\ vA7NpbMeNCz7wP/AobvUXM8xQuXKbMDTY2uZ4O7sM+PfGbptKPBGLe8Z8d2sUnTO\n\ @@ -628,16 +619,20 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ // remove saved installations of composer if input.get_option("clean-backups").as_bool().unwrap_or(false) { - self.clean_backups(&rollback_dir, None); + // TODO(phase-b): self.clean_backups conflicts with earlier `self.get_io()` borrow } - if !self.set_local_phar(&local_filename, &temp_filename, Some(&backup_file))? { + // TODO(phase-b): self.set_local_phar mutable borrow conflicts with earlier `self.get_io()` borrow + let _set_phar_ok: bool = todo!("self.set_local_phar(...)"); + if !_set_phar_ok { // @unlink let _ = unlink(&temp_filename); return Ok(1); } + // TODO(phase-b): re-borrow io because earlier borrow conflicts with the &mut self calls above + let io = self.get_io(); if file_exists(&backup_file) { io.write_error3( &sprintf( @@ -735,7 +730,7 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ "{}/keys.dev.pub", config.get("home").as_string().unwrap_or("") ); - file_put_contents(&key_path, match_.as_deref().unwrap_or("")); + file_put_contents(&key_path, match_.as_deref().unwrap_or("").as_bytes()); io.write(&format!( "Stored key with fingerprint: {}", Keys::fingerprint(&key_path)? @@ -783,7 +778,7 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ "{}/keys.tags.pub", config.get("home").as_string().unwrap_or("") ); - file_put_contents(&key_path, match_.as_deref().unwrap_or("")); + file_put_contents(&key_path, match_.as_deref().unwrap_or("").as_bytes()); io.write(&format!( "Stored key with fingerprint: {}", Keys::fingerprint(&key_path)? @@ -872,7 +867,6 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ new_filename: &str, backup_target: Option<&str>, ) -> Result<bool> { - let io = self.get_io(); let perms = fileperms(local_filename); if perms >= 0 { // @chmod @@ -881,7 +875,9 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ // check phar validity let mut error: Option<String> = None; - if !self.validate_phar(new_filename, &mut error)? { + let phar_valid = self.validate_phar(new_filename, &mut error)?; + let io = self.get_io(); + if !phar_valid { io.write_error3( &format!( "<error>The {} file is corrupted ({})</error>", @@ -959,16 +955,17 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ } } - pub(crate) fn clean_backups(&self, rollback_dir: &str, except: Option<&str>) { + pub(crate) fn clean_backups(&mut self, rollback_dir: &str, except: Option<&str>) { let finder = self.get_old_installation_finder(rollback_dir); let io = self.get_io(); - let fs = Filesystem::new(None); + let mut fs = Filesystem::new(None); for file in finder { - if file.get_basename(Self::OLD_INSTALL_EXT) == except.unwrap_or_default() { + if file.get_basename(Some(Self::OLD_INSTALL_EXT)) == except.unwrap_or_default() { continue; } - let file_str = file.to_string(); + // TODO(phase-b): SplFileInfo to string conversion (PHP __toString returns the path) + let file_str = format!("{:?}", file); io.write_error3( &format!("<info>Removing: {}</info>", file_str), true, @@ -995,11 +992,14 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ } pub(crate) fn get_old_installation_finder(&self, rollback_dir: &str) -> Finder { - Finder::create() + // TODO(phase-b): builder returns &mut Self; restructure to return owned Finder + let mut finder = Finder::create(); + finder .depth(0) .files() .name(&format!("*{}", Self::OLD_INSTALL_EXT)) - .in_(rollback_dir) + .r#in(rollback_dir); + finder } /// Validates the downloaded/backup phar file @@ -1136,7 +1136,7 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ ) }; - file_put_contents(&script, &code); + file_put_contents(&script, code.as_bytes()); let command = if using_sudo { sprintf("sudo \"%s\"", &[PhpMixed::String(script.clone())]) } else { diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index 66b3e9f..53ab934 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -84,19 +84,18 @@ impl ShowCommand { self.init_styles(output); } - let composer = self.try_composer(None, None); - let io = self.get_io(); + let mut composer = self.try_composer(None, None); if input.get_option("installed").as_bool() == Some(true) && input.get_option("self").as_bool() != Some(true) { - io.write_error("<warning>You are using the deprecated option \"installed\". Only installed packages are shown by default now. The --all option can be used to show all packages.</warning>"); + self.get_io().write_error("<warning>You are using the deprecated option \"installed\". Only installed packages are shown by default now. The --all option can be used to show all packages.</warning>"); } if input.get_option("outdated").as_bool() == Some(true) { input.set_option("latest", PhpMixed::Bool(true)); } else if input.get_option("ignore").as_list().map_or(0, |l| l.len()) > 0 { - io.write_error("<warning>You are using the option \"ignore\" for action other than \"outdated\", it will be ignored.</warning>"); + self.get_io().write_error("<warning>You are using the option \"ignore\" for action other than \"outdated\", it will be ignored.</warning>"); } if input.get_option("direct").as_bool() == Some(true) @@ -104,7 +103,7 @@ impl ShowCommand { || input.get_option("available").as_bool() == Some(true) || input.get_option("platform").as_bool() == Some(true)) { - io.write_error("The --direct (-D) option is not usable in combination with --all, --platform (-p) or --available (-a)"); + self.get_io().write_error("The --direct (-D) option is not usable in combination with --all, --platform (-p) or --available (-a)"); return Ok(1); } @@ -113,7 +112,7 @@ impl ShowCommand { && (input.get_option("all").as_bool() == Some(true) || input.get_option("available").as_bool() == Some(true)) { - io.write_error("The --tree (-t) option is not usable in combination with --all or --available (-a)"); + self.get_io().write_error("The --tree (-t) option is not usable in combination with --all or --available (-a)"); return Ok(1); } @@ -127,7 +126,7 @@ impl ShowCommand { .filter(|b| **b) .count(); if only_count > 1 { - io.write_error( + self.get_io().write_error( "Only one of --major-only, --minor-only or --patch-only can be used at once", ); @@ -137,7 +136,7 @@ impl ShowCommand { if input.get_option("tree").as_bool() == Some(true) && input.get_option("latest").as_bool() == Some(true) { - io.write_error( + self.get_io().write_error( "The --tree (-t) option is not usable in combination with --latest (-l)", ); @@ -147,7 +146,9 @@ impl ShowCommand { if input.get_option("tree").as_bool() == Some(true) && input.get_option("path").as_bool() == Some(true) { - io.write_error("The --tree (-t) option is not usable in combination with --path (-P)"); + self.get_io().write_error( + "The --tree (-t) option is not usable in combination with --path (-P)", + ); return Ok(1); } @@ -165,7 +166,7 @@ impl ShowCommand { ]), false, ) { - io.write_error(&format!( + self.get_io().write_error(&format!( "Unsupported format \"{}\". See help for supported formats.", format )); @@ -188,7 +189,13 @@ impl ShowCommand { platform_overrides = p.into_iter().map(|(k, v)| (k, *v)).collect(); } } - let platform_repo = PlatformRepository::new(vec![], platform_overrides); + // TODO(phase-b): PHP shares a single $platformRepo instance by reference. + // We clone the overrides and re-construct as needed because PlatformRepository + // is not Clone (PHP class semantics; Phase D will introduce Rc sharing). + let platform_repo = PlatformRepository::new(vec![], platform_overrides.clone())?; + let make_platform_repo = || -> anyhow::Result<PlatformRepository> { + PlatformRepository::new(vec![], platform_overrides.clone()) + }; let mut locked_repo: Option<Box<dyn RepositoryInterface>> = None; // The single-package $package binding from PHP gets surfaced here. @@ -203,7 +210,7 @@ impl ShowCommand { { let package = self.require_composer(None, None)?.get_package().clone_box(); if input.get_option("name-only").as_bool() == Some(true) { - io.write(package.get_name()); + self.get_io().write(package.get_name()); return Ok(0); } @@ -220,50 +227,67 @@ impl ShowCommand { repos = Box::new(InstalledRepository::new(vec![Box::new( RootPackageRepository::new(package.clone_box()), )])); - single_package = package.into_complete_package_interface(); + // TODO(phase-b): need to convert Box<dyn BasePackage> to Box<dyn CompletePackageInterface> + single_package = todo!("convert package to Box<dyn CompletePackageInterface>"); } else if input.get_option("platform").as_bool() == Some(true) { installed_repo = Box::new(InstalledRepository::new(vec![Box::new( - platform_repo.clone(), + make_platform_repo()?, )])); repos = Box::new(InstalledRepository::new(vec![Box::new( - platform_repo.clone(), + make_platform_repo()?, )])); } else if input.get_option("available").as_bool() == Some(true) { - let mut ir = InstalledRepository::new(vec![Box::new(platform_repo.clone())]); + let mut ir = InstalledRepository::new(vec![Box::new(make_platform_repo()?)]); if let Some(ref composer) = composer { repos = Box::new(CompositeRepository::new( - composer.get_repository_manager().get_repositories(), + composer + .get_repository_manager() + .get_repositories() + .iter() + .map(|r| r.clone_box()) + .collect(), )); - ir.add_repository(composer.get_repository_manager().get_local_repository()); + ir.add_repository( + composer + .get_repository_manager() + .get_local_repository() + .clone_box(), + ); installed_repo = Box::new(ir); } else { - let default_repos = RepositoryFactory::default_repos_with_default_manager(io); + let default_repos = + RepositoryFactory::default_repos_with_default_manager(self.get_io())?; let names: Vec<String> = default_repos.keys().cloned().collect(); repos = Box::new(CompositeRepository::new( default_repos.into_values().collect(), )); - io.write_error(&format!( + self.get_io().write_error(&format!( "No composer.json found in the current directory, showing available packages from {}", names.join(", ") )); installed_repo = Box::new(ir); } } else if input.get_option("all").as_bool() == Some(true) && composer.is_some() { - let composer_ref = composer.as_ref().unwrap(); - let local_repo = composer_ref.get_repository_manager().get_local_repository(); - let locker = composer_ref.get_locker(); + let composer_ref = composer.as_mut().unwrap(); + let local_repo_cloned = composer_ref + .get_repository_manager() + .get_local_repository() + .clone_box(); + let locker = composer_ref.get_locker_mut(); if locker.is_locked() { let lr = locker.get_locked_repository(true)?; installed_repo = Box::new(InstalledRepository::new(vec![ lr.clone_box(), - local_repo.clone_box(), - Box::new(platform_repo.clone()), + local_repo_cloned, + Box::new(make_platform_repo()?), ])); - locked_repo = Some(lr); + // TODO(phase-b): wrap lr (LockArrayRepository) as Box<dyn RepositoryInterface> + locked_repo = Some(todo!("share lr as Box<dyn RepositoryInterface>")); + let _ = lr; } else { installed_repo = Box::new(InstalledRepository::new(vec![ - local_repo.clone_box(), - Box::new(platform_repo.clone()), + local_repo_cloned, + Box::new(make_platform_repo()?), ])); } let mut composite_input: Vec<Box<dyn RepositoryInterface>> = vec![Box::new( @@ -271,21 +295,22 @@ impl ShowCommand { let mut m = IndexMap::new(); m.insert("canonical".to_string(), PhpMixed::Bool(false)); m - }), + })?, )]; for r in composer_ref.get_repository_manager().get_repositories() { - composite_input.push(r); + composite_input.push(r.clone_box()); } repos = Box::new(CompositeRepository::new(composite_input)); } else if input.get_option("all").as_bool() == Some(true) { - let default_repos = RepositoryFactory::default_repos_with_default_manager(io); + let default_repos = + RepositoryFactory::default_repos_with_default_manager(self.get_io())?; let names: Vec<String> = default_repos.keys().cloned().collect(); - io.write_error(&format!( + self.get_io().write_error(&format!( "No composer.json found in the current directory, showing available packages from {}", names.join(", ") )); installed_repo = Box::new(InstalledRepository::new(vec![Box::new( - platform_repo.clone(), + make_platform_repo()?, )])); let mut composite_input: Vec<Box<dyn RepositoryInterface>> = vec![installed_repo.clone_box()]; @@ -294,15 +319,15 @@ impl ShowCommand { } repos = Box::new(CompositeRepository::new(composite_input)); } else if input.get_option("locked").as_bool() == Some(true) { - if composer.is_none() || !composer.as_ref().unwrap().get_locker().is_locked() { + if composer.is_none() || !composer.as_mut().unwrap().get_locker_mut().is_locked() { return Err(UnexpectedValueException { message: "A valid composer.json and composer.lock files is required to run this command with --locked".to_string(), code: 0, } .into()); } - let composer_ref = composer.as_ref().unwrap(); - let locker = composer_ref.get_locker(); + let composer_ref = composer.as_mut().unwrap(); + let locker = composer_ref.get_locker_mut(); let mut lr = locker.get_locked_repository(input.get_option("no-dev").as_bool() != Some(true))?; if input.get_option("self").as_bool() == Some(true) { @@ -312,12 +337,21 @@ impl ShowCommand { } installed_repo = Box::new(InstalledRepository::new(vec![lr.clone_box()])); repos = Box::new(InstalledRepository::new(vec![lr.clone_box()])); - locked_repo = Some(lr); + // TODO(phase-b): wrap lr (LockArrayRepository) as Box<dyn RepositoryInterface> + locked_repo = Some(todo!("share lr as Box<dyn RepositoryInterface>")); + let _ = lr; } else { // --installed / default case - let composer_local = match composer.clone() { + // TODO(phase-b): PHP shares the Composer object by reference. Phase B + // can't clone Composer, so we re-fetch via require_composer when missing + // but otherwise borrow the existing Option. + let composer_local_owned; + let composer_local: &Composer = match composer.as_ref() { Some(c) => c, - None => self.require_composer(None, None)?, + None => { + composer_local_owned = self.require_composer(None, None)?; + &composer_local_owned + } }; let root_pkg = composer_local.get_package(); @@ -328,15 +362,20 @@ impl ShowCommand { Box::new(InstalledArrayRepository::new()?) }; if input.get_option("no-dev").as_bool() == Some(true) { + let local_packages = composer_local + .get_repository_manager() + .get_local_repository() + .get_packages(); let packages = RepositoryUtils::filter_required_packages( - composer_local - .get_repository_manager() - .get_local_repository() - .get_packages(), - root_pkg, + &local_packages, + root_pkg as &dyn PackageInterface, + false, + Vec::new(), ); - let cloned: Vec<Box<dyn PackageInterface>> = - packages.into_iter().map(|p| p.clone_box()).collect(); + let cloned: Vec<Box<dyn PackageInterface>> = packages + .into_iter() + .map(|p| p.clone_package_box()) + .collect(); installed_repo = Box::new(InstalledRepository::new(vec![ root_repo.clone_box(), Box::new(InstalledArrayRepository::new_with_packages(cloned)?), @@ -353,7 +392,7 @@ impl ShowCommand { root_repo.clone_box(), lr.clone_box(), ])); - repos = Box::new(InstalledRepository::new(vec![root_repo, lr])); + repos = Box::new(InstalledRepository::new(vec![root_repo, lr.clone_box()])); } if installed_repo.get_packages().is_empty() { @@ -365,13 +404,15 @@ impl ShowCommand { if has_non_platform_reqs(&root_pkg.get_requires()) || has_non_platform_reqs(&root_pkg.get_dev_requires()) { - io.write_error("<warning>No dependencies installed. Try running composer install or update.</warning>"); + // Borrow is local; release composer_local borrow first. + let _ = root_pkg; + self.get_io().write_error("<warning>No dependencies installed. Try running composer install or update.</warning>"); } } } if let Some(ref composer) = composer { - let mut command_event = CommandEvent::new6( + let command_event = CommandEvent::new6( PluginEvents::COMMAND, "show", input, @@ -379,13 +420,17 @@ impl ShowCommand { vec![], IndexMap::new(), ); + // TODO(phase-b): EventDispatcher::dispatch wants Option<Event>, but PHP passes + // the CommandEvent subclass directly. Phase D will introduce trait-based dispatch. + let _event_name = command_event.get_name().to_string(); composer .get_event_dispatcher() - .dispatch(&command_event.get_name(), &mut command_event); + .borrow_mut() + .dispatch(Some(&_event_name), None)?; } if input.get_option("latest").as_bool() == Some(true) && composer.is_none() { - io.write_error( + self.get_io().write_error( "No composer.json found in the current directory, disabling \"latest\" option", ); input.set_option("latest", PhpMixed::Bool(false)); @@ -492,12 +537,12 @@ impl ShowCommand { .collect(), ))]), ); - io.write(&JsonFile::encode( + self.get_io().write(&JsonFile::encode( &PhpMixed::Array( wrapper.into_iter().map(|(k, v)| (k, Box::new(v))).collect(), ), 0, - )?); + )); } else { self.display_package_tree(vec![array_tree]); } @@ -534,18 +579,20 @@ impl ShowCommand { exit_code = 1; } if input.get_option("path").as_bool() == Some(true) { - io.write_no_newline(package.get_name()); - let path = composer - .as_ref() - .unwrap() - .get_installation_manager() - .get_install_path(package.as_package_interface()); + self.get_io().write_no_newline(package.get_name()); + let path = { + let composer_ref = composer.as_ref().unwrap(); + // TODO(phase-b): get_installation_manager wants &mut Composer; PHP shares + // by reference. Skipping the install path lookup keeps compile clean. + let _ = composer_ref; + None::<String> + }; if let Some(path) = path { let real = realpath(&path).unwrap_or_default(); let trimmed = real.split(|c| c == '\r' || c == '\n').next().unwrap_or(""); - io.write(&format!(" {}", trimmed)); + self.get_io().write(&format!(" {}", trimmed)); } else { - io.write(" null"); + self.get_io().write(" null"); } return Ok(exit_code); @@ -614,10 +661,10 @@ impl ShowCommand { .collect(), ), ); - io.write(&JsonFile::encode( + self.get_io().write(&JsonFile::encode( &PhpMixed::Array(wrapper.into_iter().map(|(k, v)| (k, Box::new(v))).collect()), 0, - )?); + )); } else { self.display_package_tree(array_tree); } @@ -639,13 +686,13 @@ impl ShowCommand { } if input.get_option("path").as_bool() == Some(true) && composer.is_none() { - io.write_error( + self.get_io().write_error( "No composer.json found in the current directory, disabling \"path\" option", ); input.set_option("path", PhpMixed::Bool(false)); } - for repo in RepositoryUtils::flatten_repositories(&*repos) { + for repo in RepositoryUtils::flatten_repositories(repos.clone_box(), false) { // TODO(phase-b): InstalledRepository needs as_repository_interface / get_repositories // wired through; placeholder classification until then. let r#type = if Self::same_repository(&*repo, &platform_repo) { @@ -660,13 +707,9 @@ impl ShowCommand { "available" }; let type_owned = r#type.to_string(); - if let Some(composer_repo) = repo.as_composer_repository_mut() { - for name in composer_repo.get_package_names(package_filter.as_deref())? { - packages - .entry(type_owned.clone()) - .or_insert_with(IndexMap::new) - .insert(name.clone(), PackageOrName::Name(name)); - } + // TODO(phase-b): RepositoryInterface needs as_composer_repository_mut downcast helper + if false { + let _ = package_filter.as_deref(); } else { for package in repo.get_packages() { let existing = packages @@ -715,7 +758,7 @@ impl ShowCommand { packages .entry(type_owned.clone()) .or_insert_with(IndexMap::new) - .insert(name, PackageOrName::Pkg(p)); + .insert(name.clone(), PackageOrName::Pkg(p.clone_package_box())); } } } @@ -966,16 +1009,16 @@ impl ShowCommand { if let Some(c) = package.as_complete_package_interface() { package_view_data.insert( "description".to_string(), - PhpMixed::String(c.get_description().to_string()), + PhpMixed::String(c.get_description().unwrap_or("").to_string()), ); } } if write_path { - let path = composer - .as_ref() - .unwrap() - .get_installation_manager() - .get_install_path(&**package); + // TODO(phase-b): get_installation_manager wants &mut Composer; PHP shares by ref. + let path: Option<String> = { + let _ = composer.as_ref().unwrap(); + None + }; if let Some(p) = path { let r = realpath(&p).unwrap_or_default(); let trimmed = @@ -1010,7 +1053,7 @@ impl ShowCommand { PhpMixed::String(package_warning), ); package_is_abandoned = match replacement_package_name { - Some(rp) => PhpMixed::String(rp), + Some(rp) => PhpMixed::String(rp.to_string()), None => PhpMixed::Bool(true), }; } @@ -1062,6 +1105,7 @@ impl ShowCommand { ), ); } + let io: &mut dyn IOInterface = self.get_io(); io.write(&JsonFile::encode( &PhpMixed::Array( json_map @@ -1070,11 +1114,12 @@ impl ShowCommand { .collect(), ), 0, - )?); + )); } else { if input.get_option("latest").as_bool() == Some(true) && view_data.values().any(|v| !v.is_empty()) { + let io: &mut dyn IOInterface = self.get_io(); if !io.is_decorated() { io.write_error("Legend:"); io.write_error("! patch or minor release available - update recommended"); @@ -1118,15 +1163,16 @@ impl ShowCommand { name_length + version_length + latest_length + release_date_length + 24 <= width_usize; - if latest_fits && !io.is_decorated() { + if latest_fits && !self.get_io().is_decorated() { latest_length += 2; } if show_all_types { if r#type == "available" { - io.write(&format!("<comment>{}</comment>:", r#type)); + self.get_io() + .write(&format!("<comment>{}</comment>:", r#type)); } else { - io.write(&format!("<info>{}</info>:", r#type)); + self.get_io().write(&format!("<info>{}</info>:", r#type)); } } @@ -1145,17 +1191,17 @@ impl ShowCommand { } } - io.write_error(""); - io.write_error("<info>Direct dependencies required in composer.json:</>"); + self.get_io().write_error(""); + self.get_io() + .write_error("<info>Direct dependencies required in composer.json:</>"); if !direct_deps.is_empty() { self.print_packages( - io, &direct_deps, indent, write_version && version_fits, latest_fits, write_description && description_fits, - width, + width_usize, version_length, name_length, latest_length, @@ -1163,21 +1209,20 @@ impl ShowCommand { release_date_length, ); } else { - io.write_error("Everything up to date"); + self.get_io().write_error("Everything up to date"); } - io.write_error(""); - io.write_error( + self.get_io().write_error(""); + self.get_io().write_error( "<info>Transitive dependencies not required in composer.json:</>", ); if !transitive_deps.is_empty() { self.print_packages( - io, &transitive_deps, indent, write_version && version_fits, latest_fits, write_description && description_fits, - width, + width_usize, version_length, name_length, latest_length, @@ -1185,20 +1230,20 @@ impl ShowCommand { release_date_length, ); } else { - io.write_error("Everything up to date"); + self.get_io().write_error("Everything up to date"); } } else { if write_latest && packages.is_empty() { - io.write_error("All your direct dependencies are up to date"); + self.get_io() + .write_error("All your direct dependencies are up to date"); } else { self.print_packages( - io, packages, indent, write_version && version_fits, write_latest && latest_fits, write_description && description_fits, - width, + width_usize, version_length, name_length, latest_length, @@ -1209,7 +1254,7 @@ impl ShowCommand { } if show_all_types { - io.write(""); + self.get_io().write(""); } } } @@ -1218,8 +1263,7 @@ impl ShowCommand { } fn print_packages( - &self, - io: &dyn IOInterface, + &mut self, packages: &[IndexMap<String, PhpMixed>], indent: &str, write_version: bool, @@ -1232,6 +1276,7 @@ impl ShowCommand { write_release_date: bool, release_date_length: usize, ) { + let io: &mut dyn IOInterface = self.get_io(); let pad_name = write_version || write_latest || write_release_date || write_description; let pad_version = write_latest || write_release_date || write_description; let pad_latest = write_description || write_release_date; @@ -1372,7 +1417,7 @@ impl ShowCommand { } } - pub(crate) fn get_root_requires(&self) -> Vec<String> { + pub(crate) fn get_root_requires(&mut self) -> Vec<String> { let composer = self.try_composer(None, None); let composer = match composer { None => return vec![], @@ -1419,19 +1464,29 @@ impl ShowCommand { _ => None, // already a ConstraintInterface }; - let policy = DefaultPolicy::new(); - let mut repository_set = RepositorySet::with_stability("dev"); - repository_set.allow_installed_repositories(); - repository_set.add_repository(repos.clone_box()); + // TODO(phase-b): DefaultPolicy::new() requires (bool, bool, Option<IndexMap>) — using placeholder values. + let policy = DefaultPolicy::new(false, false, None); + let _ = &policy; + // TODO(phase-b): RepositorySet::with_stability("dev") — using new() with placeholder args. + let mut repository_set = RepositorySet::new( + "dev", + IndexMap::new(), + Vec::new(), + IndexMap::new(), + IndexMap::new(), + IndexMap::new(), + ); + repository_set.allow_installed_repositories(true); + repository_set.add_repository(repos.clone_box())?; let mut matched_package: Option<Box<dyn PackageInterface>> = None; let mut versions: IndexMap<String, String> = IndexMap::new(); - let pool = if PlatformRepository::is_platform_package(&name) { - repository_set.create_pool_with_all_packages() + let mut pool = if PlatformRepository::is_platform_package(&name) { + repository_set.create_pool_with_all_packages()? } else { - repository_set.create_pool_for_package(&name) + repository_set.create_pool_for_package(&name, None)? }; - let matches = pool.what_provides(&name, constraint.as_deref())?; + let matches = pool.what_provides(&name, constraint.as_deref()); let mut literals: Vec<i64> = Vec::new(); for package in matches.iter() { // avoid showing the 9999999-dev alias if the default branch has no branch-alias set @@ -1444,7 +1499,7 @@ impl ShowCommand { // select an exact match if it is in the installed repo and no specific version was required if version.is_null() && installed_repo.has_package(&*p) { - matched_package = Some(p.clone_box()); + matched_package = Some(p.clone_package_box()); } versions.insert( @@ -1457,7 +1512,7 @@ impl ShowCommand { // select preferred package according to policy rules if matched_package.is_none() && !literals.is_empty() { let preferred = policy.select_preferred_packages(&pool, literals.clone(), None); - matched_package = Some(pool.literal_to_package(preferred[0])); + matched_package = Some(pool.literal_to_package(preferred[0]).clone_package_box()); } if let Some(ref mp) = matched_package { @@ -1473,10 +1528,10 @@ impl ShowCommand { } } - Ok(( - matched_package.and_then(|p| p.into_complete_package_interface()), - versions, - )) + // TODO(phase-b): need a Box<dyn PackageInterface> -> Box<dyn CompletePackageInterface> + // conversion. PHP relies on duck typing; placeholder None. + let _ = matched_package; + Ok((None, versions)) } /// Prints package info. @@ -1487,16 +1542,15 @@ impl ShowCommand { installed_repo: &InstalledRepository, latest_package: Option<&dyn PackageInterface>, ) -> anyhow::Result<()> { - let io = self.get_io(); - self.print_meta(package, versions, installed_repo, latest_package); self.print_links(package, Link::TYPE_REQUIRE, None); self.print_links(package, Link::TYPE_DEV_REQUIRE, Some("requires (dev)")); if !package.get_suggests().is_empty() { - io.write("\n<info>suggests</info>"); + self.get_io().write("\n<info>suggests</info>"); for (suggested, reason) in package.get_suggests().iter() { - io.write(&format!("{} <comment>{}</comment>", suggested, reason)); + self.get_io() + .write(&format!("{} <comment>{}</comment>", suggested, reason)); } } @@ -1508,7 +1562,7 @@ impl ShowCommand { /// Prints package metadata. pub(crate) fn print_meta( - &self, + &mut self, package: &dyn CompletePackageInterface, versions: &IndexMap<String, String>, installed_repo: &InstalledRepository, @@ -1517,27 +1571,25 @@ impl ShowCommand { let is_installed_package = !PlatformRepository::is_platform_package(package.get_name()) && installed_repo.has_package(package.as_package_interface()); - let io = self.get_io(); - io.write(&format!( + self.get_io().write(&format!( "<info>name</info> : {}", package.get_pretty_name() )); - io.write(&format!( + self.get_io().write(&format!( "<info>descrip.</info> : {}", - package.get_description() + package.get_description().unwrap_or("") )); let keywords = package.get_keywords(); - io.write(&format!( - "<info>keywords</info> : {}", - keywords.unwrap_or_default().join(", ") - )); + self.get_io() + .write(&format!("<info>keywords</info> : {}", keywords.join(", "))); self.print_versions(package, versions, installed_repo); if is_installed_package { if let Some(rd) = package.get_release_date() { - io.write(&format!( + let rel = self.get_relative_time(&rd); + self.get_io().write(&format!( "<info>released</info> : {}, {}", rd.format("%Y-%m-%d"), - self.get_relative_time(&rd) + rel )); } } @@ -1545,13 +1597,12 @@ impl ShowCommand { let style = self.get_version_style(latest, package.as_package_interface()); let released_time = match latest.get_release_date() { None => String::new(), - Some(rd) => format!( - " released {}, {}", - rd.format("%Y-%m-%d"), - self.get_relative_time(&rd) - ), + Some(rd) => { + let rel = self.get_relative_time(&rd); + format!(" released {}, {}", rd.format("%Y-%m-%d"), rel) + } }; - io.write(&format!( + self.get_io().write(&format!( "<info>latest</info> : <{}>{}</{}>{}", style, latest.get_pretty_version(), @@ -1562,42 +1613,42 @@ impl ShowCommand { } else { package.as_package_interface() }; - io.write(&format!( - "<info>type</info> : {}", - package.get_type_field() - )); + self.get_io() + .write(&format!("<info>type</info> : {}", package.get_type())); self.print_licenses(package); - io.write(&format!( + self.get_io().write(&format!( "<info>homepage</info> : {}", package.get_homepage().unwrap_or("") )); - io.write(&format!( + self.get_io().write(&format!( "<info>source</info> : [{}] <comment>{}</comment> {}", package.get_source_type().unwrap_or(""), package.get_source_url().unwrap_or(""), package.get_source_reference().unwrap_or("") )); - io.write(&format!( + self.get_io().write(&format!( "<info>dist</info> : [{}] <comment>{}</comment> {}", package.get_dist_type().unwrap_or(""), package.get_dist_url().unwrap_or(""), package.get_dist_reference().unwrap_or("") )); if is_installed_package { - let path = self.require_composer(None, None).ok().and_then(|c| { - c.get_installation_manager() - .get_install_path(package.as_package_interface()) + // TODO(phase-b): get_installation_manager wants &mut Composer; PHP shares by ref. + // Skipping the install path lookup keeps compile clean. + let path: Option<String> = self.require_composer(None, None).ok().and_then(|c| { + let _ = c; + None::<String> }); if let Some(p) = path { - io.write(&format!( + self.get_io().write(&format!( "<info>path</info> : {}", realpath(&p).unwrap_or_default() )); } else { - io.write("<info>path</info> : null"); + self.get_io().write("<info>path</info> : null"); } } - io.write(&format!( + self.get_io().write(&format!( "<info>names</info> : {}", package.get_names(true).join(", ") )); @@ -1609,7 +1660,7 @@ impl ShowCommand { None => String::new(), }; - io.write_error(&format!( + self.get_io().write_error(&format!( "<warning>Attention: This package is abandoned and no longer maintained.{}</warning>", replacement )); @@ -1618,17 +1669,19 @@ impl ShowCommand { let support = package.get_support(); if !support.is_empty() { - io.write("\n<info>support</info>"); + self.get_io().write("\n<info>support</info>"); for (r#type, value) in support.iter() { - io.write(&format!("<comment>{}</comment> : {}", r#type, value)); + self.get_io() + .write(&format!("<comment>{}</comment> : {}", r#type, value)); } } let autoload_config = package.get_autoload(); if !autoload_config.is_empty() { - io.write("\n<info>autoload</info>"); + self.get_io().write("\n<info>autoload</info>"); for (r#type, autoloads) in autoload_config.iter() { - io.write(&format!("<comment>{}</comment>", r#type)); + self.get_io() + .write(&format!("<comment>{}</comment>", r#type)); if r#type == "psr-0" || r#type == "psr-4" { if let PhpMixed::Array(map) = autoloads { @@ -1643,7 +1696,8 @@ impl ShowCommand { _ => ".".to_string(), }; let name_disp = if name.is_empty() { "*" } else { name }; - io.write(&format!("{} => {}", name_disp, path_str)); + self.get_io() + .write(&format!("{} => {}", name_disp, path_str)); } } } else if r#type == "classmap" { @@ -1652,21 +1706,21 @@ impl ShowCommand { .iter() .filter_map(|v| v.as_string().map(|s| s.to_string())) .collect(); - io.write(&joined.join(", ")); + self.get_io().write(&joined.join(", ")); } } } let include_paths = package.get_include_paths(); if !include_paths.is_empty() { - io.write("<comment>include-path</comment>"); - io.write(&include_paths.join(", ")); + self.get_io().write("<comment>include-path</comment>"); + self.get_io().write(&include_paths.join(", ")); } } } /// Prints all available versions of this package and highlights the installed one if any. pub(crate) fn print_versions( - &self, + &mut self, package: &dyn CompletePackageInterface, versions: &IndexMap<String, String>, installed_repo: &InstalledRepository, @@ -1699,7 +1753,7 @@ impl ShowCommand { /// print link objects pub(crate) fn print_links( - &self, + &mut self, package: &dyn CompletePackageInterface, link_type: &str, title: Option<&str>, @@ -1713,15 +1767,15 @@ impl ShowCommand { for link in links.iter() { io.write(&format!( "{} <comment>{}</comment>", - link.get_target(), - link.get_pretty_constraint() + link.1.get_target(), + link.1.get_pretty_constraint().unwrap_or("") )); } } } /// Prints the licenses of a package with metadata - pub(crate) fn print_licenses(&self, package: &dyn CompletePackageInterface) { + pub(crate) fn print_licenses(&mut self, package: &dyn CompletePackageInterface) { let spdx_licenses = SpdxLicenses::new(); let licenses = package.get_license(); @@ -1733,14 +1787,16 @@ impl ShowCommand { let out = match license { None => license_id.clone(), Some(license) => { - let is_osi = license.osi; + // TODO(phase-b): SpdxLicenses returns PhpMixed; field access (osi/fullname/url) + // is placeholder until PHP array offsets are wired. + let _ = &license; + let fullname = String::new(); + let url = String::new(); + let is_osi = false; if is_osi { - format!( - "{} ({}) (OSI approved) {}", - license.fullname, license_id, license.url - ) + format!("{} ({}) (OSI approved) {}", fullname, license_id, url) } else { - format!("{} ({}) {}", license.fullname, license_id, license.url) + format!("{} ({}) {}", fullname, license_id, url) } } }; @@ -1751,7 +1807,7 @@ impl ShowCommand { /// Prints package info in JSON format. pub(crate) fn print_package_info_as_json( - &self, + &mut self, package: &dyn CompletePackageInterface, versions: &IndexMap<String, String>, installed_repo: &InstalledRepository, @@ -1764,11 +1820,10 @@ impl ShowCommand { ); json.insert( "description".to_string(), - PhpMixed::String(package.get_description().to_string()), + PhpMixed::String(package.get_description().unwrap_or("").to_string()), ); let keywords: Vec<PhpMixed> = package .get_keywords() - .unwrap_or_default() .into_iter() .map(PhpMixed::String) .collect(); @@ -1778,7 +1833,7 @@ impl ShowCommand { ); json.insert( "type".to_string(), - PhpMixed::String(package.get_type_field().to_string()), + PhpMixed::String(package.get_type().to_string()), ); json.insert( "homepage".to_string(), @@ -1854,10 +1909,9 @@ impl ShowCommand { if !PlatformRepository::is_platform_package(package.get_name()) && installed_repo.has_package(package.as_package_interface()) { - let path = self - .require_composer(None, None)? - .get_installation_manager() - .get_install_path(package.as_package_interface()); + // TODO(phase-b): get_installation_manager wants &mut Composer; PHP shares by ref. + let _ = self.require_composer(None, None)?; + let path: Option<String> = None; match path { Some(p) => { if let Some(r) = realpath(&p) { @@ -1879,7 +1933,7 @@ impl ShowCommand { json.insert( "replacement".to_string(), match c.get_replacement_package() { - Some(rp) => PhpMixed::String(rp), + Some(rp) => PhpMixed::String(rp.to_string()), None => PhpMixed::Null, }, ); @@ -1928,7 +1982,7 @@ impl ShowCommand { self.get_io().write(&JsonFile::encode( &PhpMixed::Array(json.into_iter().map(|(k, v)| (k, Box::new(v))).collect()), 0, - )?); + )); Ok(()) } @@ -1978,10 +2032,12 @@ impl ShowCommand { match license { None => PhpMixed::String(license_id), Some(l) => { + // TODO(phase-b): SpdxLicenses returns PhpMixed; field access placeholder. + let _ = &l; let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); - m.insert("name".to_string(), PhpMixed::String(l.fullname)); + m.insert("name".to_string(), PhpMixed::String(String::new())); m.insert("osi".to_string(), PhpMixed::String(license_id)); - m.insert("url".to_string(), PhpMixed::String(l.url)); + m.insert("url".to_string(), PhpMixed::String(String::new())); PhpMixed::Array(m.into_iter().map(|(k, v)| (k, Box::new(v))).collect()) } } @@ -2056,7 +2112,7 @@ impl ShowCommand { mut json: IndexMap<String, PhpMixed>, package: &dyn CompletePackageInterface, ) -> IndexMap<String, PhpMixed> { - for link_type in Link::TYPES.iter() { + for link_type in Link::types().iter() { json = Self::append_link(json, package, link_type); } @@ -2074,8 +2130,8 @@ impl ShowCommand { let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); for link in links.iter() { m.insert( - link.get_target().to_string(), - PhpMixed::String(link.get_pretty_constraint().to_string()), + link.1.get_target().to_string(), + PhpMixed::String(link.1.get_pretty_constraint().unwrap_or("").to_string()), ); } json.insert( @@ -2098,36 +2154,39 @@ impl ShowCommand { ]; for color in self.colors.iter() { - let style = OutputFormatterStyle::new(Some(color.clone()), None, vec![]); - output.get_formatter().set_style(color, style); + let _style = OutputFormatterStyle::new(Some(color.as_str()), None, None); + // TODO(phase-b): OutputInterface::get_formatter returns &OutputFormatter, but + // set_style requires &mut. Resolution requires interior-mutability refactor of + // OutputFormatter wiring across symfony shim. + let _ = (output.get_formatter(), color); } } /// Display the tree - pub(crate) fn display_package_tree(&self, array_tree: Vec<IndexMap<String, PhpMixed>>) { - let io = self.get_io(); + pub(crate) fn display_package_tree(&mut self, array_tree: Vec<IndexMap<String, PhpMixed>>) { for package in array_tree.iter() { let name = package .get("name") .and_then(|v| v.as_string()) .unwrap_or("") .to_string(); - io.write_no_newline(&format!("<info>{}</info>", name)); + self.get_io() + .write_no_newline(&format!("<info>{}</info>", name)); let version = package .get("version") .and_then(|v| v.as_string()) .unwrap_or("") .to_string(); - io.write_no_newline(&format!(" {}", version)); + self.get_io().write_no_newline(&format!(" {}", version)); if let Some(description) = package.get("description").and_then(|v| v.as_string()) { let trimmed = description .split(|c| c == '\r' || c == '\n') .next() .unwrap_or(""); - io.write(&format!(" {}", trimmed)); + self.get_io().write(&format!(" {}", trimmed)); } else { // output newline - io.write(""); + self.get_io().write(""); } if let Some(requires) = package.get("requires").and_then(|v| v.as_list()).cloned() { @@ -2208,7 +2267,7 @@ impl ShowCommand { tree_child_desc.insert("name".to_string(), PhpMixed::String(require_name.clone())); tree_child_desc.insert( "version".to_string(), - PhpMixed::String(require.get_pretty_constraint().to_string()), + PhpMixed::String(require.get_pretty_constraint().unwrap_or("").to_string()), ); let deep_children = self @@ -2258,7 +2317,7 @@ impl ShowCommand { PhpMixed::String( package .as_complete_package_interface() - .map(|c| c.get_description().to_string()) + .map(|c| c.get_description().unwrap_or("").to_string()) .unwrap_or_default(), ), ); @@ -2275,7 +2334,7 @@ impl ShowCommand { /// Display a package tree pub(crate) fn display_tree( - &self, + &mut self, package: &PhpMixed, packages_in_tree: &[PhpMixed], previous_tree_bar: &str, @@ -2351,11 +2410,11 @@ impl ShowCommand { packages_in_tree: &[PhpMixed], ) -> anyhow::Result<Vec<IndexMap<String, PhpMixed>>> { let mut children: Vec<IndexMap<String, PhpMixed>> = Vec::new(); - let version_arg: PhpMixed = if link.get_pretty_constraint() == "self.version" { + let version_arg: PhpMixed = if link.get_pretty_constraint().ok() == Some("self.version") { // pass the ConstraintInterface object — signal via Null in this scalar shape PhpMixed::Null } else { - PhpMixed::String(link.get_pretty_constraint().to_string()) + PhpMixed::String(link.get_pretty_constraint().unwrap_or("").to_string()) }; let (package, _) = self.get_package(installed_repo, remote_repos, name, version_arg)?; if let Some(package) = package { @@ -2368,7 +2427,7 @@ impl ShowCommand { tree_child_desc.insert("name".to_string(), PhpMixed::String(require_name.clone())); tree_child_desc.insert( "version".to_string(), - PhpMixed::String(require.get_pretty_constraint().to_string()), + PhpMixed::String(require.get_pretty_constraint().unwrap_or("").to_string()), ); if !in_array( @@ -2445,7 +2504,7 @@ impl ShowCommand { "update-possible".to_string() } - fn write_tree_line(&self, line: &str) { + fn write_tree_line(&mut self, line: &str) { let io = self.get_io(); let mut line = line.to_string(); if !io.is_decorated() { @@ -2472,8 +2531,18 @@ impl ShowCommand { ) -> anyhow::Result<Option<Box<dyn PackageInterface>>> { // find the latest version allowed in this repo set let name = package.get_name(); - let version_selector = - VersionSelector::new(self.get_repository_set(composer)?, Some(platform_repo)); + // TODO(phase-b): VersionSelector::new wants RepositorySet by value, but get_repository_set + // returns &mut RepositorySet. Constructing a placeholder set keeps compile clean. + let _ = self.get_repository_set(composer)?; + let placeholder_rs = RepositorySet::new( + composer.get_package().get_minimum_stability(), + composer.get_package().get_stability_flags().clone(), + Vec::new(), + IndexMap::new(), + IndexMap::new(), + IndexMap::new(), + ); + let mut version_selector = VersionSelector::new(placeholder_rs, Some(platform_repo))?; let mut stability = composer.get_package().get_minimum_stability().to_string(); let flags = composer.get_package().get_stability_flags(); if let Some(flag_value) = flags.get(name) { @@ -2562,15 +2631,18 @@ impl ShowCommand { version_compare(candidate.get_version(), &package_version, "<=") }); } + // TODO(phase-b): platform_req_filter needs to be Option<Box<dyn ...>>; current code holds &dyn. + let _ = platform_req_filter; + let _ = show_warnings_box; let mut candidate = version_selector.find_best_candidate( name, target_version.as_deref(), - Some(&best_stability), - platform_req_filter, + &best_stability, + None, 0, Some(self.get_io()), - Some(&*show_warnings_box), - ); + PhpMixed::Bool(true), + )?; while let Some(ref c) = candidate { if let Some(alias) = c.as_alias_package() { candidate = Some(alias.get_alias_of().clone_box()); @@ -2584,13 +2656,23 @@ impl ShowCommand { fn get_repository_set(&mut self, composer: &Composer) -> anyhow::Result<&mut RepositorySet> { if self.repository_set.is_none() { - let mut rs = RepositorySet::with_stability_and_flags( + // TODO(phase-b): RepositorySet::with_stability_and_flags — using new() placeholder. + let mut rs = RepositorySet::new( composer.get_package().get_minimum_stability(), - composer.get_package().get_stability_flags(), + composer.get_package().get_stability_flags().clone(), + Vec::new(), + IndexMap::new(), + IndexMap::new(), + IndexMap::new(), ); rs.add_repository(Box::new(CompositeRepository::new( - composer.get_repository_manager().get_repositories(), - ))); + composer + .get_repository_manager() + .get_repositories() + .iter() + .map(|r| r.clone_box()) + .collect(), + )))?; self.repository_set = Some(rs); } diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs index bc81a21..b62b4d6 100644 --- a/crates/shirabe/src/command/status_command.rs +++ b/crates/shirabe/src/command/status_command.rs @@ -39,44 +39,52 @@ impl StatusCommand { ); } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> Result<i64> { + pub fn execute( + &mut self, + input: &dyn InputInterface, + output: &dyn OutputInterface, + ) -> Result<i64> { let composer = self.require_composer(None, None)?; // TODO(plugin): dispatch CommandEvent let command_event = CommandEvent::new(PluginEvents::COMMAND, "status", input, output); composer .get_event_dispatcher() + .borrow_mut() .dispatch(Some(command_event.get_name()), None); - composer.get_event_dispatcher().dispatch_script( - ScriptEvents::PRE_STATUS_CMD, - true, - vec![], - indexmap::IndexMap::new(), - ); + composer + .get_event_dispatcher() + .borrow_mut() + .dispatch_script( + ScriptEvents::PRE_STATUS_CMD, + true, + vec![], + indexmap::IndexMap::new(), + ); let exit_code = self.do_execute(input)?; - composer.get_event_dispatcher().dispatch_script( - ScriptEvents::POST_STATUS_CMD, - true, - vec![], - indexmap::IndexMap::new(), - ); + composer + .get_event_dispatcher() + .borrow_mut() + .dispatch_script( + ScriptEvents::POST_STATUS_CMD, + true, + vec![], + indexmap::IndexMap::new(), + ); Ok(exit_code) } - fn do_execute(&self, input: &dyn InputInterface) -> Result<i64> { - let composer = self.require_composer(None, None)?; - - let installed_repo = composer.get_repository_manager().get_local_repository(); - - let dm = composer.get_download_manager(); - let im = composer.get_installation_manager(); + fn do_execute(&mut self, input: &dyn InputInterface) -> Result<i64> { + let mut composer = self.require_composer(None, None)?; + // TODO(phase-b): release the &mut self borrow held by get_io via clone_box. + let io_box = self.get_io().clone_box(); + let io: &dyn IOInterface = io_box.as_ref(); let mut errors: IndexMap<String, String> = IndexMap::new(); - let io = self.get_io(); let mut unpushed_changes: IndexMap<String, String> = IndexMap::new(); let mut vcs_version_changes: IndexMap<String, IndexMap<String, IndexMap<String, String>>> = IndexMap::new(); @@ -88,21 +96,34 @@ impl StatusCommand { .get_process_executor() .map(std::rc::Rc::clone) .unwrap_or_else(|| std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(io)))); - let guesser = VersionGuesser::new( + let mut guesser = VersionGuesser::new( std::rc::Rc::clone(composer.get_config()), std::rc::Rc::clone(&process_executor), parser.clone(), - Some(io.clone_box()), + Some(io_box.clone_box()), ); let dumper = ArrayDumper::new(); - for package in installed_repo.get_canonical_packages() { - let downloader = dm.borrow().get_downloader_for_package(package.as_ref()); - let target_dir = im.get_install_path(package.as_ref()); + let dm = composer.get_download_manager().clone(); + let packages: Vec<_> = composer + .get_repository_manager() + .get_local_repository() + .get_canonical_packages(); + for package in packages { + let target_dir = composer + .get_installation_manager_mut() + .get_install_path(package.as_ref()); let target_dir = match target_dir { Some(d) => d, None => continue, }; + // TODO(phase-b): downloader borrow lifetime tied to dm.borrow() temporary; restructure later. + let dm_borrow = dm.borrow(); + let downloader: &dyn crate::downloader::downloader_interface::DownloaderInterface = + match dm_borrow.get_downloader_for_package(package.as_ref())? { + Some(d) => d, + None => continue, + }; // TODO(phase-b): isinstance checks using ChangeReportInterface/VcsCapableDownloaderInterface/DvcsDownloaderInterface if let Some(change_reporter) = downloader.as_change_report_interface() { @@ -132,12 +153,11 @@ impl StatusCommand { }; let current_version = - guesser.guess_version(&dumper.dump(package.as_ref()), &target_dir); + guesser.guess_version(&dumper.dump(package.as_ref()), &target_dir)?; if let (Some(prev_ref), Some(cur_version)) = (&previous_ref, ¤t_version) { - if cur_version.get("commit").map(|s| s.as_str()) != Some(prev_ref.as_str()) - && cur_version.get("pretty_version").map(|s| s.as_str()) - != Some(prev_ref.as_str()) + if cur_version.commit.as_deref() != Some(prev_ref.as_str()) + && cur_version.pretty_version.as_deref() != Some(prev_ref.as_str()) { let mut previous = IndexMap::new(); previous.insert( @@ -149,14 +169,11 @@ impl StatusCommand { let mut current = IndexMap::new(); current.insert( "version".to_string(), - cur_version - .get("pretty_version") - .cloned() - .unwrap_or_default(), + cur_version.pretty_version.clone().unwrap_or_default(), ); current.insert( "ref".to_string(), - cur_version.get("commit").cloned().unwrap_or_default(), + cur_version.commit.clone().unwrap_or_default(), ); let mut change = IndexMap::new(); diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs index 0350dd1..3b114c7 100644 --- a/crates/shirabe/src/command/suggests_command.rs +++ b/crates/shirabe/src/command/suggests_command.rs @@ -8,8 +8,10 @@ use crate::installer::suggested_packages_reporter::SuggestedPackagesReporter; use crate::io::io_interface::IOInterface; use crate::repository::installed_repository::InstalledRepository; use crate::repository::platform_repository::PlatformRepository; +use crate::repository::repository_interface::RepositoryInterface; use crate::repository::root_package_repository::RootPackageRepository; use anyhow::Result; +use indexmap::IndexMap; use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; use shirabe_php_shim::{PhpMixed, empty, in_array}; @@ -43,37 +45,53 @@ impl SuggestsCommand { input: &dyn InputInterface, _output: &dyn OutputInterface, ) -> Result<i64> { - let composer = self.require_composer(None, None)?; + let mut composer = self.require_composer(None, None)?; - let mut installed_repos = vec![Box::new(RootPackageRepository::new( - composer.get_package().clone(), - ))]; + let mut installed_repos: Vec<Box<dyn RepositoryInterface>> = vec![Box::new( + RootPackageRepository::new(composer.get_package().clone_box()), + )]; - let locker = composer.get_locker(); - if locker.is_locked() { + if composer.get_locker_mut().is_locked() { + // TODO(phase-b): get_platform_overrides returns IndexMap<String, String>; PlatformRepository::new expects IndexMap<String, PhpMixed> + let _platform_overrides = composer.get_locker_mut().get_platform_overrides()?; + let platform_overrides: IndexMap<String, PhpMixed> = + todo!("convert IndexMap<String, String> to IndexMap<String, PhpMixed>"); installed_repos.push(Box::new(PlatformRepository::new( vec![], - locker.get_platform_overrides(), - ))); - installed_repos.push(Box::new(locker.get_locked_repository( - !input.get_option("no-dev").as_bool().unwrap_or(false), - ))); + platform_overrides, + )?)); + let locked_repo = composer + .get_locker_mut() + .get_locked_repository(!input.get_option("no-dev").as_bool().unwrap_or(false))?; + installed_repos.push(Box::new(locked_repo)); } else { + // TODO(phase-b): Config::get returns PhpMixed; need to coerce to IndexMap<String, PhpMixed> + let _platform_cfg = composer.get_config().borrow().get("platform"); + let platform_overrides: IndexMap<String, PhpMixed> = + todo!("extract IndexMap<String, PhpMixed> from PhpMixed config value"); installed_repos.push(Box::new(PlatformRepository::new( vec![], - composer.get_config().borrow().get("platform"), - ))); - installed_repos.push(Box::new( - composer.get_repository_manager().get_local_repository(), - )); + platform_overrides, + )?)); + installed_repos.push( + composer + .get_repository_manager() + .get_local_repository() + .clone_box(), + ); } let installed_repo = InstalledRepository::new(installed_repos); - let mut reporter = SuggestedPackagesReporter::new(self.get_io()); + // TODO(phase-b): SuggestedPackagesReporter::new expects Box<dyn IOInterface>; self.get_io() returns &mut dyn IOInterface + let io_box: Box<dyn IOInterface> = todo!("share IOInterface as Box<dyn IOInterface>"); + let mut reporter = SuggestedPackagesReporter::new(io_box); let filter = input.get_argument("packages"); - let mut packages = installed_repo.get_packages(); - packages.push(composer.get_package()); + let mut packages = RepositoryInterface::get_packages(&installed_repo); + // TODO(phase-b): composer.get_package() returns &dyn RootPackageInterface; pushing into Vec<Box<dyn BasePackage>> requires conversion + let root_pkg_as_base: Box<dyn crate::package::base_package::BasePackage> = + todo!("convert RootPackageInterface to Box<dyn BasePackage>"); + packages.push(root_pkg_as_base); for package in &packages { if !empty(&filter) && !in_array( @@ -84,7 +102,10 @@ impl SuggestsCommand { { continue; } - reporter.add_suggestions_from_package(package); + // TODO(phase-b): add_suggestions_from_package expects &dyn PackageInterface; BasePackage is a separate trait + reporter.add_suggestions_from_package(todo!( + "convert Box<dyn BasePackage> to &dyn PackageInterface" + )); } let mut mode = SuggestedPackagesReporter::MODE_BY_PACKAGE; @@ -99,15 +120,17 @@ impl SuggestsCommand { mode = SuggestedPackagesReporter::MODE_LIST; } - reporter.output( - mode, - &installed_repo, + let only_dependents_of: Option<&dyn crate::package::package_interface::PackageInterface> = if empty(&filter) && !input.get_option("all").as_bool().unwrap_or(false) { - Some(composer.get_package()) + // TODO(phase-b): composer.get_package() returns &dyn RootPackageInterface; need conversion to &dyn PackageInterface + Some(todo!( + "convert RootPackageInterface to &dyn PackageInterface" + )) } else { None - }, - ); + }; + + reporter.output(mode, Some(&installed_repo), only_dependents_of); Ok(0) } diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index 405b164..2e8b993 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -76,7 +76,10 @@ impl UpdateCommand { input: &dyn InputInterface, output: &dyn OutputInterface, ) -> Result<i64> { - let io = self.get_io(); + // TODO(phase-b): clone_box avoids the &mut self conflict with require_composer + // below; revisit when get_io can return an Rc/Arc owned handle. + let io_box = self.get_io().clone_box(); + let io: &dyn IOInterface = &*io_box; if input.get_option("dev").as_bool().unwrap_or(false) { io.write_error3( "<warning>You are using the deprecated option \"--dev\". It has no effect and will break in Composer 3.</warning>", @@ -121,7 +124,7 @@ impl UpdateCommand { .collect() }) .unwrap_or_default(), - ); + )?; // extract --with shorthands from the allowlist if packages.len() > 0 { @@ -130,7 +133,7 @@ impl UpdateCommand { Preg::is_match(r"{\S+[ =:]\S+}", pkg).unwrap_or(false) }); for (package, constraint) in - self.format_requirements(allowlist_packages_with_requirements.clone()) + self.format_requirements(allowlist_packages_with_requirements.clone())? { reqs.insert(package, constraint); } @@ -152,15 +155,17 @@ impl UpdateCommand { } let root_package = composer.get_package(); - root_package.set_references(RootPackageLoader::extract_references( - &reqs, - &root_package.get_references(), - )); - root_package.set_stability_flags(RootPackageLoader::extract_stability_flags( + // TODO(phase-b): composer.get_package() returns &dyn RootPackageInterface so + // set_references/set_stability_flags cannot be called; needs &mut access. + let references = + RootPackageLoader::extract_references(&reqs, root_package.get_references().clone()); + let stability_flags = RootPackageLoader::extract_stability_flags( &reqs, root_package.get_minimum_stability(), - root_package.get_stability_flags(), - )); + root_package.get_stability_flags().clone(), + ); + let _ = references; + let _ = stability_flags; let parser = VersionParser::new(); let mut temporary_constraints: IndexMap<String, _> = IndexMap::new(); @@ -172,10 +177,12 @@ impl UpdateCommand { for (package, constraint) in &reqs { let package = strtolower(package); let parsed_constraint = parser.parse_constraints(constraint)?; - temporary_constraints.insert(package.clone(), parsed_constraint.clone()); + // TODO(phase-b): clone_box because Box<dyn ConstraintInterface> isn't Clone. + temporary_constraints.insert(package.clone(), parsed_constraint.clone_box()); + let _ = parsed_constraint; // TODO(phase-b): access root_requirements[package].getConstraint() - let intersected = todo!("Intervals::haveIntersections check"); - if let Some(_root_req) = todo!("root_requirements.get(&package)") { + let intersected: bool = todo!("Intervals::haveIntersections check"); + if let Some(_root_req) = todo!("root_requirements.get(&package)") as Option<PhpMixed> { if !intersected { io.write_error3( &format!( @@ -225,9 +232,10 @@ impl UpdateCommand { matches.get(1).cloned().unwrap_or_default() ))?; if temporary_constraints.contains_key(package.get_name()) { + // TODO(phase-b): Box<dyn ConstraintInterface> isn't Clone; clone_box workaround. let existing = temporary_constraints .get(package.get_name()) - .cloned() + .map(|c| c.clone_box()) .unwrap(); temporary_constraints.insert( package.get_name().to_string(), @@ -292,18 +300,22 @@ impl UpdateCommand { } let mut command_event = CommandEvent::new(PluginEvents::COMMAND, "update", input, output); + // TODO(phase-b): dispatch should accept the CommandEvent itself; passing the + // event by name only for now to keep types aligned with EventDispatcher::dispatch. composer .get_event_dispatcher() - .dispatch(&command_event.get_name(), &mut command_event); + .borrow_mut() + .dispatch(Some(command_event.get_name()), None)?; composer .get_installation_manager() .set_output_progress(!input.get_option("no-progress").as_bool().unwrap_or(false)); - let mut install = Installer::create(io, &composer); + let mut install = Installer::create(io.clone_box(), &composer); - let config = composer.get_config(); - let (prefer_source, prefer_dist) = self.get_preferred_install_options(config, input, false); + let config = std::rc::Rc::clone(composer.get_config()); + let (prefer_source, prefer_dist) = + self.get_preferred_install_options(&*config.borrow(), input, false)?; let optimize = input .get_option("optimize-autoloader") @@ -323,8 +335,11 @@ impl UpdateCommand { .get("classmap-authoritative") .as_bool() .unwrap_or(false); - let apcu_prefix = input.get_option("apcu-autoloader-prefix"); - let apcu = !matches!(apcu_prefix, PhpMixed::Null) + let apcu_prefix: Option<String> = input + .get_option("apcu-autoloader-prefix") + .as_string_opt() + .map(|s| s.to_string()); + let apcu = apcu_prefix.is_some() || input .get_option("apcu-autoloader") .as_bool() @@ -344,22 +359,23 @@ impl UpdateCommand { .as_bool() .unwrap_or(false); - let mut update_allow_transitive_dependencies = UpdateAllowTransitiveDeps::UpdateOnlyListed; + let mut update_allow_transitive_dependencies: i64 = Request::UPDATE_ONLY_LISTED; if input .get_option("with-all-dependencies") .as_bool() .unwrap_or(false) { - update_allow_transitive_dependencies = - UpdateAllowTransitiveDeps::UpdateListedWithTransitiveDeps; + update_allow_transitive_dependencies = Request::UPDATE_LISTED_WITH_TRANSITIVE_DEPS; } else if input .get_option("with-dependencies") .as_bool() .unwrap_or(false) { update_allow_transitive_dependencies = - UpdateAllowTransitiveDeps::UpdateListedWithTransitiveDepsNoRootRequire; + Request::UPDATE_LISTED_WITH_TRANSITIVE_DEPS_NO_ROOT_REQUIRE; } + // Keep `UpdateAllowTransitiveDeps` import alive while still using i64 for the setter. + let _ = UpdateAllowTransitiveDeps::UpdateOnlyListed; install .set_dry_run(input.get_option("dry-run").as_bool().unwrap_or(false)) @@ -370,17 +386,25 @@ impl UpdateCommand { .set_dump_autoloader(!input.get_option("no-autoloader").as_bool().unwrap_or(false)) .set_optimize_autoloader(optimize) .set_class_map_authoritative(authoritative) - .set_apcu_autoloader(apcu, apcu_prefix) + .set_apcu_autoloader(apcu, apcu_prefix.clone()) .set_update(true) .set_install(!input.get_option("no-install").as_bool().unwrap_or(false)) .set_update_mirrors(update_mirrors) .set_update_allow_list(packages.clone()) - .set_update_allow_transitive_dependencies(update_allow_transitive_dependencies) - .set_platform_requirement_filter(self.get_platform_requirement_filter(input)) + .set_update_allow_transitive_dependencies(update_allow_transitive_dependencies)? + .set_platform_requirement_filter(self.get_platform_requirement_filter(input)?) .set_prefer_stable(input.get_option("prefer-stable").as_bool().unwrap_or(false)) .set_prefer_lowest(input.get_option("prefer-lowest").as_bool().unwrap_or(false)) - .set_temporary_constraints(temporary_constraints) - .set_audit_config(self.create_audit_config(composer.get_config(), input)?) + // TODO(phase-b): VersionParser::parse_constraints returns Arc<dyn ...> but + // Installer::set_temporary_constraints expects IndexMap<String, Box<dyn ...>>; + // bridge the constraint storage types later. + .set_temporary_constraints({ + let _ = &temporary_constraints; + IndexMap::new() + }) + .set_audit_config( + self.create_audit_config(&mut *composer.get_config().borrow_mut(), input)?, + ) .set_minimal_update(minimal_changes); if input.get_option("no-plugins").as_bool().unwrap_or(false) { @@ -402,8 +426,10 @@ impl UpdateCommand { true, io_interface::NORMAL, ); - let mut bump_command = BumpCommand::new(); - bump_command.set_composer(composer.clone()); + let mut bump_command = BumpCommand::new(None); + // TODO(phase-b): Composer is a PHP class shared by reference; calling + // set_composer here requires Rc<RefCell<Composer>> shared-ownership. + // bump_command.set_composer(composer); result = bump_command.do_bump( io, bump_after_update.as_string() == Some("dev"), @@ -465,17 +491,22 @@ impl UpdateCommand { io_interface::NORMAL, ); let mut autocompleter_values: IndexMap<String, String> = IndexMap::new(); - let installed_packages = if composer.get_locker().is_locked() { - CanonicalPackagesTrait::get_packages( - &composer.get_locker().get_locked_repository(true)?, - ) - } else { - composer - .get_repository_manager() - .get_local_repository() - .get_packages() - }; - let version_selector = self.create_version_selector(composer); + // TODO(phase-b): unify return types — CanonicalPackagesTrait returns + // Vec<Box<dyn PackageInterface>> while RepositoryInterface::get_packages + // returns Vec<Box<dyn BasePackage>>. Use only the locker branch for now. + let installed_packages: Vec<Box<dyn crate::package::package_interface::PackageInterface>> = + if composer.get_locker().is_locked() { + CanonicalPackagesTrait::get_packages( + &composer.get_locker().get_locked_repository(true)?, + ) + } else { + let _ = composer + .get_repository_manager() + .get_local_repository() + .get_packages(); + Vec::new() + }; + let mut version_selector = self.create_version_selector(composer)?; for package in &installed_packages { if let Some(filter) = &filter { if !Preg::is_match(filter, package.get_name()).unwrap_or(false) { @@ -483,17 +514,21 @@ impl UpdateCommand { } } let current_version = package.get_pretty_version(); - let constraint = - todo!("requires[package.get_name()].get_pretty_constraint() if present"); - let stability = todo!( - "if stabilityFlags[package_name] use array_search(BasePackage::STABILITIES) else minimum_stability" - ); + // TODO(phase-b): pull from requires[package.get_name()].get_pretty_constraint() + let constraint: Option<&str> = None; + // TODO(phase-b): derive from stabilityFlags / minimum_stability + let stability: &str = "stable"; let latest_version = version_selector.find_best_candidate( package.get_name(), constraint, stability, - &*platform_req_filter, - ); + None, + 0, + None, + PhpMixed::Bool(true), + )?; + let _ = &platform_req_filter; + let _ = &stability_flags; if let Some(latest) = latest_version { if package.get_version() != latest.get_version() || latest.is_dev() { autocompleter_values.insert( @@ -508,11 +543,15 @@ impl UpdateCommand { } } if 0 == installed_packages.len() { - for (req, _constraint) in &requires { + // TODO(phase-b): iterate composer.get_package().get_requires() merged with + // get_dev_requires(); requires is currently a PhpMixed placeholder. + let _ = &requires; + let _empty: IndexMap<String, ()> = IndexMap::new(); + for (req, _constraint) in &_empty { if PlatformRepository::is_platform_package(req) { continue; } - autocompleter_values.insert(req.clone(), String::new()); + autocompleter_values.insert(req.to_string(), String::new()); } } @@ -524,19 +563,34 @@ impl UpdateCommand { .into()); } - let packages: Vec<String> = io.select( + // TODO(phase-b): IOInterface::select returns PhpMixed and takes + // Vec<String> choices; convert IndexMap<String, String> autocompleter values + // to choices and downcast PhpMixed back to Vec<String>. + let select_result = io.select( "Select packages: (Select more than one value separated by comma) ".to_string(), - autocompleter_values, - false, - 1, + autocompleter_values + .keys() + .cloned() + .collect::<Vec<String>>(), + PhpMixed::Bool(false), + PhpMixed::Int(1), "No package named \"%s\" is installed.".to_string(), true, ); + let packages: Vec<String> = match select_result { + PhpMixed::List(l) => l + .into_iter() + .filter_map(|v| v.as_string().map(|s| s.to_string())) + .collect(), + _ => Vec::new(), + }; let mut table = Table::new(output); - table.set_headers(vec!["Selected packages".to_string()]); + table.set_headers(vec![PhpMixed::String("Selected packages".to_string())]); for package in &packages { - table.add_row(vec![package.clone()]); + table.add_row(PhpMixed::List(vec![Box::new(PhpMixed::String( + package.clone(), + ))])); } table.render(); @@ -559,20 +613,29 @@ impl UpdateCommand { .into()) } - fn create_version_selector(&self, composer: &Composer) -> VersionSelector { - let mut repository_set = RepositorySet::new(); - repository_set.add_repository(Box::new(CompositeRepository::new(array_filter( - &composer.get_repository_manager().get_repositories(), - |repository: &Box<dyn RepositoryInterface>| -> bool { - // PHP: !$repository instanceof PlatformRepository - repository - .as_any() - .downcast_ref::<PlatformRepository>() - .is_none() - }, - )))); + fn create_version_selector(&self, composer: &Composer) -> Result<VersionSelector> { + let mut repository_set = RepositorySet::new( + composer.get_package().get_minimum_stability(), + composer.get_package().get_stability_flags().clone(), + // TODO(phase-b): collect root aliases from composer.get_package().get_aliases() + Vec::new(), + composer.get_package().get_references().clone(), + IndexMap::new(), + IndexMap::new(), + ); + // TODO(phase-b): array_filter requires Clone on Box<dyn RepositoryInterface> + // which PHP classes must not implement. Skipping the repo filter for now. + let _ = &composer.get_repository_manager().get_repositories(); + let _ = |repository: &Box<dyn RepositoryInterface>| -> bool { + repository + .as_any() + .downcast_ref::<PlatformRepository>() + .is_none() + }; + repository_set.add_repository(Box::new(CompositeRepository::new(Vec::new())))?; + let _ = array_filter::<i64, fn(&i64) -> bool>; - VersionSelector::new(repository_set) + VersionSelector::new(repository_set, None) } } diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs index af8a5ce..a15c819 100644 --- a/crates/shirabe/src/command/validate_command.rs +++ b/crates/shirabe/src/command/validate_command.rs @@ -108,13 +108,20 @@ impl ValidateCommand { ); } - pub fn execute(&self, input: &dyn InputInterface, output: &dyn OutputInterface) -> Result<i64> { + pub fn execute( + &mut self, + input: &dyn InputInterface, + output: &dyn OutputInterface, + ) -> Result<i64> { let file = input .get_argument("file") .as_string_opt() .map(|s| s.to_string()) - .unwrap_or_else(|| Factory::get_composer_file()); - let io = self.get_io(); + .map(Ok) + .unwrap_or_else(Factory::get_composer_file)?; + // TODO(phase-b): get_io() takes &mut self via BaseCommand; clone_box to release the borrow. + let io_box = self.get_io().clone_box(); + let io: &dyn IOInterface = io_box.as_ref(); if !std::path::Path::new(&file).exists() { io.write_error(&format!("<error>{} not found.</error>", file)); @@ -125,7 +132,7 @@ impl ValidateCommand { return Ok(3); } - let validator = ConfigValidator::new(io); + let validator = ConfigValidator::new(io.clone_box()); let check_all = if input.get_option("no-check-all").as_bool().unwrap_or(false) { 0 } else { @@ -147,10 +154,10 @@ impl ValidateCommand { }; let is_strict = input.get_option("strict").as_bool().unwrap_or(false); let (mut errors, mut publish_errors, mut warnings) = - validator.validate(&file, check_all, check_version)?; + validator.validate(&file, check_all, check_version); let mut lock_errors: Vec<String> = vec![]; - let composer = self.create_composer_instance(input, io, vec![])?; + let mut composer = self.create_composer_instance(input, io, None, false, None)?; let check_lock = (check_lock && composer .get_config() @@ -159,13 +166,17 @@ impl ValidateCommand { .as_bool() .unwrap_or(true)) || input.get_option("check-lock").as_bool().unwrap_or(false); - let locker = composer.get_locker(); + // TODO(phase-b): get_missing_requirement_info needs &package from composer while + // locker holds &mut composer; cloning lock state isn't trivial. Use todo!() for the + // package-arg subexpression below. + let locker = composer.get_locker_mut(); if locker.is_locked() && !locker.is_fresh()? { lock_errors.push("- The lock file is not up to date with the latest changes in composer.json, it is recommended that you run `composer update` or `composer update <package name>`.".to_string()); } if locker.is_locked() { - lock_errors.extend(locker.get_missing_requirement_info(composer.get_package(), true)?); + // TODO(phase-b): borrows composer twice; use todo!() for the package arg. + lock_errors.extend(locker.get_missing_requirement_info(todo!(), true)?); } self.output_result( @@ -195,10 +206,13 @@ impl ValidateCommand { .as_bool() .unwrap_or(false) { - let local_repo = composer.get_repository_manager().get_local_repository(); - for package in local_repo.get_packages() { + let packages = composer + .get_repository_manager() + .get_local_repository() + .get_packages(); + for package in packages { let path = composer - .get_installation_manager() + .get_installation_manager_mut() .get_install_path(package.as_ref()); let path = match path { Some(p) => p, @@ -208,7 +222,7 @@ impl ValidateCommand { if std::path::Path::new(&path).is_dir() && std::path::Path::new(&dep_file).exists() { let (mut dep_errors, mut dep_publish_errors, mut dep_warnings) = - validator.validate(&dep_file, check_all, check_version)?; + validator.validate(&dep_file, check_all, check_version); self.output_result( io, @@ -238,6 +252,7 @@ impl ValidateCommand { let command_event = CommandEvent::new(PluginEvents::COMMAND, "validate", input, output); let event_code = composer .get_event_dispatcher() + .borrow_mut() .dispatch(Some(command_event.get_name()), None)?; Ok(exit_code.max(event_code)) diff --git a/crates/shirabe/src/compiler.rs b/crates/shirabe/src/compiler.rs index db18a66..713aa59 100644 --- a/crates/shirabe/src/compiler.rs +++ b/crates/shirabe/src/compiler.rs @@ -45,13 +45,24 @@ impl Compiler { shirabe_php_shim::unlink(phar_file); } - let process = ProcessExecutor::new(None); + let process = std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(()))); - let command = Git::build_rev_list_command(&process, &["-n1", "--format=%H", "HEAD"]); + let command = Git::build_rev_list_command( + &process, + vec![ + "-n1".to_string(), + "--format=%H".to_string(), + "HEAD".to_string(), + ], + ); let mut output = String::new(); // PHP: dirname(__DIR__, 2) - going up 2 levels from src/Composer to the repo root let repo_root = shirabe_php_shim::dirname_levels(file!(), 2); - if process.execute_args(&command, &mut output, Some(&repo_root)) != 0 { + if process + .borrow_mut() + .execute_args(&command, &mut output, Some(&repo_root)) + != 0 + { return Err(RuntimeException { message: "Can't run git rev-list. You must ensure to run compile from composer git repository clone and that git binary is available.".to_string(), code: 0, @@ -61,9 +72,20 @@ impl Compiler { .trim() .to_string(); - let command = Git::build_rev_list_command(&process, &["-n1", "--format=%ci", "HEAD"]); + let command = Git::build_rev_list_command( + &process, + vec![ + "-n1".to_string(), + "--format=%ci".to_string(), + "HEAD".to_string(), + ], + ); let mut output = String::new(); - if process.execute_args(&command, &mut output, Some(&repo_root)) != 0 { + if process + .borrow_mut() + .execute_args(&command, &mut output, Some(&repo_root)) + != 0 + { return Err(RuntimeException { message: "Can't run git rev-list. You must ensure to run compile from composer git repository clone and that git binary is available.".to_string(), code: 0, @@ -77,7 +99,7 @@ impl Compiler { .unwrap_or_else(|_| chrono::Utc::now()); let mut git_describe_output = String::new(); - if process.execute_args( + if process.borrow_mut().execute_args( &[ "git".to_string(), "describe".to_string(), @@ -93,7 +115,7 @@ impl Compiler { } else { // get branch-alias defined in composer.json for dev-main (if any) let local_config_path = format!("{}/composer.json", repo_root); - let file = JsonFile::new(local_config_path.clone(), None, None)?; + let mut file = JsonFile::new(local_config_path.clone(), None, None)?; let local_config = file.read()?; if let Some(branch_alias) = local_config .as_array() @@ -123,8 +145,8 @@ impl Compiler { let finder_sort = |a: &SplFileInfo, b: &SplFileInfo| -> i64 { strcmp( - &strtr(a.get_real_path(), "\\", "/"), - &strtr(b.get_real_path(), "\\", "/"), + &strtr(&a.get_real_path().unwrap_or_default(), "\\", "/"), + &strtr(&b.get_real_path().unwrap_or_default(), "\\", "/"), ) }; @@ -223,10 +245,11 @@ impl Compiler { let mut unexpected_files: Vec<String> = vec![]; for file in finder.iter() { - if let Some(index) = array_search(file.get_real_path(), &extra_files) { + let real_path = file.get_real_path().unwrap_or_default(); + if let Some(index) = array_search(&real_path, &extra_files) { extra_files.shift_remove(&index); } else if !Preg::is_match(r"{(^LICENSE(?:\.txt)?$|\.php$)}", &file.get_filename())? { - unexpected_files.push(file.to_string()); + unexpected_files.push(file.get_pathname()); } if Preg::is_match(r"{\.php[\d.]*$}", &file.get_filename())? { @@ -275,30 +298,30 @@ impl Compiler { // re-sign the phar with reproducible timestamp / signature let mut util = Timestamps::new(phar_file); - util.update_timestamps(&self.version_date); - util.save(phar_file, Phar::SHA512); + util.update_timestamps(&self.version_date.format("%Y-%m-%d %H:%M:%S").to_string())?; + util.save(phar_file, Phar::SHA512)?; Linter::lint( phar_file, &[ - "vendor/symfony/console/Attribute/AsCommand.php", - "vendor/symfony/polyfill-intl-grapheme/bootstrap80.php", - "vendor/symfony/polyfill-intl-normalizer/bootstrap80.php", - "vendor/symfony/polyfill-mbstring/bootstrap80.php", - "vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php", - "vendor/symfony/service-contracts/Attribute/SubscribedService.php", - "vendor/symfony/polyfill-php84/Resources/stubs/Deprecated.php", - "vendor/symfony/polyfill-php84/Resources/Deprecated.php", - "vendor/symfony/polyfill-php84/Resources/RoundingMode.php", - "vendor/symfony/polyfill-php84/bootstrap82.php", + "vendor/symfony/console/Attribute/AsCommand.php".to_string(), + "vendor/symfony/polyfill-intl-grapheme/bootstrap80.php".to_string(), + "vendor/symfony/polyfill-intl-normalizer/bootstrap80.php".to_string(), + "vendor/symfony/polyfill-mbstring/bootstrap80.php".to_string(), + "vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php".to_string(), + "vendor/symfony/service-contracts/Attribute/SubscribedService.php".to_string(), + "vendor/symfony/polyfill-php84/Resources/stubs/Deprecated.php".to_string(), + "vendor/symfony/polyfill-php84/Resources/Deprecated.php".to_string(), + "vendor/symfony/polyfill-php84/Resources/RoundingMode.php".to_string(), + "vendor/symfony/polyfill-php84/bootstrap82.php".to_string(), ], - ); + )?; Ok(()) } fn get_relative_file_path(&self, file: &SplFileInfo) -> String { - let real_path = file.get_real_path(); + let real_path = file.get_real_path().unwrap_or_default(); // PHP: dirname(__DIR__, 2) . DIRECTORY_SEPARATOR - repo root + separator let repo_root = shirabe_php_shim::dirname_levels(file!(), 2); let path_prefix = format!("{}/", repo_root); @@ -306,7 +329,7 @@ impl Compiler { let relative_path = if let Some(stripped) = real_path.strip_prefix(&path_prefix) { stripped.to_string() } else { - real_path.to_string() + real_path.clone() }; strtr(&relative_path, "\\", "/") @@ -314,7 +337,7 @@ impl Compiler { fn add_file(&self, phar: &mut Phar, file: &SplFileInfo, strip: bool) -> anyhow::Result<()> { let path = self.get_relative_file_path(file); - let content = file_get_contents(file.get_path()).unwrap_or_default(); + let content = file_get_contents(&file.get_path()).unwrap_or_default(); let mut content = if strip { self.strip_whitespace(&content) } else if file.get_filename() == "LICENSE" { diff --git a/crates/shirabe/src/composer.rs b/crates/shirabe/src/composer.rs index 2841d12..69f272e 100644 --- a/crates/shirabe/src/composer.rs +++ b/crates/shirabe/src/composer.rs @@ -59,6 +59,10 @@ impl Composer { self.locker.as_ref().unwrap() } + pub fn get_locker_mut(&mut self) -> &mut Locker { + self.locker.as_mut().unwrap() + } + pub fn set_download_manager( &mut self, manager: std::rc::Rc<std::cell::RefCell<DownloadManager>>, @@ -88,6 +92,11 @@ impl Composer { self.plugin_manager.as_ref().unwrap() } + // TODO(plugin): get_plugin_manager_mut is part of the plugin API + pub fn get_plugin_manager_mut(&mut self) -> &mut PluginManager { + self.plugin_manager.as_mut().unwrap() + } + pub fn set_autoload_generator(&mut self, autoload_generator: AutoloadGenerator) { self.autoload_generator = Some(autoload_generator); } @@ -96,6 +105,10 @@ impl Composer { self.autoload_generator.as_ref().unwrap() } + pub fn get_autoload_generator_mut(&mut self) -> &mut AutoloadGenerator { + self.autoload_generator.as_mut().unwrap() + } + pub fn get_package(&self) -> &dyn crate::package::root_package_interface::RootPackageInterface { self.inner.get_package() } @@ -116,9 +129,19 @@ impl Composer { self.inner.get_repository_manager() } + pub fn set_event_dispatcher( + &mut self, + dispatcher: std::rc::Rc< + std::cell::RefCell<crate::event_dispatcher::event_dispatcher::EventDispatcher>, + >, + ) { + self.inner.set_event_dispatcher(dispatcher); + } + pub fn get_event_dispatcher( &self, - ) -> &crate::event_dispatcher::event_dispatcher::EventDispatcher { + ) -> &std::rc::Rc<std::cell::RefCell<crate::event_dispatcher::event_dispatcher::EventDispatcher>> + { self.inner.get_event_dispatcher() } @@ -128,11 +151,54 @@ impl Composer { self.inner.get_installation_manager() } + pub fn get_installation_manager_mut( + &mut self, + ) -> &mut crate::installer::installation_manager::InstallationManager { + self.inner.get_installation_manager_mut() + } + pub fn get_loop(&self) -> &std::rc::Rc<std::cell::RefCell<crate::util::r#loop::Loop>> { self.inner.get_loop() } + pub fn set_loop(&mut self, r#loop: std::rc::Rc<std::cell::RefCell<crate::util::r#loop::Loop>>) { + self.inner.set_loop(r#loop); + } + + pub fn set_config(&mut self, config: std::rc::Rc<std::cell::RefCell<crate::config::Config>>) { + self.inner.set_config(config); + } + + pub fn set_global(&mut self) { + self.inner.set_global(); + } + + pub fn set_repository_manager( + &mut self, + manager: crate::repository::repository_manager::RepositoryManager, + ) { + self.inner.set_repository_manager(manager); + } + + pub fn set_installation_manager( + &mut self, + manager: crate::installer::installation_manager::InstallationManager, + ) { + self.inner.set_installation_manager(manager); + } + pub fn is_global(&self) -> bool { self.inner.is_global() } + + pub fn as_partial(&self) -> &crate::partial_composer::PartialComposer { + &self.inner + } + + pub fn set_package( + &mut self, + package: Box<dyn crate::package::root_package_interface::RootPackageInterface>, + ) { + self.inner.set_package(package); + } } diff --git a/crates/shirabe/src/config.rs b/crates/shirabe/src/config.rs index cabd68f..5516020 100644 --- a/crates/shirabe/src/config.rs +++ b/crates/shirabe/src/config.rs @@ -270,6 +270,10 @@ impl Config { self.config_source.as_ref().unwrap().as_ref() } + pub fn get_config_source_mut(&mut self) -> &mut dyn ConfigSourceInterface { + self.config_source.as_mut().unwrap().as_mut() + } + pub fn set_auth_config_source(&mut self, source: Box<dyn ConfigSourceInterface>) { self.auth_config_source = Some(source); } @@ -278,6 +282,10 @@ impl Config { self.auth_config_source.as_ref().unwrap().as_ref() } + pub fn get_auth_config_source_mut(&mut self) -> &mut dyn ConfigSourceInterface { + self.auth_config_source.as_mut().unwrap().as_mut() + } + pub fn set_local_auth_config_source(&mut self, source: Box<dyn ConfigSourceInterface>) { self.local_auth_config_source = Some(source); } @@ -286,13 +294,21 @@ impl Config { self.local_auth_config_source.as_deref() } + pub fn get_local_auth_config_source_mut( + &mut self, + ) -> Option<&mut (dyn ConfigSourceInterface + 'static)> { + self.local_auth_config_source + .as_mut() + .map(|b| &mut **b as &mut dyn ConfigSourceInterface) + } + /// Merges new config values with the existing ones (overriding) /// /// @param array{config?: array<string, mixed>, repositories?: array<mixed>} $config pub fn merge(&mut self, config: &IndexMap<String, PhpMixed>, source: &str) { // override defaults with given config let config_section = config.get("config").cloned().unwrap_or(PhpMixed::Null); - if !empty(&config_section) && is_array(config_section.clone()) { + if !empty(&config_section) && is_array(&config_section) { let config_section_map = match config_section { PhpMixed::Array(m) => m, _ => IndexMap::new(), @@ -327,8 +343,8 @@ impl Config { ))]), true, ) && self.config.contains_key(key) - && is_array(self.config.get(key).cloned().unwrap_or(PhpMixed::Null)) - && is_array(val.clone()) + && is_array(self.config.get(key).unwrap_or(&PhpMixed::Null)) + && is_array(&val) { // merging $val first to get the local config on top of the global one, then appending the global config, // then merging local one again to make sure the values from local win over global ones for keys present in both @@ -370,7 +386,7 @@ impl Config { } else if key == "preferred-install" && self.config.contains_key(key) { let mut val = val.clone(); let existing = self.config.get(key).cloned().unwrap_or(PhpMixed::Null); - if is_array(val.clone()) || is_array(existing.clone()) { + if is_array(&val) || is_array(&existing) { if is_string(&val) { let mut m = IndexMap::new(); m.insert("*".to_string(), Box::new(val.clone())); @@ -443,13 +459,19 @@ impl Config { .get("repositories") .cloned() .unwrap_or(PhpMixed::Null); - if !empty(&repositories_section) && is_array(repositories_section.clone()) { - self.repositories = array_reverse(&self.repositories, true); - let new_repos_map = match &repositories_section { + if !empty(&repositories_section) && is_array(&repositories_section) { + // PHP: array_reverse on IndexMap preserves keys (preserve_keys=true) + self.repositories = self + .repositories + .iter() + .rev() + .map(|(k, v)| (k.clone(), v.clone())) + .collect(); + let new_repos_map: IndexMap<String, PhpMixed> = match &repositories_section { PhpMixed::Array(m) => m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect(), _ => IndexMap::new(), }; - let new_repos = array_reverse(&new_repos_map, true); + let new_repos: IndexMap<String, PhpMixed> = new_repos_map.into_iter().rev().collect(); for (name, repository) in &new_repos { // disable a repository by name // this is a code path, that will be used less as the next check will be preferred @@ -459,7 +481,7 @@ impl Config { } // disable a repository with an anonymous {"name": false} repo - if is_array(repository.clone()) + if is_array(&repository) && repository.as_array().map(|m| m.len()).unwrap_or(0) == 1 && matches!(current(repository.clone()), PhpMixed::Bool(false)) { @@ -537,7 +559,12 @@ impl Config { ); } } - self.repositories = array_reverse(&self.repositories, true); + self.repositories = self + .repositories + .iter() + .rev() + .map(|(k, v)| (k.clone(), v.clone())) + .collect(); } } @@ -986,6 +1013,7 @@ impl Config { let _ = self.get(key); self.source_of_config_value + .borrow() .get(key) .cloned() .unwrap_or_else(|| Self::SOURCE_UNKNOWN.to_string()) @@ -997,7 +1025,7 @@ impl Config { .borrow_mut() .insert(path.to_string(), source.to_string()); - if is_array(config_value.clone()) { + if is_array(config_value) { let map = match config_value { PhpMixed::Array(m) => m .iter() diff --git a/crates/shirabe/src/config/config_source_interface.rs b/crates/shirabe/src/config/config_source_interface.rs index 5a23282..f8676cc 100644 --- a/crates/shirabe/src/config/config_source_interface.rs +++ b/crates/shirabe/src/config/config_source_interface.rs @@ -1,20 +1,14 @@ //! ref: composer/src/Composer/Config/ConfigSourceInterface.php -use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; pub trait ConfigSourceInterface: std::fmt::Debug { - fn add_repository( - &mut self, - name: &str, - config: Option<IndexMap<String, PhpMixed>>, - append: bool, - ) -> anyhow::Result<()>; + fn add_repository(&mut self, name: &str, config: PhpMixed, append: bool) -> anyhow::Result<()>; fn insert_repository( &mut self, name: &str, - config: Option<IndexMap<String, PhpMixed>>, + config: PhpMixed, reference_name: &str, offset: i64, ) -> anyhow::Result<()>; diff --git a/crates/shirabe/src/config/json_config_source.rs b/crates/shirabe/src/config/json_config_source.rs index 13eb9b3..b6c3722 100644 --- a/crates/shirabe/src/config/json_config_source.rs +++ b/crates/shirabe/src/config/json_config_source.rs @@ -69,7 +69,7 @@ impl JsonConfigSource { contents = "{\n \"config\": {\n }\n}\n".to_string(); } - let mut manipulator = JsonManipulator::new(&contents); + let mut manipulator = JsonManipulator::new(contents.clone())?; let new_file = !self.file.exists(); @@ -248,7 +248,8 @@ impl JsonConfigSource { // TODO(phase-b): retain reference semantics so later mutations of $value propagate array[0] = value.clone(); - return_val.map(|_| 0).unwrap_or(0) + array.len() as i64 + let _ = return_val; + array.len() as i64 } } @@ -257,14 +258,8 @@ impl ConfigSourceInterface for JsonConfigSource { self.file.get_path().to_string() } - fn add_repository( - &mut self, - name: &str, - config: Option<IndexMap<String, PhpMixed>>, - append: bool, - ) -> Result<()> { + fn add_repository(&mut self, name: &str, config: PhpMixed, append: bool) -> Result<()> { let name_owned = name.to_string(); - let config_owned = config.clone(); self.manipulate_json( "addRepository", Box::new(move |cfg: &mut PhpMixed, args: &mut Vec<PhpMixed>| { @@ -272,27 +267,18 @@ impl ConfigSourceInterface for JsonConfigSource { let _ = (cfg, args); todo!("addRepository fallback closure body"); }), - vec![ - PhpMixed::String(name_owned), - config_owned - .map(|m| { - PhpMixed::Array(m.into_iter().map(|(k, v)| (k, Box::new(v))).collect()) - }) - .unwrap_or(PhpMixed::Bool(false)), - PhpMixed::Bool(append), - ], + vec![PhpMixed::String(name_owned), config, PhpMixed::Bool(append)], ) } fn insert_repository( &mut self, name: &str, - config: Option<IndexMap<String, PhpMixed>>, + config: PhpMixed, reference_name: &str, offset: i64, ) -> Result<()> { let name_owned = name.to_string(); - let config_owned = config.clone(); let reference_name_owned = reference_name.to_string(); self.manipulate_json( "insertRepository", @@ -303,11 +289,7 @@ impl ConfigSourceInterface for JsonConfigSource { }), vec![ PhpMixed::String(name_owned), - config_owned - .map(|m| { - PhpMixed::Array(m.into_iter().map(|(k, v)| (k, Box::new(v))).collect()) - }) - .unwrap_or(PhpMixed::Bool(false)), + config, PhpMixed::String(reference_name_owned), PhpMixed::Int(offset), ], diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index 8d399a6..23094eb 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -100,8 +100,9 @@ impl Application { const LOGO: &'static str = " ______\n / ____/___ ____ ___ ____ ____ ________ _____\n / / / __ \\/ __ `__ \\/ __ \\/ __ \\/ ___/ _ \\/ ___/\n/ /___/ /_/ / / / / / / /_/ / /_/ (__ ) __/ /\n\\____/\\____/_/ /_/ /_/ .___/\\____/____/\\___/_/\n /_/\n"; pub fn new(name: String, mut version: String) -> Self { - let mut inner = BaseApplication::new(name.clone(), version.clone()); - if method_exists(&inner, "setCatchErrors") { + let mut inner = BaseApplication::new(&name, &version); + // TODO(phase-b): method_exists check requires reflection-style API on BaseApplication + if true { inner.set_catch_errors(true); } @@ -129,7 +130,8 @@ impl Application { let last_error = error_get_last(); let message = last_error - .get("message") + .as_ref() + .and_then(|m| m.get("message")) .and_then(|v| v.as_string()) .unwrap_or(""); if !message.is_empty() @@ -160,18 +162,13 @@ impl Application { pub fn run( &mut self, - input: Option<&dyn InputInterface>, - output: Option<&dyn OutputInterface>, + input: Option<&mut dyn InputInterface>, + output: Option<&mut dyn OutputInterface>, ) -> anyhow::Result<i64> { - let output_owned: Box<dyn OutputInterface>; - let output_ref: &dyn OutputInterface = if let Some(o) = output { - o - } else { - output_owned = Factory::create_output(); - &*output_owned - }; - - self.inner.run(input, Some(output_ref)) + // TODO(phase-b): Factory::create_output returns ConsoleOutput, not Box<dyn OutputInterface>. + // The PHP code falls back to a default output when none is supplied; for now we + // forward the caller-provided output as-is. + self.inner.run(input, output) } pub fn do_run( @@ -184,36 +181,42 @@ impl Application { // PHP: static $stdin = null; // We use an Option here to mimic the lazy initialization. - static STDIN: std::sync::OnceLock<Option<shirabe_php_shim::PhpResource>> = - std::sync::OnceLock::new(); - let stdin = STDIN.get_or_init(|| { - if defined("STDIN") { - Some(shirabe_php_shim::stdin_handle()) - } else { - shirabe_php_shim::fopen("php://stdin", "r") - } - }); + // TODO(phase-b): stdin caching across calls needs proper resource handling; for + // now we recompute on each call via PhpMixed values to keep types consistent. + let stdin: PhpMixed = if defined("STDIN") { + shirabe_php_shim::stdin_handle() + } else { + shirabe_php_shim::fopen("php://stdin", "r") + }; if Platform::get_env("COMPOSER_TESTS_ARE_RUNNING").as_deref() != Some("1") && (Platform::get_env("COMPOSER_NO_INTERACTION").is_some() - || stdin.is_none() - || !Platform::is_tty(stdin.as_ref().unwrap())) + || matches!(stdin, PhpMixed::Null) + || !Platform::is_tty(Some(stdin))) { input.set_interactive(false); } - let mut helpers: Vec< - Box<dyn shirabe_external_packages::symfony::component::console::helper::helper::Helper>, - > = vec![]; - helpers.push(Box::new(QuestionHelper)); - let console_io = ConsoleIO::new(input, output, HelperSet::new(helpers)); - self.io = Box::new(console_io); - let io = &mut *self.io; + let mut helpers: Vec<PhpMixed> = vec![]; + // TODO(phase-b): QuestionHelper does not yet implement the Helper trait; + // packing it as PhpMixed defers the issue. + helpers.push(PhpMixed::Null); + let _ = QuestionHelper; + // TODO(phase-b): ConsoleIO::new takes Box<dyn>, but here input/output are + // borrowed references — defer construction until ownership story is sorted. + let _ = ConsoleIO::new; + let _ = HelperSet::new(helpers); + // self.io stays as the NullIO that was set during construction. + let io_owned = self.io.clone_box(); + let _ = io_owned; // Register error handler again to pass it the IO instance - ErrorHandler::register(Some(io)); + // TODO(phase-b): ErrorHandler::register expects Box<dyn IOInterface + Send>, + // not a borrow; passing None until the IO sharing story is settled. + ErrorHandler::register(None); if input.has_parameter_option(&["--no-cache"], false) { - io.write_error3("Disabling cache usage", true, io_interface::DEBUG); + self.io + .write_error3("Disabling cache usage", true, io_interface::DEBUG); Platform::put_env( "COMPOSER_CACHE_DIR", if Platform::is_windows() { @@ -228,11 +231,11 @@ impl Application { let new_work_dir = self.get_new_working_dir(input)?; let mut old_working_dir: Option<String> = None; if let Some(ref nwd) = new_work_dir { - old_working_dir = Some(Platform::get_cwd_real(true)); + old_working_dir = Some(Platform::get_cwd(true).unwrap_or_default()); chdir(nwd); self.initial_working_directory = getcwd(); - let cwd = Platform::get_cwd_real(true); - io.write_error3( + let cwd = Platform::get_cwd(true).unwrap_or_default(); + self.io.write_error3( &format!( "Changed CWD to {}", if !cwd.is_empty() { @@ -251,7 +254,12 @@ impl Application { let raw_command_name = self.get_command_name_before_binding(input); if let Some(ref raw) = raw_command_name { match self.inner.find(raw) { - Ok(cmd) => command_name = Some(cmd.get_name()), + Ok(cmd) => { + // TODO(phase-b): BaseApplication::find returns PhpMixed; calling + // get_name() requires a Command trait downcast that is not yet wired. + let _ = cmd; + command_name = Some(String::new()); + } Err(e) => { if e.downcast_ref::<CommandNotFoundException>().is_some() { // we'll check command validity again later after plugins are loaded @@ -276,13 +284,19 @@ impl Application { "outdated".to_string(), ]; let use_parent_dir_if_no_json_available = self.get_use_parent_dir_config_value(); + let no_composer_json_commands_pm = PhpMixed::List( + no_composer_json_commands + .iter() + .map(|s| Box::new(PhpMixed::String(s.clone()))) + .collect(), + ); if new_work_dir.is_none() && !in_array( - command_name.as_deref().unwrap_or(""), - &no_composer_json_commands, + command_name.as_deref().unwrap_or("").into(), + &no_composer_json_commands_pm, true, ) - && !file_exists(&Factory::get_composer_file()) + && !file_exists(&Factory::get_composer_file().unwrap_or_default()) && use_parent_dir_if_no_json_available.as_bool() != Some(false) && (command_name.as_deref() != Some("config") || (input.has_parameter_option(&["--file"], true) == false @@ -290,7 +304,7 @@ impl Application { && input.has_parameter_option(&["--help"], true) == false && input.has_parameter_option(&["-h"], true) == false { - let mut dir = dirname(&Platform::get_cwd_real(true)); + let mut dir = dirname(&Platform::get_cwd(true).unwrap_or_default()); let home_value = Platform::get_env("HOME") .or_else(|| Platform::get_env("USERPROFILE")) .unwrap_or_else(|| "/".to_string()); @@ -298,22 +312,26 @@ impl Application { // abort when we reach the home dir or top of the filesystem while dirname(&dir) != dir && dir != home { - if file_exists(&format!("{}/{}", dir, Factory::get_composer_file())) { + if file_exists(&format!( + "{}/{}", + dir, + Factory::get_composer_file().unwrap_or_default() + )) { if use_parent_dir_if_no_json_available.as_bool() != Some(true) - && !io.is_interactive() + && !self.io.is_interactive() { - io.write_error(&format!("<info>No composer.json in current directory, to use the one at {} run interactively or set config.use-parent-dir to true</info>", dir)); + self.io.write_error(&format!("<info>No composer.json in current directory, to use the one at {} run interactively or set config.use-parent-dir to true</info>", dir)); break; } if use_parent_dir_if_no_json_available.as_bool() == Some(true) - || io.ask_confirmation(format!("<info>No composer.json in current directory, do you want to use the one at {}?</info> [<comment>y,n</comment>]? ", dir), true) + || self.io.ask_confirmation(format!("<info>No composer.json in current directory, do you want to use the one at {}?</info> [<comment>y,n</comment>]? ", dir), true) { if use_parent_dir_if_no_json_available.as_bool() == Some(true) { - io.write_error(&format!("<info>No composer.json in current directory, changing working directory to {}</info>", dir)); + self.io.write_error(&format!("<info>No composer.json in current directory, changing working directory to {}</info>", dir)); } else { - io.write_error("<info>Always want to use the parent dir? Use \"composer config --global use-parent-dir true\" to change the default.</info>"); + self.io.write_error("<info>Always want to use the parent dir? Use \"composer config --global use-parent-dir true\" to change the default.</info>"); } - old_working_dir = Some(Platform::get_cwd_real(true)); + old_working_dir = Some(Platform::get_cwd(true).unwrap_or_default()); chdir(&dir); } break; @@ -360,12 +378,16 @@ impl Application { // avoid loading plugins/initializing the Composer instance earlier than necessary if no plugin command is needed // if showing the version, we never need plugin commands - let may_need_plugin_command = !input - .has_parameter_option_array(&vec!["--version".to_string(), "-V".to_string()], false) + let mnp_list = PhpMixed::List(vec![ + Box::new(PhpMixed::String("".to_string())), + Box::new(PhpMixed::String("list".to_string())), + Box::new(PhpMixed::String("help".to_string())), + ]); + let may_need_plugin_command = !input.has_parameter_option(&["--version", "-V"], false) && (command_name.is_none() || in_array( - command_name.as_deref().unwrap_or(""), - &vec!["".to_string(), "list".to_string(), "help".to_string()], + command_name.as_deref().unwrap_or("").into(), + &mnp_list, true, ) || (command_name.as_deref() == Some("_complete") && !is_non_allowed_root)); @@ -379,10 +401,10 @@ impl Application { // at this point plugins are needed, so if we are running as root and it is not allowed we need to prompt // if interactive, and abort otherwise if is_non_allowed_root { - io.write_error("<warning>Do not run Composer as root/super user! See https://getcomposer.org/root for details</warning>"); + self.io.write_error("<warning>Do not run Composer as root/super user! See https://getcomposer.org/root for details</warning>"); - if io.is_interactive() - && io.ask_confirmation( + if self.io.is_interactive() + && self.io.ask_confirmation( "<info>Continue as root/super user</info> [<comment>yes</comment>]? " .to_string(), true, @@ -391,23 +413,29 @@ impl Application { // avoid a second prompt later is_non_allowed_root = false; } else { - io.write_error("<warning>Aborting as no plugin should be loaded if running as super user is not explicitly allowed</warning>"); + self.io.write_error("<warning>Aborting as no plugin should be loaded if running as super user is not explicitly allowed</warning>"); return Ok(1); } } + // TODO(phase-b): the original PHP catches plugin discovery exceptions in a + // try/catch. The Rust port keeps the loop but skips IO error reporting + // because get_plugin_commands borrows &mut self, conflicting with io. + let mut plugin_warnings: Vec<String> = Vec::new(); match (|| -> anyhow::Result<()> { for command in self.get_plugin_commands()? { - if self.inner.has(&command.get_name()) { - io.write_error(&format!("<warning>Plugin command {} ({}) would override a Composer command and has been skipped</warning>", command.get_name(), get_class(&*command))); + let cmd_name = command.get_name().unwrap_or_default(); + if self.inner.has(&cmd_name) { + // TODO(phase-b): get_class needs a Command-aware overload; default + // to a placeholder while the trait downcast story is settled. + let cls = String::new(); + plugin_warnings.push(format!("<warning>Plugin command {} ({}) would override a Composer command and has been skipped</warning>", cmd_name, cls)); } else { // Compatibility layer for symfony/console <7.4 - if method_exists(&self.inner, "addCommand") { - self.inner.add_command(command); - } else { - self.inner.add(command); - } + // TODO(phase-b): add_command/add accept PhpMixed; the symfony + // stubs do not yet expose typed command insertion. + let _ = command; } } Ok(()) @@ -417,9 +445,10 @@ impl Application { if e.downcast_ref::<NoSslException>().is_some() { // suppress these as they are not relevant at this point } else if let Some(pe) = e.downcast_ref::<ParsingException>() { - let details = pe.get_details(); + // TODO(phase-b): ParsingException::get_details is not yet ported. + let details: IndexMap<String, PhpMixed> = IndexMap::new(); - let file = realpath(&Factory::get_composer_file()); + let file = realpath(&Factory::get_composer_file().unwrap_or_default()); let mut line: Option<i64> = None; if !details.is_empty() { @@ -437,38 +466,40 @@ impl Application { } } } + for warning in &plugin_warnings { + self.io.write_error(warning); + } self.has_plugin_commands = true; } - if !self.disable_plugins_by_default && is_non_allowed_root && !io.is_interactive() { - io.write_error("<error>Composer plugins have been disabled for safety in this non-interactive session.</error>"); - io.write_error("<error>Set COMPOSER_ALLOW_SUPERUSER=1 if you want to allow plugins to run as root/super user.</error>"); + if !self.disable_plugins_by_default && is_non_allowed_root && !self.io.is_interactive() { + self.io.write_error("<error>Composer plugins have been disabled for safety in this non-interactive session.</error>"); + self.io.write_error("<error>Set COMPOSER_ALLOW_SUPERUSER=1 if you want to allow plugins to run as root/super user.</error>"); self.disable_plugins_by_default = true; } // determine command name to be executed incl plugin commands, and check if it's a proxy command - let mut is_proxy_command = false; + let is_proxy_command = false; if let Some(ref name) = self.get_command_name_before_binding(input) { if let Ok(command) = self.inner.find(name) { - command_name = Some(command.get_name()); - is_proxy_command = command - .as_any() - .downcast_ref::<BaseCommand>() - .map(|bc| bc.is_proxy_command()) - .unwrap_or(false); + // TODO(phase-b): BaseApplication::find returns PhpMixed; we cannot yet + // extract a typed command name or detect proxy commands without the + // command trait downcast story. + let _ = command; + command_name = Some(String::new()); } } if !is_proxy_command { - io.write_error3( + self.io.write_error3( &sprintf( "Running %s (%s) with %s on %s", &[ Composer::get_version().into(), Composer::RELEASE_DATE.into(), (if defined("HHVM_VERSION") { - format!("HHVM {}", shirabe_php_shim::HHVM_VERSION) + format!("HHVM {}", shirabe_php_shim::HHVM_VERSION.unwrap_or("")) } else { format!("PHP {}", PHP_VERSION) }) @@ -486,13 +517,13 @@ impl Application { ); if PHP_VERSION_ID < 70205 { - io.write_error(&format!("<warning>Composer supports PHP 7.2.5 and above, you will most likely encounter problems with your PHP {}. Upgrading is strongly recommended but you can use Composer 2.2.x LTS as a fallback.</warning>", PHP_VERSION)); + self.io.write_error(&format!("<warning>Composer supports PHP 7.2.5 and above, you will most likely encounter problems with your PHP {}. Upgrading is strongly recommended but you can use Composer 2.2.x LTS as a fallback.</warning>", PHP_VERSION)); } if XdebugHandler::is_xdebug_active() && Platform::get_env("COMPOSER_DISABLE_XDEBUG_WARN").is_none() { - io.write_error("<warning>Composer is operating slower than normal because you have Xdebug enabled. See https://getcomposer.org/xdebug</warning>"); + self.io.write_error("<warning>Composer is operating slower than normal because you have Xdebug enabled. See https://getcomposer.org/xdebug</warning>"); } if defined("COMPOSER_DEV_WARNING_TIME") @@ -500,7 +531,7 @@ impl Application { && command_name.as_deref() != Some("selfupdate") && time() > shirabe_php_shim::composer_dev_warning_time() { - io.write_error(&sprintf( + self.io.write_error(&sprintf( "<warning>Warning: This development build of Composer is over 60 days old. It is recommended to update it by running \"%s self-update\" to get the latest version.</warning>", &[shirabe_php_shim::server_get("PHP_SELF").unwrap_or_default().into()], )); @@ -511,10 +542,10 @@ impl Application { && command_name.as_deref() != Some("selfupdate") && command_name.as_deref() != Some("_complete") { - io.write_error("<warning>Do not run Composer as root/super user! See https://getcomposer.org/root for details</warning>"); + self.io.write_error("<warning>Do not run Composer as root/super user! See https://getcomposer.org/root for details</warning>"); - if io.is_interactive() { - if !io.ask_confirmation( + if self.io.is_interactive() { + if !self.io.ask_confirmation( "<info>Continue as root/super user</info> [<comment>yes</comment>]? " .to_string(), true, @@ -526,7 +557,7 @@ impl Application { } // Check system temp folder for usability as it can cause weird runtime issues otherwise - let _ = Silencer::call(|| { + let tempfile_msg: Option<String> = Silencer::call(|| -> anyhow::Result<Option<String>> { let pid = if function_exists("getmypid") { format!("{}-", getmypid()) } else { @@ -538,21 +569,27 @@ impl Application { pid, bin2hex(&random_bytes(5)) ); - if !(file_put_contents(&tempfile, file!()) > 0 + if !(file_put_contents(&tempfile, file!().as_bytes()).is_some_and(|n| n > 0) && file_get_contents(&tempfile).as_deref() == Some(file!()) && unlink(&tempfile) && !file_exists(&tempfile)) { - io.write_error(&sprintf("<error>PHP temp directory (%s) does not exist or is not writable to Composer. Set sys_temp_dir in your php.ini</error>", &[sys_get_temp_dir().into()])); + return Ok(Some(sprintf("<error>PHP temp directory (%s) does not exist or is not writable to Composer. Set sys_temp_dir in your php.ini</error>", &[sys_get_temp_dir().into()]))); } - Ok(()) - }); + Ok(None) + }) + .ok() + .flatten(); + if let Some(msg) = tempfile_msg { + self.io.write_error(&msg); + } // add non-standard scripts as own commands - let file = Factory::get_composer_file(); + let file = Factory::get_composer_file().unwrap_or_default(); if may_need_script_command && is_file(&file) && Filesystem::is_readable(&file) { - let composer_json = - json_decode(&file_get_contents(&file).unwrap_or_default(), true); + let composer_json: PhpMixed = + json_decode(&file_get_contents(&file).unwrap_or_default(), true) + .unwrap_or(PhpMixed::Null); if let Some(arr) = composer_json.as_array() { if let Some(scripts) = arr.get("scripts").and_then(|v| v.as_array()) { for (script, dummy) in scripts { @@ -562,7 +599,7 @@ impl Application { ); if !defined(&script_event_const) { if self.inner.has(script) { - io.write_error(&format!("<warning>A script named {} would override a Composer command and has been skipped</warning>", script)); + self.io.write_error(&format!("<warning>A script named {} would override a Composer command and has been skipped</warning>", script)); } else { let mut description = format!( "Runs the {} script as defined in composer.json", @@ -596,13 +633,14 @@ impl Application { let root_package = composer.get_package(); let generator = composer.get_autoload_generator(); - let package_map = generator.build_package_map( - composer.get_installation_manager(), - &*root_package, - vec![], - )?; + // TODO(phase-b): build_package_map needs &mut InstallationManager + // but get_composer returns &Composer; skip until shared ownership is settled. + let package_map: Vec<( + Box<dyn crate::package::package_interface::PackageInterface>, + Option<String>, + )> = todo!("build_package_map requires &mut InstallationManager"); let map = generator.parse_autoloads( - &package_map, + package_map, &*root_package, PhpMixed::Bool(false), ); @@ -620,55 +658,51 @@ impl Application { } // if the command is not an array of commands, and points to a valid Command subclass, import its details directly - let dummy_str = dummy.as_string().unwrap_or(""); - let cmd: Box<dyn Command> = if is_string(dummy) - && shirabe_php_shim::class_exists(dummy_str) + let dummy_str = dummy.as_string().unwrap_or("").to_string(); + let cmd: PhpMixed = if is_string(dummy) + && shirabe_php_shim::class_exists(&dummy_str) && is_subclass_of( - dummy_str, + &PhpMixed::String(dummy_str.clone()), "Symfony\\Component\\Console\\Command\\Command", + true, ) { if is_subclass_of( - dummy_str, + &PhpMixed::String(dummy_str.clone()), "Symfony\\Component\\Console\\SingleCommandApplication", + true, ) { - io.write_error(&format!("<warning>The script named {} extends SingleCommandApplication which is not compatible with Composer 2.9+, make sure you extend Symfony\\Component\\Console\\Command instead.</warning>", script)); + self.io.write_error(&format!("<warning>The script named {} extends SingleCommandApplication which is not compatible with Composer 2.9+, make sure you extend Symfony\\Component\\Console\\Command instead.</warning>", script)); } - let mut cmd = shirabe_php_shim::instantiate_class::< - Box<dyn Command>, - >( - dummy_str, + let mut cmd = shirabe_php_shim::instantiate_class( + &dummy_str, vec![PhpMixed::String(script.clone())], ); - let _ = SingleCommandApplication::class_name(); + // TODO(phase-b): SingleCommandApplication has no class_name() yet. + let _ = SingleCommandApplication::new; // makes sure the command is find()'able by the name defined in composer.json, and the name isn't overridden in its configure() - let name = cmd.get_name(); - if !name.is_empty() && name != *script { - io.write_error(&format!("<warning>The script named {} in composer.json has a mismatched name in its class definition. For consistency, either use the same name, or do not define one inside the class.</warning>", script)); - cmd.set_name(script); - } - - if cmd.get_description().is_empty() - && is_string(&PhpMixed::String(description.clone())) - { - cmd.set_description(&description); - } + // TODO(phase-b): cmd is PhpMixed; get_name/set_name/get_description/set_description + // require the command trait to be unwrapped. Defer until that lands. + let _ = description.clone(); + let _ = &mut cmd; cmd } else { // fallback to usual aliasing behavior - Box::new(ScriptAliasCommand::new( + // TODO(phase-b): ScriptAliasCommand returns Result; bury it + // into PhpMixed::Null until the command-as-PhpMixed path is + // replaced by a typed trait object. + let _ = ScriptAliasCommand::new( script.clone(), - description.clone(), + Some(description.clone()), aliases, - )) + ); + PhpMixed::Null }; // Compatibility layer for symfony/console <7.4 - if method_exists(&self.inner, "addCommand") { - self.inner.add_command(cmd); - } else { - self.inner.add(cmd); - } + // TODO(phase-b): add_command/add take PhpMixed but expect a + // command instance; pending typed-command rewiring. + let _ = self.inner.add(cmd); } } } @@ -681,19 +715,20 @@ impl Application { let result_outcome: anyhow::Result<i64> = (|| -> anyhow::Result<i64> { if input.has_parameter_option(&["--profile"], false) { start_time = Some(microtime(true)); - self.io.enable_debugging(start_time.unwrap()); + // TODO(phase-b): enable_debugging is defined only on ConsoleIO, not + // through IOInterface. Skip until the IO concrete type is known here. + let _ = start_time.unwrap(); } - let result = self.inner.do_run(input, output)?; + // TODO(phase-b): BaseApplication exposes only `run`, not `do_run`. + let result: i64 = todo!("BaseApplication::do_run"); - if input - .has_parameter_option_array(&vec!["--version".to_string(), "-V".to_string()], true) - { - io.write_error(&sprintf( + if input.has_parameter_option(&["--version", "-V"], true) { + self.io.write_error(&sprintf( "<info>PHP</info> version <comment>%s</comment> (%s)", &[PHP_VERSION.into(), PHP_BINARY.into()], )); - io.write_error( + self.io.write_error( "Run the \"diagnose\" command to get more detailed diagnostics output.", ); } @@ -713,7 +748,7 @@ impl Application { } if let Some(st) = start_time { - io.write_error(&format!( + self.io.write_error(&format!( "<info>Memory usage: {}MiB (peak: {}MiB), time: {}s</info>", round((memory_get_usage() as f64) / 1024.0 / 1024.0, 2), round((memory_get_peak_usage(true) as f64) / 1024.0 / 1024.0, 2), @@ -729,8 +764,8 @@ impl Application { && self.is_running_as_root() && !self.io.is_interactive() { - io.write_error3("<error>Plugins have been disabled automatically as you are running as root, this may be the cause of the script failure.</error>", true, io_interface::QUIET); - io.write_error3( + self.io.write_error3("<error>Plugins have been disabled automatically as you are running as root, this may be the cause of the script failure.</error>", true, io_interface::QUIET); + self.io.write_error3( "<error>See also https://getcomposer.org/root</error>", true, io_interface::QUIET, @@ -744,15 +779,13 @@ impl Application { self.hint_common_errors(&e, output); - if !method_exists(&self.inner, "setCatchErrors") { - if let Some(coi) = - output.as_any().downcast_ref::<dyn ConsoleOutputInterface>() - { - self.inner.render_throwable(&e, coi.get_error_output()); - } else { - self.inner.render_throwable(&e, output); - } - + // TODO(phase-b): method_exists/as_any on the inner application and + // output trait objects are not yet supported; replicate the catch-all + // branch unconditionally. + if false { + let _ = <dyn ConsoleOutputInterface>::is_console_output_interface; + // self.inner.render_throwable expects &mut dyn OutputInterface. + // Skipped while output is &dyn OutputInterface here. let code = e .downcast_ref::<RuntimeException>() .map(|r| r.code) @@ -782,11 +815,7 @@ impl Application { fn get_new_working_dir(&self, input: &dyn InputInterface) -> anyhow::Result<Option<String>> { let working_dir = input - .get_parameter_option( - &vec!["--working-dir".to_string(), "-d".to_string()], - None, - true, - ) + .get_parameter_option(&["--working-dir", "-d"], PhpMixed::Null, true) .as_string() .map(|s| s.to_string()); if let Some(ref wd) = working_dir { @@ -805,16 +834,16 @@ impl Application { Ok(working_dir) } - fn hint_common_errors(&self, exception: &anyhow::Error, output: &dyn OutputInterface) { - let io = self.get_io(); - + fn hint_common_errors(&mut self, exception: &anyhow::Error, output: &dyn OutputInterface) { let is_logic_or_error = exception.downcast_ref::<ShimLogicException>().is_some(); if is_logic_or_error && output.get_verbosity() < output_interface::VERBOSITY_VERBOSE { output.set_verbosity(output_interface::VERBOSITY_VERBOSE); } Silencer::suppress(None); - let _ = (|| -> anyhow::Result<()> { + // Compute the disk-space hint message first; emit it via io afterwards to + // avoid overlapping borrows of self (get_composer needs &mut self). + let disk_hint_msg: Option<String> = (|| -> anyhow::Result<Option<String>> { let composer = self.get_composer(false, Some(true), None)?; if composer.is_some() && function_exists("disk_free_space") { let composer = composer.unwrap(); @@ -845,13 +874,20 @@ impl Application { hit = df.map(|d| d < min_space_free).unwrap_or(false); } if hit { - io.write_error3(&format!("<error>The disk hosting {} has less than 100MiB of free space, this may be the cause of the following exception</error>", dir), true, io_interface::QUIET); + return Ok(Some(format!("<error>The disk hosting {} has less than 100MiB of free space, this may be the cause of the following exception</error>", dir))); } } - Ok(()) - })(); + Ok(None) + })() + .ok() + .flatten(); Silencer::restore(); + let io = self.get_io(); + if let Some(msg) = &disk_hint_msg { + io.write_error3(msg, true, io_interface::QUIET); + } + let message = exception.to_string(); if exception.downcast_ref::<TransportException>().is_some() && str_contains(&message, "Unable to use a proxy") @@ -869,13 +905,13 @@ impl Application { && str_contains(&message, "unable to get local issuer certificate") { let avast_detect = glob("C:\\Program Files\\Avast*"); - if is_array(&PhpMixed::List( + let avast_detect_pm = PhpMixed::List( avast_detect .iter() .map(|s| Box::new(PhpMixed::String(s.clone()))) .collect(), - )) && count(&avast_detect) != 0 - { + ); + if is_array(&avast_detect_pm) && count(&avast_detect_pm) != 0 { io.write_error3("<error>The following exception indicates a possible issue with the Avast Firewall</error>", true, io_interface::QUIET); io.write_error3( "<error>Check https://getcomposer.org/local-issuer for details</error>", @@ -929,8 +965,8 @@ impl Application { io.write_error3("<error>Plugins have been disabled, which may be why some commands are missing, unless you made a typo</error>", true, io_interface::QUIET); } - let hints = HttpDownloader::get_exception_hints_from_error(exception); - if !hints.is_empty() && count(&hints) > 0 { + let hints = HttpDownloader::get_exception_hints(exception).unwrap_or_default(); + if !hints.is_empty() { for hint in &hints { io.write_error3(hint, true, io_interface::QUIET); } @@ -952,7 +988,17 @@ impl Application { } else { self.io.clone_box() }; - match Factory::create(io_for_factory, None, disable_plugins, disable_scripts) { + let disable_plugins_enum = if disable_plugins { + crate::factory::DisablePlugins::All + } else { + crate::factory::DisablePlugins::None + }; + match Factory::create( + &*io_for_factory, + None, + disable_plugins_enum, + disable_scripts, + ) { Ok(c) => self.composer = Some(c), Err(e) => { if e.downcast_ref::<JsonValidationException>().is_some() @@ -964,9 +1010,8 @@ impl Application { } else { if required { self.io.write_error(&e.to_string()); - if self.inner.are_exceptions_caught() { - std::process::exit(1); - } + // TODO(phase-b): BaseApplication::are_exceptions_caught not yet + // available; fall through to returning the error. return Err(e); } } @@ -980,9 +1025,13 @@ impl Application { /// Removes the cached composer instance pub fn reset_composer(&mut self) { self.composer = None; - if method_exists(&*self.io, "resetAuthentications") { - self.io.reset_authentications(); - } + // TODO(phase-b): reset_authentications is defined on BaseIO not IOInterface; + // skipped until the cross-trait dispatch story is settled. + } + + /// Delegates to the underlying BaseApplication's `find` method (PHP Symfony Console). + pub fn find(&self, _name: &str) -> anyhow::Result<shirabe_php_shim::PhpMixed> { + todo!() } pub fn get_io(&self) -> &dyn IOInterface { @@ -990,7 +1039,8 @@ impl Application { } pub fn get_help(&self) -> String { - format!("{}{}", Self::LOGO, self.inner.get_help()) + // TODO(phase-b): BaseApplication::get_help is not yet exposed via the stub. + format!("{}{}", Self::LOGO, "") } /// Initializes all the composer commands. @@ -998,16 +1048,18 @@ impl Application { // TODO(phase-b): each shirabe command struct needs its own `impl Command` (the orphan // rule disallowed a blanket `impl<C: HasBaseCommandData> Command for C`). Until those // are written, expose only the inner symfony defaults. - self.inner.get_default_commands() + // TODO(phase-b): BaseApplication::get_default_commands is not yet exposed. + vec![] } /// This ensures we can find the correct command name even if a global input option is present before it fn get_command_name_before_binding(&self, input: &dyn InputInterface) -> Option<String> { let mut input = clone(&input); // Makes ArgvInput::getFirstArgument() able to distinguish an option from an argument. - let _ = input.bind(&self.inner.get_definition()); - - input.get_first_argument() + // TODO(phase-b): BaseApplication::get_definition returns PhpMixed, not InputDefinition. + let _ = input; + let _ = self.inner.get_definition(); + None } pub fn get_long_version(&self) -> String { @@ -1033,95 +1085,68 @@ impl Application { } pub(crate) fn get_default_input_definition(&self) -> InputDefinition { - let mut definition = self.inner.get_default_input_definition(); - definition.add_option(InputOption::new( + // TODO(phase-b): BaseApplication::get_default_input_definition is not yet exposed. + let mut definition = InputDefinition::new(vec![]); + let _ = InputOption::new( "--profile", None, Some(InputOption::VALUE_NONE), "Display timing and memory usage information", - None, - vec![], - )); - definition.add_option(InputOption::new( + PhpMixed::Null, + ); + definition.add_option(PhpMixed::Null); + let _ = InputOption::new( "--no-plugins", None, Some(InputOption::VALUE_NONE), "Whether to disable plugins.", - None, - vec![], - )); - definition.add_option(InputOption::new( + PhpMixed::Null, + ); + definition.add_option(PhpMixed::Null); + let _ = InputOption::new( "--no-scripts", None, Some(InputOption::VALUE_NONE), "Skips the execution of all scripts defined in composer.json file.", - None, - vec![], - )); - definition.add_option(InputOption::new( + PhpMixed::Null, + ); + definition.add_option(PhpMixed::Null); + let _ = InputOption::new( "--working-dir", Some("-d"), Some(InputOption::VALUE_REQUIRED), "If specified, use the given directory as working directory.", - None, - vec![], - )); - definition.add_option(InputOption::new( + PhpMixed::Null, + ); + definition.add_option(PhpMixed::Null); + let _ = InputOption::new( "--no-cache", None, Some(InputOption::VALUE_NONE), "Prevent use of the cache", - None, - vec![], - )); + PhpMixed::Null, + ); + definition.add_option(PhpMixed::Null); definition } fn get_plugin_commands(&mut self) -> anyhow::Result<Vec<Box<dyn Command>>> { // TODO(plugin): plugin command discovery is part of the plugin API - let mut commands: Vec<Box<dyn Command>> = vec![]; + let commands: Vec<Box<dyn Command>> = vec![]; - let composer = self.get_composer(false, Some(false), None)?.cloned(); - let composer = match composer { - Some(c) => Some(c), - None => Factory::create_global( - &*self.io, - self.disable_plugins_by_default, - self.disable_scripts_by_default, - ), + // TODO(phase-b): Composer is a PHP class (no Clone) and the plugin manager + // pathway needs PluginCapability downcasting. Defer the full implementation + // until those are available; for now return the empty command list. + let _ = self.get_composer(false, Some(false), None)?; + let _ = UnexpectedValueException { + message: String::new(), + code: 0, }; - - if let Some(composer) = composer { - let pm = composer.get_plugin_manager(); - let mut ctor_args: IndexMap<String, PhpMixed> = IndexMap::new(); - ctor_args.insert( - "composer".to_string(), - PhpMixed::Object(shirabe_php_shim::ArrayObject::new(None)), - ); - ctor_args.insert( - "io".to_string(), - PhpMixed::Object(shirabe_php_shim::ArrayObject::new(None)), - ); - for capability in pm - .get_plugin_capabilities("Composer\\Plugin\\Capability\\CommandProvider", ctor_args) - { - // TODO(phase-b): downcast to CommandProvider via Any/trait-object instead of todo!() - let new_commands: Vec<Box<dyn crate::command::base_command::BaseCommand>> = - todo!("downcast capability to CommandProvider and call get_commands()"); - let _ = capability; - for command in &new_commands { - if command.as_any().downcast_ref::<BaseCommand>().is_none() { - return Err(UnexpectedValueException { - message: format!("Plugin capability {} returned an invalid value, we expected an array of Composer\\Command\\BaseCommand objects", get_class(&*capability)), - code: 0, - } - .into()); - } - } - commands = array_merge(commands, new_commands); - } - } + let _: fn(PhpMixed, PhpMixed) -> PhpMixed = array_merge; + let _: fn(&PhpMixed) -> String = get_class; + let _ = shirabe_php_shim::ArrayObject::new(None); + let _: IndexMap<String, PhpMixed> = IndexMap::new(); Ok(commands) } @@ -1140,7 +1165,7 @@ impl Application { } fn get_use_parent_dir_config_value(&self) -> PhpMixed { - let config = match Factory::create_config(Some(&*self.io)) { + let config = match Factory::create_config(Some(&*self.io), None) { Ok(c) => c, Err(_) => return PhpMixed::Bool(false), }; diff --git a/crates/shirabe/src/dependency_resolver/lock_transaction.rs b/crates/shirabe/src/dependency_resolver/lock_transaction.rs index aa49d17..ef49bd8 100644 --- a/crates/shirabe/src/dependency_resolver/lock_transaction.rs +++ b/crates/shirabe/src/dependency_resolver/lock_transaction.rs @@ -38,7 +38,11 @@ impl LockTransaction { result_packages: IndexMap::new(), }; this.set_result_packages(pool, decisions); - let all = this.result_packages.get("all").cloned().unwrap_or_default(); + let all: Vec<Box<dyn PackageInterface>> = this + .result_packages + .get("all") + .map(|v| v.iter().map(|p| p.clone_package_box()).collect()) + .unwrap_or_default(); let present: Vec<Box<dyn PackageInterface>> = this .present_map .values() @@ -54,8 +58,8 @@ impl LockTransaction { result_packages.insert("non-dev".to_string(), vec![]); result_packages.insert("dev".to_string(), vec![]); - for decision in decisions.iter() { - let literal = decision[Decisions::DECISION_LITERAL]; + for decision in decisions.decision_queue.iter() { + let literal = decision.0; if literal > 0 { let package = pool.literal_to_package(literal); @@ -120,7 +124,11 @@ impl LockTransaction { continue; } - if update_mirrors && !self.present_map.contains_key(&package.get_object_hash()) { + if update_mirrors + && !self + .present_map + .contains_key(&shirabe_php_shim::spl_object_hash(package.as_ref())) + { let updated = self.update_mirror_and_urls(package.as_ref()); packages.push(updated); } else { @@ -150,8 +158,11 @@ impl LockTransaction { } if let Some(concrete_pkg) = present_package.as_any().downcast_ref::<Package>() { - concrete_pkg.set_source_url(package.get_source_url()); - concrete_pkg.set_source_mirrors(package.get_source_mirrors()); + // TODO(phase-b): set_source_url/set_source_mirrors expect &mut and owned types; + // present_package is &Box<dyn PackageInterface> (immutable). Revisit ownership. + let _ = concrete_pkg; + let _ = package.get_source_url().map(|s| s.to_string()); + let _ = package.get_source_mirrors(); } if present_package.get_dist_type() != package.get_dist_type() { @@ -168,9 +179,11 @@ impl LockTransaction { package.get_dist_url().unwrap(), ) .unwrap_or_else(|_| package.get_dist_url().unwrap().to_string()); - present_package.set_dist_url(Some(new_dist_url)); + // TODO(phase-b): set_dist_url requires &mut PackageInterface; revisit ownership. + let _ = new_dist_url; } - present_package.set_dist_mirrors(package.get_dist_mirrors()); + // TODO(phase-b): set_dist_mirrors requires &mut PackageInterface; revisit ownership. + let _ = package.get_dist_mirrors(); return present_package.clone_package_box(); } diff --git a/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs b/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs index 14ece50..e2b781c 100644 --- a/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs +++ b/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs @@ -143,6 +143,10 @@ impl Rule for MultiConflictRule { fn is_assertion(&self) -> bool { todo!() } + + fn as_multi_conflict(&self) -> Option<&MultiConflictRule> { + Some(self) + } } impl std::fmt::Display for MultiConflictRule { diff --git a/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs b/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs index f90649d..5eb955a 100644 --- a/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs +++ b/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs @@ -28,4 +28,10 @@ pub trait OperationInterface: std::fmt::Debug { fn as_uninstall_operation(&self) -> Option<&UninstallOperation> { None } + + /// PHP duck-typed accessor. Only InstallOperation/UninstallOperation/MarkAlias*Operation + /// expose this; UpdateOperation has getInitialPackage()/getTargetPackage() instead. + fn get_package(&self) -> &dyn crate::package::package_interface::PackageInterface { + todo!("get_package is not available on this operation type") + } } diff --git a/crates/shirabe/src/dependency_resolver/pool.rs b/crates/shirabe/src/dependency_resolver/pool.rs index a194d15..9b52ba7 100644 --- a/crates/shirabe/src/dependency_resolver/pool.rs +++ b/crates/shirabe/src/dependency_resolver/pool.rs @@ -214,7 +214,7 @@ impl Pool { /// Retrieves the package object for a given package id. pub fn package_by_id(&self, id: i64) -> &dyn BasePackage { - &self.packages[(id - 1) as usize] + self.packages[(id - 1) as usize].as_ref() } /// Searches all packages providing the given package name and match the constraint @@ -230,7 +230,7 @@ impl Pool { ) -> Vec<Box<dyn BasePackage>> { // PHP: $key = (string) $constraint; let key = match constraint { - Some(c) => c.to_string(), + Some(c) => c.__to_string(), None => String::new(), }; if let Some(by_key) = self.provider_cache.get(name) { @@ -251,7 +251,7 @@ impl Pool { /// @param ?ConstraintInterface $constraint A constraint that all returned /// packages must match or null to return all /// @return BasePackage[] - fn compute_what_provides( + pub(crate) fn compute_what_provides( &self, name: &str, constraint: Option<&dyn ConstraintInterface>, @@ -281,11 +281,11 @@ impl Pool { pub fn literal_to_pretty_string( &self, literal: i64, - installed_map: &IndexMap<i64, Box<dyn BasePackage>>, + installed_map: &IndexMap<String, Box<dyn BasePackage>>, ) -> String { let package = self.literal_to_package(literal); - let prefix = if installed_map.contains_key(&package.id()) { + let prefix = if installed_map.contains_key(&package.id().to_string()) { if literal > 0 { "keep" } else { "remove" } } else { if literal > 0 { @@ -316,7 +316,7 @@ impl Pool { || CompilingMatcher::r#match( constraint.unwrap(), Constraint::OP_EQ, - candidate_version, + candidate_version.to_string(), ); } diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs index 3043aaa..a790dfc 100644 --- a/crates/shirabe/src/dependency_resolver/pool_builder.rs +++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs @@ -7,8 +7,9 @@ use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::composer::semver::compiling_matcher::CompilingMatcher; use shirabe_external_packages::composer::semver::intervals::Intervals; use shirabe_php_shim::{ - LogicException, PhpMixed, array_chunk, array_flip, array_map, array_merge, array_search, count, - in_array, microtime, number_format, round, spl_object_hash, sprintf, strpos, + LogicException, PhpMixed, array_chunk, array_flip, array_flip_strings, array_map, array_merge, + array_search, array_search_mixed, count, in_array, microtime, number_format, round, + spl_object_hash, sprintf, strpos, }; use shirabe_semver::constraint::constraint::Constraint; use shirabe_semver::constraint::constraint_interface::ConstraintInterface; @@ -41,7 +42,7 @@ pub struct PoolBuilder { root_aliases: IndexMap<String, IndexMap<String, IndexMap<String, String>>>, root_references: IndexMap<String, String>, temporary_constraints: IndexMap<String, Box<dyn ConstraintInterface>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, pool_optimizer: Option<PoolOptimizer>, io: Box<dyn IOInterface>, alias_map: IndexMap<String, IndexMap<i64, AliasPackage>>, @@ -85,7 +86,7 @@ impl PoolBuilder { root_aliases: IndexMap<String, IndexMap<String, IndexMap<String, String>>>, root_references: IndexMap<String, String>, io: Box<dyn IOInterface>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, pool_optimizer: Option<PoolOptimizer>, temporary_constraints: IndexMap<String, Box<dyn ConstraintInterface>>, security_advisory_pool_filter: Option<SecurityAdvisoryPoolFilter>, @@ -134,13 +135,18 @@ impl PoolBuilder { request: &mut Request, ) -> anyhow::Result<Pool> { self.restricted_packages_list = if request.get_restricted_packages().is_some() { - Some(array_flip(&request.get_restricted_packages().unwrap())) + Some( + array_flip_strings(request.get_restricted_packages().unwrap()) + .into_iter() + .map(|(k, v)| (k, v.as_int().unwrap_or(0))) + .collect(), + ) } else { None }; - if count(&request.get_update_allow_list()) > 0 { - self.update_allow_list = request.get_update_allow_list(); + if request.get_update_allow_list().len() > 0 { + self.update_allow_list = request.get_update_allow_list().clone(); self.warn_about_non_matching_update_allow_list(request)?; if request.get_locked_repository().is_none() { @@ -176,7 +182,10 @@ impl PoolBuilder { } } - request.lock_package(&*locked_package); + // TODO(phase-b): lock_package wants Box<dyn BasePackage>; locked_package is a + // PackageInterface trait object from CanonicalPackagesTrait::get_packages. The + // PHP code passes the same object; needs Rc<dyn BasePackage> migration. + request.lock_package(todo!("convert PackageInterface → Box<dyn BasePackage>")); } } } @@ -222,7 +231,7 @@ impl PoolBuilder { } } - for (package_name, constraint) in &request.get_requires() { + for (package_name, constraint) in request.get_requires() { // fixed and locked packages have already been added, so if a root require needs one of them, no need to do anything if self.loaded_packages.contains_key(package_name) { continue; @@ -244,11 +253,11 @@ impl PoolBuilder { self.packages_to_load.shift_remove(&name); } - while count(&self.packages_to_load) > 0 { + while self.packages_to_load.len() > 0 { self.load_packages_marked_for_loading(request, &repositories)?; } - if count(&self.temporary_constraints) > 0 { + if self.temporary_constraints.len() > 0 { let indices: Vec<i64> = self.packages.keys().cloned().collect(); for i in indices { let package = match self.packages.get(&i) { @@ -266,22 +275,20 @@ impl PoolBuilder { None => continue, }; - let mut package_and_aliases: IndexMap<i64, Box<dyn BasePackage>> = - IndexMap::new(); - package_and_aliases.insert(i, package.clone_box()); + // TODO(phase-b): package_and_aliases originally held Box<dyn BasePackage>; + // AliasPackage is a PHP class so we collect (index, version) tuples instead of + // cloning the alias objects. + let mut package_and_aliases: Vec<(i64, String)> = Vec::new(); + package_and_aliases.push((i, package.get_version().to_string())); if let Some(aliases) = self.alias_map.get(&spl_object_hash(&*package)) { for (idx, alias) in aliases { - package_and_aliases.insert(*idx, Box::new(alias.clone())); + package_and_aliases.push((*idx, alias.get_version().to_string())); } } let mut found = false; - for (_idx, package_or_alias) in &package_and_aliases { - if CompilingMatcher::matches( - &*constraint, - Constraint::OP_EQ, - package_or_alias.get_version(), - ) { + for (_idx, version) in &package_and_aliases { + if CompilingMatcher::matches(&*constraint, Constraint::OP_EQ, version) { found = true; } } @@ -296,11 +303,11 @@ impl PoolBuilder { } if self.event_dispatcher.is_some() { - // TODO(phase-b): PrePoolCreateEvent::new takes Request by value; placeholder until - // event API switches to a shared reference / Arc. + // TODO(phase-b): PrePoolCreateEvent::new takes Request and Vec<Box<dyn RepositoryInterface>> + // by value but neither can be cloned (PHP class shared semantics). Needs Rc-based migration. let mut pre_pool_create_event = PrePoolCreateEvent::new( PluginEvents::PRE_POOL_CREATE.to_string(), - repositories.clone(), + todo!("share repositories with PrePoolCreateEvent without moving"), todo!("share Request with PrePoolCreateEvent without moving"), self.acceptable_stabilities.clone(), self.stability_flags.clone(), @@ -314,18 +321,22 @@ impl PoolBuilder { ); // TODO(phase-b): EventDispatcher::dispatch expects an owned Event, not &mut PrePoolCreateEvent self.event_dispatcher - .as_mut() + .as_ref() .unwrap() + .borrow_mut() .dispatch(Some(pre_pool_create_event.get_name()), None)?; // PHP rebinds $this->packages to a list-style array; preserve indices via reindexing. self.packages = pre_pool_create_event .get_packages() - .into_iter() + .iter() .enumerate() - .map(|(i, p)| (i as i64, p)) + .map(|(i, p)| (i as i64, p.clone_box())) + .collect(); + self.unacceptable_fixed_or_locked_packages = pre_pool_create_event + .get_unacceptable_fixed_packages() + .iter() + .map(|p| p.clone_box()) .collect(); - self.unacceptable_fixed_or_locked_packages = - pre_pool_create_event.get_unacceptable_fixed_packages(); } let mut pool = Pool::new( @@ -334,6 +345,10 @@ impl PoolBuilder { .iter() .map(|p| p.clone_box()) .collect(), + IndexMap::new(), + IndexMap::new(), + IndexMap::new(), + IndexMap::new(), ); self.alias_map = IndexMap::new(); @@ -346,7 +361,7 @@ impl PoolBuilder { self.skipped_load = IndexMap::new(); self.index_counter = 0; - self.io.debug("Built pool."); + self.io.debug("Built pool.", &[]); // filter vulnerable packages before optimizing the pool otherwise we may end up with inconsistent state where the optimizer took away versions // that were not vulnerable and now suddenly the vulnerable ones are removed and we are missing some versions to make it solvable @@ -383,7 +398,7 @@ impl PoolBuilder { let root_requires = request.get_requires(); let mut constraint = constraint; if let Some(root_constraint) = root_requires.get(name) { - if !Intervals::is_subset_of(&*constraint, &**root_constraint)? { + if !Intervals::is_subset_of(&*constraint, &**root_constraint).unwrap_or(false) { constraint = root_constraint.clone_box(); } } @@ -400,10 +415,13 @@ impl PoolBuilder { } // extend the constraint to be loaded - constraint = Intervals::compact_constraint(MultiConstraint::create( - vec![existing.clone_box(), constraint.clone_box()], - false, - )); + constraint = Intervals::compact_constraint( + MultiConstraint::create( + vec![existing.clone_box(), constraint.clone_box()], + false, + ) + .unwrap_or_else(|_| Box::new(MatchAllConstraint::new())), + ); } self.packages_to_load.insert(name.to_string(), constraint); @@ -424,13 +442,16 @@ impl PoolBuilder { // yet so we get the required package versions self.packages_to_load.insert( name.to_string(), - Intervals::compact_constraint(MultiConstraint::create( - vec![ - self.loaded_packages.get(name).unwrap().clone_box(), - constraint, - ], - false, - )), + Intervals::compact_constraint( + MultiConstraint::create( + vec![ + self.loaded_packages.get(name).unwrap().clone_box(), + constraint, + ], + false, + ) + .unwrap_or_else(|_| Box::new(MatchAllConstraint::new())), + ), ); self.loaded_packages.shift_remove(name); } @@ -465,7 +486,21 @@ impl PoolBuilder { } // Load packages in chunks of 50 to prevent memory usage build-up due to caches of all sorts - let mut package_batches = array_chunk(&self.packages_to_load, Self::LOAD_BATCH_SIZE, true); + // TODO(phase-b): array_chunk shim signature expects &[T]; build IndexMap chunks manually. + let mut package_batches: Vec<IndexMap<String, Box<dyn ConstraintInterface>>> = { + let mut chunks: Vec<IndexMap<String, Box<dyn ConstraintInterface>>> = Vec::new(); + let mut current: IndexMap<String, Box<dyn ConstraintInterface>> = IndexMap::new(); + for (k, v) in self.packages_to_load.iter() { + current.insert(k.clone(), v.clone_box()); + if current.len() as i64 >= Self::LOAD_BATCH_SIZE { + chunks.push(std::mem::take(&mut current)); + } + } + if !current.is_empty() { + chunks.push(current); + } + chunks + }; self.packages_to_load = IndexMap::new(); for (repo_index, repository) in repositories.iter().enumerate() { @@ -484,63 +519,81 @@ impl PoolBuilder { continue; } - if 0 == count(&package_batches) { + if 0 == package_batches.len() { break; } - for (batch_index, package_batch) in package_batches.clone().iter().enumerate() { + // Iterate by index because we mutate package_batches inside the loop. + for batch_index in 0..package_batches.len() { + let package_batch: IndexMap<String, Option<Box<dyn ConstraintInterface>>> = + package_batches[batch_index] + .iter() + .map(|(k, v)| (k.clone(), Some(v.clone_box()))) + .collect(); let result = repository.load_packages( package_batch, - &self.acceptable_stabilities, - &self.stability_flags, + self.acceptable_stabilities.clone(), + self.stability_flags.clone(), self.loaded_per_repo .get(&(repo_index as i64)) - .cloned() + .map(|m| { + m.iter() + .map(|(k, inner)| { + ( + k.clone(), + inner + .iter() + .map(|(kk, vv)| (kk.clone(), vv.clone_package_box())) + .collect(), + ) + }) + .collect() + }) .unwrap_or_default(), ); - let names_found = result - .get("namesFound") - .and_then(|v| v.as_list()) - .cloned() - .unwrap_or_default(); + let names_found = result.names_found; for name in &names_found { // avoid loading the same package again from other repositories once it has been found if let Some(b) = package_batches.get_mut(batch_index) { - b.shift_remove(name.as_string().unwrap_or("")); + b.shift_remove(name); } } - let packages_in_result = result - .get("packages") - .and_then(|v| v.as_list()) - .cloned() - .unwrap_or_default(); + let packages_in_result = result.packages; for package in &packages_in_result { - let pkg = match package.as_package_interface() { - Some(p) => p, - None => continue, - }; - self.loaded_per_repo - .entry(repo_index as i64) - .or_insert_with(IndexMap::new) - .entry(pkg.get_name().to_string()) - .or_insert_with(IndexMap::new) - .insert(pkg.get_version().to_string(), pkg.clone_box()); + // TODO(phase-b): proper upcast Box<dyn BasePackage> → Box<dyn PackageInterface>; + // clone_box on BasePackage produces a BasePackage, while loaded_per_repo stores PackageInterface. + let pkg_name = package.get_name().to_string(); + let pkg_version = package.get_version().to_string(); + let pkg_type = package.get_type().to_string(); - if in_array(pkg.get_type(), &self.ignored_types, true) - || (self.allowed_types.is_some() - && !in_array( - pkg.get_type(), - self.allowed_types.as_ref().unwrap(), - true, - )) + let pkg_type_mixed: PhpMixed = pkg_type.clone().into(); + let ignored_mixed: PhpMixed = self + .ignored_types + .iter() + .cloned() + .map(PhpMixed::from) + .collect::<Vec<_>>() + .into(); + if in_array(pkg_type_mixed.clone(), &ignored_mixed, true) + || (self.allowed_types.is_some() && { + let allowed_mixed: PhpMixed = self + .allowed_types + .as_ref() + .unwrap() + .iter() + .cloned() + .map(PhpMixed::from) + .collect::<Vec<_>>() + .into(); + !in_array(pkg_type_mixed.clone(), &allowed_mixed, true) + }) { continue; } - if let Some(bp) = pkg.as_base_package() { - let propagate = !self.path_repo_unlocked.contains_key(pkg.get_name()); - self.load_package(request, repositories, &*bp, propagate)?; - } + let _ = (pkg_name, pkg_version); + let propagate = !self.path_repo_unlocked.contains_key(package.get_name()); + self.load_package(request, repositories, package.as_ref(), propagate)?; } } @@ -551,7 +604,21 @@ impl PoolBuilder { merged.insert(k.clone(), v.clone_box()); } } - package_batches = array_chunk(&merged, Self::LOAD_BATCH_SIZE, true); + // Rebuild chunks from merged. + package_batches = { + let mut chunks: Vec<IndexMap<String, Box<dyn ConstraintInterface>>> = Vec::new(); + let mut current: IndexMap<String, Box<dyn ConstraintInterface>> = IndexMap::new(); + for (k, v) in merged.iter() { + current.insert(k.clone(), v.clone_box()); + if current.len() as i64 >= Self::LOAD_BATCH_SIZE { + chunks.push(std::mem::take(&mut current)); + } + } + if !current.is_empty() { + chunks.push(current); + } + chunks + }; } Ok(()) } @@ -568,10 +635,13 @@ impl PoolBuilder { self.packages.insert(index, package.clone_box()); if let Some(alias) = package.as_alias_package() { + // TODO(phase-b): alias_map should hold shared references (Rc<AliasPackage>); AliasPackage + // is a PHP class and must not be cloned. + let _ = alias; self.alias_map .entry(spl_object_hash(alias.get_alias_of())) .or_insert_with(IndexMap::new) - .insert(index, alias.clone()); + .insert(index, todo!("share AliasPackage via Rc")); } let name = PackageInterface::get_name(package).to_string(); @@ -582,7 +652,10 @@ impl PoolBuilder { if let Some(reference) = self.root_references.get(&name) { // do not modify the references on already locked or fixed packages if !request.is_locked_package(package) && !request.is_fixed_package(package) { - package.set_source_dist_references(reference); + // TODO(phase-b): set_source_dist_references mutates the package; load_package takes + // `&dyn BasePackage`. PHP passes by reference (shared) and mutates in place. Needs + // either &mut dyn BasePackage propagation or Rc<RefCell<...>>. + let _ = reference; } } @@ -608,11 +681,15 @@ impl PoolBuilder { }; let alias_package: Box<dyn BasePackage> = if base_package.as_any().is::<CompletePackage>() { - Box::new(CompleteAliasPackage::new( - base_package.clone_box(), + // TODO(phase-b): CompleteAliasPackage does not yet impl BasePackage; also its + // constructor wants CompletePackage by value but BasePackage is a PHP class + // (shared). Needs Rc<CompletePackage> migration + BasePackage impl. + let _ = CompleteAliasPackage::new( + todo!("downcast Box<dyn BasePackage> to CompletePackage by value"), alias.get("alias_normalized").cloned().unwrap_or_default(), alias.get("alias").cloned().unwrap_or_default(), - )) + ); + todo!("CompleteAliasPackage must implement BasePackage") } else { Box::new(AliasPackage::new( base_package.clone_box(), @@ -627,10 +704,13 @@ impl PoolBuilder { self.index_counter += 1; self.packages.insert(new_index, alias_package.clone_box()); if let Some(ap) = alias_package.as_alias_package() { + // TODO(phase-b): alias_map should hold shared references (Rc<AliasPackage>); AliasPackage + // is a PHP class and must not be cloned. + let _ = ap; self.alias_map .entry(spl_object_hash(ap.get_alias_of())) .or_insert_with(IndexMap::new) - .insert(new_index, ap.clone()); + .insert(new_index, todo!("share AliasPackage via Rc")); } } @@ -648,7 +728,7 @@ impl PoolBuilder { let skipped_root_requires = self.get_skipped_root_requires(request, &require); if request.get_update_allow_transitive_root_dependencies() - || 0 == count(&skipped_root_requires) + || 0 == skipped_root_requires.len() { self.unlock_package(request, repositories, &require)?; self.mark_package_name_for_loading(request, &require, link_constraint); @@ -683,7 +763,7 @@ impl PoolBuilder { let skipped_root_requires = self.get_skipped_root_requires(request, &replace); if request.get_update_allow_transitive_root_dependencies() - || 0 == count(&skipped_root_requires) + || 0 == skipped_root_requires.len() { self.unlock_package(request, repositories, &replace)?; // the replaced package only needs to be loaded if something else requires it @@ -755,12 +835,10 @@ impl PoolBuilder { } /// Checks whether the update allow list allows this package in the lock file to be updated - fn is_update_allowed(&self, package: &dyn BasePackage) -> bool { + fn is_update_allowed(&self, package: &dyn PackageInterface) -> bool { for pattern in &self.update_allow_list { let pattern_regexp = base_package::package_name_to_regexp(pattern); - if Preg::is_match3(&pattern_regexp, PackageInterface::get_name(package), None) - .unwrap_or(false) - { + if Preg::is_match3(&pattern_regexp, package.get_name(), None).unwrap_or(false) { return true; } } @@ -785,14 +863,12 @@ impl PoolBuilder { for package in CanonicalPackagesTrait::get_packages(request.get_locked_repository().unwrap()) { - if Preg::is_match3(&pattern_regexp, PackageInterface::get_name(package), None) - .unwrap_or(false) - { + if Preg::is_match3(&pattern_regexp, package.get_name(), None).unwrap_or(false) { continue 'outer; } } // update pattern matches a root require? => all good, probably a new package - for (package_name, _constraint) in &request.get_requires() { + for (package_name, _constraint) in request.get_requires() { if Preg::is_match3(&pattern_regexp, package_name, None).unwrap_or(false) { if PlatformRepository::is_platform_package(package_name) { matched_platform_package = true; @@ -900,10 +976,21 @@ impl PoolBuilder { if locked_package.as_alias_package().is_none() && locked_package.get_name() == name { let pkgs: Vec<Box<dyn BasePackage>> = self.packages.values().map(|p| p.clone_box()).collect(); - let index_opt = array_search(&**locked_package, &pkgs, true); + // PHP uses array_search with strict identity; map to pointer comparison. + let index_opt = pkgs.iter().position(|p| { + std::ptr::eq( + p.as_ref() as *const _ as *const u8, + locked_package.as_ref() as *const _ as *const u8, + ) + }); if let Some(index) = index_opt { request.unlock_package(&**locked_package); - self.remove_loaded_package(request, repositories, &**locked_package, index); + self.remove_loaded_package( + request, + repositories, + &**locked_package, + index as i64, + ); // make sure that any requirements for this package by other locked or fixed packages are now // also loaded, as they were previously ignored because the locked (now unlocked) package already @@ -963,11 +1050,8 @@ impl PoolBuilder { fn mark_package_name_for_loading_if_required(&mut self, request: &Request, name: &str) { if self.is_root_require(request, name) { - self.mark_package_name_for_loading( - request, - name, - request.get_requires()[name].clone_box(), - ); + let cons = request.get_requires()[name].clone_box(); + self.mark_package_name_for_loading(request, name, &*cons); } let pkgs: Vec<Box<dyn BasePackage>> = @@ -994,8 +1078,18 @@ impl PoolBuilder { ) { let repos_box: Vec<Box<dyn RepositoryInterface>> = repositories.iter().map(|r| r.clone_box()).collect(); - let repo_index = match package.get_repository() { - Some(repo) => array_search(&*repo, &repos_box, true).unwrap_or(-1), + let repo_index: i64 = match package.get_repository() { + // PHP uses array_search with strict identity; map to pointer comparison. + Some(repo) => repos_box + .iter() + .position(|r| { + std::ptr::eq( + r.as_ref() as *const _ as *const u8, + repo as *const _ as *const u8, + ) + }) + .map(|i| i as i64) + .unwrap_or(-1), None => -1, }; @@ -1008,20 +1102,17 @@ impl PoolBuilder { } self.packages.shift_remove(&index); let object_hash = spl_object_hash(package); - if let Some(aliases) = self.alias_map.get(&object_hash).cloned() { + if let Some(aliases) = self.alias_map.shift_remove(&object_hash) { for (alias_index, alias_package) in &aliases { if repo_index >= 0 { if let Some(repo_map) = self.loaded_per_repo.get_mut(&repo_index) { - if let Some(name_map) = - repo_map.get_mut(PackageInterface::get_name(alias_package.as_ref())) - { + if let Some(name_map) = repo_map.get_mut(alias_package.get_name()) { name_map.shift_remove(alias_package.get_version()); } } } self.packages.shift_remove(alias_index); } - self.alias_map.shift_remove(&object_hash); } } @@ -1030,18 +1121,22 @@ impl PoolBuilder { return pool; } - self.io.debug("Running pool optimizer."); + self.io.debug("Running pool optimizer.", &[]); let before = microtime(true); - let total = count(&pool.get_packages()) as f64; + let total = pool.get_packages().len() as f64; - let pool = self + let pool = match self .pool_optimizer .as_mut() .unwrap() - .optimize(request, pool); + .optimize(request, &pool) + { + Ok(p) => p, + Err(_) => return pool, + }; - let filtered = total - (count(&pool.get_packages()) as f64); + let filtered = total - (pool.get_packages().len() as f64); if 0.0 == filtered { return pool; @@ -1059,9 +1154,9 @@ impl PoolBuilder { &sprintf( "<info>Found %s package versions referenced in your dependency graph. %s (%d%%) were optimized away.</info>", &[ - number_format(total).into(), - number_format(filtered).into(), - round(100.0 / total * filtered).into(), + number_format(total, 0, ".", ",").into(), + number_format(filtered, 0, ".", ",").into(), + round(100.0 / total * filtered, 0).into(), ], ), true, @@ -1081,18 +1176,20 @@ impl PoolBuilder { return pool; } - self.io.debug("Running security advisory pool filter."); + self.io.debug("Running security advisory pool filter.", &[]); let before = microtime(true); - let total = count(&pool.get_packages()) as f64; + let total = pool.get_packages().len() as f64; - let pool = self.security_advisory_pool_filter.as_mut().unwrap().filter( - pool, - repositories, - request, - ); + let repos_owned: Vec<Box<dyn RepositoryInterface>> = + repositories.iter().map(|r| r.clone_box()).collect(); + let pool = + self.security_advisory_pool_filter + .as_mut() + .unwrap() + .filter(pool, repos_owned, request); - let filtered = total - (count(&pool.get_packages()) as f64); + let filtered = total - (pool.get_packages().len() as f64); if 0.0 == filtered { return pool; @@ -1110,9 +1207,9 @@ impl PoolBuilder { &sprintf( "<info>Found %s package versions referenced in your dependency graph. %s (%d%%) were filtered away.</info>", &[ - number_format(total).into(), - number_format(filtered).into(), - round(100.0 / total * filtered).into(), + number_format(total, 0, ".", ",").into(), + number_format(filtered, 0, ".", ",").into(), + round(100.0 / total * filtered, 0).into(), ], ), true, diff --git a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs index 3da36b1..3869078 100644 --- a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs +++ b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs @@ -120,7 +120,7 @@ impl PoolOptimizer { ); } // Extract package conflicts - for link in package.get_conflicts() { + for link in package.get_conflicts().values() { self.extract_conflict_constraints_per_package( link.get_target(), // TODO(phase-b): clone constraint @@ -167,7 +167,7 @@ impl PoolOptimizer { if CompilingMatcher::r#match( constraint.as_ref(), Constraint::OP_EQ, - package.get_version(), + package.get_version().to_string(), ) { self.mark_package_irremovable(package.as_ref()); } @@ -216,7 +216,8 @@ impl PoolOptimizer { todo!("pool.get_unacceptable_fixed_or_locked_packages().clone()"), removed_versions, self.removed_versions_by_package.clone(), - pool.get_all_security_removed_package_versions().clone(), + // TODO(phase-b): PartialSecurityAdvisory is a PHP class (no Clone). Need shared ownership rework. + todo!("pool.get_all_security_removed_package_versions().clone()"), pool.get_all_abandoned_removed_package_versions().clone(), ) } @@ -254,31 +255,35 @@ impl PoolOptimizer { continue; } - let require_constraints = self - .require_constraints_per_package - .get(&package_name) - .cloned() - .unwrap_or_default(); + let require_constraints = self.require_constraints_per_package.get(&package_name); + let empty_constraints = IndexMap::new(); + let require_constraints = require_constraints.unwrap_or(&empty_constraints); for (_, require_constraint) in require_constraints.iter() { let mut group_hash_parts: Vec<String> = vec![]; if CompilingMatcher::r#match( require_constraint.as_ref(), Constraint::OP_EQ, - package.get_version(), + package.get_version().to_string(), ) { - group_hash_parts.push(format!("require:{}", require_constraint)); + group_hash_parts.push(format!( + "require:{}", + require_constraint.get_pretty_string() + )); } if package.get_replaces().len() > 0 { - for link in package.get_replaces() { + for (_, link) in package.get_replaces() { if CompilingMatcher::r#match( link.get_constraint(), Constraint::OP_EQ, - package.get_version(), + package.get_version().to_string(), ) { // Use the same hash part as the regular require hash because that's what the replacement does - group_hash_parts.push(format!("require:{}", link.get_constraint())); + group_hash_parts.push(format!( + "require:{}", + link.get_constraint().get_pretty_string() + )); } } } @@ -290,9 +295,12 @@ impl PoolOptimizer { if CompilingMatcher::r#match( conflict_constraint.as_ref(), Constraint::OP_EQ, - package.get_version(), + package.get_version().to_string(), ) { - group_hash_parts.push(format!("conflict:{}", conflict_constraint)); + group_hash_parts.push(format!( + "conflict:{}", + conflict_constraint.get_pretty_string() + )); } } } @@ -325,14 +333,18 @@ impl PoolOptimizer { } // PHP: foreach ($identicalDefinitionsPerPackage as $constraintGroups) - let identical_clone = identical_definitions_per_package.clone(); + // TODO(phase-b): Box<dyn BasePackage> is not Clone; need restructuring to avoid borrow conflict. + let identical_clone: IndexMap< + String, + IndexMap<String, IndexMap<String, Vec<Box<dyn BasePackage>>>>, + > = todo!("identical_definitions_per_package.clone()"); for (_, constraint_groups) in identical_clone.iter() { for (_, constraint_group) in constraint_groups.iter() { for (_, packages) in constraint_group.iter() { // Only one package in this constraint group has the same requirements, we're not allowed to remove that package if 1 == packages.len() { self.keep_package( - &packages[0], + packages[0].as_ref(), &identical_definitions_per_package, &package_identical_definition_lookup, ); @@ -352,7 +364,7 @@ impl PoolOptimizer { .select_preferred_packages(pool, literals.clone(), None) { self.keep_package( - &pool.literal_to_package(preferred_literal), + pool.literal_to_package(preferred_literal), &identical_definitions_per_package, &package_identical_definition_lookup, ); @@ -372,9 +384,18 @@ impl PoolOptimizer { "requires", package.get_requires().values().cloned().collect(), ), - ("conflicts", package.get_conflicts()), - ("replaces", package.get_replaces()), - ("provides", package.get_provides()), + ( + "conflicts", + package.get_conflicts().values().cloned().collect(), + ), + ( + "replaces", + package.get_replaces().values().cloned().collect(), + ), + ( + "provides", + package.get_provides().values().cloned().collect(), + ), ]; for (key, links) in hash_relevant_links { @@ -394,7 +415,7 @@ impl PoolOptimizer { // performance more than the additional few packages that could be filtered out would benefit the process. subhash.insert( link.get_target().to_string(), - link.get_constraint().to_string(), + link.get_constraint().__to_string(), ); } @@ -618,7 +639,7 @@ impl PoolOptimizer { == CompilingMatcher::r#match( link_constraint, Constraint::OP_EQ, - &version_str, + version_str, ) { // TODO(phase-b): mark_package_for_removal returns Result; ignoring here @@ -647,7 +668,7 @@ impl PoolOptimizer { self.require_constraints_per_package .entry(package.to_string()) .or_insert_with(IndexMap::new) - .insert(expanded.to_string(), expanded); + .insert(expanded.__to_string(), expanded); } } @@ -665,7 +686,7 @@ impl PoolOptimizer { self.conflict_constraints_per_package .entry(package.to_string()) .or_insert_with(IndexMap::new) - .insert(expanded.to_string(), expanded); + .insert(expanded.__to_string(), expanded); } } @@ -680,7 +701,11 @@ impl PoolOptimizer { if multi.is_disjunctive() { // No need to call ourselves recursively here because Intervals::compactConstraint() ensures that there // are no nested disjunctive MultiConstraint instances possible - return multi.get_constraints(); + return multi + .get_constraints() + .iter() + .map(|c| c.clone_box()) + .collect(); } } diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs index e78ee14..c73dd3e 100644 --- a/crates/shirabe/src/dependency_resolver/problem.rs +++ b/crates/shirabe/src/dependency_resolver/problem.rs @@ -65,7 +65,7 @@ impl Problem { &self, repository_set: &RepositorySet, request: &Request, - pool: &Pool, + pool: &mut Pool, is_verbose: bool, installed_map: &IndexMap<String, Box<dyn BasePackage>>, learned_pool: &Vec<Vec<Box<dyn Rule>>>, @@ -74,12 +74,12 @@ impl Problem { let mut reasons: Vec<Box<dyn Rule>> = Vec::new(); for section_rules in self.reasons.values().rev() { for rule in section_rules { - reasons.push(rule.clone()); + reasons.push(rule.clone_box()); } } if reasons.len() == 1 { - let rule = reasons[0].clone(); + let rule = reasons[0].clone_box(); if rule.get_reason() != rule::RULE_ROOT_REQUIRE { return Err(LogicException { @@ -90,12 +90,17 @@ impl Problem { } let reason_data = rule.get_reason_data(); - // TODO(phase-b): reason_data for RULE_ROOT_REQUIRE is `array{packageName: string, constraint: ConstraintInterface}`. - let reason_array = reason_data.as_array().unwrap(); - let package_name = reason_array["packageName"].as_string().unwrap().to_string(); - let constraint: Option<&dyn ConstraintInterface> = None; // reason_array["constraint"] + // TODO(phase-b): reason_data for RULE_ROOT_REQUIRE; extract via ReasonData::RootRequire variant. + let (package_name, constraint): (String, Option<&dyn ConstraintInterface>) = + match reason_data { + rule::ReasonData::RootRequire { + package_name, + constraint, + } => (package_name.clone(), Some(constraint.as_ref())), + _ => (String::new(), None), + }; - let packages = pool.what_provides(&package_name, constraint); + let packages = pool.compute_what_provides(&package_name, constraint); if packages.len() == 0 { let missing = Self::get_missing_package_reason( repository_set, @@ -134,27 +139,33 @@ impl Problem { fn get_sortable_string(&self, pool: &Pool, rule: &dyn Rule) -> String { match rule.get_reason() { - rule::RULE_ROOT_REQUIRE => rule.get_reason_data().as_array().unwrap()["packageName"] - .as_string() - .unwrap() - .to_string(), + rule::RULE_ROOT_REQUIRE => match rule.get_reason_data() { + rule::ReasonData::RootRequire { package_name, .. } => package_name.clone(), + _ => String::new(), + }, rule::RULE_FIXED => { // TODO(phase-b): reason_data for RULE_FIXED is `array{package: BasePackage}`. // PHP: (string) $rule->getReasonData()['package'] - php_to_string(rule.get_reason_data().as_array().unwrap()["package"].as_ref()) + match rule.get_reason_data() { + rule::ReasonData::Fixed { package } => package.get_pretty_string(), + _ => String::new(), + } } rule::RULE_PACKAGE_CONFLICT | rule::RULE_PACKAGE_REQUIRES => { // TODO(phase-b): reason_data is a Link. - let source = rule.get_source_package(pool); - format!( - "{}//{}", - source.to_string(), - rule.get_reason_data_as_link().get_pretty_string(&source) - ) + let source = rule.get_source_package(pool).unwrap(); + let link_pretty = match rule.get_reason_data() { + rule::ReasonData::Link(link) => link.get_pretty_string(source.as_ref()), + _ => String::new(), + }; + format!("{}//{}", source.get_pretty_string(), link_pretty) } rule::RULE_PACKAGE_SAME_NAME | rule::RULE_PACKAGE_ALIAS - | rule::RULE_PACKAGE_INVERSE_ALIAS => php_to_string(&rule.get_reason_data()), + | rule::RULE_PACKAGE_INVERSE_ALIAS => { + // TODO(phase-b): convert ReasonData to PhpMixed for php_to_string + format!("{:?}", rule.get_reason_data()) + } rule::RULE_LEARNED => implode( "-", &rule @@ -192,7 +203,7 @@ impl Problem { indent: &str, repository_set: &RepositorySet, request: &Request, - pool: &Pool, + pool: &mut Pool, is_verbose: bool, installed_map: &IndexMap<String, Box<dyn BasePackage>>, learned_pool: &Vec<Vec<Box<dyn Rule>>>, @@ -374,7 +385,7 @@ impl Problem { pub fn get_missing_package_reason( repository_set: &RepositorySet, request: &Request, - pool: &Pool, + pool: &mut Pool, is_verbose: bool, package_name: &str, constraint: Option<&dyn ConstraintInterface>, @@ -537,10 +548,10 @@ impl Problem { } let mut locked_package: Option<Box<dyn BasePackage>> = None; - for package in request.get_locked_packages() { + for (_key, package) in request.get_locked_packages() { if package.get_name() == package_name { - locked_package = Some(package.clone()); - if pool.is_unacceptable_fixed_or_locked_package(&package) { + locked_package = Some(package.clone_box()); + if pool.is_unacceptable_fixed_or_locked_package(package.as_ref()) { return ( "- ".to_string(), format!( @@ -564,7 +575,7 @@ impl Problem { .unwrap_or_else(|_| c.get_pretty_string()); let packages = repository_set.find_packages( package_name, - Some(&MultiConstraint::new( + Some(Box::new(MultiConstraint::new( vec![ Box::new(Constraint::new(Constraint::STR_OP_EQ, &new_constraint)) as Box<dyn ConstraintInterface>, @@ -574,7 +585,7 @@ impl Problem { )) as Box<dyn ConstraintInterface>, ], false, - )), + ))), 0, ); if packages.len() > 0 { @@ -602,11 +613,12 @@ impl Problem { // first check if the actual requested package is found in normal conditions // if so it must mean it is rejected by another constraint than the one given here - let packages = repository_set.find_packages(package_name, constraint, 0); + let packages = + repository_set.find_packages(package_name, constraint.map(|c| c.clone_box()), 0); if packages.len() > 0 { let root_reqs = repository_set.get_root_requires(); if root_reqs.contains_key(package_name) { - let filtered: Vec<&Box<dyn PackageInterface>> = packages + let filtered: Vec<&Box<dyn BasePackage>> = packages .iter() .filter(|p| { root_reqs[package_name].matches(&Constraint::new("==", p.get_version())) @@ -643,7 +655,7 @@ impl Problem { let first_pkg = packages.first().unwrap(); for name in first_pkg.get_names(true) { if temp_reqs.contains_key(&name) { - let filtered: Vec<&Box<dyn PackageInterface>> = packages + let filtered: Vec<&Box<dyn BasePackage>> = packages .iter() .filter(|p| { temp_reqs[&name].matches(&Constraint::new("==", p.get_version())) @@ -680,7 +692,7 @@ impl Problem { if let Some(ref lp) = locked_package { let fixed_constraint = Constraint::new("==", lp.get_version()); - let filtered: Vec<&Box<dyn PackageInterface>> = packages + let filtered: Vec<&Box<dyn BasePackage>> = packages .iter() .filter(|p| fixed_constraint.matches(&Constraint::new("==", p.get_version()))) .collect(); @@ -706,9 +718,13 @@ impl Problem { } } - let non_locked_packages: Vec<&Box<dyn PackageInterface>> = packages + let non_locked_packages: Vec<&Box<dyn BasePackage>> = packages .iter() - .filter(|p| !p.get_repository().is_lock_array_repository()) + .filter(|p| { + p.get_repository() + .and_then(|r| r.as_any().downcast_ref::<LockArrayRepository>()) + .is_none() + }) .collect(); if non_locked_packages.len() == 0 { @@ -752,43 +768,12 @@ impl Problem { } if pool.is_security_removed_package_version(package_name, constraint) { - let advisories = - repository_set.get_matching_security_advisories(&packages, false, true); - let advisories_list: Vec<String> = if let Some(by_pkg) = advisories - .get("advisories") - .and_then(|m| m.get(package_name)) - .filter(|v| v.len() > 0) - { - by_pkg - .iter() - .map(|advisory: &SecurityAdvisory| { - if advisory.link.is_some() && advisory.link.as_ref().unwrap() != "" { - return format!( - "<href={}>{}</>", - OutputFormatter::escape(advisory.link.as_ref().unwrap()), - advisory.inner.advisory_id - ); - } - - if str_starts_with(&advisory.inner.advisory_id, "PKSA-") { - return format!( - "<href={}>{}</>", - OutputFormatter::escape(&format!( - "https://packagist.org/security-advisories/{}", - advisory.inner.advisory_id - )), - advisory.inner.advisory_id - ); - } - - advisory.inner.advisory_id.clone() - }) - .collect() - } else { - pool.get_security_advisory_identifiers_for_package_version( - package_name, - constraint, - ) + // TODO(phase-b): get_matching_security_advisories needs Vec<Box<dyn PackageInterface>> + // and SecurityAdvisory.inner.advisory_id is on the private inner field. + // Convert packages to PackageInterface boxes and adjust SecurityAdvisory accessor first. + let _ = repository_set; + let advisories_list: Vec<String> = pool + .get_security_advisory_identifiers_for_package_version(package_name, constraint) .into_iter() .map(|advisory_id: String| { if str_starts_with(&advisory_id, "PKSA-") { @@ -804,8 +789,7 @@ impl Problem { advisory_id }) - .collect() - }; + .collect(); return ( format!( @@ -848,14 +832,14 @@ impl Problem { // check if the package is found when bypassing stability checks let packages = repository_set.find_packages( package_name, - constraint, + constraint.map(|c| c.clone_box()), RepositorySet::ALLOW_UNACCEPTABLE_STABILITIES, ); if packages.len() > 0 { // we must first verify if a valid package would be found in a lower priority repository let all_repos_packages = repository_set.find_packages( package_name, - constraint, + constraint.map(|c| c.clone_box()), RepositorySet::ALLOW_SHADOWED_REPOSITORIES, ); if all_repos_packages.len() > 0 { @@ -898,7 +882,7 @@ impl Problem { // we must first verify if a valid package would be found in a lower priority repository let all_repos_packages = repository_set.find_packages( package_name, - constraint, + constraint.map(|c| c.clone_box()), RepositorySet::ALLOW_SHADOWED_REPOSITORIES, ); if all_repos_packages.len() > 0 { @@ -918,7 +902,7 @@ impl Problem { if c.is_constraint() && c.get_version() == "dev-master" { for candidate in &packages { if in_array( - PhpMixed::String(candidate.get_version()), + PhpMixed::String(candidate.get_version().to_string()), &PhpMixed::List(vec![ Box::new(PhpMixed::String("dev-default".to_string())), Box::new(PhpMixed::String("dev-main".to_string())), @@ -939,7 +923,7 @@ impl Problem { let all_repos_packages = &packages; let top_package = all_repos_packages.first(); if let Some(tp) = top_package { - if tp.is_root_package_interface() { + if tp.as_root_package_interface().is_some() { suffix = " See https://getcomposer.org/dep-on-root for details and assistance." .to_string(); } @@ -1001,7 +985,7 @@ impl Problem { /// @internal pub fn get_package_list( - packages: &Vec<Box<dyn PackageInterface>>, + packages: &Vec<Box<dyn BasePackage>>, is_verbose: bool, pool: Option<&Pool>, constraint: Option<&dyn ConstraintInterface>, @@ -1014,24 +998,21 @@ impl Problem { let mut prepared: IndexMap<String, PreparedEntry> = IndexMap::new(); let mut has_default_branch: IndexMap<String, bool> = IndexMap::new(); for package in packages { - let pkg_name = package.get_name(); + let pkg_name = package.get_name().to_string(); let entry = prepared .entry(pkg_name.clone()) .or_insert_with(|| PreparedEntry { - name: package.get_pretty_name(), + name: package.get_pretty_name().to_string(), versions: IndexMap::new(), }); - entry.name = package.get_pretty_name(); - let alias_suffix = if package.is_alias_package() { - format!( - " (alias of {})", - package.get_alias_of().unwrap().get_pretty_version() - ) + entry.name = package.get_pretty_name().to_string(); + let alias_suffix = if let Some(alias) = package.as_alias_package() { + format!(" (alias of {})", alias.get_alias_of().get_pretty_version()) } else { String::new() }; entry.versions.insert( - package.get_version(), + package.get_version().to_string(), format!("{}{}", package.get_pretty_version(), alias_suffix), ); if pool.is_some() && constraint.is_some() { @@ -1045,7 +1026,7 @@ impl Problem { if pool.is_some() && use_removed_version_group { for (version, pretty_version) in pool .unwrap() - .get_removed_versions_by_package(&spl_object_hash(package)) + .get_removed_versions_by_package(&spl_object_hash(package.as_ref())) { entry.versions.insert(version, pretty_version); } @@ -1103,16 +1084,20 @@ impl Problem { /// @param string $version the effective runtime version of the platform package /// @return ?string a version string or null if it appears the package was artificially disabled fn get_platform_package_version( - pool: &Pool, + pool: &mut Pool, package_name: &str, version: &str, ) -> Option<String> { let available = pool.what_provides(package_name, None); if available.len() > 0 { - let mut selected: Option<&Box<dyn PackageInterface>> = None; + let mut selected: Option<&Box<dyn BasePackage>> = None; for pkg in &available { - if pkg.get_repository().is_platform_repository() { + if pkg + .get_repository() + .and_then(|r| r.as_any().downcast_ref::<PlatformRepository>()) + .is_some() + { selected = Some(pkg); break; } @@ -1130,31 +1115,26 @@ impl Problem { if link.get_target() == package_name { return Some(format!( "{} {}d by {}", - link.get_pretty_constraint(), - substr(&link.get_description(), 0, Some(-1)), - selected.to_string() + link.get_pretty_constraint().unwrap_or(""), + substr(link.get_description(), 0, Some(-1)), + selected.get_pretty_string() )); } } } - let mut version = selected.get_pretty_version(); + let mut version: String = selected.get_pretty_version().to_string(); let extra = selected.get_extra(); - if selected.is_complete_package_interface() + if selected.as_complete_package_interface().is_some() && extra.contains_key("config.platform") && extra["config.platform"].as_bool() == Some(true) { - version = format!( - "{}; {}", - version, - str_replace( - "Package ", - "", - &php_to_string(&PhpMixed::String( - selected.get_description().unwrap_or_default() - )) - ) - ); + let description: String = selected + .as_complete_package_interface() + .and_then(|c| c.get_description()) + .unwrap_or("") + .to_string(); + version = format!("{}; {}", version, str_replace("Package ", "", &description)); } return Some(version); } @@ -1208,11 +1188,11 @@ impl Problem { filtered } - fn has_multiple_names(packages: &Vec<Box<dyn PackageInterface>>) -> bool { + fn has_multiple_names(packages: &Vec<Box<dyn BasePackage>>) -> bool { let mut name: Option<String> = None; for package in packages { - if name.is_none() || name.as_deref() == Some(package.get_name().as_str()) { - name = Some(package.get_name()); + if name.is_none() || name.as_deref() == Some(package.get_name()) { + name = Some(package.get_name().to_string()); } else { return true; } @@ -1225,25 +1205,21 @@ impl Problem { pool: &Pool, is_verbose: bool, package_name: &str, - higher_repo_packages: &Vec<Box<dyn PackageInterface>>, - all_repos_packages: &Vec<Box<dyn PackageInterface>>, + higher_repo_packages: &Vec<Box<dyn BasePackage>>, + all_repos_packages: &Vec<Box<dyn BasePackage>>, reason: &str, constraint: Option<&dyn ConstraintInterface>, ) -> (String, String) { - let mut next_repo_packages: Vec<Box<dyn PackageInterface>> = Vec::new(); + let mut next_repo_packages: Vec<Box<dyn BasePackage>> = Vec::new(); let mut next_repo: Option< Box<dyn crate::repository::repository_interface::RepositoryInterface>, > = None; for package in all_repos_packages { - if next_repo.is_none() - || next_repo - .as_ref() - .map(|r| r.equals(package.get_repository().as_ref())) - == Some(true) - { - next_repo_packages.push(package.clone()); - next_repo = Some(package.get_repository()); + // TODO(phase-b): RepositoryInterface has no equals(); reference identity needed. + if next_repo.is_none() { + next_repo_packages.push(package.clone_box()); + next_repo = package.get_repository().map(|r| r.clone_box()); } else { break; } @@ -1254,7 +1230,7 @@ impl Problem { if higher_repo_packages.len() > 0 { let top_package = higher_repo_packages.first().unwrap(); - if top_package.is_root_package_interface() { + if top_package.as_root_package_interface().is_some() { return ( format!( "- Root composer.json requires {}{}, it is ", @@ -1278,7 +1254,11 @@ impl Problem { } } - if next_repo.is_lock_array_repository() { + if next_repo + .as_any() + .downcast_ref::<LockArrayRepository>() + .is_some() + { let singular = higher_repo_packages.len() == 1; let mut suggestion = format!( @@ -1293,7 +1273,7 @@ impl Problem { ) ); // symlinked path repos cannot be locked so do not suggest keeping it locked - if next_repo_packages[0].get_dist_type() == "path" { + if next_repo_packages[0].get_dist_type() == Some("path") { let transport_options = next_repo_packages[0].get_transport_options(); if !transport_options.contains_key("symlink") || transport_options["symlink"].as_bool() != Some(false) @@ -1355,7 +1335,8 @@ impl Problem { .first() .unwrap() .get_repository() - .get_repo_name(), + .map(|r| r.get_repo_name()) + .unwrap_or_default(), reason ), ) @@ -1420,24 +1401,24 @@ impl Problem { let providers = repository_set.get_providers(package_name); if providers.len() > 0 { let provider_count = providers.len() as i64; - let slice = if provider_count > max_providers + 1 { - providers - .iter() - .take(max_providers as usize) - .cloned() - .collect::<Vec<_>>() - } else { - providers.clone() - }; + let slice: Vec<crate::repository::repository_interface::ProviderInfo> = + if provider_count > max_providers + 1 { + providers + .values() + .take(max_providers as usize) + .cloned() + .collect::<Vec<_>>() + } else { + providers.values().cloned().collect::<Vec<_>>() + }; let mut providers_str = implode( "", &slice .iter() .map(|p| { - let description = if p.description != "" && !p.description.is_empty() { - format!(" {}", substr(&p.description, 0, Some(100))) - } else { - String::new() + let description = match &p.description { + Some(d) if !d.is_empty() => format!(" {}", substr(d, 0, Some(100))), + _ => String::new(), }; format!(" - {}{}\n", p.name, description) diff --git a/crates/shirabe/src/dependency_resolver/request.rs b/crates/shirabe/src/dependency_resolver/request.rs index ec59861..7930d70 100644 --- a/crates/shirabe/src/dependency_resolver/request.rs +++ b/crates/shirabe/src/dependency_resolver/request.rs @@ -9,6 +9,7 @@ use crate::package::base_package::BasePackage; use crate::package::package_interface::PackageInterface; use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; use crate::repository::lock_array_repository::LockArrayRepository; +use crate::repository::repository_interface::RepositoryInterface; /// Identifies a partial update for listed packages only, all dependencies will remain at locked versions pub const UPDATE_ONLY_LISTED: i64 = 0; @@ -22,6 +23,13 @@ pub const UPDATE_LISTED_WITH_TRANSITIVE_DEPS_NO_ROOT_REQUIRE: i64 = 1; /// dependencies also directly required by the root composer.json will be updated. pub const UPDATE_LISTED_WITH_TRANSITIVE_DEPS: i64 = 2; +impl Request { + pub const UPDATE_ONLY_LISTED: i64 = UPDATE_ONLY_LISTED; + pub const UPDATE_LISTED_WITH_TRANSITIVE_DEPS_NO_ROOT_REQUIRE: i64 = + UPDATE_LISTED_WITH_TRANSITIVE_DEPS_NO_ROOT_REQUIRE; + pub const UPDATE_LISTED_WITH_TRANSITIVE_DEPS: i64 = UPDATE_LISTED_WITH_TRANSITIVE_DEPS; +} + /// Represents the value of updateAllowTransitiveDependencies, which is false|UPDATE_* in PHP. #[derive(Debug, Clone, PartialEq)] pub enum UpdateAllowTransitiveDeps { @@ -114,7 +122,8 @@ impl Request { /// still marks them as locked packages at the same time. pub fn fix_locked_package(&mut self, package: Box<dyn BasePackage>) { let hash = spl_object_hash(&package); - self.fixed_packages.insert(hash.clone(), package.clone()); + self.fixed_packages + .insert(hash.clone(), package.clone_box()); self.fixed_locked_packages.insert(hash, package); } @@ -168,8 +177,16 @@ impl Request { } pub fn get_fixed_or_locked_packages(&self) -> IndexMap<String, Box<dyn BasePackage>> { - let mut result = self.fixed_packages.clone(); - result.extend(self.locked_packages.clone()); + let mut result: IndexMap<String, Box<dyn BasePackage>> = self + .fixed_packages + .iter() + .map(|(k, v)| (k.clone(), v.clone_box())) + .collect(); + result.extend( + self.locked_packages + .iter() + .map(|(k, v)| (k.clone(), v.clone_box())), + ); result } @@ -181,7 +198,7 @@ impl Request { let mut present_map: IndexMap<String, Box<dyn BasePackage>> = IndexMap::new(); if let Some(ref locked_repository) = self.locked_repository { - for package in locked_repository.get_packages() { + for package in RepositoryInterface::get_packages(locked_repository) { let key = if package_ids { package.get_id().to_string() } else { @@ -197,7 +214,7 @@ impl Request { } else { spl_object_hash(package) }; - present_map.insert(key, package.clone()); + present_map.insert(key, package.clone_box()); } present_map @@ -206,7 +223,7 @@ impl Request { pub fn get_fixed_packages_map(&self) -> IndexMap<i64, Box<dyn BasePackage>> { let mut fixed_packages_map: IndexMap<i64, Box<dyn BasePackage>> = IndexMap::new(); for (_, package) in &self.fixed_packages { - fixed_packages_map.insert(package.get_id(), package.clone()); + fixed_packages_map.insert(package.get_id(), package.clone_box()); } fixed_packages_map } diff --git a/crates/shirabe/src/dependency_resolver/rule.rs b/crates/shirabe/src/dependency_resolver/rule.rs index e54df18..37bf30a 100644 --- a/crates/shirabe/src/dependency_resolver/rule.rs +++ b/crates/shirabe/src/dependency_resolver/rule.rs @@ -18,6 +18,7 @@ use crate::dependency_resolver::rule_set::RuleSet; use crate::package::alias_package::AliasPackage; use crate::package::base_package::BasePackage; use crate::package::link::Link; +use crate::package::package_interface::PackageInterface; use crate::package::version::version_parser::VersionParser; use crate::repository::platform_repository::PlatformRepository; use crate::repository::repository_set::RepositorySet; @@ -86,6 +87,14 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { todo!() } + /// PHP: `$rule instanceof MultiConflictRule`. Returns a borrow of the + /// underlying `MultiConflictRule` when this rule is one, otherwise `None`. + fn as_multi_conflict( + &self, + ) -> Option<&crate::dependency_resolver::multi_conflict_rule::MultiConflictRule> { + None + } + /// @return self::RULE_* fn get_reason(&self) -> i64 { (self.bitfield() & (255 << BITFIELD_REASON)) >> BITFIELD_REASON @@ -99,15 +108,15 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { fn get_required_package(&self) -> Option<String> { match self.get_reason() { - r if r == Self::RULE_ROOT_REQUIRE => match self.get_reason_data() { + r if r == RULE_ROOT_REQUIRE => match self.get_reason_data() { ReasonData::RootRequire { package_name, .. } => Some(package_name.clone()), _ => None, }, - r if r == Self::RULE_FIXED => match self.get_reason_data() { + r if r == RULE_FIXED => match self.get_reason_data() { ReasonData::Fixed { package } => Some(package.get_name().to_string()), _ => None, }, - r if r == Self::RULE_PACKAGE_REQUIRES => match self.get_reason_data() { + r if r == RULE_PACKAGE_REQUIRES => match self.get_reason_data() { ReasonData::Link(link) => Some(link.get_target().to_string()), _ => None, }, @@ -148,14 +157,16 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { request: &Request, pool: &Pool, ) -> bool { - if self.get_reason() == Self::RULE_PACKAGE_REQUIRES { + if self.get_reason() == RULE_PACKAGE_REQUIRES { if let ReasonData::Link(link) = self.get_reason_data() { if PlatformRepository::is_platform_package(link.get_target()) { return false; } // TODO(phase-b): Request::get_locked_repository() signature - if let Some(locked_repo) = todo!("request.get_locked_repository()") { - for package in todo!("locked_repo.get_packages()") { + let locked_repo: Option<()> = todo!("request.get_locked_repository()"); + if let Some(_locked_repo) = locked_repo { + let packages: Vec<Box<dyn BasePackage>> = todo!("locked_repo.get_packages()"); + for package in packages { let p: &dyn BasePackage = todo!("package as BasePackage reference"); if p.get_name() == link.get_target() { if pool.is_unacceptable_fixed_or_locked_package(p) { @@ -179,7 +190,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { } } - if self.get_reason() == Self::RULE_ROOT_REQUIRE { + if self.get_reason() == RULE_ROOT_REQUIRE { if let ReasonData::RootRequire { package_name, constraint, @@ -189,8 +200,10 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { return false; } // TODO(phase-b): Request::get_locked_repository() signature - if let Some(locked_repo) = todo!("request.get_locked_repository()") { - for package in todo!("locked_repo.get_packages()") { + let locked_repo: Option<()> = todo!("request.get_locked_repository()"); + if let Some(_locked_repo) = locked_repo { + let packages: Vec<Box<dyn BasePackage>> = todo!("locked_repo.get_packages()"); + for package in packages { let p: &dyn BasePackage = todo!("package as BasePackage reference"); if p.get_name() == package_name { if pool.is_unacceptable_fixed_or_locked_package(p) { @@ -214,7 +227,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { let literals = self.get_literals(); match self.get_reason() { - r if r == Self::RULE_PACKAGE_CONFLICT => { + r if r == RULE_PACKAGE_CONFLICT => { let mut package1 = self.deduplicate_default_branch_alias( pool.literal_to_package(literals[0]).clone_box(), ); @@ -233,7 +246,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { Ok(package2) } - r if r == Self::RULE_PACKAGE_REQUIRES => { + r if r == RULE_PACKAGE_REQUIRES => { let source_literal = literals[0]; let source_package = self.deduplicate_default_branch_alias( pool.literal_to_package(source_literal).clone_box(), @@ -258,13 +271,13 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { request: &Request, pool: &mut Pool, is_verbose: bool, - installed_map: IndexMap<i64, Box<dyn BasePackage>>, - _learned_pool: IndexMap<i64, Vec<Box<dyn Rule>>>, + installed_map: &IndexMap<String, Box<dyn BasePackage>>, + _learned_pool: &Vec<Vec<Box<dyn Rule>>>, ) -> String { let mut literals = self.get_literals(); match self.get_reason() { - r if r == Self::RULE_ROOT_REQUIRE => { + r if r == RULE_ROOT_REQUIRE => { let reason_data = self.get_reason_data(); let (package_name, constraint): (&str, &dyn ConstraintInterface) = match reason_data { @@ -316,7 +329,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { ) } - r if r == Self::RULE_FIXED => { + r if r == RULE_FIXED => { let package_in = match self.get_reason_data() { ReasonData::Fixed { package } => package.clone_box(), _ => return String::new(), @@ -338,7 +351,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { ) } - r if r == Self::RULE_PACKAGE_CONFLICT => { + r if r == RULE_PACKAGE_CONFLICT => { let mut package1 = self.deduplicate_default_branch_alias( pool.literal_to_package(literals[0]).clone_box(), ); @@ -404,7 +417,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { ) } - r if r == Self::RULE_PACKAGE_REQUIRES => { + r if r == RULE_PACKAGE_REQUIRES => { assert!(literals.len() > 0); let source_literal = array_shift(&mut literals).unwrap(); let source_package = self.deduplicate_default_branch_alias( @@ -418,7 +431,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { let mut requires: Vec<Box<dyn BasePackage>> = vec![]; for literal in &literals { - requires.push(pool.literal_to_package(*literal)); + requires.push(pool.literal_to_package(*literal).clone_box()); } let text = link.get_pretty_string(&*source_package); @@ -450,7 +463,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { } } - r if r == Self::RULE_PACKAGE_SAME_NAME => { + r if r == RULE_PACKAGE_SAME_NAME => { let mut package_names: IndexMap<String, bool> = IndexMap::new(); for literal in &literals { let package = pool.literal_to_package(*literal); @@ -489,10 +502,10 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { let mut installed_packages: Vec<Box<dyn BasePackage>> = vec![]; let mut removable_packages: Vec<Box<dyn BasePackage>> = vec![]; for literal in &literals { - if installed_map.contains_key(&abs(*literal)) { - installed_packages.push(pool.literal_to_package(*literal)); + if installed_map.contains_key(&abs(*literal).to_string()) { + installed_packages.push(pool.literal_to_package(*literal).clone_box()); } else { - removable_packages.push(pool.literal_to_package(*literal)); + removable_packages.push(pool.literal_to_package(*literal).clone_box()); } } @@ -533,7 +546,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { ), ) } - r if r == Self::RULE_LEARNED => { + r if r == RULE_LEARNED => { /// @TODO currently still generates way too much output to be helpful, and in some cases can even lead to endless recursion // (PHP commented-out alternative code preserved) let learned_string = " (conflict analysis result)"; @@ -544,7 +557,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { let mut groups: IndexMap<String, Vec<Box<dyn BasePackage>>> = IndexMap::new(); for literal in &literals { let package = pool.literal_to_package(*literal); - let group = if installed_map.contains_key(&package.id()) { + let group = if installed_map.contains_key(&package.id().to_string()) { if *literal > 0 { "keep" } else { "remove" } } else { if *literal > 0 { @@ -557,7 +570,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { groups .entry(group.to_string()) .or_insert_with(Vec::new) - .push(self.deduplicate_default_branch_alias(package)); + .push(self.deduplicate_default_branch_alias(package.clone_box())); } let mut rule_texts: Vec<String> = vec![]; for (group, packages) in &groups { @@ -580,7 +593,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { format!("Conclusion: {}{}", rule_text, learned_string) } - r if r == Self::RULE_PACKAGE_ALIAS => { + r if r == RULE_PACKAGE_ALIAS => { let alias_package = pool.literal_to_package(literals[0]); // avoid returning content like "9999999-dev is an alias of dev-master" as it is useless @@ -597,7 +610,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { package.get_pretty_string(), ) } - r if r == Self::RULE_PACKAGE_INVERSE_ALIAS => { + r if r == RULE_PACKAGE_INVERSE_ALIAS => { // inverse alias rules work the other way around than above let alias_package = pool.literal_to_package(literals[1]); @@ -646,9 +659,9 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { } Problem::get_package_list( - packages, + &packages, is_verbose, - pool, + Some(pool), constraint, use_removed_version_group, ) @@ -668,9 +681,9 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { packages.push(pool.literal_to_package(*literal).clone_box()); } Problem::get_package_list( - packages, + &packages, is_verbose, - pool, + Some(pool), constraint, use_removed_version_group, ) diff --git a/crates/shirabe/src/dependency_resolver/rule_set.rs b/crates/shirabe/src/dependency_resolver/rule_set.rs index 032790e..0e3d1de 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set.rs @@ -57,7 +57,7 @@ impl RuleSet { .into()); } - let hash = rule.get_hash(); + let hash = rule.get_hash().to_string(); if let Some(potential_duplicates) = self.rules_by_hash.get(&hash) { for potential_duplicate in potential_duplicates { @@ -67,12 +67,16 @@ impl RuleSet { } } + // TODO(phase-b): Rule is a PHP class with shared ownership; should be Rc<dyn Rule> + // so the same instance can be inserted in rules, rule_by_id, and rules_by_hash. + // Box<dyn Rule> cannot be cloned; storing placeholders for now. self.rules .entry(r#type) .or_insert_with(Vec::new) - .push(rule.clone()); + .push(todo!("share rule via Rc")); rule.set_type(r#type); - self.rule_by_id.insert(self.next_rule_id, rule.clone()); + self.rule_by_id + .insert(self.next_rule_id, todo!("share rule via Rc")); self.next_rule_id += 1; @@ -93,7 +97,7 @@ impl RuleSet { } pub fn rule_by_id_mut(&mut self, id: i64) -> &mut dyn Rule { - &mut *self.rule_by_id.get_mut(&id).unwrap() + self.rule_by_id.get_mut(&id).unwrap().as_mut() } pub fn get_rules(&self) -> &IndexMap<i64, Vec<Box<dyn Rule>>> { @@ -136,12 +140,9 @@ impl RuleSet { string.push_str(&format!("{:<8}: ", type_name)); for rule in rules { if repository_set.is_some() && request.is_some() && pool.is_some() { - string.push_str(&rule.get_pretty_string( - repository_set.unwrap(), - request.unwrap(), - pool.unwrap(), - is_verbose, - )); + // TODO(phase-b): get_pretty_string needs &mut Pool plus installed_map and learned_pool. + let _ = (repository_set, request, pool, is_verbose, rule); + string.push_str(&rule.to_string()); } else { string.push_str(&rule.to_string()); } diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs index 6cbe93b..91533b3 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs @@ -213,12 +213,18 @@ impl RuleSetGenerator { .as_any() .downcast_ref::<IgnoreListPlatformRequirementFilter>( ) { + let fallback = constraint.clone_box(); constraint = ignore_list_filter .filter_constraint(link.get_target(), constraint, true) - .unwrap_or(constraint); + .unwrap_or(fallback); } - let possible_requires = self.pool.what_provides(link.get_target(), &*constraint); + let possible_requires: Vec<Box<dyn PackageInterface>> = self + .pool + .what_provides(link.get_target(), Some(&*constraint)) + .into_iter() + .map(|p| p.clone_package_box()) + .collect(); let rule = self.create_require_rule( &*package, @@ -262,12 +268,15 @@ impl RuleSetGenerator { .as_any() .downcast_ref::<IgnoreListPlatformRequirementFilter>( ) { + let fallback = constraint.clone_box(); constraint = ignore_list_filter .filter_constraint(link.get_target(), constraint, false) - .unwrap_or(constraint); + .unwrap_or(fallback); } - let conflicts = self.pool.what_provides(link.get_target(), &*constraint); + let conflicts = self + .pool + .what_provides(link.get_target(), Some(&*constraint)); for conflict in &conflicts { // define the conflict rule for regular packages, for alias packages it's only needed if the name @@ -341,7 +350,7 @@ impl RuleSetGenerator { Box::new(PhpMixed::Null), // reasonData: $package (BasePackage) ); let rule = self.create_install_one_of_rule( - &[package.clone_box()], + &[package.clone_package_box()], rule::RULE_FIXED, PhpMixed::Array(reason_data), ); @@ -356,15 +365,24 @@ impl RuleSetGenerator { .as_any() .downcast_ref::<IgnoreListPlatformRequirementFilter>( ) { + let fallback = constraint.clone_box(); constraint = ignore_list_filter .filter_constraint(package_name, constraint, true) - .unwrap_or(constraint); + .unwrap_or(fallback); } - let packages = self.pool.what_provides(package_name, &*constraint); + let packages: Vec<Box<dyn PackageInterface>> = self + .pool + .what_provides(package_name, Some(&*constraint)) + .into_iter() + .map(|p| p.clone_package_box()) + .collect(); if !packages.is_empty() { for package in &packages { - self.add_rules_for_package(package.clone_box(), platform_requirement_filter); + self.add_rules_for_package( + package.clone_package_box(), + platform_requirement_filter, + ); } let mut reason_data: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); @@ -392,7 +410,13 @@ impl RuleSetGenerator { &mut self, platform_requirement_filter: &dyn PlatformRequirementFilterInterface, ) { - for package in self.pool.get_packages() { + let packages: Vec<Box<dyn BasePackage>> = self + .pool + .get_packages() + .iter() + .map(|p| p.clone_box()) + .collect(); + for package in &packages { // ensure that rules for root alias packages and aliases of packages which were loaded are also loaded // even if the alias itself isn't required, otherwise a package could be installed without its alias which // leads to unexpected behavior @@ -406,7 +430,7 @@ impl RuleSetGenerator { .contains_key(&alias_pkg.get_alias_of().get_id()) { self.add_rules_for_package( - package.clone_box(), + package.clone_package_box(), platform_requirement_filter, ); } diff --git a/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs b/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs index 8caf6bd..82c9dec 100644 --- a/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs +++ b/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs @@ -2,14 +2,12 @@ use crate::advisory::audit_config::AuditConfig; use crate::advisory::auditor::Auditor; +use crate::advisory::partial_security_advisory::PartialSecurityAdvisory; use crate::dependency_resolver::pool::Pool; use crate::dependency_resolver::request::Request; use crate::package::package_interface::PackageInterface; -use crate::repository::platform_repository::PlatformRepository; use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_set::RepositorySet; use indexmap::IndexMap; -use shirabe_php_shim::PhpMixed; use shirabe_semver::constraint::constraint::Constraint; #[derive(Debug)] @@ -32,111 +30,35 @@ impl SecurityAdvisoryPoolFilter { repositories: Vec<Box<dyn RepositoryInterface>>, request: &Request, ) -> Pool { - if !self.audit_config.block_insecure { - return pool; - } - - let mut repo_set = RepositorySet::new(); - for repo in &repositories { - repo_set.add_repository(repo.as_ref()); - } - - let mut packages_for_advisories: Vec<Box<dyn PackageInterface>> = vec![]; - for package in pool.get_packages() { - if !package.is_root() - && !PlatformRepository::is_platform_package(package.get_name()) - && !request.is_locked_package(package.as_ref()) - { - packages_for_advisories.push(package); - } - } - - // all_advisories: ['advisories' => array<string, array<PartialSecurityAdvisory|SecurityAdvisory>>, ...] - let mut all_advisories: IndexMap<String, PhpMixed> = - repo_set.get_matching_security_advisories(&packages_for_advisories, true, true); - if self.auditor.needs_complete_advisory_load( - &all_advisories["advisories"], - &self.audit_config.ignore_list_for_blocking, - ) { - all_advisories = - repo_set.get_matching_security_advisories(&packages_for_advisories, false, true); - } - - // advisory_map: array<string, array<PartialSecurityAdvisory|SecurityAdvisory>> - let advisory_map: IndexMap<String, Vec<PhpMixed>> = self.auditor.process_advisories( - &all_advisories["advisories"], - &self.audit_config.ignore_list_for_blocking, - &self.audit_config.ignore_severity_for_blocking, - )["advisories"] - .clone() - .into(); - - let mut packages: Vec<Box<dyn PackageInterface>> = vec![]; - // security_removed_versions: array<string, array<string, array<PartialSecurityAdvisory|SecurityAdvisory>>> - let mut security_removed_versions: IndexMap<String, IndexMap<String, Vec<PhpMixed>>> = - IndexMap::new(); - // abandoned_removed_versions: array<string, array<string, string>> - let mut abandoned_removed_versions: IndexMap<String, IndexMap<String, String>> = - IndexMap::new(); - for package in pool.get_packages() { - if self.audit_config.block_abandoned - && !self - .auditor - .filter_abandoned_packages( - vec![package.as_ref()], - &self.audit_config.ignore_abandoned_for_blocking, - ) - .is_empty() - { - for package_name in package.get_names(false) { - abandoned_removed_versions - .entry(package_name) - .or_default() - .insert( - package.get_version().to_string(), - package.get_pretty_version().to_string(), - ); - } - continue; - } - - let matching_advisories = self.get_matching_advisories(package.as_ref(), &advisory_map); - if !matching_advisories.is_empty() { - for package_name in package.get_names(false) { - security_removed_versions - .entry(package_name) - .or_default() - .insert( - package.get_version().to_string(), - matching_advisories.clone(), - ); - } - continue; - } - - packages.push(package); - } - - Pool::new( - packages, - pool.get_unacceptable_fixed_or_locked_packages(), - pool.get_all_removed_versions(), - pool.get_all_removed_versions_by_package(), - security_removed_versions, - abandoned_removed_versions, - ) + // TODO(phase-b): port the filter() body. Blockers: + // * RepositorySet::new takes 6 args; ConfigSourceInterface refactor pending + // * pool.get_packages() yields Box<dyn BasePackage>, but the audit/repo APIs + // expect Box<dyn PackageInterface>; needs trait-object coercion / cloning story + // * Pool::new requires owned Vecs, but existing pool's getters return refs and + // Box<dyn BasePackage> is not Clone (only clone_box). + // * advisory map element type mismatch (PhpMixed vs PartialSecurityAdvisory). + let _ = ( + pool, + repositories, + request, + &self.auditor, + &self.audit_config, + ); + todo!("port SecurityAdvisoryPoolFilter::filter") } + /// @param array<string, array<PartialSecurityAdvisory|SecurityAdvisory>> $advisoryMap + /// @return list<PartialSecurityAdvisory|SecurityAdvisory> fn get_matching_advisories( &self, package: &dyn PackageInterface, - advisory_map: &IndexMap<String, Vec<PhpMixed>>, - ) -> Vec<PhpMixed> { + advisory_map: &IndexMap<String, Vec<PartialSecurityAdvisory>>, + ) -> Vec<PartialSecurityAdvisory> { if package.is_dev() { return vec![]; } - let mut matching_advisories: Vec<PhpMixed> = vec![]; + let mut matching_advisories: Vec<PartialSecurityAdvisory> = vec![]; for package_name in package.get_names(false) { if !advisory_map.contains_key(&package_name) { continue; @@ -145,8 +67,9 @@ impl SecurityAdvisoryPoolFilter { let package_constraint = Constraint::new("==", package.get_version()); for advisory in &advisory_map[&package_name] { // advisory is PartialSecurityAdvisory or SecurityAdvisory; both have affected_versions: Box<dyn ConstraintInterface> - if advisory.affected_versions().matches(&package_constraint) { - matching_advisories.push(advisory.clone()); + if advisory.affected_versions.matches(&package_constraint) { + // TODO(phase-b): PartialSecurityAdvisory is not Clone; replace with Rc when sharing is needed + matching_advisories.push(todo!("clone PartialSecurityAdvisory")); } } } diff --git a/crates/shirabe/src/dependency_resolver/solver.rs b/crates/shirabe/src/dependency_resolver/solver.rs index b4b878b..4421013 100644 --- a/crates/shirabe/src/dependency_resolver/solver.rs +++ b/crates/shirabe/src/dependency_resolver/solver.rs @@ -61,7 +61,11 @@ impl Solver { pool, rules: RuleSet::new(), watch_graph: RuleWatchGraph::new(), - decisions: Decisions::new(Pool::default()), + // TODO(phase-b): PHP shares `$pool` between Solver and Decisions by reference. + // Pool has no `Default`/`Clone` impl, so we leave this placeholder until the + // resolver is refactored to use `Rc<RefCell<Pool>>`. `solve()` rebuilds the + // decisions field before any access. + decisions: todo!("Decisions::new requires a shared Pool reference"), fixed_map: IndexMap::new(), propagate_index: 0, branches: Vec::new(), @@ -112,8 +116,10 @@ impl Solver { // found a conflict if RuleSet::TYPE_LEARNED == rule.get_type() { - let mut rule_mut = self.rules.rule_by_id_mut(rule_index); - rule_mut.disable()?; + let rule_mut = self.rules.rule_by_id_mut(rule_index); + // TODO(phase-b): PHP `disable()` may throw for MultiConflictRule. + // The Rule trait method returns `()`; the special case isn't surfaced. + rule_mut.disable(); rule_index += 1; continue; } @@ -125,7 +131,8 @@ impl Solver { problem.add_rule(rule.clone_box()); problem.add_rule(conflict); - self.rules.rule_by_id_mut(rule_index).disable()?; + // TODO(phase-b): PHP `disable()` may throw for MultiConflictRule. + self.rules.rule_by_id_mut(rule_index).disable(); self.problems.push(problem); rule_index += 1; continue; @@ -133,16 +140,18 @@ impl Solver { // conflict with another root require/fixed package let mut problem = Problem::new(); - problem.add_rule(rule.clone()); + problem.add_rule(rule.clone_box()); problem.add_rule(conflict); // push all of our rules (can only be root require/fixed package rules) // asserting this literal on the problem stack - let request_rules: Vec<i64> = self - .rules - .get_iterator_for(vec![RuleSet::TYPE_REQUEST]) - .ids() - .collect(); + // TODO(phase-b): RuleSetIterator does not expose an `ids()` method matching + // PHP's `array_keys($iterator->rules())`. Returning an empty Vec until the + // iterator surfaces the underlying rule ids. + let request_rules: Vec<i64> = { + let _iter = self.rules.get_iterator_for(vec![RuleSet::TYPE_REQUEST]); + Vec::new() + }; for assert_rule_id in request_rules { let assert_rule = self.rules.rule_by_id(assert_rule_id).clone_box(); if assert_rule.is_disabled() || !assert_rule.is_assertion() { @@ -156,7 +165,8 @@ impl Solver { continue; } problem.add_rule(assert_rule); - self.rules.rule_by_id_mut(assert_rule_id).disable()?; + // TODO(phase-b): PHP `disable()` may throw for MultiConflictRule. + self.rules.rule_by_id_mut(assert_rule_id).disable(); } self.problems.push(problem); @@ -169,8 +179,8 @@ impl Solver { fn setup_fixed_map(&mut self, request: &Request) { self.fixed_map = IndexMap::new(); - for package in request.get_fixed_packages() { - self.fixed_map.insert(package.id, package.clone()); + for (_, package) in request.get_fixed_packages() { + self.fixed_map.insert(package.get_id(), package.clone_box()); } } @@ -180,19 +190,30 @@ impl Solver { platform_requirement_filter: &dyn PlatformRequirementFilterInterface, ) { for (package_name, constraint) in request.get_requires() { - let mut constraint: Box<dyn ConstraintInterface> = constraint.clone(); + // TODO(phase-b): ConstraintInterface is a PHP class — Box<dyn ConstraintInterface> + // cannot be cloned. We borrow the original constraint and only allocate a fresh + // box when the ignore filter rewrites it. + let mut filtered: Option<Box<dyn ConstraintInterface>> = None; + let constraint_ref: &dyn ConstraintInterface = constraint.as_ref(); if platform_requirement_filter.is_ignored(package_name) { continue; } else if let Some(ignore_filter) = platform_requirement_filter .as_any() .downcast_ref::<IgnoreListPlatformRequirementFilter>( ) { - constraint = ignore_filter.filter_constraint(package_name, constraint); + // TODO(phase-b): filter_constraint consumes its boxed constraint and would + // need an owned clone of the original. Skipping rewrite until Constraint + // ownership is reworked. + let _ = ignore_filter; + let _ = &mut filtered; } + let active_constraint: &dyn ConstraintInterface = + filtered.as_deref().unwrap_or(constraint_ref); + if self .pool - .what_provides(package_name, Some(constraint.as_ref())) + .what_provides(package_name, Some(active_constraint)) .is_empty() { let mut problem = Problem::new(); @@ -231,21 +252,26 @@ impl Solver { self.io .write_error3("Generating rules", true, crate::io::io_interface::DEBUG); - let mut rule_set_generator = - RuleSetGenerator::new(self.policy.clone_box(), self.pool.clone()); - self.rules = - rule_set_generator.get_rules_for(request, platform_requirement_filter.as_ref())?; + // TODO(phase-b): Pool is a PHP class without Clone; RuleSetGenerator should hold + // a shared reference (Rc<RefCell<Pool>>). Using a placeholder pool until then. + let mut rule_set_generator = RuleSetGenerator::new( + self.policy.clone_box(), + todo!("share Pool with RuleSetGenerator"), + ); + // TODO(phase-b): get_rules_for takes Option<Box<dyn PlatformRequirementFilterInterface>>; + // PHP passes the filter directly. Forwarding `None` here keeps the call typecheckable. + let _ = platform_requirement_filter.as_ref(); + self.rules = rule_set_generator.get_rules_for(request, None)?; drop(rule_set_generator); self.check_for_root_require_problems(request, platform_requirement_filter.as_ref()); - self.decisions = Decisions::new(self.pool.clone()); + // TODO(phase-b): Pool sharing — same as above. + self.decisions = Decisions::new(todo!("share Pool with Decisions")); self.watch_graph = RuleWatchGraph::new(); - for rule in self.rules.iter() { - self.watch_graph - .insert(std::rc::Rc::new(std::cell::RefCell::new( - RuleWatchNode::new(rule.clone()), - ))); - } + // TODO(phase-b): RuleSet does not expose `iter()`; RuleWatchNode expects + // Box<dyn RuleLiterals>. Skipping watch-graph seeding until rule storage is + // refactored to share rules between RuleSet and RuleWatchGraph. + let _ = &mut self.watch_graph; // make decisions based on root require/fix assertions self.make_assertion_rule_decisions()?; @@ -269,17 +295,25 @@ impl Solver { ); if self.problems.len() > 0 { - return Err(anyhow::anyhow!(SolverProblemsException::new( + // TODO(phase-b): SolverProblemsException stores `Box<dyn Rule>` which is not + // `Send + Sync`, so it cannot satisfy `anyhow::Error`'s bounds. Returning a + // placeholder error preserves control flow until Rule gains thread-safety + // requirements or the exception type is reworked. + let _ = SolverProblemsException::new( std::mem::take(&mut self.problems), - self.learned_pool.clone(), - ))); + std::mem::take(&mut self.learned_pool), + ); + return Err(anyhow::anyhow!("solver problems")); } + // TODO(phase-b): LockTransaction expects IndexMap<_, Box<dyn PackageInterface>> + // and borrows Pool/Decisions. The present/fixed maps from Request are keyed + // by BasePackage; converting requires reworking Request. Ok(LockTransaction::new( - self.pool.clone(), - request.get_present_map(), - request.get_fixed_packages_map(), - self.decisions.clone(), + &self.pool, + todo!("convert request.get_present_map(false) to PackageInterface map"), + todo!("convert request.get_fixed_packages_map() to PackageInterface map"), + &self.decisions, )) } @@ -384,17 +418,14 @@ impl Solver { self.revert(level); - self.rules - .add(new_rule.clone().into(), RuleSet::TYPE_LEARNED)?; - - self.learned_why.insert(spl_object_hash(&new_rule), why); - - let mut rule_node = RuleWatchNode::new(new_rule.clone().into()); - rule_node.watch2_on_highest(&self.decisions); - self.watch_graph - .insert(std::rc::Rc::new(std::cell::RefCell::new(rule_node))); - - self.decisions.decide(learn_literal, level, new_rule.into()); + // TODO(phase-b): GenericRule is a PHP class — Composer shares the same + // instance between RuleSet, RuleWatchGraph, and Decisions. Without shared + // ownership we can't add the rule once and reference it later; the watch + // graph and decisions hand-off are stubbed. + let _ = new_rule; + let _ = learn_literal; + let _ = why; + todo!("share learned GenericRule across RuleSet, RuleWatchGraph, and Decisions"); } Ok(level) @@ -413,7 +444,8 @@ impl Solver { rule.get_required_package(), ); - let selected_literal = array_shift::<i64>(&mut literals); + let selected_literal = array_shift::<i64>(&mut literals) + .expect("select_preferred_packages returned an empty literal list"); // if there are multiple candidates, then branch if literals.len() > 0 { @@ -428,7 +460,7 @@ impl Solver { level: i64, rule: Box<dyn Rule>, ) -> anyhow::Result<(i64, i64, GenericRule, i64)> { - let analyzed_rule = rule.clone(); + let analyzed_rule = rule.clone_box(); let mut rule = rule; let mut rule_level = 1_i64; let mut num = 0_i64; @@ -443,7 +475,7 @@ impl Solver { 'outer: loop { let last = self.learned_pool.len() - 1; - self.learned_pool[last].push(rule.clone()); + self.learned_pool[last].push(rule.clone_box()); for literal in rule.get_literals().clone() { // multiconflictrule is really a bunch of rules in one, so some may not have finished propagating yet @@ -503,8 +535,7 @@ impl Solver { decision_id -= 1; - let decision = self.decisions.at_offset(decision_id as usize).clone(); - let lit = decision.0; + let lit = self.decisions.at_offset(decision_id as usize).0; if seen.contains_key(&lit.abs()) { break lit; @@ -533,8 +564,7 @@ impl Solver { l1num += 1; l1retry = true; } else { - let decision = self.decisions.at_offset(decision_id as usize).clone(); - rule = decision.1; + rule = self.decisions.at_offset(decision_id as usize).1.clone_box(); if rule.as_multi_conflict().is_some() { // there is only ever exactly one positive decision in a MultiConflictRule @@ -543,7 +573,7 @@ impl Solver { && self.decisions.satisfy(-rule_literal) { let last = self.learned_pool.len() - 1; - self.learned_pool[last].push(rule.clone()); + self.learned_pool[last].push(rule.clone_box()); let l = self.decisions.decision_level(rule_literal); if 1 == l { l1num += 1; @@ -569,8 +599,7 @@ impl Solver { } let _ = literal_for_outer; - let decision = self.decisions.at_offset(decision_id as usize).clone(); - rule = decision.1; + rule = self.decisions.at_offset(decision_id as usize).1.clone_box(); } let why = (self.learned_pool.len() as i64) - 1; @@ -606,11 +635,11 @@ impl Solver { if conflict_rule.get_type() == RuleSet::TYPE_LEARNED { let learned_why = self.learned_why[&why]; - let problem_rules = self.learned_pool[learned_why as usize].clone(); + let problem_rules = &self.learned_pool[learned_why as usize]; - for problem_rule in &problem_rules { + for problem_rule in problem_rules { if !rule_seen.contains_key(&spl_object_hash(problem_rule)) { - self.analyze_unsolvable_rule(problem, problem_rule, rule_seen); + self.analyze_unsolvable_rule(problem, problem_rule.as_ref(), rule_seen); } } @@ -623,12 +652,12 @@ impl Solver { } problem.next_section(); - problem.add_rule(conflict_rule.clone()); + problem.add_rule(conflict_rule.clone_box()); } fn analyze_unsolvable(&mut self, conflict_rule: &dyn Rule) { let mut problem = Problem::new(); - problem.add_rule(conflict_rule.clone()); + problem.add_rule(conflict_rule.clone_box()); let mut rule_seen: IndexMap<String, bool> = IndexMap::new(); @@ -645,18 +674,24 @@ impl Solver { seen.insert(literal.abs(), true); } - for decision in self.decisions.iter() { - let decision_literal = decision.0; + // TODO(phase-b): Decisions does not expose an `iter()` matching PHP's foreach. + // Walk the decision queue directly through offsets to avoid borrowing issues + // (we still need to call back into `&self` while iterating). + let mut offset = 0_usize; + while offset < self.decisions.count() { + let decision_literal = self.decisions.at_offset(offset).0; + + offset += 1; // skip literals that are not in this rule if !seen.contains_key(&decision_literal.abs()) { continue; } - let why = decision.1.clone(); + let why = self.decisions.at_offset(offset - 1).1.clone_box(); - problem.add_rule(why.clone()); - self.analyze_unsolvable_rule(&mut problem, &why, &mut rule_seen); + problem.add_rule(why.clone_box()); + self.analyze_unsolvable_rule(&mut problem, why.as_ref(), &mut rule_seen); let literals = why.get_literals().clone(); for literal in &literals { @@ -700,7 +735,7 @@ impl Solver { let mut iterator = self.rules.get_iterator_for(vec![RuleSet::TYPE_REQUEST]); let mut broke_inner = false; while iterator.valid() { - let rule = iterator.current().clone(); + let rule = iterator.current().clone_box(); if rule.is_enabled() { let mut decision_queue: Vec<i64> = Vec::new(); let mut none_satisfied = true; @@ -741,7 +776,7 @@ impl Solver { } } } - iterator.advance(); + iterator.next(); } let _ = broke_inner; @@ -893,7 +928,7 @@ impl Solver { level = last_level_v; self.revert(level); - let why = self.decisions.last_reason().clone(); + let why = self.decisions.last_reason().clone_box(); level = self.set_propagate_learn(level, last_literal_v, why)?; diff --git a/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs b/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs index c306bd0..f05dd87 100644 --- a/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs +++ b/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs @@ -46,7 +46,7 @@ impl SolverProblemsException { &self, repository_set: &RepositorySet, request: &Request, - pool: &Pool, + pool: &mut Pool, is_verbose: bool, is_dev_extraction: bool, ) -> String { @@ -58,16 +58,24 @@ impl SolverProblemsException { for problem in &self.problems { problems.push(format!( "{}\n", - problem.get_pretty_string( - repository_set, - request, - pool, - is_verbose, - &installed_map, - &self.learned_pool - ) + problem + .get_pretty_string( + repository_set, + request, + pool, + is_verbose, + &installed_map, + &self.learned_pool + ) + .unwrap_or_default() )); - missing_extensions.extend(self.get_extension_problems(problem.get_reasons())); + // TODO(phase-b): get_reasons returns an IndexMap; flatten its values into Vec<Vec<...>>. + let reasons_vec: Vec<Vec<Box<dyn crate::dependency_resolver::rule::Rule>>> = problem + .get_reasons() + .values() + .map(|v| v.iter().map(|r| r.clone_box()).collect()) + .collect(); + missing_extensions.extend(self.get_extension_problems(reasons_vec)); is_caused_by_lock = is_caused_by_lock || problem.is_caused_by_lock(repository_set, request, pool); } diff --git a/crates/shirabe/src/downloader/archive_downloader.rs b/crates/shirabe/src/downloader/archive_downloader.rs index 937add0..45121ee 100644 --- a/crates/shirabe/src/downloader/archive_downloader.rs +++ b/crates/shirabe/src/downloader/archive_downloader.rs @@ -9,6 +9,7 @@ use shirabe_php_shim::{ }; use crate::dependency_resolver::operation::install_operation::InstallOperation; +use crate::downloader::downloader_interface::DownloaderInterface; use crate::downloader::file_downloader::FileDownloader; use crate::package::package_interface::PackageInterface; use crate::util::platform::Platform; @@ -69,7 +70,14 @@ pub trait ArchiveDownloader { )); } - let vendor_dir = self.inner().config.borrow_mut().get("vendor-dir"); + let vendor_dir = self + .inner() + .config + .borrow_mut() + .get("vendor-dir") + .as_string() + .unwrap_or("") + .to_string(); // clean up the target directory, unless it contains the vendor dir, as the vendor dir contains // the archive to be extracted. This is the case when installing with create-project in the current directory @@ -90,21 +98,20 @@ pub trait ArchiveDownloader { self.inner_mut() .filesystem .borrow_mut() - .empty_directory(path); + .empty_directory(path, true); } - let temporary_dir; - loop { - temporary_dir = format!("{}/composer/{}", vendor_dir, bin2hex(&random_bytes(4))); - if !is_dir(&temporary_dir) { - break; + let temporary_dir = loop { + let candidate = format!("{}/composer/{}", vendor_dir, bin2hex(&random_bytes(4))); + if !is_dir(&candidate) { + break candidate; } - } + }; self.inner_mut().add_cleanup_path(package, &temporary_dir); // avoid cleaning up $path if installing in "." for eg create-project as we can not // delete the directory we are currently in on windows - if !is_dir(path) || realpath(path) != Platform::get_cwd(false).unwrap_or_default() { + if !is_dir(path) || realpath(path) != Some(Platform::get_cwd(false).unwrap_or_default()) { self.inner_mut().add_cleanup_path(package, path); } @@ -114,136 +121,21 @@ pub trait ArchiveDownloader { .ensure_directory_exists(&temporary_dir); let file_name = self.inner().get_file_name(package, path); - let filesystem = &self.inner().filesystem; - - let cleanup = move || { - // remove cache if the file was corrupted - self.inner_mut().clear_last_cache_write(package); - - // clean up - filesystem.borrow_mut().remove_directory(&temporary_dir); - if is_dir(path) && realpath(path) != Platform::get_cwd(false).unwrap_or_default() { - filesystem.borrow_mut().remove_directory(path); - } - self.inner_mut() - .remove_cleanup_path(package, &temporary_dir); - let realpath_result = realpath(path); - if let Some(realpath_val) = realpath_result { - self.inner_mut().remove_cleanup_path(package, &realpath_val); - } - }; - - let promise = match self.extract(package, &file_name, &temporary_dir) { - Ok(p) => p, - Err(e) => { - cleanup(); - return Err(e); - } - }; - - Ok(promise.then( - Box::new(move || -> Result<Box<dyn PromiseInterface>> { - if file_exists(&file_name) { - filesystem.borrow_mut().unlink(&file_name); - } - - let get_folder_content = |dir: &str| -> Vec<std::path::PathBuf> { - let finder = Finder::create() - .ignore_vcs(false) - .ignore_dot_files(false) - .not_name(".DS_Store") - .depth(0) - .in_(dir); - - finder.into_iter().collect() - }; - - let mut rename_recursively: Option<Box<dyn Fn(&str, &str) -> Result<()>>> = None; - // Renames (and recursively merges if needed) a folder into another one - // - // For custom installers, where packages may share paths, and given Composer 2's parallelism, we need to make sure - // that the source directory gets merged into the target one if the target exists. Otherwise rename() by default would - // put the source into the target e.g. src/ => target/src/ (assuming target exists) instead of src/ => target/ - rename_recursively = Some(Box::new(move |from: &str, to: &str| -> Result<()> { - let content_dir = get_folder_content(from); - - // move files back out of the temp dir - for file in &content_dir { - let file = file.to_string_lossy().to_string(); - let file_basename = shirabe_php_shim::basename(&file); - if is_dir(&format!("{}/{}", to, file_basename)) { - if !is_dir(&file) { - return Err(RuntimeException { - message: format!("Installing {} would lead to overwriting the {}/{} directory with a file from the package, invalid operation.", package, to, file_basename), - code: 0, - }.into()); - } - rename_recursively.as_ref().unwrap()( - &file, - &format!("{}/{}", to, file_basename), - )?; - } else { - filesystem.borrow_mut().rename(&file, &format!("{}/{}", to, file_basename)); - } - } - - Ok(()) - })); - - let mut rename_as_one = false; - if !file_exists(path) { - rename_as_one = true; - } else if filesystem.borrow().is_dir_empty(path) { - match filesystem.borrow_mut().remove_directory_php(path) { - Ok(true) => { - rename_as_one = true; - } - _ => { - // ignore error, and simply do not renameAsOne - } - } - } - - let content_dir = get_folder_content(&temporary_dir); - let single_dir_at_top_level = - content_dir.len() == 1 - && is_dir(&content_dir[0].to_string_lossy().to_string()); - - if rename_as_one { - // if the target $path is clear, we can rename the whole package in one go instead of looping over the contents - let extracted_dir = if single_dir_at_top_level { - content_dir[0].to_string_lossy().to_string() - } else { - temporary_dir.clone() - }; - filesystem.borrow_mut().rename(&extracted_dir, path); - } else { - // only one dir in the archive, extract its contents out of it - let from = if single_dir_at_top_level { - content_dir[0].to_string_lossy().to_string() - } else { - temporary_dir.clone() - }; - - rename_recursively.as_ref().unwrap()(&from, path)?; - } + let _ = file_name; - let promise = filesystem.borrow_mut().remove_directory_async(&temporary_dir); + let promise = self.extract(package, "", &temporary_dir)?; - Ok(promise.then( - Box::new(move || -> Result<()> { - self.inner_mut().remove_cleanup_path(package, &temporary_dir); - self.inner_mut().remove_cleanup_path(package, path); - Ok(()) - }), - None, - )) - }), - Box::new(move |e: anyhow::Error| -> Result<()> { - cleanup(); - Err(e) - }), - )) + // TODO(phase-b): the original PHP chains React promise `.then(onFulfilled, onRejected)` + // callbacks that capture `$this`, `$filesystem`, `$package`, `$path`, `$temporaryDir`, + // `$fileName`, and a recursive `$renameRecursively` closure. PromiseInterface::then in + // Rust expects `FnOnce(Option<PhpMixed>) -> Option<PhpMixed>` and the callbacks here + // need both `&mut self` access and to return another promise. This needs a structural + // rework (likely splitting the trait or adding a `then_boxed_result` adapter), plus a + // way to share `&mut self` with the closure (probably `Rc<RefCell<...>>`). + let _ = (&promise, &temporary_dir, package, path); + todo!( + "ArchiveDownloader::install: rewire .then(onFulfilled, onRejected) chain to match PromiseInterface signature" + ) } /// @inheritDoc diff --git a/crates/shirabe/src/downloader/download_manager.rs b/crates/shirabe/src/downloader/download_manager.rs index ea2ee1e..630f16d 100644 --- a/crates/shirabe/src/downloader/download_manager.rs +++ b/crates/shirabe/src/downloader/download_manager.rs @@ -158,7 +158,7 @@ impl DownloadManager { message: sprintf( "Downloader \"%s\" is a %s type downloader and can not be used to download %s for package %s", &[ - PhpMixed::String(get_class(downloader)), + PhpMixed::String(shirabe_php_shim::get_class_obj(downloader)), PhpMixed::String(downloader.get_installation_source()), PhpMixed::String(installation_source.unwrap_or("").to_string()), PhpMixed::String(package.to_string()), @@ -273,9 +273,12 @@ impl DownloadManager { // PHP: $result->then(static fn ($res) => $res, $handleError); // TODO(phase-b): chain $handleError as the rejection handler on the promise - let res = result.then(Box::new(move |res: PhpMixed| -> Result<PhpMixed> { - Ok(res) - })); + let res = result.then( + Some(Box::new(move |res: Option<PhpMixed>| -> Option<PhpMixed> { + res + })), + None, + ); return Ok(res); } @@ -384,12 +387,15 @@ impl DownloadManager { let promise = initial_downloader.unwrap().remove2(initial, &target_dir)?; let target_dir_owned = target_dir.clone(); - // TODO(phase-b): capture self and target into the closure - Ok(promise.then(Box::new( - move |_res: PhpMixed| -> Result<Box<dyn PromiseInterface>> { + // TODO(phase-b): capture self and target into the closure; type mismatch with then signature. + let _ = target_dir_owned; + Ok(promise.then( + Some(Box::new(move |res: Option<PhpMixed>| -> Option<PhpMixed> { + let _ = res; todo!("self.install(target, &target_dir_owned)") - }, - ))) + })), + None, + )) } /// Removes package from target dir. diff --git a/crates/shirabe/src/downloader/downloader_interface.rs b/crates/shirabe/src/downloader/downloader_interface.rs index b72d80e..11ec928 100644 --- a/crates/shirabe/src/downloader/downloader_interface.rs +++ b/crates/shirabe/src/downloader/downloader_interface.rs @@ -79,4 +79,27 @@ pub trait DownloaderInterface: std::fmt::Debug { path: &str, prev_package: Option<&dyn PackageInterface>, ) -> anyhow::Result<Box<dyn PromiseInterface>>; + + /// TODO(phase-b): runtime downcast helpers for PHP `instanceof` checks. + fn as_change_report_interface( + &self, + ) -> Option<&dyn crate::downloader::change_report_interface::ChangeReportInterface> { + None + } + + /// TODO(phase-b): runtime downcast helpers for PHP `instanceof` checks. + fn as_vcs_capable_downloader_interface( + &self, + ) -> Option< + &dyn crate::downloader::vcs_capable_downloader_interface::VcsCapableDownloaderInterface, + > { + None + } + + /// TODO(phase-b): runtime downcast helpers for PHP `instanceof` checks. + fn as_dvcs_downloader_interface( + &self, + ) -> Option<&dyn crate::downloader::dvcs_downloader_interface::DvcsDownloaderInterface> { + None + } } diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs index c814baa..48160e6 100644 --- a/crates/shirabe/src/downloader/file_downloader.rs +++ b/crates/shirabe/src/downloader/file_downloader.rs @@ -67,7 +67,7 @@ pub struct FileDownloader { /// @var ?Cache pub(crate) cache: Option<Cache>, /// @var ?EventDispatcher - pub(crate) event_dispatcher: Option<EventDispatcher>, + pub(crate) event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, /// @var ProcessExecutor pub(crate) process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, /// @var array<string, string> Map of package name to cache key @@ -77,19 +77,29 @@ pub struct FileDownloader { } impl FileDownloader { + /// TODO(phase-b): `$downloadMetadata` is a static property in PHP; not yet mapped to Rust. + pub fn reset_download_metadata() { + todo!("FileDownloader::reset_download_metadata") + } + + /// TODO(phase-b): `$downloadMetadata` is a static property in PHP; not yet mapped to Rust. + pub fn download_metadata() -> indexmap::IndexMap<String, shirabe_php_shim::PhpMixed> { + todo!("FileDownloader::download_metadata") + } + /// Constructor. pub fn new( io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, cache: Option<Cache>, filesystem: Option<std::rc::Rc<std::cell::RefCell<Filesystem>>>, process: Option<std::rc::Rc<std::cell::RefCell<ProcessExecutor>>>, ) -> Self { let process = process.unwrap_or_else(|| { std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(Some( - Box::new(&*io), + io.clone_box(), )))) }); let filesystem = filesystem.unwrap_or_else(|| { @@ -185,7 +195,7 @@ impl DownloaderInterface for FileDownloader { let file_name = self.get_file_name(package, path); self.filesystem.borrow_mut().ensure_directory_exists(path)?; - let dir_of_file = shirabe_php_shim::dirname(&file_name, 1); + let dir_of_file = shirabe_php_shim::dirname(&file_name); self.filesystem .borrow_mut() .ensure_directory_exists(&dir_of_file)?; @@ -209,7 +219,7 @@ impl DownloaderInterface for FileDownloader { _path: &str, _prev_package: Option<&dyn PackageInterface>, ) -> Result<Box<dyn PromiseInterface>> { - Ok(react_promise_resolve(PhpMixed::Null)) + Ok(react_promise_resolve(Some(PhpMixed::Null))) } /// @inheritDoc @@ -257,14 +267,14 @@ impl DownloaderInterface for FileDownloader { for dir in &dirs_to_clean_up { if is_dir(dir) - && self.filesystem.borrow_mut().is_dir_empty(dir)? + && self.filesystem.borrow_mut().is_dir_empty(dir) && realpath(dir).as_deref() != Some(&Platform::get_cwd(false).unwrap_or_default()) { self.filesystem.borrow_mut().remove_directory_php(dir)?; } } - Ok(react_promise_resolve(PhpMixed::Null)) + Ok(react_promise_resolve(Some(PhpMixed::Null))) } /// @inheritDoc @@ -379,8 +389,11 @@ impl ChangeReportInterface for FileDownloader { let mut null_io = NullIO::new(); null_io.load_configuration(&mut *self.config.borrow_mut())?; - let mut e: Option<anyhow::Error> = None; - let mut output: String = String::new(); + // TODO(phase-b): `e` is captured by both the inner closure (assignment in error handler) + // and the outer block (read after the closure). PHP closures capture by reference (`use (&$e)`); + // emulate via Rc<RefCell> or restructure when proper async/promise types land. + let e: std::cell::RefCell<Option<anyhow::Error>> = std::cell::RefCell::new(None); + let output_cell: std::cell::RefCell<String> = std::cell::RefCell::new(String::new()); let target_dir = Filesystem::trim_trailing_slash(path); let result: Result<()> = (|| -> Result<()> { @@ -400,8 +413,8 @@ impl ChangeReportInterface for FileDownloader { })), ); self.http_downloader.borrow_mut().wait()?; - if e.is_some() { - return Err(e.unwrap()); + if e.borrow().is_some() { + return Err(e.borrow_mut().take().unwrap()); } let promise = self.install(package, &format!("{}_compare", target_dir), false)?; promise.then_with( @@ -412,23 +425,25 @@ impl ChangeReportInterface for FileDownloader { })), ); self.process.borrow_mut().wait()?; - if e.is_some() { - return Err(e.unwrap()); + if e.borrow().is_some() { + return Err(e.borrow_mut().take().unwrap()); } let mut comparer = Comparer::new(); comparer.set_source(format!("{}_compare", target_dir)); comparer.set_update(target_dir.clone()); comparer.do_compare(); - output = comparer.get_changed_as_string(true, false); + *output_cell.borrow_mut() = comparer.get_changed_as_string(true, false); self.filesystem .borrow_mut() .remove_directory(&format!("{}_compare", target_dir))?; Ok(()) })(); if let Err(err) = result { - e = Some(err); + *e.borrow_mut() = Some(err); } + let e = e.into_inner(); + let output = output_cell.into_inner(); // TODO(phase-b): restore self.io = prev_io @@ -474,24 +489,26 @@ impl FileDownloader { .to_string() } - fn clear_last_cache_write(&mut self, package: &dyn PackageInterface) { + pub(crate) fn clear_last_cache_write(&mut self, package: &dyn PackageInterface) { if self.cache.is_some() && self.last_cache_writes.contains_key(package.get_name()) { - self.cache - .as_ref() + let key = self + .last_cache_writes + .get(package.get_name()) .unwrap() - .remove(self.last_cache_writes.get(package.get_name()).unwrap()); + .clone(); + self.cache.as_mut().unwrap().remove(&key); self.last_cache_writes.shift_remove(package.get_name()); } } - fn add_cleanup_path(&mut self, package: &dyn PackageInterface, path: &str) { + pub(crate) fn add_cleanup_path(&mut self, package: &dyn PackageInterface, path: &str) { self.additional_cleanup_paths .entry(package.get_name().to_string()) .or_insert_with(Vec::new) .push(path.to_string()); } - fn remove_cleanup_path(&mut self, package: &dyn PackageInterface, path: &str) { + pub(crate) fn remove_cleanup_path(&mut self, package: &dyn PackageInterface, path: &str) { if let Some(paths) = self.additional_cleanup_paths.get_mut(package.get_name()) { // PHP: array_search($path, ..., true) let idx = paths.iter().position(|p| p == path); @@ -503,7 +520,7 @@ impl FileDownloader { } /// Gets file name for specific package - fn get_file_name(&self, package: &dyn PackageInterface, _path: &str) -> String { + pub(crate) fn get_file_name(&self, package: &dyn PackageInterface, _path: &str) -> String { let extension = self.get_dist_path(package, PATHINFO_EXTENSION); let extension = if extension.is_empty() { package.get_dist_type().unwrap_or("").to_string() @@ -539,7 +556,7 @@ impl FileDownloader { } /// Process the download url - fn process_url(&self, package: &dyn PackageInterface, url: &str) -> Result<String> { + pub(crate) fn process_url(&self, package: &dyn PackageInterface, url: &str) -> Result<String> { if !shirabe_php_shim::extension_loaded("openssl") && Some(0) == strpos(url, "https:") { return Err(RuntimeException { message: "You must enable the openssl extension to download files via https" @@ -553,7 +570,7 @@ impl FileDownloader { if package.get_dist_reference().is_some() { url = UrlUtil::update_dist_reference( &*self.config.borrow(), - &url, + url, package.get_dist_reference().unwrap(), ); } @@ -571,7 +588,7 @@ struct UrlEntry { // Suppress unused-import warnings for items kept for parity with the PHP source. #[allow(dead_code)] -const _USE_PARITY: () = { +fn _use_parity() { let _ = filesize; let _ = hash_file; let _ = in_array; @@ -581,4 +598,4 @@ const _USE_PARITY: () = { message: String::new(), code: 0, }; -}; +} diff --git a/crates/shirabe/src/downloader/fossil_downloader.rs b/crates/shirabe/src/downloader/fossil_downloader.rs index 53b4315..8842a3a 100644 --- a/crates/shirabe/src/downloader/fossil_downloader.rs +++ b/crates/shirabe/src/downloader/fossil_downloader.rs @@ -1,7 +1,12 @@ //! ref: composer/src/Composer/Downloader/FossilDownloader.php +use crate::config::Config; +use crate::downloader::downloader_interface::DownloaderInterface; use crate::downloader::vcs_downloader::VcsDownloaderBase; +use crate::io::io_interface::IOInterface; use crate::package::package_interface::PackageInterface; +use crate::util::filesystem::Filesystem; +use crate::util::process_executor::ProcessExecutor; use anyhow::Result; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; @@ -13,6 +18,17 @@ pub struct FossilDownloader { } impl FossilDownloader { + pub fn new( + io: Box<dyn IOInterface>, + config: std::rc::Rc<std::cell::RefCell<Config>>, + process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, + fs: std::rc::Rc<std::cell::RefCell<Filesystem>>, + ) -> Self { + Self { + inner: VcsDownloaderBase::new(io, config, Some(process), Some(fs)), + } + } + pub(crate) fn do_download( &self, _package: &dyn PackageInterface, @@ -31,7 +47,7 @@ impl FossilDownloader { ) -> Result<Box<dyn PromiseInterface>> { self.inner.config.borrow_mut().prohibit_url_by_config( &url, - Some(&self.inner.io), + Some(self.inner.io.as_ref()), &indexmap::IndexMap::new(), )?; @@ -71,7 +87,10 @@ impl FossilDownloader { "fossil".to_string(), "update".to_string(), "--".to_string(), - package.get_source_reference().unwrap_or_default(), + package + .get_source_reference() + .unwrap_or_default() + .to_string(), ], real_path, &mut output, @@ -89,7 +108,7 @@ impl FossilDownloader { ) -> Result<Box<dyn PromiseInterface>> { self.inner.config.borrow_mut().prohibit_url_by_config( &url, - Some(&self.inner.io), + Some(self.inner.io.as_ref()), &indexmap::IndexMap::new(), )?; @@ -120,7 +139,10 @@ impl FossilDownloader { "fossil".to_string(), "up".to_string(), "--".to_string(), - target.get_source_reference().unwrap_or_default(), + target + .get_source_reference() + .unwrap_or_default() + .to_string(), ], real_path, &mut output, @@ -204,7 +226,7 @@ impl FossilDownloader { .inner .process .borrow_mut() - .execute(&command, output, cwd) + .execute(&command, output, cwd)? != 0 { return Err(RuntimeException { @@ -225,3 +247,69 @@ impl FossilDownloader { || std::path::Path::new(&format!("{}/_FOSSIL_", path)).is_file() } } + +// TODO(phase-b): wire up VcsDownloader trait properly. FossilDownloader extends VcsDownloader +// which implements DownloaderInterface in PHP. Delegating each trait method to todo!() until the +// inner VcsDownloaderBase exposes the matching impl surface. +impl DownloaderInterface for FossilDownloader { + fn get_installation_source(&self) -> String { + todo!() + } + + fn download( + &self, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + _output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn prepare( + &self, + _type: &str, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn install( + &self, + _package: &dyn PackageInterface, + _path: &str, + _output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn update( + &self, + _initial: &dyn PackageInterface, + _target: &dyn PackageInterface, + _path: &str, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn remove( + &self, + _package: &dyn PackageInterface, + _path: &str, + _output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn cleanup( + &self, + _type: &str, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } +} diff --git a/crates/shirabe/src/downloader/git_downloader.rs b/crates/shirabe/src/downloader/git_downloader.rs index d451727..519f48a 100644 --- a/crates/shirabe/src/downloader/git_downloader.rs +++ b/crates/shirabe/src/downloader/git_downloader.rs @@ -93,7 +93,10 @@ impl GitDownloader { &format!( " - Syncing <info>{}</info> (<comment>{}</comment>) into cache", package.get_name(), - package.get_full_pretty_version(), + package.get_full_pretty_version( + true, + <dyn PackageInterface>::DISPLAY_SOURCE_REF_IF_DEV, + ), ), true, io_interface::NORMAL, @@ -112,7 +115,7 @@ impl GitDownloader { &cache_path, r#ref.unwrap_or(""), Some(package.get_pretty_version()), - ) && is_dir(&cache_path) + )? && is_dir(&cache_path) { self.cached_packages .entry(package.get_id()) @@ -736,7 +739,7 @@ impl GitDownloader { let changes: Vec<String> = array_map( |elem: &String| format!(" {}", elem), - &Preg::split(r"{\s*\r?\n\s*}", &changes), + &Preg::split(r"{\s*\r?\n\s*}", &changes)?, ); self.inner.io.write_error3( &format!( @@ -747,16 +750,10 @@ impl GitDownloader { io_interface::NORMAL, ); let slice_end = 10_usize.min(changes.len()); - self.inner.io.write_error3( - PhpMixed::List( - changes[..slice_end] - .iter() - .map(|s| Box::new(PhpMixed::String(s.clone()))) - .collect(), - ), - true, - io_interface::NORMAL, - ); + // TODO(phase-b): PHP passes the list directly to writeError; joined here so write_error3 takes &str + self.inner + .io + .write_error3(&changes[..slice_end].join("\n"), true, io_interface::NORMAL); if (changes.len() as i64) > 10 { self.inner.io.write_error3( &format!( @@ -804,16 +801,10 @@ impl GitDownloader { .into()); } Some("v") => { - self.inner.io.write_error3( - PhpMixed::List( - changes - .iter() - .map(|s| Box::new(PhpMixed::String(s.clone()))) - .collect(), - ), - true, - io_interface::NORMAL, - ); + // TODO(phase-b): PHP passes list directly; joined here for &str arg + self.inner + .io + .write_error3(&changes.join("\n"), true, io_interface::NORMAL); } Some("d") => { self.view_diff(&path); @@ -826,21 +817,21 @@ impl GitDownloader { if do_help { // help: + // TODO(phase-b): PHP passes list directly; joined here for &str arg self.inner.io.write_error3( - PhpMixed::List(vec![ - Box::new(PhpMixed::String(format!( + &[ + format!( " y - discard changes and apply the {}", if update { "update" } else { "uninstall" } - ))), - Box::new(PhpMixed::String(format!( + ), + format!( " n - abort the {} and let you manually clean things up", if update { "update" } else { "uninstall" } - ))), - Box::new(PhpMixed::String(" v - view modified files".to_string())), - Box::new(PhpMixed::String( - " d - view local modifications (diff)".to_string(), - )), - ]), + ), + " v - view modified files".to_string(), + " d - view local modifications (diff)".to_string(), + ] + .join("\n"), true, io_interface::NORMAL, ); @@ -925,7 +916,7 @@ impl GitDownloader { // If the non-existent branch is actually the name of a file, the file // is checked out. - let mut branch = Preg::replace(r"{(?:^dev-|(?:\.x)?-dev$)}i", "", &pretty_version); + let mut branch = Preg::replace(r"{(?:^dev-|(?:\.x)?-dev$)}i", "", &pretty_version)?; // Closure equivalent: $execute = function(array $command) use (&$output, $path) { ... }; // Inlined below at each call site. diff --git a/crates/shirabe/src/downloader/gzip_downloader.rs b/crates/shirabe/src/downloader/gzip_downloader.rs index 4ee9d33..43d174a 100644 --- a/crates/shirabe/src/downloader/gzip_downloader.rs +++ b/crates/shirabe/src/downloader/gzip_downloader.rs @@ -31,7 +31,7 @@ impl GzipDownloader { io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, cache: Option<Cache>, filesystem: std::rc::Rc<std::cell::RefCell<Filesystem>>, process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, @@ -88,7 +88,7 @@ impl GzipDownloader { .collect(), ), Some(&mut process_output), - None, + (), )? == 0 { return Ok(shirabe_external_packages::react::promise::resolve(None)); @@ -129,3 +129,66 @@ impl GzipDownloader { fclose(target_file); } } + +impl crate::downloader::downloader_interface::DownloaderInterface for GzipDownloader { + fn get_installation_source(&self) -> String { + self.inner.get_installation_source() + } + + fn download( + &self, + package: &dyn PackageInterface, + path: &str, + prev_package: Option<&dyn PackageInterface>, + output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.download(package, path, prev_package, output) + } + + fn prepare( + &self, + r#type: &str, + package: &dyn PackageInterface, + path: &str, + prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.prepare(r#type, package, path, prev_package) + } + + fn install( + &self, + package: &dyn PackageInterface, + path: &str, + output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.install(package, path, output) + } + + fn update( + &self, + initial: &dyn PackageInterface, + target: &dyn PackageInterface, + path: &str, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.update(initial, target, path) + } + + fn remove( + &self, + package: &dyn PackageInterface, + path: &str, + output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.remove(package, path, output) + } + + fn cleanup( + &self, + r#type: &str, + package: &dyn PackageInterface, + path: &str, + prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.cleanup(r#type, package, path, prev_package) + } +} diff --git a/crates/shirabe/src/downloader/hg_downloader.rs b/crates/shirabe/src/downloader/hg_downloader.rs index 161eb7e..4ccb150 100644 --- a/crates/shirabe/src/downloader/hg_downloader.rs +++ b/crates/shirabe/src/downloader/hg_downloader.rs @@ -1,8 +1,13 @@ //! ref: composer/src/Composer/Downloader/HgDownloader.php +use crate::config::Config; +use crate::downloader::downloader_interface::DownloaderInterface; use crate::downloader::vcs_downloader::VcsDownloaderBase; +use crate::io::io_interface::IOInterface; use crate::package::package_interface::PackageInterface; +use crate::util::filesystem::Filesystem; use crate::util::hg::Hg as HgUtils; +use crate::util::process_executor::ProcessExecutor; use anyhow::Result; use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; use shirabe_php_shim::RuntimeException; @@ -13,6 +18,17 @@ pub struct HgDownloader { } impl HgDownloader { + pub fn new( + io: Box<dyn IOInterface>, + config: std::rc::Rc<std::cell::RefCell<Config>>, + process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, + fs: std::rc::Rc<std::cell::RefCell<Filesystem>>, + ) -> Self { + Self { + inner: VcsDownloaderBase::new(io, config, Some(process), Some(fs)), + } + } + pub(crate) fn do_download( &self, package: &dyn PackageInterface, @@ -59,7 +75,10 @@ impl HgDownloader { "hg".to_string(), "up".to_string(), "--".to_string(), - package.get_source_reference().unwrap_or_default(), + package + .get_source_reference() + .unwrap_or_default() + .to_string(), ]; let mut ignored_output = String::new(); if self.inner.process.borrow_mut().execute_args( @@ -95,7 +114,10 @@ impl HgDownloader { &self.inner.process, ); - let ref_ = target.get_source_reference().unwrap_or_default(); + let ref_ = target + .get_source_reference() + .unwrap_or_default() + .to_string(); self.inner.io.write_error(&format!( " Updating to {}", target.get_source_reference().unwrap_or_default() @@ -195,3 +217,69 @@ impl HgDownloader { std::path::Path::new(&format!("{}/.hg", path)).is_dir() } } + +// TODO(phase-b): wire up VcsDownloader trait properly. HgDownloader extends VcsDownloader which +// implements DownloaderInterface in PHP. Delegating each trait method to todo!() until the inner +// VcsDownloaderBase exposes the matching impl surface. +impl DownloaderInterface for HgDownloader { + fn get_installation_source(&self) -> String { + todo!() + } + + fn download( + &self, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + _output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn prepare( + &self, + _type: &str, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn install( + &self, + _package: &dyn PackageInterface, + _path: &str, + _output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn update( + &self, + _initial: &dyn PackageInterface, + _target: &dyn PackageInterface, + _path: &str, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn remove( + &self, + _package: &dyn PackageInterface, + _path: &str, + _output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn cleanup( + &self, + _type: &str, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } +} diff --git a/crates/shirabe/src/downloader/path_downloader.rs b/crates/shirabe/src/downloader/path_downloader.rs index 26795f3..56ecf0f 100644 --- a/crates/shirabe/src/downloader/path_downloader.rs +++ b/crates/shirabe/src/downloader/path_downloader.rs @@ -11,10 +11,14 @@ use shirabe_php_shim::{ RuntimeException, file_exists, function_exists, is_dir, realpath, }; +use crate::cache::Cache; +use crate::config::Config; use crate::dependency_resolver::operation::install_operation::InstallOperation; use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; +use crate::downloader::downloader_interface::DownloaderInterface; use crate::downloader::file_downloader::FileDownloader; use crate::downloader::vcs_capable_downloader_interface::VcsCapableDownloaderInterface; +use crate::event_dispatcher::event_dispatcher::EventDispatcher; use crate::io::io_interface::IOInterface; use crate::package::archiver::archivable_files_finder::ArchivableFilesFinder; use crate::package::dumper::array_dumper::ArrayDumper; @@ -22,7 +26,9 @@ use crate::package::package_interface::PackageInterface; use crate::package::version::version_guesser::VersionGuesser; use crate::package::version::version_parser::VersionParser; use crate::util::filesystem::Filesystem; +use crate::util::http_downloader::HttpDownloader; use crate::util::platform::Platform; +use crate::util::process_executor::ProcessExecutor; #[derive(Debug)] pub struct PathDownloader { @@ -33,6 +39,28 @@ impl PathDownloader { const STRATEGY_SYMLINK: i64 = 10; const STRATEGY_MIRROR: i64 = 20; + pub fn new( + io: Box<dyn IOInterface>, + config: std::rc::Rc<std::cell::RefCell<Config>>, + http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, + cache: Option<Cache>, + filesystem: std::rc::Rc<std::cell::RefCell<Filesystem>>, + process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, + ) -> Self { + Self { + inner: FileDownloader::new( + io, + config, + http_downloader, + event_dispatcher, + cache, + Some(filesystem), + Some(process), + ), + } + } + pub fn download( &mut self, package: &dyn PackageInterface, @@ -140,7 +168,7 @@ impl PathDownloader { let (mut current_strategy, allowed_strategies) = self.compute_allowed_strategies(&transport_options)?; - let symfony_filesystem = SymfonyFilesystem::new(None); + let symfony_filesystem = SymfonyFilesystem::new(); self.inner.filesystem.borrow_mut().remove_directory(&path); if output { @@ -153,58 +181,63 @@ impl PathDownloader { let mut is_fallback = false; if Self::STRATEGY_SYMLINK == current_strategy { - let symlink_result: Result<Result<(), IOException>> = (|| { - if Platform::is_windows() { - // Implement symlinks as NTFS junctions on Windows - if output { - self.inner.io.write_error3( - &format!("Junctioning from {}", url), - false, - io_interface::NORMAL, - ); - } - Ok(self - .inner - .filesystem - .borrow_mut() - .junction(&real_url, &path)) - } else { - let path = path.trim_end_matches('/').to_string(); - if output { - self.inner.io.write_error3( - &format!("Symlinking from {}", url), - false, - io_interface::NORMAL, - ); - } - if transport_options - .get("relative") - .and_then(|v| v.as_bool()) - .unwrap_or(false) - { - let absolute_path = - if !self.inner.filesystem.borrow_mut().is_absolute_path(&path) { - format!( - "{}{}{}", - Platform::get_cwd(false), - DIRECTORY_SEPARATOR, - path - ) - } else { - path.clone() - }; - let shortest_path = self.inner.filesystem.borrow_mut().find_shortest_path( - &absolute_path, - &real_url, - false, - true, - ); - Ok(symfony_filesystem.symlink(&format!("{}/", shortest_path), &path)) + // TODO(phase-b): PHP catches IOException; shim symfony filesystem returns anyhow::Result. + let symlink_result: Result<anyhow::Result<()>> = + (|| { + if Platform::is_windows() { + // Implement symlinks as NTFS junctions on Windows + if output { + self.inner.io.write_error3( + &format!("Junctioning from {}", url), + false, + io_interface::NORMAL, + ); + } + Ok(self + .inner + .filesystem + .borrow_mut() + .junction(&real_url, &path)) } else { - Ok(symfony_filesystem.symlink(&format!("{}/", real_url), &path)) + let path = path.trim_end_matches('/').to_string(); + if output { + self.inner.io.write_error3( + &format!("Symlinking from {}", url), + false, + io_interface::NORMAL, + ); + } + if transport_options + .get("relative") + .and_then(|v| v.as_bool()) + .unwrap_or(false) + { + let absolute_path = + if !self.inner.filesystem.borrow_mut().is_absolute_path(&path) { + format!( + "{}{}{}", + Platform::get_cwd(false)?, + DIRECTORY_SEPARATOR, + path + ) + } else { + path.clone() + }; + let shortest_path = self + .inner + .filesystem + .borrow_mut() + .find_shortest_path(&absolute_path, &real_url, false, true); + Ok(symfony_filesystem.symlink( + &format!("{}/", shortest_path), + &path, + false, + )) + } else { + Ok(symfony_filesystem.symlink(&format!("{}/", real_url), &path, false)) + } } - } - })(); + })(); match symlink_result? { Ok(()) => {} @@ -249,8 +282,9 @@ impl PathDownloader { io_interface::NORMAL, ); } - let iterator = ArchivableFilesFinder::new(&real_url, vec![], false)?; - symfony_filesystem.mirror(&real_url, &path, Some(&iterator)); + let _iterator = ArchivableFilesFinder::new(&real_url, vec![], false)?; + // TODO(phase-b): pass iterator as PhpMixed; ArchivableFilesFinder iterator wrapping not modelled yet. + symfony_filesystem.mirror(&real_url, &path, None, &IndexMap::new())?; } if output { @@ -325,12 +359,12 @@ impl PathDownloader { let abs_path = if fs.is_absolute_path(&path) { path.clone() } else { - format!("{}/{}", Platform::get_cwd(false), path) + format!("{}/{}", Platform::get_cwd(false)?, path) }; let abs_dist_url = if fs.is_absolute_path(&url) { - url.clone() + url.to_string() } else { - format!("{}/{}", Platform::get_cwd(false), url) + format!("{}/{}", Platform::get_cwd(false)?, url) }; if fs.normalize_path(&abs_path) == fs.normalize_path(&abs_dist_url) { if output { @@ -354,7 +388,7 @@ impl PathDownloader { pub fn get_vcs_reference(&self, package: &dyn PackageInterface, path: &str) -> Option<String> { let path = Filesystem::trim_trailing_slash(path); let parser = VersionParser::new(); - let guesser = VersionGuesser::new( + let mut guesser = VersionGuesser::new( std::rc::Rc::clone(&self.inner.config), std::rc::Rc::clone(&self.inner.process), parser.clone(), @@ -364,11 +398,8 @@ impl PathDownloader { let package_config = dumper.dump(package); let package_version = guesser.guess_version(&package_config, &path); - if let Some(version) = package_version { - return version - .get("commit") - .and_then(|v| v.as_string()) - .map(|s| s.to_owned()); + if let Ok(Some(version)) = package_version { + return version.commit; } None @@ -502,3 +533,70 @@ impl VcsCapableDownloaderInterface for PathDownloader { PathDownloader::get_vcs_reference(self, package, &path) } } + +// TODO(phase-b): wire up PathDownloader trait properly. PathDownloader extends FileDownloader and +// overrides download/install/remove with &mut self signatures that diverge from the trait. The +// trait methods here delegate to the inner FileDownloader; the bespoke overrides on the struct +// itself are not yet routed through the trait. +impl DownloaderInterface for PathDownloader { + fn get_installation_source(&self) -> String { + self.inner.get_installation_source() + } + + fn download( + &self, + package: &dyn PackageInterface, + path: &str, + prev_package: Option<&dyn PackageInterface>, + output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.download(package, path, prev_package, output) + } + + fn prepare( + &self, + r#type: &str, + package: &dyn PackageInterface, + path: &str, + prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.prepare(r#type, package, path, prev_package) + } + + fn install( + &self, + package: &dyn PackageInterface, + path: &str, + output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.install(package, path, output) + } + + fn update( + &self, + initial: &dyn PackageInterface, + target: &dyn PackageInterface, + path: &str, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.update(initial, target, path) + } + + fn remove( + &self, + package: &dyn PackageInterface, + path: &str, + output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.remove(package, path, output) + } + + fn cleanup( + &self, + r#type: &str, + package: &dyn PackageInterface, + path: &str, + prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.cleanup(r#type, package, path, prev_package) + } +} diff --git a/crates/shirabe/src/downloader/perforce_downloader.rs b/crates/shirabe/src/downloader/perforce_downloader.rs index fe5e9e5..b2d05dd 100644 --- a/crates/shirabe/src/downloader/perforce_downloader.rs +++ b/crates/shirabe/src/downloader/perforce_downloader.rs @@ -1,9 +1,14 @@ //! ref: composer/src/Composer/Downloader/PerforceDownloader.php +use crate::config::Config; +use crate::downloader::downloader_interface::DownloaderInterface; use crate::downloader::vcs_downloader::VcsDownloaderBase; +use crate::io::io_interface::IOInterface; use crate::package::package_interface::PackageInterface; use crate::repository::vcs_repository::VcsRepository; +use crate::util::filesystem::Filesystem; use crate::util::perforce::Perforce; +use crate::util::process_executor::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; @@ -17,6 +22,18 @@ pub struct PerforceDownloader { } impl PerforceDownloader { + pub fn new( + io: Box<dyn IOInterface>, + config: std::rc::Rc<std::cell::RefCell<Config>>, + process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, + fs: std::rc::Rc<std::cell::RefCell<Filesystem>>, + ) -> Self { + Self { + inner: VcsDownloaderBase::new(io, config, Some(process), Some(fs)), + perforce: None, + } + } + pub(crate) fn do_download( &self, _package: &dyn PackageInterface, @@ -33,7 +50,7 @@ impl PerforceDownloader { path: String, url: String, ) -> Result<Box<dyn PromiseInterface>> { - let source_ref = package.get_source_reference(); + let source_ref = package.get_source_reference().map(|s| s.to_string()); let label = self.get_label_from_source_reference(source_ref.clone().unwrap_or_default()); self.inner.io.write_error(&format!( @@ -44,7 +61,7 @@ impl PerforceDownloader { self.perforce .as_mut() .unwrap() - .set_stream(source_ref.clone().unwrap_or_default()); + .set_stream(&source_ref.clone().unwrap_or_default()); self.perforce.as_mut().unwrap().p4_login(); self.perforce.as_mut().unwrap().write_p4_client_spec(); self.perforce.as_mut().unwrap().connect_client(); @@ -68,7 +85,7 @@ impl PerforceDownloader { pub fn init_perforce(&mut self, package: &dyn PackageInterface, path: String, url: String) { if self.perforce.is_some() { - self.perforce.as_mut().unwrap().initialize_path(path); + self.perforce.as_mut().unwrap().initialize_path(&path); return; } @@ -83,16 +100,16 @@ impl PerforceDownloader { None }; self.perforce = Some(Perforce::create( - repo_config, + repo_config.unwrap_or_default(), url, path, - &self.inner.process, - &self.inner.io, + std::rc::Rc::clone(&self.inner.process), + self.inner.io.clone_box(), )); } fn get_repo_config(&self, repository: &VcsRepository) -> IndexMap<String, PhpMixed> { - repository.get_repo_config() + repository.get_repo_config().clone() } pub(crate) fn do_update( @@ -118,16 +135,17 @@ impl PerforceDownloader { } pub(crate) fn get_commit_logs( - &self, + &mut self, from_reference: String, to_reference: String, _path: String, ) -> Result<String> { Ok(self .perforce - .as_ref() + .as_mut() .unwrap() - .get_commit_logs(from_reference, to_reference)) + .get_commit_logs(&from_reference, &to_reference) + .unwrap_or_default()) } pub fn set_perforce(&mut self, perforce: Perforce) { @@ -138,3 +156,69 @@ impl PerforceDownloader { true } } + +// TODO(phase-b): wire up VcsDownloader trait properly. PerforceDownloader extends VcsDownloader +// which implements DownloaderInterface in PHP. Delegating each trait method to todo!() until the +// inner VcsDownloaderBase exposes the matching impl surface. +impl DownloaderInterface for PerforceDownloader { + fn get_installation_source(&self) -> String { + todo!() + } + + fn download( + &self, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + _output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn prepare( + &self, + _type: &str, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn install( + &self, + _package: &dyn PackageInterface, + _path: &str, + _output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn update( + &self, + _initial: &dyn PackageInterface, + _target: &dyn PackageInterface, + _path: &str, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn remove( + &self, + _package: &dyn PackageInterface, + _path: &str, + _output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn cleanup( + &self, + _type: &str, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + todo!() + } +} diff --git a/crates/shirabe/src/downloader/phar_downloader.rs b/crates/shirabe/src/downloader/phar_downloader.rs index 19777fb..f6c15b8 100644 --- a/crates/shirabe/src/downloader/phar_downloader.rs +++ b/crates/shirabe/src/downloader/phar_downloader.rs @@ -27,7 +27,7 @@ impl PharDownloader { io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, cache: Option<Cache>, filesystem: std::rc::Rc<std::cell::RefCell<Filesystem>>, process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, diff --git a/crates/shirabe/src/downloader/rar_downloader.rs b/crates/shirabe/src/downloader/rar_downloader.rs index afc2f12..0366e28 100644 --- a/crates/shirabe/src/downloader/rar_downloader.rs +++ b/crates/shirabe/src/downloader/rar_downloader.rs @@ -30,7 +30,7 @@ impl RarDownloader { io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, cache: Option<Cache>, filesystem: std::rc::Rc<std::cell::RefCell<Filesystem>>, process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, @@ -75,7 +75,7 @@ impl RarDownloader { .collect(), ), Some(&mut process_output), - None, + (), )? == 0 { return Ok(shirabe_external_packages::react::promise::resolve(None)); diff --git a/crates/shirabe/src/downloader/svn_downloader.rs b/crates/shirabe/src/downloader/svn_downloader.rs index c228379..5b20ff8 100644 --- a/crates/shirabe/src/downloader/svn_downloader.rs +++ b/crates/shirabe/src/downloader/svn_downloader.rs @@ -7,10 +7,14 @@ use shirabe_external_packages::react::promise; use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; use shirabe_php_shim::{PhpMixed, RuntimeException, is_dir, version_compare}; +use crate::config::Config; +use crate::downloader::downloader_interface::DownloaderInterface; use crate::downloader::vcs_downloader::VcsDownloaderBase; use crate::io::io_interface::IOInterface; use crate::package::package_interface::PackageInterface; use crate::repository::vcs_repository::VcsRepository; +use crate::util::filesystem::Filesystem; +use crate::util::process_executor::ProcessExecutor; use crate::util::svn::Svn as SvnUtil; #[derive(Debug)] @@ -20,6 +24,18 @@ pub struct SvnDownloader { } impl SvnDownloader { + pub fn new( + io: Box<dyn IOInterface>, + config: std::rc::Rc<std::cell::RefCell<Config>>, + process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, + fs: std::rc::Rc<std::cell::RefCell<Filesystem>>, + ) -> Self { + Self { + inner: VcsDownloaderBase::new(io, config, Some(process), Some(fs)), + cache_credentials: true, + } + } + pub(crate) fn do_download( &mut self, package: &dyn PackageInterface, @@ -28,8 +44,8 @@ impl SvnDownloader { prev_package: Option<&dyn PackageInterface>, ) -> anyhow::Result<Box<dyn PromiseInterface>> { SvnUtil::clean_env(); - let util = SvnUtil::new( - url, + let mut util = SvnUtil::new( + url.to_string(), self.inner.io.clone_box(), std::rc::Rc::clone(&self.inner.config), Some(std::rc::Rc::clone(&self.inner.process)), @@ -70,7 +86,10 @@ impl SvnDownloader { } self.inner.io.write_error3( - &format!(" Checking out {}", package.get_source_reference()), + &format!( + " Checking out {}", + package.get_source_reference().unwrap_or_default() + ), true, io_interface::NORMAL, ); @@ -78,7 +97,7 @@ impl SvnDownloader { package, url, vec!["svn".to_string(), "co".to_string()], - &format!("{}/{}", url, r#ref), + &format!("{}/{}", url, r#ref.unwrap_or_default()), None, Some(path), )?; @@ -107,8 +126,8 @@ impl SvnDownloader { .into()); } - let util = SvnUtil::new( - url, + let mut util = SvnUtil::new( + url.to_string(), self.inner.io.clone_box(), std::rc::Rc::clone(&self.inner.config), Some(std::rc::Rc::clone(&self.inner.process)), @@ -119,7 +138,7 @@ impl SvnDownloader { } self.inner.io.write_error3( - &format!(" Checking out {}", r#ref), + &format!(" Checking out {}", r#ref.unwrap_or_default()), true, io_interface::NORMAL, ); @@ -129,7 +148,7 @@ impl SvnDownloader { target, url, command, - &format!("{}/{}", url, r#ref), + &format!("{}/{}", url, r#ref.unwrap_or_default()), Some(path), None, )?; @@ -168,7 +187,7 @@ impl SvnDownloader { path: Option<&str>, ) -> anyhow::Result<String> { let mut util = SvnUtil::new( - base_url, + base_url.to_string(), self.inner.io.clone_box(), std::rc::Rc::clone(&self.inner.config), Some(std::rc::Rc::clone(&self.inner.process)), @@ -212,6 +231,7 @@ impl SvnDownloader { let changes_str = changes.unwrap(); let changes: Vec<String> = Preg::split(r"{\s*\r?\n\s*}", &changes_str) + .unwrap_or_default() .into_iter() .map(|elem| format!(" {}", elem)) .collect(); @@ -226,16 +246,10 @@ impl SvnDownloader { io_interface::NORMAL, ); let slice_end = 10_usize.min(changes.len()); - self.inner.io.write_error3( - PhpMixed::List( - changes[..slice_end] - .iter() - .map(|s| Box::new(PhpMixed::String(s.clone()))) - .collect(), - ), - true, - io_interface::NORMAL, - ); + // TODO(phase-b): PHP writeError accepts array<string>; iterate per-line for now. + for line in &changes[..slice_end] { + self.inner.io.write_error3(line, true, io_interface::NORMAL); + } if count_changes > 10 { let remaining_changes = count_changes - 10; self.inner.io.write_error3( @@ -271,34 +285,28 @@ impl SvnDownloader { .into()); } Some("v") => { - self.inner.io.write_error3( - PhpMixed::List( - changes - .iter() - .map(|s| Box::new(PhpMixed::String(s.clone()))) - .collect(), - ), - true, - io_interface::NORMAL, - ); + // TODO(phase-b): PHP writeError accepts array<string>; iterate per-line. + for line in &changes { + self.inner.io.write_error3(line, true, io_interface::NORMAL); + } } _ => { - self.inner.io.write_error3( - PhpMixed::List(vec![ - Box::new(PhpMixed::String(format!( - " y - discard changes and apply the {}", - if update { "update" } else { "uninstall" } - ))), - Box::new(PhpMixed::String(format!( - " n - abort the {} and let you manually clean things up", - if update { "update" } else { "uninstall" } - ))), - Box::new(PhpMixed::String(" v - view modified files".to_string())), - Box::new(PhpMixed::String(" ? - print help".to_string())), - ]), - true, - io_interface::NORMAL, - ); + // TODO(phase-b): PHP writeError accepts array<string>; iterate per-line. + let help_lines = vec![ + format!( + " y - discard changes and apply the {}", + if update { "update" } else { "uninstall" } + ), + format!( + " n - abort the {} and let you manually clean things up", + if update { "update" } else { "uninstall" } + ), + " v - view modified files".to_string(), + " ? - print help".to_string(), + ]; + for line in &help_lines { + self.inner.io.write_error3(line, true, io_interface::NORMAL); + } } } } @@ -374,7 +382,7 @@ impl SvnDownloader { ]; let mut util = SvnUtil::new( - &base_url, + base_url, self.inner.io.clone_box(), std::rc::Rc::clone(&self.inner.config), Some(std::rc::Rc::clone(&self.inner.process)), @@ -421,3 +429,69 @@ impl SvnDownloader { is_dir(&format!("{}/.svn", path)) } } + +// TODO(phase-b): wire up VcsDownloader trait properly. SvnDownloader extends VcsDownloader which +// implements DownloaderInterface in PHP. Delegating each trait method to todo!() until the inner +// VcsDownloaderBase exposes the matching impl surface. +impl DownloaderInterface for SvnDownloader { + fn get_installation_source(&self) -> String { + todo!() + } + + fn download( + &self, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + _output: bool, + ) -> anyhow::Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn prepare( + &self, + _type: &str, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + ) -> anyhow::Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn install( + &self, + _package: &dyn PackageInterface, + _path: &str, + _output: bool, + ) -> anyhow::Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn update( + &self, + _initial: &dyn PackageInterface, + _target: &dyn PackageInterface, + _path: &str, + ) -> anyhow::Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn remove( + &self, + _package: &dyn PackageInterface, + _path: &str, + _output: bool, + ) -> anyhow::Result<Box<dyn PromiseInterface>> { + todo!() + } + + fn cleanup( + &self, + _type: &str, + _package: &dyn PackageInterface, + _path: &str, + _prev_package: Option<&dyn PackageInterface>, + ) -> anyhow::Result<Box<dyn PromiseInterface>> { + todo!() + } +} diff --git a/crates/shirabe/src/downloader/tar_downloader.rs b/crates/shirabe/src/downloader/tar_downloader.rs index 8fcf339..10d2614 100644 --- a/crates/shirabe/src/downloader/tar_downloader.rs +++ b/crates/shirabe/src/downloader/tar_downloader.rs @@ -27,7 +27,7 @@ impl TarDownloader { io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, cache: Option<Cache>, filesystem: std::rc::Rc<std::cell::RefCell<Filesystem>>, process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, diff --git a/crates/shirabe/src/downloader/vcs_downloader.rs b/crates/shirabe/src/downloader/vcs_downloader.rs index 39518e3..cc8f9fb 100644 --- a/crates/shirabe/src/downloader/vcs_downloader.rs +++ b/crates/shirabe/src/downloader/vcs_downloader.rs @@ -6,7 +6,8 @@ use indexmap::IndexMap; use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, RuntimeException, array_map, array_shift, count, explode, - get_class, implode, rawurldecode, realpath, str_replace, strlen, strpos, substr, trim, + get_class, get_class_err, implode, rawurldecode, realpath, str_replace, strlen, strpos, substr, + trim, }; use crate::config::Config; @@ -40,9 +41,8 @@ impl VcsDownloaderBase { process: Option<std::rc::Rc<std::cell::RefCell<ProcessExecutor>>>, fs: Option<std::rc::Rc<std::cell::RefCell<Filesystem>>>, ) -> Self { - let process = process.unwrap_or_else(|| { - std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(None))) - }); + let process = process + .unwrap_or_else(|| std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(())))); let filesystem = fs.unwrap_or_else(|| std::rc::Rc::new(std::cell::RefCell::new(Filesystem::new(None)))); Self { @@ -53,6 +53,21 @@ impl VcsDownloaderBase { has_cleaned_changes: IndexMap::new(), } } + + /// Equivalent of PHP `parent::cleanChanges()`. Subclasses that override the trait method + /// call this when they need to invoke the base behavior. Since this lives on the data struct, + /// it cannot consult subclass-specific `get_local_changes`; it assumes any callers have + /// already verified that no local changes exist. + pub fn clean_changes( + &self, + _package: &dyn PackageInterface, + _path: &str, + _update: bool, + ) -> Result<Box<dyn PromiseInterface>> { + // TODO(phase-b): parent::cleanChanges() rechecks getLocalChanges via dynamic dispatch. + // Callers in subclasses must do that check themselves (they already have). + Ok(shirabe_external_packages::react::promise::resolve(None)) + } } pub trait VcsDownloader: @@ -140,7 +155,7 @@ pub trait VcsDownloader: } if self.io().is_debug() { self.io_mut().write_error3( - &format!("Failed: [{}] {}", get_class(&e), e,), + &format!("Failed: [{}] {}", get_class_err(&e), e,), true, io_interface::NORMAL, ); @@ -183,7 +198,9 @@ pub trait VcsDownloader: self.has_cleaned_changes_mut() .insert(prev_package.unwrap().get_unique_name(), true); } else if r#type == "install" { - self.filesystem_mut().borrow_mut().empty_directory(path); + self.filesystem_mut() + .borrow_mut() + .empty_directory(path, true)?; } else if r#type == "uninstall" { self.clean_changes(package, path, false)?; } @@ -251,7 +268,7 @@ pub trait VcsDownloader: } if self.io().is_debug() { self.io_mut().write_error3( - &format!("Failed: [{}] {}", get_class(&e), e,), + &format!("Failed: [{}] {}", get_class_err(&e), e,), true, io_interface::NORMAL, ); @@ -326,7 +343,7 @@ pub trait VcsDownloader: } if self.io().is_debug() { self.io_mut().write_error3( - &format!("Failed: [{}] {}", get_class(&e), e,), + &format!("Failed: [{}] {}", get_class_err(&e), e,), true, io_interface::NORMAL, ); @@ -406,22 +423,25 @@ pub trait VcsDownloader: let promise = self .filesystem_mut() .borrow_mut() - .remove_directory_async(path); + .remove_directory_async(path)?; let path = path.to_string(); - Ok( - promise.then(Box::new(move |result: PhpMixed| -> Result<()> { - let result_bool = result.as_bool().unwrap_or(false); - if !result_bool { - return Err(RuntimeException { - message: format!("Could not completely delete {}, aborting.", path), - code: 0, + // TODO(phase-b): closure return type mismatches PromiseInterface::then signature. + Ok(promise.then( + Some(Box::new( + move |result: Option<PhpMixed>| -> Option<PhpMixed> { + let result_bool = result.as_ref().and_then(|v| v.as_bool()).unwrap_or(false); + if !result_bool { + let _: RuntimeException = RuntimeException { + message: format!("Could not completely delete {}, aborting.", path), + code: 0, + }; } - .into()); - } - Ok(()) - })), - ) + None + }, + )), + None, + )) } fn get_vcs_reference(&self, package: &dyn PackageInterface, path: &str) -> Option<String> { @@ -435,11 +455,9 @@ pub trait VcsDownloader: let dumper = ArrayDumper::new(); let package_config = dumper.dump(package); - if let Some(package_version) = guesser.guess_version(&package_config, path) { - return package_version - .get("commit") - .and_then(|v| v.as_string()) - .map(|s| s.to_string()); + let mut guesser = guesser; + if let Ok(Some(package_version)) = guesser.guess_version(&package_config, path) { + return package_version.commit.clone(); } None diff --git a/crates/shirabe/src/downloader/xz_downloader.rs b/crates/shirabe/src/downloader/xz_downloader.rs index 99c29d3..a16341c 100644 --- a/crates/shirabe/src/downloader/xz_downloader.rs +++ b/crates/shirabe/src/downloader/xz_downloader.rs @@ -26,7 +26,7 @@ impl XzDownloader { io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, cache: Option<Cache>, filesystem: std::rc::Rc<std::cell::RefCell<Filesystem>>, process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, @@ -62,7 +62,7 @@ impl XzDownloader { .collect(), ), Some(&mut ignored_output), - None, + (), )? == 0 { return Ok(shirabe_external_packages::react::promise::resolve(None)); diff --git a/crates/shirabe/src/downloader/zip_downloader.rs b/crates/shirabe/src/downloader/zip_downloader.rs index bfaf180..835c118 100644 --- a/crates/shirabe/src/downloader/zip_downloader.rs +++ b/crates/shirabe/src/downloader/zip_downloader.rs @@ -1,6 +1,7 @@ //! ref: composer/src/Composer/Downloader/ZipDownloader.php use crate::downloader::archive_downloader::ArchiveDownloader; +use crate::downloader::downloader_interface::DownloaderInterface; use crate::downloader::file_downloader::FileDownloader; use crate::package::package_interface::PackageInterface; use crate::util::ini_helper::IniHelper; @@ -31,6 +32,36 @@ pub struct ZipDownloader { } impl ZipDownloader { + pub fn new( + io: Box<dyn crate::io::io_interface::IOInterface>, + config: std::rc::Rc<std::cell::RefCell<crate::config::Config>>, + http_downloader: std::rc::Rc< + std::cell::RefCell<crate::util::http_downloader::HttpDownloader>, + >, + event_dispatcher: Option< + std::rc::Rc< + std::cell::RefCell<crate::event_dispatcher::event_dispatcher::EventDispatcher>, + >, + >, + cache: Option<crate::cache::Cache>, + filesystem: std::rc::Rc<std::cell::RefCell<crate::util::filesystem::Filesystem>>, + process: std::rc::Rc<std::cell::RefCell<crate::util::process_executor::ProcessExecutor>>, + ) -> Self { + Self { + inner: FileDownloader::new( + io, + config, + http_downloader, + event_dispatcher, + cache, + Some(filesystem), + Some(process), + ), + cleanup_executed: IndexMap::new(), + zip_archive_object: None, + } + } + pub fn download( &mut self, package: &dyn PackageInterface, @@ -45,7 +76,9 @@ impl ZipDownloader { let finder = ExecutableFinder::new(); let commands = unzip_commands.as_mut().unwrap(); if Platform::is_windows() { - if let Some(cmd) = finder.find("7z", None, &[r"C:\Program Files\7-Zip"]) { + if let Some(cmd) = + finder.find("7z", None, &[r"C:\Program Files\7-Zip".to_string()]) + { commands.push(vec![ "7z".to_string(), cmd, @@ -216,7 +249,9 @@ impl ZipDownloader { if self .inner .process - .execute(&[command_spec[1].as_str()], &mut output) + .borrow_mut() + .execute(&[command_spec[1].as_str()], &mut output, None::<&str>) + .unwrap_or(1) == 0 { let mut m: IndexMap<CaptureKey, String> = IndexMap::new(); @@ -238,97 +273,22 @@ impl ZipDownloader { } } - let io = &self.inner.io; - let try_fallback = |process_error: anyhow::Error| -> Result<Box<dyn PromiseInterface>> { - if is_last_chance { - return Err(process_error); - } - - if process_error.to_string().contains("zip bomb") { - return Err(process_error); - } - - if !is_file(file) { - io.write_error(&format!(" <warning>{}</warning>", process_error)); - io.write_error(" <warning>This most likely is due to a custom installer plugin not handling the returned Promise from the downloader</warning>"); - io.write_error(" <warning>See https://github.com/composer/installers/commit/5006d0c28730ade233a8f42ec31ac68fb1c5c9bb for an example fix</warning>"); - } else { - io.write_error(&format!(" <warning>{}</warning>", process_error)); - io.write_error(" The archive may contain identical file names with different capitalization (which fails on case insensitive filesystems)"); - io.write_error(&format!( - " Unzip with {} command failed, falling back to ZipArchive class", - executable - )); - - if Platform::get_env("GITHUB_ACTIONS").is_some() - && Platform::get_env("COMPOSER_TESTS_ARE_RUNNING").is_none() - { - io.write_error(" <warning>Additional debug info, please report to https://github.com/composer/composer/issues/11148 if you see this:</warning>"); - io.write_error(&format!("File size: {}", filesize(file).unwrap_or(0))); - io.write_error(&format!( - "File SHA1: {}", - hash_file("sha1", file).unwrap_or_default() - )); - let content = file_get_contents(file).unwrap_or_default(); - let bytes = content.as_bytes(); - io.write_error(&format!( - "First 100 bytes (hex): {}", - bin2hex(&bytes[..bytes.len().min(100)]) - )); - let len = bytes.len(); - io.write_error(&format!( - "Last 100 bytes (hex): {}", - bin2hex(&bytes[len.saturating_sub(100)..]) - )); - if package.get_dist_url().map_or(false, |u| !u.is_empty()) { - io.write_error(&format!( - "Origin URL: {}", - self.inner - .process_url(package, &package.get_dist_url().unwrap_or_default()) - )); - let headers = FileDownloader::response_headers.lock().unwrap(); - io.write_error(&format!( - "Response Headers: {}", - json_encode(&shirabe_php_shim::PhpMixed::Null) - .unwrap_or_else(|| "[]".to_string()) - )); - } - } - } - - self.extract_with_zip_archive(package, file, path) - }; - - match self.inner.process.borrow_mut().execute_async(&command) { - Ok(promise) => Ok(promise.then( - Box::new(move |process: Process| -> Result<()> { - if !process.is_successful() { - if self.inner.cleanup_executed.contains_key(package.get_name()) { - return Err(RuntimeException { - message: format!("Failed to extract {} as the installation was aborted by another package operation.", package.get_name()), - code: 0, - }.into()); - } - - let mut output = process.get_error_output(); - output = output.replace(&format!(", {}.zip or {}.ZIP", file, file), ""); - - return try_fallback(RuntimeException { - message: format!( - "Failed to extract {}: ({}) {}\n\n{}", - package.get_name(), - process.get_exit_code().unwrap_or(0), - command.join(" "), - output, - ), - code: 0, - }.into()); - } - Ok(()) - }), - None, - )), - Err(e) => try_fallback(e), + // TODO(phase-b): full try_fallback closure deferred — PHP captures `$io`, `$self` + // and several locals by reference, conflicting with Rust's borrow checker because + // `extract_with_zip_archive` later needs `&mut self`. Restructure once the + // promise/closure plumbing supports that shape. + let _ = ( + is_last_chance, + file, + path, + executable, + package, + &command, + &self.inner.io, + ); + match self.inner.process.borrow_mut().execute_async(&command, ()) { + Ok(_promise) => todo!("phase-b: chain promise.then with fallback closure"), + Err(_e) => todo!("phase-b: pipe execute_async error into try_fallback"), } } @@ -462,3 +422,69 @@ impl ZipDownloader { } } } + +// TODO(phase-b): ZipDownloader::download is overridden with extra setup (UNZIP_COMMANDS init, +// etc.). The trait method here delegates straight to the inner FileDownloader; the bespoke +// override on the struct itself takes &mut self and is not yet routed through the trait. +impl crate::downloader::downloader_interface::DownloaderInterface for ZipDownloader { + fn get_installation_source(&self) -> String { + self.inner.get_installation_source() + } + + fn download( + &self, + package: &dyn PackageInterface, + path: &str, + prev_package: Option<&dyn PackageInterface>, + output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.download(package, path, prev_package, output) + } + + fn prepare( + &self, + r#type: &str, + package: &dyn PackageInterface, + path: &str, + prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.prepare(r#type, package, path, prev_package) + } + + fn install( + &self, + package: &dyn PackageInterface, + path: &str, + output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.install(package, path, output) + } + + fn update( + &self, + initial: &dyn PackageInterface, + target: &dyn PackageInterface, + path: &str, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.update(initial, target, path) + } + + fn remove( + &self, + package: &dyn PackageInterface, + path: &str, + output: bool, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.remove(package, path, output) + } + + fn cleanup( + &self, + r#type: &str, + package: &dyn PackageInterface, + path: &str, + prev_package: Option<&dyn PackageInterface>, + ) -> Result<Box<dyn PromiseInterface>> { + self.inner.cleanup(r#type, package, path, prev_package) + } +} diff --git a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs index a8d9a74..33da710 100644 --- a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs +++ b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs @@ -88,11 +88,11 @@ impl EventDispatcher { Platform::get_env("COMPOSER_SKIP_SCRIPTS").unwrap_or_else(|| "".to_string()); let skip_scripts: Vec<String> = skip_scripts_env .split(',') - .map(|v| trim(v, " \t\n\r\0\u{0B}")) + .map(|v| trim(v, Some(" \t\n\r\0\u{0B}"))) .filter(|val| val != "") .collect(); Self { - composer, + composer: Box::new(composer), io, loader: None, process, @@ -251,8 +251,12 @@ impl EventDispatcher { // other newly appeared prepended autoloaders should be appended instead to ensure Composer loads its classes first // TODO(plugin): ClassLoader detection via instanceof — currently treat all callbacks uniformly - spl_autoload_unregister(cb.clone()); - spl_autoload_register(cb); + // TODO(phase-b): `cb` is a PhpMixed; spl_autoload_*/register expect a typed + // Box<dyn Fn(&str) -> PhpMixed + Send + Sync> callback. Bridging requires + // exposing the underlying callable from PhpMixed. + let _ = &cb; + let _ = spl_autoload_unregister; + let _ = spl_autoload_register; } result @@ -358,7 +362,12 @@ impl EventDispatcher { let args: Vec<String>; if let Some(index) = array_search_in_vec("@additional_args", &script) { - let _ = array_splice::<String>(&mut script, index, 0, &additional_args); + let _ = array_splice::<String>( + &mut script, + index as i64, + Some(0), + additional_args.clone(), + ); args = script.clone(); } else { let mut merged = script.clone(); @@ -558,7 +567,7 @@ impl EventDispatcher { continue; } - let mut app = Application::new(); + let mut app = Application::new("", ""); app.set_catch_exceptions(false); if method_exists( &PhpMixed::String("Application".to_string()), @@ -579,15 +588,18 @@ impl EventDispatcher { .join(" "); // reusing the output from $this->io is mostly needed for tests, but generally speaking // it does not hurt to keep the same stream as the current Application - let output = if let Some(_console_io) = - self.io.as_any().downcast_ref::<ConsoleIO>() - { + // TODO(phase-b): IOInterface needs an `as_any` shim before + // `instanceof ConsoleIO` can be expressed; treat io as a + // generic IOInterface for now. + let _io_ref: &dyn IOInterface = &*self.io; + let downcast: Option<&ConsoleIO> = None; + let output: ConsoleOutput = if let Some(_console_io) = downcast { // TODO(plugin): \ReflectionProperty to read private `output` from ConsoleIO // is required by the original PHP — needs user-decided porting strategy. let _refl_php_version_gate = PHP_VERSION_ID < 80100; todo!("\\ReflectionProperty on ConsoleIO::$output") } else { - ConsoleOutput::new() + ConsoleOutput::new(0, None, None) }; let input_str = event .get_flags() @@ -595,7 +607,9 @@ impl EventDispatcher { .and_then(|v| v.as_string()) .unwrap_or(&args) .to_string(); - Ok(app.run(StringInput::new(input_str), output)) + let mut input = StringInput::new(&input_str); + let mut output = output; + Ok(app.run(Some(&mut input), Some(&mut output))?) })(); match result { Ok(v) => r#return = v, @@ -690,12 +704,8 @@ impl EventDispatcher { if strpos(&exec, "=").is_none() { Platform::clear_env(&substr(&exec, 8, None)); } else { - let parts: Vec<&str> = substr(&exec, 8, None) - .splitn(2, '=') - .collect::<Vec<_>>() - .iter() - .map(|s| *s) - .collect(); + let after = substr(&exec, 8, None); + let parts: Vec<&str> = after.splitn(2, '=').collect(); let var = parts[0].to_string(); let value = parts[1].to_string(); Platform::put_env(&var, &value); @@ -727,7 +737,7 @@ impl EventDispatcher { m.get(&CaptureKey::ByIndex(0)).cloned().unwrap_or_default(); if !file_exists(&m0) { let finder = ExecutableFinder::new(); - if let Some(path_to_exec) = finder.find(&m0) { + if let Some(path_to_exec) = finder.find(&m0, None, &[]) { let mut path_to_exec = path_to_exec; if Platform::is_windows() { let exec_without_ext = Preg::replace( @@ -848,10 +858,10 @@ impl EventDispatcher { fn execute_tty(&self, exec: &str) -> anyhow::Result<i64> { if self.io.is_interactive() { - return self.process.borrow_mut().execute_tty(exec); + return self.process.borrow_mut().execute_tty(exec, ()); } - self.process.borrow_mut().execute(exec) + self.process.borrow_mut().execute(exec, (), ()) } fn get_php_exec_command(&self) -> anyhow::Result<String> { @@ -1045,8 +1055,10 @@ impl EventDispatcher { let package = self.composer.get_package(); let scripts = package.get_scripts(); - let event_scripts = match scripts.get(event.get_name()) { - Some(v) if !Self::is_empty_value(v) => v.clone(), + // TODO(phase-b): RootPackage::get_scripts() returns Vec<String> per event; + // mirror PHP's is_empty_value semantics on the Vec form. + let event_scripts: Vec<String> = match scripts.get(event.get_name()) { + Some(v) if !v.is_empty() => v.clone(), _ => return Vec::new(), }; @@ -1064,23 +1076,7 @@ impl EventDispatcher { } // PHP returns the array of script strings; convert each to Callable::String - match event_scripts { - PhpMixed::Array(map) => map - .values() - .filter_map(|v| match v.as_ref() { - PhpMixed::String(s) => Some(Callable::String(s.clone())), - _ => None, - }) - .collect(), - PhpMixed::List(list) => list - .iter() - .filter_map(|v| match v.as_ref() { - PhpMixed::String(s) => Some(Callable::String(s.clone())), - _ => None, - }) - .collect(), - _ => Vec::new(), - } + event_scripts.into_iter().map(Callable::String).collect() } /// Checks if string given references a class path and method @@ -1203,10 +1199,14 @@ impl EventDispatcher { fn make_autoloader(&mut self, event: &Event, callable: &Callable) { // TODO(plugin): full autoloader rebuild on plugin-supplied callables — currently a stub. - let composer = match self.composer_as_full() { - Some(c) => c, - None => return, - }; + // TODO(phase-b): composer_as_full() returns Option<&Composer> borrowed from &self, + // which conflicts with &mut self updates further down (previous_listeners, + // previous_hash, loader). Resolve when Composer ownership is shared. For now, + // short-circuit before any mutable use and fabricate the rest via todo!(). + if self.composer_as_full().is_none() { + return; + } + let composer: &Composer = todo!("composer_as_full borrows &self; needs shared ownership"); let callable_key = match callable { Callable::ArrayCallable(first, method) => { @@ -1247,9 +1247,15 @@ impl EventDispatcher { self.previous_hash = Some(hash_value); - let package_map = - generator.build_package_map(composer.get_installation_manager(), package, &packages); - let map = generator.parse_autoloads(&package_map, package); + // TODO(phase-b): build_package_map needs &mut InstallationManager and returns Result; + // Composer is &Composer here so we cannot take a mut borrow. Defer until shared ownership. + let _ = generator; + let _ = packages; + let package_map: Vec<(Box<dyn PackageInterface>, Option<String>)> = + todo!("build_package_map requires &mut InstallationManager"); + // TODO(phase-b): parse_autoloads also expects the filtered dev packages list + // (PhpMixed in this port). + let map = generator.parse_autoloads(package_map, package, shirabe_php_shim::PhpMixed::Null); if self.loader.is_some() { self.loader.as_mut().unwrap().unregister(); @@ -1262,7 +1268,7 @@ impl EventDispatcher { .as_string() .map(|s| s.to_string()) .unwrap_or_default(); - let mut loader = generator.create_loader(&map, &vendor_dir); + let mut loader = generator.create_loader(&map, Some(vendor_dir.clone())); loader.register(false); self.loader = Some(loader); } diff --git a/crates/shirabe/src/factory.rs b/crates/shirabe/src/factory.rs index 321d590..6dc2fbd 100644 --- a/crates/shirabe/src/factory.rs +++ b/crates/shirabe/src/factory.rs @@ -116,7 +116,7 @@ impl Factory { let appdata = Platform::get_env("APPDATA").unwrap_or_default(); return Ok(format!( "{}/Composer", - trim(&strtr(&appdata, "\\", "/"), "/") + trim(&strtr(&appdata, "\\", "/"), Some("/")) )); } @@ -168,7 +168,7 @@ impl Factory { cache_dir = format!("{}/cache", home); } - return Ok(trim(&strtr(&cache_dir, "\\", "/"), "/")); + return Ok(trim(&strtr(&cache_dir, "\\", "/"), Some("/"))); } let user_dir = Self::get_user_dir()?; @@ -233,11 +233,12 @@ impl Factory { io: Option<&dyn IOInterface>, cwd: Option<&str>, ) -> anyhow::Result<Config> { - let cwd = cwd - .map(|s| s.to_string()) - .unwrap_or_else(|| Platform::get_cwd(true)); + let cwd = match cwd { + Some(s) => s.to_string(), + None => Platform::get_cwd(true)?, + }; - let mut config = Config::new(true, cwd); + let mut config = Config::new(true, Some(cwd)); // determine and add main dirs to the config let home = Self::get_home_dir()?; @@ -256,10 +257,11 @@ impl Factory { "config".to_string(), PhpMixed::Array(inner.into_iter().map(|(k, v)| (k, Box::new(v))).collect()), ); - config.merge(defaults, Config::SOURCE_DEFAULT); + config.merge(&defaults, Config::SOURCE_DEFAULT); // load global config - let file = JsonFile::new(format!("{}/config.json", config.get_str("home")?), None, io)?; + let global_config_path = format!("{}/config.json", config.get_str("home")?); + let mut file = JsonFile::new(global_config_path.clone(), None, io.map(|i| i.clone_box()))?; if file.exists() { if let Some(io_ref) = io { io_ref.write_error3( @@ -268,15 +270,29 @@ impl Factory { crate::io::io_interface::DEBUG, ); } + // TODO(phase-b): validate_json_schema takes ownership of JsonFile; recreate it Self::validate_json_schema( io, - ValidateJsonInput::File(file.clone()), + ValidateJsonInput::File(JsonFile::new( + global_config_path.clone(), + None, + io.map(|i| i.clone_box()), + )?), JsonFile::LAX_SCHEMA, None, )?; - config.merge(file.read()?, file.get_path().to_string()); + let read_data = match file.read()? { + PhpMixed::Array(map) => map + .into_iter() + .map(|(k, v)| (k, *v)) + .collect::<IndexMap<_, _>>(), + _ => IndexMap::new(), + }; + let file_path_owned = file.get_path().to_string(); + config.merge(&read_data, &file_path_owned); } - config.set_config_source(JsonConfigSource::new(file.clone(), false)); + // TODO(phase-b): set_config_source takes Box<dyn ConfigSourceInterface> + config.set_config_source(Box::new(JsonConfigSource::new(file, false))); let htaccess_protect = config.get("htaccess-protect").as_bool().unwrap_or(false); if htaccess_protect { @@ -305,7 +321,8 @@ impl Factory { } // load global auth file - let auth_file = JsonFile::new(format!("{}/auth.json", config.get_str("home")?), None, io)?; + let auth_file_path = format!("{}/auth.json", config.get_str("home")?); + let mut auth_file = JsonFile::new(auth_file_path.clone(), None, io.map(|i| i.clone_box()))?; if auth_file.exists() { if let Some(io_ref) = io { io_ref.write_error3( @@ -314,26 +331,36 @@ impl Factory { crate::io::io_interface::DEBUG, ); } + // TODO(phase-b): validate_json_schema takes ownership; recreate JsonFile Self::validate_json_schema( io, - ValidateJsonInput::File(auth_file.clone()), + ValidateJsonInput::File(JsonFile::new( + auth_file_path.clone(), + None, + io.map(|i| i.clone_box()), + )?), JsonFile::AUTH_SCHEMA, None, )?; + let read_data: IndexMap<String, PhpMixed> = match auth_file.read()? { + PhpMixed::Array(map) => map.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }; let mut wrapped: IndexMap<String, PhpMixed> = IndexMap::new(); wrapped.insert( "config".to_string(), PhpMixed::Array( - auth_file - .read()? + read_data .into_iter() .map(|(k, v)| (k, Box::new(v))) .collect(), ), ); - config.merge(wrapped, auth_file.get_path().to_string()); + let auth_path_owned = auth_file.get_path().to_string(); + config.merge(&wrapped, &auth_path_owned); } - config.set_auth_config_source(JsonConfigSource::new(auth_file, true)); + // TODO(phase-b): set_auth_config_source takes Box<dyn ConfigSourceInterface> + config.set_auth_config_source(Box::new(JsonConfigSource::new(auth_file, true))); Self::load_composer_auth_env(&mut config, io)?; @@ -343,7 +370,7 @@ impl Factory { pub fn get_composer_file() -> anyhow::Result<String> { let env = Platform::get_env("COMPOSER"); if let Some(env_str) = env { - let env_trimmed = trim(&env_str, " \t\n\r\0\u{0B}"); + let env_trimmed = trim(&env_str, Some(" \t\n\r\0\u{0B}")); if env_trimmed != "" { if is_dir(&env_trimmed) { return Err(anyhow::anyhow!(RuntimeException { @@ -385,24 +412,21 @@ impl Factory { let mut styles: IndexMap<String, OutputFormatterStyle> = IndexMap::new(); styles.insert( "highlight".to_string(), - OutputFormatterStyle::new(Some("red".to_string()), None, Vec::new()), + OutputFormatterStyle::new(Some("red"), None, Some(vec![])), ); styles.insert( "warning".to_string(), - OutputFormatterStyle::new( - Some("black".to_string()), - Some("yellow".to_string()), - Vec::new(), - ), + OutputFormatterStyle::new(Some("black"), Some("yellow"), Some(vec![])), ); styles } pub fn create_output() -> ConsoleOutput { - let styles = Self::create_additional_styles(); - let formatter = OutputFormatter::new(false, styles); - - ConsoleOutput::new_with_formatter(ConsoleOutput::VERBOSITY_NORMAL, None, formatter) + let _styles = Self::create_additional_styles(); + // TODO(phase-b): OutputFormatter::new signature and ConsoleOutput::new_with_formatter missing + todo!( + "create_output: wire OutputFormatter into ConsoleOutput once the symfony console stubs are completed" + ) } /// Creates a Composer instance @@ -424,7 +448,10 @@ impl Factory { } } - let cwd = cwd.unwrap_or_else(|| Platform::get_cwd(true)); + let cwd = match cwd { + Some(s) => s, + None => Platform::get_cwd(true)?, + }; // load Composer configuration if local_config.is_none() { @@ -437,7 +464,7 @@ impl Factory { if let Some(LocalConfigInput::Path(path)) = &local_config { composer_file = Some(path.clone()); - let file = JsonFile::new(path.clone(), None, Some(io))?; + let mut file = JsonFile::new(path.clone(), None, Some(io.clone_box()))?; if !file.exists() { let message = if path == "./composer.json" || path == "composer.json" { @@ -473,7 +500,11 @@ impl Factory { } } - local_config_data = file.read()?.as_array().cloned().unwrap_or_default(); + local_config_data = file + .read()? + .as_array() + .map(|m| m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) + .unwrap_or_default(); local_config_source = file.get_path().to_string(); } else if let Some(LocalConfigInput::Data(data)) = local_config { local_config_data = data; @@ -504,7 +535,7 @@ impl Factory { false, ))); - let local_auth_file = JsonFile::new( + let mut local_auth_file = JsonFile::new( format!( "{}/auth.json", dirname(&realpath(composer_file_path).unwrap_or_default()) @@ -554,7 +585,8 @@ impl Factory { if full_load { // load auth configs into the IO instance - io.load_configuration(&mut *config.borrow_mut())?; + // TODO(phase-b): load_configuration requires &mut IOInterface; create_composer takes &dyn IOInterface + // io.load_configuration(&mut *config.borrow_mut())?; // load existing Composer\InstalledVersions instance if available and scripts/plugins are allowed, as they might need it // we only load if the InstalledVersions class wasn't defined yet so that this is only loaded once @@ -578,7 +610,9 @@ impl Factory { let http_downloader = std::rc::Rc::new(std::cell::RefCell::new( Self::create_http_downloader(io, &config, IndexMap::new())?, )); - let process = std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(io))); + let process = std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(Some( + io.clone_box(), + )))); let r#loop = std::rc::Rc::new(std::cell::RefCell::new(Loop::new( std::rc::Rc::clone(&http_downloader), Some(std::rc::Rc::clone(&process)), @@ -586,23 +620,25 @@ impl Factory { composer.set_loop(r#loop.clone()); // initialize event dispatcher - let mut dispatcher = EventDispatcher::new( - composer.as_partial(), - io.clone_box(), - Some(std::rc::Rc::clone(&process)), - ); - dispatcher.set_run_scripts(!disable_scripts); - composer.set_event_dispatcher(dispatcher.clone()); + let dispatcher = { + let mut d = EventDispatcher::new( + composer.as_partial(), + io.clone_box(), + Some(std::rc::Rc::clone(&process)), + ); + d.set_run_scripts(!disable_scripts); + std::rc::Rc::new(std::cell::RefCell::new(d)) + }; + composer.set_event_dispatcher(std::rc::Rc::clone(&dispatcher)); // initialize repository manager - let rm = RepositoryFactory::manager( + let mut rm = RepositoryFactory::manager( io, &config, Some(std::rc::Rc::clone(&http_downloader)), - Some(dispatcher.clone()), + Some(std::rc::Rc::clone(&dispatcher)), Some(std::rc::Rc::clone(&process)), )?; - composer.set_repository_manager(rm.clone()); // force-set the version of the global package if not defined as // guessing it adds no value and only takes time @@ -616,9 +652,12 @@ impl Factory { std::rc::Rc::clone(&config), std::rc::Rc::clone(&process), parser.clone(), + Some(io.clone_box()), ); + // TODO(phase-b): RepositoryManager is a PHP class — both composer.set_repository_manager() + // and self.load_root_package() want ownership. Use a placeholder rm for the loader. let mut loader = self.load_root_package( - rm.clone(), + todo!("share RepositoryManager via Rc<RefCell<>>"), std::rc::Rc::clone(&config), parser, guesser, @@ -632,24 +671,28 @@ impl Factory { "Composer\\Package\\RootPackage", Some(&cwd), )?; - composer.set_package(package); + // TODO(phase-b): set_package expects RootPackageInterface; loader returns BasePackage + // composer.set_package(package); + let _ = package; // load local repository self.add_local_repository( io, - rm.clone(), + &mut rm, &vendor_dir, composer.get_package(), Some(&process), ); + composer.set_repository_manager(rm); // initialize installation manager let im = self.create_installation_manager( r#loop.clone(), io.clone_box(), - Some(dispatcher.clone()), + Some(std::rc::Rc::clone(&dispatcher)), ); - composer.set_installation_manager(im.clone()); + // TODO(phase-b): set_installation_manager takes ownership; im needs sharing for create_default_installers + composer.set_installation_manager(im); if let PartialComposerOrComposer::Full(ref mut composer_full) = composer { // initialize download manager @@ -663,7 +706,8 @@ impl Factory { composer_full.set_download_manager(dm.clone()); // initialize autoload generator - let generator = AutoloadGenerator::new(&dispatcher, io.clone_box()); + let generator = + AutoloadGenerator::new(std::rc::Rc::clone(&dispatcher), Some(io.clone_box())); composer_full.set_autoload_generator(generator); // initialize archive manager @@ -694,6 +738,7 @@ impl Factory { ); } + // TODO(phase-b): InstallationManager is a PHP class — needs Rc<RefCell<>> sharing let locker = Locker::new( io.clone_box(), JsonFile::new( @@ -703,27 +748,29 @@ impl Factory { Platform::get_dev_null() }, None, - Some(io), + Some(io.clone_box()), )?, - im.clone(), - file_get_contents(composer_file_path).unwrap_or_default(), + todo!("InstallationManager clone"), + &file_get_contents(composer_file_path).unwrap_or_default(), std::rc::Rc::clone(&process), ); composer_full.set_locker(locker); } else { + let lock_contents = JsonFile::encode( + &PhpMixed::Array( + local_config_data + .iter() + .map(|(k, v)| (k.clone(), Box::new(v.clone()))) + .collect(), + ), + 448, + ); + // TODO(phase-b): InstallationManager is a PHP class — needs Rc<RefCell<>> sharing let locker = Locker::new( io.clone_box(), - JsonFile::new(Platform::get_dev_null(), None, Some(io))?, - im.clone(), - JsonFile::encode( - &PhpMixed::Array( - local_config_data - .iter() - .map(|(k, v)| (k.clone(), Box::new(v.clone()))) - .collect(), - ), - 448, - ), + JsonFile::new(Platform::get_dev_null(), None, Some(io.clone_box()))?, + todo!("InstallationManager clone"), + &lock_contents, std::rc::Rc::clone(&process), ); composer_full.set_locker(locker); @@ -748,24 +795,25 @@ impl Factory { global_composer.as_ref(), disable_plugins, ); - composer_full.set_plugin_manager(pm.clone()); - + // TODO(phase-b): PluginManager is a PHP class; sharing pm before transferring requires Rc<RefCell<>> if composer_full.is_global() { pm.set_running_in_global_dir(true); } - pm.load_installed_plugins(); + composer_full.set_plugin_manager(pm); } if full_load { let init_event = Event::from_name(PluginEvents::INIT.to_string()); composer - .get_event_dispatcher_mut() + .get_event_dispatcher() + .borrow_mut() .dispatch(Some(init_event.get_name()), Some(init_event))?; // once everything is initialized we can // purge packages from local repos if they have been deleted on the filesystem - self.purge_packages(rm.get_local_repository(), &im); + // TODO(phase-b): rm and im are owned by composer at this point; need to access via composer + // self.purge_packages(rm.get_local_repository(), &mut im)?; } Ok(composer) @@ -789,7 +837,7 @@ impl Factory { fn add_local_repository( &self, io: &dyn IOInterface, - mut rm: RepositoryManager, + rm: &mut RepositoryManager, vendor_dir: &str, root_package: &dyn RootPackageInterface, process: Option<&std::rc::Rc<std::cell::RefCell<ProcessExecutor>>>, @@ -865,9 +913,12 @@ impl Factory { config: &std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: &std::rc::Rc<std::cell::RefCell<HttpDownloader>>, process: &std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, - event_dispatcher: Option<&EventDispatcher>, + event_dispatcher: Option<&std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, ) -> anyhow::Result<std::rc::Rc<std::cell::RefCell<DownloadManager>>> { - let mut cache: Option<Cache> = None; + // TODO(phase-b): cache is shared across all downloaders; PHP class semantics requires + // either Rc<RefCell<Cache>> (with corresponding signature changes everywhere) or + // making Cache cloneable. For now we don't construct a cache and pass None below. + let _cache: Option<Cache> = None; if config .borrow_mut() .get("cache-files-ttl") @@ -875,19 +926,13 @@ impl Factory { .unwrap_or(0) > 0 { - let mut c = Cache::new( - io, + let _ = Cache::new( + io.clone_box(), &config.borrow_mut().get_str("cache-files-dir")?, - "a-z0-9_./", - ); - c.set_read_only( - config - .borrow_mut() - .get("cache-read-only") - .and_then(|v| v.as_bool()) - .unwrap_or(false), + Some("a-z0-9_./"), + None, + false, ); - cache = Some(c); } let fs = std::rc::Rc::new(std::cell::RefCell::new(Filesystem::new(Some( @@ -895,8 +940,8 @@ impl Factory { )))); let mut dm = DownloadManager::new(io.clone_box(), false, Some(std::rc::Rc::clone(&fs))); - let preferred = config.borrow_mut().get("preferred-install").cloned(); - match preferred.as_ref().and_then(|v| v.as_string()) { + let preferred = config.borrow_mut().get("preferred-install"); + match preferred.as_string() { Some("dist") => { dm.set_prefer_dist(true); } @@ -908,7 +953,7 @@ impl Factory { } } - if let Some(PhpMixed::Array(prefs)) = preferred { + if let PhpMixed::Array(prefs) = preferred { dm.set_preferences( prefs .into_iter() @@ -977,7 +1022,7 @@ impl Factory { std::rc::Rc::clone(&config), std::rc::Rc::clone(http_downloader), event_dispatcher.cloned(), - cache.clone(), + None, // TODO(phase-b): shared Cache requires Rc<RefCell<Cache>>; see _cache std::rc::Rc::clone(&fs), std::rc::Rc::clone(&process), )), @@ -989,7 +1034,7 @@ impl Factory { std::rc::Rc::clone(&config), std::rc::Rc::clone(http_downloader), event_dispatcher.cloned(), - cache.clone(), + None, // TODO(phase-b): shared Cache requires Rc<RefCell<Cache>>; see _cache std::rc::Rc::clone(&fs), std::rc::Rc::clone(&process), )), @@ -1001,7 +1046,7 @@ impl Factory { std::rc::Rc::clone(&config), std::rc::Rc::clone(http_downloader), event_dispatcher.cloned(), - cache.clone(), + None, // TODO(phase-b): shared Cache requires Rc<RefCell<Cache>>; see _cache std::rc::Rc::clone(&fs), std::rc::Rc::clone(&process), )), @@ -1013,7 +1058,7 @@ impl Factory { std::rc::Rc::clone(&config), std::rc::Rc::clone(http_downloader), event_dispatcher.cloned(), - cache.clone(), + None, // TODO(phase-b): shared Cache requires Rc<RefCell<Cache>>; see _cache std::rc::Rc::clone(&fs), std::rc::Rc::clone(&process), )), @@ -1025,7 +1070,7 @@ impl Factory { std::rc::Rc::clone(&config), std::rc::Rc::clone(http_downloader), event_dispatcher.cloned(), - cache.clone(), + None, // TODO(phase-b): shared Cache requires Rc<RefCell<Cache>>; see _cache std::rc::Rc::clone(&fs), std::rc::Rc::clone(&process), )), @@ -1037,7 +1082,7 @@ impl Factory { std::rc::Rc::clone(&config), std::rc::Rc::clone(http_downloader), event_dispatcher.cloned(), - cache.clone(), + None, // TODO(phase-b): shared Cache requires Rc<RefCell<Cache>>; see _cache std::rc::Rc::clone(&fs), std::rc::Rc::clone(&process), )), @@ -1049,7 +1094,7 @@ impl Factory { std::rc::Rc::clone(&config), std::rc::Rc::clone(http_downloader), event_dispatcher.cloned(), - cache.clone(), + None, // TODO(phase-b): shared Cache requires Rc<RefCell<Cache>>; see _cache Some(std::rc::Rc::clone(&fs)), Some(std::rc::Rc::clone(&process)), )), @@ -1061,7 +1106,7 @@ impl Factory { std::rc::Rc::clone(&config), std::rc::Rc::clone(http_downloader), event_dispatcher.cloned(), - cache.clone(), + None, // TODO(phase-b): shared Cache requires Rc<RefCell<Cache>>; see _cache std::rc::Rc::clone(&fs), std::rc::Rc::clone(&process), )), @@ -1094,19 +1139,17 @@ impl Factory { global_composer: Option<&PartialComposer>, disable_plugins: DisablePlugins, ) -> PluginManager { - PluginManager::new( - io.clone_box(), - composer.clone(), - global_composer.cloned(), - disable_plugins, - ) + // TODO(phase-b): PluginManager::new takes ownership of Composer/PartialComposer; PHP + // class semantics requires Rc<RefCell<>> for shared access. Stubbed for now. + let _ = (io, composer, global_composer, disable_plugins); + todo!("PluginManager::new requires shared Composer/PartialComposer") } pub fn create_installation_manager( &self, r#loop: std::rc::Rc<std::cell::RefCell<Loop>>, io: Box<dyn IOInterface>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, ) -> InstallationManager { InstallationManager::new(r#loop, io, event_dispatcher) } @@ -1127,7 +1170,7 @@ impl Factory { .borrow_mut() .get_str("bin-dir") .unwrap_or_default(), - "/", + Some("/"), ); let bin_compat = composer .get_config() @@ -1140,31 +1183,20 @@ impl Factory { .borrow_mut() .get_str("vendor-dir") .unwrap_or_default(), - "/", + Some("/"), ); - let binary_installer = BinaryInstaller::new( + // TODO(phase-b): BinaryInstaller is a PHP class so it can't be cloned. Sharing requires + // Rc<RefCell<BinaryInstaller>>; for now construct one per installer. + let _binary_installer = BinaryInstaller::new( io.clone_box(), - bin_dir, - bin_compat, + bin_dir.clone(), + bin_compat.clone(), Some(std::rc::Rc::clone(&fs)), - vendor_dir, + Some(vendor_dir.clone()), ); - let mut im = im.clone(); - im.add_installer(Box::new(LibraryInstaller::new( - io.clone_box(), - composer.as_partial(), - None, - Some(std::rc::Rc::clone(&fs)), - binary_installer.clone(), - ))); - im.add_installer(Box::new(PluginInstaller::new( - io.clone_box(), - composer.as_partial(), - Some(std::rc::Rc::clone(&fs)), - binary_installer.clone(), - ))); - im.add_installer(Box::new(MetapackageInstaller::new(io.clone_box()))); + // TODO(phase-b): InstallationManager not clone-able; need shared Rc<RefCell<>> + let _ = im; } fn purge_packages( @@ -1240,7 +1272,7 @@ impl Factory { static mut WARNED: bool = false; let mut disable_tls = false; // allow running the config command if disable-tls is in the arg list, even if openssl is missing, to allow disabling it via the config command - let argv = Platform::server_argv().unwrap_or_default(); + let argv = shirabe_php_shim::server_argv(); if !argv.is_empty() && argv.contains(&"disable-tls".to_string()) && (argv.contains(&"conf".to_string()) || argv.contains(&"config".to_string())) @@ -1301,12 +1333,13 @@ impl Factory { http_downloader_options = array_replace_recursive(http_downloader_options, options.clone()); } - let http_downloader = match HttpDownloader::new_full( + let http_downloader_result: anyhow::Result<HttpDownloader> = Ok(HttpDownloader::new( io.clone_box(), std::rc::Rc::clone(config), http_downloader_options, disable_tls, - ) { + )); + let http_downloader = match http_downloader_result { Ok(h) => h, Err(e) => { if let Some(te) = e.downcast_ref::<TransportException>() { @@ -1372,13 +1405,14 @@ impl Factory { if !matches!(auth_data_assoc, PhpMixed::Null) { let mut wrapped: IndexMap<String, PhpMixed> = IndexMap::new(); wrapped.insert("config".to_string(), auth_data_assoc); - config.merge(wrapped, "COMPOSER_AUTH".to_string()); + config.merge(&wrapped, "COMPOSER_AUTH"); } Ok(()) } fn use_xdg() -> bool { - for key in array_keys(&Platform::server_env()) { + // PHP: array_keys($_SERVER) — iterate env-style server vars + for (key, _) in std::env::vars() { if strpos(&key, "XDG_") == Some(0) { return true; } @@ -1398,7 +1432,7 @@ impl Factory { })); } - Ok(trim(&strtr(&home, "\\", "/"), "/")) + Ok(trim(&strtr(&home, "\\", "/"), Some("/"))) } fn validate_json_schema( @@ -1412,7 +1446,7 @@ impl Factory { } let result = match file_or_data { - ValidateJsonInput::File(file) => file.validate_schema(schema), + ValidateJsonInput::File(mut file) => file.validate_schema(schema, None), ValidateJsonInput::Data(data) => { let source = source.ok_or_else(|| { anyhow::anyhow!(InvalidArgumentException { @@ -1422,7 +1456,7 @@ impl Factory { code: 0, }) })?; - JsonFile::validate_json_schema(source, &data, schema) + JsonFile::validate_json_schema(source, &data, schema, None) } }; @@ -1484,7 +1518,10 @@ impl PartialComposerOrComposer { Self::Partial(p) => p.set_loop(r#loop), } } - fn set_event_dispatcher(&mut self, dispatcher: EventDispatcher) { + fn set_event_dispatcher( + &mut self, + dispatcher: std::rc::Rc<std::cell::RefCell<EventDispatcher>>, + ) { match self { Self::Full(c) => c.set_event_dispatcher(dispatcher), Self::Partial(p) => p.set_event_dispatcher(dispatcher), @@ -1520,18 +1557,16 @@ impl PartialComposerOrComposer { Self::Partial(p) => p.get_config(), } } - fn get_event_dispatcher_mut(&mut self) -> &mut EventDispatcher { + fn get_event_dispatcher(&self) -> &std::rc::Rc<std::cell::RefCell<EventDispatcher>> { match self { - Self::Full(c) => c.get_event_dispatcher_mut(), - Self::Partial(p) => p.get_event_dispatcher_mut(), + Self::Full(c) => c.get_event_dispatcher(), + Self::Partial(p) => p.get_event_dispatcher(), } } fn as_partial(&self) -> PartialComposer { - // TODO(phase-b): exact clone semantics differ across Composer/PartialComposer. - match self { - Self::Full(_) => PartialComposer::default(), - Self::Partial(p) => p.clone(), - } + // TODO(phase-b): PHP class semantics requires sharing PartialComposer by reference; + // currently returning a fresh default since PartialComposer is not Clone. + PartialComposer::default() } fn into_partial(self) -> PartialComposer { match self { diff --git a/crates/shirabe/src/installer.rs b/crates/shirabe/src/installer.rs index 40d08cf..55e45e5 100644 --- a/crates/shirabe/src/installer.rs +++ b/crates/shirabe/src/installer.rs @@ -20,9 +20,9 @@ use indexmap::IndexMap; use shirabe_external_packages::seld::json_lint::parsing_exception::ParsingException; use shirabe_php_shim::{ - RuntimeException, array_flip, array_map, array_merge, array_unique, array_values, clone, count, - defined, gc_collect_cycles, gc_disable, gc_enable, get_class, implode, in_array, intval, - is_dir, is_numeric, is_string, max_i64, sprintf, strcmp, strpos, strtolower, touch, + PhpMixed, RuntimeException, array_flip, array_map, array_merge, array_unique, array_values, + clone, count, defined, gc_collect_cycles, gc_disable, gc_enable, get_class, implode, in_array, + intval, is_dir, is_numeric, is_string, max_i64, sprintf, strcmp, strpos, strtolower, touch, trigger_error, usort, }; use shirabe_semver; @@ -99,7 +99,7 @@ pub struct Installer { pub(crate) repository_manager: RepositoryManager, pub(crate) locker: Locker, pub(crate) installation_manager: InstallationManager, - pub(crate) event_dispatcher: EventDispatcher, + pub(crate) event_dispatcher: std::rc::Rc<std::cell::RefCell<EventDispatcher>>, pub(crate) autoload_generator: AutoloadGenerator, pub(crate) prefer_source: bool, pub(crate) prefer_dist: bool, @@ -154,7 +154,7 @@ impl Installer { repository_manager: RepositoryManager, locker: Locker, installation_manager: InstallationManager, - event_dispatcher: EventDispatcher, + event_dispatcher: std::rc::Rc<std::cell::RefCell<EventDispatcher>>, autoload_generator: AutoloadGenerator, ) -> Self { let suggested_packages_reporter = SuggestedPackagesReporter::new(io.clone_box()); @@ -237,7 +237,9 @@ impl Installer { self.execute_operations = false; self.write_lock = false; self.dump_autoloader = false; - self.mock_local_repositories(&mut self.repository_manager); + // TODO(phase-b): borrow conflict: passing &mut self.repository_manager while &self + // is implicit. Refactor mock_local_repositories or split borrow. + // self.mock_local_repositories(&mut self.repository_manager); } if self.download_only { @@ -258,8 +260,12 @@ impl Installer { } else { ScriptEvents::PRE_INSTALL_CMD }; - self.event_dispatcher - .dispatch_script(event_name, self.dev_mode); + self.event_dispatcher.borrow_mut().dispatch_script( + event_name, + self.dev_mode, + vec![], + IndexMap::new(), + ); } self.download_manager @@ -269,15 +275,17 @@ impl Installer { .borrow_mut() .set_prefer_dist(self.prefer_dist); - let local_repo = self.repository_manager.get_local_repository(); + let local_repo_box = self + .repository_manager + .get_local_repository() + .clone_installed_repository_box(); - let res_result: anyhow::Result<i64> = (|| { - if self.update { - self.do_update(local_repo, self.install) - } else { - self.do_install(local_repo, false) - } - })(); + let install = self.install; + let res_result: anyhow::Result<i64> = if self.update { + self.do_update(local_repo_box, install) + } else { + self.do_install(local_repo_box, false) + }; let res = match res_result { Ok(r) => { @@ -321,14 +329,14 @@ impl Installer { .get_locked_repository(self.dev_mode)? .clone_box(), Box::new(self.create_platform_repo(false)), - Box::new(RootPackageRepository::new(clone(&self.package))), + Box::new(RootPackageRepository::new(self.package.clone_box())), ]); if is_fresh_install { self.suggested_packages_reporter .add_suggestions_from_package(&*self.package); } self.suggested_packages_reporter - .output_minimalistic(&installed_repo); + .output_minimalistic(Some(&installed_repo), None); } // Find abandoned packages and warn user @@ -339,11 +347,8 @@ impl Installer { _ => continue, }; - let replacement = if is_string(complete.get_replacement_package()) { - format!( - "Use {} instead", - complete.get_replacement_package().as_string().unwrap_or("") - ) + let replacement = if let Some(repl) = complete.get_replacement_package() { + format!("Use {} instead", repl) } else { "No replacement was suggested".to_string() }; @@ -373,34 +378,45 @@ impl Installer { .set_platform_requirement_filter(self.platform_requirement_filter.clone_box()); self.autoload_generator.dump( &*self.config.borrow(), - &local_repo, + self.repository_manager.get_local_repository(), &*self.package, - &self.installation_manager, + &mut self.installation_manager, "composer", self.optimize_autoloader, None, - Some(&self.locker), + Some(&mut self.locker), + false, )?; } if self.install && self.execute_operations { // force binaries re-generation in case they are missing - for package in local_repo.get_packages() { - self.installation_manager.ensure_binaries_presence(package); + for package in self + .repository_manager + .get_local_repository() + .get_packages() + { + self.installation_manager + .ensure_binaries_presence(&*package); } } let fund_env = Platform::get_env("COMPOSER_FUND"); let mut show_funding = true; if let Some(ref s) = fund_env { - if is_numeric(s) { - show_funding = intval(s) != 0; + let mixed = PhpMixed::String(s.to_string()); + if is_numeric(&mixed) { + show_funding = intval(&mixed) != 0; } } if show_funding { let mut funding_count: i64 = 0; - for package in local_repo.get_packages() { + for package in self + .repository_manager + .get_local_repository() + .get_packages() + { if let Some(cp) = package.as_complete_package_interface() { if package.as_alias_package().is_none() && !cp.get_funding().is_empty() { funding_count += 1; @@ -408,17 +424,16 @@ impl Installer { } } if funding_count > 0 { - self.io.write_error(vec![ - sprintf( - "<info>%d package%s you are using %s looking for funding.</info>", - &[ - funding_count.into(), - (if 1 == funding_count { "" } else { "s" }).into(), - (if 1 == funding_count { "is" } else { "are" }).into(), - ], - ), - "<info>Use the `composer fund` command to find out more!</info>".to_string(), - ]); + self.io.write_error(&sprintf( + "<info>%d package%s you are using %s looking for funding.</info>", + &[ + funding_count.into(), + (if 1 == funding_count { "" } else { "s" }).into(), + (if 1 == funding_count { "is" } else { "are" }).into(), + ], + )); + self.io + .write_error("<info>Use the `composer fund` command to find out more!</info>"); } } @@ -429,8 +444,12 @@ impl Installer { } else { ScriptEvents::POST_INSTALL_CMD }; - self.event_dispatcher - .dispatch_script(event_name, self.dev_mode); + self.event_dispatcher.borrow_mut().dispatch_script( + event_name, + self.dev_mode, + vec![], + IndexMap::new(), + ); } // re-enable GC except on HHVM which triggers a warning here @@ -444,12 +463,17 @@ impl Installer { let (packages, target) = if self.update && !self.install { (locked_repository.get_canonical_packages(), "locked") } else { - (local_repo.get_canonical_packages(), "installed") + ( + self.repository_manager + .get_local_repository() + .get_canonical_packages(), + "installed", + ) }; - if count(&packages) > 0 { + if packages.len() > 0 { let auditor = Auditor; let mut repo_set = RepositorySet::new( - "stable".to_string(), + "stable", IndexMap::new(), vec![], IndexMap::new(), @@ -457,21 +481,15 @@ impl Installer { IndexMap::new(), ); for repo in self.repository_manager.get_repositories() { - repo_set.add_repository(repo); + repo_set.add_repository(repo.clone_box())?; } - let audit_result = auditor.audit( - &*self.io, - &repo_set, - &packages, - &audit_config.audit_format, - true, - &audit_config.ignore_list_for_audit, - &audit_config.audit_abandoned, - &audit_config.ignore_severity_for_audit, - audit_config.ignore_unreachable, - &audit_config.ignore_abandoned_for_audit, - ); + // TODO(phase-b): Auditor::audit takes owned packages/ignore lists; need cloning + // strategy. PHP shares these (copy semantics for arrays). Cloning for now is + // safe because arrays use copy semantics, but trait objects (packages) cannot + // be cloned trivially. + let audit_result: anyhow::Result<i64> = todo!(); + let _ = (&auditor, &repo_set, &packages, &audit_config); match audit_result { Ok(n) => { return Ok(if n > 0 && self.error_on_audit { @@ -483,10 +501,12 @@ impl Installer { Err(e) => { if let Some(te) = e.downcast_ref::<TransportException>() { self.io - .error(&format!("Failed to audit {} packages.", target)); + .error(&format!("Failed to audit {} packages.", target), &[]); if self.io.is_verbose() { - self.io - .error(&format!("[{}] {}", get_class(te), te.get_message())); + self.io.error( + &format!("[{}] {}", "TransportException", te.get_message()), + &[], + ); } } else { return Err(e); @@ -510,10 +530,10 @@ impl Installer { let platform_repo = self.create_platform_repo(true); let aliases = self.get_root_aliases(true); - let mut locked_repository: Option<Box<LockArrayRepository>> = None; + let mut locked_repository: Option<LockArrayRepository> = None; - let try_load_locked = - || -> anyhow::Result<Result<Option<Box<LockArrayRepository>>, ParsingException>> { + let mut try_load_locked = + || -> anyhow::Result<Result<Option<LockArrayRepository>, ParsingException>> { if self.locker.is_locked() { match self.locker.get_locked_repository(true) { Ok(r) => Ok(Ok(Some(r))), @@ -561,52 +581,50 @@ impl Installer { .write_error("<info>Loading composer repositories with package information</info>"); // creating repository set - let policy = self.create_policy(true, locked_repository.as_deref()); + let policy = self.create_policy(true, locked_repository.as_ref()); let mut repository_set = self.create_repository_set(true, &platform_repo, &aliases, None); let repositories = self.repository_manager.get_repositories(); for repository in repositories { - repository_set.add_repository(repository); + repository_set.add_repository(repository.clone_box())?; } if let Some(ref lr) = locked_repository { - repository_set.add_repository(lr.clone_box()); + repository_set.add_repository(lr.clone_box())?; } let mut request = self.create_request( &*self.fixed_root_package, &platform_repo, - locked_repository.as_deref(), + locked_repository.as_ref(), ); - self.require_packages_for_update(&mut request, locked_repository.as_deref(), true); + self.require_packages_for_update(&mut request, locked_repository.as_ref(), true)?; // pass the allow list into the request, so the pool builder can apply it if let Some(ref allow_list) = self.update_allow_list { - request.set_update_allow_list( - allow_list.clone(), - self.update_allow_transitive_dependencies, - ); + // TODO(phase-b): convert i64 self.update_allow_transitive_dependencies into the enum + let _ = allow_list; } - let mut pool: Option<Pool> = Some(repository_set.create_pool( - &request, - &*self.io, - &self.event_dispatcher, - self.create_pool_optimizer(&policy), - self.ignored_types.clone(), - self.allowed_types.clone(), - self.create_security_audit_pool_filter()?, - )); + // TODO(phase-b): create_pool takes owned Request, Box<dyn IOInterface>, Option<Rc<...>> + // but locally we only have refs. PHP classes (IO, dispatcher) shouldn't Clone. + let mut pool: Option<Pool> = { + let _ = (&request, &self.event_dispatcher, &policy, &repository_set); + todo!() + }; self.io.write_error("<info>Updating dependencies</info>"); // solve dependencies - let mut solver: Option<Solver> = - Some(Solver::new(&policy, pool.as_ref().unwrap(), &*self.io)); - let lock_transaction; + // TODO(phase-b): Solver::new takes owned policy/pool/io; refactor needed + let mut solver: Option<Solver> = { + let _ = (&policy, pool.as_ref(), &self.io); + todo!() + }; + let mut lock_transaction: LockTransaction; let rule_set_size; match solver .as_mut() .unwrap() - .solve(&request, &*self.platform_requirement_filter) + .solve(&request, Some(self.platform_requirement_filter.clone_box())) { Ok(t) => { lock_transaction = t; @@ -614,35 +632,9 @@ impl Installer { solver = None; } Err(e) => { - if let Some(spe) = e.downcast_ref::<SolverProblemsException>() { - let err = "Your requirements could not be resolved to an installable set of packages."; - let pretty_problem = spe.get_pretty_string( - &repository_set, - &request, - pool.as_ref().unwrap(), - self.io.is_verbose(), - false, - ); - - self.io.write_error3( - &format!("<error>{}</error>", err), - true, - io_interface::QUIET, - ); - self.io.write_error(&pretty_problem); - if !self.dev_mode { - self.io.write_error3( - "<warning>Running update with --no-dev does not mean require-dev is ignored, it just means the packages will not be installed. If dev requirements are blocking the update you have to resolve those problems.</warning>", - true, - io_interface::QUIET, - ); - } - - let mut ghe = GithubActionError::new(self.io.clone_box()); - ghe.emit(&format!("{}\n{}", err, pretty_problem), None, None); - - return Ok(max_i64(Self::ERROR_GENERIC_FAILURE, spe.get_code())); - } + // TODO(phase-b): SolverProblemsException contains dyn Rule which isn't Send+Sync + // so anyhow::Error::downcast_ref can't extract it. Skipping detection. + let _ = (&repository_set, &request, pool.as_ref()); return Err(e); } } @@ -651,7 +643,7 @@ impl Installer { self.io.write_error3( &format!( "Analyzed {} packages to resolve dependencies", - count(&pool.as_ref().unwrap()) + pool.as_ref().unwrap().get_packages().len() ), true, io_interface::VERBOSE, @@ -681,7 +673,7 @@ impl Installer { &platform_repo, &aliases, &policy, - locked_repository.as_deref(), + locked_repository.as_ref(), )?; if exit_code != 0 { return Ok(exit_code); @@ -706,7 +698,7 @@ impl Installer { install_names.push(format!( "{}:{}", io.get_package().get_pretty_name(), - io.get_package().get_full_pretty_version(true) + io.get_package().get_full_pretty_version(true, 0) )); } else if let Some(uo) = operation.as_update_operation() { // when mirrors/metadata from a package gets updated we do not want to list it as an @@ -723,7 +715,7 @@ impl Installer { update_names.push(format!( "{}:{}", uo.get_target_package().get_pretty_name(), - uo.get_target_package().get_full_pretty_version(true) + uo.get_target_package().get_full_pretty_version(true, 0) )); } else if let Some(uo) = operation.as_uninstall_operation() { uninstalls.push(operation.clone_box()); @@ -741,12 +733,12 @@ impl Installer { self.io.write_error(&sprintf( "<info>Lock file operations: %d install%s, %d update%s, %d removal%s</info>", &[ - (count(&install_names) as i64).into(), - (if 1 == count(&install_names) { "" } else { "s" }).into(), - (count(&update_names) as i64).into(), - (if 1 == count(&update_names) { "" } else { "s" }).into(), - (count(&uninstalls) as i64).into(), - (if 1 == count(&uninstalls) { "" } else { "s" }).into(), + (install_names.len() as i64).into(), + (if 1 == install_names.len() { "" } else { "s" }).into(), + (update_names.len() as i64).into(), + (if 1 == update_names.len() { "" } else { "s" }).into(), + (uninstalls.len() as i64).into(), + (if 1 == uninstalls.len() { "" } else { "s" }).into(), ], )); if !install_names.is_empty() { @@ -773,25 +765,25 @@ impl Installer { } } - let sort_by_name = |a: &Box<dyn OperationInterface>, - b: &Box<dyn OperationInterface>| - -> std::cmp::Ordering { - let a_name: String = if let Some(uo) = a.as_update_operation() { - uo.get_target_package().get_name().to_string() - } else { - a.get_package().get_name().to_string() - }; - let b_name: String = if let Some(uo) = b.as_update_operation() { - uo.get_target_package().get_name().to_string() - } else { - b.get_package().get_name().to_string() + let sort_by_name = + |a: &Box<dyn OperationInterface>, b: &Box<dyn OperationInterface>| -> i64 { + let a_name: String = if let Some(uo) = a.as_update_operation() { + uo.get_target_package().get_name().to_string() + } else { + a.get_package().get_name().to_string() + }; + let b_name: String = if let Some(uo) = b.as_update_operation() { + uo.get_target_package().get_name().to_string() + } else { + b.get_package().get_name().to_string() + }; + strcmp(&a_name, &b_name) }; - strcmp(&a_name, &b_name) - }; usort(&mut uninstalls, &sort_by_name); usort(&mut installs_updates, &sort_by_name); - let merged: Vec<Box<dyn OperationInterface>> = array_merge(uninstalls, installs_updates); + let mut merged: Vec<Box<dyn OperationInterface>> = uninstalls; + merged.extend(installs_updates); for operation in &merged { // collect suggestions if let Some(io) = operation.as_install_operation() { @@ -806,17 +798,18 @@ impl Installer { .get("lock") .as_bool() .unwrap_or(false) - && (strpos(operation.get_operation_type(), "Alias") == false || self.io.is_debug()) + && (strpos(&operation.get_operation_type(), "Alias").is_none() + || self.io.is_debug()) { let mut source_repo = String::new(); if self.io.is_very_verbose() - && strpos(operation.get_operation_type(), "Alias") == false + && strpos(&operation.get_operation_type(), "Alias").is_none() { let operation_pkg: Box<dyn PackageInterface> = if let Some(uo) = operation.as_update_operation() { - uo.get_target_package().clone_box() + uo.get_target_package().clone_package_box() } else { - operation.get_package().clone_box() + operation.get_package().clone_package_box() }; if let Some(repo) = operation_pkg.get_repository() { source_repo = format!(" from {}", repo.get_repo_name()); @@ -827,22 +820,37 @@ impl Installer { } } + // Convert aliases (Vec<IndexMap<String, String>>) into Vec<IndexMap<String, PhpMixed>> + let aliases_php_mixed: Vec<IndexMap<String, PhpMixed>> = lock_transaction + .get_aliases(aliases.clone()) + .into_iter() + .map(|m| { + m.into_iter() + .map(|(k, v)| (k, PhpMixed::String(v))) + .collect::<IndexMap<String, PhpMixed>>() + }) + .collect(); + let platform_overrides: IndexMap<String, PhpMixed> = self + .config + .borrow_mut() + .get("platform") + .as_array() + .cloned() + .unwrap_or_default() + .into_iter() + .map(|(k, v)| (k, *v)) + .collect(); let updated_lock = self.locker.set_lock_data( lock_transaction.get_new_lock_packages(false, self.update_mirrors), - lock_transaction.get_new_lock_packages(true, self.update_mirrors), + Some(lock_transaction.get_new_lock_packages(true, self.update_mirrors)), platform_reqs, platform_dev_reqs, - lock_transaction.get_aliases(aliases.clone()), + aliases_php_mixed, self.package.get_minimum_stability(), - self.package.get_stability_flags(), + self.package.get_stability_flags().clone(), self.prefer_stable || self.package.get_prefer_stable(), self.prefer_lowest, - self.config - .borrow_mut() - .get("platform") - .as_array() - .cloned() - .unwrap_or_default(), + platform_overrides, self.write_lock && self.execute_operations, )?; if updated_lock && self.write_lock && self.execute_operations { @@ -875,62 +883,45 @@ impl Installer { let loader = ArrayLoader::new(None, true); let dumper = ArrayDumper::new(); for pkg in lock_transaction.get_new_lock_packages(false, false) { - result_repo.add_package(loader.load( + let loaded = loader.load( dumper.dump(&*pkg), - "Composer\\Package\\CompletePackage".to_string(), - )?)?; + Some("Composer\\Package\\CompletePackage".to_string()), + )?; + result_repo.add_package(loaded.clone_package_box())?; } let mut repository_set = self.create_repository_set(true, platform_repo, aliases, None); - repository_set.add_repository(Box::new(result_repo)); + repository_set.add_repository(Box::new(result_repo))?; let mut request = self.create_request(&*self.fixed_root_package, platform_repo, None); - self.require_packages_for_update(&mut request, locked_repository, false); + self.require_packages_for_update(&mut request, locked_repository, false)?; - let pool = repository_set.create_pool_with_all_packages(); + let pool = repository_set.create_pool_with_all_packages()?; - let mut solver: Option<Solver> = Some(Solver::new(policy, &pool, &*self.io)); - let non_dev_lock_transaction; + // TODO(phase-b): Solver::new takes owned policy/pool/io; refactor needed + let mut solver: Option<Solver> = { + let _ = (policy, &pool, &self.io); + todo!() + }; + let non_dev_lock_transaction: LockTransaction; match solver .as_mut() .unwrap() - .solve(&request, &*self.platform_requirement_filter) + .solve(&request, Some(self.platform_requirement_filter.clone_box())) { Ok(t) => { non_dev_lock_transaction = t; solver = None; } Err(e) => { - if let Some(spe) = e.downcast_ref::<SolverProblemsException>() { - let err = "Unable to find a compatible set of packages based on your non-dev requirements alone."; - let pretty_problem = spe.get_pretty_string( - &repository_set, - &request, - &pool, - self.io.is_verbose(), - true, - ); - - self.io.write_error3( - &format!("<error>{}</error>", err), - true, - io_interface::QUIET, - ); - self.io.write_error("Your requirements can be resolved successfully when require-dev packages are present."); - self.io.write_error("You may need to move packages from require-dev or some of their dependencies to require."); - self.io.write_error(&pretty_problem); - - let mut ghe = GithubActionError::new(self.io.clone_box()); - ghe.emit(&format!("{}\n{}", err, pretty_problem), None, None); - - return Ok(spe.get_code()); - } + // TODO(phase-b): SolverProblemsException can't be downcast (dyn Rule not Send+Sync) + let _ = (&repository_set, &request, &pool); return Err(e); } } let _ = solver; - lock_transaction.set_non_dev_packages(non_dev_lock_transaction); + lock_transaction.set_non_dev_packages(&non_dev_lock_transaction); Ok(0) } @@ -938,7 +929,7 @@ impl Installer { /// Whether the function is called as part of an update command or independently pub(crate) fn do_install( &mut self, - local_repo: Box<dyn InstalledRepositoryInterface>, + mut local_repo: Box<dyn InstalledRepositoryInterface>, already_solved: bool, ) -> anyhow::Result<i64> { if self @@ -975,15 +966,15 @@ impl Installer { false, &platform_repo, &vec![], - Some(&*locked_repository), + Some(&locked_repository), ); - repository_set.add_repository(locked_repository.clone_box()); + repository_set.add_repository(locked_repository.clone_box())?; // creating requirements request let mut request = self.create_request( &*self.fixed_root_package, &platform_repo, - Some(&*locked_repository), + Some(&locked_repository), ); if !self.locker.is_fresh()? { @@ -996,9 +987,9 @@ impl Installer { let missing_requirement_info = self .locker - .get_missing_requirement_info(&*self.package, self.dev_mode); + .get_missing_requirement_info(&*self.package, self.dev_mode)?; if !missing_requirement_info.is_empty() { - self.io.write_error(missing_requirement_info); + self.io.write_error(&missing_requirement_info.join("\n")); if !self .config @@ -1017,45 +1008,47 @@ impl Installer { let mut root_requires = self.package.get_requires(); if self.dev_mode { - root_requires = array_merge(root_requires, self.package.get_dev_requires()); + for (k, v) in self.package.get_dev_requires() { + root_requires.insert(k, v); + } } for (_key, link) in &root_requires { if PlatformRepository::is_platform_package(link.get_target()) { request - .require_name(link.get_target().to_string(), Some(link.get_constraint())); + .require_name(link.get_target(), Some(link.get_constraint().clone_box()))?; } } - for link in self.locker.get_platform_requirements(self.dev_mode) { + for link in self.locker.get_platform_requirements(self.dev_mode)? { if !root_requires.contains_key(link.get_target()) { request - .require_name(link.get_target().to_string(), Some(link.get_constraint())); + .require_name(link.get_target(), Some(link.get_constraint().clone_box()))?; } } drop(root_requires); - let pool = repository_set.create_pool( - &request, - &*self.io, - &self.event_dispatcher, - None, - self.ignored_types.clone(), - self.allowed_types.clone(), - None, - ); + // TODO(phase-b): create_pool takes owned Request, Box<dyn IOInterface>, Option<Rc<...>> + let pool: Pool = { + let _ = (&request, &self.io, &self.event_dispatcher, &repository_set); + todo!() + }; // solve dependencies - let mut solver: Option<Solver> = Some(Solver::new(&policy, &pool, &*self.io)); + // TODO(phase-b): Solver::new takes owned policy/pool/io + let mut solver: Option<Solver> = { + let _ = (&policy, &pool, &self.io); + todo!() + }; match solver .as_mut() .unwrap() - .solve(&request, &*self.platform_requirement_filter) + .solve(&request, Some(self.platform_requirement_filter.clone_box())) { Ok(lock_transaction) => { solver = None; // installing the locked packages on this platform resulted in lock modifying operations, there wasn't a conflict, but the lock file as-is seems to not work on this system - if 0 != count(&lock_transaction.get_operations()) { + if 0 != lock_transaction.get_operations().len() { self.io.write_error3( "<error>Your lock file cannot be installed on this system without changes. Please run composer update.</error>", true, @@ -1066,28 +1059,8 @@ impl Installer { } } Err(e) => { - if let Some(spe) = e.downcast_ref::<SolverProblemsException>() { - let err = "Your lock file does not contain a compatible set of packages. Please run composer update."; - let pretty_problem = spe.get_pretty_string( - &repository_set, - &request, - &pool, - self.io.is_verbose(), - false, - ); - - self.io.write_error3( - &format!("<error>{}</error>", err), - true, - io_interface::QUIET, - ); - self.io.write_error(&pretty_problem); - - let mut ghe = GithubActionError::new(self.io.clone_box()); - ghe.emit(&format!("{}\n{}", err, pretty_problem), None, None); - - return Ok(max_i64(Self::ERROR_GENERIC_FAILURE, spe.get_code())); - } + // TODO(phase-b): SolverProblemsException can't be downcast (dyn Rule not Send+Sync) + let _ = (&repository_set, &request, &pool); return Err(e); } } @@ -1095,13 +1068,14 @@ impl Installer { } // TODO in how far do we need to do anything here to ensure dev packages being updated to latest in lock without version change are treated correctly? - let local_repo_transaction = LocalRepoTransaction::new(&*locked_repository, &*local_repo); - self.event_dispatcher.dispatch_installer_event( - InstallerEvents::PRE_OPERATIONS_EXEC, - self.dev_mode, - self.execute_operations, - &local_repo_transaction, - ); + let local_repo_transaction = LocalRepoTransaction::new(&locked_repository, &*local_repo); + // TODO(phase-b): dispatch_installer_event takes owned Transaction, not &LocalRepoTransaction + // self.event_dispatcher.borrow_mut().dispatch_installer_event( + // InstallerEvents::PRE_OPERATIONS_EXEC, + // self.dev_mode, + // self.execute_operations, + // &local_repo_transaction, + // ); let mut installs: Vec<String> = vec![]; let mut updates: Vec<String> = vec![]; @@ -1111,13 +1085,13 @@ impl Installer { installs.push(format!( "{}:{}", io.get_package().get_pretty_name(), - io.get_package().get_full_pretty_version(true) + io.get_package().get_full_pretty_version(true, 0) )); } else if let Some(uo) = operation.as_update_operation() { updates.push(format!( "{}:{}", uo.get_target_package().get_pretty_name(), - uo.get_target_package().get_full_pretty_version(true) + uo.get_target_package().get_full_pretty_version(true, 0) )); } else if let Some(uo) = operation.as_uninstall_operation() { uninstalls.push(uo.get_package().get_pretty_name().to_string()); @@ -1130,12 +1104,12 @@ impl Installer { self.io.write_error(&sprintf( "<info>Package operations: %d install%s, %d update%s, %d removal%s</info>", &[ - (count(&installs) as i64).into(), - (if 1 == count(&installs) { "" } else { "s" }).into(), - (count(&updates) as i64).into(), - (if 1 == count(&updates) { "" } else { "s" }).into(), - (count(&uninstalls) as i64).into(), - (if 1 == count(&uninstalls) { "" } else { "s" }).into(), + (installs.len() as i64).into(), + (if 1 == installs.len() { "" } else { "s" }).into(), + (updates.len() as i64).into(), + (if 1 == updates.len() { "" } else { "s" }).into(), + (uninstalls.len() as i64).into(), + (if 1 == uninstalls.len() { "" } else { "s" }).into(), ], )); if !installs.is_empty() { @@ -1164,7 +1138,7 @@ impl Installer { if self.execute_operations { local_repo.set_dev_package_names(self.locker.get_dev_package_names()?); self.installation_manager.execute( - &*local_repo, + &mut *local_repo, local_repo_transaction.get_operations(), self.dev_mode, self.run_scripts, @@ -1172,7 +1146,7 @@ impl Installer { )?; // see https://github.com/composer/composer/issues/2764 - if count(&local_repo_transaction.get_operations()) > 0 { + if local_repo_transaction.get_operations().len() > 0 { let vendor_dir = self .config .borrow_mut() @@ -1189,7 +1163,8 @@ impl Installer { } else { for operation in local_repo_transaction.get_operations() { // output op, but alias op only in debug verbosity - if strpos(operation.get_operation_type(), "Alias") == false || self.io.is_debug() { + if strpos(&operation.get_operation_type(), "Alias").is_none() || self.io.is_debug() + { self.io .write_error(&format!(" - {}", operation.show(false))); } @@ -1199,19 +1174,29 @@ impl Installer { Ok(0) } - pub(crate) fn create_platform_repo(&self, for_update: bool) -> PlatformRepository { - let platform_overrides = if for_update { + pub(crate) fn create_platform_repo(&mut self, for_update: bool) -> PlatformRepository { + let platform_overrides: IndexMap<String, PhpMixed> = if for_update { self.config .borrow_mut() .get("platform") .as_array() .cloned() .unwrap_or_default() + .into_iter() + .map(|(k, v)| (k, *v)) + .collect() } else { - self.locker.get_platform_overrides() + self.locker + .get_platform_overrides() + .unwrap_or_default() + .into_iter() + .map(|(k, v)| (k, PhpMixed::String(v))) + .collect() }; + // TODO(phase-b): PlatformRepository::new returns Result, propagate PlatformRepository::new(vec![], platform_overrides) + .expect("PlatformRepository::new should not fail") } fn create_repository_set( @@ -1221,13 +1206,13 @@ impl Installer { root_aliases: &Vec<IndexMap<String, String>>, locked_repository: Option<&dyn RepositoryInterface>, ) -> RepositorySet { - let minimum_stability; + let minimum_stability: String; let mut stability_flags: IndexMap<String, i64>; let requires: IndexMap<String, Box<dyn ConstraintInterface>>; if for_update { - minimum_stability = self.package.get_minimum_stability(); - stability_flags = self.package.get_stability_flags(); + minimum_stability = self.package.get_minimum_stability().to_string(); + stability_flags = self.package.get_stability_flags().clone(); // Convert Link map merge into ConstraintInterface map for use later let mut req_links: IndexMap<String, Link> = IndexMap::new(); @@ -1240,12 +1225,24 @@ impl Installer { // Translate to constraint map for downstream uniform handling. let mut tmp: IndexMap<String, Box<dyn ConstraintInterface>> = IndexMap::new(); for (k, link) in req_links { - tmp.insert(k, link.get_constraint()); + tmp.insert(k, link.get_constraint().clone_box()); } requires = tmp; } else { - minimum_stability = self.locker.get_minimum_stability(); - stability_flags = self.locker.get_stability_flags(); + minimum_stability = self + .locker + .get_minimum_stability() + .unwrap_or_else(|_| String::new()); + // TODO(phase-b): locker.get_stability_flags returns IndexMap<String, String>; convert to i64 + stability_flags = self + .locker + .get_stability_flags() + .map(|m| { + m.into_iter() + .map(|(k, v)| (k, v.parse::<i64>().unwrap_or(0))) + .collect() + }) + .unwrap_or_default(); let mut tmp: IndexMap<String, Box<dyn ConstraintInterface>> = IndexMap::new(); for package in locked_repository.unwrap().get_packages() { @@ -1266,14 +1263,18 @@ impl Installer { .as_any() .downcast_ref::<IgnoreListPlatformRequirementFilter>() { - constraint = filter.filter_constraint(&req, constraint); + constraint = filter + .filter_constraint(&req, constraint, false) + .unwrap_or_else(|_| Box::new(Constraint::new("=", String::new()))); } root_requires.insert(req, constraint); } - self.fixed_root_package = clone(&self.package); - self.fixed_root_package.set_requires(IndexMap::new()); - self.fixed_root_package.set_dev_requires(IndexMap::new()); + // TODO(phase-b): self.package is Box<dyn RootPackageInterface>; cannot clone a trait + // object without Clone. PHP shares the reference. Skipping fixed_root_package assignment. + // self.fixed_root_package = clone(&self.package); + self.fixed_root_package.set_requires(vec![]); + self.fixed_root_package.set_dev_requires(vec![]); stability_flags.insert( self.package.get_name().to_string(), @@ -1281,18 +1282,26 @@ impl Installer { [VersionParser::parse_stability(self.package.get_version()).as_str()], ); + // TODO(phase-b): convert root_aliases (Vec<IndexMap<String, String>>) into Vec<RootAliasInput> + let root_aliases_input: Vec<crate::repository::repository_set::RootAliasInput> = vec![]; + let _ = root_aliases; + // TODO(phase-b): temporary_constraints holds Box<dyn ConstraintInterface> which can't Clone + let temporary_constraints: IndexMap<String, Box<dyn ConstraintInterface>> = IndexMap::new(); let mut repository_set = RepositorySet::new( - minimum_stability, + &minimum_stability, stability_flags, - root_aliases.clone(), - self.package.get_references(), + root_aliases_input, + self.package.get_references().clone(), root_requires, - self.temporary_constraints.clone(), + temporary_constraints, ); - repository_set.add_repository(Box::new(RootPackageRepository::new(clone( - &self.fixed_root_package, - )))); - repository_set.add_repository(Box::new(platform_repo.clone())); + // TODO(phase-b): RootPackageRepository::new takes owned root package + // repository_set.add_repository(Box::new(RootPackageRepository::new(clone( + // &self.fixed_root_package, + // )))); + let _ = platform_repo; + // TODO(phase-b): PlatformRepository has no Clone impl (PHP class) + // repository_set.add_repository(Box::new(platform_repo.clone())); if let Some(ref additional_fixed_repository) = self.additional_fixed_repository { // allow using installed repos if needed to avoid warnings about installed repositories being used in the RepositorySet // see https://github.com/composer/composer/pull/9574 @@ -1301,40 +1310,42 @@ impl Installer { .as_any() .downcast_ref::<CompositeRepository>() { - composite.get_repositories() + composite + .get_repositories() + .iter() + .map(|r| r.clone_box()) + .collect() } else { vec![additional_fixed_repository.clone_box()] }; for additional_fixed_repository in &additional_fixed_repositories { + // TODO(phase-b): as_installed_repository_interface not on RepositoryInterface trait if additional_fixed_repository .as_any() .downcast_ref::<InstalledRepository>() .is_some() - || additional_fixed_repository - .as_installed_repository_interface() - .is_some() { - repository_set.allow_installed_repositories(); + repository_set.allow_installed_repositories(true); break; } } - repository_set.add_repository(additional_fixed_repository.clone_box()); + let _ = repository_set.add_repository(additional_fixed_repository.clone_box()); } repository_set } fn create_policy( - &self, + &mut self, for_update: bool, locked_repo: Option<&LockArrayRepository>, ) -> DefaultPolicy { let mut prefer_stable: Option<bool> = None; let mut prefer_lowest: Option<bool> = None; if !for_update { - prefer_stable = self.locker.get_prefer_stable(); - prefer_lowest = self.locker.get_prefer_lowest(); + prefer_stable = self.locker.get_prefer_stable().unwrap_or(None); + prefer_lowest = self.locker.get_prefer_lowest().unwrap_or(None); } // old lock file without prefer stable/lowest will return null // so in this case we use the composer.json info @@ -1351,11 +1362,12 @@ impl Installer { for pkg in CanonicalPackagesTrait::get_packages(locked_repo.unwrap()) { if pkg.as_alias_package().is_some() || (self.update_allow_list.is_some() - && in_array( - pkg.get_name(), - self.update_allow_list.as_ref().unwrap(), - true, - )) + && self + .update_allow_list + .as_ref() + .unwrap() + .iter() + .any(|s| s == pkg.get_name())) { continue; } @@ -1377,17 +1389,21 @@ impl Installer { platform_repo: &PlatformRepository, locked_repository: Option<&LockArrayRepository>, ) -> Request { - let mut request = Request::new(locked_repository); + // TODO(phase-b): Request::new takes Option<LockArrayRepository> (owned). PHP class + // shouldn't Clone. Passing None for now. + let _ = locked_repository; + let mut request = Request::new(None); - request.fix_package(root_package); - if let Some(alias) = root_package.as_any().downcast_ref::<RootAliasPackage>() { - request.fix_package(alias.get_alias_of()); + // TODO(phase-b): request.fix_package wants Box<dyn BasePackage>; root_package is &dyn RootPackageInterface + let _ = root_package; + // request.fix_package(root_package); + if let Some(_alias) = root_package.as_any().downcast_ref::<RootAliasPackage>() { + // request.fix_package(alias.get_alias_of()); } let mut fixed_packages = platform_repo.get_packages(); if let Some(ref additional_fixed_repository) = self.additional_fixed_repository { - fixed_packages = - array_merge(fixed_packages, additional_fixed_repository.get_packages()); + fixed_packages.extend(additional_fixed_repository.get_packages()); } // fix the version of all platform packages + additionally installed packages @@ -1411,7 +1427,9 @@ impl Installer { .get_constraint() .matches(&Constraint::new("=", package.get_version().to_string())) { - request.fix_package(&*package); + // TODO(phase-b): fix_package needs owned Box<dyn BasePackage> + let _ = &package; + // request.fix_package(&*package); } } @@ -1419,15 +1437,21 @@ impl Installer { } fn require_packages_for_update( - &self, + &mut self, request: &mut Request, locked_repository: Option<&LockArrayRepository>, include_dev_requires: bool, - ) { + ) -> anyhow::Result<()> { // if we're updating mirrors we want to keep exactly the same versions installed which are in the lock file, but we want current remote metadata if self.update_mirrors { let excluded_packages: IndexMap<String, i64> = if !include_dev_requires { - array_flip(&self.locker.get_dev_package_names()) + // TODO(phase-b): locker.get_dev_package_names returns Result<Vec<String>> + let names = self.locker.get_dev_package_names().unwrap_or_default(); + names + .into_iter() + .enumerate() + .map(|(i, name)| (name, i as i64)) + .collect() } else { IndexMap::new() }; @@ -1439,33 +1463,34 @@ impl Installer { && !excluded_packages.contains_key(locked_package.get_name()) { request.require_name( - locked_package.get_name().to_string(), + locked_package.get_name(), Some(Box::new(Constraint::new( "==", locked_package.get_version().to_string(), ))), - ); + )?; } } } else { let mut links = self.package.get_requires(); if include_dev_requires { - links = array_merge(links, self.package.get_dev_requires()); + for (k, v) in self.package.get_dev_requires() { + links.insert(k, v); + } } for (_key, link) in &links { - request.require_name(link.get_target().to_string(), Some(link.get_constraint())); + request.require_name(link.get_target(), Some(link.get_constraint().clone_box()))?; } } + Ok(()) } - fn get_root_aliases(&self, for_update: bool) -> Vec<IndexMap<String, String>> { - let aliases = if for_update { - self.package.get_aliases() + fn get_root_aliases(&mut self, for_update: bool) -> Vec<IndexMap<String, String>> { + if for_update { + self.package.get_aliases().to_vec() } else { - self.locker.get_aliases() - }; - - aliases + self.locker.get_aliases().unwrap_or_default() + } } fn extract_platform_requirements( @@ -1477,7 +1502,9 @@ impl Installer { if PlatformRepository::is_platform_package(link.get_target()) { platform_reqs.insert( link.get_target().to_string(), - link.get_pretty_constraint().to_string(), + link.get_pretty_constraint() + .map(|s| s.to_string()) + .unwrap_or_default(), ); } } @@ -1498,14 +1525,12 @@ impl Installer { let package_clone = packages.get(&key).unwrap().clone_package_box(); if let Some(alias_pkg) = package_clone.as_alias_package() { let alias_key = alias_pkg.get_alias_of().to_string(); - let _class_name = get_class(&*package_clone); + // TODO(phase-b): get_class on dyn PackageInterface; skipped because PhpMixed shim only + let _class_name = "Composer\\Package\\AliasPackage".to_string(); // PHP: $packages[$key] = new $className($packages[$alias], $package->getVersion(), $package->getPrettyVersion()); - let aliased = packages.get(&alias_key).unwrap().clone_package_box(); - let new_alias_package: Box<dyn PackageInterface> = Box::new(AliasPackage::new( - aliased, - alias_pkg.get_version().to_string(), - alias_pkg.get_pretty_version().to_string(), - )); + // TODO(phase-b): AliasPackage::new expects Box<dyn BasePackage>; have Box<dyn PackageInterface> + let _aliased = packages.get(&alias_key).unwrap().clone_package_box(); + let new_alias_package: Box<dyn PackageInterface> = todo!(); packages.insert(key, new_alias_package); } } @@ -1529,7 +1554,9 @@ impl Installer { return None; } - Some(PoolOptimizer::new(policy)) + // TODO(phase-b): PoolOptimizer::new takes owned Box<dyn PolicyInterface>; have &dyn + let _ = policy; + todo!() } fn get_audit_config(&mut self) -> anyhow::Result<&AuditConfig> { @@ -1547,9 +1574,10 @@ impl Installer { fn create_security_audit_pool_filter( &mut self, ) -> anyhow::Result<Option<SecurityAdvisoryPoolFilter>> { + let update_mirrors = self.update_mirrors; let audit_config = self.get_audit_config()?; - if audit_config.block_insecure && !self.update_mirrors { + if audit_config.block_insecure && !update_mirrors { return Ok(Some(SecurityAdvisoryPoolFilter::new( Auditor, audit_config.clone(), @@ -1561,17 +1589,11 @@ impl Installer { /// Create Installer pub fn create(io: Box<dyn IOInterface>, composer: &Composer) -> Self { - Self::new( - io, - composer.get_config().clone(), - composer.get_package().clone_box(), - composer.get_download_manager().clone(), - composer.get_repository_manager().clone(), - composer.get_locker().clone(), - composer.get_installation_manager().clone(), - composer.get_event_dispatcher().clone(), - composer.get_autoload_generator().clone(), - ) + // TODO(phase-b): Installer::new takes owned manager/locker/etc., but Composer holds them + // by value without Clone (correct for PHP class semantics). Requires refactoring + // Installer to hold &/Rc references or moving ownership out of Composer. + let _ = (io, composer); + todo!() } /// Packages of those types are ignored, by default php-ext and php-ext-zend are ignored @@ -1745,14 +1767,14 @@ impl Installer { pub fn set_ignore_platform_requirements( &mut self, ignore_platform_reqs: shirabe_php_shim::PhpMixed, - ) -> &mut Self { + ) -> anyhow::Result<&mut Self> { trigger_error( "Installer::setIgnorePlatformRequirements is deprecated since Composer 2.2, use setPlatformRequirementFilter instead.", shirabe_php_shim::E_USER_DEPRECATED, ); - self.set_platform_requirement_filter(PlatformRequirementFilterFactory::from_bool_or_list( - ignore_platform_reqs, + Ok(self.set_platform_requirement_filter( + PlatformRequirementFilterFactory::from_bool_or_list(ignore_platform_reqs)?, )) } @@ -1775,13 +1797,12 @@ impl Installer { /// restrict the update operation to a few packages, all other packages /// that are already installed will be kept at their current version pub fn set_update_allow_list(&mut self, packages: Vec<String>) -> &mut Self { - if count(&packages) == 0 { + if packages.len() == 0 { self.update_allow_list = None; } else { - self.update_allow_list = Some(array_values(array_unique(array_map( - |s: &String| strtolower(s), - &packages, - )))); + let lowered: Vec<String> = array_map(|s: &String| strtolower(s), &packages); + let unique: Vec<String> = array_unique(&lowered); + self.update_allow_list = Some(unique); } self @@ -1795,15 +1816,12 @@ impl Installer { &mut self, update_allow_transitive_dependencies: i64, ) -> anyhow::Result<&mut Self> { - if !in_array( - update_allow_transitive_dependencies, - &vec![ - Request::UPDATE_ONLY_LISTED, - Request::UPDATE_LISTED_WITH_TRANSITIVE_DEPS_NO_ROOT_REQUIRE, - Request::UPDATE_LISTED_WITH_TRANSITIVE_DEPS, - ], - true, - ) { + let valid = [ + Request::UPDATE_ONLY_LISTED, + Request::UPDATE_LISTED_WITH_TRANSITIVE_DEPS_NO_ROOT_REQUIRE, + Request::UPDATE_LISTED_WITH_TRANSITIVE_DEPS, + ]; + if !valid.contains(&update_allow_transitive_dependencies) { return Err(RuntimeException { message: "Invalid value for updateAllowTransitiveDependencies supplied".to_string(), code: 0, diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs index c7b880b..aea0a7c 100644 --- a/crates/shirabe/src/installer/binary_installer.rs +++ b/crates/shirabe/src/installer/binary_installer.rs @@ -252,7 +252,7 @@ impl BinaryInstaller { let bin_path = self .filesystem .borrow_mut() - .find_shortest_path(link, bin, false); + .find_shortest_path(link, bin, false, false); let caller = Self::determine_binary_caller(bin); // if the target is a php file, we run the unixy proxy file @@ -288,7 +288,7 @@ impl BinaryInstaller { let bin_path = self .filesystem .borrow_mut() - .find_shortest_path(link, bin, false); + .find_shortest_path(link, bin, false, false); let bin_dir = ProcessExecutor::escape(&dirname(&bin_path)); let bin_file = basename(&bin_path); @@ -312,7 +312,7 @@ impl BinaryInstaller { let bin_path_exported = self .filesystem .borrow() - .find_shortest_path_code(link, bin, false, true); + .find_shortest_path_code(link, bin, false, true, false); let mut stream_proxy_code = String::new(); let mut stream_hint = String::new(); let mut globals_code = format!("$GLOBALS['_composer_bin_dir'] = __DIR__;\n",); @@ -329,6 +329,7 @@ impl BinaryInstaller { &format!("{}/autoload.php", vendor_dir_real), false, true, + false, ), )); } diff --git a/crates/shirabe/src/installer/installation_manager.rs b/crates/shirabe/src/installer/installation_manager.rs index 3789729..3b342a9 100644 --- a/crates/shirabe/src/installer/installation_manager.rs +++ b/crates/shirabe/src/installer/installation_manager.rs @@ -42,7 +42,7 @@ pub struct InstallationManager { notifiable_packages: IndexMap<String, Vec<Box<dyn PackageInterface>>>, loop_: std::rc::Rc<std::cell::RefCell<Loop>>, io: Box<dyn IOInterface>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, output_progress: bool, } @@ -50,7 +50,7 @@ impl InstallationManager { pub fn new( loop_: std::rc::Rc<std::cell::RefCell<Loop>>, io: Box<dyn IOInterface>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, ) -> Self { Self { installers: vec![], @@ -85,7 +85,7 @@ impl InstallationManager { let _ = installer; let key: Option<usize> = None; if let Some(k) = key { - array_splice(&mut self.installers, k as i64, Some(1), None); + array_splice(&mut self.installers, k as i64, Some(1), vec![]); self.cache = IndexMap::new(); } } @@ -109,18 +109,18 @@ impl InstallationManager { /// @param string $type package type /// /// @throws \InvalidArgumentException if installer for provided type is not registered - pub fn get_installer(&mut self, r#type: &str) -> Result<&dyn InstallerInterface> { + pub fn get_installer(&mut self, r#type: &str) -> Result<&mut dyn InstallerInterface> { let r#type = strtolower(r#type); if self.cache.contains_key(&r#type) { - return Ok(self.cache.get(&r#type).unwrap().as_ref()); + return Ok(self.cache.get_mut(&r#type).unwrap().as_mut()); } for installer in &self.installers { if installer.supports(&r#type) { // TODO(phase-b): cache by cloning Box<dyn InstallerInterface> is non-trivial self.cache.insert(r#type.clone(), installer.clone_box()); - return Ok(self.cache.get(&r#type).unwrap().as_ref()); + return Ok(self.cache.get_mut(&r#type).unwrap().as_mut()); } } @@ -187,9 +187,9 @@ impl InstallationManager { let signal_handler = SignalHandler::create( vec![ - SignalHandler::SIGINT, - SignalHandler::SIGTERM, - SignalHandler::SIGHUP, + SignalHandler::SIGINT.to_string(), + SignalHandler::SIGTERM.to_string(), + SignalHandler::SIGHUP.to_string(), ], // TODO(phase-b): closure captures &mut self via &mut cleanup_promises Box::new(move |signal: String, handler: &SignalHandler| { @@ -331,7 +331,7 @@ impl InstallationManager { if op_type != "uninstall" { let installer = self.get_installer(package.get_type())?; let promise = installer.download(package, initial_package); - if let Some(p) = promise { + if let Ok(Some(p)) = promise { promises.push(p); } } @@ -447,8 +447,6 @@ impl InstallationManager { initial_package = None; } - let installer = self.get_installer(package.get_type())?; - let event_name = match op_type.as_str() { "install" => PackageEvents::PRE_PACKAGE_INSTALL, "update" => PackageEvents::PRE_PACKAGE_UPDATE, @@ -457,25 +455,26 @@ impl InstallationManager { }; if run_scripts && self.event_dispatcher.is_some() { - self.event_dispatcher - .as_mut() - .unwrap() - .dispatch_package_event( - event_name, - dev_mode, - repo, - all_operations, - operation.as_ref(), - ); + // TODO(phase-b): dispatch_package_event takes Box<dyn RepositoryInterface>/Vec<Box<...>> + // but we hold &mut dyn here. Needs structural rework (likely shared Rc on repo and ops). + let _ = ( + event_name, + dev_mode, + &repo, + &all_operations, + operation.as_ref(), + ); } let _dispatcher = self.event_dispatcher.as_ref(); let _io = self.io.as_ref(); + let installer = self.get_installer(package.get_type())?; let promise = installer.prepare(&op_type, package, initial_package); let promise = match promise { - Some(p) => p, - None => promise::resolve(None), + Ok(Some(p)) => p, + Ok(None) => promise::resolve(None), + Err(e) => return Err(e), }; // TODO(phase-b): chain `.then(cb1).then(cb2)` with cleanup_promises[index], repo.write, etc. @@ -527,7 +526,8 @@ impl InstallationManager { // TODO(phase-b): progress = self.io.get_progress_bar(); progress = Some(()); } - let _ = self.loop_.borrow_mut().wait(promises, progress); + // TODO(phase-b): pass actual ProgressBar when self.io.get_progress_bar() is implemented + let _ = self.loop_.borrow_mut().wait(promises, None); if progress.is_some() { // progress.clear(); // ProgressBar in non-decorated output does not output a final line-break and clear() does nothing @@ -545,7 +545,7 @@ impl InstallationManager { package: &dyn PackageInterface, ) -> Option<Box<dyn PromiseInterface>> { let installer = self.get_installer(package.get_type()).ok()?; - let promise = installer.cleanup("install", package, None); + let promise = installer.cleanup("install", package, None).ok()?; promise } @@ -560,7 +560,7 @@ impl InstallationManager { ) -> Option<Box<dyn PromiseInterface>> { let package = operation.get_package(); let installer = self.get_installer(package.get_type()).ok()?; - let promise = installer.install(repo, package); + let promise = installer.install(repo, package).ok()?; self.mark_for_notification(package); promise @@ -582,14 +582,15 @@ impl InstallationManager { let promise = if initial_type == target_type { let installer = self.get_installer(initial_type).ok()?; - let promise = installer.update(repo, initial, target); + let promise = installer.update(repo, initial, target).ok()?; self.mark_for_notification(target); promise } else { let promise = self .get_installer(initial_type) .ok()? - .uninstall(repo, initial); + .uninstall(repo, initial) + .ok()?; let promise = match promise { Some(p) => p, None => promise::resolve(None), @@ -615,7 +616,7 @@ impl InstallationManager { let package = operation.get_package(); let installer = self.get_installer(package.get_type()).ok()?; - installer.uninstall(repo, package) + installer.uninstall(repo, package).ok()? } /// Executes markAliasInstalled operation. @@ -684,9 +685,13 @@ impl InstallationManager { "Content-type: application/x-www-form-urlencoded".to_string(), ))]), ); + let params_vec: Vec<(&str, &str)> = params + .iter() + .map(|(k, v)| (k.as_str(), v.as_str())) + .collect(); http.insert( "content".to_string(), - PhpMixed::String(http_build_query(¶ms, "", Some("&"))), + PhpMixed::String(http_build_query(¶ms_vec, "", "&")), ); http.insert("timeout".to_string(), PhpMixed::Int(3)); opts.insert( @@ -696,12 +701,13 @@ impl InstallationManager { ), ); - promises.push(self.loop_.borrow().get_http_downloader().borrow_mut().add( - &url, - &PhpMixed::Array( - opts.into_iter().map(|(k, v)| (k, Box::new(v))).collect(), - ), - )?); + promises.push( + self.loop_ + .borrow() + .get_http_downloader() + .borrow_mut() + .add(&url, opts)?, + ); } continue; @@ -767,10 +773,13 @@ impl InstallationManager { PhpMixed::Array(http.into_iter().map(|(k, v)| (k, Box::new(v))).collect()), ); - promises.push(self.loop_.borrow().get_http_downloader().borrow_mut().add( - repo_url, - &PhpMixed::Array(opts.into_iter().map(|(k, v)| (k, Box::new(v))).collect()), - )?); + promises.push( + self.loop_ + .borrow() + .get_http_downloader() + .borrow_mut() + .add(repo_url, opts)?, + ); } let _ = self.loop_.borrow_mut().wait(promises, None); diff --git a/crates/shirabe/src/installer/library_installer.rs b/crates/shirabe/src/installer/library_installer.rs index 0bc87f9..fc79bdd 100644 --- a/crates/shirabe/src/installer/library_installer.rs +++ b/crates/shirabe/src/installer/library_installer.rs @@ -44,8 +44,9 @@ impl LibraryInstaller { binary_installer: Option<BinaryInstaller>, ) -> Self { // PHP: $this->downloadManager = $composer instanceof Composer ? $composer->getDownloadManager() : null; - let download_manager = - if let Some(full_composer) = composer.as_any().downcast_ref::<Composer>() { + // TODO(phase-b): PartialComposer cannot downcast to Composer in this Rust port. + let download_manager: Option<std::rc::Rc<std::cell::RefCell<DownloadManager>>> = + if let Some(_full_composer) = composer.as_any().downcast_ref::<Composer>() { // TODO(phase-b): clone or borrow the DownloadManager from the full Composer Some(todo!("composer.get_download_manager() as DownloadManager")) } else { @@ -55,8 +56,12 @@ impl LibraryInstaller { let filesystem = filesystem .unwrap_or_else(|| std::rc::Rc::new(std::cell::RefCell::new(Filesystem::new(None)))); let vendor_dir = rtrim( - // TODO(phase-b): composer.get_config().borrow_mut().get("vendor-dir") returns a PhpMixed/String - &composer.get_config().borrow_mut().get("vendor-dir"), + // TODO(phase-b): Config::get returns PhpMixed; coerce to String via get_str. + &composer + .get_config() + .borrow_mut() + .get_str("vendor-dir") + .unwrap_or_default(), Some("/"), ); let binary_installer = binary_installer.unwrap_or_else(|| { @@ -64,13 +69,22 @@ impl LibraryInstaller { // TODO(phase-b): pass io by reference/clone todo!("io reference"), rtrim( - &composer.get_config().borrow_mut().get("bin-dir"), + &composer + .get_config() + .borrow_mut() + .get_str("bin-dir") + .unwrap_or_default(), Some("/"), ), - composer.get_config().borrow_mut().get("bin-compat"), + // TODO(phase-b): Config::get returns PhpMixed; coerce to String via get_str. + composer + .get_config() + .borrow_mut() + .get_str("bin-compat") + .unwrap_or_default(), // TODO(phase-b): pass filesystem reference todo!("filesystem reference"), - vendor_dir.clone(), + Some(vendor_dir.clone()), ) }); @@ -86,12 +100,10 @@ impl LibraryInstaller { } /// Make sure binaries are installed for a given package. - pub fn ensure_binaries_presence(&self, package: &dyn PackageInterface) { - self.binary_installer.install_binaries( - package, - &self.get_install_path(package).unwrap(), - false, - ); + pub fn ensure_binaries_presence(&mut self, package: &dyn PackageInterface) { + let install_path = self.get_install_path(package).unwrap(); + self.binary_installer + .install_binaries(package, &install_path, false); } /// Returns the base path of the package without target-dir path @@ -104,7 +116,7 @@ impl LibraryInstaller { if let Some(target_dir) = target_dir { if !target_dir.is_empty() { - return Preg::replace( + let replaced = Preg::replace( &format!( "{{/*{}/?$}}", preg_quote(&target_dir, None).replace('/', "/+") @@ -112,6 +124,7 @@ impl LibraryInstaller { "", &install_path, ); + return replaced.unwrap_or(install_path); } } @@ -126,9 +139,11 @@ impl LibraryInstaller { ) -> Result<Option<Box<dyn PromiseInterface>>> { let download_path = self.get_install_path(package).unwrap(); - self.get_download_manager() - .borrow() - .install(package, &download_path) + Ok(Some( + self.get_download_manager() + .borrow() + .install(package, &download_path)?, + )) } /// @return PromiseInterface|null @@ -152,17 +167,13 @@ impl LibraryInstaller { None => shirabe_external_packages::react::promise::resolve(None), }; - return Ok(Some(promise.then(Box::new( - move || -> Result<Box<dyn PromiseInterface>> { - // TODO(phase-b): capture target/self into the closure - let promise = self.install_code(target)?; - if let Some(promise) = promise { - return Ok(promise); - } - - Ok(shirabe_external_packages::react::promise::resolve(None)) - }, - )))); + // TODO(phase-b): promise.then expects Option<Box<dyn FnOnce(Option<PhpMixed>) -> Option<PhpMixed>>> + // arguments. Translating the original PHP closure (which captures &self and target) + // requires restructuring; tracked separately. + let _ = promise; + return Ok(Some(todo!( + "promise.then(...) chain to install_code(target)" + ))); } self.filesystem @@ -170,9 +181,11 @@ impl LibraryInstaller { .rename(&initial_download_path, &target_download_path); } - self.get_download_manager() - .borrow() - .update(initial, target, &target_download_path) + Ok(Some(self.get_download_manager().borrow().update( + initial, + target, + &target_download_path, + )?)) } /// @return PromiseInterface|null @@ -183,9 +196,11 @@ impl LibraryInstaller { ) -> Result<Option<Box<dyn PromiseInterface>>> { let download_path = self.get_package_base_path(package); - self.get_download_manager() - .borrow() - .remove(package, &download_path) + Ok(Some( + self.get_download_manager() + .borrow() + .remove(package, &download_path)?, + )) } pub(crate) fn initialize_vendor_dir(&mut self) { @@ -262,9 +277,11 @@ impl InstallerInterface for LibraryInstaller { // self.initialize_vendor_dir(); let download_path = self.get_install_path(package).unwrap(); - self.get_download_manager() - .borrow() - .download(package, &download_path, prev_package) + Ok(Some(self.get_download_manager().borrow().download( + package, + &download_path, + prev_package, + )?)) } fn prepare( @@ -277,9 +294,12 @@ impl InstallerInterface for LibraryInstaller { // self.initialize_vendor_dir(); let download_path = self.get_install_path(package).unwrap(); - self.get_download_manager() - .borrow() - .prepare(r#type, package, &download_path, prev_package) + Ok(Some(self.get_download_manager().borrow().prepare( + r#type, + package, + &download_path, + prev_package, + )?)) } fn cleanup( @@ -292,9 +312,12 @@ impl InstallerInterface for LibraryInstaller { // self.initialize_vendor_dir(); let download_path = self.get_install_path(package).unwrap(); - self.get_download_manager() - .borrow() - .cleanup(r#type, package, &download_path, prev_package) + Ok(Some(self.get_download_manager().borrow().cleanup( + r#type, + package, + &download_path, + prev_package, + )?)) } fn install( @@ -317,17 +340,13 @@ impl InstallerInterface for LibraryInstaller { None => shirabe_external_packages::react::promise::resolve(None), }; - let binary_installer = &self.binary_installer; - let install_path = self.get_install_path(package).unwrap(); - - // TODO(phase-b): capture binary_installer/install_path/package/repo into the closure - Ok(Some(promise.then(Box::new(move || -> Result<()> { - binary_installer.install_binaries(package, &install_path, true); - if !repo.has_package(package) { - repo.add_package(package.clone_package_box())?; - } - Ok(()) - })))) + // TODO(phase-b): promise.then expects Option<Box<dyn FnOnce(Option<PhpMixed>) -> Option<PhpMixed>>> + // arguments. The original PHP closure captures &mut self/binary_installer/repo/package; + // restructuring required. + let _ = promise; + Ok(Some(todo!( + "promise.then(...) chain to install_binaries + repo.add_package" + ))) } fn update( @@ -354,18 +373,13 @@ impl InstallerInterface for LibraryInstaller { None => shirabe_external_packages::react::promise::resolve(None), }; - let binary_installer = &self.binary_installer; - let install_path = self.get_install_path(target).unwrap(); - - // TODO(phase-b): capture binary_installer/install_path/target/initial/repo into the closure - Ok(Some(promise.then(Box::new(move || -> Result<()> { - binary_installer.install_binaries(target, &install_path, true); - repo.remove_package(initial)?; - if !repo.has_package(target) { - repo.add_package(target.clone_package_box())?; - } - Ok(()) - })))) + // TODO(phase-b): promise.then expects Option<Box<dyn FnOnce(Option<PhpMixed>) -> Option<PhpMixed>>> + // arguments. Closure captures &mut self/binary_installer/repo/initial/target; + // restructuring required. + let _ = promise; + Ok(Some(todo!( + "promise.then(...) chain to install_binaries + repo updates" + ))) } fn uninstall( @@ -387,28 +401,13 @@ impl InstallerInterface for LibraryInstaller { None => shirabe_external_packages::react::promise::resolve(None), }; - let binary_installer = &self.binary_installer; - let download_path = self.get_package_base_path(package); - let filesystem = &self.filesystem; - - // TODO(phase-b): capture binary_installer/filesystem/download_path/package/repo into the closure - Ok(Some(promise.then(Box::new(move || -> Result<()> { - binary_installer.remove_binaries(package); - repo.remove_package(package)?; - - if strpos(package.get_name(), "/").is_some() { - let package_vendor_dir = shirabe_php_shim::dirname(&download_path); - if shirabe_php_shim::is_dir(&package_vendor_dir) - && filesystem.borrow().is_dir_empty(&package_vendor_dir) - { - Silencer::call(|| { - rmdir(&package_vendor_dir); - Ok(()) - })?; - } - } - Ok(()) - })))) + // TODO(phase-b): promise.then expects Option<Box<dyn FnOnce(Option<PhpMixed>) -> Option<PhpMixed>>> + // arguments. Closure captures binary_installer/filesystem/download_path/package/repo; + // restructuring required. + let _ = promise; + Ok(Some(todo!( + "promise.then(...) chain to remove_binaries/remove_package/rmdir" + ))) } fn get_install_path(&self, package: &dyn PackageInterface) -> Option<String> { @@ -439,7 +438,10 @@ impl InstallerInterface for LibraryInstaller { } impl BinaryPresenceInterface for LibraryInstaller { - fn ensure_binaries_presence(&self, package: &dyn PackageInterface) { - LibraryInstaller::ensure_binaries_presence(self, package) + fn ensure_binaries_presence(&self, _package: &dyn PackageInterface) { + // TODO(phase-b): trait takes &self but LibraryInstaller::ensure_binaries_presence + // requires &mut self due to BinaryInstaller::install_binaries(&mut self, ...). + // Revisit the trait or use interior mutability. + todo!() } } diff --git a/crates/shirabe/src/installer/plugin_installer.rs b/crates/shirabe/src/installer/plugin_installer.rs index bb04947..2ec8cb9 100644 --- a/crates/shirabe/src/installer/plugin_installer.rs +++ b/crates/shirabe/src/installer/plugin_installer.rs @@ -57,19 +57,8 @@ impl PluginInstaller { } fn get_plugin_manager(&self) -> &PluginManager { - // TODO(plugin): assert self.inner.composer is fully loaded Composer instance - assert!( - self.inner.composer.is_full_composer(), - "{}", - LogicException { - message: - "PluginInstaller should be initialized with a fully loaded Composer instance." - .to_string(), - code: 0, - } - ); - // TODO(plugin): return plugin manager from composer - self.inner.composer.get_plugin_manager() + // TODO(plugin): PartialComposer does not expose PluginManager; revisit when wiring plugin support + todo!("PartialComposer.get_plugin_manager") } fn get_plugin_manager_mut(&mut self) -> &mut PluginManager { @@ -106,8 +95,8 @@ impl InstallerInterface for PluginInstaller { .map(|v| matches!(v, PhpMixed::Bool(true))) .unwrap_or(false); // TODO(plugin): check if plugin is allowed - self.get_plugin_manager() - .is_plugin_allowed(package.get_name(), false, plugin_optional); + // TODO(phase-b): is_plugin_allowed needs &mut PluginManager but prepare is &self. + let _ = plugin_optional; } self.inner.prepare(r#type, package, prev_package) @@ -145,12 +134,15 @@ impl InstallerInterface for PluginInstaller { }; // TODO(plugin): register package in plugin manager after install, rollback on failure - Ok(Some(promise.then(Box::new(move || -> Result<()> { - Platform::workaround_filesystem_issues(); - // self.get_plugin_manager().register_package(package, true)?; - // On error: self.rollback_install(e, repo, package)?; - Ok(()) - })))) + Ok(Some(promise.then( + Some(Box::new(move |_v| -> Option<PhpMixed> { + Platform::workaround_filesystem_issues(); + // self.get_plugin_manager().register_package(package, true)?; + // On error: self.rollback_install(e, repo, package)?; + None + })), + None, + ))) } fn update( @@ -166,13 +158,16 @@ impl InstallerInterface for PluginInstaller { }; // TODO(plugin): deactivate initial and register target in plugin manager after update, rollback on failure - Ok(Some(promise.then(Box::new(move || -> Result<()> { - Platform::workaround_filesystem_issues(); - // self.get_plugin_manager().deactivate_package(initial); - // self.get_plugin_manager().register_package(target, true)?; - // On error: self.rollback_install(e, repo, target)?; - Ok(()) - })))) + Ok(Some(promise.then( + Some(Box::new(move |_v| -> Option<PhpMixed> { + Platform::workaround_filesystem_issues(); + // self.get_plugin_manager().deactivate_package(initial); + // self.get_plugin_manager().register_package(target, true)?; + // On error: self.rollback_install(e, repo, target)?; + None + })), + None, + ))) } fn uninstall( diff --git a/crates/shirabe/src/installer/project_installer.rs b/crates/shirabe/src/installer/project_installer.rs index 906e2c0..6f794af 100644 --- a/crates/shirabe/src/installer/project_installer.rs +++ b/crates/shirabe/src/installer/project_installer.rs @@ -97,9 +97,11 @@ impl InstallerInterface for ProjectInstaller { _repo: &mut dyn InstalledRepositoryInterface, package: &dyn PackageInterface, ) -> anyhow::Result<Option<Box<dyn PromiseInterface>>> { - self.download_manager - .borrow() - .install(package, &self.install_path) + Ok(Some( + self.download_manager + .borrow() + .install(package, &self.install_path)?, + )) } fn update( diff --git a/crates/shirabe/src/installer/suggested_packages_reporter.rs b/crates/shirabe/src/installer/suggested_packages_reporter.rs index c820009..8248f5f 100644 --- a/crates/shirabe/src/installer/suggested_packages_reporter.rs +++ b/crates/shirabe/src/installer/suggested_packages_reporter.rs @@ -196,5 +196,6 @@ impl SuggestedPackagesReporter { fn remove_control_characters(&self, string: &str) -> String { Preg::replace("/[[:cntrl:]]/", "", &string.replace('\n', " ")) + .unwrap_or_else(|_| string.replace('\n', " ")) } } diff --git a/crates/shirabe/src/io/base_io.rs b/crates/shirabe/src/io/base_io.rs index 6e6e7d0..f2b7ee5 100644 --- a/crates/shirabe/src/io/base_io.rs +++ b/crates/shirabe/src/io/base_io.rs @@ -446,11 +446,11 @@ pub trait BaseIO: IOInterface { let mut message_str = message.as_string().unwrap_or("").to_string(); if !context.is_empty() { - let json = Silencer::call(|| { - json_encode_ex( + let json: anyhow::Result<Option<String>> = Silencer::call(|| { + Ok(json_encode_ex( &PhpMixed::Array(context.clone()), JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE, - ) + )) }); if let Ok(Some(json_str)) = json { message_str += " "; diff --git a/crates/shirabe/src/io/buffer_io.rs b/crates/shirabe/src/io/buffer_io.rs index 79fa9c3..ce4070a 100644 --- a/crates/shirabe/src/io/buffer_io.rs +++ b/crates/shirabe/src/io/buffer_io.rs @@ -3,11 +3,12 @@ use crate::io::console_io::ConsoleIO; use anyhow::Result; use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::symfony::component::console::helper::helper_set::HelperSet; +use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; +use shirabe_external_packages::symfony::component::console::input::string_input::StringInput; +use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; use shirabe_external_packages::symfony::console::formatter::output_formatter_interface::OutputFormatterInterface; -use shirabe_external_packages::symfony::console::helper::helper_set::HelperSet; use shirabe_external_packages::symfony::console::helper::question_helper::QuestionHelper; -use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_external_packages::symfony::console::input::string_input::StringInput; use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; use shirabe_php_shim::{ PHP_EOL, PhpMixed, RuntimeException, fopen, fseek, fwrite, rewind, stream_get_contents, @@ -16,7 +17,7 @@ use shirabe_php_shim::{ #[derive(Debug)] pub struct BufferIO { - inner: ConsoleIO, + pub(crate) inner: ConsoleIO, } impl BufferIO { @@ -25,7 +26,7 @@ impl BufferIO { verbosity: i64, formatter: Option<Box<dyn OutputFormatterInterface>>, ) -> Result<Self> { - let mut input_obj = StringInput::new(input); + let mut input_obj = StringInput::new(&input); input_obj.set_interactive(false); let stream = fopen("php://memory", "rw"); @@ -38,21 +39,34 @@ impl BufferIO { } let decorated = formatter.as_ref().map_or(false, |f| f.is_decorated()); - let output = StreamOutput::new(stream, verbosity, decorated, formatter); + // TODO(phase-b): StreamOutput lives under `symfony::console` (not `symfony::component::console`) + // and so does not implement the `component::console::output::OutputInterface` ConsoleIO expects. + // Real fix requires unifying the two crate paths. + let _ = formatter; + let _ = StreamOutput::new(stream, verbosity, Some(decorated)); + let output: Box<dyn OutputInterface> = todo!("StreamOutput as Box<dyn OutputInterface>"); + // TODO(phase-b): symfony console helper modules live under both `symfony::console` + // and `symfony::component::console`; QuestionHelper::new is not yet provided. + let helpers: Vec<PhpMixed> = vec![/* PhpMixed::Object(QuestionHelper::new()) */]; + let _ = std::marker::PhantomData::<QuestionHelper>; let inner = ConsoleIO::new( - input_obj, + Box::new(input_obj) as Box<dyn InputInterface>, output, - HelperSet::new(vec![Box::new(QuestionHelper::new())]), + HelperSet::new(helpers), ); Ok(Self { inner }) } pub fn get_output(&self) -> String { - fseek(self.inner.output.get_stream(), 0); + // TODO(phase-b): OutputInterface::get_stream returns PhpResource, while + // fseek/stream_get_contents take PhpMixed. Conversion is not yet defined. + let stream: PhpMixed = + todo!("PhpResource -> PhpMixed conversion for OutputInterface::get_stream"); + fseek(stream.clone(), 0); - let output = stream_get_contents(self.inner.output.get_stream()).unwrap_or_default(); + let output = stream_get_contents(stream).unwrap_or_default(); let output = Preg::replace_callback( r"{(?<=^|\n|\x08)(.+?)(\x08+)}", @@ -80,28 +94,19 @@ impl BufferIO { &output, ); - output + // TODO(phase-b): Preg::replace_callback returns Result<String>, unwrap for now + output.unwrap_or_default() } pub fn set_user_inputs(&mut self, inputs: Vec<String>) -> Result<()> { - if self - .inner - .input - .as_any() - .downcast_ref::<dyn StreamableInputInterface>() - .is_none() - { - return Err(RuntimeException { - message: "Setting the user inputs requires at least the version 3.2 of the symfony/console component.".to_string(), - code: 0, - } - .into()); - } - - self.inner.input.set_stream(self.create_stream(inputs)?); - self.inner.input.set_interactive(true); - - Ok(()) + // TODO(phase-b): downcast Box<dyn InputInterface> to StreamableInputInterface. + // as_any/set_stream are not yet exposed on the InputInterface trait object. + let _ = inputs; + let _ = |i: &Box<dyn InputInterface>| -> bool { + let _ = i; + false + }; + todo!("port BufferIO::set_user_inputs once StreamableInputInterface downcast is available") } fn create_stream(&self, inputs: Vec<String>) -> Result<PhpMixed> { @@ -123,3 +128,148 @@ impl BufferIO { Ok(stream) } } + +// TODO(phase-b): PHP `class BufferIO extends ConsoleIO` — delegate all IOInterface, +// LoggerInterface, and BaseIO methods to `self.inner` (ConsoleIO). +impl shirabe_external_packages::psr::log::logger_interface::LoggerInterface for BufferIO { + fn emergency(&self, message: &str, context: &[(&str, &str)]) { + self.inner.emergency(message, context) + } + fn alert(&self, message: &str, context: &[(&str, &str)]) { + self.inner.alert(message, context) + } + fn critical(&self, message: &str, context: &[(&str, &str)]) { + self.inner.critical(message, context) + } + fn error(&self, message: &str, context: &[(&str, &str)]) { + self.inner.error(message, context) + } + fn warning(&self, message: &str, context: &[(&str, &str)]) { + self.inner.warning(message, context) + } + fn notice(&self, message: &str, context: &[(&str, &str)]) { + self.inner.notice(message, context) + } + fn info(&self, message: &str, context: &[(&str, &str)]) { + self.inner.info(message, context) + } + fn debug(&self, message: &str, context: &[(&str, &str)]) { + self.inner.debug(message, context) + } + fn log(&self, level: &str, message: &str, context: &[(&str, &str)]) { + self.inner.log(level, message, context) + } +} + +impl crate::io::io_interface::IOInterface for BufferIO { + fn is_interactive(&self) -> bool { + self.inner.is_interactive() + } + fn is_verbose(&self) -> bool { + self.inner.is_verbose() + } + fn is_very_verbose(&self) -> bool { + self.inner.is_very_verbose() + } + fn is_debug(&self) -> bool { + self.inner.is_debug() + } + fn is_decorated(&self) -> bool { + self.inner.is_decorated() + } + fn write3(&self, message: &str, newline: bool, verbosity: i64) { + self.inner.write3(message, newline, verbosity) + } + fn write_error3(&self, message: &str, newline: bool, verbosity: i64) { + self.inner.write_error3(message, newline, verbosity) + } + fn write_raw3(&self, message: &str, newline: bool, verbosity: i64) { + self.inner.write_raw3(message, newline, verbosity) + } + fn write_error_raw3(&self, message: &str, newline: bool, verbosity: i64) { + self.inner.write_error_raw3(message, newline, verbosity) + } + fn overwrite4(&self, message: &str, newline: bool, size: Option<i64>, verbosity: i64) { + self.inner.overwrite4(message, newline, size, verbosity) + } + fn overwrite_error4(&self, message: &str, newline: bool, size: Option<i64>, verbosity: i64) { + self.inner + .overwrite_error4(message, newline, size, verbosity) + } + fn ask(&self, question: String, default: PhpMixed) -> PhpMixed { + self.inner.ask(question, default) + } + fn ask_confirmation(&self, question: String, default: bool) -> bool { + self.inner.ask_confirmation(question, default) + } + fn ask_and_validate( + &self, + question: String, + validator: Box<dyn Fn(PhpMixed) -> PhpMixed>, + attempts: Option<i64>, + default: PhpMixed, + ) -> PhpMixed { + self.inner + .ask_and_validate(question, validator, attempts, default) + } + fn ask_and_hide_answer(&self, question: String) -> Option<String> { + self.inner.ask_and_hide_answer(question) + } + fn select( + &self, + question: String, + choices: Vec<String>, + default: PhpMixed, + attempts: PhpMixed, + error_message: String, + multiselect: bool, + ) -> PhpMixed { + self.inner.select( + question, + choices, + default, + attempts, + error_message, + multiselect, + ) + } + fn get_authentications( + &self, + ) -> indexmap::IndexMap<String, indexmap::IndexMap<String, Option<String>>> { + self.inner.get_authentications() + } + fn has_authentication(&self, repository_name: &str) -> bool { + self.inner.has_authentication(repository_name) + } + fn get_authentication( + &self, + repository_name: &str, + ) -> indexmap::IndexMap<String, Option<String>> { + self.inner.get_authentication(repository_name) + } + fn set_authentication( + &mut self, + repository_name: String, + username: String, + password: Option<String>, + ) { + self.inner + .set_authentication(repository_name, username, password) + } + fn load_configuration(&mut self, config: &mut crate::config::Config) -> anyhow::Result<()> { + self.inner.load_configuration(config) + } +} + +impl crate::io::base_io::BaseIO for BufferIO { + fn authentications( + &self, + ) -> &indexmap::IndexMap<String, indexmap::IndexMap<String, Option<String>>> { + self.inner.authentications() + } + fn authentications_mut( + &mut self, + ) -> &mut indexmap::IndexMap<String, indexmap::IndexMap<String, Option<String>>> { + self.inner.authentications_mut() + } +} diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs index 39099c4..2182c37 100644 --- a/crates/shirabe/src/io/console_io.rs +++ b/crates/shirabe/src/io/console_io.rs @@ -29,7 +29,6 @@ use crate::question::strict_confirmation_question::StrictConfirmationQuestion; use crate::util::silencer::Silencer; /// The Input/Output helper. -#[derive(Debug)] pub struct ConsoleIO { authentications: indexmap::IndexMap<String, indexmap::IndexMap<String, Option<String>>>, @@ -45,6 +44,21 @@ pub struct ConsoleIO { verbosity_map: IndexMap<i64, i64>, } +// TODO(phase-b): dyn InputInterface / dyn OutputInterface do not implement Debug, +// so we cannot derive Debug. Provide a manual impl that omits those fields. +impl std::fmt::Debug for ConsoleIO { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("ConsoleIO") + .field("authentications", &self.authentications) + .field("helper_set", &self.helper_set) + .field("last_message", &self.last_message) + .field("last_message_err", &self.last_message_err) + .field("start_time", &self.start_time) + .field("verbosity_map", &self.verbosity_map) + .finish() + } +} + impl ConsoleIO { /// Constructor. /// @@ -131,9 +145,11 @@ impl ConsoleIO { // TODO(phase-b): downcast Box<dyn OutputInterface> to ConsoleOutputInterface let console_output: &dyn ConsoleOutputInterface = todo!("downcast self.output to ConsoleOutputInterface"); - console_output - .get_error_output() - .write3(messages.clone(), newline, sf_verbosity); + console_output.get_error_output().write( + &Self::to_string_list(&messages).join(if newline { "\n" } else { "" }), + newline, + sf_verbosity, + ); // PHP: implode($newline ? "\n" : '', (array) $messages) *self.last_message_err.borrow_mut() = implode( if newline { "\n" } else { "" }, @@ -143,7 +159,11 @@ impl ConsoleIO { return; } - self.output.write3(messages.clone(), newline, sf_verbosity); + self.output.write( + &Self::to_string_list(&messages).join(if newline { "\n" } else { "" }), + newline, + sf_verbosity, + ); *self.last_message.borrow_mut() = implode( if newline { "\n" } else { "" }, &Self::to_string_list(&messages), @@ -168,11 +188,12 @@ impl ConsoleIO { // since overwrite is supposed to overwrite last message... let size = size.unwrap_or_else(|| { // removing possible formatting of lastMessage with strip_tags - strlen(&strip_tags(if stderr { - &self.last_message_err.borrow() + let last = if stderr { + self.last_message_err.borrow().clone() } else { - &self.last_message.borrow() - })) + self.last_message.borrow().clone() + }; + strlen(&strip_tags(&last)) }); // ...let's fill its length with backspaces self.do_write( @@ -279,7 +300,7 @@ impl ConsoleIO { }; if is_string(&messages) { let message = Self::ensure_valid_utf8(messages.as_string().unwrap_or("")); - return PhpMixed::String(Preg::replace(&pattern, "", &message)); + return PhpMixed::String(Preg::replace(&pattern, "", &message).unwrap_or_default()); } // PHP: $sanitized = []; foreach ($messages as $key => $message) { ... } @@ -290,7 +311,7 @@ impl ConsoleIO { let s = Self::ensure_valid_utf8(message.as_string().unwrap_or("")); sanitized.insert( key.to_string(), - PhpMixed::String(Preg::replace(&pattern, "", &s)), + PhpMixed::String(Preg::replace(&pattern, "", &s).unwrap_or_default()), ); } } @@ -299,7 +320,7 @@ impl ConsoleIO { let s = Self::ensure_valid_utf8(message.as_string().unwrap_or("")); sanitized.insert( key.clone(), - PhpMixed::String(Preg::replace(&pattern, "", &s)), + PhpMixed::String(Preg::replace(&pattern, "", &s).unwrap_or_default()), ); } } @@ -358,40 +379,44 @@ impl ConsoleIO { } impl LoggerInterface for ConsoleIO { - fn emergency(&self, message: &str, context: &[(&str, &str)]) { - <Self as BaseIO>::emergency(self, message, context) + // TODO(phase-b): BaseIO's emergency/alert/.../log take PhpMixed and + // IndexMap<String, Box<PhpMixed>> while LoggerInterface takes &str and + // &[(&str, &str)]. Delegation requires reconciling signatures; for now, + // mirror NullIO and panic via todo!(). + fn emergency(&self, _message: &str, _context: &[(&str, &str)]) { + todo!() } - fn alert(&self, message: &str, context: &[(&str, &str)]) { - <Self as BaseIO>::alert(self, message, context) + fn alert(&self, _message: &str, _context: &[(&str, &str)]) { + todo!() } - fn critical(&self, message: &str, context: &[(&str, &str)]) { - <Self as BaseIO>::critical(self, message, context) + fn critical(&self, _message: &str, _context: &[(&str, &str)]) { + todo!() } - fn error(&self, message: &str, context: &[(&str, &str)]) { - <Self as BaseIO>::error(self, message, context) + fn error(&self, _message: &str, _context: &[(&str, &str)]) { + todo!() } - fn warning(&self, message: &str, context: &[(&str, &str)]) { - <Self as BaseIO>::warning(self, message, context) + fn warning(&self, _message: &str, _context: &[(&str, &str)]) { + todo!() } - fn notice(&self, message: &str, context: &[(&str, &str)]) { - <Self as BaseIO>::notice(self, message, context) + fn notice(&self, _message: &str, _context: &[(&str, &str)]) { + todo!() } - fn info(&self, message: &str, context: &[(&str, &str)]) { - <Self as BaseIO>::info(self, message, context) + fn info(&self, _message: &str, _context: &[(&str, &str)]) { + todo!() } - fn debug(&self, message: &str, context: &[(&str, &str)]) { - <Self as BaseIO>::debug(self, message, context) + fn debug(&self, _message: &str, _context: &[(&str, &str)]) { + todo!() } - fn log(&self, level: &str, message: &str, context: &[(&str, &str)]) { - <Self as BaseIO>::log(self, level, message, context) + fn log(&self, _level: &str, _message: &str, _context: &[(&str, &str)]) { + todo!() } } @@ -417,107 +442,142 @@ impl IOInterface for ConsoleIO { } fn write3(&self, message: &str, newline: bool, verbosity: i64) { - let message = Self::sanitize(message, true); + let message = Self::sanitize(PhpMixed::String(message.to_string()), true); self.do_write(message, newline, false, verbosity, false); } fn write_error3(&self, message: &str, newline: bool, verbosity: i64) { - let message = Self::sanitize(message, true); + let message = Self::sanitize(PhpMixed::String(message.to_string()), true); self.do_write(message, newline, true, verbosity, false); } fn write_raw3(&self, message: &str, newline: bool, verbosity: i64) { - self.do_write(message, newline, false, verbosity, true); + self.do_write( + PhpMixed::String(message.to_string()), + newline, + false, + verbosity, + true, + ); } fn write_error_raw3(&self, message: &str, newline: bool, verbosity: i64) { - self.do_write(message, newline, true, verbosity, true); + self.do_write( + PhpMixed::String(message.to_string()), + newline, + true, + verbosity, + true, + ); } fn overwrite4(&self, message: &str, newline: bool, size: Option<i64>, verbosity: i64) { - self.do_overwrite(message, newline, size, false, verbosity); + self.do_overwrite( + PhpMixed::String(message.to_string()), + newline, + size, + false, + verbosity, + ); } fn overwrite_error4(&self, message: &str, newline: bool, size: Option<i64>, verbosity: i64) { - self.do_overwrite(message, newline, size, true, verbosity); + self.do_overwrite( + PhpMixed::String(message.to_string()), + newline, + size, + true, + verbosity, + ); } - fn ask(&mut self, question: String, default: PhpMixed) -> PhpMixed { + fn ask(&self, question: String, default: PhpMixed) -> PhpMixed { // PHP: $helper = $this->helperSet->get('question'); - let helper = self.helper_set.get("question"); - let question = Question::new( - Self::sanitize(PhpMixed::String(question), true), - if is_string(&default) { - Self::sanitize(default, true) - } else { - default - }, - ); + let _helper = self.helper_set.get("question"); + let sanitized_question = Self::sanitize(PhpMixed::String(question), true) + .as_string() + .unwrap_or("") + .to_string(); + let sanitized_default = if is_string(&default) { + Some(Self::sanitize(default, true)) + } else { + Some(default) + }; + let _question = Question::new(&sanitized_question, sanitized_default); - helper.ask(&*self.input, self.get_error_output(), &question) + // TODO(phase-b): HelperSet::get returns PhpMixed; QuestionHelper::ask is + // not yet modeled. Returning a placeholder until helper types are wired up. + todo!("call QuestionHelper::ask on resolved helper") } - fn ask_confirmation(&mut self, question: String, default: bool) -> bool { - let helper = self.helper_set.get("question"); + fn ask_confirmation(&self, question: String, default: bool) -> bool { + let _helper = self.helper_set.get("question"); // TODO(phase-b): Self::sanitize returns PhpMixed but new() expects String; // also true/false regexes need to come through composer/symfony defaults. let sanitized = Self::sanitize(PhpMixed::String(question), true) .as_string() .unwrap_or("") .to_string(); - let question = StrictConfirmationQuestion::new( + let _question = StrictConfirmationQuestion::new( sanitized, default, "/^y(?:es)?$/i".to_string(), "/^no?$/i".to_string(), ); - helper - .ask(&*self.input, self.get_error_output(), &question) - .as_bool() - .unwrap_or(false) + // TODO(phase-b): see ask() above; placeholder until QuestionHelper is modeled. + todo!("call QuestionHelper::ask on resolved helper and coerce to bool") } fn ask_and_validate( - &mut self, + &self, question: String, validator: Box<dyn Fn(PhpMixed) -> PhpMixed>, attempts: Option<i64>, default: PhpMixed, ) -> PhpMixed { - let helper = self.helper_set.get("question"); - let mut question = Question::new( - Self::sanitize(PhpMixed::String(question), true), - if is_string(&default) { - Self::sanitize(default, true) - } else { - default - }, - ); - question.set_validator(validator); + let _helper = self.helper_set.get("question"); + let sanitized_question = Self::sanitize(PhpMixed::String(question), true) + .as_string() + .unwrap_or("") + .to_string(); + let sanitized_default = if is_string(&default) { + Some(Self::sanitize(default, true)) + } else { + Some(default) + }; + let mut question = Question::new(&sanitized_question, sanitized_default); + // TODO(phase-b): IOInterface validator type is Box<dyn Fn(PhpMixed) -> PhpMixed> + // but Question::set_validator expects Option<Box<dyn Fn(Option<PhpMixed>) -> Result<PhpMixed>>>. + // Bridge the signatures by adapting the input/output types. + let adapted: Box<dyn Fn(Option<PhpMixed>) -> anyhow::Result<PhpMixed>> = + Box::new(move |answer: Option<PhpMixed>| { + Ok(validator(answer.unwrap_or(PhpMixed::Null))) + }); + question.set_validator(Some(adapted)); question.set_max_attempts(attempts); - helper.ask(&*self.input, self.get_error_output(), &question) + // TODO(phase-b): QuestionHelper::ask not yet modeled. + todo!("call QuestionHelper::ask on resolved helper") } - fn ask_and_hide_answer(&mut self, question: String) -> Option<String> { - let helper = self.helper_set.get("question"); - let mut question = Question::new( - Self::sanitize(PhpMixed::String(question), true), - PhpMixed::Null, - ); + fn ask_and_hide_answer(&self, question: String) -> Option<String> { + let _helper = self.helper_set.get("question"); + let sanitized_question = Self::sanitize(PhpMixed::String(question), true) + .as_string() + .unwrap_or("") + .to_string(); + let mut question = Question::new(&sanitized_question, Some(PhpMixed::Null)); question.set_hidden(true); - helper - .ask(&*self.input, self.get_error_output(), &question) - .as_string() - .map(|s| s.to_string()) + // TODO(phase-b): QuestionHelper::ask not yet modeled. + todo!("call QuestionHelper::ask on resolved helper and coerce to Option<String>") } fn select( - &mut self, + &self, question: String, choices: Vec<String>, default: PhpMixed, @@ -532,27 +592,39 @@ impl IOInterface for ConsoleIO { .map(|s| Box::new(PhpMixed::String(s))) .collect(), ); - let helper = self.helper_set.get("question"); - let mut question = ChoiceQuestion::new( - Self::sanitize(PhpMixed::String(question), true), - Self::sanitize(choices.clone(), true), - if is_string(&default) { - Self::sanitize(default, true) - } else { - default - }, - ); + let _helper = self.helper_set.get("question"); + let sanitized_question = Self::sanitize(PhpMixed::String(question), true) + .as_string() + .unwrap_or("") + .to_string(); + // TODO(phase-b): ChoiceQuestion::new expects Vec<PhpMixed>; collect from the + // sanitized PhpMixed::List. + let sanitized_choices_mixed = Self::sanitize(choices.clone(), true); + let sanitized_choices: Vec<PhpMixed> = match sanitized_choices_mixed { + PhpMixed::List(l) => l.into_iter().map(|b| *b).collect(), + PhpMixed::Array(a) => a.into_values().map(|b| *b).collect(), + other => vec![other], + }; + let sanitized_default = if is_string(&default) { + Some(Self::sanitize(default, true)) + } else { + Some(default) + }; + let mut question = + ChoiceQuestion::new(&sanitized_question, sanitized_choices, sanitized_default); // PHP: IOInterface requires false, and Question requires null or int let max_attempts = match attempts { PhpMixed::Bool(false) => None, PhpMixed::Int(i) => Some(i), _ => None, }; - question.set_max_attempts(max_attempts); + // ChoiceQuestion delegates set_max_attempts to its inner Question. + question.0.set_max_attempts(max_attempts); question.set_error_message(&error_message); question.set_multiselect(multiselect); - let result = helper.ask(&*self.input, self.get_error_output(), &question); + // TODO(phase-b): QuestionHelper::ask not yet modeled. + let result: PhpMixed = todo!("call QuestionHelper::ask on resolved helper"); // PHP: $isAssoc = (bool) \count(array_filter(array_keys($choices), 'is_string')); let choice_keys: Vec<String> = match &choices { diff --git a/crates/shirabe/src/io/io_interface.rs b/crates/shirabe/src/io/io_interface.rs index d9092b1..f014594 100644 --- a/crates/shirabe/src/io/io_interface.rs +++ b/crates/shirabe/src/io/io_interface.rs @@ -82,22 +82,22 @@ pub trait IOInterface: LoggerInterface + std::fmt::Debug { } fn overwrite_error4(&self, message: &str, newline: bool, size: Option<i64>, verbosity: i64); - fn ask(&mut self, question: String, default: PhpMixed) -> PhpMixed; + fn ask(&self, question: String, default: PhpMixed) -> PhpMixed; - fn ask_confirmation(&mut self, question: String, default: bool) -> bool; + fn ask_confirmation(&self, question: String, default: bool) -> bool; fn ask_and_validate( - &mut self, + &self, question: String, validator: Box<dyn Fn(PhpMixed) -> PhpMixed>, attempts: Option<i64>, default: PhpMixed, ) -> PhpMixed; - fn ask_and_hide_answer(&mut self, question: String) -> Option<String>; + fn ask_and_hide_answer(&self, question: String) -> Option<String>; fn select( - &mut self, + &self, question: String, choices: Vec<String>, default: PhpMixed, diff --git a/crates/shirabe/src/io/null_io.rs b/crates/shirabe/src/io/null_io.rs index 2536ad0..1a06e6e 100644 --- a/crates/shirabe/src/io/null_io.rs +++ b/crates/shirabe/src/io/null_io.rs @@ -58,16 +58,16 @@ impl IOInterface for NullIO { ) { } - fn ask(&mut self, _question: String, default: PhpMixed) -> PhpMixed { + fn ask(&self, _question: String, default: PhpMixed) -> PhpMixed { default } - fn ask_confirmation(&mut self, _question: String, default: bool) -> bool { + fn ask_confirmation(&self, _question: String, default: bool) -> bool { default } fn ask_and_validate( - &mut self, + &self, _question: String, _validator: Box<dyn Fn(PhpMixed) -> PhpMixed>, _attempts: Option<i64>, @@ -76,12 +76,12 @@ impl IOInterface for NullIO { default } - fn ask_and_hide_answer(&mut self, _question: String) -> Option<String> { + fn ask_and_hide_answer(&self, _question: String) -> Option<String> { None } fn select( - &mut self, + &self, _question: String, _choices: Vec<String>, default: PhpMixed, diff --git a/crates/shirabe/src/json/json_file.rs b/crates/shirabe/src/json/json_file.rs index 52c3c71..4a2d079 100644 --- a/crates/shirabe/src/json/json_file.rs +++ b/crates/shirabe/src/json/json_file.rs @@ -413,17 +413,27 @@ impl JsonFile { if (options & JSON_PRETTY_PRINT) > 0 && indent != Self::INDENT_DEFAULT { // Pretty printing and not using default indentation - let indent = indent.to_string(); + let indent_owned = indent.to_string(); return Preg::replace_callback( r"#^ {4,}#m", - move |m| -> String { - str_repeat( - &indent, - (strlen(m.get(&0).map(|s| s.as_str()).unwrap_or("")) / 4) as usize, - ) + move |m: &indexmap::IndexMap< + shirabe_external_packages::composer::pcre::preg::CaptureKey, + String, + >| + -> String { + let whole = m + .get( + &shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex( + 0, + ), + ) + .map(|s| s.as_str()) + .unwrap_or(""); + str_repeat(&indent_owned, (strlen(whole) / 4) as usize) }, &json, - ); + ) + .unwrap_or(json); } json @@ -471,13 +481,15 @@ impl JsonFile { // attempt resolving simple conflicts in lock files so that one can run `composer update --lock` and get a valid lock file if let Some(file) = file { if str_ends_with(file, ".lock") && str_contains(json, "\"content-hash\"") { - // TODO(phase-b): Preg::replace_with_count signature unavailable; ignoring $count - let replaced = Preg::replace( + let mut count: usize = 0; + let replaced = Preg::replace5( 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", json, - ); - let count = todo!("Preg::replace returning $count"); + -1, + &mut count, + ) + .unwrap_or_else(|_| json.to_string()); if count == 1 { data = json_decode(&replaced, true)?; if !matches!(data, PhpMixed::Null) { @@ -523,7 +535,7 @@ impl JsonFile { "The input does not contain valid JSON\n{}", result.get_message() ), - result.get_details(), + None, ), Some(f) => ParsingException::new( format!( @@ -531,7 +543,7 @@ impl JsonFile { f, result.get_message() ), - result.get_details(), + None, ), } .into()) diff --git a/crates/shirabe/src/json/json_manipulator.rs b/crates/shirabe/src/json/json_manipulator.rs index c776e13..7dee06f 100644 --- a/crates/shirabe/src/json/json_manipulator.rs +++ b/crates/shirabe/src/json/json_manipulator.rs @@ -2,12 +2,13 @@ use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; use shirabe_php_shim::{ ArrayObject, InvalidArgumentException, LogicException, PREG_BACKTRACK_LIMIT_ERROR, PhpMixed, RuntimeException, StdClass, addcslashes, array_key_exists, array_keys, array_reverse, count, - explode, implode, in_array, is_array, is_int, is_numeric, json_decode, max_i64, preg_quote, - rtrim, str_contains, str_repeat, str_replace, strlen, strnatcmp, strpos, substr, trim, uksort, + empty, explode, implode, in_array, is_array, is_int, is_numeric, json_decode, max_i64, + preg_quote, rtrim, str_contains, str_repeat, str_replace, strlen, strnatcmp, strpos, substr, + trim, uksort, }; use crate::json::json_file::JsonFile; @@ -32,7 +33,7 @@ impl JsonManipulator { )"; pub fn new(contents: String) -> anyhow::Result<Self> { - let mut contents = trim(&contents, " \t\n\r\0\u{0B}"); + let mut contents = trim(&contents, Some(" \t\n\r\0\u{0B}")); if contents == "" { contents = "{}".to_string(); } @@ -88,7 +89,7 @@ impl JsonManipulator { "{{{}^(?P<start>\\s*\\{{\\s*(?:(?&string)\\s*:\\s*(?&json)\\s*,\\s*)*?)(?P<property>{}\\s*:\\s*)(?P<value>(?&json))(?P<end>.*)}}sx", Self::DEFINES, preg_quote( - &JsonFile::encode(&PhpMixed::String(r#type.to_string()), 0)?, + &JsonFile::encode(&PhpMixed::String(r#type.to_string()), 0), None ), ); @@ -122,21 +123,23 @@ impl JsonManipulator { Self::DEFINES, package_regex ), - Box::new(move |m: &IndexMap<String, String>| -> String { + move |m: &IndexMap<CaptureKey, String>| -> String { format!( "{}{}\"{}\"", JsonFile::encode( &PhpMixed::String(str_replace("\\/", "/", &existing_owned)), 0 ), - m.get("separator").cloned().unwrap_or_default(), + m.get(&CaptureKey::ByName("separator".to_string())) + .cloned() + .unwrap_or_default(), constraint_owned ) - }), + }, &links, - ); + )?; } else { - let mut groups: Vec<String> = vec![]; + let mut groups: IndexMap<CaptureKey, String> = IndexMap::new(); if Preg::is_match_strict_groups3( "#^\\s*\\{\\s*\\S+.*?(\\s*\\}\\s*)$#s", &links, @@ -144,9 +147,13 @@ impl JsonManipulator { ) .unwrap_or(false) { + let groups_1 = groups + .get(&CaptureKey::ByIndex(1)) + .cloned() + .unwrap_or_default(); // link missing but non empty links links = Preg::replace( - &format!("{{{}$}}", preg_quote(&groups[1], None)), + &format!("{{{}$}}", preg_quote(&groups_1, None)), // addcslashes is used to double up backslashes/$ since preg_replace resolves them as back references otherwise, see #1588 &addcslashes( &format!( @@ -154,14 +161,14 @@ impl JsonManipulator { self.newline, self.indent, self.indent, - JsonFile::encode(&PhpMixed::String(package.to_string()), 0)?, - JsonFile::encode(&PhpMixed::String(constraint.to_string()), 0)?, - groups[1] + JsonFile::encode(&PhpMixed::String(package.to_string()), 0), + JsonFile::encode(&PhpMixed::String(constraint.to_string()), 0), + groups_1 ), "\\$", ), &links, - ); + )?; } else { // links empty links = format!( @@ -169,8 +176,8 @@ impl JsonManipulator { self.newline, self.indent, self.indent, - JsonFile::encode(&PhpMixed::String(package.to_string()), 0)?, - JsonFile::encode(&PhpMixed::String(constraint.to_string()), 0)?, + JsonFile::encode(&PhpMixed::String(package.to_string()), 0), + JsonFile::encode(&PhpMixed::String(constraint.to_string()), 0), self.newline, self.indent ); @@ -192,30 +199,20 @@ impl JsonManipulator { fn sort_packages(packages: &mut PhpMixed) { let prefix = |requirement: &str| -> String { if PlatformRepository::is_platform_package(requirement) { - Preg::replace_array( - &vec![ - "/^php/".to_string(), - "/^hhvm/".to_string(), - "/^ext/".to_string(), - "/^lib/".to_string(), - "/^\\D/".to_string(), - ], - &vec![ - "0-$0".to_string(), - "1-$0".to_string(), - "2-$0".to_string(), - "3-$0".to_string(), - "4-$0".to_string(), - ], - requirement, - ) + let patterns = ["/^php/", "/^hhvm/", "/^ext/", "/^lib/", "/^\\D/"]; + let replacements = ["0-$0", "1-$0", "2-$0", "3-$0", "4-$0"]; + let mut result = requirement.to_string(); + for (p, r) in patterns.iter().zip(replacements.iter()) { + result = Preg::replace(p, r, &result).unwrap_or(result); + } + result } else { format!("5-{}", requirement) } }; if let Some(arr) = packages.as_array_mut() { - uksort(arr, |a: &String, b: &String| -> std::cmp::Ordering { + uksort(arr, |a: &str, b: &str| -> i64 { strnatcmp(&prefix(a), &prefix(b)) }); } @@ -235,7 +232,10 @@ impl JsonManipulator { return Ok(false); } - let final_config = if is_array(&config) && !is_numeric(name) && "" != name { + let final_config = if is_array(&config) + && !is_numeric(&PhpMixed::String(name.to_string())) + && "" != name + { // PHP: ['name' => $name] + $config — preserve $config keys let mut merged: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); merged.insert( @@ -264,17 +264,21 @@ impl JsonManipulator { fn do_convert_repositories_from_assoc_to_list(&mut self) -> anyhow::Result<bool> { let decoded = json_decode(&self.contents, false)?; - let repositories_value = decoded.as_object().and_then(|o| o.get("repositories")); + let repositories_value: Option<Box<PhpMixed>> = decoded + .as_object() + .and_then(|o| o.to_array().get("repositories").cloned()); let is_std_class = repositories_value + .as_ref() .map(|v| v.as_any().is::<StdClass>()) .unwrap_or(false); if is_std_class { // delete from bottom to top, to ensure keys stay the same let repos_arr: IndexMap<String, Box<PhpMixed>> = repositories_value + .as_ref() .and_then(|v| v.as_array().cloned()) .unwrap_or_default(); - let entries_to_revert: Vec<String> = array_reverse(array_keys(&repos_arr)); + let entries_to_revert: Vec<String> = array_reverse(&array_keys(&repos_arr), false); for entry_key in &entries_to_revert { if !self.remove_sub_node("repositories", entry_key)? { @@ -293,7 +297,7 @@ impl JsonManipulator { if !self.add_list_item("repositories", PhpMixed::Array(m), true)? { return Ok(false); } - } else if is_numeric(repository_name) { + } else if is_numeric(&PhpMixed::String(repository_name.clone())) { if !self.add_list_item("repositories", (**repository).clone(), true)? { return Ok(false); } @@ -366,7 +370,7 @@ impl JsonManipulator { let object_regex = format!( "{{{}^(?P<start>\\s*\\{{\\s*(?:(?&string)\\s*:\\s*(?&json)\\s*,\\s*)*?\"repositories\"\\s*:\\s*\\{{\\s*(?:(?&string)\\s*:\\s*(?&json)\\s*,\\s*)*?{}\\s*:\\s*)(?P<repository>(?&object))(?P<end>.*)}}sx", Self::DEFINES, - preg_quote(&JsonFile::encode(&repository_index, 0)?, None) + preg_quote(&JsonFile::encode(&repository_index, 0), None) ); let mut matches: IndexMap<String, String> = IndexMap::new(); @@ -393,18 +397,22 @@ impl JsonManipulator { matches.get("start").cloned().unwrap_or_default(), Preg::replace_callback( &repository_regex, - Box::new( - move |repository_matches: &IndexMap<String, String>| -> String { - format!( - "{}{}{}", - repository_matches.get("start").cloned().unwrap_or_default(), - JsonFile::encode(&PhpMixed::String(url_owned.clone()), 0), - repository_matches.get("end").cloned().unwrap_or_default() - ) - } - ), + move |repository_matches: &IndexMap<CaptureKey, String>| -> String { + format!( + "{}{}{}", + repository_matches + .get(&CaptureKey::ByName("start".to_string())) + .cloned() + .unwrap_or_default(), + JsonFile::encode(&PhpMixed::String(url_owned.clone()), 0), + repository_matches + .get(&CaptureKey::ByName("end".to_string())) + .cloned() + .unwrap_or_default() + ) + }, &raw_repo, - ), + )?, matches.get("end").cloned().unwrap_or_default() ); @@ -468,7 +476,10 @@ impl JsonManipulator { None => return Ok(false), }; - let final_config = if is_array(&config) && !is_numeric(name) && "" != name { + let final_config = if is_array(&config) + && !is_numeric(&PhpMixed::String(name.to_string())) + && "" != name + { let mut merged: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); merged.insert( "name".to_string(), @@ -499,12 +510,16 @@ impl JsonManipulator { fn do_remove_repository(&mut self, name: &str) -> anyhow::Result<bool> { let decoded = json_decode(&self.contents, false)?; - let repositories_value = decoded.as_object().and_then(|o| o.get("repositories")); + let repositories_value: Option<Box<PhpMixed>> = decoded + .as_object() + .and_then(|o| o.to_array().get("repositories").cloned()); let is_assoc = repositories_value + .as_ref() .map(|v| v.as_any().is::<StdClass>()) .unwrap_or(false); let repos: IndexMap<String, Box<PhpMixed>> = repositories_value + .as_ref() .and_then(|v| v.as_array().cloned()) .unwrap_or_default(); @@ -517,11 +532,11 @@ impl JsonManipulator { break; } - let repo_name = repository + let repo_name_owned: Option<String> = repository .as_object() - .and_then(|o| o.get("name")) - .and_then(|v| v.as_string()); - if Some(name) == repo_name { + .and_then(|o| o.to_array().get("name").cloned()) + .and_then(|v| v.as_string().map(|s| s.to_string())); + if Some(name) == repo_name_owned.as_deref() { if is_assoc { if !self.remove_sub_node("repositories", repository_index)? { return Ok(false); @@ -552,7 +567,7 @@ impl JsonManipulator { .get(name) .map(|v| v.as_bool() == Some(false)) .unwrap_or(false) - && 1 == count(&repository_as_array) + && 1 == count(&PhpMixed::Array(repository_as_array.clone())) { let idx: i64 = repository_index.parse().unwrap_or(0); if !self.remove_list_item("repositories", idx)? { @@ -627,12 +642,12 @@ impl JsonManipulator { let mut name_owned = name.to_string(); let mut sub_name: Option<String> = None; if in_array( - main_node, - &vec![ - "config".to_string(), - "extra".to_string(), - "scripts".to_string(), - ], + PhpMixed::String(main_node.to_string()), + &PhpMixed::List(vec![ + Box::new(PhpMixed::String("config".to_string())), + Box::new(PhpMixed::String("extra".to_string())), + Box::new(PhpMixed::String("scripts".to_string())), + ]), false, ) && strpos(name, ".").is_some() { @@ -666,7 +681,7 @@ impl JsonManipulator { "{{{}^(?P<start> \\s* \\{{ \\s* (?: (?&string) \\s* : (?&json) \\s* , \\s* )*?{}\\s*:\\s*)(?P<content>(?&object))(?P<end>.*)}}sx", Self::DEFINES, preg_quote( - &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0)?, + &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0), None ) ); @@ -711,10 +726,13 @@ impl JsonManipulator { }; children = Preg::replace_callback( &child_regex, - Box::new(move |matches: &IndexMap<String, String>| -> String { + move |matches: &IndexMap<CaptureKey, String>| -> String { + let content_key = CaptureKey::ByName("content".to_string()); + let start_key = CaptureKey::ByName("start".to_string()); + let end_key = CaptureKey::ByName("end".to_string()); let mut value_local = value_capture.clone(); - if sub_name_capture.is_some() && matches.get("content").is_some() { - let mut cur_val = json_decode(matches.get("content").unwrap(), true) + if sub_name_capture.is_some() && matches.get(&content_key).is_some() { + let mut cur_val = json_decode(matches.get(&content_key).unwrap(), true) .unwrap_or(PhpMixed::Null); if !is_array(&cur_val) { cur_val = PhpMixed::Array(IndexMap::new()); @@ -730,13 +748,13 @@ impl JsonManipulator { format!( "{}{}{}", - matches.get("start").cloned().unwrap_or_default(), + matches.get(&start_key).cloned().unwrap_or_default(), formatter.format(&value_local, 1, false).unwrap_or_default(), - matches.get("end").cloned().unwrap_or_default() + matches.get(&end_key).cloned().unwrap_or_default() ) - }), + }, &children, - ); + )?; } else { let mut leading_match: IndexMap<String, String> = IndexMap::new(); if Preg::is_match_named( @@ -773,14 +791,14 @@ impl JsonManipulator { self.newline, self.indent, self.indent, - JsonFile::encode(&PhpMixed::String(name_owned.clone()), 0)?, + JsonFile::encode(&PhpMixed::String(name_owned.clone()), 0), self.format(&value_local, 1, false)?, whitespace ), "\\$", ), &children, - ); + )?; } else { whitespace = leading_space.clone(); children = Preg::replace( @@ -789,7 +807,7 @@ impl JsonManipulator { &format!( "{{{}{}: {},{}{}{}", whitespace, - JsonFile::encode(&PhpMixed::String(name_owned.clone()), 0)?, + JsonFile::encode(&PhpMixed::String(name_owned.clone()), 0), self.format(&value_local, 1, false)?, self.newline, self.indent, @@ -798,7 +816,7 @@ impl JsonManipulator { "\\$", ), &children, - ); + )?; } } else { let mut value_local = value.clone(); @@ -814,7 +832,7 @@ impl JsonManipulator { self.newline, self.indent, self.indent, - JsonFile::encode(&PhpMixed::String(name_owned.clone()), 0)?, + JsonFile::encode(&PhpMixed::String(name_owned.clone()), 0), self.format(&value_local, 1, false)?, whitespace ); @@ -831,16 +849,20 @@ impl JsonManipulator { let children_owned = children; self.contents = Preg::replace_callback( &node_regex, - Box::new(move |m: &IndexMap<String, String>| -> String { + move |m: &IndexMap<CaptureKey, String>| -> String { format!( "{}{}{}", - m.get("start").cloned().unwrap_or_default(), + m.get(&CaptureKey::ByName("start".to_string())) + .cloned() + .unwrap_or_default(), children_owned, - m.get("end").cloned().unwrap_or_default() + m.get(&CaptureKey::ByName("end".to_string())) + .cloned() + .unwrap_or_default() ) - }), + }, &self.contents, - ); + )?; Ok(true) } @@ -850,7 +872,7 @@ impl JsonManipulator { // no node or empty node let main_node_value = decoded.as_array().and_then(|a| a.get(main_node)); - if main_node_value.map(|v| v.is_empty()).unwrap_or(true) { + if main_node_value.map(|v| empty(v.as_ref())).unwrap_or(true) { return Ok(true); } @@ -859,7 +881,7 @@ impl JsonManipulator { "{{{}^(?P<start> \\s* \\{{ \\s* (?: (?&string) \\s* : (?&json) \\s* , \\s* )*?{}\\s*:\\s*)(?P<content>(?&object))(?P<end>.*)}}sx", Self::DEFINES, preg_quote( - &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0)?, + &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0), None ) ); @@ -891,12 +913,12 @@ impl JsonManipulator { let mut name_owned = name.to_string(); let mut sub_name: Option<String> = None; if in_array( - main_node, - &vec![ - "config".to_string(), - "extra".to_string(), - "scripts".to_string(), - ], + PhpMixed::String(main_node.to_string()), + &PhpMixed::List(vec![ + Box::new(PhpMixed::String("config".to_string())), + Box::new(PhpMixed::String("extra".to_string())), + Box::new(PhpMixed::String("scripts".to_string())), + ]), false, ) && strpos(name, ".").is_some() { @@ -930,7 +952,7 @@ impl JsonManipulator { .unwrap_or(false) { // find best match for the value of "name" - let mut all_matches: Vec<Vec<String>> = vec![]; + let mut all_matches: IndexMap<CaptureKey, Vec<String>> = IndexMap::new(); if Preg::is_match_all3( &format!( "{{{}\"{}\"\\s*:\\s*(?:(?&json))}}x", @@ -938,32 +960,36 @@ impl JsonManipulator { key_regex ), &children, - &mut all_matches, + Some(&mut all_matches), ) .unwrap_or(false) { let mut best_match: String = String::new(); - for m in &all_matches[0] { + let first_group = all_matches + .get(&CaptureKey::ByIndex(0)) + .cloned() + .unwrap_or_default(); + for m in &first_group { if strlen(&best_match) < strlen(m) { best_match = m.clone(); } } - let mut count_out: i64 = 0; - let cleaned = Preg::replace_count( + let mut count_out: usize = 0; + let cleaned = Preg::replace5( &format!("{{,\\s*{}}}i", preg_quote(&best_match, None)), "", &children, -1, &mut count_out, - ); + )?; if 1 != count_out { - let cleaned2 = Preg::replace_count( + let cleaned2 = Preg::replace5( &format!("{{{}\\s*,?\\s*}}i", preg_quote(&best_match, None)), "", &cleaned, -1, &mut count_out, - ); + )?; if 1 != count_out { return Ok(false); } @@ -996,17 +1022,23 @@ impl JsonManipulator { self.contents = Preg::replace_callback( &node_regex, - Box::new(move |matches: &IndexMap<String, String>| -> String { + move |matches: &IndexMap<CaptureKey, String>| -> String { format!( "{}{{{}{}}}{}", - matches.get("start").cloned().unwrap_or_default(), + matches + .get(&CaptureKey::ByName("start".to_string())) + .cloned() + .unwrap_or_default(), newline, indent, - matches.get("end").cloned().unwrap_or_default() + matches + .get(&CaptureKey::ByName("end".to_string())) + .cloned() + .unwrap_or_default() ) - }), + }, &self.contents, - ); + )?; // we have a subname, so we restore the rest of $name if let Some(sub) = sub_name { @@ -1049,12 +1081,17 @@ impl JsonManipulator { }; self.contents = Preg::replace_callback( &node_regex, - Box::new(move |matches: &IndexMap<String, String>| -> String { + move |matches: &IndexMap<CaptureKey, String>| -> String { + let content_key = CaptureKey::ByName("content".to_string()); + let start_key = CaptureKey::ByName("start".to_string()); + let end_key = CaptureKey::ByName("end".to_string()); let mut children_clean = children_clean_capture.clone(); if let Some(ref sub) = sub_name_capture { - let mut cur_val = - json_decode(matches.get("content").unwrap_or(&String::new()), true) - .unwrap_or(PhpMixed::Null); + let mut cur_val = json_decode( + matches.get(&content_key).map(|s| s.as_str()).unwrap_or(""), + true, + ) + .unwrap_or(PhpMixed::Null); if let Some(arr) = cur_val.as_array_mut() { if let Some(inner) = arr.get_mut(&name_capture).and_then(|v| v.as_array_mut()) @@ -1078,13 +1115,13 @@ impl JsonManipulator { format!( "{}{}{}", - matches.get("start").cloned().unwrap_or_default(), + matches.get(&start_key).cloned().unwrap_or_default(), children_clean, - matches.get("end").cloned().unwrap_or_default() + matches.get(&end_key).cloned().unwrap_or_default() ) - }), + }, &self.contents, - ); + )?; Ok(true) } @@ -1109,7 +1146,7 @@ impl JsonManipulator { "{{{}^(?P<start> \\s* \\{{ \\s* (?: (?&string) \\s* : (?&json) \\s* , \\s* )*?{}\\s*:\\s*)(?P<content>(?&array))(?P<end>.*)}}sx", Self::DEFINES, preg_quote( - &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0)?, + &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0), None ) ); @@ -1179,7 +1216,7 @@ impl JsonManipulator { "\\$", ), &children, - ); + )?; } else { whitespace = leading_whitespace.clone(); children = Preg::replace( @@ -1194,7 +1231,7 @@ impl JsonManipulator { "\\$", ), &children, - ); + )?; } } else { // children present but empty @@ -1216,16 +1253,20 @@ impl JsonManipulator { let children_owned = children; self.contents = Preg::replace_callback( &node_regex, - Box::new(move |m: &IndexMap<String, String>| -> String { + move |m: &IndexMap<CaptureKey, String>| -> String { format!( "{}{}{}", - m.get("start").cloned().unwrap_or_default(), + m.get(&CaptureKey::ByName("start".to_string())) + .cloned() + .unwrap_or_default(), children_owned, - m.get("end").cloned().unwrap_or_default() + m.get(&CaptureKey::ByName("end".to_string())) + .cloned() + .unwrap_or_default() ) - }), + }, &self.contents, - ); + )?; Ok(true) } @@ -1272,7 +1313,7 @@ impl JsonManipulator { "{{{}^(?P<start> \\s* \\{{ \\s* (?: (?&string) \\s* : (?&json) \\s* , \\s* )*?{}\\s*:\\s*)(?P<content>(?&array))(?P<end>.*)}}sx", Self::DEFINES, preg_quote( - &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0)?, + &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0), None ) ); @@ -1312,34 +1353,46 @@ impl JsonManipulator { }; children = Preg::replace_callback( &list_skip_to_item_regex, - Box::new(move |m: &IndexMap<String, String>| -> String { + move |m: &IndexMap<CaptureKey, String>| -> String { format!( "{}{}{},{}{}", - m.get("start").cloned().unwrap_or_default(), - m.get("space_before_item").cloned().unwrap_or_default(), + m.get(&CaptureKey::ByName("start".to_string())) + .cloned() + .unwrap_or_default(), + m.get(&CaptureKey::ByName("space_before_item".to_string())) + .cloned() + .unwrap_or_default(), formatter .format(&value_capture, 1, false) .unwrap_or_default(), - m.get("space_before_item").cloned().unwrap_or_default(), - m.get("end").cloned().unwrap_or_default() + m.get(&CaptureKey::ByName("space_before_item".to_string())) + .cloned() + .unwrap_or_default(), + m.get(&CaptureKey::ByName("end".to_string())) + .cloned() + .unwrap_or_default() ) - }), + }, &children, - ); + )?; let children_owned = children; self.contents = Preg::replace_callback( &node_regex, - Box::new(move |m: &IndexMap<String, String>| -> String { + move |m: &IndexMap<CaptureKey, String>| -> String { format!( "{}{}{}", - m.get("start").cloned().unwrap_or_default(), + m.get(&CaptureKey::ByName("start".to_string())) + .cloned() + .unwrap_or_default(), children_owned, - m.get("end").cloned().unwrap_or_default() + m.get(&CaptureKey::ByName("end".to_string())) + .cloned() + .unwrap_or_default() ) - }), + }, &self.contents, - ); + )?; Ok(true) } @@ -1354,7 +1407,7 @@ impl JsonManipulator { // no node or empty node let main_node_value = decoded.as_array().and_then(|a| a.get(main_node)); - if main_node_value.map(|v| v.is_empty()).unwrap_or(true) { + if main_node_value.map(|v| empty(v.as_ref())).unwrap_or(true) { return Ok(true); } @@ -1363,7 +1416,7 @@ impl JsonManipulator { "{{{}^(?P<start> \\s* \\{{ \\s* (?: (?&string) \\s* : (?&json) \\s* , \\s* )*?{}\\s*:\\s*)(?P<content>(?&array))(?P<end>.*)}}sx", Self::DEFINES, preg_quote( - &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0)?, + &JsonFile::encode(&PhpMixed::String(main_node.to_string()), 0), None ) ); @@ -1457,7 +1510,7 @@ impl JsonManipulator { "{{{}^(?P<start>\\s*\\{{\\s*(?:(?&string)\\s*:\\s*(?&json)\\s*,\\s*)*?)(?P<key>{}\\s*:\\s*(?&json))(?P<end>.*)}}sx", Self::DEFINES, preg_quote( - &JsonFile::encode(&PhpMixed::String(key.to_string()), 0)?, + &JsonFile::encode(&PhpMixed::String(key.to_string()), 0), None ) ); @@ -1474,7 +1527,7 @@ impl JsonManipulator { self.contents = format!( "{}{}: {}{}", matches.get("start").cloned().unwrap_or_default(), - JsonFile::encode(&PhpMixed::String(key.to_string()), 0)?, + JsonFile::encode(&PhpMixed::String(key.to_string()), 0), content, matches.get("end").cloned().unwrap_or_default() ); @@ -1483,25 +1536,29 @@ impl JsonManipulator { } // append at the end of the file and keep whitespace - let mut tail_match: Vec<String> = vec![]; + let mut tail_match: IndexMap<CaptureKey, String> = IndexMap::new(); if Preg::is_match3("#[^{\\s](\\s*)\\}$#", &self.contents, Some(&mut tail_match)) .unwrap_or(false) { + let tail_match_1 = tail_match + .get(&CaptureKey::ByIndex(1)) + .cloned() + .unwrap_or_default(); self.contents = Preg::replace( - &format!("#{}\\}}$#", tail_match[1]), + &format!("#{}\\}}$#", tail_match_1), &addcslashes( &format!( ",{}{}{}: {}{}}}", self.newline, self.indent, - JsonFile::encode(&PhpMixed::String(key.to_string()), 0)?, + JsonFile::encode(&PhpMixed::String(key.to_string()), 0), content, self.newline ), "\\$", ), &self.contents, - ); + )?; return Ok(true); } @@ -1513,14 +1570,14 @@ impl JsonManipulator { &format!( "{}{}: {}{}}}", self.indent, - JsonFile::encode(&PhpMixed::String(key.to_string()), 0)?, + JsonFile::encode(&PhpMixed::String(key.to_string()), 0), content, self.newline ), "\\$", ), &self.contents, - ); + )?; Ok(true) } @@ -1538,7 +1595,7 @@ impl JsonManipulator { "{{{}^(?P<start>\\s*\\{{\\s*(?:(?&string)\\s*:\\s*(?&json)\\s*,\\s*)*?)(?P<removal>{}\\s*:\\s*(?&json))\\s*,?\\s*(?P<end>.*)}}sx", Self::DEFINES, preg_quote( - &JsonFile::encode(&PhpMixed::String(key.to_string()), 0)?, + &JsonFile::encode(&PhpMixed::String(key.to_string()), 0), None ) ); @@ -1556,7 +1613,10 @@ impl JsonManipulator { if Preg::is_match_strict_groups3("#,\\s*$#", &start, None).unwrap_or(false) && Preg::is_match3("#^\\}$#", &end, None).unwrap_or(false) { - start = rtrim(&Preg::replace("#,(\\s*)$#", "$1", &start), &self.indent); + start = rtrim( + &Preg::replace("#,(\\s*)$#", "$1", &start)?, + Some(&self.indent), + ); } self.contents = format!("{}{}", start, end); @@ -1582,7 +1642,7 @@ impl JsonManipulator { "{{{}^(?P<start>\\s*\\{{\\s*(?:(?&string)\\s*:\\s*(?&json)\\s*,\\s*)*?{}\\s*:\\s*)(?P<removal>\\{{(?P<removal_space>\\s*+)\\}})(?P<end>\\s*,?\\s*.*)}}sx", Self::DEFINES, preg_quote( - &JsonFile::encode(&PhpMixed::String(key.to_string()), 0)?, + &JsonFile::encode(&PhpMixed::String(key.to_string()), 0), None ) ); @@ -1668,7 +1728,7 @@ impl JsonManipulator { elems.push(format!( "{}{}: {}", str_repeat(&self.indent, (depth + 2) as usize), - JsonFile::encode(&PhpMixed::String(key.clone()), 0)?, + JsonFile::encode(&PhpMixed::String(key.clone()), 0), self.format(val, depth + 1, false)? )); } @@ -1683,11 +1743,11 @@ impl JsonManipulator { )); } - Ok(JsonFile::encode(&data, 0)?) + Ok(JsonFile::encode(&data, 0)) } pub(crate) fn detect_indenting(&mut self) { - self.indent = JsonFile::detect_indenting(&self.contents); + self.indent = JsonFile::detect_indenting(Some(&self.contents)); } } @@ -1739,7 +1799,7 @@ impl ManipulatorFormatter { elems.push(format!( "{}{}: {}", str_repeat(&self.indent, (depth + 2) as usize), - JsonFile::encode(&PhpMixed::String(key.clone()), 0)?, + JsonFile::encode(&PhpMixed::String(key.clone()), 0), self.format(val, depth + 1, false)? )); } @@ -1754,6 +1814,6 @@ impl ManipulatorFormatter { )); } - Ok(JsonFile::encode(&data, 0)?) + Ok(JsonFile::encode(&data, 0)) } } diff --git a/crates/shirabe/src/package/alias_package.rs b/crates/shirabe/src/package/alias_package.rs index 3f4b1d8..0049d89 100644 --- a/crates/shirabe/src/package/alias_package.rs +++ b/crates/shirabe/src/package/alias_package.rs @@ -130,7 +130,11 @@ impl AliasPackage { } pub fn get_alias_of(&self) -> &dyn BasePackage { - &self.alias_of + self.alias_of.as_ref() + } + + pub fn get_alias_of_mut(&mut self) -> &mut dyn BasePackage { + &mut *self.alias_of } /// Stores whether this is an alias created by an aliasing in the requirements of the root package or not @@ -181,7 +185,7 @@ impl AliasPackage { Some(link_type.to_string()), Some(pretty_version.clone()), ); - constraint.set_pretty_string(&pretty_version); + shirabe_semver::constraint::constraint_interface::ConstraintInterface::set_pretty_string(&mut constraint, Some(pretty_version.clone())); new_links.push(new_link); } } @@ -201,7 +205,7 @@ impl AliasPackage { Some(link_type.to_string()), Some(pretty_version.clone()), ); - constraint.set_pretty_string(&pretty_version); + shirabe_semver::constraint::constraint_interface::ConstraintInterface::set_pretty_string(&mut constraint, Some(pretty_version.clone())); links[index] = new_link; } } @@ -479,7 +483,7 @@ impl BasePackage for AliasPackage { } fn repository_opt(&self) -> Option<&dyn RepositoryInterface> { - self.repository.as_ref() + self.repository.as_deref() } fn set_repository_box(&mut self, repository: Box<dyn RepositoryInterface>) { diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs index 374e16c..094ddc3 100644 --- a/crates/shirabe/src/package/archiver/archive_manager.rs +++ b/crates/shirabe/src/package/archiver/archive_manager.rs @@ -58,10 +58,10 @@ impl ArchiveManager { pub fn get_package_filename_parts( &self, package: &dyn CompletePackageInterface, - ) -> IndexMap<String, String> { + ) -> anyhow::Result<IndexMap<String, String>> { let base_name = match package.get_archive_name() { Some(name) => name.to_string(), - None => Preg::replace("#[^a-z0-9-_]#i", "-", package.get_name()), + None => Preg::replace("#[^a-z0-9-_]#i", "-", package.get_name())?, }; let mut parts: IndexMap<String, String> = IndexMap::new(); @@ -70,7 +70,7 @@ impl ArchiveManager { let dist_reference = package.get_dist_reference(); if let Some(ref dist_ref) = dist_reference { if Preg::is_match("{^[a-f0-9]{40}$}", dist_ref).unwrap_or(false) { - parts.insert("dist_reference".to_string(), dist_ref.clone()); + parts.insert("dist_reference".to_string(), dist_ref.to_string()); if let Some(dist_type) = package.get_dist_type() { parts.insert("dist_type".to_string(), dist_type.to_string()); } @@ -79,7 +79,7 @@ impl ArchiveManager { "version".to_string(), package.get_pretty_version().to_string(), ); - parts.insert("dist_reference".to_string(), dist_ref.clone()); + parts.insert("dist_reference".to_string(), dist_ref.to_string()); } } else { parts.insert( @@ -95,10 +95,10 @@ impl ArchiveManager { // array_filter removed null values; replace '/' with '-' in each value for val in parts.values_mut() { - *val = val.replace('/', '-'); + *val = val.replace('/', "-"); } - parts + Ok(parts) } pub fn get_package_filename_from_parts(&self, parts: &IndexMap<String, String>) -> String { @@ -106,9 +106,12 @@ impl ArchiveManager { values.join("-") } - pub fn get_package_filename(&self, package: &dyn CompletePackageInterface) -> String { - let parts = self.get_package_filename_parts(package); - self.get_package_filename_from_parts(&parts) + pub fn get_package_filename( + &self, + package: &dyn CompletePackageInterface, + ) -> anyhow::Result<String> { + let parts = self.get_package_filename_parts(package)?; + Ok(self.get_package_filename_from_parts(&parts)) } pub fn archive( @@ -147,9 +150,9 @@ impl ArchiveManager { } }; - let filesystem = Filesystem::new(None); + let mut filesystem = Filesystem::new(None); - let is_root = package.as_any().is::<dyn RootPackageInterface>(); + let is_root = package.as_root_package_interface().is_some(); let source_path: String; if is_root { @@ -181,7 +184,7 @@ impl ArchiveManager { let composer_json_path = format!("{}/composer.json", source_path); if file_exists(&composer_json_path) { - let json_file = JsonFile::new(composer_json_path, None, None)?; + let mut json_file = JsonFile::new(composer_json_path, None, None)?; let json_data = json_file.read()?; if let Some(archive) = json_data.get("archive") { if let Some(name) = archive.get("name").and_then(|v| v.as_string()) { @@ -206,7 +209,7 @@ impl ArchiveManager { let supported_formats = self.get_supported_formats(); let package_name_parts = match file_name { - None => self.get_package_filename_parts(package), + None => self.get_package_filename_parts(package)?, Some(f) => { let mut parts = IndexMap::new(); parts.insert("base".to_string(), f); diff --git a/crates/shirabe/src/package/archiver/archiver_interface.rs b/crates/shirabe/src/package/archiver/archiver_interface.rs index 82e976d..54121b5 100644 --- a/crates/shirabe/src/package/archiver/archiver_interface.rs +++ b/crates/shirabe/src/package/archiver/archiver_interface.rs @@ -1,5 +1,7 @@ //! ref: composer/src/Composer/Package/Archiver/ArchiverInterface.php +use std::any::Any; + pub trait ArchiverInterface { fn archive( &self, @@ -11,4 +13,7 @@ pub trait ArchiverInterface { ) -> anyhow::Result<String>; fn supports(&self, format: String, source_type: Option<String>) -> bool; + + /// PHP `$archiver instanceof X` checks; allow downcasting from `dyn ArchiverInterface`. + fn as_any(&self) -> &dyn Any; } diff --git a/crates/shirabe/src/package/archiver/phar_archiver.rs b/crates/shirabe/src/package/archiver/phar_archiver.rs index 7b5142b..17bc05b 100644 --- a/crates/shirabe/src/package/archiver/phar_archiver.rs +++ b/crates/shirabe/src/package/archiver/phar_archiver.rs @@ -156,4 +156,8 @@ impl ArchiverInterface for PharArchiver { fn supports(&self, format: String, _source_type: Option<String>) -> bool { formats().contains_key(format.as_str()) } + + fn as_any(&self) -> &dyn std::any::Any { + self + } } diff --git a/crates/shirabe/src/package/archiver/zip_archiver.rs b/crates/shirabe/src/package/archiver/zip_archiver.rs index 471352f..a5dd4f4 100644 --- a/crates/shirabe/src/package/archiver/zip_archiver.rs +++ b/crates/shirabe/src/package/archiver/zip_archiver.rs @@ -107,4 +107,8 @@ impl ArchiverInterface for ZipArchiver { fn supports(&self, format: String, _source_type: Option<String>) -> bool { Self::formats().contains_key(&format) && self.compression_available() } + + fn as_any(&self) -> &dyn std::any::Any { + self + } } diff --git a/crates/shirabe/src/package/base_package.rs b/crates/shirabe/src/package/base_package.rs index 052a480..109fdb4 100644 --- a/crates/shirabe/src/package/base_package.rs +++ b/crates/shirabe/src/package/base_package.rs @@ -83,6 +83,12 @@ pub trait BasePackage: PackageInterface + std::fmt::Display { fn set_repository_box(&mut self, repository: Box<dyn RepositoryInterface>); fn take_repository(&mut self) -> Option<Box<dyn RepositoryInterface>>; + /// PHP `setRepository($this)` from the containing repository — Rust port marker until + /// the borrow story for repository-package back-references is finalized in phase B. + fn set_repository_self(&mut self) { + // TODO(phase-b): wire up a back-reference to the containing repository when needed. + } + fn clone_box(&self) -> Box<dyn BasePackage>; // as_alias_package / as_complete_package_interface inherited from PackageInterface. diff --git a/crates/shirabe/src/package/complete_package.rs b/crates/shirabe/src/package/complete_package.rs index 27c49c6..f6ee7ae 100644 --- a/crates/shirabe/src/package/complete_package.rs +++ b/crates/shirabe/src/package/complete_package.rs @@ -23,6 +23,26 @@ pub struct CompletePackage { pub(crate) archive_excludes: Vec<String>, } +impl CompletePackage { + pub fn new(name: String, version: String, pretty_version: String) -> Self { + Self { + inner: crate::package::package::Package::new(name, version, pretty_version), + repositories: Vec::new(), + license: Vec::new(), + keywords: Vec::new(), + authors: Vec::new(), + description: None, + homepage: None, + scripts: IndexMap::new(), + support: IndexMap::new(), + funding: Vec::new(), + abandoned: PhpMixed::Bool(false), + archive_name: None, + archive_excludes: Vec::new(), + } + } +} + impl CompletePackageInterface for CompletePackage { fn set_scripts(&mut self, scripts: IndexMap<String, Vec<String>>) { self.scripts = scripts; diff --git a/crates/shirabe/src/package/dumper/array_dumper.rs b/crates/shirabe/src/package/dumper/array_dumper.rs index 0b57070..cbff605 100644 --- a/crates/shirabe/src/package/dumper/array_dumper.rs +++ b/crates/shirabe/src/package/dumper/array_dumper.rs @@ -1,14 +1,14 @@ //! ref: composer/src/Composer/Package/Dumper/ArrayDumper.php -use std::any::Any; - use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::base_package::BasePackage; +use crate::package::base_package::SUPPORTED_LINK_TYPES; use crate::package::complete_package::CompletePackage; +use crate::package::complete_package_interface::CompletePackageInterface; use crate::package::package_interface::PackageInterface; use crate::package::root_package::RootPackage; +use crate::package::root_package_interface::RootPackageInterface; #[derive(Debug)] pub struct ArrayDumper; @@ -131,10 +131,10 @@ impl ArrayDumper { } // corresponds to: foreach (BasePackage::$supportedLinkTypes as $type => $opts) { $links = $package->{'get'.ucfirst($opts['method'])}(); ... } - for (type_name, method_name) in <dyn BasePackage>::supported_link_types() { + for (type_name, opts) in SUPPORTED_LINK_TYPES.iter() { // TODO(phase-b): PackageInterface needs get_links_by_method to mimic PHP magic call let links: Vec<crate::package::link::Link> = Vec::new(); - let _ = (&method_name, package); + let _ = (&opts.method, package); if links.is_empty() { continue; } @@ -142,11 +142,13 @@ impl ArrayDumper { for link in &links { link_map.insert( link.get_target().to_string(), - Box::new(PhpMixed::String(link.get_pretty_constraint().to_string())), + Box::new(PhpMixed::String( + link.get_pretty_constraint().unwrap_or_default().to_string(), + )), ); } link_map.sort_keys(); - data.insert(type_name, PhpMixed::Array(link_map)); + data.insert(type_name.to_string(), PhpMixed::Array(link_map)); } let suggests = package.get_suggests(); @@ -265,7 +267,7 @@ impl ArrayDumper { let entry = data .entry("archive".to_string()) .or_insert_with(|| PhpMixed::Array(IndexMap::new())); - if let PhpMixed::Array(ref mut archive) = entry { + if let PhpMixed::Array(archive) = entry { archive.insert( "name".to_string(), Box::new(PhpMixed::String(archive_name.to_string())), @@ -277,7 +279,7 @@ impl ArrayDumper { let entry = data .entry("archive".to_string()) .or_insert_with(|| PhpMixed::Array(IndexMap::new())); - if let PhpMixed::Array(ref mut archive) = entry { + if let PhpMixed::Array(archive) = entry { archive.insert( "exclude".to_string(), Box::new(PhpMixed::List( diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs index 3ece5c7..82b2ef7 100644 --- a/crates/shirabe/src/package/loader/array_loader.rs +++ b/crates/shirabe/src/package/loader/array_loader.rs @@ -860,7 +860,7 @@ impl ArrayLoader { && default_branch_is_true && self .version_parser - .parse_numeric_alias_prefix(&Preg::replace(r"{^v}", "", &version_str)) + .parse_numeric_alias_prefix(&Preg::replace(r"{^v}", "", &version_str)?) .is_none() { return Ok(Some(VersionParser::DEFAULT_BRANCH_ALIAS.to_string())); diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index d2e2a7a..15f1114 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -9,12 +9,14 @@ use shirabe_php_shim::{ use crate::config::Config; use crate::io::io_interface::IOInterface; use crate::package::base_package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES}; +use crate::package::complete_package_interface::CompletePackageInterface; use crate::package::loader::array_loader::ArrayLoader; use crate::package::loader::loader_interface::LoaderInterface; use crate::package::loader::validating_array_loader::ValidatingArrayLoader; use crate::package::package_interface::PackageInterface; use crate::package::root_alias_package::RootAliasPackage; use crate::package::root_package::RootPackage; +use crate::package::root_package_interface::RootPackageInterface; use crate::package::version::version_guesser::VersionGuesser; use crate::package::version::version_parser::VersionParser; use crate::repository::repository_factory::RepositoryFactory; @@ -39,9 +41,9 @@ impl RootPackageLoader { version_guesser: Option<VersionGuesser>, io: Option<Box<dyn IOInterface>>, ) -> Self { - let inner = ArrayLoader::new(parser); + let inner = ArrayLoader::new(parser, true); let version_guesser = version_guesser.unwrap_or_else(|| { - let mut process_executor = ProcessExecutor::new(io.as_deref()); + let mut process_executor = ProcessExecutor::new(io.as_deref().map(|i| i.clone_box())); process_executor.enable_async(); VersionGuesser::new( std::rc::Rc::clone(&config), @@ -94,7 +96,7 @@ impl RootPackageLoader { let mut commit: Option<String> = None; if Platform::get_env("COMPOSER_ROOT_VERSION").is_some() { - let version = self.version_guesser.get_root_version_from_env(); + let version = self.version_guesser.get_root_version_from_env()?; config.insert( "version".to_string(), Box::new(shirabe_php_shim::PhpMixed::String(version)), @@ -102,18 +104,25 @@ impl RootPackageLoader { } else { let cwd_str = cwd .map(|s| s.to_string()) - .unwrap_or_else(|| Platform::get_cwd(true)); - let version_data = self.version_guesser.guess_version(&config, &cwd_str); + .unwrap_or_else(|| Platform::get_cwd(true).unwrap_or_default()); + // TODO(phase-b): config here is IndexMap<String, Box<PhpMixed>> but guess_version + // expects IndexMap<String, PhpMixed>; pass an empty map as placeholder. + let unboxed_config: IndexMap<String, shirabe_php_shim::PhpMixed> = IndexMap::new(); + let version_data = self + .version_guesser + .guess_version(&unboxed_config, &cwd_str)?; if let Some(data) = version_data { config.insert( "version".to_string(), Box::new(shirabe_php_shim::PhpMixed::String( - data.pretty_version.clone(), + data.pretty_version.clone().unwrap_or_default(), )), ); config.insert( "version_normalized".to_string(), - Box::new(shirabe_php_shim::PhpMixed::String(data.version.clone())), + Box::new(shirabe_php_shim::PhpMixed::String( + data.version.clone().unwrap_or_default(), + )), ); commit = data.commit; } @@ -127,7 +136,7 @@ impl RootPackageLoader { io.warning(&format!( "Composer could not detect the root package ({}) version, defaulting to '1.0.0'. See https://getcomposer.org/root-version", name - )); + ), &[]); } } config.insert( @@ -176,42 +185,30 @@ impl RootPackageLoader { } } - let package = self - .inner - .load(config.clone(), "Composer\\Package\\RootPackage")?; + // TODO(phase-b): config is IndexMap<String, Box<PhpMixed>> but LoaderInterface::load + // expects IndexMap<String, PhpMixed>; pass empty placeholder. + let unboxed_config: IndexMap<String, shirabe_php_shim::PhpMixed> = IndexMap::new(); + let mut package = self.inner.load( + unboxed_config, + Some("Composer\\Package\\RootPackage".to_string()), + )?; - let real_package: &mut RootPackage = - if let Some(alias_pkg) = package.as_any_mut().downcast_mut::<RootAliasPackage>() { - alias_pkg - .get_alias_of_mut() - .as_any_mut() - .downcast_mut::<RootPackage>() - .ok_or_else(|| { - anyhow::anyhow!(LogicException { - message: "Expecting a Composer\\Package\\RootPackage at this point" - .to_string(), - code: 0, - }) - })? - } else if let Some(root_pkg) = package.as_any_mut().downcast_mut::<RootPackage>() { - root_pkg - } else { - return Err(anyhow::anyhow!(LogicException { - message: "Expecting a Composer\\Package\\RootPackage at this point".to_string(), - code: 0, - })); - }; + // TODO(phase-b): as_any_mut is not available on BasePackage; downcast via Any is not + // possible without it. Skipping real downcast and using todo!() placeholder. + let real_package: &mut RootPackage = { + let _ = &mut package; + todo!("downcast Box<dyn BasePackage> to &mut RootPackage requires as_any_mut on trait") + }; if auto_versioned { - real_package.replace_version( - real_package.get_version().to_string(), - RootPackage::DEFAULT_PRETTY_VERSION.to_string(), - ); + // TODO(phase-b): replace_version is an inherent method on Package, not exposed via trait. + let _ = real_package; + todo!("replace_version is not accessible through RootPackage's embedded Package"); } if let Some(min_stability) = config.get("minimum-stability").and_then(|v| v.as_string()) { real_package.set_minimum_stability( - VersionParser::normalize_stability(min_stability).to_string(), + VersionParser::normalize_stability(min_stability).unwrap_or_default(), ); } @@ -222,19 +219,10 @@ impl RootPackageLoader { for link_type in ["require", "require-dev"] { if config.contains_key(link_type) { let link_info = &SUPPORTED_LINK_TYPES[link_type]; - let method = format!("get_{}", link_info.method); - let links: IndexMap<String, String> = real_package - .call_get_links_method(&method) - .iter() - .map(|(target, link)| { - ( - target.clone(), - link.get_constraint() - .map(|c| c.get_pretty_string().to_string()) - .unwrap_or_default(), - ) - }) - .collect(); + let _method = format!("get_{}", link_info.method); + // TODO(phase-b): PHP uses dynamic method dispatch ($realPackage->{$method}()). + // We need a Rust-side equivalent (e.g. a match on link_type) to collect Links. + let links: IndexMap<String, String> = IndexMap::new(); aliases = self.extract_aliases(&links, aliases); stability_flags = Self::extract_stability_flags( &links, @@ -295,10 +283,13 @@ impl RootPackageLoader { Some(std::rc::Rc::clone(&self.config)), Some(&mut self.manager), )?; - for repo in repos { + for (_, repo) in repos { self.manager.add_repository(repo); } - real_package.set_repositories(self.config.borrow().get_repositories()); + // TODO(phase-b): Config::get_repositories returns IndexMap<String, PhpMixed>, but + // set_repositories expects Vec<IndexMap<String, PhpMixed>>; pass empty placeholder. + real_package.set_repositories(Vec::new()); + let _ = self.config.borrow().get_repositories(); Ok(package) } @@ -390,7 +381,8 @@ impl RootPackageLoader { { let name = strtolower(req_name); let m1 = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); - let stability = stabilities[VersionParser::normalize_stability(&m1)]; + let normalized_m1 = VersionParser::normalize_stability(&m1).unwrap_or_default(); + let stability = stabilities[normalized_m1.as_str()]; if stability_flags.get(&name).copied().unwrap_or(i64::MAX) > stability { continue; @@ -411,7 +403,7 @@ impl RootPackageLoader { let stability_name = VersionParser::parse_stability(&req_version_stripped); if stability_name != "stable" { let name = strtolower(req_name); - let stability = stabilities[stability_name]; + let stability = stabilities[stability_name.as_str()]; if stability_flags.get(&name).copied().unwrap_or(i64::MAX) > stability || minimum_stability_val > stability { diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs index 5009a0d..f01b774 100644 --- a/crates/shirabe/src/package/loader/validating_array_loader.rs +++ b/crates/shirabe/src/package/loader/validating_array_loader.rs @@ -12,6 +12,7 @@ use shirabe_php_shim::{ strtolower, strtotime, substr, trigger_error, trim, var_export, }; use shirabe_semver::constraint::constraint::Constraint; +use shirabe_semver::constraint::constraint_interface::ConstraintInterface; use shirabe_semver::constraint::match_none_constraint::MatchNoneConstraint; use shirabe_semver::intervals::Intervals; @@ -215,7 +216,7 @@ impl ValidatingArrayLoader { let license_to_validate = str_replace("proprietary", "MIT", &license_str); if !license_validator.validate(&license_to_validate) { if license_validator - .validate(&trim(&license_to_validate, " \t\n\r\0\u{0B}")) + .validate(&trim(&license_to_validate, Some(" \t\n\r\0\u{0B}"))) { self.warnings.push(sprintf( "License %s must not contain extra spaces, make sure to trim it.", @@ -963,7 +964,7 @@ impl ValidatingArrayLoader { )); } - let compacted = Intervals::compact_constraint(link_constraint.as_ref()); + let compacted = Intervals::compact_constraint(link_constraint.as_ref())?; if compacted.as_any().is::<MatchNoneConstraint>() { self.warnings.push(format!( "{}.{} : this version constraint cannot possibly match anything ({})", @@ -985,7 +986,16 @@ impl ValidatingArrayLoader { .and_then(|v| v.as_array()) .cloned() .unwrap_or_default(); - let keys = array_intersect_key(&replace_map, &conflict_map); + // TODO(phase-b): convert Box<PhpMixed> maps for the shim signature. + let replace_map_flat: IndexMap<String, PhpMixed> = replace_map + .iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect(); + let conflict_map_flat: IndexMap<String, PhpMixed> = conflict_map + .iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect(); + let keys = array_intersect_key(&replace_map_flat, &conflict_map_flat); if !keys.is_empty() { self.errors.push(format!( "{}.{} : you cannot conflict with a package that is also replaced, as replace already creates an implicit conflict rule", @@ -1238,7 +1248,7 @@ impl ValidatingArrayLoader { 0, Some((target_branch_str.len() as i64) - 4), ); - let validated_target_branch = self.version_parser.normalize_branch(&trimmed); + let validated_target_branch = self.version_parser.normalize_branch(&trimmed)?; if substr(&validated_target_branch, -4, None) != "-dev" { self.warnings.push(format!( "extra.branch-alias.{} : the target branch ({}) must be a parseable number like 2.0-dev", @@ -1418,7 +1428,7 @@ impl ValidatingArrayLoader { let is_empty = !self.config.contains_key(property) || trim( self.config[property].as_string().unwrap_or(""), - " \t\n\r\0\u{0B}", + Some(" \t\n\r\0\u{0B}"), ) == ""; if is_empty { if mandatory { diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index 8b3fea5..72339e8 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -29,6 +29,7 @@ use crate::plugin::plugin_interface::{self, PluginInterface}; use crate::repository::installed_repository::InstalledRepository; use crate::repository::lock_array_repository::LockArrayRepository; use crate::repository::platform_repository::PlatformRepository; +use crate::repository::repository_interface::FindPackageConstraint; use crate::repository::root_package_repository::RootPackageRepository; use crate::util::git::Git as GitUtil; use crate::util::process_executor::ProcessExecutor; @@ -51,7 +52,7 @@ pub struct Locker { /// @var ProcessExecutor process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, /// @var mixed[]|null - lock_data_cache: Option<IndexMap<String, PhpMixed>>, + lock_data_cache: std::cell::RefCell<Option<IndexMap<String, PhpMixed>>>, /// @var bool virtual_file_written: bool, } @@ -73,7 +74,7 @@ impl Locker { loader: ArrayLoader::new(None, true), dumper: ArrayDumper::new(), process, - lock_data_cache: None, + lock_data_cache: std::cell::RefCell::new(None), virtual_file_written: false, } } @@ -85,7 +86,12 @@ impl Locker { /// Returns the md5 hash of the sorted content of the composer file. pub fn get_content_hash(composer_file_contents: &str) -> Result<String> { - let content = JsonFile::parse_json(composer_file_contents, Some("composer.json"))?; + let content = JsonFile::parse_json(Some(composer_file_contents), Some("composer.json"))?; + // TODO(phase-b): parse_json returns PhpMixed; downstream expects map-like access + let content_map: IndexMap<String, PhpMixed> = match &content { + PhpMixed::Array(m) => m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect(), + _ => IndexMap::new(), + }; let relevant_keys: Vec<&str> = vec![ "name", @@ -103,16 +109,16 @@ impl Locker { let mut relevant_content: IndexMap<String, PhpMixed> = IndexMap::new(); - let content_keys: Vec<String> = array_keys(&content); + let content_keys: Vec<String> = array_keys(&content_map); let relevant_keys_strings: Vec<String> = relevant_keys.iter().map(|s| s.to_string()).collect(); let intersected = array_intersect(&relevant_keys_strings, &content_keys); for key in intersected { - if let Some(value) = content.get(&key) { + if let Some(value) = content_map.get(&key) { relevant_content.insert(key, value.clone()); } } - let platform_value = content.get("config").and_then(|v| match v { + let platform_value = content_map.get("config").and_then(|v| match v { PhpMixed::Array(m) => m.get("platform").cloned(), _ => None, }); @@ -152,17 +158,21 @@ impl Locker { } /// Checks whether the lock file is still up to date with the current hash - pub fn is_fresh(&self) -> Result<bool> { + pub fn is_fresh(&mut self) -> Result<bool> { let lock = self.lock_file.read()?; + let lock_map: IndexMap<String, PhpMixed> = match lock { + PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }; - let content_hash = lock.get("content-hash"); + let content_hash = lock_map.get("content-hash"); if content_hash.is_some() && !shirabe_php_shim::empty(content_hash.unwrap()) { // There is a content hash key, use that instead of the file hash return Ok(self.content_hash == content_hash.unwrap().as_string().unwrap_or("")); } // BC support for old lock files without content-hash - let lock_hash = lock.get("hash"); + let lock_hash = lock_map.get("hash"); if lock_hash.is_some() && !shirabe_php_shim::empty(lock_hash.unwrap()) { return Ok(self.hash == lock_hash.unwrap().as_string().unwrap_or("")); } @@ -174,7 +184,8 @@ impl Locker { /// Searches and returns an array of locked packages, retrieved from registered repositories. pub fn get_locked_repository(&mut self, with_dev_reqs: bool) -> Result<LockArrayRepository> { let lock_data = self.get_lock_data()?; - let mut packages = LockArrayRepository::new(vec![])?; + // TODO(phase-b): LockArrayRepository has no `new` constructor yet + let mut packages: LockArrayRepository = todo!("LockArrayRepository::new(vec![])"); let mut locked_packages = lock_data .get("packages") @@ -215,17 +226,12 @@ impl Locker { let info_map: IndexMap<String, PhpMixed> = m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect(); let package = self.loader.load(info_map, None)?; - packages.add_package(package.clone())?; - package_by_name.insert(package.get_name().to_string(), package.clone()); - - // TODO(phase-b): `$package instanceof AliasPackage` downcast - let package_as_alias: Option<&AliasPackage> = None; - if let Some(alias) = package_as_alias { - package_by_name.insert( - alias.get_alias_of().get_name().to_string(), - alias.get_alias_of(), - ); - } + // TODO(phase-b): PHP shares the package between repository and map (Rc<dyn BasePackage>) + let _name = package.get_name().to_string(); + let _ = (&mut packages, &mut package_by_name, package); + todo!( + "packages.add_package(package); package_by_name.insert(name, package); + AliasPackage downcast" + ); } } } @@ -239,7 +245,8 @@ impl Locker { .and_then(|v| v.as_string()) .unwrap_or("") .to_string(); - if let Some(base_pkg) = package_by_name.get(&alias_pkg_name).cloned() { + // TODO(phase-b): Box<dyn BasePackage> is not Clone; PHP semantics need Rc<dyn BasePackage> + if let Some(base_pkg) = package_by_name.get(&alias_pkg_name) { let mut alias_pkg = CompleteAliasPackage::new( todo!("phase-b: downcast Box<BasePackage> to CompletePackage"), m.get("alias_normalized") @@ -251,7 +258,7 @@ impl Locker { .unwrap_or("") .to_string(), ); - alias_pkg.set_root_package_alias(true); + // TODO(phase-b): set_root_package_alias missing on CompleteAliasPackage let _ = base_pkg; // TODO(phase-b): packages.add_package(Box::new(alias_pkg)) let _ = alias_pkg; @@ -432,7 +439,7 @@ impl Locker { /// @return array<string, mixed> pub fn get_lock_data(&mut self) -> Result<IndexMap<String, PhpMixed>> { - if let Some(cache) = self.lock_data_cache.clone() { + if let Some(cache) = self.lock_data_cache.borrow().clone() { return Ok(cache); } @@ -444,8 +451,12 @@ impl Locker { .into()); } - let data = self.lock_file.read()?; - self.lock_data_cache = Some(data.clone()); + let data_php = self.lock_file.read()?; + let data: IndexMap<String, PhpMixed> = match data_php { + PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }; + *self.lock_data_cache.borrow_mut() = Some(data.clone()); Ok(data) } @@ -604,16 +615,21 @@ impl Locker { } else { None }; - if !is_locked || Some(&lock) != current_data.as_ref() { + // TODO(phase-b): PhpMixed lacks PartialEq; PHP compares lock array with current data + let differs = current_data + .as_ref() + .map(|c| !std::ptr::eq(c as *const _, &lock as *const _)) + .unwrap_or(true); + if !is_locked || differs { if write { self.lock_file.write(PhpMixed::Array( lock.into_iter().map(|(k, v)| (k, Box::new(v))).collect(), ))?; - self.lock_data_cache = None; + *self.lock_data_cache.borrow_mut() = None; self.virtual_file_written = false; } else { self.virtual_file_written = true; - self.lock_data_cache = Some(JsonFile::parse_json( + let parsed = JsonFile::parse_json( Some(&JsonFile::encode_with_indent( &PhpMixed::Array(lock.into_iter().map(|(k, v)| (k, Box::new(v))).collect()), shirabe_php_shim::JSON_UNESCAPED_SLASHES @@ -622,7 +638,12 @@ impl Locker { JsonFile::INDENT_DEFAULT, )), None, - )?); + )?; + let parsed_map: IndexMap<String, PhpMixed> = match parsed { + PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }; + *self.lock_data_cache.borrow_mut() = Some(parsed_map); } return Ok(true); @@ -644,7 +665,7 @@ impl Locker { where F: FnOnce(IndexMap<String, PhpMixed>) -> IndexMap<String, PhpMixed>, { - let contents = file_get_contents(&composer_json.get_path(), false, None); + let contents = file_get_contents(&composer_json.get_path()); let contents = match contents { Some(s) => s, None => { @@ -660,7 +681,11 @@ impl Locker { }; let lock_mtime = filemtime(&self.lock_file.get_path()); - let mut lock_data = self.lock_file.read()?; + let lock_data_php = self.lock_file.read()?; + let mut lock_data: IndexMap<String, PhpMixed> = match lock_data_php { + PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }; lock_data.insert( "content-hash".to_string(), PhpMixed::String(Self::get_content_hash(&contents)?), @@ -675,11 +700,13 @@ impl Locker { .map(|(k, v)| (k, Box::new(v))) .collect(), ))?; - self.lock_data_cache = None; + *self.lock_data_cache.borrow_mut() = None; self.virtual_file_written = false; if let Some(mtime) = lock_mtime { if is_int(&PhpMixed::Int(mtime)) { - let _ = touch(&self.lock_file.get_path(), Some(mtime)); + // TODO(phase-b): touch() in php-shim doesn't accept mtime; need touch2 + let _ = mtime; + let _ = touch(&self.lock_file.get_path()); } } Ok(()) @@ -835,7 +862,12 @@ impl Locker { let command = GitUtil::build_rev_list_command(&self.process, args); let mut output = PhpMixed::Null; if 0 == self.process.borrow_mut().execute( - PhpMixed::String(command), + PhpMixed::List( + command + .into_iter() + .map(|s| Box::new(PhpMixed::String(s))) + .collect(), + ), Some(&mut output), path.as_deref(), )? { @@ -916,7 +948,7 @@ impl Locker { let root_repo = RootPackageRepository::new(todo!("phase-b: clone root package")); for set in &sets { - let installed_repo = InstalledRepository::new(vec![/* set.repo, root_repo */])?; + let installed_repo = InstalledRepository::new(vec![/* set.repo, root_repo */]); // PHP: call_user_func([$package, $set['method']]) // TODO(phase-b): dynamic method dispatch by name @@ -925,13 +957,15 @@ impl Locker { if PlatformRepository::is_platform_package(&link.get_target()) { continue; } - if link.get_pretty_constraint().as_deref() == Some("self.version") { + if link.get_pretty_constraint().ok() == Some("self.version") { continue; } if installed_repo .find_packages_with_replacers_and_providers( &link.get_target(), - Some(link.get_constraint()), + Some(FindPackageConstraint::Constraint( + link.get_constraint().clone_box(), + )), ) .is_empty() { @@ -939,7 +973,10 @@ impl Locker { .find_packages_with_replacers_and_providers(&link.get_target(), None); if !results.is_empty() { - let provider = reset_first(&results).unwrap(); + // TODO(phase-b): reset_first requires Clone on dyn BasePackage; PHP returns shared reference + let provider: &Box<dyn BasePackage> = + todo!("reset_first(&results) shared ref"); + let _ = &results; let mut description = provider.get_pretty_version().to_string(); if provider.get_name() != link.get_target() { 'outer: for (method, text) in [ @@ -959,7 +996,8 @@ impl Locker { PhpMixed::String( provider_link .get_pretty_constraint() - .unwrap_or_default(), + .unwrap_or_default() + .to_string(), ), PhpMixed::String(format!( "{} {}", @@ -1012,7 +1050,7 @@ struct SetEntry { // Suppress unused-import warnings for items kept for parity with the PHP source. #[allow(dead_code)] -const _USE_PARITY: () = { +fn _use_parity() { let _ = is_array; - let _ = call_user_func; -}; + let _: PhpMixed = call_user_func("", &[]); +} diff --git a/crates/shirabe/src/package/package.rs b/crates/shirabe/src/package/package.rs index 74286a0..b36de7a 100644 --- a/crates/shirabe/src/package/package.rs +++ b/crates/shirabe/src/package/package.rs @@ -463,9 +463,9 @@ impl Package { url, &self.name, &self.version, - r#ref.unwrap_or(""), - r#type.unwrap_or(""), - &self.pretty_version, + r#ref, + r#type, + Some(self.pretty_version.as_str()), ) } else { url.to_string() @@ -479,9 +479,9 @@ impl Package { &mirror.url, &self.name, &self.version, - r#ref.unwrap_or(""), - r#type.unwrap_or(""), - &self.pretty_version, + r#ref, + r#type, + Some(self.pretty_version.as_str()), ) } else if url_type == "source" && r#type == Some("git") { ComposerMirror::process_git_url( @@ -560,7 +560,7 @@ impl BasePackage for Package { } fn repository_opt(&self) -> Option<&dyn RepositoryInterface> { - self.repository.as_ref() + self.repository.as_deref() } fn set_repository_box(&mut self, repository: Box<dyn RepositoryInterface>) { diff --git a/crates/shirabe/src/package/package_interface.rs b/crates/shirabe/src/package/package_interface.rs index beadc5c..e6ffbed 100644 --- a/crates/shirabe/src/package/package_interface.rs +++ b/crates/shirabe/src/package/package_interface.rs @@ -200,6 +200,18 @@ pub trait PackageInterface: std::fmt::Display + std::fmt::Debug { /// @phpstan-return array<string, string> fn get_suggests(&self) -> IndexMap<String, String>; + /// PHP helper that switches on the link kind (require/require-dev/conflict/etc.). + fn get_links_for_type(&self, link_type: &str) -> IndexMap<String, crate::package::link::Link> { + match link_type { + "require" => self.get_requires(), + "require-dev" => self.get_dev_requires(), + "conflict" => self.get_conflicts(), + "provide" => self.get_provides(), + "replace" => self.get_replaces(), + _ => IndexMap::new(), + } + } + /// Returns an associative array of autoloading rules /// /// {"<type>": {"<namespace": "<directory>"}} diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index b366b20..c229c97 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -34,7 +34,7 @@ pub struct VersionGuesser { process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, /// @var SemverVersionParser - version_parser: SemverVersionParser, + version_parser: VersionParser, /// @var IOInterface|null io: Option<Box<dyn IOInterface>>, @@ -54,7 +54,7 @@ impl VersionGuesser { pub fn new( config: std::rc::Rc<std::cell::RefCell<Config>>, process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, - version_parser: SemverVersionParser, + version_parser: VersionParser, io: Option<Box<dyn IOInterface>>, ) -> Self { Self { @@ -132,11 +132,14 @@ impl VersionGuesser { && Preg::is_match(r"{\.9{7}}", version_data.version.as_deref().unwrap_or("")) .unwrap_or(false) { - version_data.pretty_version = Some(Preg::replace( - r"{(\.9{7})+}", - ".x", - version_data.version.as_deref().unwrap_or(""), - )); + version_data.pretty_version = Some( + Preg::replace( + r"{(\.9{7})+}", + ".x", + version_data.version.as_deref().unwrap_or(""), + ) + .unwrap_or_default(), + ); } let feature_non_empty = version_data @@ -157,11 +160,14 @@ impl VersionGuesser { ) .unwrap_or(false) { - version_data.feature_pretty_version = Some(Preg::replace( - r"{(\.9{7})+}", - ".x", - version_data.feature_version.as_deref().unwrap_or(""), - )); + version_data.feature_pretty_version = Some( + Preg::replace( + r"{(\.9{7})+}", + ".x", + version_data.feature_version.as_deref().unwrap_or(""), + ) + .unwrap_or_default(), + ); } version_data @@ -228,7 +234,7 @@ impl VersionGuesser { is_feature_branch = true; is_detached = true; } else { - version = Some(self.version_parser.normalize_branch(&g1)); + version = Some(self.version_parser.normalize_branch(&g1)?); pretty_version = Some(format!("dev-{}", g1)); is_feature_branch = self.is_feature_branch(package_config, Some(&g1)); } @@ -300,7 +306,12 @@ impl VersionGuesser { Box::new(PhpMixed::String("-n1".to_string())), Box::new(PhpMixed::String("HEAD".to_string())), ]), - GitUtil::get_no_show_signature_flags(&self.process), + PhpMixed::List( + GitUtil::get_no_show_signature_flags(&self.process) + .into_iter() + .map(|s| Box::new(PhpMixed::String(s))) + .collect(), + ), ) .as_list() .map(|l| { @@ -377,7 +388,7 @@ impl VersionGuesser { Some(path.to_string()), ) { let branch = trim(&output, None); - let version = self.version_parser.normalize_branch(&branch); + let version = self.version_parser.normalize_branch(&branch)?; let is_feature_branch = strpos(&version, "dev-") == Some(0); if VersionParser::DEFAULT_BRANCH_ALIAS == version { @@ -401,20 +412,15 @@ impl VersionGuesser { } // re-use the HgDriver to fetch branches (this properly includes bookmarks) - let io = NullIO::new(); + let _io = NullIO::new(); let mut repo_config: IndexMap<String, PhpMixed> = IndexMap::new(); repo_config.insert("url".to_string(), PhpMixed::String(path.to_string())); - let mut driver = HgDriver::new( - repo_config, - // TODO(phase-b): NullIO -> Box<dyn IOInterface> - Box::new(io), - self.config.clone(), - // TODO(phase-b): HttpDownloader::new signature - todo!("HttpDownloader::new(io, config)"), - std::rc::Rc::clone(&self.process), + // TODO(phase-b): HgDriver lacks a `new` constructor and HttpDownloader::new signature is unknown + let mut driver: HgDriver = todo!( + "HgDriver::new(repo_config, Box::new(io), self.config.clone(), HttpDownloader::new(io, config), Rc::clone(&self.process))" ); let branches: Vec<String> = - array_map(|k: &String| k.clone(), &array_keys(driver.get_branches())); + array_map(|k: &String| k.clone(), &array_keys(&driver.get_branches()?)); // try to find the best (nearest) version branch to assume this feature's version let mut result = self.guess_feature_version( @@ -486,7 +492,8 @@ impl VersionGuesser { ) .is_some(); if !has_branch_alias || has_self_version { - let branch = Preg::replace(r"{^dev-}", "", version.as_deref().unwrap_or("")); + let branch = + Preg::replace(r"{^dev-}", "", version.as_deref().unwrap_or("")).unwrap_or_default(); let mut length: i64 = PHP_INT_MAX; // return directly, if branch is configured to be non-feature branch @@ -518,7 +525,8 @@ impl VersionGuesser { let result: Result<()> = (|| -> Result<()> { let mut last_index: i64 = -1; for (index, candidate) in branches.iter().enumerate() { - let candidate_version = Preg::replace(r"{^remotes/\S+/}", "", candidate); + let candidate_version = + Preg::replace(r"{^remotes/\S+/}", "", candidate).unwrap_or_default(); // do not compare against itself or other feature branches if candidate == &branch @@ -537,23 +545,19 @@ impl VersionGuesser { }, &scm_cmdline, ); - let async_promise = self.process.borrow_mut().execute_async(&cmd_line, path); - promises.push(async_promise.then(Box::new( - move |process: Process| -> Result<()> { - if !process.is_successful() { - return Ok(()); - } - - let output = process.get_output(); - // overwrite existing if we have a shorter diff, or we have an equal diff and an index that comes later in the array (i.e. older version) - // as newer versions typically have more commits, if the feature branch is based on a newer branch it should have a longer diff to the old version - // but if it doesn't and they have equal diffs, then it probably is based on the old version - // TODO(phase-b): closure captures need shared mutable state (last_index, length, version, pretty_version, promises) - todo!( - "mutate last_index/length/version/pretty_version and possibly cancel promises" - ); - }, - ))); + let async_promise = self.process.borrow_mut().execute_async(&cmd_line, path)?; + // TODO(phase-b): closure receives Process in PHP but PromiseInterface::then expects fn(Option<PhpMixed>) -> Option<PhpMixed>; + // closure captures need shared mutable state (last_index, length, version, pretty_version, promises) + promises.push(async_promise.then( + Some(Box::new( + move |_value: Option<PhpMixed>| -> Option<PhpMixed> { + todo!( + "mutate last_index/length/version/pretty_version and possibly cancel promises" + ) + }, + )), + None, + )); } self.process.borrow_mut().wait(); @@ -589,10 +593,13 @@ impl VersionGuesser { non_feature_branches = implode("|", &names); } - !Preg::is_match(&format!( - r"{{^({}|master|main|latest|next|current|support|tip|trunk|default|develop|\d+\..+)$}}", - non_feature_branches, - ), branch_name.unwrap_or("")).unwrap_or(false) + !Preg::is_match( + &format!( + r"{{^({}|master|main|latest|next|current|support|tip|trunk|default|develop|\d+\..+)$}}", + non_feature_branches, + ), + branch_name.unwrap_or(""), + ) .unwrap_or(false) } @@ -613,7 +620,7 @@ impl VersionGuesser { Some(path.to_string()), ) { let branch = trim(&output, None); - version = Some(self.version_parser.normalize_branch(&branch)); + version = Some(self.version_parser.normalize_branch(&branch)?); pretty_version = Some(format!("dev-{}", branch)); } @@ -691,7 +698,9 @@ impl VersionGuesser { || tags_path == *m2.as_ref().unwrap()) { // we are in a branches path - let version = self.version_parser.normalize_branch(m3.as_deref().unwrap()); + let version = self + .version_parser + .normalize_branch(m3.as_deref().unwrap())?; let pretty_version = format!("dev-{}", m3.as_ref().unwrap()); return Ok(Some(VersionData { diff --git a/crates/shirabe/src/package/version/version_parser.rs b/crates/shirabe/src/package/version/version_parser.rs index 84749a3..4286419 100644 --- a/crates/shirabe/src/package/version/version_parser.rs +++ b/crates/shirabe/src/package/version/version_parser.rs @@ -13,7 +13,7 @@ use crate::repository::platform_repository::PlatformRepository; static CONSTRAINTS: LazyLock<Mutex<IndexMap<String, Arc<dyn ConstraintInterface + Send + Sync>>>> = LazyLock::new(|| Mutex::new(IndexMap::new())); -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct VersionParser { inner: SemverVersionParser, } @@ -24,13 +24,9 @@ impl VersionParser { pub fn parse_constraints( &self, constraints: &str, - ) -> anyhow::Result<Arc<dyn ConstraintInterface + Send + Sync>> { - let mut cache = CONSTRAINTS.lock().unwrap(); - if !cache.contains_key(constraints) { - let parsed = self.inner.parse_constraints(constraints)?; - cache.insert(constraints.to_string(), Arc::from(parsed)); - } - Ok(Arc::clone(cache.get(constraints).unwrap())) + ) -> anyhow::Result<Box<dyn ConstraintInterface>> { + // TODO(phase-b): re-introduce a memoization cache once trait objects are Send+Sync. + self.inner.parse_constraints(constraints) } pub fn parse_name_version_pairs( @@ -92,6 +88,10 @@ impl VersionParser { SemverVersionParser::parse_stability(version) } + pub fn parse_numeric_alias_prefix(&self, branch: &str) -> Option<String> { + self.inner.parse_numeric_alias_prefix(branch) + } + pub fn is_upgrade(normalized_from: &str, normalized_to: &str) -> anyhow::Result<bool> { if normalized_from == normalized_to { return Ok(true); diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs index 1df58ab..6496dea 100644 --- a/crates/shirabe/src/package/version/version_selector.rs +++ b/crates/shirabe/src/package/version/version_selector.rs @@ -23,6 +23,7 @@ use crate::package::loader::array_loader::ArrayLoader; use crate::package::package_interface::PackageInterface; use crate::package::version::version_parser::VersionParser; use crate::repository::platform_repository::PlatformRepository; +use crate::repository::repository_interface::RepositoryInterface; use crate::repository::repository_set::RepositorySet; #[derive(Debug)] @@ -40,7 +41,8 @@ impl VersionSelector { let mut platform_constraints: IndexMap<String, Vec<Box<dyn ConstraintInterface>>> = IndexMap::new(); if let Some(platform_repo) = platform_repo { - for package in platform_repo.get_packages() { + for package in <PlatformRepository as RepositoryInterface>::get_packages(platform_repo) + { let constraint = Constraint::new("==", package.get_version()); platform_constraints .entry(package.get_name().to_string()) @@ -88,9 +90,9 @@ impl VersionSelector { }; let mut candidates = self.repository_set.find_packages( &strtolower(package_name), - constraint.as_deref(), + constraint.as_ref().map(|c| c.clone_box()), repo_set_flags, - )?; + ); let min_priority = *base_package::STABILITIES.get(preferred_stability).unwrap(); candidates.sort_by(|a, b| { @@ -190,7 +192,7 @@ impl VersionSelector { pkg.get_pretty_version(), link.get_description(), link.get_target(), - link.get_pretty_constraint(), + link.get_pretty_constraint().unwrap_or_default(), reason ), true, @@ -216,7 +218,7 @@ impl VersionSelector { package = found_package; } else { package = if !candidates.is_empty() { - Some(candidates.remove(0)) + Some(candidates.remove(0).clone_package_box()) } else { None }; @@ -230,7 +232,7 @@ impl VersionSelector { let package = if let Some(alias) = package.as_ref().as_any().downcast_ref::<AliasPackage>() { if alias.get_version() == VersionParser::DEFAULT_BRANCH_ALIAS { - alias.get_alias_of() + alias.get_alias_of().clone_package_box() } else { package } @@ -266,9 +268,9 @@ impl VersionSelector { ); } - let loader = ArrayLoader::new(self.get_parser()); + let loader = ArrayLoader::new(Some(self.get_parser().clone()), false); let dumper = ArrayDumper::new(); - let extra = loader.get_branch_alias(&dumper.dump(package)?)?; + let extra = loader.get_branch_alias(&dumper.dump(package))?; if let Some(extra) = extra { if extra != VersionParser::DEFAULT_BRANCH_ALIAS { let new_extra = diff --git a/crates/shirabe/src/partial_composer.rs b/crates/shirabe/src/partial_composer.rs index a310ae8..1ed7805 100644 --- a/crates/shirabe/src/partial_composer.rs +++ b/crates/shirabe/src/partial_composer.rs @@ -15,7 +15,7 @@ pub struct PartialComposer { repository_manager: Option<RepositoryManager>, installation_manager: Option<InstallationManager>, config: Option<std::rc::Rc<std::cell::RefCell<Config>>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, } impl PartialComposer { @@ -63,11 +63,18 @@ impl PartialComposer { self.installation_manager.as_ref().unwrap() } - pub fn set_event_dispatcher(&mut self, event_dispatcher: EventDispatcher) { + pub fn get_installation_manager_mut(&mut self) -> &mut InstallationManager { + self.installation_manager.as_mut().unwrap() + } + + pub fn set_event_dispatcher( + &mut self, + event_dispatcher: std::rc::Rc<std::cell::RefCell<EventDispatcher>>, + ) { self.event_dispatcher = Some(event_dispatcher); } - pub fn get_event_dispatcher(&self) -> &EventDispatcher { + pub fn get_event_dispatcher(&self) -> &std::rc::Rc<std::cell::RefCell<EventDispatcher>> { self.event_dispatcher.as_ref().unwrap() } @@ -78,4 +85,18 @@ impl PartialComposer { pub fn set_global(&mut self) { self.global = true; } + + /// TODO(phase-b): Emulates PHP `$composer instanceof Composer` check. + /// PartialComposer cannot be a Composer here (Composer is a separate struct + /// that wraps PartialComposer via composition), so this always returns false. + pub fn is_full_composer(&self) -> bool { + false + } + + /// TODO(phase-b): Emulates PHP downcast to `Composer`. + /// Returns self as `&dyn Any`; downcasting to Composer will always fail because + /// PartialComposer is not a Composer in this Rust port. + pub fn as_any(&self) -> &dyn std::any::Any { + self + } } diff --git a/crates/shirabe/src/platform/hhvm_detector.rs b/crates/shirabe/src/platform/hhvm_detector.rs index 4e40a00..1fd3fee 100644 --- a/crates/shirabe/src/platform/hhvm_detector.rs +++ b/crates/shirabe/src/platform/hhvm_detector.rs @@ -51,7 +51,7 @@ impl HhvmDetector { let hhvm_path = finder.find("hhvm", None, &[]); if let Some(hhvm_path) = hhvm_path { let executor = self.process_executor.get_or_insert_with(|| { - std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(None))) + std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(()))) }); let mut version_output = shirabe_php_shim::PhpMixed::Null; let cmd = shirabe_php_shim::PhpMixed::List( @@ -69,7 +69,7 @@ impl HhvmDetector { ); let exit_code = executor .borrow_mut() - .execute(cmd, Some(&mut version_output), None) + .execute(cmd, Some(&mut version_output), ()) .unwrap_or(1); if exit_code == 0 { *cache = Some(version_output.as_string().map(|s| s.to_string())); diff --git a/crates/shirabe/src/plugin/plugin_interface.rs b/crates/shirabe/src/plugin/plugin_interface.rs index a7bb384..d3083cc 100644 --- a/crates/shirabe/src/plugin/plugin_interface.rs +++ b/crates/shirabe/src/plugin/plugin_interface.rs @@ -2,6 +2,7 @@ use crate::composer::Composer; use crate::io::io_interface::IOInterface; +use crate::plugin::capable::Capable; pub const PLUGIN_API_VERSION: &'static str = "2.9.0"; @@ -15,4 +16,15 @@ pub trait PluginInterface: std::fmt::Debug { fn clone_box(&self) -> Box<dyn PluginInterface> { todo!() } + + // TODO(plugin): PHP-side `instanceof` checks for EventSubscriberInterface / Capable. + // EventSubscriberInterface is not dyn-compatible (its only method is associated, not + // a `&self` method), so we expose a boolean predicate instead. + fn is_event_subscriber_interface(&self) -> bool { + false + } + + fn as_capable(&self) -> Option<&dyn Capable> { + None + } } diff --git a/crates/shirabe/src/plugin/plugin_manager.rs b/crates/shirabe/src/plugin/plugin_manager.rs index 03c4841..840b6a9 100644 --- a/crates/shirabe/src/plugin/plugin_manager.rs +++ b/crates/shirabe/src/plugin/plugin_manager.rs @@ -9,9 +9,9 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_php_shim::{ E_USER_DEPRECATED, PhpMixed, RuntimeException, UnexpectedValueException, array_key_exists, - array_reverse, array_search, clone, get_class, implode, in_array, is_a, is_array, is_string, - ksort, preg_quote, str_replace, strrpos, strtr, substr, trigger_error, trim, var_export, - version_compare, + array_reverse, array_search, clone, get_class, get_class_obj, implode, in_array, is_a, + is_array, is_string, ksort, preg_quote, str_replace, strrpos, strtr, substr, trigger_error, + trim, var_export, var_export_str, version_compare, }; use shirabe_semver::constraint::constraint::Constraint; @@ -71,14 +71,13 @@ static mut CLASS_COUNTER: i64 = 0; impl PluginManager { pub fn new( io: Box<dyn IOInterface>, - composer: Composer, + mut composer: Composer, global_composer: Option<PartialComposer>, disable_plugins: DisablePlugins, ) -> Self { - let allow_plugin_rules = Self::parse_allowed_plugins( - composer.get_config().borrow().get("allow-plugins").clone(), - Some(composer.get_locker()), - ); + let allow_plugins_config = composer.get_config().borrow().get("allow-plugins").clone(); + let allow_plugin_rules = + Self::parse_allowed_plugins(allow_plugins_config, Some(composer.get_locker_mut())); let allow_global_plugin_rules = Self::parse_allowed_plugins( global_composer .as_ref() @@ -108,20 +107,28 @@ impl PluginManager { pub fn load_installed_plugins(&mut self) -> anyhow::Result<()> { // TODO(plugin): plugin loading is part of the plugin API if !self.are_plugins_disabled("local") { - let repo = self + // TODO(phase-b): PHP returns a shared object reference; we clone the repository + // box here to side-step a borrow conflict between `&self.composer` and + // `&mut self`. The Rust port should eventually share via Rc<RefCell<_>>. + let repo: Box<dyn RepositoryInterface> = self .composer .get_repository_manager() - .get_local_repository(); - self.load_repository(&*repo, false, Some(self.composer.get_package()))?; + .get_local_repository() + .clone_box(); + // The root package borrow is also tied to `self.composer`; clone the package box + // for the same reason as above. + let root_package = self.composer.get_package().clone_box(); + self.load_repository(&*repo, false, Some(&*root_package))?; } if self.global_composer.is_some() && !self.are_plugins_disabled("global") { - let repo = self + let repo: Box<dyn RepositoryInterface> = self .global_composer .as_ref() .unwrap() .get_repository_manager() - .get_local_repository(); + .get_local_repository() + .clone_box(); self.load_repository(&*repo, true, None)?; } Ok(()) @@ -131,20 +138,22 @@ impl PluginManager { pub fn deactivate_installed_plugins(&mut self) { // TODO(plugin): deactivation is part of the plugin API if !self.are_plugins_disabled("local") { - let repo = self + let repo: Box<dyn RepositoryInterface> = self .composer .get_repository_manager() - .get_local_repository(); + .get_local_repository() + .clone_box(); self.deactivate_repository(&*repo, false); } if self.global_composer.is_some() && !self.are_plugins_disabled("global") { - let repo = self + let repo: Box<dyn RepositoryInterface> = self .global_composer .as_ref() .unwrap() .get_repository_manager() - .get_local_repository(); + .get_local_repository() + .clone_box(); self.deactivate_repository(&*repo, true); } } @@ -184,10 +193,11 @@ impl PluginManager { } if package.get_type() == "composer-plugin" { + let requires_map = package.get_requires(); let mut requires_composer: Option< - Box<dyn shirabe_semver::constraint::constraint_interface::ConstraintInterface>, + &dyn shirabe_semver::constraint::constraint_interface::ConstraintInterface, > = None; - for (_k, link) in &package.get_requires() { + for (_k, link) in &requires_map { if "composer-plugin-api" == link.get_target() { requires_composer = Some(link.get_constraint()); break; @@ -264,7 +274,18 @@ impl PluginManager { let extra = package.get_extra(); let class_value = extra.get("class"); - if class_value.is_none() || class_value.map(|v| v.is_empty()).unwrap_or(true) { + // PHP: empty($extra['class']) — true for null, false, 0, "", "0", [], or missing key. + let class_is_empty = match class_value { + None => true, + Some(PhpMixed::Null) => true, + Some(PhpMixed::Bool(false)) => true, + Some(PhpMixed::Int(0)) => true, + Some(PhpMixed::String(s)) if s.is_empty() || s == "0" => true, + Some(PhpMixed::Array(a)) => a.is_empty(), + Some(PhpMixed::List(l)) => l.is_empty(), + _ => false, + }; + if class_is_empty { return Err(UnexpectedValueException { message: format!("Error while installing {}, composer-plugin packages should have a class defined in their extra key to be usable.", package.get_pretty_name()), code: 0, @@ -309,7 +330,7 @@ impl PluginManager { match plugin { PluginOrInstaller::Installer(inst) => { self.composer - .get_installation_manager() + .get_installation_manager_mut() .remove_installer(&*inst); } PluginOrInstaller::Plugin(p) => { @@ -334,12 +355,12 @@ impl PluginManager { match plugin { PluginOrInstaller::Installer(inst) => { self.composer - .get_installation_manager() + .get_installation_manager_mut() .remove_installer(&*inst); } - PluginOrInstaller::Plugin(p) => { + PluginOrInstaller::Plugin(mut p) => { self.remove_plugin(&*p); - self.uninstall_plugin(&*p); + self.uninstall_plugin(&mut *p); } } } @@ -353,7 +374,7 @@ impl PluginManager { /// Adds a plugin, activates it and registers it with the event dispatcher pub fn add_plugin( &mut self, - plugin: Box<dyn PluginInterface>, + mut plugin: Box<dyn PluginInterface>, is_global_plugin: bool, source_package: Option<&dyn PackageInterface>, ) -> anyhow::Result<()> { @@ -377,7 +398,7 @@ impl PluginManager { if !self.is_plugin_allowed(sp.get_name(), is_global_plugin, plugin_optional, true)? { self.io.write_error(&format!( "Skipped loading \"{} from {}\" {} as it is not in config.allow-plugins", - get_class(&*plugin), + get_class_obj(&*plugin), sp.get_name(), if is_global_plugin || self.running_in_global_dir { "(installed globally) " @@ -398,7 +419,7 @@ impl PluginManager { } self.io.write_error(&format!( "Loading plugin {}{}", - get_class(&*plugin), + get_class_obj(&*plugin), if !details.is_empty() { format!(" ({})", implode(", ", &details)) } else { @@ -408,36 +429,43 @@ impl PluginManager { plugin.activate(&self.composer, &*self.io); // TODO(plugin): if plugin is EventSubscriberInterface, hook into the event dispatcher - let plugin_dyn: &dyn PluginInterface = &*plugin; - if let Some(sub) = plugin_dyn.as_event_subscriber_interface() { - self.composer.get_event_dispatcher().add_subscriber(sub); - } + // The PHP code calls $this->composer->getEventDispatcher()->addSubscriber($plugin); + // — add_subscriber here is generic over `S: EventSubscriberInterface` and cannot + // accept a `&dyn EventSubscriberInterface`. Skipped until subscriber dispatch is + // implemented dynamically. + let _ = (&*plugin).is_event_subscriber_interface(); self.plugins.push(plugin); Ok(()) } /// Removes a plugin, deactivates it and removes any listener the plugin has set on the plugin instance pub fn remove_plugin(&mut self, plugin: &dyn PluginInterface) { - // TODO(plugin): plugin removal - let index = array_search(plugin, &self.plugins, true); + // TODO(plugin): plugin removal — PHP uses identity (`===`) comparison via array_search($plugin, $this->plugins, true). + let plugin_addr = plugin as *const dyn PluginInterface as *const () as usize; + let index = self.plugins.iter().position(|p| { + (p.as_ref() as *const dyn PluginInterface as *const () as usize) == plugin_addr + }); let index = match index { Some(i) => i, None => return, }; self.io - .write_error(&format!("Unloading plugin {}", get_class(plugin))); - self.plugins.remove(index as usize); - plugin.deactivate(&self.composer, &*self.io); + .write_error(&format!("Unloading plugin {}", get_class_obj(plugin))); + let mut removed = self.plugins.remove(index); + removed.deactivate(&self.composer, &*self.io); - self.composer.get_event_dispatcher().remove_listener(plugin); + // TODO(plugin): remove_listener accepts any callable/object in PHP; here we have + // a plugin instance and need to translate to a Callable, which is not portable + // without runtime reflection. + let _ = plugin; } /// Notifies a plugin it is being uninstalled and should clean up - pub fn uninstall_plugin(&self, plugin: &dyn PluginInterface) { + pub fn uninstall_plugin(&self, plugin: &mut dyn PluginInterface) { // TODO(plugin): plugin uninstall hook self.io - .write_error(&format!("Uninstalling plugin {}", get_class(plugin))); + .write_error(&format!("Uninstalling plugin {}", get_class_obj(plugin))); plugin.uninstall(&self.composer, &*self.io); } @@ -465,16 +493,23 @@ impl PluginManager { } } - let sorted_packages = - PackageSorter::sort_packages(packages.iter().map(|p| p.clone_box()).collect(), weights); + let sorted_packages = PackageSorter::sort_packages( + packages.iter().map(|p| p.clone_package_box()).collect(), + weights, + ); let required_packages: Vec<Box<dyn PackageInterface>> = if !is_global_repo { + // PHP: $requiredPackages = RepositoryUtils::filterRequiredPackages($packages, $rootPackage, true); + // RepositoryUtils::filter_required_packages takes &[Box<dyn BasePackage>] plus a bucket. + // We need to convert &[Box<dyn BasePackage>] from packages. + let bucket: Vec<Box<dyn crate::package::base_package::BasePackage>> = vec![]; RepositoryUtils::filter_required_packages( - packages.iter().map(|p| p.as_ref()).collect(), + packages.as_slice(), root_package.unwrap(), true, + bucket, ) .iter() - .map(|p| p.clone_box()) + .map(|p| p.clone_package_box()) .collect() } else { vec![] @@ -486,23 +521,21 @@ impl PluginManager { None => continue, }; - if !in_array( - package.get_type(), - &vec![ - "composer-plugin".to_string(), - "composer-installer".to_string(), - ], - true, - ) { + let pkg_type = package.get_type(); + if pkg_type != "composer-plugin" && pkg_type != "composer-installer" { continue; } + // PHP: !in_array($package, $requiredPackages, true) — identity-based comparison. + // Compare data pointers since `sorted_packages` and `required_packages` are both + // `Box<dyn PackageInterface>`. + let package_addr = + package.as_ref() as *const dyn PackageInterface as *const () as usize; + let in_required = required_packages.iter().any(|rp| { + (rp.as_ref() as *const dyn PackageInterface as *const () as usize) == package_addr + }); if !is_global_repo - && !in_array( - &**package as &dyn PackageInterface, - &required_packages.iter().map(|p| &**p).collect::<Vec<_>>(), - true, - ) + && !in_required && !self.is_plugin_allowed(package.get_name(), false, true, false)? { self.io.write_error(&format!("<warning>The \"{}\" plugin was not loaded as it is not listed in allow-plugins and is not required by the root package anymore.</warning>", package.get_name())); @@ -523,10 +556,12 @@ impl PluginManager { fn deactivate_repository(&mut self, repo: &dyn RepositoryInterface, _is_global_repo: bool) { // TODO(plugin): deactivate plugins from a repository let packages = repo.get_packages(); - let sorted_packages = array_reverse(PackageSorter::sort_packages( - packages.iter().map(|p| p.clone_box()).collect(), + // PHP: $sortedPackages = array_reverse(PackageSorter::sortPackages($packages)); + let mut sorted_packages = PackageSorter::sort_packages( + packages.iter().map(|p| p.clone_package_box()).collect(), IndexMap::new(), - )); + ); + sorted_packages.reverse(); for package in &sorted_packages { if package.as_complete_package().is_none() { @@ -549,13 +584,13 @@ impl PluginManager { ) -> IndexMap<String, Box<dyn PackageInterface>> { // TODO(plugin): used by registerPackage to assemble plugin dependency autoload map for (_k, require_link) in &package.get_requires() { - for required_package in - installed_repo.find_packages_with_replacers_and_providers(require_link.get_target()) + for required_package in installed_repo + .find_packages_with_replacers_and_providers(require_link.get_target(), None) { if !collected.contains_key(required_package.get_name()) { collected.insert( required_package.get_name().to_string(), - required_package.clone_box(), + required_package.clone_package_box(), ); collected = self.collect_dependencies(installed_repo, collected, &*required_package); @@ -567,19 +602,19 @@ impl PluginManager { } /// Retrieves the path a package is installed to. - fn get_install_path(&self, package: &dyn PackageInterface, global: bool) -> Option<String> { + fn get_install_path(&mut self, package: &dyn PackageInterface, global: bool) -> Option<String> { if !global { return self .composer - .get_installation_manager() + .get_installation_manager_mut() .get_install_path(package); } // PHP: assert(null !== $this->globalComposer); self.global_composer - .as_ref() + .as_mut() .unwrap() - .get_installation_manager() + .get_installation_manager_mut() .get_install_path(package) } @@ -596,34 +631,37 @@ impl PluginManager { let capabilities = capable.get_capabilities(); - if let Some(cap_value) = capabilities.get(capability) { - if let Some(s) = cap_value.as_string() { - if !trim(s, " \t\n\r\0\u{0B}").is_empty() { - return Ok(Some(trim(s, " \t\n\r\0\u{0B}"))); - } + // PHP: !empty($capabilities[$capability]) && is_string($capabilities[$capability]) && trim($capabilities[$capability]) + if let Some(s) = capabilities.get(capability) { + let trimmed = trim(s, Some(" \t\n\r\0\u{0B}")); + if !s.is_empty() && s != "0" && !trimmed.is_empty() { + return Ok(Some(trimmed)); } } + // PHP: empty($capabilities[$capability]) — true for null, false, 0, "", "0", [], or missing key. + // In Rust the values are typed as String, so we only need to consider "", "0". + let cap_is_empty = match capabilities.get(capability) { + None => true, + Some(s) if s.is_empty() || s == "0" => true, + _ => false, + }; if array_key_exists(capability, &capabilities) - && (capabilities - .get(capability) - .map(|v| v.is_empty()) - .unwrap_or(true) - || !is_string(capabilities.get(capability).unwrap()) + && (cap_is_empty || trim( capabilities .get(capability) - .and_then(|v| v.as_string()) + .map(|s| s.as_str()) .unwrap_or(""), - " \t\n\r\0\u{0B}", + Some(" \t\n\r\0\u{0B}"), ) .is_empty()) { return Err(UnexpectedValueException { message: format!( "Plugin {} provided invalid capability class name(s), got {}", - get_class(plugin), - var_export(capabilities.get(capability).unwrap(), true) + get_class_obj(plugin), + var_export_str(capabilities.get(capability).unwrap(), true) ), code: 0, } @@ -669,18 +707,29 @@ impl PluginManager { fn parse_allowed_plugins( allow_plugins_config: PhpMixed, - locker: Option<&Locker>, + mut locker: Option<&mut Locker>, ) -> Option<IndexMap<String, bool>> { // PHP: [] === $allowPluginsConfig && $locker !== null && $locker->isLocked() && version_compare($locker->getPluginApi(), '2.2.0', '<') let is_empty_array = allow_plugins_config .as_array() .map(|a| a.is_empty()) .unwrap_or(false); - if is_empty_array - && locker.is_some() - && locker.unwrap().is_locked() - && version_compare(&locker.unwrap().get_plugin_api(), "2.2.0", "<") - { + let plugin_api_under_2_2_0 = if is_empty_array { + match locker.as_deref_mut() { + Some(l) => { + if l.is_locked() { + let api = l.get_plugin_api().unwrap_or_default(); + version_compare(&api, "2.2.0", "<") + } else { + false + } + } + None => false, + } + } else { + false + }; + if is_empty_array && locker.is_some() && plugin_api_under_2_2_0 { return None; } @@ -831,12 +880,12 @@ impl PluginManager { } composer_ref .get_config() - .borrow() - .get_config_source() + .borrow_mut() + .get_config_source_mut() .add_config_setting( "allow-plugins", PhpMixed::Array(allow_plugins.clone()), - ); + )?; // TODO(phase-b): get_config() returns &Config, but merge needs &mut Config; ownership needs refactoring let mut inner: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); inner.insert( diff --git a/crates/shirabe/src/plugin/pre_file_download_event.rs b/crates/shirabe/src/plugin/pre_file_download_event.rs index 37e1e1e..5fdfa6d 100644 --- a/crates/shirabe/src/plugin/pre_file_download_event.rs +++ b/crates/shirabe/src/plugin/pre_file_download_event.rs @@ -36,6 +36,10 @@ impl PreFileDownloadEvent { } } + pub fn get_name(&self) -> &str { + self.inner.get_name() + } + pub fn get_http_downloader(&self) -> &std::rc::Rc<std::cell::RefCell<HttpDownloader>> { &self.http_downloader } diff --git a/crates/shirabe/src/repository/advisory_provider_interface.rs b/crates/shirabe/src/repository/advisory_provider_interface.rs index f9ddeb2..9d627e5 100644 --- a/crates/shirabe/src/repository/advisory_provider_interface.rs +++ b/crates/shirabe/src/repository/advisory_provider_interface.rs @@ -11,6 +11,15 @@ pub enum PartialOrSecurityAdvisory { Full(SecurityAdvisory), } +impl PartialOrSecurityAdvisory { + pub fn advisory_id(&self) -> &str { + match self { + PartialOrSecurityAdvisory::Partial(p) => &p.advisory_id, + PartialOrSecurityAdvisory::Full(s) => s.advisory_id(), + } + } +} + #[derive(Debug)] pub struct SecurityAdvisoryResult { pub names_found: Vec<String>, diff --git a/crates/shirabe/src/repository/array_repository.rs b/crates/shirabe/src/repository/array_repository.rs index ef15b39..c8a465e 100644 --- a/crates/shirabe/src/repository/array_repository.rs +++ b/crates/shirabe/src/repository/array_repository.rs @@ -53,7 +53,9 @@ impl ArrayRepository { /// Adds a new package to the repository pub fn add_package(&self, package: Box<dyn PackageInterface>) -> Result<()> { // PHP: if (!$package instanceof BasePackage) throw new \InvalidArgumentException(...) - if package.as_any().downcast_ref::<dyn BasePackage>().is_none() { + // TODO(phase-b): need a real `instanceof BasePackage` check on dyn PackageInterface; + // dyn-trait downcast requires Sized. Defer until BasePackage exposes an `as_base_package`. + if false { return Err(InvalidArgumentException { message: "Only subclasses of BasePackage are supported".to_string(), code: 0, @@ -195,8 +197,8 @@ impl RepositoryInterface for ArrayRepository { // add the aliased package for packages where the alias matches if let Some(alias) = package.as_any().downcast_ref::<AliasPackage>() { let aliased = alias.get_alias_of(); - if !result.contains_key(&spl_object_hash(aliased.as_ref())) { - result.insert(spl_object_hash(aliased.as_ref()), aliased.clone_box()); + if !result.contains_key(&spl_object_hash(aliased)) { + result.insert(spl_object_hash(aliased), aliased.clone_box()); } } } @@ -212,7 +214,7 @@ impl RepositoryInterface for ArrayRepository { for package in &packages { if let Some(alias) = package.as_any().downcast_ref::<AliasPackage>() { let aliased = alias.get_alias_of(); - if result.contains_key(&spl_object_hash(aliased.as_ref())) { + if result.contains_key(&spl_object_hash(aliased)) { result.insert(spl_object_hash(package.as_ref()), package.clone_box()); } } @@ -287,13 +289,12 @@ impl RepositoryInterface for ArrayRepository { fn search(&self, query: String, mode: i64, r#type: Option<String>) -> Vec<SearchResult> { let regex = if mode == crate::repository::repository_interface::SEARCH_FULLTEXT { - format!( - "{{(?:{})}}i", - implode("|", &Preg::split("{\\s+}", &preg_quote(&query, None))) - ) + let parts = Preg::split("{\\s+}", &preg_quote(&query, None)).unwrap_or_default(); + format!("{{(?:{})}}i", implode("|", &parts)) } else { // vendor/name searches expect the caller to have preg_quoted the query - format!("{{(?:{})}}i", implode("|", &Preg::split("{\\s+}", &query))) + let parts = Preg::split("{\\s+}", &query).unwrap_or_default(); + format!("{{(?:{})}}i", implode("|", &parts)) }; let mut matches: IndexMap<String, SearchResult> = IndexMap::new(); diff --git a/crates/shirabe/src/repository/artifact_repository.rs b/crates/shirabe/src/repository/artifact_repository.rs index afaf9cb..2ca7420 100644 --- a/crates/shirabe/src/repository/artifact_repository.rs +++ b/crates/shirabe/src/repository/artifact_repository.rs @@ -52,8 +52,8 @@ impl ArtifactRepository { let url = repo_config["url"].as_string().unwrap_or("").to_string(); let lookup = Platform::expand_path(&url); Ok(Self { - inner: ArrayRepository::new(), - loader: Box::new(ArrayLoader::new()), + inner: ArrayRepository::new(Vec::new())?, + loader: Box::new(ArrayLoader::new(None, true)), lookup, repo_config, io, @@ -65,7 +65,7 @@ impl ArtifactRepository { } fn initialize(&mut self) -> anyhow::Result<()> { - self.inner.initialize()?; + self.inner.initialize(); let lookup = self.lookup.clone(); self.scan_directory(&lookup) } @@ -177,9 +177,10 @@ impl ArtifactRepository { return Ok(None); } - let mut package = - JsonFile::parse_json(&json.unwrap(), &format!("{}#composer.json", pathname))?; - let url_normalized = pathname.replace('\\', '/'); + let json_str = json.unwrap(); + let pathname_label = format!("{}#composer.json", pathname); + let mut package = JsonFile::parse_json(Some(&json_str), Some(&pathname_label))?; + let url_normalized = pathname.replace('\\', "/"); let real_path = file .canonicalize() .ok() @@ -197,9 +198,17 @@ impl ArtifactRepository { Box::new(PhpMixed::String(url_normalized)), ); dist.insert("shasum".to_string(), Box::new(PhpMixed::String(shasum))); - package.insert("dist".to_string(), Box::new(PhpMixed::Array(dist))); + if let Some(arr) = package.as_array_mut() { + arr.insert("dist".to_string(), Box::new(PhpMixed::Array(dist))); + } - match self.loader.load(package, None) { + // TODO(phase-b): load wants IndexMap<String, PhpMixed>; convert from PhpMixed::Array. + let cfg: IndexMap<String, PhpMixed> = package + .as_array() + .cloned() + .map(|m| m.into_iter().map(|(k, v)| (k, *v)).collect()) + .unwrap_or_default(); + match self.loader.load(cfg, None) { Ok(package) => Ok(Some(package)), Err(exception) => Err(UnexpectedValueException { message: format!("Failed loading package in {}: {}", pathname, exception), diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs index 1e6443f..ac6e834 100644 --- a/crates/shirabe/src/repository/composer_repository.rs +++ b/crates/shirabe/src/repository/composer_repository.rs @@ -5,10 +5,10 @@ use shirabe_external_packages::composer::metadata_minifier::metadata_minifier::M use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; use shirabe_php_shim::{ - InvalidArgumentException, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, LogicException, - PHP_EOL, PhpMixed, RuntimeException, UnexpectedValueException, extension_loaded, hash, - http_build_query, in_array, json_decode, parse_url_all, realpath, spl_object_hash, strtolower, - strtr, urlencode, var_export, + Countable, InvalidArgumentException, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, + LogicException, PHP_EOL, PhpMixed, RuntimeException, UnexpectedValueException, + extension_loaded, hash, http_build_query, in_array, json_decode, parse_url_all, realpath, + spl_object_hash, strtolower, strtr, urlencode, var_export, }; use shirabe_semver::compiling_matcher::CompilingMatcher; @@ -100,7 +100,7 @@ pub struct ComposerRepository { pub(crate) provider_listing: Option<IndexMap<String, ProviderListingEntry>>, pub(crate) loader: ArrayLoader, allow_ssl_downgrade: bool, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, source_mirrors: Option<IndexMap<String, Vec<SourceMirror>>>, dist_mirrors: Option<Vec<DistMirror>>, degraded_mode: bool, @@ -149,10 +149,10 @@ impl ComposerRepository { io: Box<dyn IOInterface>, config: &Config, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, ) -> anyhow::Result<Self> { // parent::__construct(); - let inner = ArrayRepository::new(); + let inner = ArrayRepository::new(Vec::new()); let url_str = repo_config .get("url") @@ -263,16 +263,12 @@ impl ComposerRepository { let base_url = base_url_trimmed.trim_end_matches('/').to_string(); assert!(!base_url.is_empty()); - let cache = Cache::new( - &*io, - format!( - "{}/{}", - config.get("cache-repo-dir").as_string().unwrap_or(""), - Preg::replace(r"{[^a-z0-9.]}i", "-", &Url::sanitize(url.clone()))?, - ), - ); + // TODO(phase-b): Cache::new expects Box<dyn IOInterface> but io is also stored in self.io; + // need shared ownership (Rc) for IOInterface. Using todo!() placeholder. + let cache: Cache = + todo!("Cache::new requires Box<dyn IOInterface> but io is also moved into self.io"); let version_parser = VersionParser::new(); - let loader = ArrayLoader::new_with_parser(version_parser.clone()); + let loader = ArrayLoader::new(Some(version_parser.clone()), true); let r#loop = std::rc::Rc::new(std::cell::RefCell::new(Loop::new( std::rc::Rc::clone(&http_downloader), @@ -280,7 +276,7 @@ impl ComposerRepository { ))); let mut this = Self { - inner, + inner: inner?, repo_config, options, url, @@ -674,7 +670,7 @@ impl ComposerRepository { let result = self .http_downloader .borrow_mut() - .get(&url, &self.options)? + .get(&url, self.options.clone())? .decode_json()?; let package_names: Vec<String> = result .as_array() @@ -706,7 +702,7 @@ impl ComposerRepository { let result = self .http_downloader .borrow_mut() - .get(&url, &self.options)? + .get(&url, self.options.clone())? .decode_json()?; let package_names: Vec<String> = result .as_array() @@ -736,12 +732,19 @@ impl ComposerRepository { let has_providers = self.has_providers()?; if !has_providers && !self.has_partial_packages()? && self.lazy_providers_url.is_none() { - return self.inner.load_packages( + let inner_result = self.inner.load_packages( package_name_map, acceptable_stabilities, stability_flags, already_loaded, ); + // TODO(phase-b): repository_interface::LoadPackagesResult uses Vec<Box<dyn BasePackage>> + // for `packages`; this fn returns IndexMap. Reconciliation needs structural changes. + let _ = inner_result; + return Ok(LoadPackagesResult { + names_found: Vec::new(), + packages: IndexMap::new(), + }); } let mut packages: IndexMap<String, Box<dyn BasePackage>> = IndexMap::new(); @@ -763,13 +766,16 @@ impl ComposerRepository { continue; } + // TODO(phase-b): Box<dyn PackageInterface> is not Clone; share via Rc let candidates = self.what_provides( &name, Some(&acceptable_stabilities), Some(&stability_flags), - already_loaded.clone(), + todo!("clone of already_loaded requires sharing Box<dyn PackageInterface>"), )?; - let constraint = package_name_map.get(&name).cloned().flatten(); + let constraint = package_name_map + .get(&name) + .and_then(|c| c.as_ref().map(|c| c.clone_box())); for (_uid, candidate) in candidates.iter() { if candidate.get_name() != name { return Err(LogicException { @@ -865,7 +871,8 @@ impl ComposerRepository { let search = self .http_downloader - .get(&url, &self.options)? + .borrow_mut() + .get(&url, self.options.clone())? .decode_json()?; let results_arr = search @@ -887,7 +894,7 @@ impl ComposerRepository { // do not show virtual packages in results as they are not directly useful from a composer perspective if let Some(v) = arr.get("virtual") { // PHP's `empty()` is false when the value is truthy - let is_empty = match v { + let is_empty = match &**v { PhpMixed::Null => true, PhpMixed::Bool(false) => true, PhpMixed::Int(0) => true, @@ -919,7 +926,8 @@ impl ComposerRepository { let regex = format!("{{(?:{})}}i", parts.join("|")); let vendor_names = self.get_vendor_names()?; - for name in Preg::grep(®ex, &vendor_names)? { + let vendor_names_refs: Vec<&str> = vendor_names.iter().map(|s| s.as_str()).collect(); + for name in Preg::grep(®ex, &vendor_names_refs)? { let mut entry = IndexMap::new(); entry.insert("name".to_string(), PhpMixed::String(name)); entry.insert("description".to_string(), PhpMixed::String(String::new())); @@ -955,7 +963,7 @@ impl ComposerRepository { let result = self .http_downloader .borrow_mut() - .get(&url, &self.options)? + .get(&url, self.options.clone())? .decode_json()?; let mut results: Vec<IndexMap<String, PhpMixed>> = Vec::new(); @@ -983,7 +991,8 @@ impl ComposerRepository { let regex = format!("{{(?:{})}}i", parts.join("|")); let package_names = self.get_package_names(None)?; - for name in Preg::grep(®ex, &package_names)? { + let package_names_refs: Vec<&str> = package_names.iter().map(|s| s.as_str()).collect(); + for name in Preg::grep(®ex, &package_names_refs)? { let mut entry = IndexMap::new(); entry.insert("name".to_string(), PhpMixed::String(name)); entry.insert("description".to_string(), PhpMixed::String(String::new())); @@ -993,7 +1002,23 @@ impl ComposerRepository { return Ok(results); } - Ok(self.inner.search(query, mode, None)) + // TODO(phase-b): inner.search returns Vec<SearchResult>; convert to PHP-shaped map + let inner_results = self.inner.search(query, mode, None); + let converted: Vec<IndexMap<String, PhpMixed>> = inner_results + .into_iter() + .map(|sr| { + let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); + m.insert("name".to_string(), PhpMixed::String(sr.name)); + if let Some(d) = sr.description { + m.insert("description".to_string(), PhpMixed::String(d)); + } + if let Some(u) = sr.url { + m.insert("url".to_string(), PhpMixed::String(u)); + } + m + }) + .collect(); + Ok(converted) } pub fn has_security_advisories(&mut self) -> anyhow::Result<bool> { @@ -1096,61 +1121,85 @@ impl ComposerRepository { continue; } + // TODO(phase-b): then_boxed expects closure returning Box<dyn PromiseInterface>, + // not anyhow::Result<()>; needs structural reshape of closure type let promise = self .start_cached_async_download(&name, Some(&name))? - .then_boxed(Box::new({ - let advisories_ptr = &mut advisories as *mut _; - let names_found_ptr = &mut names_found as *mut _; - let package_constraint_map_ptr = &mut package_constraint_map as *mut _; - let name = name.clone(); - let create = &create; - move |spec: PhpMixed| -> anyhow::Result<()> { - // [$response] = $spec; - let response = spec - .as_list() - .and_then(|l| l.first()) - .map(|b| (**b).clone()) - .unwrap_or(PhpMixed::Null); - let response_arr = match response.as_array() { - Some(a) => a.clone(), - None => return Ok(()), - }; - let sec_advs = match response_arr.get("security-advisories") { - Some(v) => v.clone(), - None => return Ok(()), - }; - let sec_advs_arr = match sec_advs.as_array() { - Some(a) => a.clone(), - None => return Ok(()), - }; - unsafe { - (*names_found_ptr).insert(name.clone(), true); - } - if !sec_advs_arr.is_empty() { - let mut entries: Vec<PartialOrSecurityAdvisory> = Vec::new(); - for (_k, data_mixed) in sec_advs_arr.iter() { - if let Some(data) = data_mixed.as_array() { - let data_map: IndexMap<String, PhpMixed> = data - .iter() - .map(|(k, v)| (k.clone(), (**v).clone())) - .collect(); - let pcm: &IndexMap<String, Box<dyn ConstraintInterface>> = - unsafe { &*package_constraint_map_ptr }; - if let Some(adv) = create(&data_map, &name, pcm)? { - entries.push(adv); + .then_boxed( + Some(Box::new({ + let advisories_ptr: *mut IndexMap< + String, + Vec<PartialOrSecurityAdvisory>, + > = &mut advisories as *mut _; + let names_found_ptr: *mut IndexMap<String, bool> = + &mut names_found as *mut _; + let package_constraint_map_ptr: *mut IndexMap< + String, + Box<dyn ConstraintInterface>, + > = &mut package_constraint_map as *mut _; + let name = name.clone(); + // TODO(phase-b): create closure captures local references (semver_parser, repo_name, + // allow_partial_advisories) but is consumed by a 'static Box; needs restructuring + move |spec: PhpMixed| -> Box<dyn PromiseInterface> { + let _result: anyhow::Result<()> = (|| -> anyhow::Result<()> { + // [$response] = $spec; + let response = spec + .as_list() + .and_then(|l| l.first()) + .map(|b| (**b).clone()) + .unwrap_or(PhpMixed::Null); + let response_arr = match response.as_array() { + Some(a) => a.clone(), + None => return Ok(()), + }; + let sec_advs = match response_arr.get("security-advisories") { + Some(v) => v.clone(), + None => return Ok(()), + }; + let sec_advs_arr = match sec_advs.as_array() { + Some(a) => a.clone(), + None => return Ok(()), + }; + unsafe { + (*names_found_ptr).insert(name.clone(), true); + } + if !sec_advs_arr.is_empty() { + let mut entries: Vec<PartialOrSecurityAdvisory> = + Vec::new(); + for (_k, data_mixed) in sec_advs_arr.iter() { + if let Some(data) = data_mixed.as_array() { + let data_map: IndexMap<String, PhpMixed> = data + .iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect(); + let _pcm: &IndexMap< + String, + Box<dyn ConstraintInterface>, + > = unsafe { &*package_constraint_map_ptr }; + let _ = &data_map; + // TODO(phase-b): call create() closure; it captures references + if let Some(adv) = None::<PartialOrSecurityAdvisory> + { + entries.push(adv); + } + } + } + unsafe { + (*advisories_ptr).insert(name.clone(), entries); } } - } - unsafe { - (*advisories_ptr).insert(name.clone(), entries); - } - } - unsafe { - (*package_constraint_map_ptr).shift_remove(&name); + unsafe { + (*package_constraint_map_ptr).shift_remove(&name); + } + Ok(()) + })( + ); + // TODO(phase-b): return a real PromiseInterface; closure body retains side-effects + todo!("return real PromiseInterface") } - Ok(()) - } - })); + })), + None, + ); promises.push(promise); } @@ -1163,7 +1212,7 @@ impl ComposerRepository { let http_entry = options .entry("http".to_string()) .or_insert(PhpMixed::Array(IndexMap::new())); - if let PhpMixed::Array(ref mut http_map) = http_entry { + if let PhpMixed::Array(http_map) = http_entry { http_map.insert( "method".to_string(), Box::new(PhpMixed::String("POST".to_string())), @@ -1203,7 +1252,7 @@ impl ComposerRepository { http_map.insert("content".to_string(), Box::new(PhpMixed::String(body))); } - let response = self.http_downloader.borrow_mut().get(&api_url, &options)?; + let response = self.http_downloader.borrow_mut().get(&api_url, options)?; let mut warned = false; let decoded = response.decode_json()?; let advisories_response = decoded @@ -1271,12 +1320,12 @@ impl ComposerRepository { if let Some(providers_api_url) = self.providers_api_url.clone() { let api_result = match self.http_downloader.borrow_mut().get( &providers_api_url.replace("%package%", package_name), - &self.options, + self.options.clone(), ) { Ok(resp) => resp.decode_json()?, Err(e) => { if let Some(te) = e.downcast_ref::<TransportException>() { - if te.get_status_code() == 404 { + if te.get_status_code() == Some(404) { return Ok(result); } } @@ -1350,9 +1399,16 @@ impl ComposerRepository { } } - if !self.inner.is_packages_empty() { - for (k, v) in self.inner.get_providers(package_name) { - result.insert(k, v); + if Countable::count(&self.inner) > 0 { + for (k, v) in self.inner.get_providers(package_name.to_string()) { + // TODO(phase-b): ProviderInfo -> IndexMap<String, PhpMixed> conversion needed + let mut entry: IndexMap<String, PhpMixed> = IndexMap::new(); + entry.insert("name".to_string(), PhpMixed::String(v.name)); + if let Some(d) = v.description { + entry.insert("description".to_string(), PhpMixed::String(d)); + } + entry.insert("type".to_string(), PhpMixed::String(v.r#type)); + result.insert(k, entry); } } @@ -1561,7 +1617,10 @@ impl ComposerRepository { let status_code = te.get_status_code(); if self.lazy_providers_url.is_some() && in_array( - PhpMixed::Int(status_code), + match status_code { + Some(c) => PhpMixed::Int(c), + None => PhpMixed::Null, + }, &PhpMixed::List(vec![ Box::new(PhpMixed::Int(404)), Box::new(PhpMixed::Int(499)), @@ -1576,9 +1635,11 @@ impl ComposerRepository { "not-found file ({})", Url::sanitize(url.clone()) )); - if status_code == 499 { - self.io - .error(&format!("<warning>{}</warning>", te.get_message())); + if status_code == Some(499) { + self.io.error( + &format!("<warning>{}</warning>", te.get_message()), + &[], + ); } } else { return Err(e); @@ -1762,7 +1823,7 @@ impl ComposerRepository { /// @inheritDoc pub fn initialize(&mut self) -> anyhow::Result<()> { - self.inner.initialize()?; + self.inner.initialize(); let repo_data = self.load_data_from_server()?; @@ -1810,7 +1871,9 @@ impl ComposerRepository { // load ~dev versions of the packages as well if needed let names_snapshot: Vec<String> = package_names.keys().cloned().collect(); for name in names_snapshot { - let constraint = package_names.get(&name).cloned().flatten(); + let constraint = package_names + .get(&name) + .and_then(|c| c.as_ref().map(|c| c.clone_box())); if acceptable_stabilities.is_none() || stability_flags.is_none() || StabilityFilter::is_package_acceptable( @@ -1847,164 +1910,179 @@ impl ComposerRepository { continue; } - let already_loaded_clone = already_loaded.clone(); + // TODO(phase-b): Box<dyn PackageInterface> is not Clone; share via Rc + let already_loaded_clone: IndexMap< + String, + IndexMap<String, Box<dyn PackageInterface>>, + > = todo!("clone of already_loaded requires sharing Box<dyn PackageInterface>"); let acceptable_stabilities_clone = acceptable_stabilities.cloned(); let stability_flags_clone = stability_flags.cloned(); let version_parser = self.version_parser.clone(); + // TODO(phase-b): then_boxed expects closure returning Box<dyn PromiseInterface>, + // not anyhow::Result<()>; needs structural reshape let promise = self .start_cached_async_download(&name, Some(&real_name))? - .then_boxed(Box::new({ - let packages_ptr = &mut packages as *mut _; - let names_found_ptr = &mut names_found as *mut _; - let real_name = real_name.clone(); - let constraint = constraint; - move |spec: PhpMixed| -> anyhow::Result<()> { - let spec_list = spec.as_list().cloned().unwrap_or_default(); - let response = spec_list - .first() - .map(|b| (**b).clone()) - .unwrap_or(PhpMixed::Null); - let packages_source_val = spec_list - .get(1) - .map(|b| (**b).clone()) - .unwrap_or(PhpMixed::Null); - let packages_source: Option<String> = - packages_source_val.as_string().map(|s| s.to_string()); - if response.is_null() { - return Ok(()); - } - let response_arr = match response.as_array() { - Some(a) => a.clone(), - None => return Ok(()), - }; - let inner_packages = response_arr.get("packages"); - let versions_mixed = match inner_packages - .and_then(|v| v.as_array()) - .and_then(|a| a.get(&real_name)) - .cloned() - { - Some(b) => *b, - None => return Ok(()), - }; + .then_boxed( + Some(Box::new({ + let packages_ptr: *mut IndexMap<String, Box<dyn BasePackage>> = &mut packages as *mut _; + let names_found_ptr: *mut IndexMap<String, bool> = &mut names_found as *mut _; + let real_name = real_name.clone(); + let constraint = constraint; + move |spec: PhpMixed| -> Box<dyn PromiseInterface> { + let _result: anyhow::Result<()> = (|| -> anyhow::Result<()> { + let spec_list = spec.as_list().cloned().unwrap_or_default(); + let response = spec_list + .first() + .map(|b| (**b).clone()) + .unwrap_or(PhpMixed::Null); + let packages_source_val = spec_list + .get(1) + .map(|b| (**b).clone()) + .unwrap_or(PhpMixed::Null); + let packages_source: Option<String> = + packages_source_val.as_string().map(|s| s.to_string()); + if response.is_null() { + return Ok(()); + } + let response_arr = match response.as_array() { + Some(a) => a.clone(), + None => return Ok(()), + }; + let inner_packages = response_arr.get("packages"); + let versions_mixed = match inner_packages + .and_then(|v| v.as_array()) + .and_then(|a| a.get(&real_name)) + .cloned() + { + Some(b) => *b, + None => return Ok(()), + }; - let mut versions: Vec<IndexMap<String, PhpMixed>> = match &versions_mixed { - PhpMixed::List(l) => l - .iter() - .filter_map(|v| { - v.as_array().map(|a| { - a.iter() - .map(|(k, v)| (k.clone(), (**v).clone())) - .collect::<IndexMap<String, PhpMixed>>() - }) - }) - .collect(), - PhpMixed::Array(a) => a - .values() - .filter_map(|v| { - v.as_array().map(|a| { - a.iter() - .map(|(k, v)| (k.clone(), (**v).clone())) - .collect::<IndexMap<String, PhpMixed>>() - }) - }) - .collect(), - _ => return Ok(()), - }; + let mut versions: Vec<IndexMap<String, PhpMixed>> = + match &versions_mixed { + PhpMixed::List(l) => l + .iter() + .filter_map(|v| { + v.as_array().map(|a| { + a.iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect::<IndexMap<String, PhpMixed>>() + }) + }) + .collect(), + PhpMixed::Array(a) => a + .values() + .filter_map(|v| { + v.as_array().map(|a| { + a.iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect::<IndexMap<String, PhpMixed>>() + }) + }) + .collect(), + _ => return Ok(()), + }; - let minified = response_arr - .get("minified") - .and_then(|v| v.as_string()) - .map_or(false, |s| s == "composer/2.0"); - if minified { - versions = MetadataMinifier::expand(versions); - } + let minified = response_arr + .get("minified") + .and_then(|v| v.as_string()) + .map_or(false, |s| s == "composer/2.0"); + if minified { + // TODO(phase-b): MetadataMinifier::expand expects/returns IndexMap but versions is Vec + versions = todo!("MetadataMinifier::expand signature mismatch with Vec<IndexMap>"); + } - unsafe { - (*names_found_ptr).insert(real_name.clone(), true); - } - let mut versions_to_load: Vec<IndexMap<String, PhpMixed>> = Vec::new(); - for version in versions.into_iter() { - let mut version = version; - let has_vn = version.contains_key("version_normalized"); - if !has_vn { - let v = version - .get("version") + unsafe { + (*names_found_ptr).insert(real_name.clone(), true); + } + let mut versions_to_load: Vec<IndexMap<String, PhpMixed>> = Vec::new(); + for version in versions.into_iter() { + let mut version = version; + let has_vn = version.contains_key("version_normalized"); + if !has_vn { + let v = version + .get("version") + .and_then(|v| v.as_string()) + .unwrap_or("") + .to_string(); + let normalized = version_parser.normalize(&v, None)?; + version.insert( + "version_normalized".to_string(), + PhpMixed::String(normalized), + ); + } else if version + .get("version_normalized") .and_then(|v| v.as_string()) - .unwrap_or("") - .to_string(); - let normalized = version_parser.normalize(&v, None)?; - version.insert( - "version_normalized".to_string(), - PhpMixed::String(normalized), - ); - } else if version - .get("version_normalized") - .and_then(|v| v.as_string()) - .map_or(false, |s| s == VersionParser::DEFAULT_BRANCH_ALIAS) - { - // handling of existing repos which need to remain composer v1 compatible, in case the version_normalized contained VersionParser::DEFAULT_BRANCH_ALIAS, we renormalize it - let v = version - .get("version") + .map_or(false, |s| s == VersionParser::DEFAULT_BRANCH_ALIAS) + { + // handling of existing repos which need to remain composer v1 compatible, in case the version_normalized contained VersionParser::DEFAULT_BRANCH_ALIAS, we renormalize it + let v = version + .get("version") + .and_then(|v| v.as_string()) + .unwrap_or("") + .to_string(); + let normalized = version_parser.normalize(&v, None)?; + version.insert( + "version_normalized".to_string(), + PhpMixed::String(normalized), + ); + } + + let version_normalized = version + .get("version_normalized") .and_then(|v| v.as_string()) .unwrap_or("") .to_string(); - let normalized = version_parser.normalize(&v, None)?; - version.insert( - "version_normalized".to_string(), - PhpMixed::String(normalized), - ); - } - - let version_normalized = version - .get("version_normalized") - .and_then(|v| v.as_string()) - .unwrap_or("") - .to_string(); - // avoid loading packages which have already been loaded - if already_loaded_clone - .get(&real_name) - .map_or(false, |m| m.contains_key(&version_normalized)) - { - continue; - } + // avoid loading packages which have already been loaded + if already_loaded_clone + .get(&real_name) + .map_or(false, |m| m.contains_key(&version_normalized)) + { + continue; + } - let acceptable = ComposerRepository::is_version_acceptable_static( - constraint.as_deref(), - &real_name, - &version, - acceptable_stabilities_clone.as_ref(), - stability_flags_clone.as_ref(), - )?; - if acceptable { - versions_to_load.push(version); + let acceptable = ComposerRepository::is_version_acceptable_static( + constraint.as_deref(), + &real_name, + &version, + acceptable_stabilities_clone.as_ref(), + stability_flags_clone.as_ref(), + )?; + if acceptable { + versions_to_load.push(version); + } } - } - let loaded_packages: Vec<Box<dyn BasePackage>> = - ComposerRepository::create_packages_static( - versions_to_load, - packages_source, - )?; - for mut package in loaded_packages.into_iter() { - package.set_repository_self(); - let hash_c = spl_object_hash(&*package); - if let Some(alias) = package.as_alias_package_mut() { - let aliased_hash = spl_object_hash(alias.get_alias_of()); - if !unsafe { (*packages_ptr).contains_key(&aliased_hash) } { - alias.get_alias_of_mut().set_repository_self(); - let aliased_clone = dyn_clone_box(alias.get_alias_of()); - unsafe { - (*packages_ptr).insert(aliased_hash, aliased_clone); + let loaded_packages: Vec<Box<dyn BasePackage>> = + ComposerRepository::create_packages_static( + versions_to_load, + packages_source, + )?; + for mut package in loaded_packages.into_iter() { + package.set_repository_self(); + let hash_c = spl_object_hash(&*package); + if let Some(alias) = package.as_alias_package_mut() { + let aliased_hash = spl_object_hash(alias.get_alias_of()); + if !unsafe { (*packages_ptr).contains_key(&aliased_hash) } { + alias.get_alias_of_mut().set_repository_self(); + let aliased_clone = dyn_clone_box(alias.get_alias_of()); + unsafe { + (*packages_ptr).insert(aliased_hash, aliased_clone); + } } } + unsafe { + (*packages_ptr).insert(hash_c, package); + } } - unsafe { - (*packages_ptr).insert(hash_c, package); - } + Ok(()) + })(); + // TODO(phase-b): return a real PromiseInterface + todo!("return real PromiseInterface") } - Ok(()) - } - })); + })), + None, + ); promises.push(promise); } @@ -2065,47 +2143,58 @@ impl ComposerRepository { let url_owned = url.clone(); let cache_key_owned = cache_key.clone(); let contents = contents_opt; - Ok(promise.then_boxed(Box::new( - move |response: PhpMixed| -> anyhow::Result<PhpMixed> { - let mut packages_source = - format!("downloaded file ({})", Url::sanitize(url_owned.clone())); + // TODO(phase-b): then_boxed expects closure returning Box<dyn PromiseInterface>, + // not anyhow::Result<PhpMixed>; needs structural reshape + Ok(promise.then_boxed( + Some(Box::new( + move |response: PhpMixed| -> Box<dyn PromiseInterface> { + let _result: anyhow::Result<PhpMixed> = (|| -> anyhow::Result<PhpMixed> { + let mut packages_source = + format!("downloaded file ({})", Url::sanitize(url_owned.clone())); - let response_data = if response.as_bool() == Some(true) { - packages_source = format!( - "cached file ({} originating from {})", - cache_key_owned, - Url::sanitize(url_owned.clone()) - ); - contents - .clone() - .map(|m| { - PhpMixed::Array(m.into_iter().map(|(k, v)| (k, Box::new(v))).collect()) - }) - .unwrap_or(PhpMixed::Null) - } else { - response - }; + let response_data = if response.as_bool() == Some(true) { + packages_source = format!( + "cached file ({} originating from {})", + cache_key_owned, + Url::sanitize(url_owned.clone()) + ); + contents + .clone() + .map(|m| { + PhpMixed::Array( + m.into_iter().map(|(k, v)| (k, Box::new(v))).collect(), + ) + }) + .unwrap_or(PhpMixed::Null) + } else { + response + }; - let response_arr = response_data.as_array(); - let has_pkg = response_arr - .and_then(|a| a.get("packages")) - .and_then(|v| v.as_array()) - .map_or(false, |a| a.contains_key(&package_name)); - let has_advisories = - response_arr.map_or(false, |a| a.contains_key("security-advisories")); - if !has_pkg && !has_advisories { - return Ok(PhpMixed::List(vec![ - Box::new(PhpMixed::Null), - Box::new(PhpMixed::String(packages_source)), - ])); - } + let response_arr = response_data.as_array(); + let has_pkg = response_arr + .and_then(|a| a.get("packages")) + .and_then(|v| v.as_array()) + .map_or(false, |a| a.contains_key(&package_name)); + let has_advisories = + response_arr.map_or(false, |a| a.contains_key("security-advisories")); + if !has_pkg && !has_advisories { + return Ok(PhpMixed::List(vec![ + Box::new(PhpMixed::Null), + Box::new(PhpMixed::String(packages_source)), + ])); + } - Ok(PhpMixed::List(vec![ - Box::new(response_data), - Box::new(PhpMixed::String(packages_source)), - ])) - }, - ))) + Ok(PhpMixed::List(vec![ + Box::new(response_data), + Box::new(PhpMixed::String(packages_source)), + ])) + })(); + // TODO(phase-b): return a real PromiseInterface + todo!("return real PromiseInterface") + }, + )), + None, + )) } /// @param name package name (must be lowercased already) @@ -2135,7 +2224,7 @@ impl ComposerRepository { stability_flags: Option<&IndexMap<String, i64>>, ) -> anyhow::Result<bool> { Self::is_version_acceptable_with_loader( - &ArrayLoader::new_with_parser(VersionParser::new()), + &ArrayLoader::new(Some(VersionParser::new()), true), constraint, name, version_data, @@ -2160,7 +2249,7 @@ impl ComposerRepository { .to_string(), ]; - if let Some(alias) = loader.get_branch_alias(version_data) { + if let Some(alias) = loader.get_branch_alias(version_data)? { versions.push(alias); } @@ -2178,7 +2267,7 @@ impl ComposerRepository { } if let Some(c) = constraint { - if !CompilingMatcher::match_(c, Constraint::OP_EQ, version) { + if !CompilingMatcher::r#match(c, Constraint::OP_EQ, version.clone()) { continue; } } @@ -2189,7 +2278,7 @@ impl ComposerRepository { Ok(false) } - fn get_packages_json_url(&self) -> String { + pub fn get_packages_json_url(&self) -> String { let json_url_parts = parse_url_all(&strtr(&self.url, "\\", "/")); let has_json = json_url_parts @@ -2339,12 +2428,10 @@ impl ComposerRepository { .get("preferred") .and_then(|v| v.as_bool()) .unwrap_or(false); + let url = self.canonicalize_url(&dist_url)?; self.dist_mirrors .get_or_insert_with(Vec::new) - .push(DistMirror { - url: self.canonicalize_url(&dist_url)?, - preferred, - }); + .push(DistMirror { url, preferred }); } } } @@ -2766,11 +2853,29 @@ impl ComposerRepository { if let Some(mirrors) = self.source_mirrors.as_ref().and_then(|m| m.get(src_type)) { - package.set_source_mirrors(mirrors); + let converted: Vec<IndexMap<String, PhpMixed>> = mirrors + .iter() + .map(|m| { + let mut im: IndexMap<String, PhpMixed> = IndexMap::new(); + im.insert("url".to_string(), PhpMixed::String(m.url.clone())); + im.insert("preferred".to_string(), PhpMixed::Bool(m.preferred)); + im + }) + .collect(); + package.set_source_mirrors(Some(converted)); } } if let Some(dist_mirrors) = self.dist_mirrors.as_ref() { - package.set_dist_mirrors(dist_mirrors); + let converted: Vec<IndexMap<String, PhpMixed>> = dist_mirrors + .iter() + .map(|m| { + let mut im: IndexMap<String, PhpMixed> = IndexMap::new(); + im.insert("url".to_string(), PhpMixed::String(m.url.clone())); + im.insert("preferred".to_string(), PhpMixed::Bool(m.preferred)); + im + }) + .collect(); + package.set_dist_mirrors(Some(converted)); } self.configure_package_transport_options(&mut *package); results.push(package); @@ -2803,7 +2908,7 @@ impl ComposerRepository { if packages.is_empty() { return Ok(vec![]); } - let loader = ArrayLoader::new_with_parser(VersionParser::new()); + let loader = ArrayLoader::new(Some(VersionParser::new()), true); Ok(loader.load_packages(packages)?) } @@ -2847,7 +2952,8 @@ impl ComposerRepository { } { let attempt: anyhow::Result<()> = (|| -> anyhow::Result<()> { let mut options = self.options.clone(); - if let Some(dispatcher) = self.event_dispatcher.as_mut() { + if let Some(dispatcher) = self.event_dispatcher.as_ref() { + let mut dispatcher = dispatcher.borrow_mut(); let mut pre_file_download_event = PreFileDownloadEvent::new( PluginEvents::PRE_FILE_DOWNLOAD.to_string(), std::rc::Rc::clone(&self.http_downloader), @@ -2857,20 +2963,33 @@ impl ComposerRepository { let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); // TODO(plugin): pass repository self-reference m.insert("repository".to_string(), PhpMixed::Null); - m + m.into() }, ); - pre_file_download_event.set_transport_options(self.options.clone()); - dispatcher.dispatch( - &pre_file_download_event.get_name(), - &mut pre_file_download_event, + pre_file_download_event.set_transport_options( + self.options + .clone() + .into_iter() + .map(|(k, v)| (k, Box::new(v))) + .collect(), ); - filename = pre_file_download_event.get_processed_url(); - options = pre_file_download_event.get_transport_options(); + // TODO(phase-b): dispatcher.dispatch expects Option<Event>, not concrete event types; + // need a way to pass PreFileDownloadEvent through EventDispatcher's API. + let _ = &mut pre_file_download_event; + dispatcher.dispatch(Some(pre_file_download_event.get_name()), None)?; + filename = pre_file_download_event.get_processed_url().to_string(); + options = pre_file_download_event + .get_transport_options() + .iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect(); } - let response = self.http_downloader.borrow_mut().get(&filename, &options)?; - let mut json = response.get_body().to_string(); + let mut response = self + .http_downloader + .borrow_mut() + .get(&filename, options.clone())?; + let mut json = response.get_body().unwrap_or("").to_string(); if let Some(sha256_val) = sha256 { if sha256_val != hash("sha256", &json) { // undo downgrade before trying again if http seems to be hijacked or modifying content somehow @@ -2896,7 +3015,8 @@ impl ComposerRepository { } } - if let Some(dispatcher) = self.event_dispatcher.as_mut() { + if let Some(dispatcher) = self.event_dispatcher.as_ref() { + let mut dispatcher = dispatcher.borrow_mut(); let mut post_file_download_event = PostFileDownloadEvent::new( PluginEvents::POST_FILE_DOWNLOAD.to_string(), None, @@ -2908,13 +3028,12 @@ impl ComposerRepository { // TODO(plugin): pass response and repository self-reference m.insert("response".to_string(), PhpMixed::Null); m.insert("repository".to_string(), PhpMixed::Null); - m + m.into() }, ); - dispatcher.dispatch( - &post_file_download_event.get_name(), - &mut post_file_download_event, - ); + // TODO(phase-b): dispatcher.dispatch expects Option<Event>, not concrete event types + let _ = &mut post_file_download_event; + dispatcher.dispatch(Some(post_file_download_event.get_name()), None)?; } let decoded = response.decode_json()?; @@ -2961,7 +3080,7 @@ impl ComposerRepository { return Err(e); } if let Some(te) = e.downcast_ref::<TransportException>() { - if te.get_status_code() == 404 { + if te.get_status_code() == Some(404) { return Err(e); } } @@ -2981,7 +3100,7 @@ impl ComposerRepository { } self.degraded_mode = true; let parsed = JsonFile::parse_json( - &contents, + Some(&contents), Some(&format!("{}{}", self.cache.get_root(), ck)), )?; let map: IndexMap<String, PhpMixed> = parsed @@ -3028,7 +3147,8 @@ impl ComposerRepository { let mut filename = filename.to_string(); let result: anyhow::Result<FetchFileIfLastModifiedResult> = (|| { let mut options = self.options.clone(); - if let Some(dispatcher) = self.event_dispatcher.as_mut() { + if let Some(dispatcher) = self.event_dispatcher.as_ref() { + let mut dispatcher = dispatcher.borrow_mut(); let mut pre_file_download_event = PreFileDownloadEvent::new( PluginEvents::PRE_FILE_DOWNLOAD.to_string(), std::rc::Rc::clone(&self.http_downloader), @@ -3037,23 +3157,32 @@ impl ComposerRepository { { let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); m.insert("repository".to_string(), PhpMixed::Null); - m + m.into() }, ); - pre_file_download_event.set_transport_options(self.options.clone()); - dispatcher.dispatch( - &pre_file_download_event.get_name(), - &mut pre_file_download_event, + pre_file_download_event.set_transport_options( + self.options + .clone() + .into_iter() + .map(|(k, v)| (k, Box::new(v))) + .collect(), ); - filename = pre_file_download_event.get_processed_url(); - options = pre_file_download_event.get_transport_options(); + // TODO(phase-b): dispatcher.dispatch expects Option<Event>, not concrete event types + let _ = &mut pre_file_download_event; + dispatcher.dispatch(Some(pre_file_download_event.get_name()), None)?; + filename = pre_file_download_event.get_processed_url().to_string(); + options = pre_file_download_event + .get_transport_options() + .iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect(); } // cast http.header to array, then append let http_entry = options .entry("http".to_string()) .or_insert(PhpMixed::Array(IndexMap::new())); - if let PhpMixed::Array(ref mut http_map) = http_entry { + if let PhpMixed::Array(http_map) = http_entry { if let Some(existing) = http_map.get("header") { let arr = match &**existing { PhpMixed::List(l) => l.clone(), @@ -3075,13 +3204,17 @@ impl ComposerRepository { http_map.insert("header".to_string(), Box::new(PhpMixed::List(headers))); } - let response = self.http_downloader.borrow_mut().get(&filename, &options)?; - let mut json = response.get_body().to_string(); + let mut response = self + .http_downloader + .borrow_mut() + .get(&filename, options.clone())?; + let mut json = response.get_body().unwrap_or("").to_string(); if json.is_empty() && response.get_status_code() == 304 { return Ok(FetchFileIfLastModifiedResult::NotModified); } - if let Some(dispatcher) = self.event_dispatcher.as_mut() { + if let Some(dispatcher) = self.event_dispatcher.as_ref() { + let mut dispatcher = dispatcher.borrow_mut(); let mut post_file_download_event = PostFileDownloadEvent::new( PluginEvents::POST_FILE_DOWNLOAD.to_string(), None, @@ -3092,13 +3225,12 @@ impl ComposerRepository { let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); m.insert("response".to_string(), PhpMixed::Null); m.insert("repository".to_string(), PhpMixed::Null); - m + m.into() }, ); - dispatcher.dispatch( - &post_file_download_event.get_name(), - &mut post_file_download_event, - ); + // TODO(phase-b): dispatcher.dispatch expects Option<Event>, not concrete event types + let _ = &mut post_file_download_event; + dispatcher.dispatch(Some(post_file_download_event.get_name()), None)?; } let decoded = response.decode_json()?; @@ -3133,7 +3265,7 @@ impl ComposerRepository { return Err(e); } if let Some(te) = e.downcast_ref::<TransportException>() { - if te.get_status_code() == 404 { + if te.get_status_code() == Some(404) { return Err(e); } } @@ -3183,7 +3315,8 @@ impl ComposerRepository { let mut filename = filename.to_string(); let mut options = self.options.clone(); - if let Some(dispatcher) = self.event_dispatcher.as_mut() { + if let Some(dispatcher) = self.event_dispatcher.as_ref() { + let mut dispatcher = dispatcher.borrow_mut(); let mut pre_file_download_event = PreFileDownloadEvent::new( PluginEvents::PRE_FILE_DOWNLOAD.to_string(), std::rc::Rc::clone(&self.http_downloader), @@ -3192,23 +3325,32 @@ impl ComposerRepository { { let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); m.insert("repository".to_string(), PhpMixed::Null); - m + m.into() }, ); - pre_file_download_event.set_transport_options(self.options.clone()); - dispatcher.dispatch( - &pre_file_download_event.get_name(), - &mut pre_file_download_event, + pre_file_download_event.set_transport_options( + self.options + .clone() + .into_iter() + .map(|(k, v)| (k, Box::new(v))) + .collect(), ); - filename = pre_file_download_event.get_processed_url(); - options = pre_file_download_event.get_transport_options(); + // TODO(phase-b): dispatcher.dispatch expects Option<Event>, not concrete event types + let _ = &mut pre_file_download_event; + dispatcher.dispatch(Some(pre_file_download_event.get_name()), None)?; + filename = pre_file_download_event.get_processed_url().to_string(); + options = pre_file_download_event + .get_transport_options() + .iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect(); } if let Some(last_modified_time) = last_modified_time { let http_entry = options .entry("http".to_string()) .or_insert(PhpMixed::Array(IndexMap::new())); - if let PhpMixed::Array(ref mut http_map) = http_entry { + if let PhpMixed::Array(http_map) = http_entry { if let Some(existing) = http_map.get("header") { let arr = match &**existing { PhpMixed::List(l) => l.clone(), @@ -3236,10 +3378,11 @@ impl ComposerRepository { let url_owned = self.url.clone(); let last_modified_time_owned = last_modified_time.map(|s| s.to_string()); - let packages_not_found_ptr = &mut self.packagesNotFoundCache as *mut _; - let fresh_metadata_ptr = &mut self.freshMetadataUrls as *mut _; - let degraded_ptr = &mut self.degraded_mode as *mut _; - let cache_ptr = &mut self.cache as *mut _; + let packages_not_found_ptr: *mut IndexMap<String, bool> = + &mut self.packagesNotFoundCache as *mut _; + let fresh_metadata_ptr: *mut IndexMap<String, bool> = &mut self.freshMetadataUrls as *mut _; + let degraded_ptr: *mut bool = &mut self.degraded_mode as *mut _; + let cache_ptr: *mut Cache = &mut self.cache as *mut _; let io_ptr = self.io.as_ref() as *const dyn IOInterface; let accept = { @@ -3248,7 +3391,7 @@ impl ComposerRepository { let url_owned = url_owned.clone(); move |response_mixed: PhpMixed| -> anyhow::Result<PhpMixed> { // emulate: $response is a Response object; status code/body/header accessed via methods - let response = Response::from_php_mixed(response_mixed)?; + let mut response = Response::from_php_mixed(response_mixed); // package not found is acceptable for a v2 protocol repository if response.get_status_code() == 404 { unsafe { @@ -3262,7 +3405,7 @@ impl ComposerRepository { )); } - let mut json = response.get_body().to_string(); + let mut json = response.get_body().unwrap_or("").to_string(); if json.is_empty() && response.get_status_code() == 304 { unsafe { (*fresh_metadata_ptr).insert(filename.clone(), true); @@ -3318,7 +3461,7 @@ impl ComposerRepository { let accept_clone = accept.clone(); move |e: anyhow::Error| -> anyhow::Result<PhpMixed> { if let Some(te) = e.downcast_ref::<TransportException>() { - if te.get_status_code() == 404 { + if te.get_status_code() == Some(404) { unsafe { (*packages_not_found_ptr).insert(filename.clone(), true); } @@ -3348,7 +3491,7 @@ impl ComposerRepository { // special error code returned when network is being artificially disabled if let Some(te) = e.downcast_ref::<TransportException>() { - if te.get_status_code() == 499 { + if te.get_status_code() == Some(499) { let resp = Response::new_fake(&url_owned, 404, IndexMap::new(), String::new()); return accept_clone(resp.to_php_mixed()); @@ -3359,7 +3502,10 @@ impl ComposerRepository { } }; - let initial = self.http_downloader.borrow_mut().add(&filename, &options)?; + let initial = self + .http_downloader + .borrow_mut() + .add(&filename, options.clone())?; Ok(initial.then_with_reject_boxed(Box::new(accept), Box::new(reject))) } diff --git a/crates/shirabe/src/repository/composite_repository.rs b/crates/shirabe/src/repository/composite_repository.rs index d956cdd..2c26469 100644 --- a/crates/shirabe/src/repository/composite_repository.rs +++ b/crates/shirabe/src/repository/composite_repository.rs @@ -120,11 +120,30 @@ impl RepositoryInterface for CompositeRepository { let mut all_names_found = vec![]; for repository in &self.repositories { + // TODO(phase-b): manual deep clone since trait objects in maps don't derive Clone. + let name_map_cloned: IndexMap<String, Option<Box<dyn ConstraintInterface>>> = + package_name_map + .iter() + .map(|(k, v)| (k.clone(), v.as_ref().map(|c| c.clone_box()))) + .collect(); + let already_loaded_cloned: IndexMap< + String, + IndexMap<String, Box<dyn PackageInterface>>, + > = already_loaded + .iter() + .map(|(k, inner)| { + let inner_cloned: IndexMap<String, Box<dyn PackageInterface>> = inner + .iter() + .map(|(ik, iv)| (ik.clone(), iv.clone_package_box())) + .collect(); + (k.clone(), inner_cloned) + }) + .collect(); let result = repository.load_packages( - package_name_map.clone(), + name_map_cloned, acceptable_stabilities.clone(), stability_flags.clone(), - already_loaded.clone(), + already_loaded_cloned, ); all_packages.extend(result.packages); all_names_found.extend(result.names_found); diff --git a/crates/shirabe/src/repository/filesystem_repository.rs b/crates/shirabe/src/repository/filesystem_repository.rs index 4ce8585..f30e401 100644 --- a/crates/shirabe/src/repository/filesystem_repository.rs +++ b/crates/shirabe/src/repository/filesystem_repository.rs @@ -9,8 +9,8 @@ use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_php_shim::{ Exception, InvalidArgumentException, LogicException, PhpMixed, SORT_NATURAL, UnexpectedValueException, array_flip, dirname, r#eval, file_get_contents, get_class, - get_debug_type, in_array, is_array, is_int, is_null, is_string, ksort, php_dir, realpath, sort, - sort_with_flags, str_repeat, strtr, trim, usort, var_export, + get_class_err, get_debug_type, in_array, is_array, is_int, is_null, is_string, ksort, php_dir, + realpath, sort, sort_with_flags, str_repeat, strtr, trim, usort, var_export, }; use crate::installed_versions::InstalledVersions; @@ -139,7 +139,7 @@ impl FilesystemRepository { message: format!( "Invalid repository data in {}, packages could not be loaded: [{}] {}", self.file.get_path(), - get_class(&e), + get_class_err(&e), e, ), code: 0, @@ -151,18 +151,34 @@ impl FilesystemRepository { let mut loader = ArrayLoader::new(None, true); if let Some(packages_list) = packages.as_list() { for package_data in packages_list.iter() { - let package = loader.load( - (**package_data).clone(), - "Composer\\Package\\CompletePackage", - )?; + // TODO(phase-b): expected IndexMap<String, PhpMixed> but package_data is PhpMixed. + let cfg = (**package_data) + .as_array() + .cloned() + .map(|m| { + m.into_iter() + .map(|(k, v)| (k, *v)) + .collect::<IndexMap<String, PhpMixed>>() + }) + .unwrap_or_default(); + let package = + loader.load(cfg, Some("Composer\\Package\\CompletePackage".to_string()))?; self.inner.add_package(package)?; } } else if let Some(packages_array) = packages.as_array() { for (_, package_data) in packages_array.iter() { - let package = loader.load( - (**package_data).clone(), - "Composer\\Package\\CompletePackage", - )?; + // TODO(phase-b): expected IndexMap<String, PhpMixed> but package_data is PhpMixed. + let cfg = (**package_data) + .as_array() + .cloned() + .map(|m| { + m.into_iter() + .map(|(k, v)| (k, *v)) + .collect::<IndexMap<String, PhpMixed>>() + }) + .unwrap_or_default(); + let package = + loader.load(cfg, Some("Composer\\Package\\CompletePackage".to_string()))?; self.inner.add_package(package)?; } } @@ -180,7 +196,7 @@ impl FilesystemRepository { pub fn write( &mut self, dev_mode: bool, - installation_manager: &InstallationManager, + installation_manager: &mut InstallationManager, ) -> Result<()> { let mut data: IndexMap<String, PhpMixed> = IndexMap::new(); data.insert("packages".to_string(), PhpMixed::List(vec![])); @@ -226,6 +242,7 @@ impl FilesystemRepository { &repo_dir, &normalized_path, true, + false, )); } } @@ -267,9 +284,8 @@ impl FilesystemRepository { } // PHP: sort($data['dev-package-names']); - if let Some(PhpMixed::List(list)) = data.get_mut("dev-package-names") { - // TODO(phase-b): sort PhpMixed::List in-place using string comparison - sort(list); + if let Some(PhpMixed::List(_list)) = data.get_mut("dev-package-names") { + // TODO(phase-b): sort PhpMixed::List in-place using string comparison; PhpMixed: !Ord. } // PHP: usort($data['packages'], static function ($a, $b): int { return strcmp($a['name'], $b['name']); }); if let Some(PhpMixed::List(list)) = data.get_mut("packages") { @@ -576,11 +592,7 @@ impl FilesystemRepository { }; // TODO(phase-b): mutate nested versions['versions'][name]['aliases'] todo!("append alias->getPrettyVersion() to versions['versions'][name]['aliases']"); - if package - .as_any() - .downcast_ref::<dyn RootPackageInterface>() - .is_some() - { + if package.as_root_package_interface().is_some() { // TODO(phase-b): same mutation on versions['root']['aliases'] todo!("append alias->getPrettyVersion() to versions['root']['aliases']"); } @@ -596,9 +608,11 @@ impl FilesystemRepository { for (_name, version) in versions_map.iter_mut() { if let PhpMixed::Array(version_map) = version.as_mut() { for key in ["aliases", "replaced", "provided"] { - if let Some(PhpMixed::List(list)) = version_map.get_mut(key) { - // PHP: sort($versions['versions'][$name][$key], SORT_NATURAL); - sort_with_flags(list, SORT_NATURAL); + if let Some(boxed) = version_map.get_mut(key) { + if let PhpMixed::List(_list) = boxed.as_mut() { + // PHP: sort($versions['versions'][$name][$key], SORT_NATURAL); + // TODO(phase-b): PhpMixed lacks Ord; needs custom comparator. + } } } } @@ -642,18 +656,14 @@ impl FilesystemRepository { }; } - let install_path = if package - .as_any() - .downcast_ref::<dyn RootPackageInterface>() - .is_some() - { + let install_path = if package.as_root_package_interface().is_some() { let to = self.filesystem.borrow_mut().normalize_path( &realpath(&Platform::get_cwd(false).unwrap_or_default()).unwrap_or_default(), ); Some( self.filesystem .borrow_mut() - .find_shortest_path(repo_dir, &to, true), + .find_shortest_path(repo_dir, &to, true, false), ) } else { install_paths.get(package.get_name()).cloned().flatten() diff --git a/crates/shirabe/src/repository/installed_repository.rs b/crates/shirabe/src/repository/installed_repository.rs index 12abf1e..6091b15 100644 --- a/crates/shirabe/src/repository/installed_repository.rs +++ b/crates/shirabe/src/repository/installed_repository.rs @@ -61,8 +61,7 @@ impl InstalledRepository { Some(FindPackageConstraint::Constraint(c)) => Some(c), Some(FindPackageConstraint::String(s)) => { let version_parser = VersionParser::new(); - // TODO(phase-b): Arc<dyn ConstraintInterface + Send + Sync> -> Box<dyn ConstraintInterface> - Some(Box::new(version_parser.parse_constraints(&s).unwrap())) + Some(version_parser.parse_constraints(&s).unwrap()) } }; @@ -81,11 +80,13 @@ impl InstalledRepository { continue; } + let provides = candidate.get_provides(); + let replaces = candidate.get_replaces(); let mut provides_and_replaces: Vec<&Link> = vec![]; - for link in candidate.get_provides().values() { + for link in provides.values() { provides_and_replaces.push(link); } - for link in candidate.get_replaces().values() { + for link in replaces.values() { provides_and_replaces.push(link); } for link in provides_and_replaces { @@ -381,8 +382,9 @@ impl InstalledRepository { &mut self, repository: Box<dyn RepositoryInterface>, ) -> anyhow::Result<()> { + // TODO(phase-b): cannot Any::is::<dyn InstalledRepositoryInterface>; replace with a + // dedicated downcast/marker method on RepositoryInterface. if repository.as_any().is::<LockArrayRepository>() - || repository.as_any().is::<dyn InstalledRepositoryInterface>() || repository.as_any().is::<RootPackageRepository>() || repository.as_any().is::<PlatformRepository>() { diff --git a/crates/shirabe/src/repository/installed_repository_interface.rs b/crates/shirabe/src/repository/installed_repository_interface.rs index 711193a..80efef9 100644 --- a/crates/shirabe/src/repository/installed_repository_interface.rs +++ b/crates/shirabe/src/repository/installed_repository_interface.rs @@ -6,4 +6,8 @@ pub trait InstalledRepositoryInterface: WritableRepositoryInterface { fn get_dev_mode(&self) -> Option<bool>; fn is_fresh(&self) -> bool; + + fn clone_installed_repository_box(&self) -> Box<dyn InstalledRepositoryInterface> { + todo!() + } } diff --git a/crates/shirabe/src/repository/path_repository.rs b/crates/shirabe/src/repository/path_repository.rs index c29e6c0..620bff8 100644 --- a/crates/shirabe/src/repository/path_repository.rs +++ b/crates/shirabe/src/repository/path_repository.rs @@ -47,7 +47,7 @@ impl PathRepository { io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: Option<std::rc::Rc<std::cell::RefCell<HttpDownloader>>>, - dispatcher: Option<EventDispatcher>, + dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, process: Option<std::rc::Rc<std::cell::RefCell<ProcessExecutor>>>, ) -> anyhow::Result<Self> { if !repo_config.contains_key("url") { @@ -73,7 +73,7 @@ impl PathRepository { let version_guesser = VersionGuesser::new( config, std::rc::Rc::clone(&process), - shirabe_semver::version_parser::VersionParser, + VersionParser::new(), Some(io.clone_box()), ); let mut options = repo_config @@ -173,7 +173,7 @@ impl PathRepository { .unwrap_or("auto") .to_string(); if reference == "none" { - if let Some(PhpMixed::Array(ref mut dist)) = package.get_mut("dist") { + if let Some(PhpMixed::Array(dist)) = package.get_mut("dist") { dist.insert("reference".to_string(), Box::new(PhpMixed::Null)); } } else if reference == "config" || reference == "auto" { @@ -184,7 +184,7 @@ impl PathRepository { .collect(), ); let ref_hash = hash("sha1", &format!("{}{}", json, serialize(&options_mixed))); - if let Some(PhpMixed::Array(ref mut dist)) = package.get_mut("dist") { + if let Some(PhpMixed::Array(dist)) = package.get_mut("dist") { dist.insert( "reference".to_string(), Box::new(PhpMixed::String(ref_hash)), @@ -237,12 +237,12 @@ impl PathRepository { let code2 = self .process .borrow_mut() - .execute(cmd, Some(&mut ref2), None) + .execute(cmd, Some(&mut ref2), ()) .unwrap_or(1); if code1 == 0 && code2 == 0 && ref1.as_string() == ref2.as_string() { package.insert( "version".to_string(), - PhpMixed::String(self.version_guesser.get_root_version_from_env()), + PhpMixed::String(self.version_guesser.get_root_version_from_env()?), ); } } @@ -276,32 +276,33 @@ impl PathRepository { let ref_val = GitUtil::parse_rev_list_output(&output_str, &self.process) .trim() .to_string(); - if let Some(PhpMixed::Array(ref mut dist)) = package.get_mut("dist") { + if let Some(PhpMixed::Array(dist)) = package.get_mut("dist") { dist.insert("reference".to_string(), Box::new(PhpMixed::String(ref_val))); } } if !package.contains_key("version") { - let version_data = self.version_guesser.guess_version(&package, &path); + let version_data = self.version_guesser.guess_version(&package, &path)?; if let Some(version_data) = version_data { if let Some(pretty_version) = version_data - .get("pretty_version") - .and_then(|v| v.as_string()) + .pretty_version + .as_ref() .filter(|s| !s.is_empty()) - .map(|s| s.to_string()) + .cloned() { // if there is a feature branch detected, we add a second package with the feature branch version if let Some(feature_pretty_version) = version_data - .get("feature_pretty_version") - .and_then(|v| v.as_string()) + .feature_pretty_version + .as_ref() .filter(|s| !s.is_empty()) - .map(|s| s.to_string()) + .cloned() { package.insert( "version".to_string(), PhpMixed::String(feature_pretty_version), ); - self.inner.add_package(self.loader.load(package.clone())?); + self.inner + .add_package(self.loader.load(package.clone(), None)?); } package.insert("version".to_string(), PhpMixed::String(pretty_version)); @@ -320,17 +321,12 @@ impl PathRepository { } self.inner - .add_package( - self.loader - .load(package.clone()) - .map_err(|e| RuntimeException { - message: format!( - "Failed loading the package in {}", - composer_file_path - ), - code: 0, - })?, - ); + .add_package(self.loader.load(package.clone(), None).map_err(|e| { + RuntimeException { + message: format!("Failed loading the package in {}", composer_file_path), + code: 0, + } + })?); } Ok(()) diff --git a/crates/shirabe/src/repository/platform_repository.rs b/crates/shirabe/src/repository/platform_repository.rs index 64bc861..79c06fe 100644 --- a/crates/shirabe/src/repository/platform_repository.rs +++ b/crates/shirabe/src/repository/platform_repository.rs @@ -444,17 +444,18 @@ impl PlatformRepository { let mut is_fips = false; let parsed_version = Version::parse_openssl(&ssl_version, &mut is_fips) .unwrap_or_default(); + let fips_provides: Vec<String> = if is_fips { + vec!["curl-openssl".to_string()] + } else { + Vec::new() + }; self.add_library( &mut libraries, &format!("{}-openssl{}", name, if is_fips { "-fips" } else { "" }), Some(&parsed_version), Some(&format!("curl OpenSSL version ({})", parsed_version)), &[], - if is_fips { - &["curl-openssl".to_string()] - } else { - &[] - }, + &fips_provides, )?; } else { let (shortlib, ssl_lib); @@ -887,7 +888,8 @@ impl PlatformRepository { Box::new(PhpMixed::String("getUnicodeVersion".to_string())), ])], ); - let sliced = array_slice(&intl_char_versions, 0, Some(3)); + let sliced = + shirabe_php_shim::array_slice_mixed(&intl_char_versions, 0, Some(3)); let joined = implode(".", &Self::php_array_to_string_vec(&sliced)); self.add_library( &mut libraries, @@ -1605,7 +1607,12 @@ impl PlatformRepository { return Ok(()); } - let overrider = self.inner.find_package(package.get_name(), "*".to_string()); + let overrider = self.inner.find_package( + package.get_name(), + crate::repository::repository_interface::FindPackageConstraint::String( + "*".to_string(), + ), + ); let actual_text = if let Some(ref ov) = overrider { if package.get_version() == ov.get_version() { "same as actual".to_string() @@ -1670,11 +1677,13 @@ impl PlatformRepository { package.set_description("Package overridden via config.platform".to_string()); let mut extra: IndexMap<String, PhpMixed> = IndexMap::new(); extra.insert("config.platform".to_string(), PhpMixed::Bool(true)); - package.set_extra(extra); - // TODO(phase-b): CompletePackage is `Box<dyn PackageInterface>`-cloneable in PHP; - // here we add a clone for ArrayRepository but also return the original. - self.inner.add_package(Box::new(package.clone())); + package.inner.set_extra(extra); + // TODO(phase-b): CompletePackage is a PHP class (shared by ref); cannot Clone. + // The container should likely store Rc<RefCell<CompletePackage>> so both the inner + // ArrayRepository and the function caller can share ownership. + let _: () = todo!("share CompletePackage via Rc between add_package and return"); + #[allow(unreachable_code)] if package.get_name() == "php" { let parts = explode(".", package.get_version()); let head = array_slice_strs(&parts, 0, Some(3)); @@ -1696,7 +1705,7 @@ impl PlatformRepository { )); let mut extra: IndexMap<String, PhpMixed> = IndexMap::new(); extra.insert("config.platform".to_string(), PhpMixed::Bool(true)); - package.set_extra(extra); + package.inner.set_extra(extra); self.disabled_packages .insert(package.get_name().to_string(), Box::new(package)); @@ -1742,7 +1751,7 @@ impl PlatformRepository { name, extra_description.unwrap_or_default() )); - ext.set_type("php-ext".to_string()); + ext.inner.set_type("php-ext".to_string()); if name == "uuid" { let mut replaces: IndexMap<String, Link> = IndexMap::new(); @@ -1752,11 +1761,11 @@ impl PlatformRepository { "ext-uuid".to_string(), "lib-uuid".to_string(), Box::new(Constraint::new("=", &version)), - Link::TYPE_REPLACE.to_string(), + Some(Link::TYPE_REPLACE.to_string()), Some(ext.get_pretty_version().to_string()), ), ); - ext.set_replaces(replaces); + ext.inner.set_replaces(replaces); } self.add_package(Box::new(ext))?; @@ -1817,7 +1826,7 @@ impl PlatformRepository { format!("lib-{}", name), format!("lib-{}", replace_lower), Box::new(Constraint::new("=", &version)), - Link::TYPE_REPLACE.to_string(), + Some(Link::TYPE_REPLACE.to_string()), Some(lib.get_pretty_version().to_string()), ), ); @@ -1831,13 +1840,13 @@ impl PlatformRepository { format!("lib-{}", name), format!("lib-{}", provide_lower), Box::new(Constraint::new("=", &version)), - Link::TYPE_PROVIDE.to_string(), + Some(Link::TYPE_PROVIDE.to_string()), Some(lib.get_pretty_version().to_string()), ), ); } - lib.set_replaces(replace_links); - lib.set_provides(provide_links); + lib.inner.set_replaces(replace_links); + lib.inner.set_provides(provide_links); self.add_package(Box::new(lib))?; Ok(()) @@ -1872,7 +1881,7 @@ impl PlatformRepository { r#type: Option<String>, ) -> Vec<crate::repository::repository_interface::SearchResult> { // suppress vendor search as there are no vendors to match in platform packages - if mode == <dyn RepositoryInterface>::SEARCH_VENDOR { + if mode == crate::repository::repository_interface::SEARCH_VENDOR { return Vec::new(); } diff --git a/crates/shirabe/src/repository/repository_factory.rs b/crates/shirabe/src/repository/repository_factory.rs index 11e5f61..614166c 100644 --- a/crates/shirabe/src/repository/repository_factory.rs +++ b/crates/shirabe/src/repository/repository_factory.rs @@ -39,7 +39,7 @@ impl RepositoryFactory { .unwrap_or(""); if extension == "json" { - let json = JsonFile::new( + let mut json = JsonFile::new( repository.to_string(), Some(std::rc::Rc::new(std::cell::RefCell::new( Factory::create_http_downloader(io, config, IndexMap::new())?, @@ -82,7 +82,11 @@ impl RepositoryFactory { } if repository.starts_with('{') { - let repo_config = JsonFile::parse_json(repository, None)?.unwrap_or_default(); + let parsed = JsonFile::parse_json(Some(repository), None)?; + let repo_config: IndexMap<String, PhpMixed> = parsed + .as_array() + .map(|m| m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) + .unwrap_or_default(); return Ok(repo_config); } @@ -116,7 +120,7 @@ impl RepositoryFactory { owned_rm = Self::manager(io, config, None, None, None)?; &mut owned_rm }; - let mut repos = Self::create_repos( + let repos = Self::create_repos( rm, vec![PhpMixed::Array( repo_config @@ -125,20 +129,29 @@ impl RepositoryFactory { .collect(), )], )?; - Ok(repos.remove(0)) + // PHP: return current($repos); + let (_, first) = repos + .into_iter() + .next() + .ok_or_else(|| UnexpectedValueException { + message: "create_repos returned no repository".to_string(), + code: 0, + })?; + Ok(first) } pub fn default_repos( io: Option<&dyn IOInterface>, config: Option<std::rc::Rc<std::cell::RefCell<Config>>>, rm: Option<&mut RepositoryManager>, - ) -> anyhow::Result<Vec<Box<dyn RepositoryInterface>>> { + ) -> anyhow::Result<IndexMap<String, Box<dyn RepositoryInterface>>> { let config = match config { Some(c) => c, None => std::rc::Rc::new(std::cell::RefCell::new(Factory::create_config(None, None)?)), }; - if let Some(io) = io { - io.load_configuration(&mut *config.borrow_mut())?; + if let Some(_io) = io { + // TODO(phase-b): IOInterface::load_configuration requires &mut self, but this + // function takes &dyn IOInterface. Wider refactor needed; skip for now. } let mut owned_rm; @@ -163,14 +176,15 @@ impl RepositoryFactory { }; let repo_configs = config.borrow().get_repositories(); - Self::create_repos(rm, repo_configs) + // PHP: array_values($repoConfigs) — keep ordering, discard keys + Self::create_repos(rm, repo_configs.into_iter().map(|(_, v)| v).collect()) } pub fn manager( io: &dyn IOInterface, config: &std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: Option<std::rc::Rc<std::cell::RefCell<HttpDownloader>>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, process: Option<std::rc::Rc<std::cell::RefCell<ProcessExecutor>>>, ) -> anyhow::Result<RepositoryManager> { let http_downloader = match http_downloader { @@ -217,8 +231,8 @@ impl RepositoryFactory { } pub fn default_repos_with_default_manager( - io: &dyn IOInterface, - ) -> anyhow::Result<Vec<Box<dyn RepositoryInterface>>> { + io: &mut dyn IOInterface, + ) -> anyhow::Result<IndexMap<String, Box<dyn RepositoryInterface>>> { let config = std::rc::Rc::new(std::cell::RefCell::new(Factory::create_config( Some(io), None, @@ -231,7 +245,7 @@ impl RepositoryFactory { fn create_repos( rm: &mut RepositoryManager, repo_configs: Vec<PhpMixed>, - ) -> anyhow::Result<Vec<Box<dyn RepositoryInterface>>> { + ) -> anyhow::Result<IndexMap<String, Box<dyn RepositoryInterface>>> { let mut repo_map: IndexMap<String, Box<dyn RepositoryInterface>> = IndexMap::new(); for (index, repo) in repo_configs.into_iter().enumerate() { @@ -267,15 +281,22 @@ impl RepositoryFactory { Self::generate_repository_name_indexed(index, &repo_config_map, &repo_map); if repo_type == "filesystem" { - let json_path = repo_arr + let _json_path = repo_arr .get("json") .and_then(|v| v.as_string()) .unwrap_or("") .to_string(); - repo_map.insert(name, Box::new(FilesystemRepository::new(json_path)?)); + // TODO(phase-b): FilesystemRepository does not yet implement + // RepositoryInterface; once it does, construct it from JsonFile here. + let created: Box<dyn RepositoryInterface> = + todo!("FilesystemRepository as dyn RepositoryInterface"); + repo_map.insert(name, created); } else { - let created = - rm.create_repository(&repo_type, repo_config_map, &index.to_string())?; + let created = rm.create_repository( + &repo_type, + repo_config_map, + Some(&index.to_string()), + )?; repo_map.insert(name, created); } } @@ -294,7 +315,7 @@ impl RepositoryFactory { } } - Ok(repo_map.into_values().collect()) + Ok(repo_map) } pub fn generate_repository_name( @@ -305,7 +326,7 @@ impl RepositoryFactory { let mut name = match index { PhpMixed::Int(_) => { if let Some(url) = repo.get("url").and_then(|v| v.as_string()) { - Preg::replace("{^https?://}i", "", url, -1).unwrap_or_else(|_| url.to_string()) + Preg::replace("{^https?://}i", "", url).unwrap_or_else(|_| url.to_string()) } else { index.as_string().unwrap_or("").to_string() } @@ -324,7 +345,7 @@ impl RepositoryFactory { existing_repos: &IndexMap<String, Box<dyn RepositoryInterface>>, ) -> String { let mut name = if let Some(url) = repo.get("url").and_then(|v| v.as_string()) { - Preg::replace("{^https?://}i", "", url, -1).unwrap_or_else(|_| url.to_string()) + Preg::replace("{^https?://}i", "", url).unwrap_or_else(|_| url.to_string()) } else { index.to_string() }; diff --git a/crates/shirabe/src/repository/repository_interface.rs b/crates/shirabe/src/repository/repository_interface.rs index 6113997..de37b5f 100644 --- a/crates/shirabe/src/repository/repository_interface.rs +++ b/crates/shirabe/src/repository/repository_interface.rs @@ -26,11 +26,13 @@ pub struct LoadPackagesResult { pub packages: Vec<Box<dyn BasePackage>>, } +#[derive(Debug, Clone)] pub enum AbandonedInfo { Replacement(String), Abandoned, } +#[derive(Debug, Clone)] pub struct SearchResult { pub name: String, pub description: Option<String>, @@ -38,6 +40,7 @@ pub struct SearchResult { pub url: Option<String>, } +#[derive(Debug, Clone)] pub struct ProviderInfo { pub name: String, pub description: Option<String>, @@ -83,6 +86,13 @@ pub trait RepositoryInterface: Countable + std::fmt::Debug { None } + fn as_installed_repository_interface( + &self, + ) -> Option<&dyn crate::repository::installed_repository_interface::InstalledRepositoryInterface> + { + None + } + fn as_any(&self) -> &dyn std::any::Any; fn clone_box(&self) -> Box<dyn RepositoryInterface> { diff --git a/crates/shirabe/src/repository/repository_manager.rs b/crates/shirabe/src/repository/repository_manager.rs index a3c5b78..b697949 100644 --- a/crates/shirabe/src/repository/repository_manager.rs +++ b/crates/shirabe/src/repository/repository_manager.rs @@ -22,7 +22,7 @@ pub struct RepositoryManager { io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, } @@ -31,7 +31,7 @@ impl RepositoryManager { io: &dyn IOInterface, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, process: Option<std::rc::Rc<std::cell::RefCell<ProcessExecutor>>>, ) -> Self { let process = process @@ -54,8 +54,13 @@ impl RepositoryManager { constraint: &dyn ConstraintInterface, ) -> Option<Box<dyn PackageInterface>> { for repository in &self.repositories { - if let Some(package) = repository.find_package(name, constraint) { - return Some(package); + if let Some(package) = repository.find_package( + name, + crate::repository::repository_interface::FindPackageConstraint::Constraint( + constraint.clone_box(), + ), + ) { + return Some(package.clone_package_box()); } } None @@ -68,7 +73,16 @@ impl RepositoryManager { ) -> Vec<Box<dyn PackageInterface>> { let mut packages: Vec<Box<dyn PackageInterface>> = vec![]; for repository in self.get_repositories() { - packages.extend(repository.find_packages(name, constraint)); + for p in repository.find_packages( + name, + Some( + crate::repository::repository_interface::FindPackageConstraint::Constraint( + constraint.clone_box(), + ), + ), + ) { + packages.push(p.clone_package_box()); + } } packages } @@ -126,7 +140,7 @@ impl RepositoryManager { let repository = self.create_repository_by_class(&class, cleaned_config)?; if let Some(filter_config) = filter_config { - return Ok(Box::new(FilterRepository::new(repository, filter_config))); + return Ok(Box::new(FilterRepository::new(repository, filter_config)?)); } Ok(repository) diff --git a/crates/shirabe/src/repository/repository_set.rs b/crates/shirabe/src/repository/repository_set.rs index 18c3ba6..f39840b 100644 --- a/crates/shirabe/src/repository/repository_set.rs +++ b/crates/shirabe/src/repository/repository_set.rs @@ -30,7 +30,9 @@ use crate::package::complete_alias_package::CompleteAliasPackage; use crate::package::complete_package::CompletePackage; use crate::package::package_interface::PackageInterface; use crate::package::version::stability_filter::StabilityFilter; -use crate::repository::advisory_provider_interface::AdvisoryProviderInterface; +use crate::repository::advisory_provider_interface::{ + AdvisoryProviderInterface, PartialOrSecurityAdvisory, +}; use crate::repository::composite_repository::CompositeRepository; use crate::repository::installed_repository::InstalledRepository; use crate::repository::installed_repository_interface::InstalledRepositoryInterface; @@ -221,7 +223,7 @@ impl RepositorySet { let constraint_clone = constraint .as_ref() .map(|c| FindPackageConstraint::Constraint(c.clone_box())); - let found = repository.find_packages(name.to_string(), constraint_clone); + let found = repository.find_packages(name, constraint_clone); packages.push(found); } } else { @@ -367,8 +369,8 @@ impl RepositorySet { allow_partial_advisories: bool, ignore_unreachable: bool, unreachable_repos: &mut Vec<String>, - ) -> Result<IndexMap<String, Vec<PartialSecurityAdvisory>>> { - let mut repo_advisories: Vec<IndexMap<String, Vec<PartialSecurityAdvisory>>> = vec![]; + ) -> Result<IndexMap<String, Vec<PartialOrSecurityAdvisory>>> { + let mut repo_advisories: Vec<IndexMap<String, Vec<PartialOrSecurityAdvisory>>> = vec![]; for repository in &self.repositories { // TODO(phase-b): use anyhow::Result<Result<T, E>> to model PHP try/catch let attempt: Result<()> = (|| -> Result<()> { @@ -451,7 +453,7 @@ impl RepositorySet { &mut self, request: Request, io: Box<dyn IOInterface>, - event_dispatcher: Option<EventDispatcher>, + event_dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, pool_optimizer: Option<PoolOptimizer>, ignored_types: Vec<String>, allowed_types: Option<Vec<String>>, @@ -474,10 +476,7 @@ impl RepositorySet { pool_builder.set_allowed_types(allowed_types); for repo in &self.repositories { - let is_installed = repo - .as_any() - .downcast_ref::<dyn InstalledRepositoryInterface>() - .is_some() + let is_installed = repo.as_installed_repository_interface().is_some() || repo .as_any() .downcast_ref::<InstalledRepository>() @@ -494,17 +493,17 @@ impl RepositorySet { self.locked = true; - // TODO(phase-b): pass repositories by reference; pool_builder.build_pool expects &Vec<Box<dyn RepositoryInterface>> - pool_builder.build_pool(&self.repositories, &request) + // TODO(phase-b): pool_builder.build_pool takes owned Vec and &mut Request; revisit sharing model + pool_builder.build_pool( + todo!("share self.repositories"), + todo!("share request as &mut"), + ) } /// Create a pool for dependency resolution from the packages in this repository set. pub fn create_pool_with_all_packages(&mut self) -> Result<Pool> { for repo in &self.repositories { - let is_installed = repo - .as_any() - .downcast_ref::<dyn InstalledRepositoryInterface>() - .is_some() + let is_installed = repo.as_installed_repository_interface().is_some() || repo .as_any() .downcast_ref::<InstalledRepository>() @@ -643,6 +642,6 @@ impl RepositorySet { #[derive(Debug)] pub struct SecurityAdvisoriesResult { - pub advisories: IndexMap<String, Vec<PartialSecurityAdvisory>>, + pub advisories: IndexMap<String, Vec<PartialOrSecurityAdvisory>>, pub unreachable_repos: Vec<String>, } diff --git a/crates/shirabe/src/repository/vcs/forgejo_driver.rs b/crates/shirabe/src/repository/vcs/forgejo_driver.rs index 179f2db..f4a86c7 100644 --- a/crates/shirabe/src/repository/vcs/forgejo_driver.rs +++ b/crates/shirabe/src/repository/vcs/forgejo_driver.rs @@ -50,7 +50,13 @@ impl ForgejoDriver { ); self.forgejo_url = Some(forgejo_url); - self.inner.cache = Some(Cache::new(&*self.inner.io, cache_dir)); + self.inner.cache = Some(Cache::new( + self.inner.io.clone_box(), + &cache_dir, + None, + None, + false, + )); self.inner.cache.as_mut().map(|c| { c.set_read_only( self.inner @@ -321,8 +327,10 @@ impl ForgejoDriver { if !self.inner.info_cache.contains_key(identifier) { let composer = if self.inner.should_cache(identifier) { - if let Some(res) = self.inner.cache.as_ref().and_then(|c| c.read(identifier)) { - JsonFile::parse_json(&res, None)? + if let Some(res) = self.inner.cache.as_mut().and_then(|c| c.read(identifier)) { + // TODO(phase-b): JsonFile::parse_json returns PhpMixed; convert into Option<IndexMap> + let _ = JsonFile::parse_json(Some(res.as_str()), None)?; + None } else { let file_content = self.get_file_content("composer.json", identifier)?; let c = VcsDriverBase::finish_base_composer_information( @@ -332,14 +340,21 @@ impl ForgejoDriver { )?; if self.inner.should_cache(identifier) { if let Some(ref composer_map) = c { - let encoded = JsonFile::encode_with_options( - composer_map, - shirabe_php_shim::JSON_UNESCAPED_UNICODE - | shirabe_php_shim::JSON_UNESCAPED_SLASHES, + // TODO(phase-b): JsonFile::encode_with_options does not exist; use encode + let encoded = JsonFile::encode( + &PhpMixed::Array( + composer_map + .iter() + .map(|(k, v)| (k.clone(), Box::new(v.clone()))) + .collect(), + ), + (shirabe_php_shim::JSON_UNESCAPED_UNICODE + | shirabe_php_shim::JSON_UNESCAPED_SLASHES) + as i64, ); self.inner .cache - .as_ref() + .as_mut() .map(|c| c.write(identifier, &encoded)); } } @@ -394,8 +409,7 @@ impl ForgejoDriver { format!("{}/commit/{}", html_url, identifier) }; - if let Some(PhpMixed::Array(ref mut support)) = composer_map.get_mut("support") - { + if let Some(PhpMixed::Array(support)) = composer_map.get_mut("support") { support .insert("source".to_string(), Box::new(PhpMixed::String(source_url))); } @@ -419,8 +433,7 @@ impl ForgejoDriver { .map(|r| r.html_url.clone()) .unwrap_or_default() ); - if let Some(PhpMixed::Array(ref mut support)) = composer_map.get_mut("support") - { + if let Some(PhpMixed::Array(support)) = composer_map.get_mut("support") { support .insert("issues".to_string(), Box::new(PhpMixed::String(issues_url))); } diff --git a/crates/shirabe/src/repository/vcs/fossil_driver.rs b/crates/shirabe/src/repository/vcs/fossil_driver.rs index f0c3468..f773e3b 100644 --- a/crates/shirabe/src/repository/vcs/fossil_driver.rs +++ b/crates/shirabe/src/repository/vcs/fossil_driver.rs @@ -64,7 +64,7 @@ impl FossilDriver { .into()); } - let local_name = Preg::replace(r"{[^a-z0-9]}i", "-", &self.inner.url); + let local_name = Preg::replace(r"{[^a-z0-9]}i", "-", &self.inner.url)?; self.repo_file = Some(format!("{}/{}.fossil", cache_repo_dir, local_name)); self.checkout_dir = format!("{}/{}/", cache_vcs_dir, local_name); @@ -82,7 +82,7 @@ impl FossilDriver { if self.inner.process.borrow_mut().execute_args( &["fossil", "version"].map(|s| s.to_string()).to_vec(), &mut ignored_output, - None, + (), ) != 0 { return Err(RuntimeException { @@ -100,7 +100,7 @@ impl FossilDriver { pub(crate) fn update_local_repo(&mut self) -> anyhow::Result<()> { assert!(self.repo_file.is_some()); - let fs = Filesystem::new(None); + let mut fs = Filesystem::new(None); fs.ensure_directory_exists(&self.checkout_dir)?; if !is_writable(&dirname(&self.checkout_dir)) { @@ -149,10 +149,10 @@ impl FossilDriver { .map(|s| s.to_string()) .to_vec(), &mut output, - None, + (), ) != 0 { - let output = self.inner.process.borrow().get_error_output(); + let output = self.inner.process.borrow().get_error_output().to_string(); return Err(RuntimeException { message: format!( "Failed to clone {} to repository {}\n\n{}", @@ -171,7 +171,7 @@ impl FossilDriver { Some(self.checkout_dir.clone()), ) != 0 { - let output = self.inner.process.borrow().get_error_output(); + let output = self.inner.process.borrow().get_error_output().to_string(); return Err(RuntimeException { message: format!( "Failed to open repository {} in {}\n\n{}", @@ -280,7 +280,7 @@ impl FossilDriver { Some(self.checkout_dir.clone()), ); for branch in self.inner.process.borrow().split_lines(&output) { - let branch = Preg::replace(r"/^\*/", "", &branch.trim()); + let branch = Preg::replace(r"/^\*/", "", &branch.trim())?; let branch = branch.trim().to_string(); branches.insert(branch.clone(), branch); } @@ -310,7 +310,7 @@ impl FossilDriver { return false; } - let process = ProcessExecutor::new(io); + let mut process = ProcessExecutor::new(io); let mut output = String::new(); if process.execute_args( &["fossil", "info"].map(|s| s.to_string()).to_vec(), diff --git a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs index 689c0e8..a5c6ed3 100644 --- a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs +++ b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs @@ -80,7 +80,7 @@ impl GitBitbucketDriver { self.repository = m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(); self.inner.origin_url = "bitbucket.org".to_string(); self.inner.cache = Some(Cache::new( - &*self.inner.io, + self.inner.io.clone_box(), &implode( "/", &[ @@ -97,6 +97,8 @@ impl GitBitbucketDriver { ], ), None, + None, + false, )); self.inner.cache.as_mut().unwrap().set_read_only( self.inner @@ -209,7 +211,11 @@ impl GitBitbucketDriver { .and_then(|v| v.as_string()) .map(String::from); - self.repo_data = repo_data; + // TODO(phase-b): unwrap PhpMixed::Array into the typed IndexMap stored on self + self.repo_data = match repo_data { + PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }; Ok(true) } @@ -226,13 +232,20 @@ impl GitBitbucketDriver { if !self.inner.info_cache.contains_key(identifier) { let mut composer: Option<IndexMap<String, PhpMixed>> = None; if self.inner.should_cache(identifier) && { - let res = self - .inner - .cache - .as_ref() - .and_then(|c| c.read(identifier).ok().flatten()); + let res = self.inner.cache.as_mut().and_then(|c| c.read(identifier)); if let Some(res) = res { - composer = Some(JsonFile::parse_json(&res, None)?); + // TODO(phase-b): wrap parsed PhpMixed::Array into the IndexMap-shaped composer slot + composer = Some( + JsonFile::parse_json(Some(&res), None)? + .as_array() + .cloned() + .map(|m| { + m.into_iter() + .map(|(k, v)| (k, *v)) + .collect::<IndexMap<String, PhpMixed>>() + }) + .unwrap_or_default(), + ); true } else { false @@ -248,7 +261,7 @@ impl GitBitbucketDriver { )?; if self.inner.should_cache(identifier) { - self.inner.cache.as_ref().unwrap().write( + self.inner.cache.as_mut().unwrap().write( identifier, &JsonFile::encode_with_indent( &PhpMixed::Array( @@ -422,10 +435,10 @@ impl GitBitbucketDriver { ], ); - Ok(Some( - self.fetch_with_oauth_credentials(&resource, false)? - .get_body(), - )) + Ok(self + .fetch_with_oauth_credentials(&resource, false)? + .get_body() + .map(|s| s.to_string())) } /// @inheritDoc @@ -465,7 +478,8 @@ impl GitBitbucketDriver { /// @inheritDoc pub fn get_source(&self, identifier: &str) -> IndexMap<String, String> { if let Some(fallback) = self.fallback_driver.as_ref() { - return fallback.get_source(identifier); + // TODO(phase-b): trait returns Result; flatten for the inherent signature here + return fallback.get_source(identifier).unwrap_or_default(); } let mut m: IndexMap<String, String> = IndexMap::new(); @@ -481,7 +495,8 @@ impl GitBitbucketDriver { /// @inheritDoc pub fn get_dist(&self, identifier: &str) -> Option<IndexMap<String, String>> { if let Some(fallback) = self.fallback_driver.as_ref() { - return fallback.get_dist(identifier); + // TODO(phase-b): trait returns Result; flatten for the inherent signature here + return fallback.get_dist(identifier).ok().flatten(); } let url = sprintf( @@ -685,7 +700,8 @@ impl GitBitbucketDriver { None, )?; - if let Some(te) = e.downcast_ref::<TransportException>() { + { + let te = &e; let code = te.get_code(); let in_set = in_array( PhpMixed::Int(code), @@ -703,7 +719,7 @@ impl GitBitbucketDriver { if !self.inner.io.has_authentication(&self.inner.origin_url) && bitbucket_util.authorize_oauth(&self.inner.origin_url) { - return self.inner.get_contents(url); + return self.inner.get_contents(url).map_err(anyhow::Error::from); } if !self.inner.io.is_interactive() && fetching_repo_data { @@ -714,15 +730,15 @@ impl GitBitbucketDriver { .insert("url".to_string(), PhpMixed::String("dummy".to_string())); return Ok(Response::new( headers, - 200, - IndexMap::new(), - "null".to_string(), - )); + Some(200), + vec![], + Some("null".to_string()), + )??); } } } - Err(e) + Err(e.into()) } } } @@ -786,7 +802,8 @@ impl GitBitbucketDriver { r"/https:\/\/([^@]+@)?/", "https://", m.get("href").and_then(|v| v.as_string()).unwrap_or(""), - ); + ) + .unwrap_or_default(); } } } diff --git a/crates/shirabe/src/repository/vcs/git_driver.rs b/crates/shirabe/src/repository/vcs/git_driver.rs index 07836bf..7ab185f 100644 --- a/crates/shirabe/src/repository/vcs/git_driver.rs +++ b/crates/shirabe/src/repository/vcs/git_driver.rs @@ -29,6 +29,24 @@ pub struct GitDriver { } impl GitDriver { + pub fn new( + repo_config: IndexMap<String, shirabe_php_shim::PhpMixed>, + io: Box<dyn IOInterface>, + config: std::rc::Rc<std::cell::RefCell<Config>>, + http_downloader: std::rc::Rc< + std::cell::RefCell<crate::util::http_downloader::HttpDownloader>, + >, + process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, + ) -> Self { + Self { + inner: VcsDriverBase::new(repo_config, io, config, http_downloader, process), + tags: None, + branches: None, + root_identifier: None, + repo_dir: String::new(), + } + } + pub fn initialize(&mut self) -> anyhow::Result<()> { let cache_url; if Filesystem::is_local_path(&self.inner.url) { @@ -65,12 +83,16 @@ impl GitDriver { self.repo_dir = format!( "{}/{}/", cache_vcs_dir, - Preg::replace(r"{[^a-z0-9.]}i", "-", Url::sanitize(self.inner.url.clone()))? + Preg::replace( + r"{[^a-z0-9.]}i", + "-", + &Url::sanitize(self.inner.url.clone()) + )? ); GitUtil::clean_env(&self.inner.process); - let fs = Filesystem::new(None); + let mut fs = Filesystem::new(None); fs.ensure_directory_exists(&dirname(&self.repo_dir))?; if !is_writable(&dirname(&self.repo_dir)) { @@ -96,8 +118,8 @@ impl GitDriver { .into()); } - let git_util = GitUtil::new( - &*self.inner.io, + let mut git_util = GitUtil::new( + self.inner.io.clone_box(), std::rc::Rc::clone(&self.inner.config), std::rc::Rc::clone(&self.inner.process), std::rc::Rc::new(std::cell::RefCell::new(Filesystem::new(None))), @@ -113,10 +135,10 @@ impl GitDriver { } .into()); } - self.inner.io.write_error3(shirabe_php_shim::PhpMixed::String(format!( + self.inner.io.write_error3(&format!( "<error>Failed to update {}, package information from this repository may be outdated</error>", self.inner.url - )), true, io_interface::NORMAL); + ), true, io_interface::NORMAL); } cache_url = self.inner.url.clone(); @@ -134,12 +156,15 @@ impl GitDriver { .unwrap_or("") .to_string(); self.inner.cache = Some(Cache::new( - &*self.inner.io, - format!( + self.inner.io.clone_box(), + &format!( "{}/{}", cache_repo_dir, - Preg::replace(r"{[^a-z0-9.]}i", "-", Url::sanitize(cache_url))? + Preg::replace(r"{[^a-z0-9.]}i", "-", &Url::sanitize(cache_url))? ), + None, + None, + false, )); self.inner.cache.as_mut().map(|c| { c.set_read_only( @@ -159,15 +184,15 @@ impl GitDriver { if self.root_identifier.is_none() { self.root_identifier = Some("master".to_string()); - let git_util = GitUtil::new( - &*self.inner.io, + let mut git_util = GitUtil::new( + self.inner.io.clone_box(), std::rc::Rc::clone(&self.inner.config), std::rc::Rc::clone(&self.inner.process), std::rc::Rc::new(std::cell::RefCell::new(Filesystem::new(None))), ); if !Filesystem::is_local_path(&self.inner.url) { let default_branch = - git_util.get_mirror_default_branch(&self.inner.url, &self.repo_dir, false)?; + git_util.get_mirror_default_branch(&self.inner.url, &self.repo_dir, false); if let Some(branch) = default_branch { self.root_identifier = Some(branch.clone()); return Ok(branch); @@ -269,7 +294,7 @@ impl GitDriver { let command = GitUtil::build_rev_list_command( &self.inner.process, - &[ + vec![ "-n1".to_string(), "--format=%at".to_string(), identifier.to_string(), @@ -406,7 +431,11 @@ impl GitDriver { { return Ok(true); } - GitUtil::check_for_repo_ownership_error(&process.borrow().get_error_output(), &url); + GitUtil::check_for_repo_ownership_error( + &process.borrow().get_error_output(), + &url, + Some(io), + )?; } if !deep { @@ -421,7 +450,7 @@ impl GitDriver { "GitDriver::supports requires Rc<RefCell<Config>>: not yet ported" )); #[allow(unreachable_code)] - let git_util = GitUtil::new( + let mut git_util = GitUtil::new( io.clone_box(), todo!(), std::rc::Rc::clone(&process), @@ -430,7 +459,7 @@ impl GitDriver { GitUtil::clean_env(&process); let result = git_util.run_commands( - &[vec![ + vec![vec![ "git".to_string(), "ls-remote".to_string(), "--heads".to_string(), @@ -438,7 +467,9 @@ impl GitDriver { "%url%".to_string(), ]], url, - &sys_get_temp_dir(), + Some(&sys_get_temp_dir()), + false, + None, ); match result { Ok(_) => Ok(true), diff --git a/crates/shirabe/src/repository/vcs/github_driver.rs b/crates/shirabe/src/repository/vcs/github_driver.rs index 93bfcdb..17463c1 100644 --- a/crates/shirabe/src/repository/vcs/github_driver.rs +++ b/crates/shirabe/src/repository/vcs/github_driver.rs @@ -88,7 +88,7 @@ impl GitHubDriver { self.inner.origin_url = "github.com".to_string(); } self.inner.cache = Some(Cache::new( - self.inner.io.as_ref(), + self.inner.io.clone_box(), &format!( "{}/{}/{}/{}", self.inner @@ -186,7 +186,11 @@ impl GitHubDriver { pub fn get_source(&self, identifier: &str) -> IndexMap<String, PhpMixed> { if let Some(ref git_driver) = self.git_driver { - return git_driver.get_source(identifier); + return git_driver + .get_source(identifier) + .into_iter() + .map(|(k, v)| (k, PhpMixed::String(v))) + .collect(); } let url = if self.is_private { // Private GitHub repositories should be accessed using the @@ -239,17 +243,21 @@ impl GitHubDriver { && self .inner .cache - .as_ref() + .as_mut() .and_then(|c| c.read(identifier)) .is_some() { let res = self .inner .cache - .as_ref() + .as_mut() .and_then(|c| c.read(identifier)) .unwrap_or_default(); - JsonFile::parse_json(&res, None)? + // TODO(phase-b): cached payload is JSON string; parse to PhpMixed -> Option<IndexMap> + let parsed = JsonFile::parse_json(Some(&res), None)?; + parsed + .as_array() + .map(|m| m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) } else { let file_content = self.get_file_content("composer.json", identifier)?; let composer = VcsDriverBase::finish_base_composer_information( @@ -260,11 +268,17 @@ impl GitHubDriver { if self.inner.should_cache(identifier) { if let Some(ref composer_map) = composer { - self.inner.cache.as_ref().map(|c| { + let php_value: PhpMixed = PhpMixed::Array( + composer_map + .iter() + .map(|(k, v)| (k.clone(), Box::new(v.clone()))) + .collect(), + ); + self.inner.cache.as_mut().map(|c| { c.write( identifier, - &JsonFile::encode_with_options( - composer_map, + &JsonFile::encode( + &php_value, shirabe_php_shim::JSON_UNESCAPED_UNICODE | shirabe_php_shim::JSON_UNESCAPED_SLASHES, ), @@ -410,10 +424,11 @@ impl GitHubDriver { ] { let mut options: IndexMap<String, PhpMixed> = IndexMap::new(); options.insert("retry-auth-failure".to_string(), PhpMixed::Bool(false)); - let response = self.inner.http_downloader.borrow_mut().get( - file_url, - &PhpMixed::Array(options.into_iter().map(|(k, v)| (k, Box::new(v))).collect()), - ); + let response = self + .inner + .http_downloader + .borrow_mut() + .get(file_url, options); let response = match response { Ok(r) => r, Err(_) => continue, @@ -1004,7 +1019,8 @@ impl GitHubDriver { std::rc::Rc::clone(&self.inner.config), Some(std::rc::Rc::clone(&self.inner.process)), Some(std::rc::Rc::clone(&self.inner.http_downloader)), - )?; + ) + .map_err(|err| TransportException::new(err.to_string(), 0))?; match e.code { 401 | 404 => { @@ -1018,12 +1034,8 @@ impl GitHubDriver { } if !self.inner.io.is_interactive() { - self.attempt_clone_fallback(Some(&e)).map_err(|err| { - TransportException { - message: err.to_string(), - code: 0, - } - })?; + self.attempt_clone_fallback(Some(&e)) + .map_err(|err| TransportException::new(err.to_string(), 0))?; let mut req = IndexMap::new(); req.insert("url".to_string(), PhpMixed::String("dummy".to_string())); @@ -1088,12 +1100,8 @@ impl GitHubDriver { } if !self.inner.io.is_interactive() && fetching_repo_data { - self.attempt_clone_fallback(Some(&e)).map_err(|err| { - TransportException { - message: err.to_string(), - code: 0, - } - })?; + self.attempt_clone_fallback(Some(&e)) + .map_err(|err| TransportException::new(err.to_string(), 0))?; let mut req = IndexMap::new(); req.insert("url".to_string(), PhpMixed::String("dummy".to_string())); @@ -1286,7 +1294,7 @@ impl GitHubDriver { repo_config.insert("url".to_string(), PhpMixed::String(url.to_string())); let mut git_driver = GitDriver::new( repo_config, - self.inner.io.clone(), + self.inner.io.clone_box(), self.inner.config.clone(), std::rc::Rc::clone(&self.inner.http_downloader), std::rc::Rc::clone(&self.inner.process), diff --git a/crates/shirabe/src/repository/vcs/gitlab_driver.rs b/crates/shirabe/src/repository/vcs/gitlab_driver.rs index e00bbf8..3efb38c 100644 --- a/crates/shirabe/src/repository/vcs/gitlab_driver.rs +++ b/crates/shirabe/src/repository/vcs/gitlab_driver.rs @@ -183,7 +183,7 @@ impl GitLabDriver { .unwrap_or_default(); self.inner.cache = Some(Cache::new( - self.inner.io.as_ref(), + self.inner.io.clone_box(), &format!( "{}/{}/{}/{}", self.inner @@ -240,17 +240,28 @@ impl GitLabDriver { && self .inner .cache - .as_ref() + .as_mut() .and_then(|c| c.read(identifier)) .is_some() { let res = self .inner .cache - .as_ref() + .as_mut() .and_then(|c| c.read(identifier)) .unwrap_or_default(); - JsonFile::parse_json(&res, None)? + // TODO(phase-b): cached payload is wrapped to satisfy outer Option type + Some( + JsonFile::parse_json(Some(&res), None)? + .as_array() + .cloned() + .map(|m| { + m.into_iter() + .map(|(k, v)| (k, *v)) + .collect::<IndexMap<String, PhpMixed>>() + }) + .unwrap_or_default(), + ) } else { let file_content = self.get_file_content("composer.json", identifier)?; let composer = VcsDriverBase::finish_base_composer_information( @@ -261,11 +272,17 @@ impl GitLabDriver { if self.inner.should_cache(identifier) { if let Some(ref composer_map) = composer { - self.inner.cache.as_ref().map(|c| { + self.inner.cache.as_mut().map(|c| { c.write( identifier, - &JsonFile::encode_with_options( - composer_map, + &JsonFile::encode( + &PhpMixed::Array( + composer_map + .clone() + .into_iter() + .map(|(k, v)| (k, Box::new(v))) + .collect(), + ), shirabe_php_shim::JSON_UNESCAPED_UNICODE | shirabe_php_shim::JSON_UNESCAPED_SLASHES, ), @@ -281,7 +298,7 @@ impl GitLabDriver { if let Some(ref mut composer) = composer { // specials for gitlab (this data is only available if authentication is provided) if composer.contains_key("support") - && !is_array(composer.get("support").cloned().unwrap_or(PhpMixed::Null)) + && !is_array(&composer.get("support").cloned().unwrap_or(PhpMixed::Null)) { composer.insert("support".to_string(), PhpMixed::Array(IndexMap::new())); } @@ -501,7 +518,11 @@ impl GitLabDriver { pub fn get_source(&self, identifier: &str) -> IndexMap<String, PhpMixed> { if let Some(ref git_driver) = self.git_driver { - return git_driver.get_source(identifier); + return git_driver + .get_source(identifier) + .into_iter() + .map(|(k, v)| (k, PhpMixed::String(v))) + .collect(); } let mut result = IndexMap::new(); @@ -747,7 +768,7 @@ impl GitLabDriver { repo_config.insert("url".to_string(), PhpMixed::String(url.to_string())); let mut git_driver = GitDriver::new( repo_config, - self.inner.io.clone(), + self.inner.io.clone_box(), self.inner.config.clone(), std::rc::Rc::clone(&self.inner.http_downloader), std::rc::Rc::clone(&self.inner.process), @@ -766,10 +787,9 @@ impl GitLabDriver { match response_result { Ok(response) => { if fetching_repo_data { - let json = response.decode_json().map_err(|e| TransportException { - message: e.to_string(), - code: 0, - })?; + let json = response + .decode_json() + .map_err(|e| TransportException::new(e.to_string(), 0))?; let json_map = match json { PhpMixed::Array(ref m) => m.clone(), _ => IndexMap::new(), @@ -815,10 +835,7 @@ impl GitLabDriver { ); self.attempt_clone_fallback() - .map_err(|e| TransportException { - message: e.to_string(), - code: 0, - })?; + .map_err(|e| TransportException::new(e.to_string(), 0))?; let mut req = IndexMap::new(); req.insert("url".to_string(), PhpMixed::String("dummy".to_string())); @@ -841,23 +858,26 @@ impl GitLabDriver { .and_then(|v| v.as_string()) == Some("disabled") { - return Err(TransportException { - message: "The GitLab repository is disabled in the project" - .to_string(), - code: 400, - }); + return Err(TransportException::new( + "The GitLab repository is disabled in the project".to_string(), + 400, + )); } - if !empty(&json_map.get("id").cloned().unwrap_or(PhpMixed::Null)) { + if !empty( + &*json_map + .get("id") + .cloned() + .unwrap_or(Box::new(PhpMixed::Null)), + ) { self.is_private = false; } - return Err(TransportException { - message: - "GitLab API seems to not be authenticated as it did not return a default_branch" + return Err(TransportException::new( + "GitLab API seems to not be authenticated as it did not return a default_branch" .to_string(), - code: 401, - }); + 401, + )); } } @@ -869,7 +889,8 @@ impl GitLabDriver { std::rc::Rc::clone(&self.inner.config), Some(std::rc::Rc::clone(&self.inner.process)), Some(std::rc::Rc::clone(&self.inner.http_downloader)), - )?; + ) + .map_err(|err| TransportException::new(err.to_string(), 0))?; match e.code { 401 | 404 => { @@ -885,16 +906,14 @@ impl GitLabDriver { if git_lab_util.is_oauth_expired(&self.inner.origin_url) && git_lab_util .authorize_oauth_refresh(&self.scheme, &self.inner.origin_url) + .map_err(|err| TransportException::new(err.to_string(), 0))? { return self.inner.get_contents(url); } if !self.inner.io.is_interactive() { self.attempt_clone_fallback() - .map_err(|err| TransportException { - message: err.to_string(), - code: 0, - })?; + .map_err(|err| TransportException::new(err.to_string(), 0))?; let mut req = IndexMap::new(); req.insert("url".to_string(), PhpMixed::String("dummy".to_string())); @@ -935,10 +954,7 @@ impl GitLabDriver { if !self.inner.io.is_interactive() && fetching_repo_data { self.attempt_clone_fallback() - .map_err(|err| TransportException { - message: err.to_string(), - code: 0, - })?; + .map_err(|err| TransportException::new(err.to_string(), 0))?; let mut req = IndexMap::new(); req.insert("url".to_string(), PhpMixed::String("dummy".to_string())); @@ -1095,7 +1111,9 @@ impl GitLabDriver { false, ) || (port_number.is_some() && in_array( - PhpMixed::String(Preg::replace(r"{:\d+}", "", &guessed_domain)), + PhpMixed::String( + Preg::replace(r"{:\d+}", "", &guessed_domain).unwrap_or_default(), + ), configured_domains, false, )) diff --git a/crates/shirabe/src/repository/vcs/hg_driver.rs b/crates/shirabe/src/repository/vcs/hg_driver.rs index f7c0c16..eb1be8f 100644 --- a/crates/shirabe/src/repository/vcs/hg_driver.rs +++ b/crates/shirabe/src/repository/vcs/hg_driver.rs @@ -10,7 +10,7 @@ use crate::util::hg::Hg as HgUtils; use crate::util::url::Url; use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; use shirabe_php_shim::{RuntimeException, dirname, is_dir, is_writable}; #[derive(Debug)] @@ -43,10 +43,10 @@ impl HgDriver { } let sanitized = - Preg::replace(r"{[^a-z0-9]}i", "-", Url::sanitize(self.inner.url.clone())); + Preg::replace(r"{[^a-z0-9]}i", "-", &Url::sanitize(self.inner.url.clone()))?; self.repo_dir = format!("{}/{}/", cache_vcs_dir, sanitized); - let fs = Filesystem::new(None); + let mut fs = Filesystem::new(None); fs.ensure_directory_exists(&cache_vcs_dir)?; if !is_writable(&dirname(&self.repo_dir)) { @@ -84,10 +84,10 @@ impl HgDriver { Some(self.repo_dir.clone()), ) != 0 { - self.inner.io.write_error3(format!("<error>Failed to update {}, package information from this repository may be outdated ({})</error>", self.inner.url, self.inner.process.borrow().get_error_output()).into(), true, crate::io::io_interface::NORMAL); + self.inner.io.write_error3(&format!("<error>Failed to update {}, package information from this repository may be outdated ({})</error>", self.inner.url, self.inner.process.borrow().get_error_output()), true, crate::io::io_interface::NORMAL); } } else { - let fs2 = Filesystem::new(None); + let mut fs2 = Filesystem::new(None); fs2.remove_directory(&self.repo_dir)?; let repo_dir = self.repo_dir.clone(); @@ -222,10 +222,13 @@ impl HgDriver { ); for tag in self.inner.process.borrow().split_lines(&output) { if !tag.is_empty() { - if let Some(m) = Preg::match_(r"^([^\s]+)\s+\d+:(.*)$", &tag) { + let mut m: IndexMap<CaptureKey, String> = IndexMap::new(); + if Preg::match_strict_groups3(r"^([^\s]+)\s+\d+:(.*)$", &tag, Some(&mut m)) + .unwrap_or(false) + { tags.insert( - m.get("1").cloned().unwrap_or_default(), - m.get("2").cloned().unwrap_or_default(), + m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(), + m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(), ); } } @@ -251,10 +254,20 @@ impl HgDriver { ); for branch in self.inner.process.borrow().split_lines(&output) { if !branch.is_empty() { - if let Some(m) = Preg::match_(r"^([^\s]+)\s+\d+:([a-f0-9]+)", &branch) { - let name = m.get("1").cloned().unwrap_or_default(); + let mut m: IndexMap<CaptureKey, String> = IndexMap::new(); + if Preg::match_strict_groups3( + r"^([^\s]+)\s+\d+:([a-f0-9]+)", + &branch, + Some(&mut m), + ) + .unwrap_or(false) + { + let name = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); if !name.starts_with('-') { - branches.insert(name, m.get("2").cloned().unwrap_or_default()); + branches.insert( + name, + m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(), + ); } } } @@ -268,10 +281,20 @@ impl HgDriver { ); for branch in self.inner.process.borrow().split_lines(&output) { if !branch.is_empty() { - if let Some(m) = Preg::match_(r"^(?:[\s*]*)([^\s]+)\s+\d+:(.*)$", &branch) { - let name = m.get("1").cloned().unwrap_or_default(); + let mut m: IndexMap<CaptureKey, String> = IndexMap::new(); + if Preg::match_strict_groups3( + r"^(?:[\s*]*)([^\s]+)\s+\d+:(.*)$", + &branch, + Some(&mut m), + ) + .unwrap_or(false) + { + let name = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); if !name.starts_with('-') { - bookmarks.insert(name, m.get("2").cloned().unwrap_or_default()); + bookmarks.insert( + name, + m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(), + ); } } } @@ -301,7 +324,7 @@ impl HgDriver { return false; } - let process = crate::util::process_executor::ProcessExecutor::new(io); + let mut process = crate::util::process_executor::ProcessExecutor::new(io); let mut output = String::new(); if process.execute_args( &["hg", "summary"].map(|s| s.to_string()).to_vec(), @@ -317,14 +340,14 @@ impl HgDriver { return false; } - let process = crate::util::process_executor::ProcessExecutor::new(io); + let mut process = crate::util::process_executor::ProcessExecutor::new(io); let mut ignored = String::new(); let exit = process.execute_args( &["hg", "identify", "--", url] .map(|s| s.to_string()) .to_vec(), &mut ignored, - None, + (), ); exit == 0 diff --git a/crates/shirabe/src/repository/vcs/perforce_driver.rs b/crates/shirabe/src/repository/vcs/perforce_driver.rs index e3aa868..a5b0d02 100644 --- a/crates/shirabe/src/repository/vcs/perforce_driver.rs +++ b/crates/shirabe/src/repository/vcs/perforce_driver.rs @@ -44,9 +44,9 @@ impl PerforceDriver { let repo_config = self.inner.repo_config.clone(); self.init_perforce(&repo_config)?; self.perforce.as_mut().unwrap().p4_login()?; - self.perforce.as_mut().unwrap().check_stream()?; + self.perforce.as_mut().unwrap().check_stream(); self.perforce.as_mut().unwrap().write_p4_client_spec()?; - self.perforce.as_mut().unwrap().connect_client()?; + self.perforce.as_mut().unwrap().connect_client(); Ok(()) } @@ -73,21 +73,26 @@ impl PerforceDriver { let repo_dir = format!("{}/{}", cache_vcs_dir, self.depot); self.perforce = Some(Perforce::create( - repo_config, - &self.inner.url, - &repo_dir, - &self.inner.process, - self.inner.io.as_ref(), - )?); + repo_config.clone(), + self.inner.url.clone(), + repo_dir, + std::rc::Rc::clone(&self.inner.process), + self.inner.io.clone_box(), + )); Ok(()) } - pub fn get_file_content(&self, file: &str, identifier: &str) -> anyhow::Result<Option<String>> { - self.perforce - .as_ref() + pub fn get_file_content( + &mut self, + file: &str, + identifier: &str, + ) -> anyhow::Result<Option<String>> { + Ok(self + .perforce + .as_mut() .unwrap() - .get_file_content(file, identifier) + .get_file_content(file, identifier)) } pub fn get_change_date( @@ -101,12 +106,12 @@ impl PerforceDriver { &self.branch } - pub fn get_branches(&self) -> anyhow::Result<IndexMap<String, String>> { - self.perforce.as_ref().unwrap().get_branches() + pub fn get_branches(&mut self) -> anyhow::Result<IndexMap<String, String>> { + Ok(self.perforce.as_mut().unwrap().get_branches()) } - pub fn get_tags(&self) -> anyhow::Result<IndexMap<String, String>> { - self.perforce.as_ref().unwrap().get_tags() + pub fn get_tags(&mut self) -> anyhow::Result<IndexMap<String, String>> { + Ok(self.perforce.as_mut().unwrap().get_tags()) } pub fn get_dist(&self, _identifier: &str) -> Option<IndexMap<String, PhpMixed>> { @@ -130,7 +135,13 @@ impl PerforceDriver { ); source.insert( "p4user".to_string(), - PhpMixed::String(self.perforce.as_ref().unwrap().get_user().to_string()), + PhpMixed::String( + self.perforce + .as_ref() + .unwrap() + .get_user() + .unwrap_or_default(), + ), ); source } @@ -139,13 +150,13 @@ impl PerforceDriver { &self.inner.url } - pub fn has_composer_file(&self, identifier: &str) -> bool { + pub fn has_composer_file(&mut self, identifier: &str) -> bool { let path = format!("//{}/{}", self.depot, identifier); self.perforce - .as_ref() + .as_mut() .unwrap() .get_composer_information(&path) - .map_or(false, |info| !info.is_empty()) + .map_or(false, |info| info.map_or(false, |i| !i.is_empty())) } pub fn get_contents(&self, _url: &str) -> anyhow::Result<Response> { @@ -156,15 +167,15 @@ impl PerforceDriver { .into()) } - pub fn supports(io: &dyn IOInterface, config: &Config, url: &str, deep: bool) -> bool { + pub fn supports(io: &dyn IOInterface, _config: &Config, url: &str, deep: bool) -> bool { if deep || Preg::is_match(r"#\b(perforce|p4)\b#i", url).unwrap_or(false) { - return Perforce::check_server_exists(url, &ProcessExecutor::new(io)); + return Perforce::check_server_exists(url, &mut ProcessExecutor::new(io)); } false } pub fn cleanup(&mut self) -> anyhow::Result<()> { - self.perforce.as_mut().unwrap().cleanup_client_spec()?; + self.perforce.as_mut().unwrap().cleanup_client_spec(); self.perforce = None; Ok(()) } diff --git a/crates/shirabe/src/repository/vcs/svn_driver.rs b/crates/shirabe/src/repository/vcs/svn_driver.rs index 8218563..27fccc3 100644 --- a/crates/shirabe/src/repository/vcs/svn_driver.rs +++ b/crates/shirabe/src/repository/vcs/svn_driver.rs @@ -94,7 +94,7 @@ impl SvnDriver { .get("cache-repo-dir") .as_string() .unwrap_or(""), - Preg::replace(r"{[^a-z0-9.]}i", "-", Url::sanitize(self.base_url.clone())), + Preg::replace(r"{[^a-z0-9.]}i", "-", &Url::sanitize(self.base_url.clone()))?, ), None, None, @@ -137,10 +137,7 @@ impl SvnDriver { } pub(crate) fn should_cache(&self, identifier: &str) -> bool { - self.inner.cache.is_some() - && Preg::is_match(r"{@\d+$}", identifier) - .unwrap_or(false) - .unwrap_or(false) + self.inner.cache.is_some() && Preg::is_match(r"{@\d+$}", identifier).unwrap_or(false) } pub fn get_composer_information( @@ -166,11 +163,11 @@ impl SvnDriver { .write(&format!("{}.json", identifier), &res)?; } - let parsed = JsonFile::parse_json(&res, None)?; - self.inner - .info_cache - .insert(identifier.to_string(), parsed.clone()); - return Ok(parsed); + let parsed = JsonFile::parse_json(Some(res.as_str()), None)?; + // TODO(phase-b): info_cache expects Option<IndexMap<String, PhpMixed>>; + // PhpMixed → IndexMap conversion is non-trivial here. Skip insert/return. + let _ = parsed; + return Ok(None); } } @@ -473,10 +470,7 @@ impl SvnDriver { pub fn supports(io: &dyn IOInterface, _config: &Config, url: &str, deep: bool) -> bool { let url = Self::normalize_url(url); - if Preg::is_match(r"#(^svn://|^svn\+ssh://|svn\.)#i", &url) - .unwrap_or(false) - .unwrap_or(false) - { + if Preg::is_match(r"#(^svn://|^svn\+ssh://|svn\.)#i", &url).unwrap_or(false) { return true; } @@ -496,7 +490,7 @@ impl SvnDriver { url.clone(), ], &mut ignored_output, - None, + (), ); if exit == 0 { diff --git a/crates/shirabe/src/repository/vcs/vcs_driver.rs b/crates/shirabe/src/repository/vcs/vcs_driver.rs index e356a6f..45c998b 100644 --- a/crates/shirabe/src/repository/vcs/vcs_driver.rs +++ b/crates/shirabe/src/repository/vcs/vcs_driver.rs @@ -70,12 +70,21 @@ impl VcsDriverBase { } pub fn get_contents(&self, url: &str) -> anyhow::Result<Response, TransportException> { - let options = self + let options_mixed = self .repo_config .get("options") .cloned() .unwrap_or(PhpMixed::Array(IndexMap::new())); - self.http_downloader.borrow_mut().get(url, &options) + // TODO(phase-b): convert PhpMixed::Array options into IndexMap<String, PhpMixed> properly. + let options: IndexMap<String, PhpMixed> = match options_mixed { + PhpMixed::Array(a) => a.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }; + // TODO(phase-b): map anyhow::Error from HttpDownloader::get into TransportException. + self.http_downloader + .borrow_mut() + .get(url, options) + .map_err(|e| TransportException::new(e.to_string(), 0)) } // Helper for concrete drivers: produces the same value as the trait default @@ -155,9 +164,15 @@ pub trait VcsDriver: VcsDriverInterface { ) -> anyhow::Result<Option<IndexMap<String, PhpMixed>>> { if !self.info_cache().contains_key(identifier) { if self.should_cache(identifier) { - if let Some(res) = self.cache().and_then(|c| c.read(identifier)) { - let parsed = JsonFile::parse_json(&res, None)?; - self.info_cache_mut().insert(identifier.to_string(), parsed); + if let Some(res) = self.cache_mut().and_then(|c| c.read(identifier)) { + let parsed = JsonFile::parse_json(Some(&res), None)?; + // TODO(phase-b): unwrap PhpMixed::Array into IndexMap<String, PhpMixed>. + let parsed_map: Option<IndexMap<String, PhpMixed>> = match parsed { + PhpMixed::Array(a) => Some(a.into_iter().map(|(k, v)| (k, *v)).collect()), + _ => None, + }; + self.info_cache_mut() + .insert(identifier.to_string(), parsed_map); return Ok(self.info_cache().get(identifier).and_then(|v| v.clone())); } } @@ -166,11 +181,18 @@ pub trait VcsDriver: VcsDriverInterface { if self.should_cache(identifier) { if let Some(ref composer_map) = composer { - let encoded = JsonFile::encode_with_options( - composer_map, + // TODO(phase-b): use a dedicated encode-with-options helper; reuse encode for now. + let composer_mixed = PhpMixed::Array( + composer_map + .iter() + .map(|(k, v)| (k.clone(), Box::new(v.clone()))) + .collect(), + ); + let encoded = JsonFile::encode( + &composer_mixed, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES, ); - self.cache().map(|c| c.write(identifier, &encoded)); + self.cache_mut().map(|c| c.write(identifier, &encoded)); } } @@ -194,14 +216,14 @@ pub trait VcsDriver: VcsDriverInterface { }; let composer = JsonFile::parse_json( - &composer_file_content, + Some(&composer_file_content), Some(&format!("{}:composer.json", identifier)), )?; - let mut composer = match composer { - None => return Ok(None), - Some(c) if c.is_empty() => return Ok(None), - Some(c) => c, + // TODO(phase-b): unwrap PhpMixed::Array into IndexMap<String, PhpMixed>. + let mut composer: IndexMap<String, PhpMixed> = match composer { + PhpMixed::Array(a) if !a.is_empty() => a.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => return Ok(None), }; if !composer.contains_key("time") @@ -235,12 +257,21 @@ pub trait VcsDriver: VcsDriverInterface { } fn get_contents(&self, url: &str) -> anyhow::Result<Response, TransportException> { - let options = self + let options_mixed = self .repo_config() .get("options") .cloned() .unwrap_or(PhpMixed::Array(IndexMap::new())); - self.http_downloader().borrow_mut().get(url, &options) + // TODO(phase-b): convert PhpMixed::Array options into IndexMap<String, PhpMixed> properly. + let options: IndexMap<String, PhpMixed> = match options_mixed { + PhpMixed::Array(a) => a.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }; + // TODO(phase-b): map anyhow::Error from HttpDownloader::get into TransportException. + self.http_downloader() + .borrow_mut() + .get(url, options) + .map_err(|e| TransportException::new(e.to_string(), 0)) } fn cleanup(&self) {} diff --git a/crates/shirabe/src/repository/vcs_repository.rs b/crates/shirabe/src/repository/vcs_repository.rs index 1a511fd..3a33c85 100644 --- a/crates/shirabe/src/repository/vcs_repository.rs +++ b/crates/shirabe/src/repository/vcs_repository.rs @@ -25,7 +25,7 @@ use crate::repository::configurable_repository_interface::ConfigurableRepository use crate::repository::invalid_repository_exception::InvalidRepositoryException; use crate::repository::repository_interface::RepositoryInterface; use crate::repository::vcs::vcs_driver_interface::VcsDriverInterface; -use crate::repository::version_cache_interface::VersionCacheInterface; +use crate::repository::version_cache_interface::{VersionCacheInterface, VersionCacheResult}; use crate::util::http_downloader::HttpDownloader; use crate::util::platform::Platform; use crate::util::process_executor::ProcessExecutor; @@ -69,9 +69,11 @@ pub struct VcsRepository { /// @var list<string> empty_references: Vec<String>, /// @var array<'tags'|'branches', array<string, TransportException>> - version_transport_exceptions: IndexMap<String, IndexMap<String, TransportException>>, + // TODO(phase-b): TransportException is a PHP class; uses Rc<T> for shared ownership. + version_transport_exceptions: + IndexMap<String, IndexMap<String, std::rc::Rc<TransportException>>>, /// @var ?EventDispatcher (preserved for plugin events) - _dispatcher: Option<EventDispatcher>, + _dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, } impl ConfigurableRepositoryInterface for VcsRepository { @@ -88,7 +90,7 @@ impl VcsRepository { io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, - dispatcher: Option<EventDispatcher>, + dispatcher: Option<std::rc::Rc<std::cell::RefCell<EventDispatcher>>>, process: Option<std::rc::Rc<std::cell::RefCell<ProcessExecutor>>>, drivers: Option<IndexMap<String, String>>, version_cache: Option<Box<dyn VersionCacheInterface>>, @@ -156,7 +158,7 @@ impl VcsRepository { let is_very_verbose = io.is_very_verbose(); let process_executor = process.unwrap_or_else(|| { std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(Some( - Box::new(&*io), + io.clone_box(), )))) }); @@ -185,24 +187,28 @@ impl VcsRepository { } pub fn get_repo_name(&mut self) -> String { - let driver = self.get_driver().expect("driver should be available"); + // Ensure the driver is initialized; we do not need a handle here. + let _ = self.get_driver().expect("driver should be available"); let driver_class = get_class(&PhpMixed::Null); // TODO(phase-b): obtain runtime class name of $driver + let drivers_snapshot: IndexMap<String, Box<PhpMixed>> = self + .drivers + .iter() + .map(|(k, v)| (k.clone(), Box::new(PhpMixed::String(v.clone())))) + .collect(); let driver_type = array_search_mixed( &PhpMixed::String(driver_class.clone()), - &PhpMixed::Array( - self.drivers - .iter() - .map(|(k, v)| (k.clone(), Box::new(PhpMixed::String(v.clone())))) - .collect(), - ), + &PhpMixed::Array(drivers_snapshot), false, ) .map(|v| v.as_string().unwrap_or("").to_string()) .filter(|s| !s.is_empty()) .unwrap_or(driver_class); - let _ = driver; - format!("vcs repo ({} {})", driver_type, Url::sanitize(&self.url)) + format!( + "vcs repo ({} {})", + driver_type, + Url::sanitize(self.url.clone()) + ) } pub fn get_repo_config(&self) -> &IndexMap<String, PhpMixed> { @@ -270,7 +276,7 @@ impl VcsRepository { /// @return array<'tags'|'branches', array<string, TransportException>> pub fn get_version_transport_exceptions( &self, - ) -> &IndexMap<String, IndexMap<String, TransportException>> { + ) -> &IndexMap<String, IndexMap<String, std::rc::Rc<TransportException>>> { &self.version_transport_exceptions } @@ -378,13 +384,19 @@ impl VcsRepository { is_very_verbose, false, )?; - if let CachedPackageResult::Package(pkg) = cached_package { - self.inner.add_package(pkg)?; - continue; - } - if matches!(cached_package, CachedPackageResult::Missing) { - self.empty_references.push(identifier.clone()); - continue; + match cached_package { + CachedPackageResult::Package(pkg) => { + // TODO(phase-b): trait upcast Box<dyn BasePackage> -> Box<dyn PackageInterface> + let pkg_pi: Box<dyn crate::package::package_interface::PackageInterface> = + pkg.clone_package_box(); + self.inner.add_package(pkg_pi)?; + continue; + } + CachedPackageResult::Missing => { + self.empty_references.push(identifier.clone()); + continue; + } + CachedPackageResult::None => {} } let parsed_tag = self.validate_tag(&tag); @@ -402,16 +414,12 @@ impl VcsRepository { if is_very_verbose { self.io.write_error(&msg); } else if is_verbose { - self.io.overwrite_error( - PhpMixed::String(msg.clone()), - false, - None, - io_interface::NORMAL, - ); + self.io + .overwrite_error4(&msg, false, None, io_interface::NORMAL); } let result: Result<()> = (|| -> Result<()> { - let driver = self.driver.as_mut().unwrap(); + let driver = self.driver.as_ref().unwrap(); let data_opt = driver.get_composer_information(&identifier)?; if data_opt.is_none() { if is_very_verbose { @@ -455,7 +463,7 @@ impl VcsRepository { data.get("version") .and_then(|v| v.as_string()) .unwrap_or(""), - )), + )?), ); data.insert( "version_normalized".to_string(), @@ -465,7 +473,7 @@ impl VcsRepository { data.get("version_normalized") .and_then(|v| v.as_string()) .unwrap_or(""), - )), + )?), ); // make sure tag do not contain the default-branch marker @@ -507,7 +515,9 @@ impl VcsRepository { }); if let Some(existing_package) = self.inner.find_package( &tag_package_name, - Box::new(Constraint::new("=", &version_normalized)), + crate::repository::repository_interface::FindPackageConstraint::Constraint( + Box::new(Constraint::new("=", &version_normalized)), + ), ) { if is_very_verbose { self.io.write_error(&format!( @@ -523,18 +533,26 @@ impl VcsRepository { .write_error(&format!("Importing tag {} ({})", tag, version_normalized)); } - let driver = self.driver.as_mut().unwrap(); + let driver = self.driver.as_ref().unwrap(); let processed = self.pre_process(&**driver, data, &identifier)?; let loaded = self.loader.as_ref().unwrap().load(processed, None)?; - self.inner.add_package(Box::new(loaded))?; + // TODO(phase-b): trait upcast Box<dyn BasePackage> -> Box<dyn PackageInterface> + let loaded_pi: Box<dyn crate::package::package_interface::PackageInterface> = + loaded.clone_package_box(); + self.inner.add_package(loaded_pi)?; Ok(()) })(); if let Err(e) = result { if let Some(te) = e.downcast_ref::<TransportException>() { + // TODO(phase-b): TransportException is a PHP class (shared by ref). We only + // have &TransportException from downcast_ref; obtaining the Rc requires the + // anyhow::Error chain to carry an Rc. For now we insert a todo!() placeholder. + let shared_te: std::rc::Rc<TransportException> = + todo!("share TransportException via Rc through anyhow::Error chain"); self.version_transport_exceptions .entry("tags".to_string()) .or_insert_with(IndexMap::new) - .insert(tag.clone(), te.clone()); + .insert(tag.clone(), shared_te); if te.get_code() == 404 { self.empty_references.push(identifier.clone()); } @@ -561,12 +579,8 @@ impl VcsRepository { } if !is_very_verbose { - self.io.overwrite_error( - PhpMixed::String(String::new()), - false, - None, - io_interface::NORMAL, - ); + self.io + .overwrite_error4("", false, None, io_interface::NORMAL); } let mut branches = self.driver.as_mut().unwrap().get_branches()?; @@ -597,12 +611,8 @@ impl VcsRepository { if is_very_verbose { self.io.write_error(&msg); } else if is_verbose { - self.io.overwrite_error( - PhpMixed::String(msg.clone()), - false, - None, - io_interface::NORMAL, - ); + self.io + .overwrite_error4(&msg, false, None, io_interface::NORMAL); } let parsed_branch_opt = self.validate_branch(&branch); @@ -633,7 +643,7 @@ impl VcsRepository { version = format!( "{}{}", prefix, - Preg::replace(r"{(\.9{7})+}", ".x", &parsed_branch) + Preg::replace(r"{(\.9{7})+}", ".x", &parsed_branch)? ); } @@ -645,17 +655,23 @@ impl VcsRepository { is_very_verbose, is_default_branch, )?; - if let CachedPackageResult::Package(pkg) = cached_package { - self.inner.add_package(pkg)?; - continue; - } - if matches!(cached_package, CachedPackageResult::Missing) { - self.empty_references.push(identifier.clone()); - continue; + match cached_package { + CachedPackageResult::Package(pkg) => { + // TODO(phase-b): trait upcast Box<dyn BasePackage> -> Box<dyn PackageInterface> + let pkg_pi: Box<dyn crate::package::package_interface::PackageInterface> = + pkg.clone_package_box(); + self.inner.add_package(pkg_pi)?; + continue; + } + CachedPackageResult::Missing => { + self.empty_references.push(identifier.clone()); + continue; + } + CachedPackageResult::None => {} } let result: Result<()> = (|| -> Result<()> { - let driver = self.driver.as_mut().unwrap(); + let driver = self.driver.as_ref().unwrap(); let data_opt = driver.get_composer_information(&identifier)?; if data_opt.is_none() { if is_very_verbose { @@ -707,18 +723,22 @@ impl VcsRepository { ); } } - // TODO(phase-b): Box<dyn BasePackage> -> Box<dyn PackageInterface> coercion - self.inner.add_package( - <dyn crate::package::package_interface::PackageInterface>::clone_box(&*package), - )?; + // TODO(phase-b): trait upcast Box<dyn BasePackage> -> Box<dyn PackageInterface> + let package_pi: Box<dyn crate::package::package_interface::PackageInterface> = + package.clone_package_box(); + self.inner.add_package(package_pi)?; Ok(()) })(); if let Err(e) = result { if let Some(te) = e.downcast_ref::<TransportException>() { + // TODO(phase-b): TransportException is a PHP class (shared by ref). + // See the matching tags block above; same Rc story applies. + let shared_te: std::rc::Rc<TransportException> = + todo!("share TransportException via Rc through anyhow::Error chain"); self.version_transport_exceptions .entry("branches".to_string()) .or_insert_with(IndexMap::new) - .insert(branch.clone(), te.clone()); + .insert(branch.clone(), shared_te); if te.get_code() == 404 { self.empty_references.push(identifier.clone()); } @@ -746,12 +766,8 @@ impl VcsRepository { self.driver.as_mut().unwrap().cleanup()?; if !is_very_verbose { - self.io.overwrite_error( - PhpMixed::String(String::new()), - false, - None, - io_interface::NORMAL, - ); + self.io + .overwrite_error4("", false, None, io_interface::NORMAL); } if self.inner.get_packages().is_empty() { @@ -794,7 +810,7 @@ impl VcsRepository { ); if !data.contains_key("dist") { - let dist = driver.get_dist(identifier); + let dist = driver.get_dist(identifier)?; data.insert( "dist".to_string(), match dist { @@ -808,7 +824,7 @@ impl VcsRepository { ); } if !data.contains_key("source") { - let source = driver.get_source(identifier); + let source = driver.get_source(identifier)?; data.insert( "source".to_string(), PhpMixed::Array( @@ -914,12 +930,8 @@ impl VcsRepository { if is_very_verbose { self.io.write_error(&msg); } else if is_verbose { - self.io.overwrite_error( - PhpMixed::String(msg.clone()), - false, - None, - io_interface::NORMAL, - ); + self.io + .overwrite_error4(&msg, false, None, io_interface::NORMAL); } data.shift_remove("default-branch"); @@ -937,10 +949,12 @@ impl VcsRepository { .and_then(|v| v.as_string()) .unwrap_or("") .to_string(); - if let Some(existing_package) = self - .inner - .find_package(&name, Box::new(Constraint::new("=", &version_normalized))) - { + if let Some(existing_package) = self.inner.find_package( + &name, + crate::repository::repository_interface::FindPackageConstraint::Constraint( + Box::new(Constraint::new("=", &version_normalized)), + ), + ) { if is_very_verbose { self.io.write_error(&format!( "<warning>Skipped cached version {}, it conflicts with an another tag ({}) as both resolve to {} internally</warning>", @@ -978,10 +992,3 @@ enum CachedPackageResult { Missing, Package(Box<dyn BasePackage>), } - -#[derive(Debug)] -enum VersionCacheResult { - None, - Missing, - Package(IndexMap<String, PhpMixed>), -} diff --git a/crates/shirabe/src/repository/version_cache_interface.rs b/crates/shirabe/src/repository/version_cache_interface.rs index 6dfeec0..65e5195 100644 --- a/crates/shirabe/src/repository/version_cache_interface.rs +++ b/crates/shirabe/src/repository/version_cache_interface.rs @@ -1,7 +1,22 @@ //! ref: composer/src/Composer/Repository/VersionCacheInterface.php +use indexmap::IndexMap; +use shirabe_php_shim::PhpMixed; + +/// Result of looking up a cached package version. +/// +/// PHP's `getVersionPackage(...)` returns either an array (the package data), +/// `null` (cache miss), or `false` (cached absence). We model that as an enum. +#[derive(Debug)] +pub enum VersionCacheResult { + /// Cache miss (PHP `null`). + None, + /// Cached absence (PHP `false`). + Missing, + /// Cached package data (PHP `array`). + Package(IndexMap<String, PhpMixed>), +} + pub trait VersionCacheInterface: std::fmt::Debug { - // No class implementing this interface exists in Composer's codebase; a plugin may provide - // one, but plugin support is not yet decided. Using () as a placeholder until then. - fn get_version_package(&self, version: &str, identifier: &str) -> (); + fn get_version_package(&self, version: &str, identifier: &str) -> VersionCacheResult; } diff --git a/crates/shirabe/src/util/auth_helper.rs b/crates/shirabe/src/util/auth_helper.rs index 43e13ea..1bbe7dc 100644 --- a/crates/shirabe/src/util/auth_helper.rs +++ b/crates/shirabe/src/util/auth_helper.rs @@ -54,8 +54,8 @@ impl AuthHelper { pub fn store_auth(&self, origin: &str, store_auth: StoreAuth) -> Result<()> { // TODO(phase-b): config.get_auth_config_source() and ConfigSource methods are stubs let mut store: Option<()> = None; - let config = self.config.borrow(); - let config_source = config.get_auth_config_source(); + let mut config = self.config.borrow_mut(); + let config_source = config.get_auth_config_source_mut(); if matches!(store_auth, StoreAuth::Bool(true)) { store = Some(()); } else if matches!(store_auth, StoreAuth::Prompt) { diff --git a/crates/shirabe/src/util/bitbucket.rs b/crates/shirabe/src/util/bitbucket.rs index cd4a9fa..ef1d4bf 100644 --- a/crates/shirabe/src/util/bitbucket.rs +++ b/crates/shirabe/src/util/bitbucket.rs @@ -5,7 +5,6 @@ use indexmap::IndexMap; use shirabe_php_shim::{LogicException, PhpMixed, time}; use crate::config::Config; -use crate::config::config_source_interface::ConfigSourceInterface; use crate::downloader::transport_exception::TransportException; use crate::factory::Factory; use crate::io::io_interface::IOInterface; @@ -83,7 +82,7 @@ impl Bitbucket { .execute( PhpMixed::from(vec!["git", "config", "bitbucket.accesstoken"]), Some(&mut output), - None, + (), ) .unwrap_or(1) == 0 @@ -212,17 +211,21 @@ impl Bitbucket { self.io.write_error3(msg, true, io_interface::NORMAL); } - let config_ref = self.config.borrow(); - let local_auth_config = config_ref.get_local_auth_config_source(); + let local_auth_config_name: Option<String> = self + .config + .borrow() + .get_local_auth_config_source() + .map(|c| c.get_name()); + let has_local_auth_config = local_auth_config_name.is_some(); + let auth_config_source_name = self.config.borrow().get_auth_config_source().get_name(); let url = "https://support.atlassian.com/bitbucket-cloud/docs/use-oauth-on-bitbucket-cloud/"; self.io .write_error3("Follow the instructions here:", true, io_interface::NORMAL); self.io.write_error3(url, true, io_interface::NORMAL); - let auth_config_source_name = config_ref.get_auth_config_source().get_name(); - let local_name_prefix = local_auth_config + let local_name_prefix = local_auth_config_name .as_ref() - .map(|c| format!("{} OR ", c.get_name())) + .map(|name| format!("{} OR ", name)) .unwrap_or_default(); self.io.write_error3( &format!( @@ -239,7 +242,7 @@ impl Bitbucket { ); let mut store_in_local_auth_config = false; - if local_auth_config.is_some() { + if has_local_auth_config { store_in_local_auth_config = self.io.ask_confirmation( "A local auth config source was found, do you want to store the token there?" .to_string(), @@ -299,34 +302,14 @@ impl Bitbucket { return Ok(false); } - let use_local = store_in_local_auth_config - && self - .config - .borrow() - .get_local_auth_config_source() - .is_some(); - if use_local { - let mut auth_config_source = - self.config.borrow().get_local_auth_config_source().unwrap(); - self.store_in_auth_config( - &mut *auth_config_source, - origin_url, - &consumer_key, - &consumer_secret, - )?; - } else { - let mut auth_config_source = self.config.borrow().get_auth_config_source(); - self.store_in_auth_config( - &mut *auth_config_source, - origin_url, - &consumer_key, - &consumer_secret, - )?; - } + // TODO(phase-b): PHP $authConfigSource parameter is unused inside storeInAuthConfig + // (upstream Composer bug); the dispatch on local vs. global is dropped here too. + let _ = store_in_local_auth_config; + self.store_in_auth_config(origin_url, &consumer_key, &consumer_secret)?; self.config - .borrow() - .get_auth_config_source() + .borrow_mut() + .get_auth_config_source_mut() .remove_config_setting(&format!("http-basic.{}", origin_url))?; self.io.write_error3( @@ -364,29 +347,9 @@ impl Bitbucket { return Ok(String::new()); } - let use_local = self - .config - .borrow() - .get_local_auth_config_source() - .is_some(); - if use_local { - let mut auth_config_source = - self.config.borrow().get_local_auth_config_source().unwrap(); - self.store_in_auth_config( - &mut *auth_config_source, - origin_url, - consumer_key, - consumer_secret, - )?; - } else { - let mut auth_config_source = self.config.borrow().get_auth_config_source(); - self.store_in_auth_config( - &mut *auth_config_source, - origin_url, - consumer_key, - consumer_secret, - )?; - } + // TODO(phase-b): PHP $authConfigSource parameter is unused inside storeInAuthConfig + // (upstream Composer bug); the dispatch on local vs. global is dropped here too. + self.store_in_auth_config(origin_url, consumer_key, consumer_secret)?; let access_token = self .token @@ -405,16 +368,16 @@ impl Bitbucket { } } + // TODO(phase-b): PHP $authConfigSource parameter dropped — unused in upstream Composer too. fn store_in_auth_config( &mut self, - auth_config_source: &mut dyn ConfigSourceInterface, origin_url: &str, consumer_key: &str, consumer_secret: &str, ) -> anyhow::Result<()> { self.config - .borrow() - .get_config_source() + .borrow_mut() + .get_config_source_mut() .remove_config_setting(&format!("bitbucket-oauth.{}", origin_url))?; let token = self.token.as_ref().ok_or_else(|| LogicException { @@ -460,8 +423,8 @@ impl Bitbucket { ); self.config - .borrow() - .get_auth_config_source() + .borrow_mut() + .get_auth_config_source_mut() .add_config_setting( &format!("bitbucket-oauth.{}", origin_url), PhpMixed::Array(consumer), diff --git a/crates/shirabe/src/util/config_validator.rs b/crates/shirabe/src/util/config_validator.rs index 66fcadb..4e99da0 100644 --- a/crates/shirabe/src/util/config_validator.rs +++ b/crates/shirabe/src/util/config_validator.rs @@ -40,13 +40,16 @@ impl ConfigValidator { let mut manifest: Option<IndexMap<String, PhpMixed>> = None; // TODO(phase-b): io type mismatch (&dyn IOInterface vs Box<dyn IOInterface>) - let json = + let mut json = JsonFile::new(file.to_string(), None, None).expect("config file path is always local"); let schema_result: anyhow::Result<()> = (|| -> anyhow::Result<()> { - manifest = Some(json.read()?); - json.validate_schema(Some(JsonFile::LAX_SCHEMA))?; + manifest = Some(match json.read()? { + PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }); + json.validate_schema(JsonFile::LAX_SCHEMA, None)?; lax_valid = true; - json.validate_schema(None)?; + json.validate_schema(JsonFile::STRICT_SCHEMA, None)?; Ok(()) })(); @@ -126,7 +129,12 @@ impl ConfigValidator { for license in &licenses { let spdx_license = license_validator.get_license_by_identifier(license); if let Some(spdx_license) = spdx_license { - if spdx_license[3] { + // PHP: $spdxLicense[3] — fourth element is the deprecated flag. + let is_deprecated = match &spdx_license { + PhpMixed::List(l) => l.get(3).and_then(|v| v.as_bool()).unwrap_or(false), + _ => false, + }; + if is_deprecated { if Preg::is_match(r"{^[AL]?GPL-[123](\.[01])?\+$}i", license) .unwrap_or(false) { @@ -163,7 +171,8 @@ impl ConfigValidator { r"{(?:([a-z])([A-Z])|([A-Z])([A-Z][a-z]))}", r"\1\3-\2\4", name, - ); + ) + .unwrap_or_else(|_| name.clone()); let suggest_name = suggest_name.to_lowercase(); publish_errors.push(format!( @@ -289,8 +298,8 @@ impl ConfigValidator { } } - let loader = ValidatingArrayLoader::new( - ArrayLoader::new(), + let mut loader = ValidatingArrayLoader::new( + Box::new(ArrayLoader::new(None, true)), true, None, array_loader_validation_flags, @@ -305,7 +314,11 @@ impl ConfigValidator { PhpMixed::String("dummy/dummy".to_string()), ); } - match loader.load(manifest_for_load) { + let manifest_boxed: IndexMap<String, Box<PhpMixed>> = manifest_for_load + .into_iter() + .map(|(k, v)| (k, Box::new(v))) + .collect(); + match loader.load(manifest_boxed, "Composer\\Package\\CompletePackage") { Ok(_) => {} Err(e) => { if let Some(invalid_e) = e.downcast_ref::<InvalidPackageException>() { diff --git a/crates/shirabe/src/util/filesystem.rs b/crates/shirabe/src/util/filesystem.rs index 2ab08da..e51c1e2 100644 --- a/crates/shirabe/src/util/filesystem.rs +++ b/crates/shirabe/src/util/filesystem.rs @@ -6,13 +6,13 @@ use shirabe_external_packages::symfony::component::filesystem::exception::io_exc use shirabe_external_packages::symfony::component::finder::finder::Finder; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, ErrorException, InvalidArgumentException, LogicException, PhpMixed, - RuntimeException, UnexpectedValueException, array_pop, basename, chdir, clearstatcache, copy, - count, dirname, end, error_get_last, explode, fclose, feof, file_exists, file_get_contents, - file_put_contents, fileatime, filemtime, filesize, fopen, fread, function_exists, fwrite, - implode, is_array, is_dir, is_file, is_link, is_readable, lstat, mkdir, react_promise_resolve, - rename, rmdir, rtrim, sprintf, str_contains, str_repeat, str_replace, str_starts_with, strlen, - strpos, strtolower, strtoupper, strtr, substr, substr_count, symlink, touch, unlink, usleep, - var_export, + RuntimeException, UnexpectedValueException, array_pop, basename, chdir, clearstatcache, + clearstatcache2, copy, count, dirname, end, error_get_last, explode, fclose, feof, file_exists, + file_get_contents, file_put_contents, fileatime, filemtime, filesize, fopen, fread, + function_exists, fwrite, implode, is_array, is_dir, is_file, is_link, is_readable, lstat, + mkdir, react_promise_resolve, rename, rmdir, rtrim, sprintf, str_contains, str_repeat, + str_replace, str_starts_with, strlen, strpos, strtolower, strtoupper, strtr, substr, + substr_count, symlink, touch, unlink, usleep, var_export, }; use crate::util::platform::Platform; @@ -45,13 +45,14 @@ impl Filesystem { /// Checks if a directory is empty pub fn is_dir_empty(&self, dir: &str) -> bool { - let finder = Finder::create() + let mut finder = Finder::create(); + finder .ignore_vcs(false) .ignore_dot_files(false) .depth(0) .r#in(dir); - count(&finder) == 0 + finder.len() == 0 } pub fn empty_directory( @@ -68,14 +69,15 @@ impl Filesystem { } if is_dir(dir) { - let finder = Finder::create() + let mut finder = Finder::create(); + finder .ignore_vcs(false) .ignore_dot_files(false) .depth(0) .r#in(dir); - for path in &finder { - self.remove(&path.to_string())?; + for path in finder.iter() { + self.remove(&path.get_pathname())?; } } Ok(()) @@ -102,11 +104,23 @@ impl Filesystem { vec!["rm".to_string(), "-rf".to_string(), directory.to_string()] }; - let mut output = String::new(); - let result = self.get_process().execute(&cmd, &mut output) == 0; + let mut output = PhpMixed::Null; + let result = self + .get_process() + .execute( + PhpMixed::List( + cmd.iter() + .map(|s| Box::new(PhpMixed::String(s.clone()))) + .collect(), + ), + Some(&mut output), + (), + ) + .map(|n| n == 0) + .unwrap_or(false); // clear stat cache because external processes aren't tracked by the php stat cache - clearstatcache(false, ""); + clearstatcache2(false, ""); if result && !is_dir(directory) { return Ok(true); @@ -125,7 +139,9 @@ impl Filesystem { ) -> anyhow::Result<Box<dyn PromiseInterface>> { let edge_case_result = self.remove_edge_cases(directory, true)?; if let Some(r) = edge_case_result { - return Ok(react_promise_resolve(PhpMixed::Bool(r))); + return Ok(shirabe_external_packages::react::promise::resolve(Some( + PhpMixed::Bool(r), + ))); } let cmd: Vec<String> = if Platform::is_windows() { @@ -139,34 +155,40 @@ impl Filesystem { vec!["rm".to_string(), "-rf".to_string(), directory.to_string()] }; - let promise = self.get_process().execute_async(&cmd); + let promise = self.get_process().execute_async( + PhpMixed::List( + cmd.iter() + .map(|s| Box::new(PhpMixed::String(s.clone()))) + .collect(), + ), + (), + )?; let directory_owned = directory.to_string(); // TODO(plugin): closure capture of $this in PHP — port wires the same logic via a callback handle. - Ok(promise.then(Box::new( - move |process: PhpMixed| -> Box<dyn PromiseInterface> { - // clear stat cache because external processes aren't tracked by the php stat cache - clearstatcache(false, ""); + Ok(promise.then_boxed( + Some(Box::new( + move |process: PhpMixed| -> Box<dyn PromiseInterface> { + // clear stat cache because external processes aren't tracked by the php stat cache + clearstatcache2(false, ""); - let is_successful = process - .as_object() - .map(|o| { - o.call_method("isSuccessful", &[]) - .as_bool() - .unwrap_or(false) - }) - .unwrap_or(false); - if is_successful && !is_dir(&directory_owned) { - return react_promise_resolve(PhpMixed::Bool(true)); - } + // TODO(phase-b): ArrayObject has no call_method; PHP-side calls $process->isSuccessful(). + let is_successful = matches!(process, PhpMixed::Bool(true)); + if is_successful && !is_dir(&directory_owned) { + return shirabe_external_packages::react::promise::resolve(Some( + PhpMixed::Bool(true), + )); + } - // PHP: \React\Promise\resolve($this->removeDirectoryPhp($directory)) - // The recursive PHP call doesn't have a clean async equivalent; we resort to a sync call. - let mut fs = Filesystem::new(None); - let res = fs.remove_directory_php(&directory_owned).unwrap_or(false); - react_promise_resolve(PhpMixed::Bool(res)) - }, - ))) + // PHP: \React\Promise\resolve($this->removeDirectoryPhp($directory)) + // The recursive PHP call doesn't have a clean async equivalent; we resort to a sync call. + let mut fs = Filesystem::new(None); + let res = fs.remove_directory_php(&directory_owned).unwrap_or(false); + shirabe_external_packages::react::promise::resolve(Some(PhpMixed::Bool(res))) + }, + )), + None, + )) } /// Returns null when no edge case was hit. Otherwise a bool whether removal was successful @@ -218,24 +240,10 @@ impl Filesystem { } // PHP: $it = new RecursiveDirectoryIterator($directory, RecursiveDirectoryIterator::SKIP_DOTS); - let mut it_result = + // TODO(phase-b): PHP throws UnexpectedValueException on iterator creation failure; + // shim signature does not yet model this. Skipping the retry/clearstatcache branch. + let it = shirabe_php_shim::recursive_directory_iterator(directory, shirabe_php_shim::SKIP_DOTS); - if let Err(e) = &it_result { - if e.downcast_ref::<UnexpectedValueException>().is_some() { - // re-try once after clearing the stat cache if it failed as it - // sometimes fails without apparent reason, see https://github.com/composer/composer/issues/4009 - clearstatcache(false, ""); - usleep(100000); - if !is_dir(directory) { - return Ok(true); - } - it_result = shirabe_php_shim::recursive_directory_iterator( - directory, - shirabe_php_shim::SKIP_DOTS, - ); - } - } - let it = it_result?; let ri = shirabe_php_shim::recursive_iterator_iterator(it, shirabe_php_shim::CHILD_FIRST); for file in &ri { @@ -268,7 +276,8 @@ impl Filesystem { "Could not delete symbolic link {}: {}", directory, error_get_last() - .get("message") + .as_ref() + .and_then(|m| m.get("message")) .and_then(|v| v.as_string()) .unwrap_or("") ), @@ -283,7 +292,8 @@ impl Filesystem { "{} does not exist and could not be created: {}", directory, error_get_last() - .get("message") + .as_ref() + .and_then(|m| m.get("message")) .and_then(|v| v.as_string()) .unwrap_or("") ), @@ -324,7 +334,8 @@ impl Filesystem { "Could not delete {}: {}", path, error - .get("message") + .as_ref() + .and_then(|m| m.get("message")) .and_then(|v| v.as_string()) .unwrap_or("") ); @@ -355,7 +366,8 @@ impl Filesystem { "Could not delete {}: {}", path, error - .get("message") + .as_ref() + .and_then(|m| m.get("message")) .and_then(|v| v.as_string()) .unwrap_or("") ); @@ -397,9 +409,9 @@ impl Filesystem { match result { Ok(b) => return Ok(b), Err(payload) => { - let e = match payload.downcast_ref::<ErrorException>() { - Some(e) => e.clone(), - None => return Err(anyhow::anyhow!("Copy panicked")), + let e: ErrorException = match payload.downcast::<ErrorException>() { + Ok(boxed) => *boxed, + Err(_) => return Err(anyhow::anyhow!("Copy panicked")), }; // if copy fails we attempt to copy it manually as this can help bypass issues with VirtualBox shared folders @@ -410,15 +422,15 @@ impl Filesystem { if source_handle.is_none() || target_handle.is_none() { return Err(e.into()); } - let source_handle = source_handle.unwrap(); - let target_handle = target_handle.unwrap(); - while !feof(&source_handle) { - if !fwrite(&target_handle, &fread(&source_handle, 1024 * 1024)) { - return Err(e.into()); - } + while !feof(source_handle.clone()) { + let chunk = + fread(source_handle.clone(), 1024 * 1024).unwrap_or_default(); + // TODO(phase-b): PHP fwrite returns int|false; shim currently returns (); + // assume success here. + fwrite(target_handle.clone(), &chunk, chunk.len() as i64); } - fclose(&source_handle); - fclose(&target_handle); + fclose(source_handle); + fclose(target_handle); return Ok(true); } @@ -428,7 +440,7 @@ impl Filesystem { } let it = - shirabe_php_shim::recursive_directory_iterator(source, shirabe_php_shim::SKIP_DOTS)?; + shirabe_php_shim::recursive_directory_iterator(source, shirabe_php_shim::SKIP_DOTS); let ri = shirabe_php_shim::recursive_iterator_iterator(it, shirabe_php_shim::SELF_FIRST); self.ensure_directory_exists(&target)?; @@ -457,8 +469,8 @@ impl Filesystem { if Platform::is_windows() { // Try to copy & delete - this is a workaround for random "Access denied" errors. let mut output = String::new(); - let result = self.get_process().execute( - &vec![ + let result = self.get_process().execute_args( + &[ "xcopy".to_string(), source.to_string(), target.to_string(), @@ -468,10 +480,11 @@ impl Filesystem { "/Y".to_string(), ], &mut output, + (), ); // clear stat cache because external processes aren't tracked by the php stat cache - clearstatcache(false, ""); + clearstatcache2(false, ""); if 0 == result { self.remove(source)?; @@ -482,13 +495,14 @@ impl Filesystem { // We do not use PHP's "rename" function here since it does not support // the case where $source, and $target are located on different partitions. let mut output = String::new(); - let result = self.get_process().execute( - &vec!["mv".to_string(), source.to_string(), target.to_string()], + let result = self.get_process().execute_args( + &["mv".to_string(), source.to_string(), target.to_string()], &mut output, + (), ); // clear stat cache because external processes aren't tracked by the php stat cache - clearstatcache(false, ""); + clearstatcache2(false, ""); if 0 == result { return Ok(()); @@ -522,7 +536,7 @@ impl Filesystem { let to = self.normalize_path(to); if directories { - from = format!("{}/dummy_file", rtrim(&from, "/")); + from = format!("{}/dummy_file", rtrim(&from, Some("/"))); } if dirname(&from) == dirname(&to) { @@ -542,9 +556,8 @@ impl Filesystem { return to; } - common_path = format!("{}/", rtrim(&common_path, "/")); - let source_path_depth = - substr_count(&substr(&from, strlen(&common_path) as isize, None), "/"); + common_path = format!("{}/", rtrim(&common_path, Some("/"))); + let source_path_depth = substr_count(&substr(&from, strlen(&common_path), None), "/"); let common_path_code = str_repeat("../", source_path_depth as usize); // allow top level /foo & /bar dirs to be addressed relatively as this is common in Docker setups @@ -555,7 +568,7 @@ impl Filesystem { let result = format!( "{}{}", common_path_code, - substr(&to, strlen(&common_path) as isize, None) + substr(&to, strlen(&common_path), None) ); if strlen(&result) == 0 { return "./".to_string(); @@ -604,19 +617,16 @@ impl Filesystem { return var_export(&PhpMixed::String(to), true); } - common_path = format!("{}/", rtrim(&common_path, "/")); + common_path = format!("{}/", rtrim(&common_path, Some("/"))); if str_starts_with(&to, &format!("{}/", from)) { return format!( "__DIR__ . {}", - var_export( - &PhpMixed::String(substr(&to, strlen(&from) as isize, None)), - true - ) + var_export(&PhpMixed::String(substr(&to, strlen(&from), None)), true) ); } - let source_path_depth = - (substr_count(&substr(&from, strlen(&common_path) as isize, None), "/") as i64) - + (if directories { 1 } else { 0 }); + let source_path_depth = (substr_count(&substr(&from, strlen(&common_path), None), "/") + as i64) + + (if directories { 1 } else { 0 }); // allow top level /foo & /bar dirs to be addressed relatively as this is common in Docker setups if !prefer_relative && "/" == common_path && source_path_depth > 1 { @@ -636,7 +646,7 @@ impl Filesystem { str_repeat(")", source_path_depth as usize) ) }; - let rel_target = substr(&to, strlen(&common_path) as isize, None); + let rel_target = substr(&to, strlen(&common_path), None); format!( "{}{}", @@ -673,7 +683,7 @@ impl Filesystem { return Ok(self.directory_size(path)); } - Ok(filesize(path) as i64) + Ok(filesize(path).unwrap_or(0)) } /// Normalize a path. This replaces backslashes with slashes, removes ending @@ -691,7 +701,10 @@ impl Filesystem { } // extract a prefix being a protocol://, protocol:, protocol://drive: or simply drive: - let mut prefix_match: Vec<String> = vec![]; + let mut prefix_match: indexmap::IndexMap< + shirabe_external_packages::composer::pcre::preg::CaptureKey, + String, + > = indexmap::IndexMap::new(); if Preg::is_match_strict_groups3( "{^( [0-9a-z]{2,}+: (?: // (?: [a-z]: )? )? | [a-z]: )}ix", &path, @@ -699,8 +712,11 @@ impl Filesystem { ) .unwrap_or(false) { - prefix = prefix_match[1].clone(); - path = substr(&path, strlen(&prefix) as isize, None); + prefix = prefix_match + .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(1)) + .cloned() + .unwrap_or_default(); + path = substr(&path, strlen(&prefix), None); } if strpos(&path, "/") == Some(0) { @@ -712,7 +728,7 @@ impl Filesystem { for chunk in explode("/", &path) { if ".." == chunk && (strlen(&absolute) > 0 || up) { array_pop(&mut parts); - up = !(count(&parts) == 0 || ".." == end(&parts).unwrap_or_default()); + up = !(parts.len() == 0 || ".." == end(&parts).unwrap_or_default()); } else if "." != chunk && "" != chunk { parts.push(chunk.clone()); up = ".." != chunk; @@ -722,9 +738,20 @@ impl Filesystem { // ensure c: is normalized to C: prefix = Preg::replace_callback( "{(^|://)[a-z]:$}i", - Box::new(|m: &Vec<String>| -> String { strtoupper(&m[0]) }), + |m: &indexmap::IndexMap< + shirabe_external_packages::composer::pcre::preg::CaptureKey, + String, + >| + -> String { + let s = m + .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(0)) + .cloned() + .unwrap_or_default(); + strtoupper(&s) + }, &prefix, - ); + ) + .unwrap_or_default(); format!("{}{}{}", prefix, absolute, implode("/", &parts)) } @@ -735,7 +762,7 @@ impl Filesystem { pub fn trim_trailing_slash(path: &str) -> String { let mut path = path.to_string(); if !Preg::is_match3("{^[/\\\\]+$}", &path, None).unwrap_or(false) { - path = rtrim(&path, "/\\"); + path = rtrim(&path, Some("/\\")); } path @@ -765,10 +792,11 @@ impl Filesystem { pub fn get_platform_path(path: &str) -> String { let mut path = path.to_string(); if Platform::is_windows() { - path = Preg::replace("{^(?:file:///([a-z]):?/)}i", "file://$1:/", &path); + path = Preg::replace("{^(?:file:///([a-z]):?/)}i", "file://$1:/", &path) + .unwrap_or_default(); } - Preg::replace("{^file://}i", "", &path) + Preg::replace("{^file://}i", "", &path).unwrap_or_default() } /// Cross-platform safe version of is_readable() @@ -795,8 +823,7 @@ impl Filesystem { pub(crate) fn directory_size(&self, directory: &str) -> i64 { let it = - shirabe_php_shim::recursive_directory_iterator(directory, shirabe_php_shim::SKIP_DOTS) - .unwrap(); + shirabe_php_shim::recursive_directory_iterator(directory, shirabe_php_shim::SKIP_DOTS); let ri = shirabe_php_shim::recursive_iterator_iterator(it, shirabe_php_shim::CHILD_FIRST); let mut size: i64 = 0; @@ -812,7 +839,7 @@ impl Filesystem { pub(crate) fn get_process(&mut self) -> std::cell::RefMut<'_, ProcessExecutor> { if self.process_executor.is_none() { self.process_executor = Some(std::rc::Rc::new(std::cell::RefCell::new( - ProcessExecutor::new(None), + ProcessExecutor::new(()), ))); } @@ -870,7 +897,7 @@ impl Filesystem { return pathname.to_string(); } - let resolved = rtrim(pathname, "/"); + let resolved = rtrim(pathname, Some("/")); if 0 == strlen(&resolved) { return pathname.to_string(); @@ -916,7 +943,7 @@ impl Filesystem { Platform::realpath(target), ]; let mut output = String::new(); - if self.get_process().execute(&cmd, &mut output) != 0 { + if self.get_process().execute_args(&cmd, &mut output, ()) != 0 { return Err(IOException::new( format!( "Failed to create junction to \"{}\" at \"{}\".", @@ -928,7 +955,7 @@ impl Filesystem { ) .into()); } - clearstatcache(true, junction); + clearstatcache2(true, junction); Ok(()) } @@ -953,7 +980,7 @@ impl Filesystem { } // Important to clear all caches first - clearstatcache(true, junction); + clearstatcache2(true, junction); if !is_dir(junction) || is_link(junction) { return false; @@ -976,7 +1003,7 @@ impl Filesystem { } let junction = rtrim( &str_replace("/", DIRECTORY_SEPARATOR, junction), - DIRECTORY_SEPARATOR, + Some(DIRECTORY_SEPARATOR), ); if !self.is_junction(&junction) { return Err(IOException::new( @@ -998,7 +1025,7 @@ impl Filesystem { let current_content = Silencer::call(|| Ok(file_get_contents(path).unwrap_or_default())).unwrap_or_default(); if current_content.is_empty() || current_content != content { - return Ok(file_put_contents(path, content) as i64); + return Ok(file_put_contents(path, content.as_bytes()).unwrap_or(0)); } Ok(0) @@ -1007,14 +1034,24 @@ impl Filesystem { /// Copy file using stream_copy_to_stream to work around https://bugs.php.net/bug.php?id=6463 pub fn safe_copy(&self, source: &str, target: &str) -> anyhow::Result<()> { if !file_exists(target) || !file_exists(source) || !self.files_are_equal(source, target) { - let source_handle = fopen(source, "r") - .ok_or_else(|| anyhow::anyhow!("Could not open \"{}\" for reading.", source))?; - let target_handle = fopen(target, "w+") - .ok_or_else(|| anyhow::anyhow!("Could not open \"{}\" for writing.", target))?; + let source_handle = fopen(source, "r"); + if source_handle.is_none() { + return Err(anyhow::anyhow!( + "Could not open \"{}\" for reading.", + source + )); + } + let target_handle = fopen(target, "w+"); + if target_handle.is_none() { + return Err(anyhow::anyhow!( + "Could not open \"{}\" for writing.", + target + )); + } - shirabe_php_shim::stream_copy_to_stream(&source_handle, &target_handle); - fclose(&source_handle); - fclose(&target_handle); + shirabe_php_shim::stream_copy_to_stream(source_handle.clone(), target_handle.clone()); + fclose(source_handle); + fclose(target_handle); touch(target); // PHP also passes filemtime/fileatime — skipping detailed timestamp restore here. @@ -1032,25 +1069,25 @@ impl Filesystem { } // Check if content is different - let a_handle = match fopen(a, "rb") { - Some(h) => h, - None => return false, - }; - let b_handle = match fopen(b, "rb") { - Some(h) => h, - None => return false, - }; + let a_handle = fopen(a, "rb"); + if a_handle.is_none() { + return false; + } + let b_handle = fopen(b, "rb"); + if b_handle.is_none() { + return false; + } let mut result = true; - while !feof(&a_handle) { - if fread(&a_handle, 8192) != fread(&b_handle, 8192) { + while !feof(a_handle.clone()) { + if fread(a_handle.clone(), 8192) != fread(b_handle.clone(), 8192) { result = false; break; } } - fclose(&a_handle); - fclose(&b_handle); + fclose(a_handle); + fclose(b_handle); result } diff --git a/crates/shirabe/src/util/forgejo.rs b/crates/shirabe/src/util/forgejo.rs index 88df409..002e4e5 100644 --- a/crates/shirabe/src/util/forgejo.rs +++ b/crates/shirabe/src/util/forgejo.rs @@ -43,15 +43,23 @@ impl Forgejo { io_interface::NORMAL, ); self.io.write_error3(&url, true, io_interface::NORMAL); - let local_auth_config = self.config.borrow().get_local_auth_config_source(); + let (local_auth_name, has_local_auth, auth_name): (String, bool, String) = { + let cfg = self.config.borrow(); + let local = cfg + .get_local_auth_config_source() + .map(|s| s.get_name().to_string()); + let auth = cfg.get_auth_config_source().get_name().to_string(); + (local.clone().unwrap_or_default(), local.is_some(), auth) + }; + let local_prefix = if has_local_auth { + format!("{} OR ", local_auth_name) + } else { + String::new() + }; self.io.write_error3( &format!( - "Tokens will be stored in plain text in \"{}\" for future use by Composer.", - local_auth_config - .as_ref() - .map(|s| format!("{} OR ", s.get_name())) - .unwrap_or_default() - + self.config.borrow().get_auth_config_source().get_name() + "Tokens will be stored in plain text in \"{}{}\" for future use by Composer.", + local_prefix, auth_name ), true, io_interface::NORMAL, @@ -63,19 +71,25 @@ impl Forgejo { ); let mut store_in_local_auth_config = false; - if local_auth_config.is_some() { + if has_local_auth { store_in_local_auth_config = self.io.ask_confirmation( - "A local auth config source was found, do you want to store the token there?", + "A local auth config source was found, do you want to store the token there?" + .to_string(), true, ); } - let username = self.io.ask("Username: ", None).trim().to_string(); + let username = self + .io + .ask("Username: ".to_string(), shirabe_php_shim::PhpMixed::Null) + .as_string() + .map(|s| s.trim().to_string()) + .unwrap_or_default(); let token = self .io - .ask_and_hide_answer("Token (hidden): ") - .trim() - .to_string(); + .ask_and_hide_answer("Token (hidden): ".to_string()) + .map(|s| s.trim().to_string()) + .unwrap_or_default(); let add_token_manually = format!( "You can also add it manually later by using \"composer config --global --auth forgejo-token.{} <username> <token>\"", @@ -93,8 +107,11 @@ impl Forgejo { return Ok(Ok(false)); } - self.io - .set_authentication(origin_url.to_string(), username.clone(), token.clone()); + self.io.set_authentication( + origin_url.to_string(), + username.clone(), + Some(token.clone()), + ); match self.http_downloader.borrow_mut().get( &format!("https://{}/api/v1/version", origin_url), @@ -104,7 +121,13 @@ impl Forgejo { ) { Ok(_) => {} Err(e) => { - if [403, 401, 404].contains(&e.get_code()) { + // TODO(phase-b): anyhow::Error has no get_code(); HTTP status codes come from + // TransportException::get_status_code(). + let code = e + .downcast_ref::<crate::downloader::transport_exception::TransportException>() + .and_then(|te| te.get_status_code()) + .unwrap_or(0); + if [403, 401, 404].contains(&code) { self.io.write_error3( "<error>Invalid access token provided.</error>", true, @@ -116,30 +139,35 @@ impl Forgejo { return Ok(Ok(false)); } - return Ok(Err(e)); + // TODO(phase-b): downcast anyhow::Error to TransportException for the inner Err + return Err(e); } } // store value in local/user config - let local_auth_config = self.config.borrow().get_local_auth_config_source(); - let auth_config_source = if store_in_local_auth_config { - local_auth_config - .as_ref() - .unwrap_or_else(|| self.config.borrow().get_auth_config_source()) + // TODO(phase-b): Config getters return references; cross-borrows of self.config.borrow() + // cannot live across method calls. Needs Rc<RefCell<dyn ConfigSourceInterface>> shape. + let setting_key = format!("forgejo-token.{}", origin_url); + { + let mut cfg = self.config.borrow_mut(); + cfg.get_config_source_mut() + .remove_config_setting(&setting_key)?; + } + let value: shirabe_php_shim::PhpMixed = + shirabe_php_shim::PhpMixed::Array(indexmap::indexmap! { + "username".to_string() => Box::new(username.clone().into()), + "token".to_string() => Box::new(token.clone().into()), + }); + if store_in_local_auth_config && has_local_auth { + let mut cfg = self.config.borrow_mut(); + if let Some(local) = cfg.get_local_auth_config_source_mut() { + local.add_config_setting(&setting_key, value)?; + } } else { - self.config.borrow().get_auth_config_source() - }; - self.config - .borrow() - .get_config_source() - .remove_config_setting(&format!("forgejo-token.{}", origin_url)); - auth_config_source.add_config_setting( - &format!("forgejo-token.{}", origin_url), - indexmap::indexmap! { - "username".to_string() => username.into(), - "token".to_string() => token.into(), - }, - ); + let mut cfg = self.config.borrow_mut(); + cfg.get_auth_config_source_mut() + .add_config_setting(&setting_key, value)?; + } self.io.write_error3( "<info>Token stored successfully.</info>", diff --git a/crates/shirabe/src/util/git.rs b/crates/shirabe/src/util/git.rs index 3093734..cd5082f 100644 --- a/crates/shirabe/src/util/git.rs +++ b/crates/shirabe/src/util/git.rs @@ -15,7 +15,7 @@ use shirabe_php_shim::{ use crate::config::Config; use crate::io::io_interface::IOInterface; -use crate::util::auth_helper::AuthHelper; +use crate::util::auth_helper::{AuthHelper, StoreAuth}; use crate::util::bitbucket::Bitbucket; use crate::util::filesystem::Filesystem; use crate::util::github::GitHub; @@ -117,7 +117,7 @@ impl Git { map.insert("%url%".to_string(), url.to_string()); map.insert( "%sanitizedUrl%".to_string(), - Preg::replace(r"{://([^@]+?):(.+?)@}", "://", &url), + Preg::replace(r"{://([^@]+?):(.+?)@}", "://", &url).unwrap_or_default(), ); array_map( @@ -308,7 +308,7 @@ impl Git { } // failed to checkout, first check git accessibility - let m1 = m.get(1).cloned().unwrap_or_default(); + let m1 = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); if !self.io.has_authentication(&m1) && !self.io.is_interactive() { self.throw_exception( &format!( @@ -519,7 +519,7 @@ impl Git { // We already have an access_token from a previous request. if username != "x-token-auth" { let access_token = - bitbucket_util.request_token(&domain, &username, &password); + bitbucket_util.request_token(&domain, &username, &password)?; if !access_token.is_empty() { self.io.set_authentication( domain.clone(), @@ -769,7 +769,12 @@ impl Git { .set_authentication(m2.clone(), username, Some(password)); let mut auth_helper = AuthHelper::new(self.io.clone_box(), std::rc::Rc::clone(&self.config)); - auth_helper.store_auth(&m2, &store_auth); + let store_auth_enum = match &store_auth { + PhpMixed::String(s) if s == "prompt" => StoreAuth::Prompt, + PhpMixed::Bool(b) => StoreAuth::Bool(*b), + _ => StoreAuth::Bool(false), + }; + auth_helper.store_auth(&m2, store_auth_enum)?; return Ok(()); } @@ -946,7 +951,7 @@ impl Git { && pretty_version.is_some() { let branch = - Preg::replace(r"{(?:^dev-|(?:\.x)?-dev$)}i", "", &pretty_version.unwrap()); + Preg::replace(r"{(?:^dev-|(?:\.x)?-dev$)}i", "", &pretty_version.unwrap())?; let mut branches: Option<String> = None; let mut tags: Option<String> = None; let mut output = String::new(); @@ -1126,9 +1131,9 @@ impl Git { "fatal: could not read Username", ]; - let error_output = self.process.borrow().get_error_output(); + let error_output = self.process.borrow().get_error_output().to_string(); for auth_failure in &auth_failures { - if strpos(error_output, auth_failure).is_some() { + if strpos(&error_output, auth_failure).is_some() { return Some(m); } } @@ -1304,7 +1309,7 @@ impl Git { if self.process.borrow_mut().execute_args( &vec!["git".to_string(), "--version".to_string()], &mut ignored_output, - None, + Option::<&str>::None, ) != 0 { return Err(RuntimeException { diff --git a/crates/shirabe/src/util/github.rs b/crates/shirabe/src/util/github.rs index cfb3d0c..c9513aa 100644 --- a/crates/shirabe/src/util/github.rs +++ b/crates/shirabe/src/util/github.rs @@ -68,7 +68,7 @@ impl GitHub { "github.accesstoken".to_string(), ], &mut output, - None, + (), ) == 0 { self.io.set_authentication( @@ -103,7 +103,7 @@ impl GitHub { if self .process .borrow_mut() - .execute_args(&["hostname".to_string()], &mut output, None) + .execute_args(&["hostname".to_string()], &mut output, ()) == 0 { note += &format!(" on {}", output.trim()); @@ -111,84 +111,74 @@ impl GitHub { } note += &format!(" {}", date("Y-m-d Hi", None)); - let local_auth_config = self.config.borrow().get_local_auth_config_source(); - - self.io.write_error3(PhpMixed::List(vec![ - Box::new(PhpMixed::String( - "You need to provide a GitHub access token.".to_string(), - )), - Box::new(PhpMixed::String(format!( - "Tokens will be stored in plain text in \"{}\" for future use by Composer.", - local_auth_config - .as_ref() - .map(|c| format!("{} OR ", c.get_name())) - .unwrap_or_default() - + &self.config.borrow().get_auth_config_source().get_name() - ))), - Box::new(PhpMixed::String( - "Due to the security risk of tokens being exfiltrated, use tokens with short expiration times and only the minimum permissions necessary.".to_string(), - )), - Box::new(PhpMixed::String(String::new())), - Box::new(PhpMixed::String( - "Carefully consider the following options in order:".to_string(), - )), - Box::new(PhpMixed::String(String::new())), - ]), true, io_interface::NORMAL); + // PHP: writeError(array) joins with newline. TODO(phase-b): writeError accepts array natively in Symfony. + let (local_name, auth_name): (Option<String>, String) = { + let cfg = self.config.borrow(); + ( + cfg.get_local_auth_config_source() + .map(|c| c.get_name().to_string()), + cfg.get_auth_config_source().get_name().to_string(), + ) + }; + let prefix = local_name + .as_ref() + .map(|n| format!("{} OR ", n)) + .unwrap_or_default(); + let lines = [ + "You need to provide a GitHub access token.".to_string(), + format!( + "Tokens will be stored in plain text in \"{}{}\" for future use by Composer.", + prefix, auth_name + ), + "Due to the security risk of tokens being exfiltrated, use tokens with short expiration times and only the minimum permissions necessary.".to_string(), + String::new(), + "Carefully consider the following options in order:".to_string(), + String::new(), + ]; + self.io + .write_error3(&lines.join("\n"), true, io_interface::NORMAL); let encoded_note = shirabe_php_shim::rawurlencode(¬e).replace("%20", "+"); - self.io.write_error3(PhpMixed::List(vec![ - Box::new(PhpMixed::String( - "1. When you don't use 'vcs' type 'repositories' in composer.json and do not need to clone source or download dist files".to_string(), - )), - Box::new(PhpMixed::String( - "from private GitHub repositories over HTTPS, use a fine-grained token with read-only access to public information.".to_string(), - )), - Box::new(PhpMixed::String( - "Use the following URL to create such a token:".to_string(), - )), - Box::new(PhpMixed::String(format!( + let lines = [ + "1. When you don't use 'vcs' type 'repositories' in composer.json and do not need to clone source or download dist files".to_string(), + "from private GitHub repositories over HTTPS, use a fine-grained token with read-only access to public information.".to_string(), + "Use the following URL to create such a token:".to_string(), + format!( "https://{}/settings/personal-access-tokens/new?name={}", origin_url, encoded_note - ))), - Box::new(PhpMixed::String(String::new())), - ]), true, io_interface::NORMAL); + ), + String::new(), + ]; + self.io + .write_error3(&lines.join("\n"), true, io_interface::NORMAL); - self.io.write_error3(PhpMixed::List(vec![ - Box::new(PhpMixed::String( - "2. When all relevant _private_ GitHub repositories belong to a single user or organisation, use a fine-grained token with".to_string(), - )), - Box::new(PhpMixed::String( - "repository \"content\" read-only permissions. You can start with the following URL, but you may need to change the resource owner".to_string(), - )), - Box::new(PhpMixed::String( - "to the right user or organisation. Additionally, you can scope permissions down to apply only to selected repositories.".to_string(), - )), - Box::new(PhpMixed::String(format!( + let lines = [ + "2. When all relevant _private_ GitHub repositories belong to a single user or organisation, use a fine-grained token with".to_string(), + "repository \"content\" read-only permissions. You can start with the following URL, but you may need to change the resource owner".to_string(), + "to the right user or organisation. Additionally, you can scope permissions down to apply only to selected repositories.".to_string(), + format!( "https://{}/settings/personal-access-tokens/new?contents=read&name={}", origin_url, encoded_note - ))), - Box::new(PhpMixed::String(String::new())), - ]), true, io_interface::NORMAL); + ), + String::new(), + ]; + self.io + .write_error3(&lines.join("\n"), true, io_interface::NORMAL); - self.io.write_error3(PhpMixed::List(vec![ - Box::new(PhpMixed::String( - "3. A \"classic\" token grants broad permissions on your behalf to all repositories accessible by you.".to_string(), - )), - Box::new(PhpMixed::String( - "This may include write permissions, even though not needed by Composer. Use it only when you need to access".to_string(), - )), - Box::new(PhpMixed::String( - "private repositories across multiple organisations at the same time and using directory-specific authentication sources".to_string(), - )), - Box::new(PhpMixed::String( - "is not an option. You can generate a classic token here:".to_string(), - )), - Box::new(PhpMixed::String(format!( + let mut lines3 = vec![ + "3. A \"classic\" token grants broad permissions on your behalf to all repositories accessible by you.".to_string(), + "This may include write permissions, even though not needed by Composer. Use it only when you need to access".to_string(), + "private repositories across multiple organisations at the same time and using directory-specific authentication sources".to_string(), + "is not an option. You can generate a classic token here:".to_string(), + format!( "https://{}/settings/tokens/new?scopes=repo&description={}", origin_url, encoded_note - ))), - Box::new(PhpMixed::String(String::new())), - ]), true, io_interface::NORMAL); + ), + String::new(), + ]; + let _ = &mut lines3; + self.io + .write_error3(&lines3.join("\n"), true, io_interface::NORMAL); self.io.write_error3( "For additional information, check https://getcomposer.org/doc/articles/authentication-for-private-packages.md#github-oauth", @@ -197,7 +187,7 @@ impl GitHub { ); let mut store_in_local_auth_config = false; - if local_auth_config.is_some() { + if local_name.is_some() { store_in_local_auth_config = self.io.ask_confirmation( "A local auth config source was found, do you want to store the token there?" .to_string(), @@ -238,21 +228,22 @@ impl GitHub { format!("{}/api/v3/", origin_url) }; - let mut http_options = indexmap::IndexMap::new(); - http_options.insert( - "retry-auth-failure".to_string(), - Box::new(PhpMixed::Bool(false)), - ); - let http_options = PhpMixed::Array(http_options); + let mut http_options: indexmap::IndexMap<String, PhpMixed> = indexmap::IndexMap::new(); + http_options.insert("retry-auth-failure".to_string(), PhpMixed::Bool(false)); match self .http_downloader .borrow_mut() - .get(&format!("https://{}", api_url), &http_options) + .get(&format!("https://{}", api_url), http_options) { Ok(_) => {} Err(te) => { - if te.code == 403 || te.code == 401 { + // TODO(phase-b): downcast anyhow::Error to TransportException for status code + let code = te + .downcast_ref::<crate::downloader::transport_exception::TransportException>() + .and_then(|t| t.get_status_code()) + .unwrap_or(0); + if code == 403 || code == 401 { self.io.write_error3( "<error>Invalid token provided.</error>", true, @@ -269,34 +260,28 @@ impl GitHub { } } + // TODO(phase-b): Config getters return references; cross-borrow chains require + // Rc<RefCell<dyn ConfigSourceInterface>> shape. For now use _mut variants. let use_local = store_in_local_auth_config && self .config .borrow() .get_local_auth_config_source() .is_some(); - let auth_config_source_name; + let key = format!("github-oauth.{}", origin_url); + { + let mut cfg = self.config.borrow_mut(); + cfg.get_config_source_mut().remove_config_setting(&key)?; + } if use_local { - let mut auth_config_source = - self.config.borrow().get_local_auth_config_source().unwrap(); - self.config - .borrow() - .get_config_source() - .remove_config_setting(&format!("github-oauth.{}", origin_url))?; - auth_config_source.add_config_setting( - &format!("github-oauth.{}", origin_url), - PhpMixed::String(token), - )?; + let mut cfg = self.config.borrow_mut(); + if let Some(local) = cfg.get_local_auth_config_source_mut() { + local.add_config_setting(&key, PhpMixed::String(token))?; + } } else { - let mut auth_config_source = self.config.borrow().get_auth_config_source(); - self.config - .borrow() - .get_config_source() - .remove_config_setting(&format!("github-oauth.{}", origin_url))?; - auth_config_source.add_config_setting( - &format!("github-oauth.{}", origin_url), - PhpMixed::String(token), - )?; + let mut cfg = self.config.borrow_mut(); + cfg.get_auth_config_source_mut() + .add_config_setting(&key, PhpMixed::String(token))?; } self.io.write_error3( diff --git a/crates/shirabe/src/util/gitlab.rs b/crates/shirabe/src/util/gitlab.rs index 11b7a21..7049686 100644 --- a/crates/shirabe/src/util/gitlab.rs +++ b/crates/shirabe/src/util/gitlab.rs @@ -73,7 +73,7 @@ impl GitLab { "gitlab.accesstoken".to_string(), ], &mut output, - None, + (), ) == 0 { self.io.set_authentication( @@ -94,7 +94,7 @@ impl GitLab { "gitlab.deploytoken.user".to_string(), ], &mut token_user, - None, + (), ) == 0 && self.process.borrow_mut().execute_args( &[ @@ -103,7 +103,7 @@ impl GitLab { "gitlab.deploytoken.token".to_string(), ], &mut token_password, - None, + (), ) == 0 { self.io.set_authentication( @@ -177,7 +177,12 @@ impl GitLab { self.io.write_error3(msg, true, io_interface::NORMAL); } - let local_auth_config = self.config.borrow().get_local_auth_config_source(); + let local_auth_config_name: Option<String> = self + .config + .borrow() + .get_local_auth_config_source() + .map(|c| c.get_name()); + let has_local_auth_config = local_auth_config_name.is_some(); let personal_access_token_link = format!( "{}://{}/-/user_settings/personal_access_tokens", scheme, origin_url @@ -186,9 +191,9 @@ impl GitLab { self.io.write_error3( &format!( "A token will be created and stored in \"{}\", your password will never be stored", - local_auth_config + local_auth_config_name .as_ref() - .map(|c| format!("{} OR ", c.get_name())) + .map(|name| format!("{} OR ", name)) .unwrap_or_default() + &self.config.borrow().get_auth_config_source().get_name() ), @@ -223,7 +228,7 @@ impl GitLab { .write_error3("for more details.", true, io_interface::NORMAL); let mut store_in_local_auth_config = false; - if local_auth_config.is_some() { + if has_local_auth_config { store_in_local_auth_config = self.io.ask_confirmation( "A local auth config source was found, do you want to store the token there?" .to_string(), @@ -313,14 +318,15 @@ impl GitLab { ); // store value in user config in auth file - let use_local = store_in_local_auth_config && local_auth_config.is_some(); + let use_local = store_in_local_auth_config && has_local_auth_config; let has_expires_in = response .as_array() .map(|arr| arr.contains_key("expires_in")) .unwrap_or(false); if use_local { - let mut auth_config_source = local_auth_config.clone().unwrap(); + let mut config = self.config.borrow_mut(); + let auth_config_source = config.get_local_auth_config_source_mut().unwrap(); if has_expires_in { auth_config_source.add_config_setting( &format!("gitlab-oauth.{}", origin_url), @@ -333,7 +339,8 @@ impl GitLab { )?; } } else { - let mut auth_config_source = self.config.borrow().get_auth_config_source(); + let mut config = self.config.borrow_mut(); + let auth_config_source = config.get_auth_config_source_mut(); if has_expires_in { auth_config_source.add_config_setting( &format!("gitlab-oauth.{}", origin_url), @@ -392,8 +399,8 @@ impl GitLab { // store value in user config in auth file self.config - .borrow() - .get_auth_config_source() + .borrow_mut() + .get_auth_config_source_mut() .add_config_setting( &format!("gitlab-oauth.{}", origin_url), Self::build_oauth_config(&response, &access_token), @@ -451,7 +458,7 @@ impl GitLab { .borrow_mut() .get( &format!("{}://{}/oauth/token", scheme, api_url), - &PhpMixed::Array(options), + options.into_iter().map(|(k, v)| (k, *v)).collect(), )? .decode_json()?; @@ -538,7 +545,7 @@ impl GitLab { .borrow_mut() .get( &format!("{}://{}/oauth/token", scheme, origin_url), - &PhpMixed::Array(options), + options.into_iter().map(|(k, v)| (k, *v)).collect(), )? .decode_json()?; diff --git a/crates/shirabe/src/util/hg.rs b/crates/shirabe/src/util/hg.rs index fa25a78..0d4d36d 100644 --- a/crates/shirabe/src/util/hg.rs +++ b/crates/shirabe/src/util/hg.rs @@ -52,12 +52,14 @@ impl Hg { } // Try with the authentication information available - let matches = Preg::is_match_with_captures( + let mut matches: indexmap::IndexMap<String, String> = indexmap::IndexMap::new(); + let matched = Preg::is_match_named( r"(?i)^(?P<proto>ssh|https?)://(?:(?P<user>[^:@]+)(?::(?P<pass>[^:@]+))?@)?(?P<host>[^/]+)(?P<path>/.*)?", &url, + &mut matches, )?; - if let Some(matches) = matches { + if matched { if self .io .has_authentication(matches.get("host").map(|s| s.as_str()).unwrap_or("")) @@ -82,8 +84,16 @@ impl Hg { format!( "{}://{}:{}@{}{}", matches.get("proto").unwrap_or(&String::new()), - rawurlencode(auth.get("username").map(|s| s.as_str()).unwrap_or("")), - rawurlencode(auth.get("password").map(|s| s.as_str()).unwrap_or("")), + rawurlencode( + auth.get("username") + .and_then(|s| s.as_deref()) + .unwrap_or("") + ), + rawurlencode( + auth.get("password") + .and_then(|s| s.as_deref()) + .unwrap_or("") + ), matches.get("host").unwrap_or(&String::new()), matches.get("path").unwrap_or(&String::new()), ) @@ -100,7 +110,7 @@ impl Hg { return Ok(()); } - let error = self.process.borrow().get_error_output(); + let error = self.process.borrow().get_error_output().to_string(); return self .throw_exception(&format!("Failed to clone {}, \n\n{}", url, error), &url); } @@ -117,7 +127,7 @@ impl Hg { if Self::get_version(&self.process).is_none() { anyhow::bail!( "{}", - Url::sanitize(&format!( + Url::sanitize(format!( "Failed to clone {}, hg was not found, check that it is installed and in your PATH env.\n\n{}", url, self.process.borrow().get_error_output() @@ -125,7 +135,7 @@ impl Hg { ); } - anyhow::bail!("{}", Url::sanitize(message)); + anyhow::bail!("{}", Url::sanitize(message.to_string())); } pub fn get_version( @@ -137,7 +147,7 @@ impl Hg { if process.borrow_mut().execute_args( &["hg".to_string(), "--version".to_string()], &mut output, - None, + (), ) == 0 { if let Ok(Some(matches)) = Preg::is_match_with_indexed_captures( diff --git a/crates/shirabe/src/util/http/curl_downloader.rs b/crates/shirabe/src/util/http/curl_downloader.rs index c475ad3..fd46220 100644 --- a/crates/shirabe/src/util/http/curl_downloader.rs +++ b/crates/shirabe/src/util/http/curl_downloader.rs @@ -371,7 +371,7 @@ impl CurlDownloader { if !em.is_empty() { em.push_str("\n"); } - em.push_str(&Preg::replace(r"{^fopen\(.*?\): }", "", msg)); + em.push_str(&Preg::replace(r"{^fopen\(.*?\): }", "", msg).unwrap_or_default()); true })); } @@ -552,7 +552,7 @@ impl CurlDownloader { let options = self .auth_helper - .add_authentication_options(options, origin, url); + .add_authentication_options(options, origin, url)?; let options = StreamContextFactory::init_options(url, options, true) .map_err(|e| anyhow::anyhow!(e.message))?; @@ -601,13 +601,13 @@ impl CurlDownloader { curl_setopt_array(&curl_handle, &proxy_curl_options.into_iter().collect()); let progress = array_diff_key( - &match curl_getinfo(&curl_handle) { - PhpMixed::Array(a) => a, + match curl_getinfo(&curl_handle) { + PhpMixed::Array(a) => a.into_iter().map(|(k, v)| (k, *v)).collect(), _ => IndexMap::new(), }, &time_info_static() .into_iter() - .map(|(k, v)| (k, Box::new(PhpMixed::Bool(v)))) + .map(|(k, v)| (k, PhpMixed::Bool(v))) .collect(), ); @@ -633,7 +633,16 @@ impl CurlDownloader { .collect(), ), ); - job.insert("progress".to_string(), PhpMixed::Array(progress.clone())); + job.insert( + "progress".to_string(), + PhpMixed::Array( + progress + .clone() + .into_iter() + .map(|(k, v)| (k, Box::new(v))) + .collect(), + ), + ); // curlHandle, headerHandle, bodyHandle, resolve, reject are PHP resources/callables; // stored as opaque PhpMixed::Null placeholders (real values live in Rust-side fields). // TODO(phase-b): wire handle/closure storage properly. @@ -1049,28 +1058,31 @@ impl CurlDownloader { ); } contents = c; - response = Some(CurlResponse::new( - { - let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); - m.insert( - "url".to_string(), - PhpMixed::String( - job.get("url") - .and_then(|v| v.as_string()) - .unwrap_or("") - .to_string(), - ), - ); - m - }, - status_code, - headers.clone().unwrap_or_default(), - contents.as_string().map(|s| s.to_string()), - progress - .iter() - .map(|(k, v)| (k.clone(), (**v).clone())) - .collect(), - )); + response = Some( + CurlResponse::new( + { + let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); + m.insert( + "url".to_string(), + PhpMixed::String( + job.get("url") + .and_then(|v| v.as_string()) + .unwrap_or("") + .to_string(), + ), + ); + m + }, + status_code, + headers.clone().unwrap_or_default(), + contents.as_string().map(|s| s.to_string()), + progress + .iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect(), + )? + .map_err(|e| anyhow::anyhow!(e.message))?, + ); self.io.write_error3( &format!( "[{}] {}", @@ -1125,28 +1137,31 @@ impl CurlDownloader { ); } - response = Some(CurlResponse::new( - { - let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); - m.insert( - "url".to_string(), - PhpMixed::String( - job.get("url") - .and_then(|v| v.as_string()) - .unwrap_or("") - .to_string(), - ), - ); - m - }, - status_code, - headers.clone().unwrap_or_default(), - contents.as_string().map(|s| s.to_string()), - progress - .iter() - .map(|(k, v)| (k.clone(), (**v).clone())) - .collect(), - )); + response = Some( + CurlResponse::new( + { + let mut m: IndexMap<String, PhpMixed> = IndexMap::new(); + m.insert( + "url".to_string(), + PhpMixed::String( + job.get("url") + .and_then(|v| v.as_string()) + .unwrap_or("") + .to_string(), + ), + ); + m + }, + status_code, + headers.clone().unwrap_or_default(), + contents.as_string().map(|s| s.to_string()), + progress + .iter() + .map(|(k, v)| (k.clone(), (**v).clone())) + .collect(), + )? + .map_err(|e| anyhow::anyhow!(e.message))?, + ); self.io.write_error3( &format!( "[{}] {}", @@ -1404,13 +1419,13 @@ impl CurlDownloader { // $curlHandle = $this->jobs[$i]['curlHandle']; // $progress = array_diff_key(curl_getinfo($curlHandle), self::$timeInfo); let progress_now = array_diff_key( - &match curl_getinfo(/* TODO real handle */ &curl_init()) { - PhpMixed::Array(a) => a, + match curl_getinfo(/* TODO real handle */ &curl_init()) { + PhpMixed::Array(a) => a.into_iter().map(|(k, v)| (k, *v)).collect(), _ => IndexMap::new(), }, &time_info_static() .into_iter() - .map(|(k, v)| (k, Box::new(PhpMixed::Bool(v)))) + .map(|(k, v)| (k, PhpMixed::Bool(v))) .collect(), ); @@ -1424,12 +1439,17 @@ impl CurlDownloader { PhpMixed::Array(a) => a.clone(), _ => IndexMap::new(), }; + let progress_now_boxed: IndexMap<String, Box<PhpMixed>> = progress_now + .clone() + .into_iter() + .map(|(k, v)| (k, Box::new(v))) + .collect(); - if !maps_equal(&prev_progress_map, &progress_now) { + if !maps_equal(&prev_progress_map, &progress_now_boxed) { if let Some(job) = self.jobs.get_mut(&i) { job.insert( "progress".to_string(), - PhpMixed::Array(progress_now.clone()), + PhpMixed::Array(progress_now_boxed.clone()), ); } @@ -1516,10 +1536,10 @@ impl CurlDownloader { sprintf( "IP \"%s\" is blocked for \"%s\".", &[ - (**primary_ip).clone(), + primary_ip.clone(), progress_now .get("url") - .map(|b| (**b).clone()) + .cloned() .unwrap_or(PhpMixed::Null), ], ), @@ -1581,7 +1601,7 @@ impl CurlDownloader { ), &format!("\\1{}", location_header), job_url, - ); + )?; } else { // Relative path; e.g. foo // This actually differs from PHP which seems to add duplicate slashes. @@ -1590,7 +1610,7 @@ impl CurlDownloader { r"{^(.+/)[^/?]*(?:\?.*)?$}", &format!("\\1{}", location_header), job_url, - ); + )?; } } } @@ -1649,18 +1669,20 @@ impl CurlDownloader { .and_then(|b| b.as_bool()) .unwrap_or(false) { + let status_message = response.inner.get_status_message(); + let body = response.inner.get_body().map(|s| s.to_string()); let result = self.auth_helper.prompt_auth_if_needed( job.get("url").and_then(|v| v.as_string()).unwrap_or(""), job.get("origin").and_then(|v| v.as_string()).unwrap_or(""), response.inner.get_status_code(), - response.inner.get_status_message(), + status_message.as_deref(), response.inner.get_headers().clone(), job.get("attributes") .and_then(|v| v.as_array()) .and_then(|a| a.get("retries")) .and_then(|b| b.as_int()) .unwrap_or(0), - response.inner.get_body().map(|s| s.to_string()), + body.as_deref(), )?; if result.retry { @@ -1689,7 +1711,7 @@ impl CurlDownloader { .inner .get_header("content-type") .unwrap_or_default(), - ) + )? { needs_auth_retry = Some("Bitbucket requires authentication and it was not provided"); } diff --git a/crates/shirabe/src/util/http/proxy_manager.rs b/crates/shirabe/src/util/http/proxy_manager.rs index 2576dcb..13a9920 100644 --- a/crates/shirabe/src/util/http/proxy_manager.rs +++ b/crates/shirabe/src/util/http/proxy_manager.rs @@ -14,7 +14,7 @@ pub struct ProxyManager { error: Option<String>, http_proxy: Option<ProxyItem>, https_proxy: Option<ProxyItem>, - no_proxy_handler: Option<NoProxyPattern>, + no_proxy_handler: std::cell::RefCell<Option<NoProxyPattern>>, } impl ProxyManager { @@ -23,7 +23,7 @@ impl ProxyManager { error: None, http_proxy: None, https_proxy: None, - no_proxy_handler: None, + no_proxy_handler: std::cell::RefCell::new(None), }; if let Err(e) = instance.get_proxy_data() { instance.error = Some(e.to_string()); @@ -102,7 +102,7 @@ impl ProxyManager { let (env, _name) = Self::get_proxy_env("no_proxy"); if let Some(env) = env { - self.no_proxy_handler = Some(NoProxyPattern::new(&env)); + *self.no_proxy_handler.borrow_mut() = Some(NoProxyPattern::new(&env)); } Ok(()) @@ -120,7 +120,7 @@ impl ProxyManager { } fn no_proxy(&self, request_url: &str) -> bool { - match &self.no_proxy_handler { + match self.no_proxy_handler.borrow_mut().as_mut() { None => false, Some(handler) => handler.test(request_url).unwrap_or(false), } diff --git a/crates/shirabe/src/util/http/response.rs b/crates/shirabe/src/util/http/response.rs index 62458d6..ef86ec9 100644 --- a/crates/shirabe/src/util/http/response.rs +++ b/crates/shirabe/src/util/http/response.rs @@ -82,8 +82,16 @@ impl Response { let mut value = None; let pattern = format!("(?i)^{}:\\s*(.+?)\\s*$", preg_quote(name, None)); for header in headers { - if let Some(m) = Preg::match_(&pattern, header) { - value = Some(m[1].clone()); + let mut matches: indexmap::IndexMap< + shirabe_external_packages::composer::pcre::preg::CaptureKey, + String, + > = indexmap::IndexMap::new(); + if Preg::match3(&pattern, header, Some(&mut matches)).unwrap_or(false) { + if let Some(s) = matches + .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(1)) + { + value = Some(s.clone()); + } } } value @@ -94,7 +102,16 @@ impl Response { todo!() } - pub fn new_fake(_body: Option<String>) -> Self { + pub fn to_php_mixed(&self) -> PhpMixed { + todo!() + } + + pub fn new_fake( + _url: &str, + _code: i64, + _headers: IndexMap<String, PhpMixed>, + _body: String, + ) -> Self { todo!() } } diff --git a/crates/shirabe/src/util/http_downloader.rs b/crates/shirabe/src/util/http_downloader.rs index 71385ce..b57626d 100644 --- a/crates/shirabe/src/util/http_downloader.rs +++ b/crates/shirabe/src/util/http_downloader.rs @@ -55,7 +55,6 @@ pub struct HttpDownloader { allow_async: bool, } -#[derive(Debug)] struct Job { id: i64, status: i64, @@ -69,6 +68,21 @@ struct Job { exception: Option<anyhow::Error>, } +impl std::fmt::Debug for Job { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("Job") + .field("id", &self.id) + .field("status", &self.status) + .field("request", &self.request) + .field("sync", &self.sync) + .field("origin", &self.origin) + .field("curl_id", &self.curl_id) + .field("response", &self.response) + .field("exception", &self.exception) + .finish() + } +} + #[derive(Debug, Clone)] struct Request { url: String, @@ -99,28 +113,12 @@ impl HttpDownloader { // The cafile option can be set via config.json let mut self_options: IndexMap<String, PhpMixed> = IndexMap::new(); if disable_tls == false { - self_options = StreamContextFactory::get_tls_defaults(&options, Some(&*io)); + self_options = + StreamContextFactory::get_tls_defaults(&options, Some(&*io)).unwrap_or_default(); } // handle the other externally set options normally. - self_options = array_replace_recursive( - PhpMixed::Array( - self_options - .into_iter() - .map(|(k, v)| (k, Box::new(v))) - .collect(), - ), - PhpMixed::Array( - options - .clone() - .into_iter() - .map(|(k, v)| (k, Box::new(v))) - .collect(), - ), - ) - .as_array() - .map(|m| m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) - .unwrap_or_default(); + self_options = array_replace_recursive(self_options, options.clone()); let curl = if Self::is_curl_enabled() { Some(CurlDownloader::new( @@ -138,11 +136,16 @@ impl HttpDownloader { std::rc::Rc::clone(&config), options.clone(), disable_tls, + None, )); let mut max_jobs: i64 = 12; let max_jobs_env = Platform::get_env("COMPOSER_MAX_PARALLEL_HTTP"); - if is_numeric(&max_jobs_env) { + let max_jobs_env_mixed = match &max_jobs_env { + Some(s) => PhpMixed::String(s.clone()), + None => PhpMixed::Bool(false), + }; + if is_numeric(&max_jobs_env_mixed) { max_jobs = max( 1, min( @@ -283,19 +286,7 @@ impl HttpDownloader { /// Merges new options pub fn set_options(&mut self, options: IndexMap<String, PhpMixed>) { - self.options = array_replace_recursive( - PhpMixed::Array( - self.options - .clone() - .into_iter() - .map(|(k, v)| (k, Box::new(v))) - .collect(), - ), - PhpMixed::Array(options.into_iter().map(|(k, v)| (k, Box::new(v))).collect()), - ) - .as_array() - .map(|m| m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) - .unwrap_or_default(); + self.options = array_replace_recursive(self.options.clone(), options); } /// @phpstan-param Request $request @@ -305,25 +296,7 @@ impl HttpDownloader { mut request: Request, sync: bool, ) -> Result<(JobHandle, Box<dyn PromiseInterface>)> { - request.options = array_replace_recursive( - PhpMixed::Array( - self.options - .clone() - .into_iter() - .map(|(k, v)| (k, Box::new(v))) - .collect(), - ), - PhpMixed::Array( - request - .options - .into_iter() - .map(|(k, v)| (k, Box::new(v))) - .collect(), - ), - ) - .as_array() - .map(|m| m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) - .unwrap_or_default(); + request.options = array_replace_recursive(self.options.clone(), request.options); let id = self.id_gen; self.id_gen += 1; @@ -381,20 +354,21 @@ impl HttpDownloader { // TODO(phase-b): build resolver/canceler closures bound to &mut self.jobs; needs Rc<RefCell> wiring let _ = (&self.rfs, &self.curl); - let resolver: Box<dyn Fn(_, _)> = Box::new(|_resolve, _reject| { - // TODO(phase-b) - }); + let resolver: Box<dyn Fn(Box<dyn Fn(PhpMixed)>, Box<dyn Fn(PhpMixed)>)> = + Box::new(|_resolve, _reject| { + // TODO(phase-b) + }); let canceler: Box<dyn Fn()> = Box::new(|| { // PHP canceler logic — TODO(phase-b) let _ = IrrecoverableDownloadException(shirabe_php_shim::RuntimeException { message: "Download canceled".to_string(), code: 0, }); - let _ = Url::sanitize(""); + let _ = Url::sanitize(String::new()); }); let _ = (resolver, canceler); - let promise = Promise::new(Box::new(|_resolve, _reject| {}), Box::new(|| {})); + let promise = Promise::new(Box::new(|_resolve, _reject| {})); // TODO(phase-b): wire promise.then() side-effects: mark job done & store response/exception let promise: Box<dyn PromiseInterface> = Box::new(promise); @@ -464,17 +438,17 @@ impl HttpDownloader { if has_if_modified_since { let mut req_map: IndexMap<String, PhpMixed> = IndexMap::new(); req_map.insert("url".to_string(), PhpMixed::String(url.clone())); - let _ = Response::new(req_map, 304, IndexMap::new(), String::new()); + let _ = Response::new(req_map, Some(304), Vec::new(), Some(String::new())); // job.resolve(response) — TODO(phase-b) } else { let mut e = TransportException::new( format!( "Network disabled, request canceled: {}", - Url::sanitize(&url) + Url::sanitize(url.clone()) ), 499, ); - e.set_status_code(499); + e.set_status_code(Some(499)); // job.reject(e) — TODO(phase-b) let _ = e; } @@ -597,12 +571,12 @@ impl HttpDownloader { url: &str, data: &IndexMap<String, PhpMixed>, ) -> Result<()> { - let clean_message = |msg: &str| -> String { + let clean_message = |msg: &str| -> anyhow::Result<String> { if !io.is_decorated() { return Preg::replace(&format!("{{{}{}}}u", chr(27), "\\[[;\\d]*m"), "", msg); } - msg.to_string() + Ok(msg.to_string()) }; // legacy warning/info keys @@ -633,8 +607,8 @@ impl HttpDownloader { "<{tp}>{capitalized} from {url}: {msg}</{tp}>", tp = r#type, capitalized = ucfirst(r#type), - url = Url::sanitize(url), - msg = clean_message(entry.unwrap().as_string().unwrap_or("")) + url = Url::sanitize(url.to_string()), + msg = clean_message(entry.unwrap().as_string().unwrap_or(""))? )); } @@ -669,13 +643,13 @@ impl HttpDownloader { "<{tp}>{capitalized} from {url}: {msg}</{tp}>", tp = r#type, capitalized = ucfirst(&r#type), - url = Url::sanitize(url), + url = Url::sanitize(url.to_string()), msg = clean_message( spec_map .get("message") .and_then(|v| v.as_string()) .unwrap_or("") - ) + )? )); } } @@ -711,11 +685,9 @@ impl HttpDownloader { ); http_map.insert("ignore_errors".to_string(), Box::new(PhpMixed::Bool(true))); ctx_options.insert("http".to_string(), PhpMixed::Array(http_map)); - let test_connectivity = file_get_contents( - "https://8.8.8.8", - false, - Some(stream_context_create(ctx_options)), - ); + // TODO(phase-b): file_get_contents only takes a path; stream context arg dropped. + let _ = stream_context_create(&ctx_options, None); + let test_connectivity = file_get_contents("https://8.8.8.8"); Silencer::restore(); if test_connectivity.is_some() { return Some(vec![ diff --git a/crates/shirabe/src/util/loop.rs b/crates/shirabe/src/util/loop.rs index 9ffee8f..9f8493b 100644 --- a/crates/shirabe/src/util/loop.rs +++ b/crates/shirabe/src/util/loop.rs @@ -8,7 +8,6 @@ use shirabe_external_packages::react::promise::promise_interface::PromiseInterfa use shirabe_external_packages::symfony::component::console::helper::progress_bar::ProgressBar; use shirabe_php_shim::microtime; -#[derive(Debug)] pub struct Loop { http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, process_executor: Option<std::rc::Rc<std::cell::RefCell<ProcessExecutor>>>, @@ -16,6 +15,16 @@ pub struct Loop { wait_index: i64, } +impl std::fmt::Debug for Loop { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("Loop") + .field("http_downloader", &self.http_downloader) + .field("process_executor", &self.process_executor) + .field("wait_index", &self.wait_index) + .finish() + } +} + impl Loop { pub fn new( http_downloader: std::rc::Rc<std::cell::RefCell<HttpDownloader>>, @@ -49,15 +58,17 @@ impl Loop { pub fn wait( &mut self, promises: Vec<Box<dyn PromiseInterface>>, - progress: Option<&mut ProgressBar>, + mut progress: Option<&mut ProgressBar>, ) -> Result<()> { - let mut uncaught: Option<anyhow::Error> = None; + let uncaught: Option<anyhow::Error> = None; - shirabe_external_packages::react::promise::all(&promises).then( - || {}, - |e: anyhow::Error| { - uncaught = Some(e); - }, + // TODO(phase-b): Promise::then captures uncaught by Fn; needs a Cell/RefCell wrapper + // and a thunk that matches FnOnce(Option<PhpMixed>) -> Option<PhpMixed>. + let _ = shirabe_external_packages::react::promise::all( + promises + .iter() + .map(|_| todo!("clone Box<dyn PromiseInterface>")) + .collect(), ); // keep track of every group of promises that is waited on, so abortJobs can @@ -66,13 +77,13 @@ impl Loop { self.wait_index += 1; self.current_promises.insert(wait_index, promises); - if let Some(ref progress) = progress { + if let Some(ref mut progress) = progress { let mut total_jobs: i64 = 0; total_jobs += self.http_downloader.borrow_mut().count_active_jobs(None); if let Some(ref pe) = self.process_executor { total_jobs += pe.borrow_mut().count_active_jobs(None); } - progress.start(total_jobs); + progress.start(Some(total_jobs)); } let mut last_update: f64 = 0.0; @@ -84,10 +95,11 @@ impl Loop { active_jobs += pe.borrow_mut().count_active_jobs(None); } - if let Some(ref progress) = progress { + if let Some(ref mut progress) = progress { if microtime(true) - last_update > 0.1 { last_update = microtime(true); - progress.set_progress(progress.get_max_steps() - active_jobs); + let new_progress = progress.get_max_steps() - active_jobs; + progress.set_progress(new_progress); } } @@ -97,7 +109,7 @@ impl Loop { } // as we skip progress updates if they are too quick, make sure we do one last one here at 100% - if let Some(ref progress) = progress { + if let Some(ref mut progress) = progress { progress.finish(); } @@ -111,9 +123,9 @@ impl Loop { pub fn abort_jobs(&self) { for promise_group in self.current_promises.values() { - for promise in promise_group { - // to support react/promise 2.x we wrap the promise in a resolve() call for safety - shirabe_external_packages::react::promise::resolve(Some(promise)).cancel(); + for _promise in promise_group { + // TODO(phase-b): cancel requires CancellablePromiseInterface; PromiseInterface trait + // doesn't expose it. Drop the wrap+cancel until we have the right trait. } } } diff --git a/crates/shirabe/src/util/perforce.rs b/crates/shirabe/src/util/perforce.rs index d4d39ea..0182437 100644 --- a/crates/shirabe/src/util/perforce.rs +++ b/crates/shirabe/src/util/perforce.rs @@ -92,7 +92,7 @@ impl Perforce { "-s".to_string(), ], &mut ignored_output, - None, + Option::<&str>::None, ) == 0 } @@ -169,7 +169,7 @@ impl Perforce { }; self.process .borrow_mut() - .execute_args(&cmd_vec, &mut self.command_result, None) + .execute_args(&cmd_vec, &mut self.command_result, ()) } pub fn get_client(&mut self) -> String { @@ -245,7 +245,8 @@ impl Perforce { /// @return non-empty-string pub fn get_p4_client_spec(&mut self) -> String { - format!("{}/{}.p4.spec", self.path, self.get_client()) + let path = self.path.clone(); + format!("{}/{}.p4.spec", path, self.get_client()) } pub fn get_user(&self) -> Option<String> { @@ -391,12 +392,7 @@ impl Perforce { self.generate_p4_command(vec!["client".to_string(), "-i".to_string()], true); let mut process = Process::new( - PhpMixed::List( - p4_create_client_command - .into_iter() - .map(|s| Box::new(PhpMixed::String(s))) - .collect(), - ), + p4_create_client_command, None, None, file_get_contents(&self.get_p4_client_spec()), @@ -546,18 +542,7 @@ impl Perforce { pub fn windows_login(&mut self, password: Option<&str>) -> i64 { let command = self.generate_p4_command(vec!["login".to_string(), "-a".to_string()], true); - let mut process = Process::new( - PhpMixed::List( - command - .into_iter() - .map(|s| Box::new(PhpMixed::String(s))) - .collect(), - ), - None, - None, - password.map(|s| s.to_string()), - None, - ); + let mut process = Process::new(command, None, None, password.map(|s| s.to_string()), None); process.run(None) } @@ -572,18 +557,7 @@ impl Perforce { let command = self.generate_p4_command(vec!["login".to_string(), "-a".to_string()], false); - let mut process = Process::new( - PhpMixed::List( - command - .into_iter() - .map(|s| Box::new(PhpMixed::String(s))) - .collect(), - ), - None, - None, - password, - None, - ); + let mut process = Process::new(command, None, None, password, None); process.run(None); if !process.is_successful() { @@ -717,8 +691,9 @@ impl Perforce { let branch = Preg::replace( r"/[^A-Za-z0-9 ]/", "", - res_bits.get(4).cloned().unwrap_or_default(), - ); + &res_bits.get(4).cloned().unwrap_or_default(), + ) + .unwrap_or_default(); possible_branches.insert(branch, res_bits.get(1).cloned().unwrap_or_default()); } } @@ -872,7 +847,7 @@ impl Perforce { .get_or_init(|| { let finder = ExecutableFinder::new(); finder - .find("p4", None, vec![]) + .find("p4", None, &[]) .unwrap_or_else(|| "p4".to_string()) }) .clone() diff --git a/crates/shirabe/src/util/platform.rs b/crates/shirabe/src/util/platform.rs index 1f684d8..64b3ae7 100644 --- a/crates/shirabe/src/util/platform.rs +++ b/crates/shirabe/src/util/platform.rs @@ -401,11 +401,11 @@ impl Platform { // TODO(phase-b): PHP_OS_FAMILY constant comparison && true { - let process = ProcessExecutor::new(); + let mut process = ProcessExecutor::new(None); // TODO(phase-b): inner Result for catch(\Exception); use anyhow::Result<Result<_, _>> let mut output = String::new(); let result: Result<()> = (|| { - if process.execute(&["lsmod"], &mut output)? == 0 + if process.execute_args(&["lsmod".to_string()], &mut output, ()) == 0 && shirabe_php_shim::str_contains(&output, "vboxguest") { *cached = Some(true); @@ -431,4 +431,26 @@ impl Platform { "/dev/null".to_string() } + + /// PHP: PHP_OS — returns the OS PHP was built on. + pub fn php_os() -> &'static str { + // TODO(phase-b): map to actual OS name (e.g. "Darwin", "Linux", "WINNT"). + todo!() + } + + /// PHP: rename($from, $to) — wrap the std rename so callers can use Platform::rename. + pub fn rename(from: &str, to: &str) -> bool { + std::fs::rename(from, to).is_ok() + } + + /// PHP: mkdir($pathname, $mode, $recursive) + pub fn mkdir(pathname: &str, _mode: u32, recursive: bool) -> bool { + // TODO(phase-b): honor mode bits on Unix + let result = if recursive { + std::fs::create_dir_all(pathname) + } else { + std::fs::create_dir(pathname) + }; + result.is_ok() + } } diff --git a/crates/shirabe/src/util/process_executor.rs b/crates/shirabe/src/util/process_executor.rs index d0410ff..41cb9f1 100644 --- a/crates/shirabe/src/util/process_executor.rs +++ b/crates/shirabe/src/util/process_executor.rs @@ -49,7 +49,6 @@ pub struct ProcessExecutor { allow_async: bool, } -#[derive(Debug)] struct Job { id: i64, status: i64, @@ -60,6 +59,18 @@ struct Job { reject: Option<Box<dyn Fn(PhpMixed) + Send + Sync>>, } +impl std::fmt::Debug for Job { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("Job") + .field("id", &self.id) + .field("status", &self.status) + .field("command", &self.command) + .field("cwd", &self.cwd) + .field("process", &self.process) + .finish() + } +} + impl ProcessExecutor { const STATUS_QUEUED: i64 = 1; const STATUS_STARTED: i64 = 2; @@ -79,11 +90,11 @@ impl ProcessExecutor { const GIT_CMDS_NEED_GIT_DIR: &'static [&'static [&'static str]] = &[&["show"], &["log"], &["branch"], &["remote", "set-url"]]; - pub fn new(io: Option<Box<dyn IOInterface>>) -> Self { + pub fn new<I: IntoProcessExecutorIo>(io: I) -> Self { let mut this = Self { capture_output: false, error_output: String::new(), - io, + io: io.into_process_executor_io(), jobs: IndexMap::new(), running_jobs: 0, max_jobs: 10, @@ -101,30 +112,42 @@ impl ProcessExecutor { /// if a callable is passed it will be used as output handler /// @param null|string $cwd the working directory /// @return int statuscode - pub fn execute( - &mut self, - command: PhpMixed, - output: Option<&mut PhpMixed>, - cwd: Option<&str>, - ) -> Result<i64> { + pub fn execute<'o, C, O, W>(&mut self, command: C, output: O, cwd: W) -> Result<i64> + where + C: IntoExecCommand, + O: IntoExecOutput<'o>, + W: IntoExecCwd, + { + let command = command.into_exec_command(); + let mut output = output.into_exec_output(); + let cwd_storage; + let cwd_ref: Option<&str> = match cwd.into_exec_cwd() { + Some(s) => { + cwd_storage = s; + Some(cwd_storage.as_str()) + } + None => None, + }; // PHP: func_num_args() > 1 - let has_output_arg = output.is_some(); - if has_output_arg { - return self.do_execute(command, cwd, false, output); - } - - self.do_execute(command, cwd, false, None) + let has_output_arg = output.has_output(); + let rc = if has_output_arg { + let mut buf = PhpMixed::Null; + let result = self.do_execute(command, cwd_ref, false, Some(&mut buf))?; + output.write_back(buf); + result + } else { + self.do_execute(command, cwd_ref, false, None)? + }; + Ok(rc) } /// Convenience wrapper used by phase-A code that calls /// `process.execute(&[String], &mut String, Option<&str>) == 0`. /// Forwards to `execute`, returning the status code (0 on Err for compatibility). - pub fn execute_args<C: AsRef<str>>( - &mut self, - command: &[String], - output: &mut String, - cwd: Option<C>, - ) -> i64 { + pub fn execute_args<W>(&mut self, command: &[String], output: &mut String, cwd: W) -> i64 + where + W: IntoExecCwd, + { let cmd = PhpMixed::List( command .iter() @@ -132,19 +155,39 @@ impl ProcessExecutor { .collect(), ); let mut buf = PhpMixed::String(String::new()); - let cwd_str: Option<&str> = cwd.as_ref().map(|s| s.as_ref()); - let rc = self.execute(cmd, Some(&mut buf), cwd_str).unwrap_or(1); + let cwd_storage; + let cwd_ref: Option<&str> = match cwd.into_exec_cwd() { + Some(s) => { + cwd_storage = s; + Some(cwd_storage.as_str()) + } + None => None, + }; + let rc = self.execute(cmd, Some(&mut buf), cwd_ref).unwrap_or(1); *output = buf.as_string().unwrap_or("").to_string(); rc } /// runs a process on the commandline in TTY mode - pub fn execute_tty(&mut self, command: PhpMixed, cwd: Option<&str>) -> Result<i64> { + pub fn execute_tty<C, W>(&mut self, command: C, cwd: W) -> Result<i64> + where + C: IntoExecCommand, + W: IntoExecCwd, + { + let command = command.into_exec_command(); + let cwd_storage; + let cwd_ref: Option<&str> = match cwd.into_exec_cwd() { + Some(s) => { + cwd_storage = s; + Some(cwd_storage.as_str()) + } + None => None, + }; if Platform::is_tty(None) { - return self.do_execute(command, cwd, true, None); + return self.do_execute(command, cwd_ref, true, None); } - self.do_execute(command, cwd, false, None) + self.do_execute(command, cwd_ref, false, None) } /// @param string|non-empty-list<string> $command @@ -171,7 +214,7 @@ impl ProcessExecutor { let m1 = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); command_str = substr_replace( &command_str, - &Self::escape(PhpMixed::String(Self::get_executable(&m1))), + &Self::escape(&Self::get_executable(&m1)), 0, strlen(&m1) as usize, ); @@ -183,7 +226,7 @@ impl ProcessExecutor { cwd, env.clone(), None, - Self::get_timeout(), + Some(Self::get_timeout() as f64), ); } else if let PhpMixed::List(ref list) = command { let mut cmd_vec: Vec<String> = list @@ -195,7 +238,13 @@ impl ProcessExecutor { cmd_vec[0] = Self::get_executable(&cmd_vec[0]); } - process = Process::new(cmd_vec, cwd, env, None, Self::get_timeout()); + process = Process::new( + cmd_vec, + cwd.map(String::from), + env, + None, + Some(Self::get_timeout() as f64), + ); } else { return Err(LogicException { message: "Invalid command type".to_string(), @@ -214,7 +263,8 @@ impl ProcessExecutor { } } - let _callback: Box<dyn Fn(&str, &str)> = if is_callable(output.as_deref().cloned()) { + let output_is_callable = output.as_deref().map(|o| is_callable(o)).unwrap_or(false); + let _callback: Box<dyn Fn(&str, &str)> = if output_is_callable { // TODO(phase-b): adapt output PhpMixed callable to closure Box::new(|_t: &str, _b: &str| {}) } else { @@ -226,9 +276,9 @@ impl ProcessExecutor { let io_for_signal = self.io.as_ref().map(|b| &**b as *const dyn IOInterface); let signal_handler = SignalHandler::create( vec![ - SignalHandler::SIGINT, - SignalHandler::SIGTERM, - SignalHandler::SIGHUP, + SignalHandler::SIGINT.to_string(), + SignalHandler::SIGTERM.to_string(), + SignalHandler::SIGHUP.to_string(), ], Box::new(move |signal: String, _h: &SignalHandler| { if let Some(io_ptr) = io_for_signal { @@ -242,9 +292,11 @@ impl ProcessExecutor { ); let result: Result<()> = (|| -> Result<()> { - process.run(/* callback */ Box::new(|_t: &str, _b: &str| {}))?; + let _ = process.run(/* callback */ Some(Box::new(|_t: &str, _b: &str| {}))); - if self.capture_output && !is_callable(output.as_deref().cloned()) { + let output_is_callable_inner = + output.as_deref().map(|o| is_callable(o)).unwrap_or(false); + if self.capture_output && !output_is_callable_inner { if let Some(out) = output.as_mut() { **out = PhpMixed::String(process.get_output()); } @@ -323,11 +375,13 @@ impl ProcessExecutor { } /// starts a process on the commandline in async mode - pub fn execute_async( - &mut self, - command: PhpMixed, - cwd: Option<&str>, - ) -> Result<Box<dyn PromiseInterface>> { + pub fn execute_async<C, W>(&mut self, command: C, cwd: W) -> Result<Box<dyn PromiseInterface>> + where + C: IntoExecCommand, + W: IntoExecCwd, + { + let command = command.into_exec_command(); + let cwd_opt = cwd.into_exec_cwd(); if !self.allow_async { return Err(LogicException { message: "You must use the ProcessExecutor instance which is part of a Composer\\Loop instance to be able to run async processes".to_string(), @@ -342,14 +396,15 @@ impl ProcessExecutor { id, status: Self::STATUS_QUEUED, command, - cwd: cwd.map(String::from), + cwd: cwd_opt, process: None, resolve: None, reject: None, }; // TODO(phase-b): build resolver/canceler closures bound to &mut self.jobs - let resolver: Box<dyn Fn(_, _)> = Box::new(|_resolve, _reject| {}); + let resolver: Box<dyn Fn(Option<PhpMixed>, Option<PhpMixed>)> = + Box::new(|_resolve, _reject| {}); let canceler: Box<dyn Fn()> = Box::new(|| { if defined("SIGINT") { // job.process.signal(SIGINT) @@ -358,7 +413,7 @@ impl ProcessExecutor { }); let _ = (resolver, canceler); - let promise = Promise::new(Box::new(|_resolve, _reject| {}), Box::new(|| {})); + let promise = Promise::new(Box::new(|_resolve, _reject| {})); // TODO(phase-b): wire promise.then() side-effects: mark job done & update status let promise: Box<dyn PromiseInterface> = Box::new(promise); @@ -421,17 +476,17 @@ impl ProcessExecutor { cwd.as_deref(), None, None, - Self::get_timeout(), + Some(Self::get_timeout() as f64), )) } else if let PhpMixed::List(ref list) = command { Ok(Process::new( list.iter() .map(|v| v.as_string().unwrap_or("").to_string()) .collect(), - cwd.as_deref(), + cwd.clone(), None, None, - Self::get_timeout(), + Some(Self::get_timeout() as f64), )) } else { Err(LogicException { @@ -441,7 +496,7 @@ impl ProcessExecutor { .into()) } })(); - let mut process = match process_result { + let process = match process_result { Ok(p) => p, Err(_e) => { // job.reject(e) — TODO(phase-b) @@ -450,12 +505,14 @@ impl ProcessExecutor { }; if let Some(job) = self.jobs.get_mut(&id) { - job.process = Some(process.clone()); + job.process = Some(process); } - if let Err(_e) = process.start() { - // job.reject(e) — TODO(phase-b) - return; + // PHP: $process->start($callback); — we operate on the stored job.process directly + if let Some(job) = self.jobs.get_mut(&id) { + if let Some(p) = job.process.as_mut() { + p.start(None); + } } } @@ -465,7 +522,11 @@ impl ProcessExecutor { pub fn reset_max_jobs(&mut self) { let max_jobs_env = Platform::get_env("COMPOSER_MAX_PARALLEL_PROCESSES"); - if is_numeric(&max_jobs_env) { + let max_jobs_env_mixed = match &max_jobs_env { + Some(s) => PhpMixed::String(s.clone()), + None => PhpMixed::Null, + }; + if is_numeric(&max_jobs_env_mixed) { self.max_jobs = max( 1, min( @@ -568,13 +629,13 @@ impl ProcessExecutor { } /// @return string[] - pub fn split_lines(&self, output: Option<&str>) -> Vec<String> { - let output = trim(output.unwrap_or(""), None); + pub fn split_lines(&self, output: &str) -> Vec<String> { + let output = trim(output, None); if output.is_empty() { vec![] } else { - Preg::split(r"{\r?\n}", &output) + Preg::split(r"{\r?\n}", &output).unwrap_or_default() } } @@ -589,12 +650,12 @@ impl ProcessExecutor { } /// @param int $timeout the timeout in seconds - pub fn set_timeout(timeout: i64) { - *TIMEOUT.lock().unwrap() = timeout; + pub fn set_timeout<T: ToTimeoutSeconds>(timeout: T) { + *TIMEOUT.lock().unwrap() = timeout.to_timeout_seconds(); } /// Escapes a string to be used as a shell argument. - pub fn escape(argument: PhpMixed) -> String { + pub fn escape(argument: &str) -> String { Self::escape_argument(argument) } @@ -608,7 +669,7 @@ impl ProcessExecutor { command.as_string().unwrap_or("").to_string() } else if let PhpMixed::List(list) = command { let parts: Vec<String> = array_map( - |v| Self::escape(v.clone()), + |v| Self::escape(v.as_string().unwrap_or("")), &list.iter().map(|b| (**b).clone()).collect::<Vec<_>>(), ); implode(" ", &parts) @@ -617,11 +678,12 @@ impl ProcessExecutor { }; let safe_command = Preg::replace_callback( r"{://(?P<user>[^:/\s]+):(?P<password>[^@\s/]+)@}i", - |m: &IndexMap<String, String>| -> String { + |m: &IndexMap<CaptureKey, String>| -> String { + let user_key = CaptureKey::ByName("user".to_string()); // if the username looks like a long (12char+) hex string, or a modern github token (e.g. ghp_xxx, github_pat_xxx) we obfuscate that if Preg::is_match( GitHub::GITHUB_TOKEN_REGEX, - m.get("user").cloned().unwrap_or_default().as_str(), + m.get(&user_key).cloned().unwrap_or_default().as_str(), ) .unwrap_or(false) { @@ -629,22 +691,24 @@ impl ProcessExecutor { } if Preg::is_match( r"{^[a-f0-9]{12,}$}", - m.get("user").cloned().unwrap_or_default().as_str(), + m.get(&user_key).cloned().unwrap_or_default().as_str(), ) .unwrap_or(false) { return "://***:***@".to_string(); } - format!("://{}:***@", m.get("user").cloned().unwrap_or_default()) + format!("://{}:***@", m.get(&user_key).cloned().unwrap_or_default()) }, &command_string, - ); + ) + .unwrap_or_default(); let safe_command = Preg::replace( r"{--password (.*[^\\]') }", "--password '***' ", &safe_command, - ); + ) + .unwrap_or_default(); self.io.as_ref().unwrap().write_error(&format!( "Executing{} command ({}): {}", if r#async { " async" } else { "" }, @@ -654,8 +718,8 @@ impl ProcessExecutor { } /// Escapes a string to be used as a shell argument for Symfony Process. - fn escape_argument(argument: PhpMixed) -> String { - let mut argument = argument.as_string().unwrap_or("").to_string(); + fn escape_argument(argument: &str) -> String { + let mut argument = argument.to_string(); if "" == argument { return escapeshellarg(&argument); } @@ -690,10 +754,10 @@ impl ProcessExecutor { // In addition to whitespace, commas need quoting to preserve paths let mut quote = strpbrk(&argument, " \t,").is_some(); - let mut dquotes: i64 = 0; + let mut dquotes: usize = 0; // PHP: Preg::replace('/(\\\\*)"/', '$1$1\\"', $argument, -1, $dquotes) - argument = - Preg::replace_with_count(r#"/(\\*)"/"#, r#"$1$1\""#, &argument, -1, &mut dquotes); + argument = Preg::replace5(r#"/(\\*)"/"#, r#"$1$1\""#, &argument, -1, &mut dquotes) + .unwrap_or_default(); let meta = dquotes > 0 || Preg::is_match(r"/%[^%]+%|![^!]+!/", &argument).unwrap_or(false); if !meta && !quote { @@ -701,12 +765,15 @@ impl ProcessExecutor { } if quote { - argument = format!("\"{}\"", Preg::replace(r"/(\\*)$/", "$1$1", &argument)); + argument = format!( + "\"{}\"", + Preg::replace(r"/(\\*)$/", "$1$1", &argument).unwrap_or_default() + ); } if meta { - argument = Preg::replace(r#"/(["^&|<>()%])/"#, "^$1", &argument); - argument = Preg::replace(r"/(!)/", "^^$1", &argument); + argument = Preg::replace(r#"/(["^&|<>()%])/"#, "^$1", &argument).unwrap_or_default(); + argument = Preg::replace(r"/(!)/", "^^$1", &argument).unwrap_or_default(); } argument @@ -761,7 +828,7 @@ impl ProcessExecutor { let mut executables = EXECUTABLES.lock().unwrap(); if !executables.contains_key(name) { - let path = ExecutableFinder::new().find(name, Some(name)); + let path = ExecutableFinder::new().find(name, Some(name), &[]); if let Some(p) = path { executables.insert(name.to_string(), p); } @@ -791,9 +858,266 @@ impl Clone for ProcessExecutor { } } +/// Phase B helper trait: convert various command argument forms into `PhpMixed`. +pub trait IntoExecCommand { + fn into_exec_command(self) -> PhpMixed; +} + +impl IntoExecCommand for PhpMixed { + fn into_exec_command(self) -> PhpMixed { + self + } +} + +impl IntoExecCommand for &PhpMixed { + fn into_exec_command(self) -> PhpMixed { + self.clone() + } +} + +impl IntoExecCommand for &str { + fn into_exec_command(self) -> PhpMixed { + PhpMixed::String(self.to_string()) + } +} + +impl IntoExecCommand for String { + fn into_exec_command(self) -> PhpMixed { + PhpMixed::String(self) + } +} + +impl IntoExecCommand for &String { + fn into_exec_command(self) -> PhpMixed { + PhpMixed::String(self.clone()) + } +} + +impl IntoExecCommand for Vec<String> { + fn into_exec_command(self) -> PhpMixed { + PhpMixed::List( + self.into_iter() + .map(|s| Box::new(PhpMixed::String(s))) + .collect(), + ) + } +} + +impl IntoExecCommand for &Vec<String> { + fn into_exec_command(self) -> PhpMixed { + PhpMixed::List( + self.iter() + .map(|s| Box::new(PhpMixed::String(s.clone()))) + .collect(), + ) + } +} + +impl<const N: usize> IntoExecCommand for &[&str; N] { + fn into_exec_command(self) -> PhpMixed { + PhpMixed::List( + self.iter() + .map(|s| Box::new(PhpMixed::String(s.to_string()))) + .collect(), + ) + } +} + +impl IntoExecCommand for &[&str] { + fn into_exec_command(self) -> PhpMixed { + PhpMixed::List( + self.iter() + .map(|s| Box::new(PhpMixed::String(s.to_string()))) + .collect(), + ) + } +} + +impl IntoExecCommand for &[String] { + fn into_exec_command(self) -> PhpMixed { + PhpMixed::List( + self.iter() + .map(|s| Box::new(PhpMixed::String(s.clone()))) + .collect(), + ) + } +} + +/// Phase B helper trait: write captured output back to the caller's buffer. +pub trait IntoExecOutput<'a> { + type Sink: ExecOutputSink + 'a; + fn into_exec_output(self) -> Self::Sink; +} + +pub trait ExecOutputSink { + fn has_output(&self) -> bool; + fn write_back(&mut self, value: PhpMixed); +} + +pub struct NoOutput; +impl ExecOutputSink for NoOutput { + fn has_output(&self) -> bool { + false + } + fn write_back(&mut self, _value: PhpMixed) {} +} + +pub struct PhpMixedOutput<'a>(Option<&'a mut PhpMixed>); +impl<'a> ExecOutputSink for PhpMixedOutput<'a> { + fn has_output(&self) -> bool { + self.0.is_some() + } + fn write_back(&mut self, value: PhpMixed) { + if let Some(out) = self.0.as_deref_mut() { + *out = value; + } + } +} + +pub struct StringOutput<'a>(&'a mut String); +impl<'a> ExecOutputSink for StringOutput<'a> { + fn has_output(&self) -> bool { + true + } + fn write_back(&mut self, value: PhpMixed) { + *self.0 = value.as_string().unwrap_or("").to_string(); + } +} + +impl<'a> IntoExecOutput<'a> for () { + type Sink = NoOutput; + fn into_exec_output(self) -> NoOutput { + NoOutput + } +} + +impl<'a> IntoExecOutput<'a> for Option<&'a mut PhpMixed> { + type Sink = PhpMixedOutput<'a>; + fn into_exec_output(self) -> PhpMixedOutput<'a> { + PhpMixedOutput(self) + } +} + +impl<'a> IntoExecOutput<'a> for &'a mut PhpMixed { + type Sink = PhpMixedOutput<'a>; + fn into_exec_output(self) -> PhpMixedOutput<'a> { + PhpMixedOutput(Some(self)) + } +} + +impl<'a> IntoExecOutput<'a> for &'a mut String { + type Sink = StringOutput<'a>; + fn into_exec_output(self) -> StringOutput<'a> { + StringOutput(self) + } +} + +/// Phase B helper trait: convert various cwd argument forms into `Option<String>`. +pub trait IntoExecCwd { + fn into_exec_cwd(self) -> Option<String>; +} + +impl IntoExecCwd for () { + fn into_exec_cwd(self) -> Option<String> { + None + } +} + +impl IntoExecCwd for Option<&str> { + fn into_exec_cwd(self) -> Option<String> { + self.map(|s| s.to_string()) + } +} + +impl IntoExecCwd for Option<String> { + fn into_exec_cwd(self) -> Option<String> { + self + } +} + +impl IntoExecCwd for Option<&String> { + fn into_exec_cwd(self) -> Option<String> { + self.cloned() + } +} + +impl IntoExecCwd for &str { + fn into_exec_cwd(self) -> Option<String> { + Some(self.to_string()) + } +} + +impl IntoExecCwd for String { + fn into_exec_cwd(self) -> Option<String> { + Some(self) + } +} + +impl IntoExecCwd for &String { + fn into_exec_cwd(self) -> Option<String> { + Some(self.clone()) + } +} + +/// Phase B helper: accept either `i64` or `PhpMixed` for `set_timeout`. +pub trait ToTimeoutSeconds { + fn to_timeout_seconds(self) -> i64; +} + +impl ToTimeoutSeconds for i64 { + fn to_timeout_seconds(self) -> i64 { + self + } +} + +impl ToTimeoutSeconds for PhpMixed { + fn to_timeout_seconds(self) -> i64 { + self.as_int().unwrap_or(0) + } +} + +/// Phase B helper: accept various IO forms for `ProcessExecutor::new`. +/// Note: clones the IO via `clone_box` for borrow forms; this is incidental +/// to Phase B — PHP class semantics should use Rc, but that requires broader +/// refactor. TODO(phase-b): switch to shared ownership when call sites are +/// stabilized. +pub trait IntoProcessExecutorIo { + fn into_process_executor_io(self) -> Option<Box<dyn IOInterface>>; +} + +impl IntoProcessExecutorIo for Option<Box<dyn IOInterface>> { + fn into_process_executor_io(self) -> Option<Box<dyn IOInterface>> { + self + } +} + +impl IntoProcessExecutorIo for Box<dyn IOInterface> { + fn into_process_executor_io(self) -> Option<Box<dyn IOInterface>> { + Some(self) + } +} + +impl IntoProcessExecutorIo for () { + fn into_process_executor_io(self) -> Option<Box<dyn IOInterface>> { + None + } +} + +impl IntoProcessExecutorIo for &dyn IOInterface { + fn into_process_executor_io(self) -> Option<Box<dyn IOInterface>> { + Some(self.clone_box()) + } +} + +impl IntoProcessExecutorIo for &mut dyn IOInterface { + fn into_process_executor_io(self) -> Option<Box<dyn IOInterface>> { + Some(self.clone_box()) + } +} + // Suppress unused-import warnings. #[allow(dead_code)] const _USE_PARITY: () = { - let _ = call_user_func; + let _ = call_user_func::<PhpMixed>; let _ = sprintf; }; diff --git a/crates/shirabe/src/util/remote_filesystem.rs b/crates/shirabe/src/util/remote_filesystem.rs index 7c10640..0ad5ff3 100644 --- a/crates/shirabe/src/util/remote_filesystem.rs +++ b/crates/shirabe/src/util/remote_filesystem.rs @@ -5,9 +5,11 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; use shirabe_php_shim::{ FILTER_VALIDATE_BOOLEAN, PHP_URL_HOST, PHP_URL_PATH, PHP_VERSION_ID, PhpMixed, - RuntimeException, array_replace_recursive, base64_encode, explode, extension_loaded, - file_put_contents, filter_var, ini_get, json_decode, parse_url, preg_quote, - restore_error_handler, set_error_handler, sprintf, strpos, strtolower, strtr, substr, trim, + RuntimeException, STREAM_NOTIFY_FAILURE, STREAM_NOTIFY_FILE_SIZE_IS, STREAM_NOTIFY_PROGRESS, + array_replace_recursive, base64_encode, explode, extension_loaded, file_put_contents, + filter_var, gethostbyname, http_clear_last_response_headers, http_get_last_response_headers, + ini_get, json_decode, parse_url, preg_quote, restore_error_handler, set_error_handler, sprintf, + strpos, strtolower, strtr, substr, trim, zlib_decode, }; use crate::config::Config; @@ -62,7 +64,9 @@ impl RemoteFilesystem { ) -> Self { let (computed_options, disable_tls_set) = if !disable_tls { ( - StreamContextFactory::get_tls_defaults(&options, &*io), + // TODO(phase-b): logger is None placeholder; should pass `&*io` if a Logger view is available. + StreamContextFactory::get_tls_defaults(&options, None) + .unwrap_or_else(|_| IndexMap::new()), false, ) } else { @@ -240,7 +244,7 @@ impl RemoteFilesystem { if self.degraded_mode && strpos(&file_url, "http://repo.packagist.org/") == Some(0) { file_url = format!( "http://{}{}", - Platform::gethostbyname("repo.packagist.org"), + gethostbyname("repo.packagist.org"), substr(&file_url, 20, None) ); degraded_packagist = true; @@ -253,10 +257,20 @@ impl RemoteFilesystem { } // TODO(plugin): `Closure::fromCallable([$this, 'callbackGet'])` for stream notification. - let ctx = StreamContextFactory::get_context(&file_url, &options, &IndexMap::new()); + let ctx = StreamContextFactory::get_context(&file_url, options.clone(), IndexMap::new()) + .map_err(|e| anyhow::anyhow!(e))?; - let proxy = ProxyManager::get_instance().get_proxy_for_request(&file_url); - let using_proxy = proxy.get_status(" using proxy (%s)"); + let using_proxy = { + let proxy_manager_guard = ProxyManager::get_instance().lock().unwrap(); + let proxy = proxy_manager_guard + .as_ref() + .expect("ProxyManager instance") + .get_proxy_for_request(&file_url) + .map_err(|e| anyhow::anyhow!(e))?; + proxy + .get_status(Some(" using proxy (%s)")) + .unwrap_or_default() + }; self.io.write_error3( &format!( "{}{}{}", @@ -265,7 +279,7 @@ impl RemoteFilesystem { } else { "Reading " }, - Url::sanitize(&orig_file_url), + Url::sanitize(orig_file_url.clone()), using_proxy ), true, @@ -319,7 +333,11 @@ impl RemoteFilesystem { .as_deref() .map(|s| json_decode(s, true).unwrap_or(PhpMixed::Null)) .unwrap_or(PhpMixed::Null); - HttpDownloader::output_warnings(&*self.io, origin_url, &parsed); + let parsed_map: IndexMap<String, PhpMixed> = match parsed { + PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(), + _ => IndexMap::new(), + }; + let _ = HttpDownloader::output_warnings(&*self.io, origin_url, &parsed_map); } if [401_i64, 403].contains(&code) && retry_auth_failure { @@ -342,11 +360,14 @@ impl RemoteFilesystem { if let Some(cl) = content_length { let cl_int: i64 = cl.parse().unwrap_or(0); if cl_int > 0 && Platform::strlen(result.as_deref().unwrap_or("")) < cl_int { - let mut e = TransportException::new(format!( - "Content-Length mismatch, received {} bytes out of the expected {}", - Platform::strlen(result.as_deref().unwrap_or("")), - cl_int - )); + let mut e = TransportException::new( + format!( + "Content-Length mismatch, received {} bytes out of the expected {}", + Platform::strlen(result.as_deref().unwrap_or("")), + cl_int + ), + 0, + ); e.set_headers(http_response_header.clone()); e.set_status_code(Self::find_status_code(&http_response_header)); let decoded = self @@ -407,13 +428,15 @@ impl RemoteFilesystem { self.degraded_mode = true; self.io .write_error3("", true, crate::io::io_interface::NORMAL); - self.io.write_error3(PhpMixed::List(vec![ - Box::new(PhpMixed::String(format!("<error>{}</error>", msg_owned))), - Box::new(PhpMixed::String( - "<error>Retrying with degraded mode, check https://getcomposer.org/doc/articles/troubleshooting.md#degraded-mode for more info</error>" - .to_string(), - )), - ]), true, crate::io::io_interface::NORMAL); + // TODO(phase-b): PHP writeError accepts an array of lines; joined here with newline. + self.io.write_error3( + &format!( + "<error>{}</error>\n<error>Retrying with degraded mode, check https://getcomposer.org/doc/articles/troubleshooting.md#degraded-mode for more info</error>", + msg_owned, + ), + true, + crate::io::io_interface::NORMAL, + ); return self.get( &self.origin_url.clone(), @@ -461,11 +484,9 @@ impl RemoteFilesystem { } } - let gitlab_domains: Vec<String> = self - .config - .borrow_mut() - .get("gitlab-domains") - .and_then(|v| v.as_list()) + let gitlab_domains_value = self.config.borrow_mut().get("gitlab-domains"); + let gitlab_domains: Vec<String> = gitlab_domains_value + .as_list() .map(|l| { l.iter() .filter_map(|v| v.as_string().map(|s| s.to_string())) @@ -556,17 +577,15 @@ impl RemoteFilesystem { } self.degraded_mode = true; - self.io.write_error3(PhpMixed::List(vec![ - Box::new(PhpMixed::String("".to_string())), - Box::new(PhpMixed::String(format!( - "<error>Failed to decode response: {}</error>", - e - ))), - Box::new(PhpMixed::String( - "<error>Retrying with degraded mode, check https://getcomposer.org/doc/articles/troubleshooting.md#degraded-mode for more info</error>" - .to_string(), - )), - ]), true, crate::io::io_interface::NORMAL); + // TODO(phase-b): PHP writeError accepts an array of lines; joined here with newline. + self.io.write_error3( + &format!( + "\n<error>Failed to decode response: {}</error>\n<error>Retrying with degraded mode, check https://getcomposer.org/doc/articles/troubleshooting.md#degraded-mode for more info</error>", + e, + ), + true, + crate::io::io_interface::NORMAL, + ); return self.get( &self.origin_url.clone(), @@ -582,10 +601,13 @@ impl RemoteFilesystem { if result.is_some() && file_name.is_some() && !is_redirect { let result_str = result.as_deref().unwrap(); if result_str.is_empty() { - return Err(anyhow::anyhow!(TransportException::new(format!( - "\"{}\" appears broken, and returned an empty 200 response", - self.file_url - )))); + return Err(anyhow::anyhow!(TransportException::new( + format!( + "\"{}\" appears broken, and returned an empty 200 response", + self.file_url + ), + 0, + ))); } let put_error_message = String::new(); @@ -595,12 +617,15 @@ impl RemoteFilesystem { file_put_contents(file_name.as_deref().unwrap(), result_str.as_bytes()); restore_error_handler(); if write_result.is_none() { - return Err(anyhow::anyhow!(TransportException::new(format!( - "The \"{}\" file could not be written to {}: {}", - self.file_url, - file_name.as_deref().unwrap(), - put_error_message - )))); + return Err(anyhow::anyhow!(TransportException::new( + format!( + "The \"{}\" file could not be written to {}: {}", + self.file_url, + file_name.as_deref().unwrap(), + put_error_message + ), + 0, + ))); } let _ = put_error_message; } @@ -617,8 +642,10 @@ impl RemoteFilesystem { )?; if self.store_auth { - self.auth_helper - .store_auth(&self.origin_url, PhpMixed::Bool(self.store_auth)); + let _ = self.auth_helper.store_auth( + &self.origin_url, + crate::util::auth_helper::StoreAuth::Bool(self.store_auth), + ); self.store_auth = false; } @@ -642,13 +669,15 @@ impl RemoteFilesystem { self.degraded_mode = true; self.io .write_error3("", true, crate::io::io_interface::NORMAL); - self.io.write_error3(PhpMixed::List(vec![ - Box::new(PhpMixed::String(format!("<error>{}</error>", msg_owned))), - Box::new(PhpMixed::String( - "<error>Retrying with degraded mode, check https://getcomposer.org/doc/articles/troubleshooting.md#degraded-mode for more info</error>" - .to_string(), - )), - ]), true, crate::io::io_interface::NORMAL); + // TODO(phase-b): PHP writeError accepts an array of lines; joined here with newline. + self.io.write_error3( + &format!( + "<error>{}</error>\n<error>Retrying with degraded mode, check https://getcomposer.org/doc/articles/troubleshooting.md#degraded-mode for more info</error>", + msg_owned, + ), + true, + crate::io::io_interface::NORMAL, + ); return self.get( &self.origin_url.clone(), @@ -689,7 +718,7 @@ impl RemoteFilesystem { let mut result: Option<String> = None; if PHP_VERSION_ID >= 80400 { - Platform::http_clear_last_response_headers(); + http_clear_last_response_headers(); } let mut caught_e: Option<anyhow::Error> = None; @@ -713,8 +742,8 @@ impl RemoteFilesystem { } if PHP_VERSION_ID >= 80400 { - *response_headers = Platform::http_get_last_response_headers().unwrap_or_default(); - Platform::http_clear_last_response_headers(); + *response_headers = http_get_last_response_headers().unwrap_or_default(); + http_clear_last_response_headers(); } else { // TODO(phase-b): read the magic `$http_response_header` PHP variable. *response_headers = Vec::new(); @@ -737,7 +766,7 @@ impl RemoteFilesystem { bytes_max: i64, ) -> anyhow::Result<()> { match notification_code { - x if x == Platform::STREAM_NOTIFY_FAILURE => { + x if x == STREAM_NOTIFY_FAILURE => { if 400 == message_code { return Err(anyhow::anyhow!(TransportException::new_with_code( format!( @@ -749,10 +778,10 @@ impl RemoteFilesystem { ))); } } - x if x == Platform::STREAM_NOTIFY_FILE_SIZE_IS => { + x if x == STREAM_NOTIFY_FILE_SIZE_IS => { self.bytes_max = bytes_max; } - x if x == Platform::STREAM_NOTIFY_PROGRESS => { + x if x == STREAM_NOTIFY_PROGRESS => { if self.bytes_max > 0 && self.progress { let progression = std::cmp::min( 100_i64, @@ -784,28 +813,36 @@ impl RemoteFilesystem { reason: Option<String>, headers: Vec<String>, ) -> anyhow::Result<()> { + let file_url = self.file_url.clone(); + let origin_url = self.origin_url.clone(); let result = self.auth_helper.prompt_auth_if_needed( - &self.file_url, - &self.origin_url, + &file_url, + &origin_url, http_status, - reason, + reason.as_deref(), headers, 1, - ); + None, + )?; - self.store_auth = result.store_auth; + self.store_auth = matches!( + result.store_auth, + crate::util::auth_helper::StoreAuth::Bool(true) + | crate::util::auth_helper::StoreAuth::Prompt + ); self.retry = result.retry; if self.retry { return Err(anyhow::anyhow!(TransportException::new( - "RETRY".to_string() + "RETRY".to_string(), + 0, ))); } Ok(()) } fn get_options_for_url( - &self, + &mut self, origin_url: &str, additional_options: IndexMap<String, PhpMixed>, ) -> IndexMap<String, PhpMixed> { @@ -842,7 +879,7 @@ impl RemoteFilesystem { .as_string() .unwrap_or("") .to_string(); - let split = explode("\r\n", &trim(&header_str, "\r\n")); + let split = explode("\r\n", &trim(&header_str, Some("\r\n"))); if let Some(PhpMixed::Array(m)) = options.get_mut("http") { m.insert( "header".to_string(), @@ -855,9 +892,11 @@ impl RemoteFilesystem { ); } } + let file_url = self.file_url.clone(); options = self .auth_helper - .add_authentication_options(options, origin_url, &self.file_url); + .add_authentication_options(options, origin_url, &file_url) + .unwrap_or_else(|_| IndexMap::new()); let http_entry = options .entry("http".to_string()) @@ -941,7 +980,7 @@ impl RemoteFilesystem { "Following redirect (%u) %s", &[ PhpMixed::Int(self.redirects), - PhpMixed::String(Url::sanitize(&target_url)), + PhpMixed::String(Url::sanitize(target_url.clone())), ], ), true, @@ -968,11 +1007,14 @@ impl RemoteFilesystem { } if !self.retry { - let mut e = TransportException::new(format!( - "The \"{}\" file could not be downloaded, got redirect without Location ({})", - self.file_url, - response_headers.first().map(|s| s.as_str()).unwrap_or("") - )); + let mut e = TransportException::new( + format!( + "The \"{}\" file could not be downloaded, got redirect without Location ({})", + self.file_url, + response_headers.first().map(|s| s.as_str()).unwrap_or("") + ), + 0, + ); e.set_headers(response_headers.to_vec()); let decoded = self.decode_result(result.as_deref(), response_headers)?; e.set_response(decoded); @@ -998,13 +1040,14 @@ impl RemoteFilesystem { .unwrap_or(false); if decode { - let decoded = Platform::zlib_decode(result.as_deref().unwrap_or("")); + let decoded = zlib_decode(result.as_deref().unwrap_or("")); result = match decoded { Some(d) => Some(d), None => { return Err(anyhow::anyhow!(TransportException::new( - "Failed to decode zlib stream".to_string() + "Failed to decode zlib stream".to_string(), + 0, ))); } }; diff --git a/crates/shirabe/src/util/stream_context_factory.rs b/crates/shirabe/src/util/stream_context_factory.rs index a81a68a..783d47a 100644 --- a/crates/shirabe/src/util/stream_context_factory.rs +++ b/crates/shirabe/src/util/stream_context_factory.rs @@ -44,14 +44,14 @@ impl StreamContextFactory { ); let default_options = { let mut o = default_options; - if let Some(PhpMixed::Array(ref mut http)) = o.get_mut("http") { + if let Some(PhpMixed::Array(http)) = o.get_mut("http") { http.remove("header"); } o }; options = array_replace_recursive(options, default_options); - if let Some(PhpMixed::Array(ref mut http)) = options.get_mut("http") { + if let Some(PhpMixed::Array(http)) = options.get_mut("http") { if let Some(header) = http.get("header").cloned() { let fixed = Self::fix_http_header_field(&*header); http.insert( @@ -81,7 +81,7 @@ impl StreamContextFactory { .map(|a| a.contains_key("header")) .unwrap_or(false); if !has_header { - if let Some(PhpMixed::Array(ref mut http)) = options.get_mut("http") { + if let Some(PhpMixed::Array(http)) = options.get_mut("http") { http.insert("header".to_string(), Box::new(PhpMixed::List(vec![]))); } } @@ -93,7 +93,7 @@ impl StreamContextFactory { .map(|v| matches!(**v, PhpMixed::String(_))) .unwrap_or(false); if header_is_string { - if let Some(PhpMixed::Array(ref mut http)) = options.get_mut("http") { + if let Some(PhpMixed::Array(http)) = options.get_mut("http") { if let Some(PhpMixed::String(header_str)) = http.get("header").map(|v| *v.clone()) { let parts: Vec<Box<PhpMixed>> = header_str .split("\r\n") @@ -118,27 +118,30 @@ impl StreamContextFactory { return Err(TransportException::new( "You must enable the openssl extension to use a secure proxy." .to_string(), + 0, )); } if is_https_request { return Err(TransportException::new( "You must enable the curl extension to make https requests through a secure proxy.".to_string(), + 0, )); } } else if is_https_request && !extension_loaded("openssl") { return Err(TransportException::new( "You must enable the openssl extension to make https requests through a proxy.".to_string(), + 0, )); } // Header will be a Proxy-Authorization string or not set let proxy_http = proxy_options.get("http"); if let Some(proxy_header) = proxy_http.and_then(|h| h.get("header")) { - if let Some(PhpMixed::Array(ref mut http)) = options.get_mut("http") { - if let Some(PhpMixed::List(ref mut headers)) = + if let Some(PhpMixed::Array(http)) = options.get_mut("http") { + if let Some(PhpMixed::List(headers)) = http.get_mut("header").map(|v| &mut **v) { - headers.push(Box::new(*proxy_header.clone())); + headers.push(Box::new(proxy_header.clone())); } } } @@ -149,7 +152,7 @@ impl StreamContextFactory { let inner: IndexMap<String, Box<PhpMixed>> = v .iter() .filter(|(ik, _)| ik.as_str() != "header") - .map(|(ik, iv)| (ik.clone(), iv.clone())) + .map(|(ik, iv)| (ik.clone(), Box::new(iv.clone()))) .collect(); (k.clone(), PhpMixed::Array(inner)) }) @@ -223,10 +226,8 @@ impl StreamContextFactory { "" }, ); - if let Some(PhpMixed::Array(ref mut http)) = options.get_mut("http") { - if let Some(PhpMixed::List(ref mut headers)) = - http.get_mut("header").map(|v| &mut **v) - { + if let Some(PhpMixed::Array(http)) = options.get_mut("http") { + if let Some(PhpMixed::List(headers)) = http.get_mut("header").map(|v| &mut **v) { headers.push(Box::new(PhpMixed::String(user_agent))); } } @@ -339,11 +340,11 @@ impl StreamContextFactory { if !has_cafile && !has_capath { let result = CaBundle::get_system_ca_root_bundle_path(logger); if shirabe_php_shim::is_dir(&result) { - if let Some(PhpMixed::Array(ref mut ssl)) = defaults.get_mut("ssl") { + if let Some(PhpMixed::Array(ssl)) = defaults.get_mut("ssl") { ssl.insert("capath".to_string(), Box::new(PhpMixed::String(result))); } } else { - if let Some(PhpMixed::Array(ref mut ssl)) = defaults.get_mut("ssl") { + if let Some(PhpMixed::Array(ssl)) = defaults.get_mut("ssl") { ssl.insert("cafile".to_string(), Box::new(PhpMixed::String(result))); } } @@ -359,6 +360,7 @@ impl StreamContextFactory { if !Filesystem::is_readable(cafile) || !CaBundle::validate_ca_file(cafile, logger) { return Err(TransportException::new( "The configured cafile was not valid or could not be read.".to_string(), + 0, )); } } @@ -373,12 +375,13 @@ impl StreamContextFactory { if !shirabe_php_shim::is_dir(capath) || !Filesystem::is_readable(capath) { return Err(TransportException::new( "The configured capath was not valid or could not be read.".to_string(), + 0, )); } } // Disable TLS compression to prevent CRIME attacks where supported. - if let Some(PhpMixed::Array(ref mut ssl)) = defaults.get_mut("ssl") { + if let Some(PhpMixed::Array(ssl)) = defaults.get_mut("ssl") { ssl.insert( "disable_compression".to_string(), Box::new(PhpMixed::Bool(true)), diff --git a/crates/shirabe/src/util/svn.rs b/crates/shirabe/src/util/svn.rs index 107be1b..15809df 100644 --- a/crates/shirabe/src/util/svn.rs +++ b/crates/shirabe/src/util/svn.rs @@ -164,7 +164,7 @@ impl Svn { return Ok(output); } - let error_output = self.process.borrow().get_error_output(); + let error_output = self.process.borrow().get_error_output().to_string(); let full_output = trim( &implode("\n", &[output.clone().unwrap_or_default(), error_output]), None, @@ -430,7 +430,7 @@ impl Svn { if 0 == self.process.borrow_mut().execute_args( &["svn".to_string(), "--version".to_string()], &mut output, - None, + (), ) { let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); if Preg::is_match3(r"{(\d+(?:\.\d+)+)}", &output, Some(&mut matches)) diff --git a/crates/shirabe/src/util/url.rs b/crates/shirabe/src/util/url.rs index 7dc6e4f..9ee5dc9 100644 --- a/crates/shirabe/src/util/url.rs +++ b/crates/shirabe/src/util/url.rs @@ -131,7 +131,7 @@ impl Url { .as_string_opt() .map(|s| s.to_string()) .unwrap_or_default(); - if let Some(port) = parse_url(url, PHP_URL_PORT).as_i64_opt() { + if let Some(port) = parse_url(url, PHP_URL_PORT).as_int() { origin = format!("{}:{}", origin, port); } @@ -156,7 +156,14 @@ impl Url { true, ) { - for gitlab_domain in config.get("gitlab-domains").as_vec_string() { + let gitlab_domains: Vec<String> = match config.get("gitlab-domains") { + PhpMixed::List(list) => list + .iter() + .filter_map(|v| v.as_string().map(|s| s.to_string())) + .collect(), + _ => vec![], + }; + for gitlab_domain in gitlab_domains { if !gitlab_domain.is_empty() && gitlab_domain.starts_with(&origin) { return gitlab_domain; } |