Bump version to 1.9.6

.github/SECURITY.md

@@ -7,7 +7,7 @@ The following versions of this project are supported for security updates.
 | Version | Supported          |
 | ------- | ------------------ |
 | 1.9.x   | :white_check_mark: |
-| 2.6.x   | :white_check_mark: |
+| 2.5.x   | :white_check_mark: |
 
 ## Supported PHP Versions
 

README.md

@@ -8,7 +8,7 @@
 
 <p align="center">
   <a href="https://github.com/shivammathur/setup-php" title="GitHub action to setup PHP"><img alt="GitHub Actions status" src="https://github.com/shivammathur/setup-php/workflows/Main%20workflow/badge.svg"></a>
-  <a href="https://codecov.io/gh/shivammathur/setup-php" title="Code coverage"><img alt="Codecov Code Coverage" src="https://img.shields.io/codecov/c/github/shivammathur/setup-php?logo=codecov"></a>
+  <a href="https://codecov.io/gh/shivammathur/setup-php" title="Code coverage"><img alt="Codecov Code Coverage" src="https://codecov.io/gh/shivammathur/setup-php/branch/master/graph/badge.svg"></a>
   <a href="https://github.com/shivammathur/setup-php/blob/master/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg"></a>
   <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg"></a>
 </p>
@@ -300,72 +300,31 @@ If you have a number of workflows which setup multiple tools or have many compos
 
 ### Problem Matchers
 
-Problem matchers are `json` configurations which identify errors and warnings in your logs and surface that information prominently in the GitHub Actions UI by highlighting them and creating code annotations.
-
-#### PHP
-
-Setup problem matchers for your `PHP` output by adding this step after the `setup-php` step.
-
-```yaml
-- name: Setup problem matchers for PHP
-  run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-```
-
 #### PHPUnit
 
-Setup problem matchers for your `PHPUnit` output by adding this step after the `setup-php` step.
+You can setup problem matchers for your `PHPUnit` output by adding this step after the `setup-php` step. This will scan the logs for failing tests and surface that information prominently in the GitHub Actions UI by creating annotations and log file decorations.
 
 ```yaml
-- name: Setup problem matchers for PHPUnit
+- name: Setup Problem Matchers for PHPUnit
   run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 ```
 
-#### PHPStan
-
-PHPStan supports error reporting in GitHub Actions, so no problem matchers are required.
-
-```yaml
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-    tools: phpstan
-
-- name: Run PHPStan
-  run: phpstan analyse src
-```
-
-#### Psalm
-
-Psalm supports error reporting in GitHub Actions with an output format `github`.
-
-```yaml
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-    tools: psalm
-
-- name: Run Psalm
-  run: psalm --output-format=github
-```
-
-#### Tools with checkstyle support
+#### Other Tools
 
 For tools that support `checkstyle` reporting like `phpstan`, `psalm`, `php-cs-fixer` and `phpcs` you can use `cs2pr` to annotate your code.  
