setup-php 2.31.1 → 2.32.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +57 -52
- package/lib/config.js +17 -7
- package/lib/config.js.map +1 -1
- package/lib/coverage.js +17 -7
- package/lib/coverage.js.map +1 -1
- package/lib/extensions.js +19 -9
- package/lib/extensions.js.map +1 -1
- package/lib/fetch.js +17 -7
- package/lib/fetch.js.map +1 -1
- package/lib/install.js +17 -7
- package/lib/install.js.map +1 -1
- package/lib/packagist.js +17 -7
- package/lib/packagist.js.map +1 -1
- package/lib/tools.js +17 -7
- package/lib/tools.js.map +1 -1
- package/lib/utils.js +23 -10
- package/lib/utils.js.map +1 -1
- package/package.json +19 -16
- package/src/configs/php-versions.json +4 -4
- package/src/configs/tools.json +5 -0
- package/src/extensions.ts +4 -4
- package/src/scripts/darwin.sh +9 -7
- package/src/scripts/linux.sh +5 -4
- package/src/scripts/tools/brew.sh +0 -1
- package/src/scripts/tools/ppa.sh +3 -3
- package/src/scripts/unix.sh +30 -1
- package/src/scripts/win32.ps1 +11 -2
- package/src/utils.ts +8 -3
package/src/utils.ts
CHANGED
|
@@ -436,12 +436,17 @@ export async function readPHPVersion(): Promise<string> {
|
|
|
436
436
|
const versionFile =
|
|
437
437
|
(await getInput('php-version-file', false)) || '.php-version';
|
|
438
438
|
if (fs.existsSync(versionFile)) {
|
|
439
|
-
|
|
439
|
+
const contents: string = fs.readFileSync(versionFile, 'utf8');
|
|
440
|
+
const match: RegExpMatchArray | null = contents.match(
|
|
441
|
+
/^(?:php\s)?(\d+\.\d+\.\d+)$/m
|
|
442
|
+
);
|
|
443
|
+
return match ? match[1] : contents.trim();
|
|
440
444
|
} else if (versionFile !== '.php-version') {
|
|
441
445
|
throw new Error(`Could not find '${versionFile}' file.`);
|
|
442
446
|
}
|
|
443
447
|
|
|
444
|
-
const
|
|
448
|
+
const composerProjectDir = await readEnv('COMPOSER_PROJECT_DIR');
|
|
449
|
+
const composerLock = path.join(composerProjectDir, 'composer.lock');
|
|
445
450
|
if (fs.existsSync(composerLock)) {
|
|
446
451
|
const lockFileContents = JSON.parse(fs.readFileSync(composerLock, 'utf8'));
|
|
447
452
|
if (
|
|
@@ -452,7 +457,7 @@ export async function readPHPVersion(): Promise<string> {
|
|
|
452
457
|
}
|
|
453
458
|
}
|
|
454
459
|
|
|
455
|
-
const composerJson = 'composer.json';
|
|
460
|
+
const composerJson = path.join(composerProjectDir, 'composer.json');
|
|
456
461
|
if (fs.existsSync(composerJson)) {
|
|
457
462
|
const composerFileContents = JSON.parse(
|
|
458
463
|
fs.readFileSync(composerJson, 'utf8')
|