Bump version to 1.11.5

Replace husky with simple-git-hooks

Update Node.js dependencies

.github/FUNDING.yml

@@ -1,7 +1,3 @@
 # These are supported funding model platforms
 
-open_collective: setup-php
-tidelift: "npm/setup-php"
-community_bridge: setup-php
-patreon: shivammathur
-custom: https://www.paypal.me/shivammathur
+github:shivammathur

.github/SECURITY.md

@@ -7,7 +7,7 @@ The following versions of this project are supported for security updates.
 | Version | Supported          |
 | ------- | ------------------ |
 | 1.11.x  | :white_check_mark: |
-| 2.11.x   | :white_check_mark: |
+| 2.14.x  | :white_check_mark: |
 
 ## Supported PHP Versions
 
@@ -18,6 +18,7 @@ This security policy only applies to the latest patches of the following PHP ver
 | 7.3     | :white_check_mark: |
 | 7.4     | :white_check_mark: |
 | 8.0     | :white_check_mark: |
+| 8.1     | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

README.md

@@ -61,6 +61,7 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 |Ubuntu 18.04|`ubuntu-18.04`|`PHP 7.1` to `PHP 8.0`|
 |Ubuntu 20.04|`ubuntu-latest` or `ubuntu-20.04`|`PHP 7.4` to `PHP 8.0`|
 |Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 8.0`|
+|Windows Server 2022|`windows-2022`|`PHP 8.0`|
 |macOS 10.15 Catalina|`macos-latest` or `macos-10.15`|`PHP 8.0`|
 |macOS 11.x Big Sur|`macos-11`|`PHP 8.0`|
 
@@ -415,31 +416,24 @@ Contributions are welcome! See [Contributor's Guide](.github/CONTRIBUTING.md "sh
 
 ## :sparkling_heart: Support This Project
 
-- If setup-php saved your developer time, please consider sponsoring setup-php:
-  - [Open Collective](https://opencollective.com/setup-php "setup-php Open Collective")
-  - [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal")
-  - [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon")
-- Please [reach out](mailto:contact@setup-php.com) if you have any questions regarding sponsoring setup-php.
-- Please star the project and share it. If you blog, please share your experience of using this action.
+Please sponsor setup-php using [GitHub sponsors](https://github.com/sponsors/shivammathur).
 
-*Huge thanks to the following companies for supporting `setup-php`*
+[![Sponsor shivammathur](https://img.shields.io/badge/-Sponsor-fafbfc?logo=GitHub%20Sponsors)](https://github.com/sponsors/shivammathur)
 
-<p>
-  <a href="https://www.jetbrains.com/?from=setup-php">
-    <img src="https://setup-php.com/sponsors/jetbrains.svg" alt="JetBrains" width="106" height="60">
+### Corporate Sponsors
+
+<p align="center">
+  <a href="https://setup-php.com/sponsors-corp/?">
+    <img src="https://setup-php.com/sponsors-corp/?" alt="Corporate sponsors of setup-php and related projects" width="100%">
   </a>
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://blackfire.io/?utm_source=setup-php">
-    <img src="https://setup-php.com/sponsors//blackfire.svg" alt="Blackfire" width="212" height="60">
+</p>
+
+### Individual Sponsors
+
+<p align="center">
+  <a href="https://setup-php.com/sponsors/?">
+    <img src="https://setup-php.com/sponsors/?" alt="Individual sponsors of setup-php and related projects" width="100%">
   </a>
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://www.macstadium.com/?source=setup-php">
-    <img src="https://setup-php.com/sponsors//macstadium.png" alt="Mac Stadium" width="148" height="60">
-  </a>
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://tidelift.com/subscription/pkg/npm-setup-php">
-    <img src="https://setup-php.com/sponsors//tidelift.png" alt="Tidelift" width="70" height="60">
-  </a>  
 </p>
 
 ## :bookmark: Dependencies

__tests__/extensions.test.ts

@@ -73,12 +73,13 @@ describe('Extension tests', () => {
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, grpc, igbinary, imagick, phalcon3, phalcon4, protobuf, psr, rdkafka, swoole, sqlite, ast-beta',
+      'Xdebug, pcov, expect, grpc, igbinary, imagick, phalcon3, phalcon4, protobuf, psr, rdkafka, ssh2, swoole, vips, sqlite, ast-beta',
       '7.2',
       'darwin'
     );
     expect(darwin).toContain('add_brew_extension xdebug');
     expect(darwin).toContain('add_brew_extension pcov');
+    expect(darwin).toContain('add_brew_extension expect');
     expect(darwin).toContain('add_brew_extension grpc');
     expect(darwin).toContain('add_brew_extension igbinary');
     expect(darwin).toContain('add_brew_extension imagick');
@@ -87,7 +88,9 @@ describe('Extension tests', () => {
     expect(darwin).toContain('add_brew_extension protobuf');
     expect(darwin).toContain('add_brew_extension psr');
     expect(darwin).toContain('add_brew_extension rdkafka');
+    expect(darwin).toContain('add_brew_extension ssh2');
     expect(darwin).toContain('add_brew_extension swoole');
+    expect(darwin).toContain('add_brew_extension vips');
     expect(darwin).toContain('pecl_install sqlite3');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
 

dist/index.js

@@ -230,9 +230,10 @@ async function addExtensionDarwin(extension_csv, version) {
                         ' ' +
                         ext_prefix;
                 return;
-            case /(5\.6|7\.[0-4]|8.0)(amqp|grpc|igbinary|imagick|imap|mongodb|msgpack|^(pecl_)?http$|propro|protobuf|psr|raphf|rdkafka|redis|swoole|xdebug|xdebug2|yaml|zmq)/.test(version_extension):
+            case /(5\.6|7\.[0-4]|8.0)(amqp|expect|grpc|igbinary|imagick|imap|mongodb|msgpack|^(pecl_)?http$|propro|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(version_extension):
             case /(7\.[1-4]|8\.0])pcov/.test(version_extension):
             case /^(5\.6|7\.[0-3])phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+            case /(7\.[0-4]|8\.0])vips/.test(version_extension):
                 command = 'add_brew_extension ' + extension_name.replace('pecl_', '');
                 break;
             case /^sqlite$/.test(extension):
@@ -444,8 +445,8 @@ async function run() {
         }
         core.warning('setup-php v1 is deprecated.\nPlease upgrade to v2 - https://setup-php.com/w/Switch-to-v2');
         const version = await utils.parseVersion(await utils.getInput('php-version', true));
-        if (version == '8.1') {
-            core.setFailed('PHP 8.1 is not supported on setup-php v1.\nPlease upgrade to v2 - https://setup-php.com/w/Switch-to-v2');
+        if (parseFloat(version) < 5.6 || parseFloat(version) > 8.0) {
+            core.setFailed(`setup-php v1 supports only PHP 5.6 to 8.0.\nPlease upgrade to v2 - https://setup-php.com/w/Switch-to-v2`);
             return;
         }
         if (version) {
@@ -455,11 +456,11 @@ async function run() {
                 case 'darwin':
                 case 'linux':
                     script_path = await build(os_version + '.sh', version, os_version);
-                    await exec_1.exec('bash ' + script_path + ' ' + version + ' ' + __dirname);
+                    await (0, exec_1.exec)('bash ' + script_path + ' ' + version + ' ' + __dirname);
                     break;
                 case 'win32':
                     script_path = await build('win32.ps1', version, os_version);
-                    await exec_1.exec('pwsh ' + script_path + ' ' + version + ' ' + __dirname);
+                    await (0, exec_1.exec)('pwsh ' + script_path + ' ' + version + ' ' + __dirname);
                     break;
             }
         }
