Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,42 @@ public static function default(): self
PackageManager::Apt->value => 'libsodium-dev',
PackageManager::Apk->value => 'libsodium-dev',
PackageManager::Dnf->value => 'pkgconfig(libsodium)',
PackageManager::Microdnf->value => 'pkgconfig(libsodium)',
PackageManager::Yum->value => 'pkgconfig(libsodium)',
],
'jpeg' => [
PackageManager::Apt->value => 'libjpeg-dev',
PackageManager::Apk->value => 'libjpeg-turbo-dev',
PackageManager::Dnf->value => 'pkgconfig(libjpeg)',
PackageManager::Microdnf->value => 'pkgconfig(libjpeg)',
PackageManager::Yum->value => 'pkgconfig(libjpeg)',
],
'zip' => [
PackageManager::Apt->value => 'libzip-dev',
PackageManager::Apk->value => 'libzip-dev',
PackageManager::Dnf->value => 'pkgconfig(libzip)',
PackageManager::Microdnf->value => 'pkgconfig(libzip)',
PackageManager::Yum->value => 'pkgconfig(libzip)',
],
'xslt' => [
PackageManager::Apt->value => 'libxslt1-dev',
PackageManager::Apk->value => 'libxslt-dev',
PackageManager::Dnf->value => 'pkgconfig(libxslt)',
PackageManager::Microdnf->value => 'pkgconfig(libxslt)',
PackageManager::Yum->value => 'pkgconfig(libxslt)',
],
'ffi' => [
PackageManager::Apt->value => 'libffi-dev',
PackageManager::Apk->value => 'libffi-dev',
PackageManager::Dnf->value => 'pkgconfig(libffi)',
PackageManager::Microdnf->value => 'pkgconfig(libffi)',
PackageManager::Yum->value => 'pkgconfig(libffi)',
],
'curl' => [
PackageManager::Apt->value => 'libcurl4-openssl-dev',
PackageManager::Apk->value => 'curl-dev',
PackageManager::Dnf->value => 'pkgconfig(libcurl)',
PackageManager::Microdnf->value => 'pkgconfig(libcurl)',
PackageManager::Yum->value => 'pkgconfig(libcurl)',
],
]);
Expand Down
20 changes: 14 additions & 6 deletions src/Platform/PackageManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@
/** @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks */
enum PackageManager: string
{
case Test = 'test';
case Apt = 'apt-get';
case Apk = 'apk';
case Dnf = 'dnf';
case Yum = 'yum';
case Brew = 'brew';
case Test = 'test';
case Apt = 'apt-get';
case Apk = 'apk';
case Dnf = 'dnf';
case Microdnf = 'microdnf';
case Brew = 'brew';

/** @deprecated Use `dnf` instead of `yum` */
case Yum = 'yum';

public static function detect(): self|null
{
Expand Down Expand Up @@ -53,6 +56,7 @@ public function installCommand(array $packages): array
self::Apt => ['apt-get', 'install', '-y', '--no-install-recommends', '--no-install-suggests', ...$packages],
self::Apk => ['apk', 'add', '--no-cache', '--virtual', '.php-pie-deps', ...$packages],
self::Dnf => ['dnf', 'install', '-y', ...$packages],
self::Microdnf => ['microdnf', 'install', '-y', ...$packages],
self::Yum => ['yum', 'install', '-y', ...$packages],
self::Brew => ['brew', 'install', ...$packages],
};
Expand All @@ -61,6 +65,10 @@ public function installCommand(array $packages): array
/** @param list<string> $packages */
public function install(IOInterface $io, array $packages): void
{
if ($this === self::Yum) {
$io->writeError('<warning>Usage of `yum` in PIE is deprecated in favour of `dnf`, and will be removed in a future release of PIE.</warning>');
}

$outputCallback = Process::outputCallbackForVerbosity($io, IOInterface::VERY_VERBOSE);

$cmd = self::installCommand($packages);
Expand Down
7 changes: 7 additions & 0 deletions src/SelfManage/BuildTools/CheckAllBuildTools.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public static function buildToolsFactory(): self
PackageManager::Apt->value => 'gcc',
PackageManager::Apk->value => 'build-base',
PackageManager::Dnf->value => 'gcc',
PackageManager::Microdnf->value => 'gcc',
PackageManager::Yum->value => 'gcc',
PackageManager::Brew->value => 'gcc',
],
Expand All @@ -36,6 +37,7 @@ public static function buildToolsFactory(): self
PackageManager::Apt->value => 'make',
PackageManager::Apk->value => 'build-base',
PackageManager::Dnf->value => 'make',
PackageManager::Microdnf->value => 'make',
PackageManager::Yum->value => 'make',
PackageManager::Brew->value => 'make',
],
Expand All @@ -46,6 +48,7 @@ public static function buildToolsFactory(): self
PackageManager::Apt->value => 'autoconf',
PackageManager::Apk->value => 'autoconf',
PackageManager::Dnf->value => 'autoconf',
PackageManager::Microdnf->value => 'autoconf',
PackageManager::Yum->value => 'autoconf',
PackageManager::Brew->value => 'autoconf',
],
Expand All @@ -56,6 +59,7 @@ public static function buildToolsFactory(): self
PackageManager::Apt->value => 'pkg-config',
PackageManager::Apk->value => 'pkgconfig',
PackageManager::Dnf->value => 'pkgconf-pkg-config',
PackageManager::Microdnf->value => 'pkgconf-pkg-config',
PackageManager::Yum->value => 'pkgconf-pkg-config',
PackageManager::Brew->value => 'pkgconf',
],
Expand All @@ -66,6 +70,7 @@ public static function buildToolsFactory(): self
PackageManager::Apt->value => 'libtool',
PackageManager::Apk->value => 'libtool',
PackageManager::Dnf->value => 'libtool',
PackageManager::Microdnf->value => 'libtool',
PackageManager::Yum->value => 'libtool',
PackageManager::Brew->value => 'libtool',
],
Expand All @@ -85,6 +90,7 @@ public static function buildToolsFactory(): self
PackageManager::Apt->value => 'unzip',
PackageManager::Apk->value => 'unzip',
PackageManager::Dnf->value => 'unzip',
PackageManager::Microdnf->value => 'unzip',
PackageManager::Yum->value => 'unzip',
PackageManager::Brew->value => 'unzip',
],
Expand All @@ -94,6 +100,7 @@ public static function buildToolsFactory(): self
PackageManager::Apt->value => 'php-dev',
PackageManager::Apk->value => 'php{major}{minor}-dev',
PackageManager::Dnf->value => '{php-config-path}',
PackageManager::Microdnf->value => '{php-config-path}',
PackageManager::Yum->value => '{php-config-path}',
PackageManager::Brew->value => 'php',
],
Expand Down
7 changes: 7 additions & 0 deletions test/end-to-end/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM alpine:3.24 AS alpine_base
FROM fedora:44 AS fedora_base
FROM ubuntu:26.04 AS ubuntu_base
FROM homebrew/brew:4.6.20 AS homebrew_base
FROM redhat/ubi9-minimal:9.8 AS ubi9_base

