Update dependencies as per runner on macOS

__tests__/extensions.test.ts

@@ -78,13 +78,15 @@ describe('Extension tests', () => {
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, grpc, protobuf, swoole, sqlite, ast-beta',
+      'Xdebug, pcov, grpc, igbinary, imagick, protobuf, swoole, 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 grpc');
+    expect(darwin).toContain('add_brew_extension igbinary');
+    expect(darwin).toContain('add_brew_extension imagick');
     expect(darwin).toContain('add_brew_extension protobuf');
     expect(darwin).toContain('add_brew_extension swoole');
     expect(darwin).toContain('pecl_install sqlite3');
@@ -117,14 +119,6 @@ describe('Extension tests', () => {
     darwin = await extensions.addExtension('redis', '7.2', 'darwin');
     expect(darwin).toContain('pecl_install redis');
 
-    darwin = await extensions.addExtension('imagick', '5.6', 'darwin');
-    expect(darwin).toContain('brew install pkg-config imagemagick');
-    expect(darwin).toContain('pecl_install imagick');
-
-    darwin = await extensions.addExtension('imagick', '7.4', 'darwin');
-    expect(darwin).toContain('brew install pkg-config imagemagick');
-    expect(darwin).toContain('pecl_install imagick');
-
     darwin = await extensions.addExtension(
       'does_not_exist',
       '7.2',

dist/index.js

@@ -2421,9 +2421,14 @@ exports.build = build;
  */
 async function run() {
     try {
+        core.warning('setup-php v1 is deprecated.\nPlease upgrade to v2 - https://github.com/shivammathur/setup-php/wiki/Switch-to-v2');
         const os_version = process.platform;
         let version = await utils.getInput('php-version', true);
         version = version.length > 1 ? version.slice(0, 3) : version + '.0';
+        if (version == '8.1') {
+            core.setFailed('PHP 8.1 is not supported on setup-php v1.\nPlease upgrade to v2 - https://github.com/shivammathur/setup-php/wiki/Switch-to-v2');
+            return;
+        }
         // check the os version and run the respective script
         let script_path = '';
         switch (os_version) {
@@ -2698,9 +2703,8 @@ const utils = __importStar(__webpack_require__(163));
  *
  * @param extension_csv
  * @param version
- * @param pipe
  */
-async function addExtensionDarwin(extension_csv, version, pipe) {
+async function addExtensionDarwin(extension_csv, version) {
     const extensions = await utils.extensionArray(extension_csv);
     let script = '\n';
     await utils.asyncForEach(extensions, async function (extension) {
@@ -2720,28 +2724,18 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                         ' ' +
                         ext_prefix;
                 return;
-            // match 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
-            // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
+            // match 5.6xdebug to 8.0xdebug, 5.6igbinary to 8.0igbinary
+            // match 5.6grpc to 7.4grpc, 5.6imagick to 7.4imagick, 5.6protobuf to 7.4protobuf, 5.6swoole to 7.4swoole
             // match 7.1pcov to 8.0pcov
-            case /(5\.6|7\.[0-4]|8\.[0-9])xdebug/.test(version_extension):
-            case /(5\.6|7\.[0-4])(grpc|protobuf|swoole)/.test(version_extension):
-            case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
+            case /(5\.6|7\.[0-4]|8\.0)(xdebug|igbinary)/.test(version_extension):
+            case /(5\.6|7\.[0-4])(grpc|imagick|protobuf|swoole)/.test(version_extension):
+            case /(7\.[1-4]|8\.0])pcov/.test(version_extension):
                 command = 'add_brew_extension ' + extension_name;
                 break;
             // match 5.6redis
             case /5\.6redis/.test(version_extension):
                 command = command_prefix + 'redis-2.2.8';
                 break;
-            // match imagick
-            case /^imagick$/.test(extension):
-                command =
-                    'brew install pkg-config imagemagick' +
-                        pipe +
-                        ' && ' +
-                        command_prefix +
-                        'imagick' +
-                        pipe;
-                break;
             // match sqlite
             case /^sqlite$/.test(extension):
                 extension = 'sqlite3';
@@ -2914,7 +2908,7 @@ async function addExtension(extension_csv, version, os_version, no_step = false)
         case 'win32':
             return script + (await addExtensionWindows(extension_csv, version));
         case 'darwin':
-            return script + (await addExtensionDarwin(extension_csv, version, pipe));
+            return script + (await addExtensionDarwin(extension_csv, version));
         case 'linux':
             return script + (await addExtensionLinux(extension_csv, version, pipe));
         default:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "1.9.7",
+  "version": "1.9.8",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
@@ -31,18 +31,18 @@
   },
   "devDependencies": {
     "@types/jest": "^26.0.14",
-    "@types/node": "^14.11.2",
-    "@typescript-eslint/eslint-plugin": "^4.3.0",
-    "@typescript-eslint/parser": "^4.3.0",
+    "@types/node": "^14.11.10",
+    "@typescript-eslint/eslint-plugin": "^4.4.1",
+    "@typescript-eslint/parser": "^4.4.1",
     "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.10.0",
-    "eslint-config-prettier": "^6.12.0",
+    "eslint": "^7.11.0",
+    "eslint-config-prettier": "^6.13.0",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.0.2",
+    "eslint-plugin-jest": "^24.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "husky": "^4.3.0",
-    "jest": "^26.4.2",
-    "jest-circus": "^26.4.2",
+    "jest": "^26.5.3",
+    "jest-circus": "^26.5.3",
     "prettier": "^2.1.2",
     "ts-jest": "^26.4.1",
     "typescript": "^4.0.3"

src/extensions.ts

@@ -6,12 +6,10 @@ import * as utils from './utils';
  *
  * @param extension_csv
  * @param version
- * @param pipe
  */
 export async function addExtensionDarwin(
   extension_csv: string,
-  version: string,
-  pipe: string
+  version: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
   let script = '\n';
@@ -32,28 +30,20 @@ export async function addExtensionDarwin(
           ' ' +
           ext_prefix;
         return;
-      // match 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
-      // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
+      // match 5.6xdebug to 8.0xdebug, 5.6igbinary to 8.0igbinary
+      // match 5.6grpc to 7.4grpc, 5.6imagick to 7.4imagick, 5.6protobuf to 7.4protobuf, 5.6swoole to 7.4swoole
       // match 7.1pcov to 8.0pcov
-      case /(5\.6|7\.[0-4]|8\.[0-9])xdebug/.test(version_extension):
-      case /(5\.6|7\.[0-4])(grpc|protobuf|swoole)/.test(version_extension):
-      case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
+      case /(5\.6|7\.[0-4]|8\.0)(xdebug|igbinary)/.test(version_extension):
+      case /(5\.6|7\.[0-4])(grpc|imagick|protobuf|swoole)/.test(
+        version_extension
+      ):
+      case /(7\.[1-4]|8\.0])pcov/.test(version_extension):
         command = 'add_brew_extension ' + extension_name;
         break;
       // match 5.6redis
       case /5\.6redis/.test(version_extension):
         command = command_prefix + 'redis-2.2.8';
         break;
-      // match imagick
-      case /^imagick$/.test(extension):
-        command =
-          'brew install pkg-config imagemagick' +
-          pipe +
-          ' && ' +
-          command_prefix +
-          'imagick' +
-          pipe;
-        break;
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
@@ -239,7 +229,7 @@ export async function addExtension(
     case 'win32':
       return script + (await addExtensionWindows(extension_csv, version));
     case 'darwin':
-      return script + (await addExtensionDarwin(extension_csv, version, pipe));
+      return script + (await addExtensionDarwin(extension_csv, version));
     case 'linux':
       return script + (await addExtensionLinux(extension_csv, version, pipe));
     default:

src/install.ts

@@ -62,9 +62,18 @@ export async function build(
  */
 export async function run(): Promise<void> {
   try {
+    core.warning(
+      'setup-php v1 is deprecated.\nPlease upgrade to v2 - https://github.com/shivammathur/setup-php/wiki/Switch-to-v2'
+    );
     const os_version: string = process.platform;
     let version: string = await utils.getInput('php-version', true);
     version = version.length > 1 ? version.slice(0, 3) : version + '.0';
+    if (version == '8.1') {
+      core.setFailed(
+        'PHP 8.1 is not supported on setup-php v1.\nPlease upgrade to v2 - https://github.com/shivammathur/setup-php/wiki/Switch-to-v2'
+      );
+      return;
+    }
     // check the os version and run the respective script
     let script_path = '';
     switch (os_version) {

src/scripts/darwin.sh

@@ -40,7 +40,7 @@ pecl_install() {
   yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
 }
 
-# Fuction to get the PECL version
+# Function to get the PECL version
 get_pecl_version() {
   extension=$1
   stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
@@ -192,8 +192,20 @@ add_pecl() {
   add_log "$tick" "PECL" "Added"
 }
 
+# Function to update dependencies
+update_dependencies() {
+  if [ "$version" = '8.0' ]; then
+    while read -r formula; do
+      curl -o "$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/$formula.rb" "${curl_opts[@]}" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb" &
+      to_wait+=( $! )
+    done < "$(brew --prefix)/Homebrew/Library/Taps/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
+    wait "${to_wait[@]}"
+  fi
+}
+
 # Function to setup PHP and composer
 setup_php() {
+  update_dependencies
   export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
   brew tap --shallow shivammathur/homebrew-php
   brew install shivammathur/php/php@"$version"
@@ -225,5 +237,5 @@ scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 sudo mkdir -p "$ext_dir"
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
 configure_pecl
-sudo mv "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
+sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/ext/phalcon.sh

@@ -22,7 +22,7 @@ update_ppa() {
 install_phalcon() {
   extension=$1
   version=$2
-  (update_ppa && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "php$version-$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
+  (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

@@ -22,7 +22,7 @@ cleanup_lists() {
     sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save || true
     sudo mkdir /etc/apt/sources.list.d
     sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/ || true
-    trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/" exit
+    trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/ 2>/dev/null" exit
   fi
 }
 
@@ -46,7 +46,7 @@ configure_pecl() {
   fi
 }
 
-# Fuction to get the PECL version
+# Function to get the PECL version
 get_pecl_version() {
   extension=$1
   stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
@@ -256,7 +256,7 @@ pecl_config="false"
 version=$1
 dist=$2
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
-apt_install="sudo $debconf_fix apt-fast install -y"
+apt_install="sudo $debconf_fix apt-get install -y"
 tool_path_dir="/usr/local/bin"
 curl_opts=(-sL)
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
@@ -299,5 +299,5 @@ pecl_file="$scan_dir"/99-pecl.ini
 echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
 sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1
 sudo chmod 777 "$ini_file" "$pecl_file" "$tool_path_dir"
-sudo mv "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
+sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/win32.ps1

@@ -59,9 +59,8 @@ Function Add-Printf {
 Function Install-PhpManager() {
   $module_path = "$php_dir\PhpManager\PhpManager.psm1"
   if(-not (Test-Path $module_path -PathType Leaf)) {
-    $release = Invoke-RestMethod https://api.github.com/repos/mlocati/powershell-phpmanager/releases/latest
     $zip_file = "$php_dir\PhpManager.zip"
-    Invoke-WebRequest -UseBasicParsing -Uri $release.assets[0].browser_download_url -OutFile $zip_file
+    Invoke-WebRequest -UseBasicParsing -Uri 'https://github.com/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip' -OutFile $zip_file
     Expand-Archive -Path $zip_file -DestinationPath $php_dir -Force
   }
   Import-Module $module_path
@@ -285,5 +284,5 @@ Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
 Set-PhpIniKey -Key 'memory_limit' -Value '-1' -Path $php_dir
 Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
 Update-PhpCAInfo -Path $php_dir -Source CurrentUser
-Move-Item -path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE
+Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE
 Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)"