@@ -468,7 +469,7 @@ async function run() {
         }
     }
     catch (error) {
-        core.setFailed(error.message);
+        core.setFailed(error);
     }
 }
 exports.run = run;

package.json

@@ -1,14 +1,24 @@
 {
   "name": "setup-php",
-  "version": "1.11.3",
+  "version": "1.11.5",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
+  "types": "lib/install.d.ts",
+  "directories": {
+    "lib": "lib",
+    "test": "__tests__",
+    "src": "src"
+  },
+  "files": [
+    "lib",
+    "src"
+  ],
   "scripts": {
     "build": "tsc",
-    "lint": "eslint **/*.ts --cache --fix",
-    "format": "prettier --write **/*.ts && git add .",
-    "format-check": "prettier --check **/*.ts",
+    "lint": "eslint **/src/*.ts --cache --fix",
+    "format": "prettier --write **/src/*.ts && git add .",
+    "format-check": "prettier --check **/src/*.ts",
     "release": "ncc build -o dist && git add -f dist/",
     "test": "jest"
   },
@@ -30,27 +40,27 @@
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.1",
-    "@types/node": "^16.7.1",
-    "@typescript-eslint/eslint-plugin": "^4.29.2",
-    "@typescript-eslint/parser": "^4.29.2",
-    "@vercel/ncc": "^0.29.2",
+    "@types/jest": "^27.0.2",
+    "@types/node": "^16.10.1",
+    "@typescript-eslint/eslint-plugin": "^4.32.0",
+    "@typescript-eslint/parser": "^4.32.0",
+    "@vercel/ncc": "^0.31.1",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.24.1",
-    "eslint-plugin-jest": "^24.4.0",
-    "eslint-plugin-prettier": "^3.4.1",
-    "husky": "^4.3.8",
-    "jest": "^27.0.6",
-    "jest-circus": "^27.0.6",
-    "prettier": "^2.3.2",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-jest": "^24.4.2",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jest": "^27.2.2",
+    "jest-circus": "^27.2.2",
+    "prettier": "^2.4.1",
+    "simple-git-hooks": "^2.6.1",
     "ts-jest": "^27.0.5",
-    "typescript": "^4.3.5"
+    "typescript": "^4.4.3"
   },
