From 8c4dc6cd48457f154eb067f296d79ef911573c91 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 26 Jun 2026 02:26:08 +0900 Subject: fix(check-platform-reqs-command): add PlatformRepository to existing composite execute nested the already-built InstalledRepository inside a second InstalledRepository, tripping the assertion that an InstalledRepository may not contain another. PHP adds a PlatformRepository to the existing composite via addRepository; do the same. Un-ignores CheckPlatformReqsCommandTest::test_failed_platform_requirement. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../src/symfony/console/helper/table.rs | 18 +++--------------- .../src/symfony/console/style/symfony_style.rs | 10 +++++----- 2 files changed, 8 insertions(+), 20 deletions(-) (limited to 'crates/shirabe-external-packages') 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 9d4d168..59da457 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs @@ -455,10 +455,7 @@ impl Table { } /// Adds a row to the table, and re-renders the table. - pub fn append_row( - &mut self, - row: Row, - ) -> anyhow::Result> { + pub fn append_row(&mut self, row: Row) -> anyhow::Result> { if !Self::output_is_console_section(&self.output) { return Ok(Err(RuntimeException(shirabe_php_shim::RuntimeException { message: format!( @@ -515,11 +512,7 @@ impl Table { let rows: Vec; if self.horizontal { let mut horizontal_rows: IndexMap> = IndexMap::new(); - let header0 = self - .headers - .first() - .map(|h| h.cells()) - .unwrap_or_default(); + let header0 = self.headers.first().map(|h| h.cells()).unwrap_or_default(); for (i, header) in header0.into_iter().enumerate() { let i = i as i64; horizontal_rows.insert(i, vec![header]); @@ -787,12 +780,7 @@ impl Table { } /// Renders table row. - fn render_row( - &self, - row: Vec, - cell_format: String, - first_cell_format: Option, - ) { + fn render_row(&self, row: Vec, cell_format: String, first_cell_format: Option) { let mut row_content = self.render_column_separator(BORDER_OUTSIDE); let columns = self.get_row_columns(&row); let last = columns.len() as i64 - 1; 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 eee532e..2f7c7cb 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 @@ -8,14 +8,14 @@ use crate::symfony::console::helper::Helper; use crate::symfony::console::helper::ProgressBar; use crate::symfony::console::helper::SymfonyQuestionHelper; use crate::symfony::console::helper::Table; -use crate::symfony::console::helper::table::{Cell, Row}; use crate::symfony::console::helper::TableCell; use crate::symfony::console::helper::TableSeparator; +use crate::symfony::console::helper::table::{Cell, Row}; use crate::symfony::console::input::InputInterface; use crate::symfony::console::output::ConsoleOutputInterface; use crate::symfony::console::output::OutputInterface; -use crate::symfony::console::output::console_output::ConsoleOutput; use crate::symfony::console::output::TrimmedBufferOutput; +use crate::symfony::console::output::console_output::ConsoleOutput; use crate::symfony::console::output::output_interface::OUTPUT_NORMAL; use crate::symfony::console::question::ChoiceQuestion; use crate::symfony::console::question::ConfirmationQuestion; @@ -271,9 +271,9 @@ impl SymfonyStyle { style.set_cell_header_format("%s".to_string()); let mut table = Table::new(output); - let _ = table.set_style( - crate::symfony::console::helper::table::StyleName::Style(style), - ); + let _ = table.set_style(crate::symfony::console::helper::table::StyleName::Style( + style, + )); table } -- cgit v1.3.1