Merge pull request #486 from php/1.3.x

Merge up bug fixes for PHP version parsing and OS family to 1.3.6

Author: asgrim

src/Platform/TargetPhp/PhpBinaryPath.php

@@ -299,7 +299,7 @@ public function version(): string
         $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');
 

test/assets/fake-php-invalid-version.sh

@@ -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
+

test/integration/Command/InstallCommandTest.php

@@ -50,6 +50,8 @@ public static function phpPathProvider(): array
         $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',

test/integration/Installing/UnixInstallTest.php

@@ -47,12 +47,15 @@ public static function phpPathProvider(): array
         $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),

test/unit/Platform/TargetPhp/PhpBinaryPathTest.php

@@ -57,6 +57,7 @@
 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,13 +86,22 @@ public function testNonExecutablePhpBinaryIsRejected(): void
         PhpBinaryPath::fromPhpBinaryPath(__FILE__);
     }
 
+    #[RequiresOperatingSystemFamily('Linux')]
     public function testInvalidPhpBinaryIsRejected(): void
     {
         $this->expectException(InvalidPhpBinaryPath::class);
         $this->expectExceptionMessage('does not appear to be a PHP binary');
         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 @@ public static function phpConfigPathProvider(): array
 
         $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 @@ public function testFromPhpConfigExecutable(string $phpConfigPath, string $expec
             $phpBinary->majorMinorVersion(),
         );
 
+        self::assertStringStartsWith(
+            $expectedMajorMinor . '.',
+            $phpBinary->version(),
+        );
+
         self::assertSame($phpConfigPath, $phpBinary->phpConfigPath());
     }