-  "husky": {
-    "skipCI": true,
-    "hooks": {
-      "pre-commit": "npm run format && npm run lint && npm run test && npm run build && npm run release"
-    }
+  "bugs": {
+    "url": "https://github.com/shivammathur/setup-php/issues"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "npm run format && npm run lint && npm run test && npm run build && npm run release"
   }
 }

src/configs/brew_extensions

@@ -0,0 +1,28 @@
+amqp=amqp
+apcu=apcu
+expect=expect
+grpc=grpc
+igbinary=igbinary
+imagick=imagick
+imap=imap
+memcache=memcache
+memcached=memcached
+mongodb=mongodb
+msgpack=msgpack
+pcov=pcov
+pecl_http=http
+phalcon3=phalcon
+phalcon4=phalcon
+propro=propro
+protobuf=protobuf
+psr=psr
+raphf=raphf
+rdkafka=rdkafka
+redis=redis
+ssh2=ssh2
+swoole=swoole
+vips=vips
+xdebug=xdebug
+xdebug2=xdebug
+yaml=yaml
+zmq=zmq

src/extensions.ts

@@ -30,15 +30,17 @@ export async function addExtensionDarwin(
           ' ' +
           ext_prefix;
         return;
-      // match 5.6 to 8.0 amqp, grpc, igbinary, imagick, imap, mongodb, msgpack, pecl_http, propro, protobuf, raphf, rdkafka, redis, swoole, xdebug, xdebug2, yaml, zmq
+      // match 5.6 to 8.0 amqp, expect, grpc, igbinary, imagick, imap, mongodb, msgpack, pecl_http, propro, protobuf, raphf, rdkafka, redis, ssh2, swoole, xdebug, xdebug2, yaml, zmq
       // match 7.1pcov to 8.0pcov
-      case /(5\.6|7\.[0-4]|8.0)(amqp|grpc|igbinary|imagick|imap|mongodb|msgpack|^(pecl_)?http$|propro|protobuf|psr|raphf|rdkafka|redis|swoole|xdebug|xdebug2|yaml|zmq)/.test(
+      // match 7.0vips to 8.0vips
+      case /(5\.6|7\.[0-4]|8.0)(amqp|expect|grpc|igbinary|imagick|imap|mongodb|msgpack|^(pecl_)?http$|propro|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(
         version_extension
       ):
       case /(7\.[1-4]|8\.0])pcov/.test(version_extension):
       case /^(5\.6|7\.[0-3])phalcon3$|^7\.[2-4]phalcon4$/.test(
         version_extension
       ):
+      case /(7\.[0-4]|8\.0])vips/.test(version_extension):
         command = 'add_brew_extension ' + extension_name.replace('pecl_', '');
         break;
       // match sqlite

src/install.ts

@@ -67,9 +67,9 @@ export async function run(): Promise<void> {
     const version: string = await utils.parseVersion(
       await utils.getInput('php-version', true)
     );
-    if (version == '8.1') {
+    if (parseFloat(version) < 5.6 || parseFloat(version) > 8.0) {
       core.setFailed(
-        'PHP 8.1 is not supported on setup-php v1.\nPlease upgrade to v2 - https://setup-php.com/w/Switch-to-v2'
+        `setup-php v1 supports only PHP 5.6 to 8.0.\nPlease upgrade to v2 - https://setup-php.com/w/Switch-to-v2`
       );
       return;
     }
@@ -92,7 +92,7 @@ export async function run(): Promise<void> {
       core.setFailed('Unable to get the PHP version');
     }
   } catch (error) {
-    core.setFailed(error.message);
+    core.setFailed(error as Error);
   }
 }
 

src/scripts/darwin.sh

@@ -18,7 +18,7 @@ add_log() {
 
 # Function to remove extensions
 remove_extension() {
-  extension=$1
+  local extension=$1
   sudo sed -Ei '' "/=(.*\/)?\"?$extension/d" "$ini_file"
   sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
   sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
@@ -26,7 +26,7 @@ remove_extension() {
 
 # Function to test if extension is loaded
 check_extension() {
-  extension=$1
+  local extension=$1
   if [ "$extension" != "mysql" ]; then
     php -m | grep -i -q -w "$extension"
   else
@@ -42,7 +42,7 @@ pecl_install() {
 
 # Function to get the PECL version
 get_pecl_version() {
-  extension=$1
+  local extension=$1
   stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
   pecl_rest='https://pecl.php.net/rest/r/'
   response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
@@ -55,7 +55,7 @@ get_pecl_version() {
 
 # Function to install a PECL version
 add_pecl_extension() {
-  extension=$1
+  local extension=$1
   pecl_version=$2
   prefix=$3
   if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
@@ -103,7 +103,8 @@ add_brew_tap() {
 # Function to install a php extension from shivammathur/extensions tap.
 add_brew_extension() {
   formula=$1
-  extension=${formula//[0-9]/}
+  extension=$(grep "$formula=" "$dist"/../src/configs/brew_extensions | cut -d '=' -f 2)
+  [[ -z "$extension" ]] && extension="$(echo "$formula" | sed -E "s/pecl_|[0-9]//g")"
   add_brew_tap shivammathur/homebrew-php
   add_brew_tap shivammathur/homebrew-extensions
   sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
@@ -113,7 +114,7 @@ add_brew_extension() {
 
 # Function to setup extensions
 add_extension() {
-  extension=$1
+  local extension=$1
   install_command=$2
   prefix=$3
   if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
@@ -131,7 +132,7 @@ add_extension() {
 
 # Function to pre-release extensions using PECL
 add_unstable_extension() {
-  extension=$1
+  local extension=$1
   stability=$2
   prefix=$3
   pecl_version=$(get_pecl_version "$extension" "$stability")

src/scripts/ext/phalcon.sh

@@ -20,7 +20,7 @@ update_ppa() {
 
 # Function to install phalcon
 install_phalcon() {
-  extension=$1
+  local extension=$1
   version=$2
   (update_ppa && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "php$version-psr" "php$version-$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
   add_log "$cross" "$extension" "Could not install $extension on PHP $semver"

src/scripts/linux.sh

@@ -62,7 +62,7 @@ configure_pecl() {
 
 # Function to get the PECL version
 get_pecl_version() {
-  extension=$1
+  local extension=$1
   stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
   pecl_rest='https://pecl.php.net/rest/r/'
   response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
@@ -89,7 +89,7 @@ enable_extension() {
 
 # Function to test if extension is loaded
 check_extension() {
-  extension=$1
+  local extension=$1
   if [ "$extension" != "mysql" ]; then
     php -m | grep -i -q -w "$extension"
   else
@@ -99,7 +99,7 @@ check_extension() {
 
 # Function to delete extensions
 delete_extension() {
-  extension=$1
+  local extension=$1
   sudo sed -Ei "/=(.*\/)?\"?$extension/d" "$ini_file"
   sudo sed -Ei "/=(.*\/)?\"?$extension/d" "$pecl_file"
   sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
@@ -109,7 +109,7 @@ delete_extension() {
 
 # Function to disable and delete extensions
 remove_extension() {
-  extension=$1
+  local extension=$1
   if [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
     sudo phpdismod -v "$version" "$extension"
   fi
@@ -118,7 +118,7 @@ remove_extension() {
 
 # Function to setup extensions
 add_extension() {
-  extension=$1
+  local extension=$1
   install_command=$2
   prefix=$3
   enable_extension "$extension" "$prefix"
@@ -135,7 +135,7 @@ add_extension() {
 
 # Function to install a PECL version
 add_pecl_extension() {
-  extension=$1
+  local extension=$1
   pecl_version=$2
   prefix=$3
   configure_pecl
@@ -158,7 +158,7 @@ add_pecl_extension() {
 
 # Function to pre-release extensions using PECL
 add_unstable_extension() {
-  extension=$1
+  local extension=$1
   stability=$2
   prefix=$3
   pecl_version=$(get_pecl_version "$extension" "$stability")

src/scripts/win32.ps1

@@ -46,13 +46,13 @@ Function Add-ToProfile {
 Function Add-Printf {
   if (-not(Test-Path "C:\Program Files\Git\usr\bin\printf.exe")) {
     if(Test-Path "C:\msys64\usr\bin\printf.exe") {
-      New-Item -Path $php_dir\printf.exe -ItemType SymbolicLink -Value C:\msys64\usr\bin\printf.exe
+      New-Item -Path $php_dir\printf.exe -ItemType SymbolicLink -Value C:\msys64\usr\bin\printf.exe -Force > $null 2>&1
     } else {
       Invoke-WebRequest -UseBasicParsing -Uri "$github/shivammathur/printf/releases/latest/download/printf-x64.zip" -OutFile "$php_dir\printf.zip"
       Expand-Archive -Path $php_dir\printf.zip -DestinationPath $php_dir -Force
     }
   } else {
-    New-Item -Path $php_dir\printf.exe -ItemType SymbolicLink -Value "C:\Program Files\Git\usr\bin\printf.exe"
+    New-Item -Path $php_dir\printf.exe -ItemType SymbolicLink -Value "C:\Program Files\Git\usr\bin\printf.exe" -Force > $null 2>&1
   }
 }
 
@@ -277,7 +277,6 @@ $github = 'https://github.com'
 $composer_bin = "$env:APPDATA\Composer\vendor\bin"
 $composer_json = "$env:APPDATA\Composer\composer.json"
 $composer_lock = "$env:APPDATA\Composer\composer.lock"
-$master_version = '8.0'
 $arch = 'x64'
 if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
   $arch = 'x86'
@@ -308,13 +307,7 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
     Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" Get-VcList >$null 2>&1
   }
   try {
-    if ($version -eq $master_version) {
-      $version = 'master'
-      Invoke-WebRequest -UseBasicParsing -Uri https://github.com/shivammathur/php-builder-windows/releases/latest/download/Get-Php.ps1 -OutFile $php_dir\Get-Php.ps1 > $null 2>&1
-      & $php_dir\Get-Php.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir
-    } else {
-      Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
-    }
+    Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
   } catch { }
 } else {
   $status = "Found"
@@ -329,5 +322,5 @@ if($installed.MajorMinorVersion -ne $version) {
 Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
 Update-PhpCAInfo -Path $php_dir -Source CurrentUser
 Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE
-New-Item -ItemType Directory -Path $composer_bin -Force 2>&1 | Out-Null
+New-Item -ItemType Directory -Path $composer_bin -Force > $null 2>&1
 Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)"

tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "declaration": true,
     "esModuleInterop": true,
     "lib": [
       "ES2020"
@@ -15,4 +16,4 @@
     "target": "ES2019"
   },
   "exclude": ["__tests__", "lib", "node_modules"]
-}
+}