From 9c411b6e2b7be54de58e79afa2e05eb5ddd9a848 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Sun, 29 Jan 2023 20:17:23 +0530
Subject: [PATCH] Minor refactor in utils.resolveVersion

---
 dist/index.js | 19 +++++++------------
 src/utils.ts  | 25 +++++++------------------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index f8c544ca..53987bc0 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1284,23 +1284,18 @@ async function parseExtensionSource(extension, prefix) {
 }
 exports.parseExtensionSource = parseExtensionSource;
 async function resolveVersion() {
-    let version = await getInput('php-version', false);
-    let versionFile = await getInput('php-version-file', false);
+    const version = await getInput('php-version', false);
     if (version) {
         return version;
     }
-    if (versionFile && !fs_1.default.existsSync(versionFile)) {
+    const versionFile = (await getInput('php-version-file', false)) || '.php-version';
+    if (fs_1.default.existsSync(versionFile)) {
+        return fs_1.default.readFileSync(versionFile, 'utf8');
+    }
+    else if (versionFile !== '.php-version') {
         throw new Error(`Could not find '${versionFile}' file.`);
     }
-    versionFile ??= '.php-version';
-    if (fs_1.default.existsSync(versionFile)) {
-        version = fs_1.default.readFileSync(versionFile, 'utf8');
-        core.info(`Resolved ${versionFile} as ${version}`);
-    }
-    if (!version) {
-        version = 'latest';
-    }
-    return version;
+    return 'latest';
 }
 exports.resolveVersion = resolveVersion;
 async function setVariable(variable, command, os) {
diff --git a/src/utils.ts b/src/utils.ts
index 4bdfbaec..c515b64d 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -427,29 +427,18 @@ export async function parseExtensionSource(
  * Resolve php version from input or file
  */
 export async function resolveVersion(): Promise<string> {
-  let version = await getInput('php-version', false);
-  let versionFile = await getInput('php-version-file', false);
-
+  const version = await getInput('php-version', false);
   if (version) {
     return version;
   }
-
-  if (versionFile && !fs.existsSync(versionFile)) {
+  const versionFile =
+    (await getInput('php-version-file', false)) || '.php-version';
+  if (fs.existsSync(versionFile)) {
+    return fs.readFileSync(versionFile, 'utf8');
+  } else if (versionFile !== '.php-version') {
     throw new Error(`Could not find '${versionFile}' file.`);
   }
-
-  versionFile ??= '.php-version';
-
-  if (fs.existsSync(versionFile)) {
-    version = fs.readFileSync(versionFile, 'utf8');
-    core.info(`Resolved ${versionFile} as ${version}`);
-  }
-
-  if (!version) {
-    version = 'latest';
-  }
-
-  return version;
+  return 'latest';
 }
 
 /**