From a70a993f9e0cc19e77b5b09cb53d34f8d22a0a89 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Mon, 18 Aug 2025 08:50:28 +0100 Subject: [PATCH] Format Composer additional styles properly instead of trying to strip them --- src/Container.php | 13 ++++++++++++- .../UnableToResolveRequirement.php | 4 +--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Container.php b/src/Container.php index 74358f6b..bec580a1 100644 --- a/src/Container.php +++ b/src/Container.php @@ -4,6 +4,7 @@ namespace Php\Pie; +use Composer\Factory; use Composer\Util\Platform as ComposerPlatform; use Illuminate\Container\Container as IlluminateContainer; use Php\Pie\Building\Build; @@ -37,6 +38,7 @@ use Psr\Container\ContainerInterface; use Symfony\Component\Console\ConsoleEvents; use Symfony\Component\Console\Event\ConsoleCommandEvent; +use Symfony\Component\Console\Formatter\OutputFormatter; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Console\Input\InputInterface; @@ -77,7 +79,16 @@ static function () { return $input; }, ); - $container->instance(OutputInterface::class, new ConsoleOutput()); + $container->singleton( + OutputInterface::class, + static function (): OutputInterface { + return new ConsoleOutput( + ConsoleOutput::VERBOSITY_NORMAL, + null, + new OutputFormatter(false, Factory::createAdditionalStyles()), + ); + }, + ); $container->singleton(EventDispatcher::class, static function () { $displayedBanner = false; $eventDispatcher = new EventDispatcher(); diff --git a/src/DependencyResolver/UnableToResolveRequirement.php b/src/DependencyResolver/UnableToResolveRequirement.php index 8d32e09f..78a85661 100644 --- a/src/DependencyResolver/UnableToResolveRequirement.php +++ b/src/DependencyResolver/UnableToResolveRequirement.php @@ -8,11 +8,9 @@ use Php\Pie\ComposerIntegration\QuieterConsoleIO; use RuntimeException; -use function array_map; use function count; use function implode; use function sprintf; -use function strip_tags; class UnableToResolveRequirement extends RuntimeException { @@ -33,7 +31,7 @@ public static function fromRequirement( $requestedPackageAndVersion->package, $requestedPackageAndVersion->version !== null ? sprintf('version %s', $requestedPackageAndVersion->version) : 'the latest compatible version', DetermineMinimumStability::fromRequestedVersion($requestedPackageAndVersion->version), - count($errors) ? "\n\n" . implode("\n\n", array_map(static fn ($e) => strip_tags($e), $errors)) : '', + count($errors) ? "\n\n" . implode("\n\n", $errors) : '', ), $requestedPackageAndVersion, );