-For examples refer to [cs2pr documentation](https://github.com/staabm/annotate-pull-request-from-checkstyle).   
+For examples refer to [cs2pr documentation](https://github.com/staabm/annotate-pull-request-from-checkstyle).  
 
-> Here is an example with `phpcs`.
+> Here is an example with `phpstan`.
 
 ```yaml
 - name: Setup PHP
-  uses: shivammathur/setup-php@v2
+  uses: shivammathur/setup-php@v1
   with:
     php-version: '7.4'
-    tools: cs2pr, phpcs
+    tools: cs2pr, phpstan
 
-- name: Run phpcs
-  run: phpcs -q --report=checkstyle src | cs2pr
+- name: PHPStan
+  run: phpstan analyse src --error-format=checkstyle | cs2pr
 ```
 
 ### Examples

__tests__/extensions.test.ts

@@ -78,15 +78,13 @@ describe('Extension tests', () => {
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, grpc, igbinary, imagick, protobuf, swoole, sqlite, ast-beta',
+      'Xdebug, pcov, grpc, 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');
@@ -119,6 +117,14 @@ 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',

__tests__/matchers.test.ts

@@ -0,0 +1,24 @@
+import * as io from '@actions/io';
+import * as matchers from '../src/matchers';
+
+jest.mock('@actions/io');
+
+describe('Matchers', () => {
+  it('Add matchers', async () => {
+    process.env['RUNNER_TOOL_CACHE'] = __dirname;
+    await matchers.addMatchers();
+    const spy = jest.spyOn(io, 'cp');
+    expect(spy).toHaveBeenCalledTimes(1);
+  });
+
+  it('Test Regex', async () => {
+    const regex1 = /^\d+\)\s.*$/;
+    const regex2 = /^(.*Failed\sasserting\sthat.*)$/;
+    const regex3 = /^\s*$/;
+    const regex4 = /^(.*):(\d+)$/;
+    expect(regex1.test('1) Tests\\Test::it_tests')).toBe(true);
+    expect(regex2.test('Failed asserting that false is true')).toBe(true);
+    expect(regex3.test('\n')).toBe(true);
+    expect(regex4.test('/path/to/file.php:42')).toBe(true);
+  });
+});

__tests__/utils.test.ts

@@ -17,19 +17,13 @@ async function cleanup(path: string): Promise<void> {
 }
 
 describe('Utils tests', () => {
-  it('checking readEnv', async () => {
-    process.env['test'] = 'setup-php';
-    expect(await utils.readEnv('test')).toBe('setup-php');
-    expect(await utils.readEnv('undefined')).toBe('');
-  });
-
   it('checking getInput', async () => {
+    process.env['test'] = 'setup-php';
+    process.env['undefined'] = '';
     expect(await utils.getInput('test', false)).toBe('setup-php');
+    expect(await utils.getInput('undefined', false)).toBe('');
     expect(await utils.getInput('setup-php', false)).toBe('setup-php');
     expect(await utils.getInput('DoesNotExist', false)).toBe('');
-    expect(async () => {
-      await utils.getInput('DoesNotExist', true);
-    }).rejects.toThrow('Input required and not supplied: DoesNotExist');
   });
 
   it('checking asyncForEach', async () => {

dist/index.js

@@ -953,29 +953,45 @@ class ExecState extends events.EventEmitter {
 
 /***/ }),
 
-/***/ 82:
-/***/ (function(__unusedmodule, exports) {
+/***/ 86:
+/***/ (function(__unusedmodule, exports, __webpack_require__) {
 
 "use strict";
 
-// We use any as a valid input type
-/* eslint-disable @typescript-eslint/no-explicit-any */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMatchers = void 0;
+const path = __importStar(__webpack_require__(622));
+const utils = __importStar(__webpack_require__(163));
+const io = __importStar(__webpack_require__(1));
 /**
- * Sanitizes an input into a string so it can be passed into issueCommand safely
- * @param input input to sanitize into a string
+ * Cache json files for problem matchers
  */
-function toCommandValue(input) {
-    if (input === null || input === undefined) {
-        return '';
-    }
-    else if (typeof input === 'string' || input instanceof String) {
-        return input;
-    }
-    return JSON.stringify(input);
+async function addMatchers() {
+    const config_path = path.join(__dirname, '..', 'src', 'configs', 'phpunit.json');
+    const runner_dir = await utils.getInput('RUNNER_TOOL_CACHE', false);
+    await io.cp(config_path, runner_dir);
 }
-exports.toCommandValue = toCommandValue;
-//# sourceMappingURL=utils.js.map
+exports.addMatchers = addMatchers;
+
 
 /***/ }),
 
@@ -986,42 +1002,6 @@ module.exports = require("os");
 
 /***/ }),
 
-/***/ 102:
-/***/ (function(__unusedmodule, exports, __webpack_require__) {
-
-"use strict";
-
-// For internal use, subject to change.
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// We use any as a valid input type
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const fs = __importStar(__webpack_require__(747));
-const os = __importStar(__webpack_require__(87));
-const utils_1 = __webpack_require__(82);
-function issueCommand(command, message) {
-    const filePath = process.env[`GITHUB_${command}`];
-    if (!filePath) {
-        throw new Error(`Unable to find environment variable for file command ${command}`);
-    }
-    if (!fs.existsSync(filePath)) {
-        throw new Error(`Missing file at path: ${filePath}`);
-    }
-    fs.appendFileSync(filePath, `${utils_1.toCommandValue(message)}${os.EOL}`, {
-        encoding: 'utf8'
-    });
-}
-exports.issueCommand = issueCommand;
-//# sourceMappingURL=file-command.js.map
-
-/***/ }),
-
 /***/ 129:
 /***/ (function(module) {
 
@@ -1054,25 +1034,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.suppressOutput = exports.getExtensionPrefix = exports.CSVArray = exports.extensionArray = exports.writeScript = exports.readScript = exports.addLog = exports.stepLog = exports.log = exports.color = exports.asyncForEach = exports.getInput = exports.readEnv = void 0;
+exports.suppressOutput = exports.getExtensionPrefix = exports.CSVArray = exports.extensionArray = exports.writeScript = exports.readScript = exports.addLog = exports.stepLog = exports.log = exports.color = exports.asyncForEach = exports.getInput = void 0;
 const fs = __importStar(__webpack_require__(747));
 const path = __importStar(__webpack_require__(622));
 const core = __importStar(__webpack_require__(470));
-/**
- * Function to read environment variable and return a string value.
- *
- * @param property
- */
-async function readEnv(property) {
-    const value = process.env[property];
-    switch (value) {
-        case undefined:
-            return '';
-        default:
-            return value;
-    }
-}
-exports.readEnv = readEnv;
 /**
  * Function to get inputs from both with and env annotations.
  *
@@ -1080,17 +1045,13 @@ exports.readEnv = readEnv;
  * @param mandatory
  */
 async function getInput(name, mandatory) {
-    const input = core.getInput(name);
-    const env_input = await readEnv(name);
-    switch (true) {
-        case input != '':
-            return input;
-        case input == '' && env_input != '':
-            return env_input;
-        case input == '' && env_input == '' && mandatory:
-            throw new Error(`Input required and not supplied: ${name}`);
+    const input = process.env[name];
+    switch (input) {
+        case '':
+        case undefined:
+            return core.getInput(name, { required: mandatory });
         default:
-            return '';
+            return input;
     }
 }
 exports.getInput = getInput;
@@ -1309,7 +1270,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = __importStar(__webpack_require__(87));
-const utils_1 = __webpack_require__(82);
 /**
  * Commands
  *
@@ -1363,14 +1323,28 @@ class Command {
         return cmdStr;
     }
 }
+/**
+ * Sanitizes an input into a string so it can be passed into issueCommand safely
+ * @param input input to sanitize into a string
+ */
+function toCommandValue(input) {
+    if (input === null || input === undefined) {
+        return '';
+    }
+    else if (typeof input === 'string' || input instanceof String) {
+        return input;
+    }
+    return JSON.stringify(input);
+}
+exports.toCommandValue = toCommandValue;
 function escapeData(s) {
-    return utils_1.toCommandValue(s)
+    return toCommandValue(s)
         .replace(/%/g, '%25')
         .replace(/\r/g, '%0D')
         .replace(/\n/g, '%0A');
 }
 function escapeProperty(s) {
-    return utils_1.toCommandValue(s)
+    return toCommandValue(s)
         .replace(/%/g, '%25')
         .replace(/\r/g, '%0D')
         .replace(/\n/g, '%0A')
@@ -1404,8 +1378,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __webpack_require__(431);
-const file_command_1 = __webpack_require__(102);
-const utils_1 = __webpack_require__(82);
 const os = __importStar(__webpack_require__(87));
 const path = __importStar(__webpack_require__(622));
 /**
@@ -1432,17 +1404,9 @@ var ExitCode;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function exportVariable(name, val) {
-    const convertedVal = utils_1.toCommandValue(val);
+    const convertedVal = command_1.toCommandValue(val);
     process.env[name] = convertedVal;
-    const filePath = process.env['GITHUB_ENV'] || '';
-    if (filePath) {
-        const delimiter = '_GitHubActionsFileCommandDelimeter_';
-        const commandValue = `${name}<<${delimiter}${os.EOL}${convertedVal}${os.EOL}${delimiter}`;
-        file_command_1.issueCommand('ENV', commandValue);
-    }
-    else {
-        command_1.issueCommand('set-env', { name }, convertedVal);
-    }
+    command_1.issueCommand('set-env', { name }, convertedVal);
 }
 exports.exportVariable = exportVariable;
 /**
@@ -1458,13 +1422,7 @@ exports.setSecret = setSecret;
  * @param inputPath
  */
 function addPath(inputPath) {
-    const filePath = process.env['GITHUB_PATH'] || '';
-    if (filePath) {
-        file_command_1.issueCommand('PATH', inputPath);
-    }
-    else {
-        command_1.issueCommand('add-path', {}, inputPath);
-    }
+    command_1.issueCommand('add-path', {}, inputPath);
     process.env['PATH'] = `${inputPath}${path.delimiter}${process.env['PATH']}`;
 }
 exports.addPath = addPath;
@@ -2377,6 +2335,7 @@ const coverage = __importStar(__webpack_require__(635));
 const extensions = __importStar(__webpack_require__(911));
 const tools = __importStar(__webpack_require__(534));
 const utils = __importStar(__webpack_require__(163));
+const matchers = __importStar(__webpack_require__(86));
 /**
  * Build the script
  *
@@ -2387,7 +2346,7 @@ const utils = __importStar(__webpack_require__(163));
 async function build(filename, version, os_version) {
     // taking inputs
     const name = 'setup-php';
-    const url = 'https://setup-php.com/support';
+    const url = 'setup-php.com/support';
     const extension_csv = (await utils.getInput('extensions', false)) ||
         (await utils.getInput('extension', false)) ||
         (await utils.getInput('extension-csv', false));
@@ -2421,14 +2380,9 @@ 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) {
@@ -2442,6 +2396,7 @@ async function run() {
                 await exec_1.exec('pwsh ' + script_path + ' ' + version + ' ' + __dirname);
                 break;
         }
+        await matchers.addMatchers();
     }
     catch (error) {
         core.setFailed(error.message);
@@ -2703,8 +2658,9 @@ const utils = __importStar(__webpack_require__(163));
  *
  * @param extension_csv
  * @param version
+ * @param pipe
  */
-async function addExtensionDarwin(extension_csv, version) {
+async function addExtensionDarwin(extension_csv, version, pipe) {
     const extensions = await utils.extensionArray(extension_csv);
     let script = '\n';
     await utils.asyncForEach(extensions, async function (extension) {
@@ -2724,18 +2680,28 @@ async function addExtensionDarwin(extension_csv, version) {
                         ' ' +
                         ext_prefix;
                 return;
-            // 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 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
+            // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
             // match 7.1pcov to 8.0pcov
-            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):
+            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):
                 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';
@@ -2908,7 +2874,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));
+            return script + (await addExtensionDarwin(extension_csv, version, pipe));
         case 'linux':
             return script + (await addExtensionLinux(extension_csv, version, pipe));
         default:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "1.9.8",
+  "version": "1.9.6",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
@@ -24,28 +24,28 @@
   "author": "shivammathur",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.2.5",
     "@actions/exec": "^1.0.4",
     "@actions/io": "^1.0.2",
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.14",
-    "@types/node": "^14.11.10",
-    "@typescript-eslint/eslint-plugin": "^4.4.1",
-    "@typescript-eslint/parser": "^4.4.1",
+    "@types/jest": "^26.0.13",
+    "@types/node": "^14.6.4",
+    "@typescript-eslint/eslint-plugin": "^4.0.1",
+    "@typescript-eslint/parser": "^4.0.1",
     "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.11.0",
-    "eslint-config-prettier": "^6.13.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.1.0",
+    "eslint": "^7.8.1",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-jest": "^24.0.0",
     "eslint-plugin-prettier": "^3.1.4",
-    "husky": "^4.3.0",
-    "jest": "^26.5.3",
-    "jest-circus": "^26.5.3",
-    "prettier": "^2.1.2",
-    "ts-jest": "^26.4.1",
-    "typescript": "^4.0.3"
+    "husky": "^4.2.5",
+    "jest": "^26.4.2",
+    "jest-circus": "^26.4.2",
+    "prettier": "^2.1.1",
+    "ts-jest": "^26.3.0",
+    "typescript": "^4.0.2"
   },
   "husky": {
     "skipCI": true,

src/extensions.ts

@@ -6,10 +6,12 @@ import * as utils from './utils';
  *
  * @param extension_csv
  * @param version
+ * @param pipe
  */
 export async function addExtensionDarwin(
   extension_csv: string,
-  version: string
+  version: string,
+  pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
   let script = '\n';
@@ -30,20 +32,28 @@ export async function addExtensionDarwin(
           ' ' +
           ext_prefix;
         return;
-      // 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 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
+      // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
       // match 7.1pcov to 8.0pcov
-      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):
+      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):
         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';
@@ -229,7 +239,7 @@ export async function addExtension(
     case 'win32':
       return script + (await addExtensionWindows(extension_csv, version));
     case 'darwin':
-      return script + (await addExtensionDarwin(extension_csv, version));
+      return script + (await addExtensionDarwin(extension_csv, version, pipe));
     case 'linux':
       return script + (await addExtensionLinux(extension_csv, version, pipe));
     default:

src/install.ts

@@ -5,6 +5,7 @@ import * as coverage from './coverage';
 import * as extensions from './extensions';
 import * as tools from './tools';
 import * as utils from './utils';
+import * as matchers from './matchers';
 
 /**
  * Build the script
@@ -20,7 +21,7 @@ export async function build(
 ): Promise<string> {
   // taking inputs
   const name = 'setup-php';
-  const url = 'https://setup-php.com/support';
+  const url = 'setup-php.com/support';
   const extension_csv: string =
     (await utils.getInput('extensions', false)) ||
     (await utils.getInput('extension', false)) ||
@@ -62,18 +63,9 @@ 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) {
@@ -87,6 +79,7 @@ export async function run(): Promise<void> {
         await exec('pwsh ' + script_path + ' ' + version + ' ' + __dirname);
         break;
     }
+    await matchers.addMatchers();
   } catch (error) {
     core.setFailed(error.message);
   }

src/matchers.ts

@@ -0,0 +1,18 @@
+import * as path from 'path';
+import * as utils from './utils';
+import * as io from '@actions/io';
+
+/**
+ * Cache json files for problem matchers
+ */
+export async function addMatchers(): Promise<void> {
+  const config_path = path.join(
+    __dirname,
+    '..',
+    'src',
+    'configs',
+    'phpunit.json'
+  );
+  const runner_dir: string = await utils.getInput('RUNNER_TOOL_CACHE', false);
+  await io.cp(config_path, runner_dir);
+}

src/scripts/darwin.sh

@@ -40,7 +40,7 @@ pecl_install() {
   yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
 }
 
-# Function to get the PECL version
+# Fuction to get the PECL version
 get_pecl_version() {
   extension=$1
   stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
@@ -124,7 +124,7 @@ configure_composer() {
     exit 1;
   fi
   composer -q global config process-timeout 0
-  echo "/Users/$USER/.composer/vendor/bin" >> "$GITHUB_PATH"
+  echo "::add-path::/Users/$USER/.composer/vendor/bin"
   if [ -n "$COMPOSER_TOKEN" ]; then
     composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
   fi
@@ -192,20 +192,8 @@ 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"
@@ -216,7 +204,6 @@ setup_php() {
 tick="✓"
 cross="✗"
 version=$1
-dist=$2
 tool_path_dir="/usr/local/bin"
 curl_opts=(-sL)
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
@@ -237,5 +224,4 @@ 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 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-psr" "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-$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/ 2>/dev/null" exit
+    trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/" exit
   fi
 }
 
@@ -46,7 +46,7 @@ configure_pecl() {
   fi
 }
 
-# Function to get the PECL version
+# Fuction to get the PECL version
 get_pecl_version() {
   extension=$1
   stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
@@ -155,7 +155,7 @@ configure_composer() {
     exit 1;
   fi
   composer -q global config process-timeout 0
-  echo "/home/$USER/.composer/vendor/bin" >> "$GITHUB_PATH"
+  echo "::add-path::/home/$USER/.composer/vendor/bin"
   if [ -n "$COMPOSER_TOKEN" ]; then
     composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
   fi
@@ -254,9 +254,8 @@ cross="✗"
 lists_updated="false"
 pecl_config="false"
 version=$1
-dist=$2
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
-apt_install="sudo $debconf_fix apt-get install -y"
+apt_install="sudo $debconf_fix apt-fast 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 +298,4 @@ 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 cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/win32.ps1

@@ -8,7 +8,7 @@ param (
   [ValidateNotNull()]
   [ValidateLength(1, [int]::MaxValue)]
   [string]
-  $dist
+  $dir
 )
 
 Function Step-Log($message) {
@@ -59,8 +59,9 @@ 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 'https://github.com/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip' -OutFile $zip_file
+    Invoke-WebRequest -UseBasicParsing -Uri $release.assets[0].browser_download_url -OutFile $zip_file
     Expand-Archive -Path $zip_file -DestinationPath $php_dir -Force
   }
   Import-Module $module_path
@@ -148,7 +149,7 @@ Function Edit-ComposerConfig() {
     exit 1;
   }
   composer -q global config process-timeout 0
-  Write-Output "$env:APPDATA\Composer\vendor\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
+  Write-Output "::add-path::$env:APPDATA\Composer\vendor\bin"
   if (Test-Path env:COMPOSER_TOKEN) {
     composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
   }
@@ -284,5 +285,4 @@ 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
-Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE
 Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)"

src/utils.ts

@@ -2,21 +2,6 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as core from '@actions/core';
 
-/**
- * Function to read environment variable and return a string value.
- *
- * @param property
- */
-export async function readEnv(property: string): Promise<string> {
-  const value = process.env[property];
-  switch (value) {
-    case undefined:
-      return '';
-    default:
-      return value;
-  }
-}
-
 /**
  * Function to get inputs from both with and env annotations.
  *
@@ -27,17 +12,13 @@ export async function getInput(
   name: string,
   mandatory: boolean
 ): Promise<string> {
-  const input = core.getInput(name);
-  const env_input = await readEnv(name);
-  switch (true) {
-    case input != '':
-      return input;
-    case input == '' && env_input != '':
-      return env_input;
-    case input == '' && env_input == '' && mandatory:
-      throw new Error(`Input required and not supplied: ${name}`);
+  const input = process.env[name];
+  switch (input) {
+    case '':
+    case undefined:
+      return core.getInput(name, {required: mandatory});
     default:
-      return '';
+      return input;
   }
 }