FROM box_base AS build_pie_phar
RUN apk add git
Expand All @@ -28,6 +29,12 @@ COPY --from=build_pie_phar /app/pie.phar /usr/local/bin/pie
RUN pie install --auto-install-build-tools -vv asgrim/example-pie-extension:2.0.5
RUN pie show

FROM ubi9_base AS test_pie_installs_build_tools_on_ubi9
RUN microdnf module enable -y php:8.3 && microdnf install -y php-cli php-pecl-zip unzip
COPY --from=build_pie_phar /app/pie.phar /usr/local/bin/pie
RUN pie install --auto-install-build-tools -v asgrim/example-pie-extension:2.0.5
RUN pie show

FROM ubuntu_base AS test_pie_installs_build_tools_on_ubuntu
RUN apt-get update && apt-get install -y php unzip libbz2-dev
COPY --from=build_pie_phar /app/pie.phar /usr/local/bin/pie
Expand Down
19 changes: 19 additions & 0 deletions test/unit/Platform/PackageManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@

namespace Php\PieUnitTest\Platform;

use Composer\IO\BufferIO;
use Php\Pie\Platform\PackageManager;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Process\Exception\ProcessFailedException;

#[CoversClass(PackageManager::class)]
final class PackageManagerTest extends TestCase
Expand All @@ -29,6 +31,10 @@ public function testInstallCommand(): void
['dnf', 'install', '-y', 'a', 'b'],
PackageManager::Dnf->installCommand(['a', 'b']),
);
self::assertSame(
['microdnf', 'install', '-y', 'a', 'b'],
PackageManager::Microdnf->installCommand(['a', 'b']),
);
self::assertSame(
['yum', 'install', '-y', 'a', 'b'],
PackageManager::Yum->installCommand(['a', 'b']),
Expand All @@ -38,4 +44,17 @@ public function testInstallCommand(): void
PackageManager::Brew->installCommand(['a', 'b']),
);
}

public function testInstallWithYumWritesDeprecationWarning(): void
{
$io = new BufferIO();

try {
PackageManager::Yum->install($io, ['some-package-that-does-not-exist']);
} catch (ProcessFailedException) {
// Expected
}

self::assertStringContainsString('deprecated', $io->getOutput());
}
}
Loading