Add support for .tool-versions format in php-version-file

shivammathur · Dec 23, 2024 · b6d8115 · b6d8115
1 parent 84f76b1
commit b6d8115
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/__tests__/utils.test.ts b/__tests__/utils.test.ts
@@ -285,6 +285,14 @@ describe('Utils tests', () => {
     delete process.env['php-version-file'];
     delete process.env['php-version'];
 
+    existsSync.mockReturnValue(true);
+    readFileSync.mockReturnValue('ruby 1.2.3\nphp 8.4.2\nnode 20.1.2');
+    expect(await utils.readPHPVersion()).toBe('8.4.2');
+
+    existsSync.mockReturnValue(true);
+    readFileSync.mockReturnValue('setup-php');
+    expect(await utils.readPHPVersion()).toBe('setup-php');
+
     existsSync.mockReturnValueOnce(false).mockReturnValueOnce(true);
     readFileSync.mockReturnValue(
       '{ "platform-overrides": { "php": "7.3.25" } }'

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/utils.ts b/src/utils.ts
@@ -436,7 +436,11 @@ export async function readPHPVersion(): Promise<string> {
   const versionFile =
     (await getInput('php-version-file', false)) || '.php-version';
   if (fs.existsSync(versionFile)) {
-    return fs.readFileSync(versionFile, 'utf8').replace(/[\r\n]/g, '');
+    const contents: string = fs.readFileSync(versionFile, 'utf8');
+    const match: RegExpMatchArray | null = contents.match(
+      /^(?:php\s)?(\d+\.\d+\.\d+)$/m
+    );
+    return match ? match[1] : contents.trim();
   } else if (versionFile !== '.php-version') {
     throw new Error(`Could not find '${versionFile}' file.`);
   }