diff --git a/__tests__/install.test.ts b/__tests__/install.test.ts index 00a51bc8..ed0bcd33 100644 --- a/__tests__/install.test.ts +++ b/__tests__/install.test.ts @@ -10,7 +10,7 @@ jest.mock('../src/install', () => ({ .mockImplementation(async (os: string): Promise => { const filename = os + (await utils.scriptExtension(os)); const version: string = await utils.parseVersion( - await utils.resolveVersion() + await utils.readPHPVersion() ); const ini_file: string = await utils.parseIniFile( await utils.getInput('ini-file', false) diff --git a/__tests__/utils.test.ts b/__tests__/utils.test.ts index eb7449d8..1368af59 100644 --- a/__tests__/utils.test.ts +++ b/__tests__/utils.test.ts @@ -263,11 +263,11 @@ describe('Utils tests', () => { ); }); - it('checking resolveVersion', async () => { - expect(await utils.resolveVersion()).toBe('latest'); + it('checking readPHPVersion', async () => { + expect(await utils.readPHPVersion()).toBe('latest'); process.env['php-version-file'] = '.phpenv-version'; - await expect(utils.resolveVersion()).rejects.toThrow( + await expect(utils.readPHPVersion()).rejects.toThrow( "Could not find '.phpenv-version' file." ); @@ -277,10 +277,10 @@ describe('Utils tests', () => { existsSync.mockReturnValue(true); readFileSync.mockReturnValue('8.1'); - expect(await utils.resolveVersion()).toBe('8.1'); + expect(await utils.readPHPVersion()).toBe('8.1'); process.env['php-version'] = '8.2'; - expect(await utils.resolveVersion()).toBe('8.2'); + expect(await utils.readPHPVersion()).toBe('8.2'); existsSync.mockClear(); readFileSync.mockClear(); diff --git a/dist/index.js b/dist/index.js index cbabb0c0..fa480486 100644 --- a/dist/index.js +++ b/dist/index.js @@ -557,7 +557,7 @@ async function getScript(os) { const ini_values_csv = await utils.getInput('ini-values', false); const coverage_driver = await utils.getInput('coverage', false); const tools_csv = await utils.getInput('tools', false); - const version = await utils.parseVersion(await utils.resolveVersion()); + const version = await utils.parseVersion(await utils.readPHPVersion()); const ini_file = await utils.parseIniFile(await utils.getInput('ini-file', false)); let script = await utils.joins('.', script_path, version, ini_file); if (extension_csv) { @@ -1036,7 +1036,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.setVariable = exports.resolveVersion = exports.parseExtensionSource = exports.customPackage = exports.scriptTool = exports.scriptExtension = exports.joins = exports.getCommand = exports.getUnsupportedLog = exports.suppressOutput = exports.getExtensionPrefix = exports.CSVArray = exports.extensionArray = exports.addLog = exports.stepLog = exports.log = exports.color = exports.asyncForEach = exports.parseIniFile = exports.parseVersion = exports.getManifestURL = exports.getInput = exports.readEnv = void 0; +exports.setVariable = exports.readPHPVersion = exports.parseExtensionSource = exports.customPackage = exports.scriptTool = exports.scriptExtension = exports.joins = exports.getCommand = exports.getUnsupportedLog = exports.suppressOutput = exports.getExtensionPrefix = exports.CSVArray = exports.extensionArray = exports.addLog = exports.stepLog = exports.log = exports.color = exports.asyncForEach = exports.parseIniFile = exports.parseVersion = exports.getManifestURL = exports.getInput = exports.readEnv = void 0; const fs_1 = __importDefault(__nccwpck_require__(7147)); const path = __importStar(__nccwpck_require__(1017)); const core = __importStar(__nccwpck_require__(2186)); @@ -1282,7 +1282,7 @@ async function parseExtensionSource(extension, prefix) { return await joins('\nadd_extension_from_source', ...matches.splice(1, matches.length), prefix); } exports.parseExtensionSource = parseExtensionSource; -async function resolveVersion() { +async function readPHPVersion() { const version = await getInput('php-version', false); if (version) { return version; @@ -1296,7 +1296,7 @@ async function resolveVersion() { } return 'latest'; } -exports.resolveVersion = resolveVersion; +exports.readPHPVersion = readPHPVersion; async function setVariable(variable, command, os) { switch (os) { case 'win32': diff --git a/src/install.ts b/src/install.ts index f298c6e4..465b21d6 100644 --- a/src/install.ts +++ b/src/install.ts @@ -24,7 +24,7 @@ export async function getScript(os: string): Promise { const coverage_driver: string = await utils.getInput('coverage', false); const tools_csv: string = await utils.getInput('tools', false); const version: string = await utils.parseVersion( - await utils.resolveVersion() + await utils.readPHPVersion() ); const ini_file: string = await utils.parseIniFile( await utils.getInput('ini-file', false) diff --git a/src/utils.ts b/src/utils.ts index ef5d4cf3..c8c047cb 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -425,9 +425,9 @@ export async function parseExtensionSource( } /** - * Resolve php version from input or file + * Read php version from input or file */ -export async function resolveVersion(): Promise { +export async function readPHPVersion(): Promise { const version = await getInput('php-version', false); if (version) { return version;