mirror of
https://github.com/shivammathur/setup-php.git
synced 2025-09-09 06:14:10 +07:00
Improve code quality
This commit is contained in:
32
dist/index.js
vendored
32
dist/index.js
vendored
@ -1072,7 +1072,6 @@ exports.color = color;
|
||||
* @param message
|
||||
* @param os_version
|
||||
* @param log_type
|
||||
* @param prefix
|
||||
*/
|
||||
function log(message, os_version, log_type) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
@ -1116,6 +1115,7 @@ exports.stepLog = stepLog;
|
||||
* @param mark
|
||||
* @param subject
|
||||
* @param message
|
||||
* @param os_version
|
||||
*/
|
||||
function addLog(mark, subject, message, os_version) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
@ -1135,10 +1135,8 @@ exports.addLog = addLog;
|
||||
* Read the scripts
|
||||
*
|
||||
* @param filename
|
||||
* @param version
|
||||
* @param os_version
|
||||
*/
|
||||
function readScript(filename, version, os_version) {
|
||||
function readScript(filename) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
return fs.readFileSync(path.join(__dirname, '../src/scripts/' + filename), 'utf8');
|
||||
});
|
||||
@ -1148,7 +1146,6 @@ exports.readScript = readScript;
|
||||
* Write final script which runs
|
||||
*
|
||||
* @param filename
|
||||
* @param version
|
||||
* @param script
|
||||
*/
|
||||
function writeScript(filename, script) {
|
||||
@ -1586,6 +1583,7 @@ const utils = __importStar(__webpack_require__(163));
|
||||
* Function to get command to setup tools
|
||||
*
|
||||
* @param os_version
|
||||
* @param suffix
|
||||
*/
|
||||
function getCommand(os_version, suffix) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
@ -1648,6 +1646,8 @@ exports.parseTool = parseTool;
|
||||
/**
|
||||
* Function to get the url of tool with the given version
|
||||
*
|
||||
* @param tool
|
||||
* @param extension
|
||||
* @param version
|
||||
* @param prefix
|
||||
* @param version_prefix
|
||||
@ -1738,7 +1738,7 @@ function getCodeceptionUri(version, php_version) {
|
||||
case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
|
||||
return codecept;
|
||||
default:
|
||||
return yield codecept;
|
||||
return codecept;
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -1746,9 +1746,7 @@ exports.getCodeceptionUri = getCodeceptionUri;
|
||||
/**
|
||||
* Helper function to get script to setup phive
|
||||
*
|
||||
* @param tool
|
||||
* @param version
|
||||
* @param url
|
||||
* @param os_version
|
||||
*/
|
||||
function addPhive(version, os_version) {
|
||||
@ -1771,6 +1769,9 @@ exports.addPhive = addPhive;
|
||||
/**
|
||||
* Function to get the phar url in domain/tool-version.phar format
|
||||
*
|
||||
* @param domain
|
||||
* @param tool
|
||||
* @param prefix
|
||||
* @param version
|
||||
*/
|
||||
function getPharUrl(domain, tool, prefix, version) {
|
||||
@ -1833,7 +1834,7 @@ exports.getSymfonyUri = getSymfonyUri;
|
||||
/**
|
||||
* Function to add/move composer in the tools list
|
||||
*
|
||||
* @param tools
|
||||
* @param tools_list
|
||||
*/
|
||||
function addComposer(tools_list) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
@ -1926,7 +1927,8 @@ exports.addPackage = addPackage;
|
||||
/**
|
||||
* Setup tools
|
||||
*
|
||||
* @param tool_csv
|
||||
* @param tools_csv
|
||||
* @param php_version
|
||||
* @param os_version
|
||||
*/
|
||||
function addTools(tools_csv, php_version, os_version) {
|
||||
@ -1975,7 +1977,7 @@ function addTools(tools_csv, php_version, os_version) {
|
||||
break;
|
||||
case 'composer':
|
||||
// If RC is released as latest release, switch to getcomposer.
|
||||
// Prefered source is GitHub as it is faster.
|
||||
// Preferred source is GitHub as it is faster.
|
||||
// url = github + 'composer/composer/releases/latest/download/composer.phar';
|
||||
url = 'https://getcomposer.org/composer-stable.phar';
|
||||
script += yield addArchive(tool, version, url, os_version);
|
||||
@ -2258,6 +2260,7 @@ exports.addINIValuesWindows = addINIValuesWindows;
|
||||
*
|
||||
* @param ini_values_csv
|
||||
* @param os_version
|
||||
* @param no_step
|
||||
*/
|
||||
function addINIValues(ini_values_csv, os_version, no_step = false) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
@ -2342,7 +2345,7 @@ function build(filename, version, os_version) {
|
||||
/.*-(beta|alpha|devel|snapshot).*/.test(extension_csv)) {
|
||||
tools_csv = 'pecl, ' + tools_csv;
|
||||
}
|
||||
let script = yield utils.readScript(filename, version, os_version);
|
||||
let script = yield utils.readScript(filename);
|
||||
script += yield tools.addTools(tools_csv, version, os_version);
|
||||
if (extension_csv) {
|
||||
script += yield extensions.addExtension(extension_csv, version, os_version);
|
||||
@ -2721,9 +2724,8 @@ exports.addExtensionDarwin = addExtensionDarwin;
|
||||
*
|
||||
* @param extension_csv
|
||||
* @param version
|
||||
* @param pipe
|
||||
*/
|
||||
function addExtensionWindows(extension_csv, version, pipe) {
|
||||
function addExtensionWindows(extension_csv, version) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const extensions = yield utils.extensionArray(extension_csv);
|
||||
let script = '\n';
|
||||
@ -2862,7 +2864,7 @@ function addExtension(extension_csv, version, os_version, no_step = false) {
|
||||
}
|
||||
switch (os_version) {
|
||||
case 'win32':
|
||||
return script + (yield addExtensionWindows(extension_csv, version, pipe));
|
||||
return script + (yield addExtensionWindows(extension_csv, version));
|
||||
case 'darwin':
|
||||
return script + (yield addExtensionDarwin(extension_csv, version, pipe));
|
||||
case 'linux':
|
||||
|
Reference in New Issue
Block a user