Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/StaticPHP/DI/ApplicationContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static function getContainer(): Container
*
* @param class-string<T> $id Service identifier
*
* @return T
* @return null|T
*/
public static function get(string $id): mixed
{
Expand Down
23 changes: 21 additions & 2 deletions src/StaticPHP/Package/PackageInstaller.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use StaticPHP\DI\ApplicationContext;
use StaticPHP\Exception\WrongUsageException;
use StaticPHP\Registry\PackageLoader;
use StaticPHP\Runtime\SystemTarget;
use StaticPHP\Util\DependencyResolver;
use StaticPHP\Util\FileSystem;
use StaticPHP\Util\InteractiveTerm;
Expand Down Expand Up @@ -133,6 +134,9 @@ public function run(bool $interactive = true, bool $disable_delay_msg = false):
echo PHP_EOL;
}

// Early validation: check if packages can be built or installed before downloading
$this->validatePackagesBeforeBuild();

// check download
if ($this->download) {
$downloaderOptions = DownloaderOptions::extractFromConsoleOptions($this->options, 'dl');
Expand Down Expand Up @@ -199,8 +203,6 @@ public function run(bool $interactive = true, bool $disable_delay_msg = false):
if ($interactive) {
InteractiveTerm::finish('Built package: ' . ConsoleColor::green($package->getName()) . ($status === SPC_STATUS_ALREADY_BUILT ? ' (already built, skipped)' : ''));
}
} elseif ($package->getType() === 'library') {
throw new WrongUsageException("Package '{$package->getName()}' cannot be installed: no build stage defined and no binary artifact available for current OS.");
}
}
}
Expand Down Expand Up @@ -535,6 +537,23 @@ private function printArrayInfo(array $info): void
}
}

private function validatePackagesBeforeBuild(): void
{
foreach ($this->packages as $package) {
if ($package->getType() !== 'library') {
continue;
}
$is_to_build = $this->isBuildPackage($package);
$has_build_stage = $package instanceof LibraryPackage && $package->hasStage('build');
$should_use_binary = $package instanceof LibraryPackage && ($package->getArtifact()?->shouldUseBinary() ?? false);

// Check if package can neither be built nor installed
if (!$is_to_build && !$should_use_binary && !$has_build_stage) {
throw new WrongUsageException("Package '{$package->getName()}' cannot be installed: no build stage defined and no binary artifact available for current OS: " . SystemTarget::getCurrentPlatformString());
}
}
}

private function performAfterInstallActions(Package $package): void
{
// ----------- perform post-install actions from extracted .package.{pkg_name}.postinstall.json -----------
Expand Down
31 changes: 16 additions & 15 deletions src/StaticPHP/Util/InteractiveTerm.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use StaticPHP\DI\ApplicationContext;
use Symfony\Component\Console\Helper\ProgressIndicator;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\ConsoleOutput;
use Symfony\Component\Console\Output\OutputInterface;
use ZM\Logger\ConsoleColor;

Expand All @@ -16,8 +17,8 @@ class InteractiveTerm

public static function notice(string $message, bool $indent = false): void
{
$no_ansi = ApplicationContext::get(InputInterface::class)->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class);
$no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
if ($output->isVerbose()) {
logger()->notice(strip_ansi_colors($message));
} else {
Expand All @@ -27,8 +28,8 @@ public static function notice(string $message, bool $indent = false): void

public static function success(string $message, bool $indent = false): void
{
$no_ansi = ApplicationContext::get(InputInterface::class)->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class);
$no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
if ($output->isVerbose()) {
logger()->info(strip_ansi_colors($message));
} else {
Expand All @@ -38,8 +39,8 @@ public static function success(string $message, bool $indent = false): void

public static function plain(string $message): void
{
$no_ansi = ApplicationContext::get(InputInterface::class)->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class);
$no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
if ($output->isVerbose()) {
logger()->info(strip_ansi_colors($message));
} else {
Expand All @@ -49,8 +50,8 @@ public static function plain(string $message): void

public static function info(string $message): void
{
$no_ansi = ApplicationContext::get(InputInterface::class)->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class);
$no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
if (!$output->isVerbose()) {
$output->writeln(($no_ansi ? 'strip_ansi_colors' : 'strval')(ConsoleColor::green('▶ ') . $message));
}
Expand All @@ -59,8 +60,8 @@ public static function info(string $message): void

public static function error(string $message, bool $indent = true): void
{
$no_ansi = ApplicationContext::get(InputInterface::class)->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class);
$no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
if ($output->isVerbose()) {
logger()->error(strip_ansi_colors($message));
} else {
Expand All @@ -75,15 +76,15 @@ public static function advance(): void

public static function setMessage(string $message): void
{
$no_ansi = ApplicationContext::get(InputInterface::class)->getOption('no-ansi') ?? false;
$no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
self::$indicator?->setMessage(($no_ansi ? 'strip_ansi_colors' : 'strval')($message));
}

public static function finish(string $message, bool $status = true): void
{
$no_ansi = ApplicationContext::get(InputInterface::class)->getOption('no-ansi') ?? false;
$no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
$message = $no_ansi ? strip_ansi_colors($message) : $message;
$output = ApplicationContext::get(OutputInterface::class);
$output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
if ($output->isVerbose()) {
if ($status) {
logger()->info($message);
Expand All @@ -104,8 +105,8 @@ public static function finish(string $message, bool $status = true): void

public static function indicateProgress(string $message): void
{
$no_ansi = ApplicationContext::get(InputInterface::class)->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class);
$no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
$output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
if ($output->isVerbose()) {
logger()->info(strip_ansi_colors($message));
return;
Expand Down