setup-php 2.21.0 → 2.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.21.0",
+  "version": "2.21.1",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
@@ -40,9 +40,9 @@
   },
   "devDependencies": {
     "@types/jest": "^28.1.6",
-    "@types/node": "^18.0.6",
-    "@typescript-eslint/eslint-plugin": "^5.30.7",
-    "@typescript-eslint/parser": "^5.30.7",
+    "@types/node": "^18.6.1",
+    "@typescript-eslint/eslint-plugin": "^5.31.0",
+    "@typescript-eslint/parser": "^5.31.0",
     "@vercel/ncc": "^0.34.0",
     "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.5.0",
@@ -51,7 +51,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^28.1.3",
     "jest-circus": "^28.1.3",
-    "nock": "^13.2.8",
+    "nock": "^13.2.9",
     "prettier": "^2.7.1",
     "simple-git-hooks": "^2.8.0",
     "ts-jest": "^28.0.7",

package/src/scripts/tools/add_tools.ps1

@@ -201,11 +201,15 @@ Function Add-ComposertoolHelper() {
     [string]
     $composer_args
   )
+  $tool_version = $release.split(':')[1]
+  if($NULL -eq $tool_version) {
+    $tool_version = '*'
+  }
   if($scope -eq 'global') {
     if(Test-Path $composer_lock) {
       Remove-Item -Path $composer_lock -Force
     }
-    if((composer global show $prefix$tool -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
+    if((composer global show $prefix$tool $tool_version -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
       composer global config --no-plugins allow-plugins."$prefix$tool" true >$null 2>&1
     }
     composer global require $prefix$release $composer_args >$null 2>&1
@@ -215,11 +219,12 @@ Function Add-ComposertoolHelper() {
     $scoped_dir_suffix = (Get-FileHash -InputStream $release_stream -Algorithm sha256).Hash
     $scoped_dir = "$composer_bin\_tools\$tool-$scoped_dir_suffix"
     $unix_scoped_dir = $scoped_dir.replace('\', '/')
-    if((composer show $prefix$tool -d $unix_scoped_dir -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
-      composer config -d $unix_scoped_dir --no-plugins allow-plugins."$prefix$release" true >$null 2>&1
-    }
     if(-not(Test-Path $scoped_dir)) {
       New-Item -ItemType Directory -Force -Path $scoped_dir > $null 2>&1
+      Set-Content -Path $scoped_dir\composer.json -Value "{}"
+      if((composer show $prefix$tool $tool_version -d $unix_scoped_dir -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
+        composer config -d $unix_scoped_dir --no-plugins allow-plugins."$prefix$tool" true >$null 2>&1
+      }
       composer require $prefix$release -d $unix_scoped_dir $composer_args >$null 2>&1
     }
     [System.Environment]::SetEnvironmentVariable(($tool.replace('-', '_') + '_bin'), "$scoped_dir\vendor\bin")

package/src/scripts/tools/add_tools.sh

@@ -160,9 +160,10 @@ add_composertool_helper() {
   scope=$4
   composer_args=$5
   enable_extensions curl mbstring openssl
+  tool_version=${release##*:}; [ "$tool_version" = "$tool" ] && tool_version="*"
   if [ "$scope" = "global" ]; then
     sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
-    if composer global show "$prefix$tool" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
+    if composer global show "$prefix$tool" "$tool_version" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
       composer global config --no-plugins allow-plugins."$prefix$tool" true >/dev/null 2>&1
     fi
     composer global require "$prefix$release" "$composer_args" >/dev/null 2>&1
@@ -172,7 +173,7 @@ add_composertool_helper() {
     if ! [ -d "$scoped_dir" ]; then
       mkdir -p "$scoped_dir"
       echo '{}' | tee "$scoped_dir/composer.json" >/dev/null
-      if composer show "$prefix$tool" -d "$scoped_dir" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
+      if composer show "$prefix$tool" "$tool_version" -d "$scoped_dir" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
         composer config -d "$scoped_dir" --no-plugins allow-plugins."$prefix$tool" true >/dev/null 2>&1
       fi
       composer require "$prefix$release" -d "$scoped_dir" "$composer_args" >/dev/null 2>&1