php/archived-pie
1
0
Fork 0
mirror of https://github.com/php/pie.git synced 2026-03-23 23:12:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #486 from php/1.3.x

Browse Source 
Merge up bug fixes for PHP version parsing and OS family to 1.3.6
This commit is contained in:
James Titcumb
2026-01-19 18:47:07 +00:00
committed by GitHub
parent f0efdfa0e9 1cf5c590e5
commit f9cb8d3034
5 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Platform/TargetPhp/PhpBinaryPath.php
View File

@@ -299,7 +299,7 @@ PHP,
$phpVersion = self::cleanWarningAndDeprecationsFromOutput(Process::run([
$this->phpBinaryPath,
'-r',
'echo PHP_VERSION;',
'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION . "." . PHP_RELEASE_VERSION;',
]));
Assert::stringNotEmpty($phpVersion, 'Could not determine PHP version');

26
test/assets/fake-php-invalid-version.sh Executable file
View File

@@ -0,0 +1,26 @@
#!/usr/bin/env bash
ARGS="$*"
case "$ARGS" in
"-r echo \"PHP\";")
echo "PHP";
exit 0
;;
"-r echo PHP_VERSION;")
echo "5.6.40-90+ubuntu24.04.1+deb.sury.org+1";
exit 0
;;
"-r echo PHP_MAJOR_VERSION . \".\" . PHP_MINOR_VERSION . \".\" . PHP_RELEASE_VERSION;")
echo "5.6.40";
exit 0
;;
"-r echo PHP_MAJOR_VERSION . \".\" . PHP_MINOR_VERSION;")
echo "5.6";
exit 0
;;
*)
echo "unknown fake php command: $ARGS"
exit 1
esac

2
test/integration/Command/InstallCommandTest.php
View File

@@ -50,6 +50,8 @@ class InstallCommandTest extends TestCase
$possiblePhpConfigPaths = array_filter(
[
'/usr/bin/php-config',
'/usr/bin/php-config8.5',
'/usr/bin/php-config8.4',
'/usr/bin/php-config8.3',
'/usr/bin/php-config8.2',
'/usr/bin/php-config8.1',

3
test/integration/Installing/UnixInstallTest.php
View File

@@ -47,12 +47,15 @@ final class UnixInstallTest extends TestCase
$possiblePhpConfigPaths = array_filter(
[
'/usr/bin/php-config',
'/usr/bin/php-config8.5',
'/usr/bin/php-config8.4',
'/usr/bin/php-config8.3',
'/usr/bin/php-config8.2',
'/usr/bin/php-config8.1',
'/usr/bin/php-config8.0',
'/usr/bin/php-config7.4',
'/usr/bin/php-config7.3',
'/usr/bin/php-config7.2',
],
static fn (string $phpConfigPath) => file_exists($phpConfigPath)
&& is_executable($phpConfigPath),

21
test/unit/Platform/TargetPhp/PhpBinaryPathTest.php
View File

@@ -57,6 +57,7 @@ use const PHP_VERSION;
final class PhpBinaryPathTest extends TestCase
{
private const FAKE_PHP_EXECUTABLE = __DIR__ . '/../../../assets/fake-php.sh';
private const PHP_INVALID_VERSION = __DIR__ . '/../../../assets/fake-php-invalid-version.sh';
private const VALID_PHP_WITH_WARNINGS = __DIR__ . '/../../../assets/valid-php-with-warnings.sh';
public function testNonExistentPhpBinaryIsRejected(): void
@@ -85,6 +86,7 @@ final class PhpBinaryPathTest extends TestCase
PhpBinaryPath::fromPhpBinaryPath(__FILE__);
}
#[RequiresOperatingSystemFamily('Linux')]
public function testInvalidPhpBinaryIsRejected(): void
{
$this->expectException(InvalidPhpBinaryPath::class);
@@ -92,6 +94,14 @@ final class PhpBinaryPathTest extends TestCase
PhpBinaryPath::fromPhpBinaryPath(self::FAKE_PHP_EXECUTABLE);
}
#[RequiresOperatingSystemFamily('Linux')]
public function testInvalidVersion(): void
{
$phpBinary = PhpBinaryPath::fromPhpBinaryPath(self::PHP_INVALID_VERSION);
self::assertSame('5.6.40', $phpBinary->version());
self::assertSame('5.6', $phpBinary->majorMinorVersion());
}
public function testWarningsAndDeprecationsAreFiltered(): void
{
if (Platform::isWindows()) {
@@ -129,11 +139,17 @@ final class PhpBinaryPathTest extends TestCase
$possiblePhpConfigPaths = array_filter(
[
['/usr/bin/php-config8.5', '8.5'],
['/usr/bin/php-config8.4', '8.4'],
['/usr/bin/php-config8.3', '8.3'],
['/usr/bin/php-config8.2', '8.2'],
['/usr/bin/php-config8.1', '8.1'],
['/usr/bin/php-config8.0', '8.0'],
['/usr/bin/php-config7.4', '7.4'],
['/usr/bin/php-config7.3', '7.3'],
['/usr/bin/php-config7.2', '7.2'],
['/usr/bin/php-config7.1', '7.1'],
['/usr/bin/php-config5.6', '5.6'],
],
static fn (array $phpConfigPath) => file_exists($phpConfigPath[0])
&& is_executable($phpConfigPath[0]),
@@ -168,6 +184,11 @@ final class PhpBinaryPathTest extends TestCase
$phpBinary->majorMinorVersion(),
);
self::assertStringStartsWith(
$expectedMajorMinor . '.',
$phpBinary->version(),
);
self::assertSame($phpConfigPath, $phpBinary->phpConfigPath());
}