Bump version to 1.9.7

Downloading such assets is preferable since:
- they contain updated metadata (useful for debugging)
- they contain only the production files
- they are pre-built: GitHub doesn't have to create a ZIP from a tag

.github/CONTRIBUTING.md

@@ -9,12 +9,11 @@ Please note that this project is released with a [Contributor Code of Conduct](C
 * Fork the project.
 * Make your bug fix or feature addition.
 * Add tests for it. This is important so we don't break it in a future version unintentionally.
-* If editing the scripts, create a demo integration test.
-* Send a pull request to the develop branch with all the details.
+* Send a pull request to the develop branch.
 
 Please make sure that you have [set up your user name and email address](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name <root@localhost>` look really stupid in the commit history of a project.
 
-Due to time constraints, you may not always get a quick response. Please do not take delays personally and feel free to remind.
+Due to time constraints, you may not always get a quick response. Please do not take delays personal and feel free to remind.
 
 ## Coding Guidelines
 
@@ -61,4 +60,4 @@ $ npm run release
 
 Please submit the issue using the appropriate template provided for a bug report or a feature request:
 
-* [Issues](https://github.com/shivammathur/setup-php/issues)
+* [Issues](https://github.com/shivammathur/setup-php/issues)

.github/FUNDING.yml

@@ -1,6 +1,7 @@
 # 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
+custom: https://www.paypal.me/shivammathur

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,42 +1,23 @@
 ---
 name: Bug report
-about: Nice, you found a bug!
+about: Create a report to help us improve
 title: ''
-labels: 'bug'
-assignees: 'shivammathur'
+labels: ''
+assignees: ''
 
 ---
 
 **Describe the bug**
-<!-- Please describe the bug concisely. -->
-
-**Version**
-- [ ] I have checked releases and the bug exists in the latest patch version of `v1` or `v2`.
-- [ ] `v2`
-- [ ] `v1`
-
-**Runners**
-<!-- Please mark the GitHub Action runner your workflow uses. -->
-- [ ] GitHub Hosted
-- [ ] Self Hosted
-
-**Operating systems**
-<!-- Please mention the operating systems your workflow uses. -->
-
-**PHP versions**
-<!-- Please mention the PHP versions your workflow uses. -->
+A clear and concise description of what the bug is.
 
 **To Reproduce**
-<!-- Please provide the relevant steps of your workflow `.yml` file. -->
+Please provide the GitHub Action `.yml` file.
 
 **Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
+A clear and concise description of what you expected to happen.
 
-**Screenshots/Logs**
-<!-- If applicable, add screenshots or logs to help explain your problem. -->
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
 
 **Additional context**
-<!-- Add any other context about the problem here. -->
-
-**Are you willing to submit a PR?**
-<!-- We accept pull requests targeting the develop branch. -->
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,26 +1,20 @@
 ---
 name: Feature request
-about: Suggest a new feature
+about: Suggest an idea for this project
 title: ''
-labels: 'enhancement'
-assignees: 'shivammathur'
+labels: ''
+assignees: ''
 
 ---
 
-**Describe the feature**
-<!-- Please describe concisely the feature you want to add. -->
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I want to improve [...]
 
-**Version**
-- [ ] I have checked releases and the feature is missing in the latest patch version of `v2`.
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
 
-**Underlying issue**
-<!-- Please describe the issue this would solve. -->
-
-**Describe alternatives**
-<!-- Please mention any alternative solutions you've considered. -->
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-<!-- Add any other context or screenshots about the feature request here. -->
-
-**Are you willing to submit a PR?**
-<!-- We accept pull requests targeting the develop branch. -->
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,13 +7,14 @@ labels: bug or enhancement
 
 ## A Pull Request should be associated with an Issue.
 
-> If you're fixing a bug, adding a new feature or improving something please provide the details in Issues,
-> so that the development can be pointed in the intended direction.
+> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
+> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> and potentially we'll be able to point development in a particular direction.
 
-Related issue: <!-- Please link the related issue -->
+Related issue: 
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you for your contribution.
+> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
 
 ### Description
 
@@ -25,12 +26,7 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors and all code covered.
-
-> In case this PR edits any scripts:
-
-- [ ] I have checked the edited scripts for syntax.
-- [ ] I have tested the changes in an integration test (If yes, provide workflow link).
+- [ ] `npm test` returns with no unit test errors.
 
 <!--
 - Please target the develop branch when submitting the pull request.

.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.3.x   | :white_check_mark: |
+| 2.6.x   | :white_check_mark: |
 
 ## Supported PHP Versions
 

.github/workflows/experimental-workflow.yml

@@ -1,88 +0,0 @@
-name: Experimental workflow
-on:
-  pull_request:
-    branches:
-      - nightly
-      - master
-      - develop
-      - verbose
-    paths-ignore:
-      - '**.md'
-      - 'examples/**'
-  push:
-    branches:
-      - nightly
-      - master
-      - develop
-      - verbose
-    paths-ignore:
-      - '**.md'
-      - 'examples/**'
-jobs:
-  run:
-    name: Run
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-latest, macos-latest]
-        php-versions: ['8.0']
-    env:
-      extensions: xml, opcache, pcov
-      key: cache-v2
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup cache environment
-        id: cache-env
-        uses: shivammathur/cache-extensions@develop
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
-
-      - name: Setup PHP with extensions and custom config
-        run: node dist/index.js
-        env:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata
-          coverage: pcov
-
-      - name: Testing PHP version
-        run: |
-          php -v
-          php -r "if(strpos(phpversion(), '${{ matrix.php-versions }}') === false) {throw new Exception('Wrong PHP version Installed');}"
-
-      - name: Testing Composer version
-        run: |
-          composer -V
-          php -r "if(strpos(@exec('composer -V'), 'Composer version') === false) {throw new Exception('Composer not found');}"
-      - name: Testing Extensions
-        run: |
-          php -m
-          php -r "if(! extension_loaded('mbstring')) {throw new Exception('mbstring not found');}"
-          php -r "if(! extension_loaded('pcov')) {throw new Exception('PCOV not found');}"
-      - name: Testing ini values
-        run: |
-          php -r "if(ini_get('post_max_size')!='256M') {throw new Exception('post_max_size not added');}"
-          php -r "if(ini_get('short_open_tag')!=1) {throw new Exception('short_open_tag not added');}"
-          php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}"
-      - name: Test JIT
-        run: |
-          php -r "if(! extension_loaded('Zend OPcache')) {throw new Exception('Zend OPcache not found');}"
-          php -r "if(ini_get('opcache.jit_buffer_size')!='256M') {throw new Exception('opcache.jit_buffer_size not set');}"
-          php -r "if(ini_get('opcache.jit')!=1235) {throw new Exception('opcache.jit not set');}"
-          php -r "if(ini_get('pcre.jit')!=1) {throw new Exception('pcre.jit not set');}"
-      - name: Benchmark JIT
-        run: |
-          curl -o bench.php https://raw.githubusercontent.com/php/php-src/master/Zend/bench.php
-          php bench.php

.github/workflows/main-workflow.yml

@@ -1,18 +1,15 @@
 name: Main workflow
 on:
+  workflow_dispatch:
   pull_request:
     branches:
-      - master
-      - develop
-      - verbose
+      - releases/v1
     paths-ignore:
       - '**.md'
       - 'examples/**'
   push:
     branches:
-      - master
-      - develop
-      - verbose
+      - releases/v1
     paths-ignore:
       - '**.md'
       - 'examples/**'
@@ -24,35 +21,17 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-latest, macos-latest]
-        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
-    env:
-      extensions: xml, opcache, xdebug, pcov
-      key: cache-v2
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup cache environment
-        id: cache-env
-        uses: shivammathur/cache-extensions@develop
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
-
       - name: Setup PHP with extensions and custom config
         run: node dist/index.js
         env:
           php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata
+          extensions: xml, opcache, xdebug, pcov #optional
+          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata #optional
 
       - name: Testing PHP version
         run: |
@@ -71,6 +50,7 @@ jobs:
           php -r "if(phpversion()>=7.1 && ! extension_loaded('pcov')) {throw new Exception('PCOV not found');}"
       - name: Testing ini values
         run: |
+          php -r "if(ini_get('memory_limit')!='-1') {throw new Exception('memory_limit not disabled');}"
           php -r "if(ini_get('post_max_size')!='256M') {throw new Exception('post_max_size not added');}"
           php -r "if(ini_get('short_open_tag')!=1) {throw new Exception('short_open_tag not added');}"
           php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}"

.github/workflows/node-workflow.yml

@@ -2,17 +2,13 @@ name: Node workflow
 on:
   pull_request:
     branches:
-      - master
-      - develop
-      - verbose
+      - releases/v1
     paths-ignore:
       - '**.md'
       - 'examples/**'
   push:
     branches:
-      - master
-      - develop
-      - verbose
+      - releases/v1
     paths-ignore:
       - '**.md'
       - 'examples/**'
@@ -48,4 +44,4 @@ jobs:
       - name: Send Coverage
         continue-on-error: true
         timeout-minutes: 1
-        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}
+        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}

README.md

@@ -8,9 +8,9 @@
 
 <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://codecov.io/gh/shivammathur/setup-php/branch/master/graph/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://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.3-8892BF.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>
 
 Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer in [GitHub Actions](https://github.com/features/actions "GitHub Actions"). This action gives you a cross platform interface to setup the PHP environment you need to test your application. Refer to [Usage](#memo-usage "How to use this") section and [examples](#examples "Examples of use") to see how to use this.
@@ -18,59 +18,43 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 ## Contents
 
 - [PHP Support](#tada-php-support)
-- [OS/Platform Support](#cloud-osplatform-support)
-  - [GitHub-Hosted Runners](#github-hosted-runners)
-  - [Self-Hosted Runners](#self-hosted-runners)
+- [GitHub-Hosted Runner Support](#cloud-github-hosted-runner-support)
 - [PHP Extension Support](#heavy_plus_sign-php-extension-support)
 - [Tools Support](#wrench-tools-support)
 - [Coverage Support](#signal_strength-coverage-support)
   - [Xdebug](#xdebug)
   - [PCOV](#pcov)
-  - [Disable Coverage](#disable-coverage)
+  - [Disable coverage](#disable-coverage)
 - [Usage](#memo-usage)
-  - [Inputs](#inputs)
   - [Basic Setup](#basic-setup)
   - [Matrix Setup](#matrix-setup)
   - [Nightly Build Setup](#nightly-build-setup)
-  - [Self Hosted Setup](#self-hosted-setup)
-  - [Local Testing Setup](#local-testing-setup)
-  - [Thread Safe Setup](#thread-safe-setup)
-  - [Force Update](#force-update)
-  - [Verbose Setup](#verbose-setup)
-  - [Cache Extensions](#cache-extensions)
-  - [Cache Composer Dependencies](#cache-composer-dependencies)
-  - [Cache Node.js Dependencies](#cache-nodejs-dependencies)
-  - [Composer GitHub OAuth](#composer-github-oauth)
+  - [Thread Safe Setup](#thread-safe-setup)  
+  - [Cache Dependencies](#cache-dependencies)
+  - [Composer GitHub OAuth](#composer-github-oauth)  
   - [Problem Matchers](#problem-matchers)
   - [Examples](#examples)
 - [License](#scroll-license)
 - [Contributions](#1-contributions)
-- [Support This Project](#sparkling_heart-support-this-project)
+- [Support This project](#sparkling_heart-support-this-project)
 - [Dependencies](#bookmark-dependencies)
 - [Further Reading](#bookmark_tabs-further-reading)
 
 ## :tada: PHP Support
 
-|PHP Version|Stability|Release Support|Runner Support|
-|--- |--- |--- |--- |
-|`5.3`|`Stable`|`End of life`|`GitHub-hosted`|
-|`5.4`|`Stable`|`End of life`|`GitHub-hosted`|
-|`5.5`|`Stable`|`End of life`|`GitHub-hosted`|
-|`5.6`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.0`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.1`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.2`|`Stable`|`Security fixes only`|`GitHub-hosted`, `self-hosted`|
-|`7.3`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
-|`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
-|`8.0`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
+|PHP Version|Stability|Release Support|
+|--- |--- |--- |
+|5.6|`Stable`|`End of life`|
+|7.0|`Stable`|`End of life`|
+|7.1|`Stable`|`End of life`|
+|7.2|`Stable`|`Security fixes only`|
+|7.3|`Stable`|`Active`|
+|7.4|`Stable`|`Active`|
+|8.0|`Nightly`|`In development`|
 
 **Note:** Specifying `8.0` in `php-version` input installs a nightly build of `PHP 8.0.0-dev` with `PHP JIT`, `Union Types v2` and other [new features](https://wiki.php.net/rfc#php_80 "New features implemented in PHP 8"). See [nightly build setup](#nightly-build-setup) for more information.
 
-## :cloud: OS/Platform Support
-
-Both `GitHub-hosted` runners and `self-hosted` runners are supported on the following operating systems.
-
-### GitHub-Hosted Runners
+## :cloud: GitHub-Hosted Runner Support
 
 |Virtual environment|YAML workflow label|Pre-installed PHP|
 |--- |--- |--- |
@@ -78,90 +62,34 @@ Both `GitHub-hosted` runners and `self-hosted` runners are supported on the foll
 |Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|`PHP 7.1` to `PHP 7.4`|
 |Ubuntu 20.04|`ubuntu-20.04`|`PHP 7.4`|
 |Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 7.4`|
-|macOS Catalina 10.15|`macos-latest` or `macos-10.15`|`PHP 7.4`|
-
-### Self-Hosted Runners
-
-|Host OS/Virtual environment|YAML workflow label|
-|--- |--- |
-|Ubuntu 16.04|`self-hosted` or `Linux`|
-|Ubuntu 18.04|`self-hosted` or `Linux`|
-|Ubuntu 20.04|`self-hosted` or `Linux`|
-|Windows 7 and newer|`self-hosted` or `Windows`|
-|Windows Server 2012 R2 and newer|`self-hosted` or `Windows`|
-|macOS Catalina 10.15|`self-hosted` or `macOS`|
-
-- Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.
+|macOS 10.15 Catalina|`macos-latest` or `macos-10.15`|`PHP 7.4`|
 
 ## :heavy_plus_sign: PHP Extension Support
-
-- On `ubuntu` by default extensions which are available as a package can be installed. PECL extensions if not available as a package can be installed by specifying `pecl` in the tools input.
-
-```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'
-  tools: pecl
-  extensions: swoole
-```
-
-- On `windows` PECL extensions which have the `DLL` binary can be installed.
-
-- On `macOS` PECL extensions can be installed.
-
-- Extensions installed along with PHP if specified are enabled.
-
-- Specific versions of PECL extensions can be installed by suffixing the version. This is useful for installing old versions of extensions which support end of life PHP versions.
-
-```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '5.4'
-  tools: pecl
-  extensions: swoole-1.9.3
-```
-
-- Pre-release versions of PECL extensions can be setup by suffixing the extension with its state i.e `alpha`, `beta`, `devel` or `snapshot`.
-
-```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'
-  tools: pecl
-  extensions: xdebug-beta
-```
-
-- Non-default extensions can be removed by prefixing it with a `:`.
-
-```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'  
-  extensions: :opcache
-```
-
-- Extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted.
-
-- These extensions have custom support - `gearman` on ubuntu, `blackfire`, `phalcon3` and `phalcon4` on all supported OS.
+- On `ubuntu` by default extensions which are available as a package can be installed. If the extension is not available as a package but it is on `PECL`, it can be installed by specifying `pecl` in the tools input.
+- On `windows` extensions which have `windows` binary on `PECL` can be installed.
+- On `macOS` extensions which are on `PECL` can be installed.
+- Extensions which are installed along with PHP if specified are enabled.
+- Extensions on `PECL` which do not have a latest stable version, their pre-release versions can be installed by suffixing the extension with its state i.e `alpha`, `beta`, `devel` or `snapshot` separated by a `-` like `msgpack-beta`.
+- Extensions which cannot be installed gracefully leave an error message in the logs, the action is not interrupted.
 
 ## :wrench: Tools Support
 
 These tools can be setup globally using the `tools` input.
 
-`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `flex`, `infection`, `pecl`, `phan`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`, `vapor-cli`
+`codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `pecl`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   tools: php-cs-fixer, phpunit
 ```
 
 To setup a particular version of a tool, specify it in the form `tool:version`.  
-Latest stable version of `composer` is setup by default. You can setup the required version by specifying `v1`, `v2`, `snapshot` or `preview` as version.
+Latest stable version of `composer` is setup by default and accepts `v1`, `v2`, `snapshot` and `preview` as versions.
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   tools: composer:v2
@@ -170,25 +98,23 @@ with:
 Version for other tools should be in `semver` format and a valid release of the tool.
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   tools: php-cs-fixer:2.16.2, phpunit:8.5.1
 ```
 
-**Notes**
-- Both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified.
-- Tools which cannot be setup gracefully leave an error message in the logs, the action is not interrupted.
+Tools which cannot be installed gracefully leave an error message in the logs, the action is not interrupted.
 
 ## :signal_strength: Coverage Support
 
 ### Xdebug
 
 Specify `coverage: xdebug` to use `Xdebug`.  
-Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action") except `8.0`.
+Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action").
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   coverage: xdebug
@@ -197,12 +123,13 @@ with:
 ### PCOV
 
 Specify `coverage: pcov` to use `PCOV` and disable `Xdebug`.  
-`PCOV` supports `PHP 7.1` and newer PHP versions.  
-Tests with `PCOV` run much faster than with `Xdebug`.  
+It is much faster than `Xdebug`.  
+`PCOV` needs `PHP >= 7.1`.  
 If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  
 
+
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   ini-values: pcov.directory=api #optional, see above for usage.
@@ -211,16 +138,15 @@ with:
 
 ### Disable Coverage
 
-Specify `coverage: none` to remove both `Xdebug` and `PCOV`.  
+Specify `coverage: none` to disable both `Xdebug` and `PCOV`.  
 Consider disabling the coverage using this PHP action for these reasons.
 
 - You are not generating coverage reports while testing.
 - It will remove `Xdebug`, which will have a positive impact on PHP performance.
 - You are using `phpdbg` for running your tests.
-- You are profiling your code using `blackfire`.
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   coverage: none
@@ -228,39 +154,15 @@ with:
 
 ## :memo: Usage
 
-### Inputs
+Inputs supported by this GitHub Action.
 
-#### `php-version` (required)
+- php-version `required`
+- extensions `optional`
+- ini-values `optional`
+- coverage `optional`
+- tools `optional`
 
-- Specify the PHP version you want to setup.
-- Accepts a `string`. For example `'7.4'`.
-- See [PHP support](#tada-php-support) for supported PHP versions.
-
-#### `extensions` (optional)
-
-- Specify the extensions you want to add or remove.
-- Accepts a `string` in csv-format. For example `mbstring, :opcache`.
-- Non-default extensions prefixed with `:` are removed.
-- See [PHP extension support](#heavy_plus_sign-php-extension-support) for more info.
-
-#### `ini-values` (optional)
-
-- Specify the values you want to add to `php.ini`.
-- Accepts a `string` in csv-format. For example `post_max_size=256M, short_open_tag=On`.
-
-#### `coverage` (optional)
-
-- Specify the code coverage driver you want to setup.
-- Accepts `xdebug`, `pcov` or `none`.
-- See [coverage support](#signal_strength-coverage-support) for more info.
-
-#### `tools` (optional)
-
-- Specify the tools you want to setup.
-- Accepts a `string` in csv-format. For example `phpunit, phpcs`
-- See [tools Support](#wrench-tools-support) for tools supported.
-
-See below for more info.
+See [action.yml](action.yml "Metadata for this GitHub Action") and usage below for more info.
 
 ### Basic Setup
 
@@ -272,13 +174,13 @@ steps:
   uses: actions/checkout@v2
 
 - name: Setup PHP
-  uses: shivammathur/setup-php@v2
+  uses: shivammathur/setup-php@v1
   with:
     php-version: '7.4'
-    extensions: mbstring, intl
-    ini-values: post_max_size=256M, short_open_tag=On
-    coverage: xdebug    
-    tools: php-cs-fixer, phpunit
+    extensions: mbstring, intl #optional, setup extensions
+    ini-values: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
+    coverage: xdebug #optional, setup coverage driver
+    tools: php-cs-fixer, phpunit #optional, setup tools globally
 ```
 
 ### Matrix Setup
@@ -299,21 +201,20 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: shivammathur/setup-php@v1
       with:
         php-version: ${{ matrix.php-versions }}
-        extensions: mbstring, intl
-        ini-values: post_max_size=256M, short_open_tag=On
-        coverage: xdebug        
-        tools: php-cs-fixer, phpunit
+        extensions: mbstring, intl #optional, setup extensions
+        ini-values: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
+        coverage: xdebug #optional, setup coverage driver
+        tools: php-cs-fixer, phpunit #optional, setup tools globally
 ```
 
 ### Nightly Build Setup
 
 > Setup a nightly build of `PHP 8.0.0-dev` from the [master branch](https://github.com/php/php-src/tree/master "Master branch on PHP source repository") of PHP.
 
-- This version is currently in development.
-- `PECL` is installed by default with this version on `ubuntu` and `macOS`.
+- `PECL` is installed by default with this version on `Ubuntu` and `macOS`.
 - Some extensions might not support this version currently.
 - Refer to this [RFC](https://wiki.php.net/rfc/jit "PHP JIT RFC configuration") for configuring `PHP JIT` on this version.
 - Refer to this [list of RFCs](https://wiki.php.net/rfc#php_80 "List of RFCs implemented in PHP8") implemented in this version.
@@ -324,86 +225,20 @@ steps:
   uses: actions/checkout@v2
 
 - name: Setup PHP
-  uses: shivammathur/setup-php@v2
+  uses: shivammathur/setup-php@v1
   with:
     php-version: '8.0'
-    extensions: mbstring
-    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1
-    coverage: pcov
-    tools: php-cs-fixer, phpunit
-```
-
-### Self Hosted Setup
-
-> Setup PHP on a self-hosted runner.
-
-- To setup a dockerized self-hosted runner, refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Ubuntu) to setup in an `Ubuntu` container and refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Windows) to setup in a `Windows` container.
-- To setup the runner directly on the host OS or in a VM, follow this [requirements guide](https://github.com/shivammathur/setup-php/wiki/Requirements-for-self-hosted-runners "Requirements guide for self-hosted runner to run setup-php") before setting up the self-hosted runner.
-
-Specify the environment variable `runner` with the value `self-hosted`. Without this your workflow will fail.
-
-```yaml
-jobs:
-  run:
-    runs-on: self-hosted
-    strategy:
-      matrix:        
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
-    name: PHP ${{ matrix.php-versions }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-versions }}
-      env:
-        runner: self-hosted # Specify the runner.
-```
-
-### Local Testing Setup
-
-> Test your `Ubuntu` workflow locally using [`nektos/act`](https://github.com/nektos/act "Project to test GitHub Actions locally").
-
-```yaml
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    name: PHP 7.4 Test
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 7.4
-```
-
-Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker image.
-
-```bash
-# For runs-on: ubuntu-latest
-act -P ubuntu-latest=shivammathur/node:latest
-
-# For runs-on: ubuntu-20.04
-act -P ubuntu-20.04=shivammathur/node:focal
-
-# For runs-on: ubuntu-18.04
-act -P ubuntu-18.04=shivammathur/node:bionic
-
-# For runs-on: ubuntu-16.04
-act -P ubuntu-16.04=shivammathur/node:xenial
+    extensions: mbstring #optional, setup extensions
+    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1 #optional, setup php.ini configuration
+    coverage: pcov #optional, setup PCOV, Xdebug does not support this version yet.
+    tools: php-cs-fixer, phpunit #optional, setup tools globally    
 ```
 
 ### Thread Safe Setup
 
-> Setup both `TS` and `NTS` PHP on `Windows`.
-
 - `NTS` versions are setup by default.
-- On `Ubuntu` and `macOS` only `NTS` versions are supported.
-- On `Windows` both `TS` and `NTS` versions are supported.
+- On `ubuntu` and `macOS` only NTS versions are supported.
+- On `windows` both `TS` and `NTS` versions are supported.
 
 ```yaml
 jobs:
@@ -415,131 +250,41 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: shivammathur/setup-php@v1
       with:
         php-version: '7.4'
       env:
         phpts: ts # specify ts or nts
 ```
 
-### Force Update
+### Cache Dependencies
 
-> Update to latest patch of PHP versions.
+You can persist composer's internal cache directory using the [`action/cache`](https://github.com/actions/cache "GitHub Action to cache files") GitHub Action. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.
 
-- Pre-installed PHP versions on the GitHub Actions runner are not updated to their latest patch release by default.
-- You can specify the `update` environment variable to `true` to force update to the latest release.
-
-```yaml
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-  env:
-    update: true # specify true or false
-```
-
-### Verbose Setup
-
-> Debug your workflow
-
-To debug any issues, you can use the `verbose` tag instead of `v2`.
-
-```yaml
-- name: Setup PHP
-  uses: shivammathur/setup-php@verbose
-  with:
-    php-version: '7.4'
-```
-
-### Cache Extensions
-
-You can cache PHP extensions using [`shivammathur/cache-extensions`](https://github.com/shivammathur/cache-extensions "GitHub Action to cache php extensions") and [`action/cache`](https://github.com/actions/cache "GitHub Action to cache files") GitHub Actions. Extensions which take very long to setup when cached are available in the next workflow run and are enabled directly. This reduces the workflow execution time.
-
-```yaml
-runs-on: ${{ matrix.operating-system }}
-strategy:
-  matrix:
-    operating-system: [ubuntu-latest, windows-latest, macos-latest]
-    php-versions: ['7.2', '7.3', '7.4']
-name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
-env:
-  extensions: intl, pcov
-  key: cache-v1 # can be any string, change to clear the extension cache.
-steps:
-- name: Checkout
-  uses: actions/checkout@v2
-
-- name: Setup cache environment
-  id: cache-env
-  uses: shivammathur/cache-extensions@v1
-  with:
-    php-version: ${{ matrix.php-versions }}
-    extensions: ${{ env.extensions }}
-    key: ${{ env.key }}
-
-- name: Cache extensions
-  uses: actions/cache@v2
-  with:
-    path: ${{ steps.cache-env.outputs.dir }}
-    key: ${{ steps.cache-env.outputs.key }}
-    restore-keys: ${{ steps.cache-env.outputs.key }}
-
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: ${{ matrix.php-versions }}
-    extensions: ${{ env.extensions }}
-```
-
-**Note:** If you setup both `TS` and `NTS` PHP versions on `windows`, add `${{ env.phpts }}` to `key` and `restore-keys` inputs in `actions/cache` step.
-
-### Cache Composer Dependencies
-
-If your project uses composer, you can persist composer's internal cache directory. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.
+**Note:** Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
 
 ```yaml
 - name: Get composer cache directory
-  id: composer-cache
+  id: composercache
   run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
 - name: Cache dependencies
   uses: actions/cache@v2
   with:
-    path: ${{ steps.composer-cache.outputs.dir }}
+    path: ${{ steps.composercache.outputs.dir }}
     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
     restore-keys: ${{ runner.os }}-composer-
 
-- name: Install dependencies
+- name: Install Dependencies
   run: composer install --prefer-dist
 ```
 
-**Notes**
-- Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
-- In the above example, if you support a range of `composer` dependencies and do not commit `composer.lock`, you can use the hash of `composer.json` as the key for your cache.
+In the above example, if you support a range of `composer` dependencies and do not commit `composer.lock`, you can use the hash of `composer.json` as the key for your cache.
 
 ```yaml
-key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} 
 ```
 
-### Cache Node.js Dependencies
-
-If your project has node.js dependencies, you can persist npm's or yarn's cache directory. The cached files are available across check-runs and will reduce the workflow execution time.
-
-```yaml
-- name: Get node.js cache directory
-  id: node-cache-dir
-  run: echo "::set-output name=dir::$(npm config get cache)" # Use $(yarn cache dir) for yarn
-
-- name: Cache dependencies
-  uses: actions/cache@v2
-  with:
-    path: ${{ steps.node-cache-dir.outputs.dir }}
-    key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} # Use '**/yarn.lock' for yarn
-    restore-keys: ${{ runner.os }}-node-
-```
-
-**Note:** Please do not cache `node_modules` directory as that will have side-effects.
-
 ### Composer GitHub OAuth
 
 If you have a number of workflows which setup multiple tools or have many composer dependencies, you might hit the GitHub's rate limit for composer. To avoid that you can add a `OAuth` token to the composer's config by setting `COMPOSER_TOKEN` environment variable. You can use [`GITHUB_TOKEN`](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token "GITHUB_TOKEN documentation") secret for this purpose.
@@ -555,9 +300,11 @@ 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. This will scan the logs for PHP errors and warnings, and surface them prominently in the GitHub Actions UI by creating annotations and log file decorations.
+Setup problem matchers for your `PHP` output by adding this step after the `setup-php` step.
 
 ```yaml
 - name: Setup problem matchers for PHP
@@ -566,29 +313,59 @@ Setup problem matchers for your `PHP` output by adding this step after the `setu
 
 #### PHPUnit
 
-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.
+Setup problem matchers for your `PHPUnit` output by adding this step after the `setup-php` step.
 
 ```yaml
 - name: Setup problem matchers for PHPUnit
   run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 ```
 
-#### Other Tools
+#### PHPStan
 
-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).  
-
-> Here is an example with `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: cs2pr, phpstan
+    tools: phpstan
 
-- name: PHPStan
-  run: phpstan analyse src --error-format=checkstyle | cs2pr
+- 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
+
+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).   
+
+> Here is an example with `phpcs`.
+
+```yaml
+- name: Setup PHP
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    tools: cs2pr, phpcs
+
+- name: Run phpcs
+  run: phpcs -q --report=checkstyle src | cs2pr
 ```
 
 ### Examples
@@ -597,8 +374,6 @@ Examples for setting up this GitHub Action with different PHP Frameworks/Package
 
 |Framework/Package|Runs on|Workflow|
 |--- |--- |--- |
-|Blackfire|`macOS`, `ubuntu` and `windows`|[blackfire.yml](./examples/blackfire.yml "GitHub Action using Blackfire")|
-|Blackfire Player|`macOS`, `ubuntu` and `windows`|[blackfire-player.yml](./examples/blackfire-player.yml "GitHub Action using Blackfire Player")|
 |CakePHP with `MySQL` and `Redis`|`ubuntu`|[cakephp-mysql.yml](./examples/cakephp-mysql.yml "GitHub Action for CakePHP with MySQL and Redis")|
 |CakePHP with `PostgreSQL` and `Redis`|`ubuntu`|[cakephp-postgres.yml](./examples/cakephp-postgres.yml "GitHub Action for CakePHP with Postgres and Redis")|
 |CakePHP without services|`macOS`, `ubuntu` and `windows`|[cakephp.yml](./examples/cakephp.yml "GitHub Action for CakePHP without services")|
@@ -623,7 +398,9 @@ Examples for setting up this GitHub Action with different PHP Frameworks/Package
 
 ## :scroll: License
 
-The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). This project has multiple [dependencies](#bookmark-dependencies "Dependencies for this PHP Action"). Their licenses can be found in their respective repositories.
+- The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). 
+- This project has multiple [dependencies](#bookmark-dependencies "Dependencies for this PHP Action"). Their licenses can be found in their respective repositories.
+- The logo for `setup-php` is a derivative work of [php.net logo](https://www.php.net/download-logos.php) and is licensed under the [CC BY-SA 4.0 License](https://creativecommons.org/licenses/by-sa/4.0/ "Creative Commons License").
 
 ## :+1: Contributions
 
@@ -633,25 +410,20 @@ Contributions are welcome! See [Contributor's Guide](.github/CONTRIBUTING.md "sh
 
 If this action helped you.
 
-- Sponsor the project by subscribing on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or by contributing using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal").
-- Please star the project and share it with the community.
-- If you blog, write about your experience of using this action.
-- If you need any help using this, please contact me using [Codementor](https://www.codementor.io/shivammathur "Shivam Mathur Codementor")
+- Sponsor the project by subscribing on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or by contributing using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal"). This project is also available as part of the [Tidelift Subscription](https://tidelift.com/subscription/pkg/npm-setup-php?utm_source=npm-setup-php&utm_medium=referral&utm_campaign=enterprise&utm_term=repo "Tidelift Subscription for setup-php") to support delivering enterprise-level maintenance.
+- Please star the project and dependencies. If you blog, please share your experience of using this action with the community.
 
 ## :bookmark: Dependencies
 
 - [Node.js dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Node.js dependencies")
-- [gplessis/dotdeb-php](https://github.com/gplessis/dotdeb-php "Packaging for end of life PHP versions")
 - [mlocati/powershell-phpmanager](https://github.com/mlocati/powershell-phpmanager "Package to handle PHP on windows")
 - [ppa:ondrej/php](https://launchpad.net/~ondrej/+archive/ubuntu/php "Packaging active PHP packages")
-- [shivammathur/cache-extensions](https://github.com/shivammathur/cache-extensions "GitHub action to help with caching PHP extensions")
 - [shivammathur/homebrew-php](https://github.com/shivammathur/homebrew-php "Tap for PHP builds for MacOS")
+- [shivammathur/homebrew-extensions](https://github.com/shivammathur/homebrew-extensions "Tap for PHP extensions for MacOS")
 - [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package")
-- [shivammathur/php5-darwin](https://github.com/shivammathur/php5-darwin "Scripts to setup PHP5 versions on darwin")
-- [shivammathur/php5-ubuntu](https://github.com/shivammathur/php5-ubuntu "Scripts to setup PHP5 versions on ubuntu")
 
 ## :bookmark_tabs: Further Reading
 
 - [About GitHub Actions](https://github.com/features/actions "GitHub Actions")
 - [GitHub Actions Syntax](https://help.github.com/en/articles/workflow-syntax-for-github-actions "GitHub Actions Syntax")
-- [Other Awesome Actions](https://github.com/sdras/awesome-actions "List of Awesome GitHub Actions")
+- [Other Awesome Actions](https://github.com/sdras/awesome-actions "List of Awesome GitHub Actions")

__tests__/config.test.ts

@@ -7,14 +7,14 @@ describe('Config tests', () => {
       'win32'
     );
     expect(win32).toContain(
-      'Add-Content "$php_dir\\php.ini" "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
+      'Add-Content C:\\tools\\php\\php.ini "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
     );
 
     win32 = await config.addINIValues(
       'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
-      'fedora'
+      'openbsd'
     );
-    expect(win32).toContain('Platform fedora is not supported');
+    expect(win32).toContain('Platform openbsd is not supported');
   });
 
   it('checking addINIValuesOnLinux', async () => {
@@ -29,9 +29,9 @@ describe('Config tests', () => {
 
     linux = await config.addINIValues(
       'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
-      'fedora'
+      'openbsd'
     );
-    expect(linux).toContain('Platform fedora is not supported');
+    expect(linux).toContain('Platform openbsd is not supported');
   });
 
   it('checking addINIValuesOnDarwin', async () => {
@@ -45,8 +45,8 @@ describe('Config tests', () => {
 
     darwin = await config.addINIValues(
       'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
-      'fedora'
+      'openbsd'
     );
-    expect(darwin).toContain('Platform fedora is not supported');
+    expect(darwin).toContain('Platform openbsd is not supported');
   });
 });

__tests__/coverage.test.ts

@@ -36,11 +36,6 @@ describe('Config tests', () => {
     expect(win32).toContain('add_extension xdebug');
   });
 
-  it('checking addCoverage with Xdebug on windows', async () => {
-    const win32: string = await coverage.addCoverage('xdebug', '8.0', 'win32');
-    expect(win32).toContain('Xdebug currently only supports PHP 7.4 or lower');
-  });
-
   it('checking addCoverage with Xdebug on linux', async () => {
     const linux: string = await coverage.addCoverage('xdebug', '7.4', 'linux');
     expect(linux).toContain('add_extension xdebug');
@@ -48,7 +43,8 @@ describe('Config tests', () => {
 
   it('checking addCoverage with Xdebug on linux', async () => {
     const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
-    expect(linux).toContain('Xdebug currently only supports PHP 7.4 or lower');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
   });
 
   it('checking addCoverage with Xdebug on darwin', async () => {
@@ -60,15 +56,6 @@ describe('Config tests', () => {
     expect(darwin).toContain('add_extension xdebug');
   });
 
-  it('checking addCoverage with Xdebug on darwin', async () => {
-    const darwin: string = await coverage.addCoverage(
-      'xdebug',
-      '8.0',
-      'darwin'
-    );
-    expect(darwin).toContain('Xdebug currently only supports PHP 7.4 or lower');
-  });
-
   it('checking disableCoverage windows', async () => {
     const win32 = await coverage.addCoverage('none', '7.4', 'win32');
     expect(win32).toContain('Remove-Extension xdebug');

__tests__/extensions.test.ts

@@ -3,18 +3,15 @@ import * as extensions from '../src/extensions';
 describe('Extension tests', () => {
   it('checking addExtensionOnWindows', async () => {
     let win32: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, phalcon4, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
+      'Xdebug, pcov, sqlite, phalcon4, ast-beta',
       '7.4',
       'win32'
     );
     expect(win32).toContain('Add-Extension xdebug');
     expect(win32).toContain('Add-Extension pcov');
     expect(win32).toContain('Add-Extension sqlite3');
-    expect(win32).toContain('Remove-Extension intl');
     expect(win32).toContain('phalcon.ps1 phalcon4');
     expect(win32).toContain('Add-Extension ast beta');
-    expect(win32).toContain('Add-Extension grpc stable 1.2.3');
-    expect(win32).toContain('Add-Extension inotify alpha 1.2.3');
 
     win32 = await extensions.addExtension('mysql', '7.4', 'win32');
     expect(win32).toContain('Add-Extension mysqli');
@@ -24,7 +21,7 @@ describe('Extension tests', () => {
     expect(win32).toContain('Add-Extension mysqli');
     expect(win32).toContain('Add-Extension mysqlnd');
 
-    win32 = await extensions.addExtension('mysql', '5.5', 'win32');
+    win32 = await extensions.addExtension('mysql', '5.6', 'win32');
     expect(win32).toContain('Add-Extension mysql');
     expect(win32).toContain('Add-Extension mysqli');
     expect(win32).toContain('Add-Extension mysqlnd');
@@ -38,34 +35,21 @@ describe('Extension tests', () => {
     expect(win32).toContain('phalcon.ps1 phalcon3');
     expect(win32).toContain('Add-Extension does_not_exist');
 
-    win32 = await extensions.addExtension('xdebug', '7.2', 'fedora');
-    expect(win32).toContain('Platform fedora is not supported');
-
-    win32 = await extensions.addExtension('blackfire', '7.3', 'win32');
-    expect(win32).toContain('blackfire.ps1 7.3 blackfire');
-
-    win32 = await extensions.addExtension('blackfire-1.31.0', '7.3', 'win32');
-    expect(win32).toContain('blackfire.ps1 7.3 blackfire-1.31.0');
+    win32 = await extensions.addExtension('xdebug', '7.2', 'openbsd');
+    expect(win32).toContain('Platform openbsd is not supported');
   });
 
   it('checking addExtensionOnLinux', async () => {
     let linux: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
+      'Xdebug, pcov, sqlite, ast-beta, xdebug-alpha',
       '7.4',
       'linux'
     );
-    expect(linux).toContain('update_extension xdebug 2.9.3');
     expect(linux).toContain('sudo $debconf_fix apt-get install -y php7.4-pcov');
     expect(linux).toContain(
       'sudo $debconf_fix apt-get install -y php7.4-sqlite3'
     );
-    expect(linux).toContain('remove_extension intl');
-    expect(linux).toContain('sudo $debconf_fix apt-get install -y php-ast');
-    expect(linux).toContain('sudo $debconf_fix apt-get install -y php-uopz');
     expect(linux).toContain('add_unstable_extension ast beta extension');
-    expect(linux).toContain('add_pdo_extension mysql');
-    expect(linux).toContain('add_pdo_extension odbc');
-    expect(linux).toContain('add_pecl_extension grpc 1.2.3 extension');
     expect(linux).toContain(
       'add_unstable_extension xdebug alpha zend_extension'
     );
@@ -84,32 +68,27 @@ describe('Extension tests', () => {
     linux = await extensions.addExtension('gearman', '7.4', 'linux');
     expect(linux).toContain('gearman.sh 7.4');
 
-    linux = await extensions.addExtension('xdebug', '7.2', 'fedora');
-    expect(linux).toContain('Platform fedora is not supported');
+    linux = await extensions.addExtension('xdebug', '7.2', 'openbsd');
+    expect(linux).toContain('Platform openbsd is not supported');
 
     linux = await extensions.addExtension('phalcon3, phalcon4', '7.3', 'linux');
     expect(linux).toContain('phalcon.sh phalcon3 7.3');
     expect(linux).toContain('phalcon.sh phalcon4 7.3');
-
-    linux = await extensions.addExtension('blackfire', '7.3', 'linux');
-    expect(linux).toContain('blackfire.sh 7.3 blackfire');
-
-    linux = await extensions.addExtension('blackfire-1.31.0', '7.3', 'linux');
-    expect(linux).toContain('blackfire.sh 7.3 blackfire-1.31.0');
   });
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, ast-beta, grpc-1.2.3',
+      'Xdebug, pcov, grpc, protobuf, swoole, sqlite, ast-beta',
       '7.2',
       'darwin'
     );
-    expect(darwin).toContain('sudo pecl install -f xdebug');
-    expect(darwin).toContain('sudo pecl install -f pcov');
-    expect(darwin).toContain('sudo pecl install -f sqlite3');
-    expect(darwin).toContain('remove_extension intl');
+    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 protobuf');
+    expect(darwin).toContain('add_brew_extension swoole');
+    expect(darwin).toContain('pecl_install sqlite3');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
-    expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
 
     darwin = await extensions.addExtension('phalcon3', '7.0', 'darwin');
     expect(darwin).toContain('phalcon_darwin.sh phalcon3 7.0');
@@ -118,48 +97,33 @@ describe('Extension tests', () => {
     expect(darwin).toContain('phalcon_darwin.sh phalcon4 7.3');
 
     darwin = await extensions.addExtension('pcov', '5.6', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f pcov');
+    expect(darwin).toContain('pecl_install pcov');
 
     darwin = await extensions.addExtension('pcov', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f pcov');
-
-    darwin = await extensions.addExtension('xdebug', '5.3', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.2.7');
-
-    darwin = await extensions.addExtension('xdebug', '5.4', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.4.1');
-
-    darwin = await extensions.addExtension('xdebug', '5.5', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
+    expect(darwin).toContain('add_brew_extension pcov');
 
     darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
+    expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('xdebug', '7.0', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.9.0');
+    expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug');
+    expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('redis', '5.6', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f redis-2.2.8');
+    expect(darwin).toContain('pecl_install redis-2.2.8');
 
     darwin = await extensions.addExtension('redis', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f redis');
+    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('sudo pecl install -f imagick');
+    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('sudo pecl install -f imagick');
-
-    darwin = await extensions.addExtension('blackfire', '7.3', 'darwin');
-    expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire');
-
-    darwin = await extensions.addExtension('blackfire-1.31.0', '7.3', 'darwin');
-    expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire-1.31.0');
+    expect(darwin).toContain('pecl_install imagick');
 
     darwin = await extensions.addExtension(
       'does_not_exist',
@@ -169,7 +133,7 @@ describe('Extension tests', () => {
     );
     expect(darwin).toContain('add_extension does_not_exist');
 
-    darwin = await extensions.addExtension('xdebug', '7.2', 'fedora');
-    expect(darwin).toContain('Platform fedora is not supported');
+    darwin = await extensions.addExtension('xdebug', '7.2', 'openbsd');
+    expect(darwin).toContain('Platform openbsd is not supported');
   });
 });

__tests__/install.test.ts

@@ -26,12 +26,12 @@ jest.mock('../src/install', () => ({
       if (extension_csv) {
         script += 'install extensions';
       }
-      if (ini_values_csv) {
-        script += 'edit php.ini';
-      }
       if (coverage_driver) {
         script += 'set coverage driver';
       }
+      if (ini_values_csv) {
+        script += 'edit php.ini';
+      }
 
       return script;
     }
@@ -70,6 +70,7 @@ jest.mock('../src/install', () => ({
  * @param ini_values_csv
  * @param coverage_driver
  * @param tools
+ * @param pecl
  */
 function setEnv(
   version: string | number,
@@ -77,7 +78,8 @@ function setEnv(
   extension_csv: string,
   ini_values_csv: string,
   coverage_driver: string,
-  tools: string
+  tools: string,
+  pecl: string
 ): void {
   process.env['php-version'] = version.toString();
   process.env['RUNNER_OS'] = os;
@@ -85,23 +87,24 @@ function setEnv(
   process.env['ini-values'] = ini_values_csv;
   process.env['coverage'] = coverage_driver;
   process.env['tools'] = tools;
+  process.env['pecl'] = pecl;
 }
 
 describe('Install', () => {
   it('Test install on windows', async () => {
-    setEnv('7.0', 'win32', '', '', '', '');
+    setEnv('7.0', 'win32', '', '', '', '', '');
 
     let script: string = '' + (await install.run());
     expect(script).toContain('initial script');
     expect(script).toContain('pwsh script.ps1 7.0 ' + __dirname);
 
-    setEnv('7.3', 'win32', '', '', '', '');
+    setEnv('7.3', 'win32', '', '', '', '', '');
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');
     expect(script).toContain('pwsh script.ps1 7.3 ' + __dirname);
 
-    setEnv('7.3', 'win32', 'a, b', 'a=b', 'x', '');
+    setEnv('7.3', 'win32', 'a, b', 'a=b', 'x', '', '');
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');
@@ -112,13 +115,23 @@ describe('Install', () => {
   });
 
   it('Test install on linux', async () => {
-    setEnv('7.3', 'linux', '', '', '', '');
+    setEnv('7.3', 'linux', '', '', '', '', '');
 
     let script: string = '' + (await install.run());
     expect(script).toContain('initial script');
     expect(script).toContain('bash script.sh 7.3 ');
 
-    setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit');
+    setEnv('7.4', 'linux', 'a, b', 'a=b', 'x', 'phpunit', 'true');
+
+    script = '' + (await install.run());
+    expect(script).toContain('initial script');
+    expect(script).toContain('install extensions');
+    expect(script).toContain('edit php.ini');
+    expect(script).toContain('set coverage driver');
+    expect(script).toContain('bash script.sh 7.4');
+    expect(script).toContain('add_tool');
+
+    setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit', '');
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');
@@ -130,13 +143,13 @@ describe('Install', () => {
   });
 
   it('Test install on darwin', async () => {
-    setEnv('7.3', 'darwin', '', '', '', '');
+    setEnv('7.3', 'darwin', '', '', '', '', '');
 
     let script: string = '' + (await install.run());
     expect(script).toContain('initial script');
     expect(script).toContain('bash script.sh 7.3 ' + __dirname);
 
-    setEnv('7.3', 'darwin', 'a, b', 'a=b', 'x', '');
+    setEnv('7.3', 'darwin', 'a, b', 'a=b', 'x', '', '');
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');
@@ -147,19 +160,19 @@ describe('Install', () => {
   });
 
   it('Test malformed version inputs', async () => {
-    setEnv('7.4.1', 'darwin', '', '', '', '');
+    setEnv('7.4.1', 'darwin', '', '', '', '', '');
 
-    let script: string = '' + '' + (await install.run());
+    let script: string = '' + (await install.run());
     expect(script).toContain('initial script');
     expect(script).toContain('bash script.sh 7.4 ' + __dirname);
 
-    setEnv(8.0, 'darwin', '', '', '', '');
+    setEnv(8.0, 'darwin', '', '', '', '', '');
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');
     expect(script).toContain('bash script.sh 8.0 ' + __dirname);
 
-    setEnv(8, 'darwin', '', '', '', '');
+    setEnv(8, 'darwin', '', '', '', '', '');
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');

__tests__/matchers.test.ts

@@ -1,41 +0,0 @@
-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(2);
-  });
-
-  it('Test PHPUnit 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);
-  });
-
-  it('Test PHP Regex', async () => {
-    const regex1 = /^(.*error):\s+\s+(.+) in (.+) on line (\d+)$/;
-    const regex2 = /^(.*Warning|.*Deprecated|.*Notice):\s+\s+(.+) in (.+) on line (\d+)$/;
-    expect(
-      regex1.test('PHP Parse error:  error_message in file.php on line 10')
-    ).toBe(true);
-    expect(
-      regex2.test('PHP Notice:  info_message in file.php on line 10')
-    ).toBe(true);
-    expect(
-      regex2.test('PHP Warning:  warning_message in file.php on line 10')
-    ).toBe(true);
-    expect(
-      regex2.test('PHP Deprecated:  deprecated_message in file.php on line 10')
-    ).toBe(true);
-  });
-});

__tests__/tools.test.ts

@@ -5,8 +5,32 @@ describe('Tools tests', () => {
     expect(await tools.getCommand('linux', 'tool')).toBe('add_tool ');
     expect(await tools.getCommand('darwin', 'tool')).toBe('add_tool ');
     expect(await tools.getCommand('win32', 'tool')).toBe('Add-Tool ');
-    expect(await tools.getCommand('fedora', 'tool')).toContain(
-      'Platform fedora is not supported'
+    expect(await tools.getCommand('openbsd', 'tool')).toContain(
+      'Platform openbsd is not supported'
+    );
+  });
+
+  it('checking getCommand', async () => {
+    expect(await tools.getCommand('linux', 'composertool')).toBe(
+      'add_composertool '
+    );
+    expect(await tools.getCommand('darwin', 'composertool')).toBe(
+      'add_composertool '
+    );
+    expect(await tools.getCommand('win32', 'composertool')).toBe(
+      'Add-Composertool '
+    );
+    expect(await tools.getCommand('openbsd', 'composertool')).toContain(
+      'Platform openbsd is not supported'
+    );
+  });
+
+  it('checking getCommand', async () => {
+    expect(await tools.getCommand('linux', 'pecl')).toBe('add_pecl ');
+    expect(await tools.getCommand('darwin', 'pecl')).toBe('add_pecl ');
+    expect(await tools.getCommand('win32', 'pecl')).toBe('Add-Pecl ');
+    expect(await tools.getCommand('openbsd', 'pecl')).toContain(
+      'Platform openbsd is not supported'
     );
   });
 
@@ -187,7 +211,7 @@ describe('Tools tests', () => {
     );
   });
 
-  it('checking getPharUri', async () => {
+  it('checking getPhpunitUri', async () => {
     expect(await tools.getPharUrl('domain', 'tool', '', 'latest')).toBe(
       'domain/tool.phar'
     );
@@ -239,20 +263,24 @@ describe('Tools tests', () => {
     ).toStrictEqual(['composer:2', 'a', 'b', 'c']);
   });
 
-  it('checking updateComposer', async () => {
-    expect(await tools.updateComposer('latest', 'linux')).toContain('');
-    expect(await tools.updateComposer('stable', 'win32')).toContain('');
-    expect(await tools.updateComposer('snapshot', 'darwin')).toContain(
-      '\ncomposer self-update --snapshot'
+  it('checking getComposerUrl', async () => {
+    expect(await tools.getComposerUrl('latest')).toContain(
+      'https://getcomposer.org/composer-stable.phar'
     );
-    expect(await tools.updateComposer('preview', 'linux')).toContain(
-      '\ncomposer self-update --preview'
+    expect(await tools.getComposerUrl('stable')).toContain(
+      'https://getcomposer.org/composer-stable.phar'
     );
-    expect(await tools.updateComposer('1', 'win32')).toContain(
-      '\ncomposer self-update --1'
+    expect(await tools.getComposerUrl('snapshot')).toContain(
+      'https://getcomposer.org/composer.phar'
     );
-    expect(await tools.updateComposer('2', 'darwin')).toContain(
-      '\ncomposer self-update --2'
+    expect(await tools.getComposerUrl('preview')).toContain(
+      'https://getcomposer.org/composer-preview.phar'
+    );
+    expect(await tools.getComposerUrl('1')).toContain(
+      'https://getcomposer.org/composer-1.phar'
+    );
+    expect(await tools.getComposerUrl('2')).toContain(
+      'https://getcomposer.org/composer-2.phar'
     );
   });
 
@@ -275,8 +303,8 @@ describe('Tools tests', () => {
     expect(await tools.getSymfonyUri('1.2.3', 'win32')).toContain(
       'releases/download/v1.2.3/symfony_windows_amd64'
     );
-    expect(await tools.getSymfonyUri('1.2.3', 'fedora')).toContain(
-      'Platform fedora is not supported'
+    expect(await tools.getSymfonyUri('1.2.3', 'openbsd')).toContain(
+      'Platform openbsd is not supported'
     );
   });
 
@@ -293,33 +321,21 @@ describe('Tools tests', () => {
     ]);
   });
 
-  it('checking getWpCliUri', async () => {
-    expect(await tools.getWpCliUrl('latest')).toBe(
-      'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true'
-    );
-    expect(await tools.getWpCliUrl('2.4.0')).toBe(
-      'wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar'
-    );
-  });
-
   it('checking addArchive', async () => {
     let script: string = await tools.addArchive(
       'tool',
-      '1.2.3',
       'https://tool.com/tool.phar',
       'linux'
     );
     expect(script).toContain('add_tool https://tool.com/tool.phar tool');
     script = await tools.addArchive(
       'tool',
-      '1.2.3',
       'https://tool.com/tool.phar',
       'darwin'
     );
     expect(script).toContain('add_tool https://tool.com/tool.phar tool');
     script = await tools.addArchive(
       'tool',
-      '1.2.3',
       'https://tool.com/tool.phar',
       'win32'
     );
@@ -327,11 +343,10 @@ describe('Tools tests', () => {
 
     script = await tools.addArchive(
       'tool',
-      '1.2.3',
       'https://tool.com/tool.phar',
-      'fedora'
+      'openbsd'
     );
-    expect(script).toContain('Platform fedora is not supported');
+    expect(script).toContain('Platform openbsd is not supported');
   });
 
   it('checking addDevTools', async () => {
@@ -359,8 +374,8 @@ describe('Tools tests', () => {
       'Add-Log "$cross" "php-config" "php-config is not a windows tool"'
     );
 
-    script = await tools.addDevTools('tool', 'fedora');
-    expect(script).toContain('Platform fedora is not supported');
+    script = await tools.addDevTools('tool', 'openbsd');
+    expect(script).toContain('Platform openbsd is not supported');
   });
 
   it('checking addPackage', async () => {
@@ -378,22 +393,18 @@ describe('Tools tests', () => {
     script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'win32');
     expect(script).toContain('Add-Composertool tool tool:1.2.3 user/');
 
-    script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'fedora');
-    expect(script).toContain('Platform fedora is not supported');
+    script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'openbsd');
+    expect(script).toContain('Platform openbsd is not supported');
   });
 
   it('checking addTools on linux', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, cs2pr, flex, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli',
+      'cs2pr, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony',
       '7.4',
       'linux'
     );
-    expect(script).toContain('add_blackfire');
     expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
-    );
-    expect(script).toContain(
-      'add_tool https://getcomposer.org/composer-stable.phar composer'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
@@ -413,11 +424,7 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_linux_amd64 symfony'
     );
-    expect(script).toContain(
-      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
-    );
     expect(script).toContain('add_pecl');
-    expect(script).toContain('add_composertool flex flex symfony/');
     expect(script).toContain('add_composertool phinx phinx robmorgan/');
     expect(script).toContain('add_composertool phinx phinx:1.2.3 robmorgan/');
     expect(script).toContain('add_devtools');
@@ -426,26 +433,16 @@ describe('Tools tests', () => {
   });
   it('checking addTools on darwin', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, flex, infection, phan, phpcs, phpcbf, phpcpd, phpmd, psalm, phinx, vapor-cli, phan:2.7.2, phive:1.2.3, cs2pr:1.2.3, composer-prefetcher:1.2.3, phpize, php-config, symfony, symfony:1.2.3, wp-cli',
+      'phpcs, phpcbf, phpcpd, phpmd, psalm, phinx, phive:1.2.3, cs2pr:1.2.3, composer-prefetcher:1.2.3, phpize, php-config, symfony, symfony:1.2.3',
       '7.4',
       'darwin'
     );
-    expect(script).toContain('add_blackfire');
     expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
-    );
-    expect(script).toContain(
-      'add_tool https://getcomposer.org/composer-stable.phar composer'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr'
     );
-    expect(script).toContain(
-      'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection'
-    );
-    expect(script).toContain(
-      'add_tool https://github.com/phan/phan/releases/latest/download/phan.phar phan'
-    );
     expect(script).toContain(
       'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs'
     );
@@ -461,12 +458,7 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
     );
-    expect(script).toContain('add_composertool vapor-cli vapor-cli laravel/');
-    expect(script).toContain('add_composertool flex flex symfony/');
     expect(script).toContain('add_composertool phinx phinx robmorgan/');
-    expect(script).toContain(
-      'add_tool https://github.com/phan/phan/releases/download/2.7.2/phan.phar phan'
-    );
     expect(script).toContain(
       'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
     );
@@ -479,29 +471,21 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'add_tool https://github.com/symfony/cli/releases/download/v1.2.3/symfony_darwin_amd64 symfony'
     );
-    expect(script).toContain(
-      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
-    );
     expect(script).toContain('add_log "$tick" "phpize" "Added"');
     expect(script).toContain('add_log "$tick" "php-config" "Added"');
   });
   it('checking addTools on windows', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player:1.8.1, codeception, cs2pr, deployer, flex, prestissimo, phpmd, phinx, phive:0.13.2, php-config, phpize, symfony, wp-cli, does_not_exit',
+      'codeception, cs2pr, deployer, prestissimo, phpmd, phinx, phive:0.13.2, php-config, phpize, symfony, does_not_exist',
       '7.4',
       'win32'
     );
-    expect(script).toContain('Add-Blackfire');
     expect(script).toContain(
-      'Add-Tool https://get.blackfire.io/blackfire-player-v1.8.1.phar blackfire-player'
-    );
-    expect(script).toContain(
-      'Add-Tool https://getcomposer.org/composer-stable.phar composer'
+      'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
     );
-    expect(script).toContain('Add-Composertool flex flex symfony/');
     expect(script).toContain(
       'Add-Tool https://deployer.org/deployer.phar deployer'
     );
@@ -516,13 +500,9 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'Add-Tool https://github.com/symfony/cli/releases/latest/download/symfony_windows_amd64.exe symfony'
     );
-    expect(script).toContain(
-      'Add-Tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
-    );
     expect(script).toContain('phpize is not a windows tool');
     expect(script).toContain('php-config is not a windows tool');
-    expect(script).toContain('Tool does_not_exit is not supported');
-    expect(script).toContain('Tool does_not_exit is not supported');
+    expect(script).toContain('Tool does_not_exist is not supported');
   });
   it('checking addTools with composer tool using user/tool as input', async () => {
     const script: string = await tools.addTools(
@@ -531,7 +511,7 @@ describe('Tools tests', () => {
       'win32'
     );
     expect(script).toContain(
-      'Add-Tool https://getcomposer.org/composer-stable.phar composer'
+      'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
     expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
@@ -546,17 +526,20 @@ describe('Tools tests', () => {
       'linux'
     );
     expect(script).toContain(
-      'add_tool https://getcomposer.org/composer-stable.phar composer'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-1.phar,https://getcomposer.org/composer-1.phar composer'
     );
-    expect(script).toContain('composer self-update --1');
 
     script = await tools.addTools('composer:preview', '7.4', 'linux');
-    expect(script).toContain('composer self-update --preview');
+    expect(script).toContain(
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-preview.phar,https://getcomposer.org/composer-preview.phar composer'
+    );
     script = await tools.addTools(
       'composer:v1, composer:preview, composer:snapshot',
       '7.4',
       'linux'
     );
-    expect(script).toContain('composer self-update --snapshot');
+    expect(script).toContain(
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-snapshot.phar,https://getcomposer.org/composer.phar composer'
+    );
   });
 });

__tests__/utils.test.ts

@@ -17,13 +17,19 @@ async function cleanup(path: string): Promise<void> {
 }
 
 describe('Utils tests', () => {
-  it('checking getInput', async () => {
+  it('checking readEnv', async () => {
     process.env['test'] = 'setup-php';
-    process.env['undefined'] = '';
+    expect(await utils.readEnv('test')).toBe('setup-php');
+    expect(await utils.readEnv('undefined')).toBe('');
+  });
+
+  it('checking getInput', async () => {
     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 () => {
@@ -131,8 +137,8 @@ describe('Utils tests', () => {
     expect(step_log).toEqual('step_log "Test message"');
     step_log = await utils.stepLog(message, 'darwin');
     expect(step_log).toEqual('step_log "Test message"');
-    step_log = await utils.stepLog(message, 'fedora');
-    expect(step_log).toContain('Platform fedora is not supported');
+    step_log = await utils.stepLog(message, 'openbsd');
+    expect(step_log).toContain('Platform openbsd is not supported');
 
     let add_log: string = await utils.addLog(
       'tick',
@@ -145,8 +151,8 @@ describe('Utils tests', () => {
     expect(add_log).toEqual('add_log "tick" "xdebug" "enabled"');
     add_log = await utils.addLog('tick', 'xdebug', 'enabled', 'darwin');
     expect(add_log).toEqual('add_log "tick" "xdebug" "enabled"');
-    add_log = await utils.addLog('tick', 'xdebug', 'enabled', 'fedora');
-    expect(add_log).toContain('Platform fedora is not supported');
+    add_log = await utils.addLog('tick', 'xdebug', 'enabled', 'openbsd');
+    expect(add_log).toContain('Platform openbsd is not supported');
   });
 
   it('checking getExtensionPrefix', async () => {
@@ -162,8 +168,8 @@ describe('Utils tests', () => {
     expect(await utils.suppressOutput('win32')).toEqual(' >$null 2>&1');
     expect(await utils.suppressOutput('linux')).toEqual(' >/dev/null 2>&1');
     expect(await utils.suppressOutput('darwin')).toEqual(' >/dev/null 2>&1');
-    expect(await utils.suppressOutput('fedora')).toContain(
-      'Platform fedora is not supported'
+    expect(await utils.suppressOutput('openbsd')).toContain(
+      'Platform openbsd is not supported'
     );
   });
 });

action.yml

@@ -21,6 +21,18 @@ inputs:
   tools:
     description: 'Setup popular tools globally.'
     required: false
+  extension-csv:
+    description: 'Deprecated! Use extensions instead.'
+    deprecationMessage: 'The extension-csv property is deprecated. Use extensions instead.'
+    required: false
+  ini-values-csv:
+    description: 'Deprecated! Use ini-values instead.'
+    deprecationMessage: 'The ini-values-csv property is deprecated. Use ini-values instead.'
+    required: false
+  pecl:
+    description: 'Deprecated! Use tools instead to setup PECL.'
+    deprecationMessage: 'The pecl property is deprecated. Specify pecl in tools instead.'
+    required: false
 runs:
   using: 'node12'
   main: 'dist/index.js'

dist/index.js

@@ -953,46 +953,29 @@ class ExecState extends events.EventEmitter {
 
 /***/ }),
 
-/***/ 86:
-/***/ (function(__unusedmodule, exports, __webpack_require__) {
+/***/ 82:
+/***/ (function(__unusedmodule, exports) {
 
 "use strict";
 
-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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+// We use any as a valid input type
+/* eslint-disable @typescript-eslint/no-explicit-any */
 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));
 /**
- * Cache json files for problem matchers
+ * Sanitizes an input into a string so it can be passed into issueCommand safely
+ * @param input input to sanitize into a string
  */
-async function addMatchers() {
-    const config_path = path.join(__dirname, '..', 'src', 'configs');
-    const runner_dir = await utils.getInput('RUNNER_TOOL_CACHE', false);
-    await io.cp(path.join(config_path, 'phpunit.json'), runner_dir);
-    await io.cp(path.join(config_path, 'php.json'), runner_dir);
+function toCommandValue(input) {
+    if (input === null || input === undefined) {
+        return '';
+    }
+    else if (typeof input === 'string' || input instanceof String) {
+        return input;
+    }
+    return JSON.stringify(input);
 }
-exports.addMatchers = addMatchers;
-
+exports.toCommandValue = toCommandValue;
+//# sourceMappingURL=utils.js.map
 
 /***/ }),
 
@@ -1003,6 +986,42 @@ 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) {
 
@@ -1030,15 +1049,30 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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.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;
+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;
 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.
  *
@@ -1046,13 +1080,17 @@ const core = __importStar(__webpack_require__(470));
  * @param mandatory
  */
 async function getInput(name, mandatory) {
-    const input = process.env[name];
-    switch (input) {
-        case '':
-        case undefined:
-            return core.getInput(name, { required: mandatory });
-        default:
+    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}`);
+        default:
+            return '';
     }
 }
 exports.getInput = getInput;
@@ -1271,6 +1309,7 @@ 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
  *
@@ -1324,28 +1363,14 @@ 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 toCommandValue(s)
+    return utils_1.toCommandValue(s)
         .replace(/%/g, '%25')
         .replace(/\r/g, '%0D')
         .replace(/\n/g, '%0A');
 }
 function escapeProperty(s) {
-    return toCommandValue(s)
+    return utils_1.toCommandValue(s)
         .replace(/%/g, '%25')
         .replace(/\r/g, '%0D')
         .replace(/\n/g, '%0A')
@@ -1379,6 +1404,8 @@ 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));
 /**
@@ -1405,9 +1432,17 @@ var ExitCode;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function exportVariable(name, val) {
-    const convertedVal = command_1.toCommandValue(val);
+    const convertedVal = utils_1.toCommandValue(val);
     process.env[name] = convertedVal;
-    command_1.issueCommand('set-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);
+    }
 }
 exports.exportVariable = exportVariable;
 /**
@@ -1423,7 +1458,13 @@ exports.setSecret = setSecret;
  * @param inputPath
  */
 function addPath(inputPath) {
-    command_1.issueCommand('add-path', {}, inputPath);
+    const filePath = process.env['GITHUB_PATH'] || '';
+    if (filePath) {
+        file_command_1.issueCommand('PATH', inputPath);
+    }
+    else {
+        command_1.issueCommand('add-path', {}, inputPath);
+    }
     process.env['PATH'] = `${inputPath}${path.delimiter}${process.env['PATH']}`;
 }
 exports.addPath = addPath;
@@ -1605,12 +1646,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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.addTools = exports.addPackage = exports.addDevTools = exports.addArchive = exports.getCleanedToolsList = exports.updateComposer = exports.addComposer = exports.getWpCliUrl = exports.getSymfonyUri = exports.getDeployerUrl = exports.getPharUrl = exports.addPhive = exports.getCodeceptionUri = exports.getCodeceptionUriBuilder = exports.getUri = exports.parseTool = exports.getToolVersion = exports.getCommand = void 0;
+exports.addTools = exports.addPackage = exports.addDevTools = exports.addArchive = exports.getCleanedToolsList = exports.getComposerUrl = exports.addComposer = exports.getSymfonyUri = exports.getDeployerUrl = exports.getPharUrl = exports.addPhive = exports.getCodeceptionUri = exports.getCodeceptionUriBuilder = exports.getUri = exports.parseTool = exports.getToolVersion = exports.getCommand = void 0;
 const utils = __importStar(__webpack_require__(163));
 /**
  * Function to get command to setup tools
@@ -1846,20 +1887,6 @@ async function getSymfonyUri(version, os_version) {
     }
 }
 exports.getSymfonyUri = getSymfonyUri;
-/**
- * Function to get the WP-CLI url
- *
- * @param version
- */
-async function getWpCliUrl(version) {
-    switch (version) {
-        case 'latest':
-            return 'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true';
-        default:
-            return await getUri('wp-cli', '-' + version + '.phar', version, 'wp-cli/wp-cli/releases', 'v', 'download');
-    }
-}
-exports.getWpCliUrl = getWpCliUrl;
 /**
  * Function to add/move composer in the tools list
  *
@@ -1883,25 +1910,26 @@ async function addComposer(tools_list) {
 }
 exports.addComposer = addComposer;
 /**
- * Function to get script to update composer
+ * Function to get composer URL for a given version
  *
  * @param version
- * @param os_version
  */
-async function updateComposer(version, os_version) {
+async function getComposerUrl(version) {
+    const cache_url = 'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-' +
+        version.replace('latest', 'stable') +
+        '.phar,';
     switch (version) {
         case 'snapshot':
+            return cache_url + 'https://getcomposer.org/composer.phar';
         case 'preview':
         case '1':
         case '2':
-            return ('\ncomposer self-update --' +
-                version +
-                (await utils.suppressOutput(os_version)));
+            return (cache_url + 'https://getcomposer.org/composer-' + version + '.phar');
         default:
-            return '';
+            return cache_url + 'https://getcomposer.org/composer-stable.phar';
     }
 }
-exports.updateComposer = updateComposer;
+exports.getComposerUrl = getComposerUrl;
 /**
  * Function to get Tools list after cleanup
  *
@@ -1914,7 +1942,7 @@ async function getCleanedToolsList(tools_csv) {
         .map(function (extension) {
         return extension
             .trim()
-            .replace(/symfony\/|laravel\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
+            .replace(/robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
     })
         .filter(Boolean);
     return [...new Set(tools_list)];
@@ -1924,11 +1952,10 @@ exports.getCleanedToolsList = getCleanedToolsList;
  * Helper function to get script to setup a tool using a phar url
  *
  * @param tool
- * @param version
  * @param url
  * @param os_version
  */
-async function addArchive(tool, version, url, os_version) {
+async function addArchive(tool, url, os_version) {
     return (await getCommand(os_version, 'tool')) + url + ' ' + tool;
 }
 exports.addArchive = addArchive;
@@ -1985,75 +2012,54 @@ async function addTools(tools_csv, php_version, os_version) {
         script += '\n';
         let url = '';
         switch (tool) {
-            case 'blackfire':
-            case 'blackfire-agent':
-                script += await getCommand(os_version, 'blackfire');
-                break;
-            case 'blackfire-player':
-                url = await getPharUrl('https://get.blackfire.io', tool, 'v', version);
-                script += await addArchive(tool, version, url, os_version);
-                break;
             case 'cs2pr':
                 uri = await getUri(tool, '', version, 'releases', '', 'download');
                 url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
-                script += await addArchive(tool, version, url, os_version);
-                break;
-            case 'infection':
-                url = github + 'infection/infection/' + uri;
-                script += await addArchive(tool, version, url, os_version);
+                script += await addArchive(tool, url, os_version);
                 break;
             case 'php-cs-fixer':
                 uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
                 url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
-                script += await addArchive(tool, version, url, os_version);
+                script += await addArchive(tool, url, os_version);
                 break;
             case 'phpcs':
             case 'phpcbf':
                 url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
-                script += await addArchive(tool, version, url, os_version);
-                break;
-            case 'phan':
-                url = github + 'phan/phan/' + uri;
-                script += await addArchive(tool, version, url, os_version);
+                script += await addArchive(tool, url, os_version);
                 break;
             case 'phive':
                 script += await addPhive(version, os_version);
                 break;
             case 'phpstan':
                 url = github + 'phpstan/phpstan/' + uri;
-                script += await addArchive(tool, version, url, os_version);
+                script += await addArchive(tool, url, os_version);
                 break;
             case 'phpmd':
                 url = github + 'phpmd/phpmd/' + uri;
-                script += await addArchive(tool, version, url, os_version);
+                script += await addArchive(tool, url, os_version);
                 break;
             case 'psalm':
                 url = github + 'vimeo/psalm/' + uri;
-                script += await addArchive(tool, version, url, os_version);
+                script += await addArchive(tool, url, os_version);
                 break;
             case 'composer':
-                url = 'https://getcomposer.org/composer-stable.phar';
-                script +=
-                    (await addArchive('composer', version, url, os_version)) +
-                        (await updateComposer(version, os_version));
+                url = await getComposerUrl(version);
+                script += await addArchive('composer', url, os_version);
                 break;
             case 'codeception':
                 url =
                     'https://codeception.com/' +
                         (await getCodeceptionUri(version, php_version));
-                script += await addArchive(tool, version, url, os_version);
+                script += await addArchive(tool, url, os_version);
                 break;
             case 'phpcpd':
             case 'phpunit':
                 url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
-                script += await addArchive(tool, version, url, os_version);
+                script += await addArchive(tool, url, os_version);
                 break;
             case 'deployer':
                 url = await getDeployerUrl(version);
-                script += await addArchive(tool, version, url, os_version);
-                break;
-            case 'flex':
-                script += await addPackage(tool, release, 'symfony/', os_version);
+                script += await addArchive(tool, url, os_version);
                 break;
             case 'phinx':
                 script += await addPackage(tool, release, 'robmorgan/', os_version);
@@ -2061,9 +2067,6 @@ async function addTools(tools_csv, php_version, os_version) {
             case 'prestissimo':
                 script += await addPackage(tool, release, 'hirak/', os_version);
                 break;
-            case 'vapor-cli':
-                script += await addPackage(tool, release, 'laravel/', os_version);
-                break;
             case 'composer-prefetcher':
                 script += await addPackage(tool, release, 'narrowspark/automatic-', os_version);
                 break;
@@ -2078,11 +2081,7 @@ async function addTools(tools_csv, php_version, os_version) {
             case 'symfony-cli':
                 uri = await getSymfonyUri(version, os_version);
                 url = github + 'symfony/cli/' + uri;
-                script += await addArchive('symfony', version, url, os_version);
-                break;
-            case 'wp-cli':
-                url = github + (await getWpCliUrl(version));
-                script += await addArchive(tool, version, url, os_version);
+                script += await addArchive('symfony', url, os_version);
                 break;
             default:
                 script += await utils.addLog('$cross', tool, 'Tool ' + tool + ' is not supported', os_version);
@@ -2130,7 +2129,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -2147,16 +2146,15 @@ const config = __importStar(__webpack_require__(641));
  * @param pipe
  */
 async function addCoverageXdebug(version, os_version, pipe) {
-    switch (version) {
-        case '8.0':
-            return ('\n' +
-                (await utils.addLog('$cross', 'xdebug', 'Xdebug currently only supports PHP 7.4 or lower', os_version)));
-        case '7.4':
+    const xdebug = (await extensions.addExtension('xdebug', version, os_version, true)) + pipe;
+    const ini = await config.addINIValues('xdebug.mode=coverage', os_version, true);
+    const log = await utils.addLog('$tick', 'xdebug', 'Xdebug enabled as coverage driver', os_version);
+    switch (true) {
+        case /8.[0-9]/.test(version):
+            return xdebug + '\n' + ini + '\n' + log;
+        case /5\.[3-6]|7.[0-4]/.test(version):
         default:
-            return ((await extensions.addExtension('xdebug', version, os_version, true)) +
-                pipe +
-                '\n' +
-                (await utils.addLog('$tick', 'xdebug', 'Xdebug enabled as coverage driver', os_version)));
+            return xdebug + '\n' + log;
     }
 }
 exports.addCoverageXdebug = addCoverageXdebug;
@@ -2169,7 +2167,7 @@ exports.addCoverageXdebug = addCoverageXdebug;
  */
 async function addCoveragePCOV(version, os_version, pipe) {
     let script = '\n';
-    switch (true) {
+    switch (version) {
         default:
             script +=
                 (await extensions.addExtension('pcov', version, os_version, true)) +
@@ -2191,7 +2189,8 @@ async function addCoveragePCOV(version, os_version, pipe) {
             script += await utils.addLog('$tick', 'coverage: pcov', 'PCOV enabled as coverage driver', os_version);
             // version is not supported
             break;
-        case /5\.[3-6]|7\.0/.test(version):
+        case '5.6':
+        case '7.0':
             script += await utils.addLog('$cross', 'pcov', 'PHP 7.1 or newer is required', os_version);
             break;
     }
@@ -2269,7 +2268,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -2303,7 +2302,10 @@ async function addINIValuesWindows(ini_values_csv) {
         script +=
             (await utils.addLog('$tick', line, 'Added to php.ini', 'win32')) + '\n';
     });
-    return ('Add-Content "$php_dir\\php.ini" "' + ini_values.join('\n') + '"' + script);
+    return ('Add-Content C:\\tools\\php\\php.ini "' +
+        ini_values.join('\n') +
+        '"' +
+        script);
 }
 exports.addINIValuesWindows = addINIValuesWindows;
 /**
@@ -2362,7 +2364,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -2375,7 +2377,6 @@ 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
  *
@@ -2385,15 +2386,18 @@ const matchers = __importStar(__webpack_require__(86));
  */
 async function build(filename, version, os_version) {
     // taking inputs
+    const name = 'setup-php';
+    const url = 'https://setup-php.com/support';
     const extension_csv = (await utils.getInput('extensions', false)) ||
-        (await utils.getInput('extension', false));
-    const ini_values_csv = await utils.getInput('ini-values', false);
+        (await utils.getInput('extension', false)) ||
+        (await utils.getInput('extension-csv', false));
+    const ini_values_csv = (await utils.getInput('ini-values', false)) ||
+        (await utils.getInput('ini-values-csv', false));
     const coverage_driver = await utils.getInput('coverage', false);
     const pecl = await utils.getInput('pecl', false);
     let tools_csv = await utils.getInput('tools', false);
     if (pecl == 'true' ||
-        /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv) ||
-        /.*-(\d+\.\d+\.\d+).*/.test(extension_csv)) {
+        /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv)) {
         tools_csv = 'pecl, ' + tools_csv;
     }
     let script = await utils.readScript(filename);
@@ -2401,12 +2405,14 @@ async function build(filename, version, os_version) {
     if (extension_csv) {
         script += await extensions.addExtension(extension_csv, version, os_version);
     }
-    if (ini_values_csv) {
-        script += await config.addINIValues(ini_values_csv, os_version);
-    }
     if (coverage_driver) {
         script += await coverage.addCoverage(coverage_driver, version, os_version);
     }
+    if (ini_values_csv) {
+        script += await config.addINIValues(ini_values_csv, os_version);
+    }
+    script += '\n' + (await utils.stepLog('Support this project', os_version));
+    script += '\n' + (await utils.addLog('$tick', name, url, os_version));
     return await utils.writeScript(filename, script);
 }
 exports.build = build;
@@ -2415,9 +2421,9 @@ exports.build = build;
  */
 async function run() {
     try {
+        const os_version = process.platform;
         let version = await utils.getInput('php-version', true);
         version = version.length > 1 ? version.slice(0, 3) : version + '.0';
-        const os_version = process.platform;
         // check the os version and run the respective script
         let script_path = '';
         switch (os_version) {
@@ -2431,7 +2437,6 @@ async function run() {
                 await exec_1.exec('pwsh ' + script_path + ' ' + version + ' ' + __dirname);
                 break;
         }
-        await matchers.addMatchers();
     }
     catch (error) {
         core.setFailed(error.message);
@@ -2680,7 +2685,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -2697,69 +2702,35 @@ const utils = __importStar(__webpack_require__(163));
  */
 async function addExtensionDarwin(extension_csv, version, pipe) {
     const extensions = await utils.extensionArray(extension_csv);
-    let add_script = '\n';
-    let remove_script = '';
+    let script = '\n';
     await utils.asyncForEach(extensions, async function (extension) {
         const version_extension = version + extension;
-        const [ext_name, ext_version] = extension.split('-');
-        const ext_prefix = await utils.getExtensionPrefix(ext_name);
-        const command_prefix = 'sudo pecl install -f ';
+        const [extension_name, stability] = extension.split('-');
+        const ext_prefix = await utils.getExtensionPrefix(extension_name);
+        const command_prefix = 'pecl_install ';
         let command = '';
         switch (true) {
-            // match :extension
-            case /^:/.test(ext_name):
-                remove_script += '\nremove_extension ' + ext_name.slice(1);
-                return;
-            // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-            // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-            case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
-                command =
-                    'bash ' +
-                        path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
-                        ' ' +
-                        version +
-                        ' ' +
-                        extension;
-                break;
-            // match pre-release versions. For example - xdebug-beta
+            // match pre-release versions
             case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-                add_script +=
+                script +=
                     '\nadd_unstable_extension ' +
-                        ext_name +
+                        extension_name +
                         ' ' +
-                        ext_version +
+                        stability +
                         ' ' +
                         ext_prefix;
                 return;
-            // match semver
-            case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-                add_script +=
-                    '\nadd_pecl_extension ' +
-                        ext_name +
-                        ' ' +
-                        ext_version +
-                        ' ' +
-                        ext_prefix;
-                return;
-            // match 5.3xdebug
-            case /5\.3xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.2.7' + pipe;
-                break;
-            // match 5.4xdebug
-            case /5\.4xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.4.1' + pipe;
-                break;
-            // match 5.5xdebug and 5.6xdebug
-            case /5\.[5-6]xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.5.5' + pipe;
-                break;
-            // match 7.0redis
-            case /7\.0xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.9.0' + pipe;
+            // 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-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' + pipe;
+                command = command_prefix + 'redis-2.2.8';
                 break;
             // match imagick
             case /^imagick$/.test(extension):
@@ -2774,11 +2745,11 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
             // match sqlite
             case /^sqlite$/.test(extension):
                 extension = 'sqlite3';
-                command = command_prefix + extension + pipe;
+                command = command_prefix + extension;
                 break;
             // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
             case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-                add_script +=
+                script +=
                     '\nbash ' +
                         path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
                         ' ' +
@@ -2787,13 +2758,18 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                         version;
                 return;
             default:
-                command = command_prefix + extension + pipe;
+                command = command_prefix + extension;
                 break;
         }
-        add_script +=
-            '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+        script +=
+            '\nadd_extension ' +
+                extension +
+                ' "' +
+                command +
+                '" ' +
+                (await utils.getExtensionPrefix(extension));
     });
-    return add_script + remove_script;
+    return script;
 }
 exports.addExtensionDarwin = addExtensionDarwin;
 /**
@@ -2804,63 +2780,34 @@ exports.addExtensionDarwin = addExtensionDarwin;
  */
 async function addExtensionWindows(extension_csv, version) {
     const extensions = await utils.extensionArray(extension_csv);
-    let add_script = '\n';
-    let remove_script = '';
+    let script = '\n';
     await utils.asyncForEach(extensions, async function (extension) {
-        const [ext_name, ext_version] = extension.split('-');
+        const [extension_name, stability] = extension.split('-');
         const version_extension = version + extension;
-        let matches;
         switch (true) {
-            // Match :extension
-            case /^:/.test(ext_name):
-                remove_script += '\nRemove-Extension ' + ext_name.slice(1);
-                return;
-            // match 5.4blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-            // match 5.4blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-            case /^(5\.[4-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
-                add_script +=
-                    '\n& ' +
-                        path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
-                        ' ' +
-                        version +
-                        ' ' +
-                        extension;
-                return;
-            // match pre-release versions. For example - xdebug-beta
+            // match pre-release versions
             case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-                add_script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
+                script += '\nAdd-Extension ' + extension_name + ' ' + stability;
                 break;
-            // match semver without state
-            case /.*-\d+\.\d+\.\d+$/.test(version_extension):
-                add_script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
-                return;
-            // match semver with state
-            case /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.test(version_extension):
-                matches = /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.exec(version_extension);
-                add_script +=
-                    '\nAdd-Extension ' + ext_name + ' ' + matches[2] + ' ' + matches[1];
-                return;
-            // match 5.3mysql..5.6mysql
-            // match 5.3mysqli..5.6mysqli
-            // match 5.3mysqlnd..5.6mysqlnd
-            case /^5\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-                add_script +=
+            // match 5.6mysql, 5.6mysqli, 5.6mysqlnd
+            case /^5\.6(mysql|mysqli|mysqlnd)$/.test(version_extension):
+                script +=
                     '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
                 break;
             // match 7.0mysql..8.0mysql
             // match 7.0mysqli..8.0mysqli
             // match 7.0mysqlnd..8.0mysqlnd
             case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-                add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
+                script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
                 break;
             // match sqlite
             case /^sqlite$/.test(extension):
                 extension = 'sqlite3';
-                add_script += '\nAdd-Extension ' + extension;
+                script += '\nAdd-Extension ' + extension;
                 break;
             // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
             case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-                add_script +=
+                script +=
                     '\n& ' +
                         path.join(__dirname, '../src/scripts/ext/phalcon.ps1') +
                         ' ' +
@@ -2870,11 +2817,11 @@ async function addExtensionWindows(extension_csv, version) {
                         '\n';
                 break;
             default:
-                add_script += '\nAdd-Extension ' + extension;
+                script += '\nAdd-Extension ' + extension;
                 break;
         }
     });
-    return add_script + remove_script;
+    return script;
 }
 exports.addExtensionWindows = addExtensionWindows;
 /**
@@ -2886,47 +2833,21 @@ exports.addExtensionWindows = addExtensionWindows;
  */
 async function addExtensionLinux(extension_csv, version, pipe) {
     const extensions = await utils.extensionArray(extension_csv);
-    let add_script = '\n';
-    let remove_script = '';
+    let script = '\n';
     await utils.asyncForEach(extensions, async function (extension) {
         const version_extension = version + extension;
-        const [ext_name, ext_version] = extension.split('-');
-        const ext_prefix = await utils.getExtensionPrefix(ext_name);
+        const [extension_name, stability] = extension.split('-');
+        const ext_prefix = await utils.getExtensionPrefix(extension_name);
         const command_prefix = 'sudo $debconf_fix apt-get install -y php';
         let command = '';
         switch (true) {
-            // Match :extension
-            case /^:/.test(ext_name):
-                remove_script += '\nremove_extension ' + ext_name.slice(1);
-                return;
-            // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-            // match 5.3blackfire-{semver}...5.6blackfire-{semver}, 7.0blackfire-{semver}...7.4blackfire-{semver}
-            case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
-                command =
-                    'bash ' +
-                        path.join(__dirname, '../src/scripts/ext/blackfire.sh') +
-                        ' ' +
-                        version +
-                        ' ' +
-                        extension;
-                break;
-            // match pre-release versions. For example - xdebug-beta
+            // match pre-release versions
             case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-                add_script +=
+                script +=
                     '\nadd_unstable_extension ' +
-                        ext_name +
+                        extension_name +
                         ' ' +
-                        ext_version +
-                        ' ' +
-                        ext_prefix;
-                return;
-            // match semver versions
-            case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-                add_script +=
-                    '\nadd_pecl_extension ' +
-                        ext_name +
-                        ' ' +
-                        ext_version +
+                        stability +
                         ' ' +
                         ext_prefix;
                 return;
@@ -2941,7 +2862,7 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                 break;
             // match 7.0phalcon3...7.3phalcon3 or 7.2phalcon4...7.4phalcon4
             case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-                add_script +=
+                script +=
                     '\nbash ' +
                         path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
                         ' ' +
@@ -2949,39 +2870,24 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                         ' ' +
                         version;
                 return;
-            // match 7.1xdebug..7.4xdebug
-            case /^7\.[1-4]xdebug$/.test(version_extension):
-                add_script +=
-                    '\nupdate_extension xdebug 2.9.3' +
-                        pipe +
-                        '\n' +
-                        (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
-                return;
-            // match pdo extensions
-            case /.*pdo[_-].*/.test(version_extension):
-                extension = extension
-                    .replace('pdo_', '')
-                    .replace('pdo-', '')
-                    .replace('sqlite3', 'sqlite');
-                add_script += '\nadd_pdo_extension ' + extension;
-                return;
-            // match ast and uopz
-            case /^(ast|uopz)$/.test(extension):
-                command = command_prefix + '-' + extension + pipe;
-                break;
             // match sqlite
             case /^sqlite$/.test(extension):
                 extension = 'sqlite3';
                 command = command_prefix + version + '-' + extension + pipe;
                 break;
             default:
-                command = command_prefix + version + '-' + extension + pipe;
+                command =
+                    command_prefix +
+                        version +
+                        '-' +
+                        extension.replace('pdo_', '').replace('pdo-', '') +
+                        pipe;
                 break;
         }
-        add_script +=
+        script +=
             '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
     });
-    return add_script + remove_script;
+    return script;
 }
 exports.addExtensionLinux = addExtensionLinux;
 /**

examples/bedrock.yml

@@ -13,20 +13,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install -n --prefer-dist
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: PHP test
         run: composer test

examples/blackfire-player.yml

@@ -1,31 +0,0 @@
-# GitHub Action for Blackfire Player
-name: Play a Blackfire Scenario
-on: [push, pull_request]
-jobs:
-  blackfire-player:
-    name: Blackfire (PHP ${{ matrix.php-versions }})
-    # Add your Blackfire credentials securely using GitHub Secrets
-    env:
-      BLACKFIRE_SERVER_ID: ${{ secrets.BLACKFIRE_SERVER_ID }}
-      BLACKFIRE_SERVER_TOKEN: ${{ secrets.BLACKFIRE_SERVER_TOKEN }}
-      BLACKFIRE_CLIENT_ID: ${{ secrets.BLACKFIRE_CLIENT_ID }}
-      BLACKFIRE_CLIENT_TOKEN: ${{ secrets.BLACKFIRE_CLIENT_TOKEN }}
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['7.2', '7.3', '7.4']
-        # blackfire-player supports PHP >= 5.5
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: blackfire
-          tools: blackfire, blackfire-player #Setup Blackfire client, agent and player
-          coverage: none
-      - name: Play the scenario
-        run: blackfire-player run scenario.bkf # Refer to https://blackfire.io/docs/player/index#usage

examples/blackfire.yml

@@ -1,31 +0,0 @@
-# GitHub Action for Blackfire
-name: Profiling with blackfire
-on: [push, pull_request]
-jobs:
-  blackfire:
-    name: Blackfire (PHP ${{ matrix.php-versions }})
-    # Add your Blackfire credentials securely using GitHub Secrets
-    env:
-      BLACKFIRE_SERVER_ID: ${{ secrets.BLACKFIRE_SERVER_ID }}
-      BLACKFIRE_SERVER_TOKEN: ${{ secrets.BLACKFIRE_SERVER_TOKEN }}
-      BLACKFIRE_CLIENT_ID: ${{ secrets.BLACKFIRE_CLIENT_ID }}
-      BLACKFIRE_CLIENT_TOKEN: ${{ secrets.BLACKFIRE_CLIENT_TOKEN }}
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['7.2', '7.3', '7.4']
-        # Blackfire supports PHP >= 5.3 on ubuntu and macos and PHP >= 5.4 on windows
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: blackfire
-          tools: blackfire #Setup Blackfire client and agent
-          coverage: none
-      - name: Profile
-        run: blackfire run php my-script.php # Refer to https://blackfire.io/docs/cookbooks/profiling-cli

examples/cakephp-mysql.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: ${{ matrix.php-versions }}
           # You can also use ext-apcu or ext-memcached instead of ext-redis
@@ -37,19 +37,19 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer run-script post-install-cmd --no-interaction
       # Add a step to run migrations if required
       - name: Test with phpunit
@@ -65,23 +65,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: PHP CodeSniffer
         run: composer cs-check
 
@@ -92,23 +92,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl
           tools: phpstan
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Static Analysis using PHPStan
         run: phpstan analyse --no-progress src/

examples/cakephp-postgres.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: ${{ matrix.php-versions }}
           # You can also use ext-apcu or ext-memcached instead of ext-redis
@@ -35,19 +35,19 @@ jobs:
           extensions: mbstring, intl, redis, pdo_pgsql
           coverage: pcov
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer run-script post-install-cmd --no-interaction
       # Add a step to run migrations if required
       - name: Test with phpunit
@@ -63,23 +63,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: PHP CodeSniffer
         run: composer cs-check
 
@@ -90,23 +90,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl
           tools: phpstan
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Static Analysis using PHPStan
         run: phpstan analyse --no-progress src/

examples/cakephp.yml

@@ -13,25 +13,25 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl, pdo_sqlite, pdo_mysql
           coverage: pcov #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer run-script post-install-cmd --no-interaction
       - name: Test with phpunit
         run: vendor/bin/phpunit --coverage-text
@@ -43,23 +43,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: PHP CodeSniffer
         run: composer cs-check
 
@@ -70,23 +70,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl
           tools: phpstan
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Static Analysis using PHPStan
         run: phpstan analyse --no-progress src/

examples/codeigniter.yml

@@ -12,23 +12,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl, curl, dom
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Test with phpunit
         run: vendor/bin/phpunit --coverage-text

examples/laravel-mysql.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, mysql
@@ -44,18 +44,18 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/laravel-postgres.yml

@@ -38,24 +38,24 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/laravel.yml

@@ -14,24 +14,24 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/lumen-mysql.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, mysql
@@ -44,19 +44,19 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer require predis/predis illuminate/redis
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/lumen-postgres.yml

@@ -38,25 +38,25 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer require predis/predis illuminate/redis
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/lumen.yml

@@ -14,24 +14,24 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, mysql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Test with phpunit

examples/phalcon-mysql.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, zip, phalcon4, mysql #use phalcon3 for the phalcon 3.x.
@@ -44,18 +44,18 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Run Migration

examples/phalcon-postgres.yml

@@ -37,24 +37,24 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, zip, phalcon4, pgsql #use phalcon3 for the phalcon 3.x
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Run Migration

examples/sage.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-versions }}
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -33,12 +33,12 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: ${{ runner.os }}-yarn-
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -46,7 +46,7 @@ jobs:
       - name: Install yarn dependencies
         run: yarn -V
       - name: Install Composer dependencies
-        run: composer install -o --prefer-dist --no-interaction
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Yarn test and build
         run: |
           yarn run test

examples/slim-framework.yml

@@ -12,23 +12,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, simplexml, dom
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Test with phpunit
         run: vendor/bin/phpunit --coverage-text

examples/symfony-mysql.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, mysql
@@ -31,19 +31,19 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Run Migration
         run: |
           composer require symfony/orm-pack

examples/symfony-postgres.yml

@@ -23,25 +23,25 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Run Migration
         run: |
           composer require symfony/orm-pack

examples/symfony.yml

@@ -14,18 +14,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -33,6 +33,6 @@ jobs:
       - name: Install Composer dependencies
         run: |
           composer require symfony/orm-pack
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Run Tests
         run: php bin/phpunit --coverage-text

examples/yii2-mysql.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           node-version: 10.x
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl, gd, imagick, zip, dom, mysql
@@ -41,18 +41,18 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.dist', '.env');"

examples/yii2-postgres.yml

@@ -33,24 +33,24 @@ jobs:
         with:
           node-version: 10.x
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl, gd, imagick, zip, dom, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.dist', '.env');"

examples/zend-framework.yml

@@ -12,25 +12,25 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, bcmath, curl, intl
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer require --dev phpunit/phpunit squizlabs/php_codesniffer zendframework/zend-test
       - name: Test with phpunit
         run: vendor/bin/phpunit --coverage-text

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.3.0",
+  "version": "1.9.7",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
@@ -24,33 +24,33 @@
   "author": "shivammathur",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.4",
+    "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.4",
     "@actions/io": "^1.0.2",
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^25.2.3",
-    "@types/node": "^14.0.12",
-    "@typescript-eslint/eslint-plugin": "^3.2.0",
-    "@typescript-eslint/parser": "^3.2.0",
+    "@types/jest": "^26.0.14",
+    "@types/node": "^14.11.2",
+    "@typescript-eslint/eslint-plugin": "^4.3.0",
+    "@typescript-eslint/parser": "^4.3.0",
     "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.2.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.21.1",
-    "eslint-plugin-jest": "^23.13.2",
-    "eslint-plugin-prettier": "^3.1.3",
-    "husky": "^4.2.5",
-    "jest": "^26.0.1",
-    "jest-circus": "^26.0.1",
-    "prettier": "^2.0.5",
-    "ts-jest": "^26.1.0",
-    "typescript": "^3.9.5"
+    "eslint": "^7.10.0",
+    "eslint-config-prettier": "^6.12.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jest": "^24.0.2",
+    "eslint-plugin-prettier": "^3.1.4",
+    "husky": "^4.3.0",
+    "jest": "^26.4.2",
+    "jest-circus": "^26.4.2",
+    "prettier": "^2.1.2",
+    "ts-jest": "^26.4.1",
+    "typescript": "^4.0.3"
   },
   "husky": {
     "skipCI": true,
     "hooks": {
-      "pre-commit": "npm run format && npm run lint && npm run test && npm run build && npm run release"
+      "pre-commit": "npm run format && npm run lint && npm run build && npm run release"
     }
   }
 }

src/config.ts

@@ -32,7 +32,10 @@ export async function addINIValuesWindows(
       (await utils.addLog('$tick', line, 'Added to php.ini', 'win32')) + '\n';
   });
   return (
-    'Add-Content "$php_dir\\php.ini" "' + ini_values.join('\n') + '"' + script
+    'Add-Content C:\\tools\\php\\php.ini "' +
+    ini_values.join('\n') +
+    '"' +
+    script
   );
 }
 

src/configs/config.yaml

@@ -1,58 +0,0 @@
-variants:
-  dev:
-    bcmath:
-    calendar:
-    cli:
-    ctype:
-    dom:
-    fileinfo:
-    filter:
-    ipc:
-    iconv:
-    json:
-    mbregex:
-    mbstring:
-    mhash:
-    mcrypt:
-    pcntl:
-    pcre:
-    pdo:
-    phar:
-    posix:
-    sockets:
-    tokenizer:
-    xml:
-    curl:
-    openssl:
-    zip:
-    gd:
-      - --with-freetype
-      - --with-pdo-mysql=mysqlnd
-      - --with-mysqli=mysqlnd
-      - --with-pgsql
-      - --with-pdo-pgsql
-      - --with-gmp=/usr/local/opt/gmp
-      - --with-openssl
-      - --with-pear
-      - --with-zip
-      - --with-libxml
-      - --with-kerberos
-      - --with-gd
-      - --with-ffi
-      - --with-curl
-      - --with-mhash
-      - --with-readline=/usr/local/opt/readline
-      - --with-iconv=/usr/local/opt/libiconv
-      - --with-icu-dir=/usr/local/opt/icu4c
-      - --with-config-file-path=/etc
-      - --enable-intl
-      - --enable-xml
-      - --enable-sysvsem
-      - --enable-sysvshm
-      - --enable-sysvmsg
-      - --enable-phpdbg
-      - --enable-exif
-      - --enable-gd
-      - --enable-soap
-      - --enable-xmlreader
-      - --enable-zend-test=shared

src/configs/php.json

@@ -1,29 +0,0 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "php_native_error",
-      "severity": "error",
-      "pattern": [
-        {
-          "regexp": "^(.*error):\\s+\\s+(.+) in (.+) on line (\\d+)$",
-          "code": 1,
-          "message": 2,
-          "file": 3,
-          "line": 4
-        }
-      ]
-    }, {
-      "owner": "php_native_warning",
-      "severity": "warning",
-      "pattern": [
-        {
-          "regexp": "^(.*Warning|.*Deprecated|.*Notice):\\s+\\s+(.+) in (.+) on line (\\d+)$",
-          "code": 1,
-          "message": 2,
-          "file": 3,
-          "line": 4
-        }
-      ]
-    }
-  ]
-}

src/coverage.ts

@@ -14,30 +14,25 @@ export async function addCoverageXdebug(
   os_version: string,
   pipe: string
 ): Promise<string> {
-  switch (version) {
-    case '8.0':
-      return (
-        '\n' +
-        (await utils.addLog(
-          '$cross',
-          'xdebug',
-          'Xdebug currently only supports PHP 7.4 or lower',
-          os_version
-        ))
-      );
-    case '7.4':
+  const xdebug =
+    (await extensions.addExtension('xdebug', version, os_version, true)) + pipe;
+  const ini = await config.addINIValues(
+    'xdebug.mode=coverage',
+    os_version,
+    true
+  );
+  const log = await utils.addLog(
+    '$tick',
+    'xdebug',
+    'Xdebug enabled as coverage driver',
+    os_version
+  );
+  switch (true) {
+    case /8.[0-9]/.test(version):
+      return xdebug + '\n' + ini + '\n' + log;
+    case /5\.[3-6]|7.[0-4]/.test(version):
     default:
-      return (
-        (await extensions.addExtension('xdebug', version, os_version, true)) +
-        pipe +
-        '\n' +
-        (await utils.addLog(
-          '$tick',
-          'xdebug',
-          'Xdebug enabled as coverage driver',
-          os_version
-        ))
-      );
+      return xdebug + '\n' + log;
   }
 }
 
@@ -54,7 +49,7 @@ export async function addCoveragePCOV(
   pipe: string
 ): Promise<string> {
   let script = '\n';
-  switch (true) {
+  switch (version) {
     default:
       script +=
         (await extensions.addExtension('pcov', version, os_version, true)) +
@@ -83,8 +78,8 @@ export async function addCoveragePCOV(
       );
       // version is not supported
       break;
-
-    case /5\.[3-6]|7\.0/.test(version):
+    case '5.6':
+    case '7.0':
       script += await utils.addLog(
         '$cross',
         'pcov',

src/extensions.ts

@@ -14,71 +14,35 @@ export async function addExtensionDarwin(
   pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let add_script = '\n';
-  let remove_script = '';
+  let script = '\n';
   await utils.asyncForEach(extensions, async function (extension: string) {
     const version_extension: string = version + extension;
-    const [ext_name, ext_version]: string[] = extension.split('-');
-    const ext_prefix = await utils.getExtensionPrefix(ext_name);
-    const command_prefix = 'sudo pecl install -f ';
+    const [extension_name, stability]: string[] = extension.split('-');
+    const ext_prefix = await utils.getExtensionPrefix(extension_name);
+    const command_prefix = 'pecl_install ';
     let command = '';
     switch (true) {
-      // match :extension
-      case /^:/.test(ext_name):
-        remove_script += '\nremove_extension ' + ext_name.slice(1);
-        return;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-        version_extension
-      ):
-        command =
-          'bash ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
-          ' ' +
-          version +
-          ' ' +
-          extension;
-        break;
-      // match pre-release versions. For example - xdebug-beta
+      // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script +=
+        script +=
           '\nadd_unstable_extension ' +
-          ext_name +
+          extension_name +
           ' ' +
-          ext_version +
+          stability +
           ' ' +
           ext_prefix;
         return;
-      // match semver
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        add_script +=
-          '\nadd_pecl_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
-        return;
-      // match 5.3xdebug
-      case /5\.3xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.2.7' + pipe;
-        break;
-      // match 5.4xdebug
-      case /5\.4xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.4.1' + pipe;
-        break;
-      // match 5.5xdebug and 5.6xdebug
-      case /5\.[5-6]xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.5.5' + pipe;
-        break;
-      // match 7.0redis
-      case /7\.0xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.9.0' + pipe;
+      // 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-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' + pipe;
+        command = command_prefix + 'redis-2.2.8';
         break;
       // match imagick
       case /^imagick$/.test(extension):
@@ -93,11 +57,11 @@ export async function addExtensionDarwin(
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
-        command = command_prefix + extension + pipe;
+        command = command_prefix + extension;
         break;
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        add_script +=
+        script +=
           '\nbash ' +
           path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
           ' ' +
@@ -106,13 +70,18 @@ export async function addExtensionDarwin(
           version;
         return;
       default:
-        command = command_prefix + extension + pipe;
+        command = command_prefix + extension;
         break;
     }
-    add_script +=
-      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+    script +=
+      '\nadd_extension ' +
+      extension +
+      ' "' +
+      command +
+      '" ' +
+      (await utils.getExtensionPrefix(extension));
   });
-  return add_script + remove_script;
+  return script;
 }
 
 /**
@@ -126,69 +95,34 @@ export async function addExtensionWindows(
   version: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let add_script = '\n';
-  let remove_script = '';
+  let script = '\n';
   await utils.asyncForEach(extensions, async function (extension: string) {
-    const [ext_name, ext_version]: string[] = extension.split('-');
+    const [extension_name, stability]: string[] = extension.split('-');
     const version_extension: string = version + extension;
-    let matches: RegExpExecArray;
     switch (true) {
-      // Match :extension
-      case /^:/.test(ext_name):
-        remove_script += '\nRemove-Extension ' + ext_name.slice(1);
-        return;
-      // match 5.4blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.4blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-      case /^(5\.[4-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-        version_extension
-      ):
-        add_script +=
-          '\n& ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
-          ' ' +
-          version +
-          ' ' +
-          extension;
-        return;
-      // match pre-release versions. For example - xdebug-beta
+      // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
+        script += '\nAdd-Extension ' + extension_name + ' ' + stability;
         break;
-      // match semver without state
-      case /.*-\d+\.\d+\.\d+$/.test(version_extension):
-        add_script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
-        return;
-      // match semver with state
-      case /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.test(
-        version_extension
-      ):
-        matches = /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.exec(
-          version_extension
-        ) as RegExpExecArray;
-        add_script +=
-          '\nAdd-Extension ' + ext_name + ' ' + matches[2] + ' ' + matches[1];
-        return;
-      // match 5.3mysql..5.6mysql
-      // match 5.3mysqli..5.6mysqli
-      // match 5.3mysqlnd..5.6mysqlnd
-      case /^5\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-        add_script +=
+      // match 5.6mysql, 5.6mysqli, 5.6mysqlnd
+      case /^5\.6(mysql|mysqli|mysqlnd)$/.test(version_extension):
+        script +=
           '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
         break;
       // match 7.0mysql..8.0mysql
       // match 7.0mysqli..8.0mysqli
       // match 7.0mysqlnd..8.0mysqlnd
       case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-        add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
+        script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
         break;
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
-        add_script += '\nAdd-Extension ' + extension;
+        script += '\nAdd-Extension ' + extension;
         break;
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        add_script +=
+        script +=
           '\n& ' +
           path.join(__dirname, '../src/scripts/ext/phalcon.ps1') +
           ' ' +
@@ -198,11 +132,11 @@ export async function addExtensionWindows(
           '\n';
         break;
       default:
-        add_script += '\nAdd-Extension ' + extension;
+        script += '\nAdd-Extension ' + extension;
         break;
     }
   });
-  return add_script + remove_script;
+  return script;
 }
 
 /**
@@ -218,49 +152,21 @@ export async function addExtensionLinux(
   pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let add_script = '\n';
-  let remove_script = '';
+  let script = '\n';
   await utils.asyncForEach(extensions, async function (extension: string) {
     const version_extension: string = version + extension;
-    const [ext_name, ext_version]: string[] = extension.split('-');
-    const ext_prefix = await utils.getExtensionPrefix(ext_name);
+    const [extension_name, stability]: string[] = extension.split('-');
+    const ext_prefix = await utils.getExtensionPrefix(extension_name);
     const command_prefix = 'sudo $debconf_fix apt-get install -y php';
     let command = '';
     switch (true) {
-      // Match :extension
-      case /^:/.test(ext_name):
-        remove_script += '\nremove_extension ' + ext_name.slice(1);
-        return;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-{semver}...5.6blackfire-{semver}, 7.0blackfire-{semver}...7.4blackfire-{semver}
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-        version_extension
-      ):
-        command =
-          'bash ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire.sh') +
-          ' ' +
-          version +
-          ' ' +
-          extension;
-        break;
-      // match pre-release versions. For example - xdebug-beta
+      // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script +=
+        script +=
           '\nadd_unstable_extension ' +
-          ext_name +
+          extension_name +
           ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
-        return;
-      // match semver versions
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        add_script +=
-          '\nadd_pecl_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
+          stability +
           ' ' +
           ext_prefix;
         return;
@@ -275,7 +181,7 @@ export async function addExtensionLinux(
         break;
       // match 7.0phalcon3...7.3phalcon3 or 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        add_script +=
+        script +=
           '\nbash ' +
           path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
           ' ' +
@@ -283,39 +189,24 @@ export async function addExtensionLinux(
           ' ' +
           version;
         return;
-      // match 7.1xdebug..7.4xdebug
-      case /^7\.[1-4]xdebug$/.test(version_extension):
-        add_script +=
-          '\nupdate_extension xdebug 2.9.3' +
-          pipe +
-          '\n' +
-          (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
-        return;
-      // match pdo extensions
-      case /.*pdo[_-].*/.test(version_extension):
-        extension = extension
-          .replace('pdo_', '')
-          .replace('pdo-', '')
-          .replace('sqlite3', 'sqlite');
-        add_script += '\nadd_pdo_extension ' + extension;
-        return;
-      // match ast and uopz
-      case /^(ast|uopz)$/.test(extension):
-        command = command_prefix + '-' + extension + pipe;
-        break;
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
         command = command_prefix + version + '-' + extension + pipe;
         break;
       default:
-        command = command_prefix + version + '-' + extension + pipe;
+        command =
+          command_prefix +
+          version +
+          '-' +
+          extension.replace('pdo_', '').replace('pdo-', '') +
+          pipe;
         break;
     }
-    add_script +=
+    script +=
       '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
   });
-  return add_script + remove_script;
+  return script;
 }
 
 /**

src/install.ts

@@ -5,7 +5,6 @@ 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,17 +19,21 @@ export async function build(
   os_version: string
 ): Promise<string> {
   // taking inputs
+  const name = 'setup-php';
+  const url = 'https://setup-php.com/support';
   const extension_csv: string =
     (await utils.getInput('extensions', false)) ||
-    (await utils.getInput('extension', false));
-  const ini_values_csv: string = await utils.getInput('ini-values', false);
+    (await utils.getInput('extension', false)) ||
+    (await utils.getInput('extension-csv', false));
+  const ini_values_csv: string =
+    (await utils.getInput('ini-values', false)) ||
+    (await utils.getInput('ini-values-csv', false));
   const coverage_driver: string = await utils.getInput('coverage', false);
   const pecl: string = await utils.getInput('pecl', false);
   let tools_csv: string = await utils.getInput('tools', false);
   if (
     pecl == 'true' ||
-    /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv) ||
-    /.*-(\d+\.\d+\.\d+).*/.test(extension_csv)
+    /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv)
   ) {
     tools_csv = 'pecl, ' + tools_csv;
   }
@@ -41,12 +44,15 @@ export async function build(
   if (extension_csv) {
     script += await extensions.addExtension(extension_csv, version, os_version);
   }
-  if (ini_values_csv) {
-    script += await config.addINIValues(ini_values_csv, os_version);
-  }
   if (coverage_driver) {
     script += await coverage.addCoverage(coverage_driver, version, os_version);
   }
+  if (ini_values_csv) {
+    script += await config.addINIValues(ini_values_csv, os_version);
+  }
+
+  script += '\n' + (await utils.stepLog('Support this project', os_version));
+  script += '\n' + (await utils.addLog('$tick', name, url, os_version));
 
   return await utils.writeScript(filename, script);
 }
@@ -56,10 +62,9 @@ export async function build(
  */
 export async function run(): Promise<void> {
   try {
+    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';
-    const os_version: string = process.platform;
-
     // check the os version and run the respective script
     let script_path = '';
     switch (os_version) {
@@ -73,7 +78,6 @@ 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

@@ -1,13 +0,0 @@
-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');
-  const runner_dir: string = await utils.getInput('RUNNER_TOOL_CACHE', false);
-  await io.cp(path.join(config_path, 'phpunit.json'), runner_dir);
-  await io.cp(path.join(config_path, 'php.json'), runner_dir);
-}

src/scripts/darwin.sh

@@ -1,10 +1,10 @@
-# Function to log start of a operation.
+# Function to log start of a operation
 step_log() {
   message=$1
   printf "\n\033[90;1m==> \033[0m\033[37;1m%s\033[0m\n" "$message"
 }
 
-# Function to log result of a operation.
+# Function to log result of a operation
 add_log() {
   mark=$1
   subject=$2
@@ -16,38 +16,15 @@ add_log() {
   fi
 }
 
-# Function to read env inputs.
-read_env() {
-  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
-  [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
-  [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
-  [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
-}
-
-# Function to setup environment for self-hosted runners.
-self_hosted_setup() {
-  if [[ $(command -v brew) == "" ]]; then
-      step_log "Setup Brew"
-      curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh | bash -s >/dev/null 2>&1
-      add_log "$tick" "Brew" "Installed Homebrew"
-  fi
-}
-
-# Function to remove extensions.
+# Function to remove extensions
 remove_extension() {
   extension=$1
-  if check_extension "$extension"; then
-    sudo sed -i '' "/$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
-    (! check_extension "$extension" && add_log "$tick" ":$extension" "Removed") ||
-    add_log "$cross" ":$extension" "Could not remove $extension on PHP $semver"
-  else
-    add_log "$tick" ":$extension" "Could not find $extension on PHP $semver"
-  fi
+  sudo sed -i '' "/$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
 }
 
-# Function to test if extension is loaded.
+# Function to test if extension is loaded
 check_extension() {
   extension=$1
   if [ "$extension" != "mysql" ]; then
@@ -57,24 +34,33 @@ check_extension() {
   fi
 }
 
-# Fuction to get the PECL version.
+# Function to install PECL extensions and accept default options
+pecl_install() {
+  local extension=$1
+  yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
+}
+
+# Fuction to get the PECL version
 get_pecl_version() {
   extension=$1
-  stability=$2
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
   pecl_rest='https://pecl.php.net/rest/r/'
-  response=$(curl -q -sSL "$pecl_rest$extension"/allreleases.xml)
-  pecl_version=$(echo "$response" | grep -m 1 -Eo "(\d*\.\d*\.\d*$stability\d*)")
+  response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
+  pecl_version=$(echo "$response" | grep -m 1 -Eio "(\d*\.\d*\.\d*$stability\d*)")
   if [ ! "$pecl_version" ]; then
     pecl_version=$(echo "$response" | grep -m 1 -Eo "(\d*\.\d*\.\d*)")
   fi
   echo "$pecl_version"
 }
 
-# Function to install a specific version of PECL extension.
+# Function to install a PECL version
 add_pecl_extension() {
   extension=$1
   pecl_version=$2
   prefix=$3
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot).* ]]; then
+    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
+  fi
   if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
     echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"
   fi
@@ -82,15 +68,25 @@ add_pecl_extension() {
   if [ "$ext_version" = "$pecl_version" ]; then
     add_log "$tick" "$extension" "Enabled"
   else
-    remove_extension "$extension" >/dev/null 2>&1
+    remove_extension "$extension"
     (
-      sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
+      pecl_install "$extension-$pecl_version" >/dev/null 2>&1 &&
       check_extension "$extension" &&
       add_log "$tick" "$extension" "Installed and enabled"
     ) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"
   fi
 }
 
+# Function to install a php extension from shivammathur/extensions tap.
+add_brew_extension() {
+  extension=$1
+  if ! brew tap | grep shivammathur/extensions; then
+    brew tap --shallow shivammathur/extensions
+  fi
+  brew install "$extension@$version"
+  sudo cp "$(brew --prefix)/opt/$extension@$version/$extension.so" "$ext_dir"
+}
+
 # Function to setup extensions
 add_extension() {
   extension=$1
@@ -101,14 +97,15 @@ add_extension() {
   elif check_extension "$extension"; then
     add_log "$tick" "$extension" "Enabled"
   elif ! check_extension "$extension"; then
-    eval "$install_command" >/dev/null 2>&1 &&
-    if [[ "$version" =~ $old_versions ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
-    (check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
-    add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
+    (
+      eval "$install_command" >/dev/null 2>&1 &&
+      check_extension "$extension" &&
+      add_log "$tick" "$extension" "Installed and enabled"
+    ) || add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
   fi
 }
 
-# Function to setup pre-release extensions using PECL.
+# Function to pre-release extensions using PECL
 add_unstable_extension() {
   extension=$1
   stability=$2
@@ -117,6 +114,22 @@ add_unstable_extension() {
   add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }
 
+# Function to configure composer
+configure_composer() {
+  tool_path=$1
+  sudo ln -sf "$tool_path" "$tool_path.phar"
+  php -r "try {\$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception \$e) {exit(1);}"
+  if [ $? -eq 1 ]; then
+    add_log "$cross" "composer" "Could not download composer"
+    exit 1;
+  fi
+  composer -q global config process-timeout 0
+  echo "/Users/$USER/.composer/vendor/bin" >> "$GITHUB_PATH"
+  if [ -n "$COMPOSER_TOKEN" ]; then
+    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
+  fi
+}
+
 # Function to setup a remote tool.
 add_tool() {
   url=$1
@@ -125,33 +138,28 @@ add_tool() {
   if [ ! -e "$tool_path" ]; then
     rm -rf "$tool_path"
   fi
-
-  status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" -L "$url")
+  if [ "$tool" = "composer" ]; then
+    IFS="," read -r -a urls <<< "$url"
+    status_code=$(sudo curl -f -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[0]}") ||
+    status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[1]}")
+  else
+    status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "$url")
+  fi
   if [ "$status_code" = "200" ]; then
     sudo chmod a+x "$tool_path"
     if [ "$tool" = "composer" ]; then
-      composer -q global config process-timeout 0
-      echo "::add-path::/Users/$USER/.composer/vendor/bin"
-      if [ -n "$COMPOSER_TOKEN" ]; then
-        composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
-      fi
-      # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
-      if [[ "$version" =~ $old_versions ]]; then
-        composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
-      fi
+      configure_composer "$tool_path"
     elif [ "$tool" = "phan" ]; then
-      add_extension fileinfo "sudo pecl install -f fileinfo" extension >/dev/null 2>&1
-      add_extension ast "sudo pecl install -f ast" extension >/dev/null 2>&1
+      add_extension fileinfo "pecl_install fileinfo" extension >/dev/null 2>&1
+      add_extension ast "pecl_install ast" extension >/dev/null 2>&1
     elif [ "$tool" = "phive" ]; then
-      add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1
-      add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1
-      add_extension xml "sudo pecl install -f xml" extension >/dev/null 2>&1
+      add_extension curl "pecl_install curl" extension >/dev/null 2>&1
+      add_extension mbstring "pecl_install mbstring" extension >/dev/null 2>&1
+      add_extension xml "pecl_install xml" extension >/dev/null 2>&1
     elif [ "$tool" = "cs2pr" ]; then
       sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
-      tr -d '\r' <"$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"
+      tr -d '\r' < "$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"
       sudo chmod a+x "$tool_path"
-    elif [ "$tool" = "wp-cli" ]; then
-      sudo cp -p "$tool_path" "$tool_path_dir"/wp
     fi
     add_log "$tick" "$tool" "Added"
   else
@@ -159,7 +167,7 @@ add_tool() {
   fi
 }
 
-# Function to add a tool using composer.
+# Function to add a tool using composer
 add_composertool() {
   tool=$1
   release=$2
@@ -170,55 +178,25 @@ add_composertool() {
   ) || add_log "$cross" "$tool" "Could not setup $tool"
 }
 
-add_blackfire() {
-  sudo mkdir -p usr/local/var/run
-  brew tap blackfireio/homebrew-blackfire >/dev/null 2>&1
-  brew install blackfire-agent >/dev/null 2>&1
-  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
-    sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
-    brew services start blackfire-agent >/dev/null 2>&1
-  fi
-  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
-    sudo blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
-  fi
-  add_log "$tick" "blackfire" "Added"
-  add_log "$tick" "blackfire-agent" "Added"
-}
-
 # Function to configure PECL
 configure_pecl() {
   for tool in pear pecl; do
-    sudo "$tool" config-set php_ini "$ini_file"
-    sudo "$tool" channel-update "$tool".php.net
+    sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1
+    sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
+    sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
   done
 }
 
-# Function to handle request to add PECL.
+# Function to log PECL, it is installed along with PHP
 add_pecl() {
   add_log "$tick" "PECL" "Added"
 }
 
-# Function to fetch updated formulae.
-update_formulae() {
-  brew_dir=$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula
-  for formula in httpd pkg-config apr apr-util argon2 aspell autoconf bison curl-openssl freetds freetype gettext glib gmp icu4c jpeg krb5 libffi libpng libpq libsodium libzip oniguruma openldap openssl@1.1 re2c sqlite tidyp unixodbc webp; do
-    sudo curl -o "$brew_dir"/"$formula".rb -sSL https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/"$formula".rb &
-    to_wait+=( $! )
-  done
-  wait "${to_wait[@]}"
-}
-
-# Function to setup PHP 5.6 and newer.
+# Function to setup PHP and composer
 setup_php() {
-  action=$1
   export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-  brew tap shivammathur/homebrew-php
-  if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
-    brew unlink php@"$version"
-  else
-    if [ "$version" = "$master_version" ]; then update_formulae; fi
-    brew "$action" shivammathur/php/php@"$version"
-  fi
+  brew tap --shallow shivammathur/homebrew-php
+  brew install shivammathur/php/php@"$version"
   brew link --force --overwrite php@"$version"
 }
 
@@ -226,42 +204,26 @@ setup_php() {
 tick="✓"
 cross="✗"
 version=$1
-nodot_version=${1/./}
-master_version="8.0"
-old_versions="5.[3-5]"
+dist=$2
 tool_path_dir="/usr/local/bin"
+curl_opts=(-sL)
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
 
-read_env
-if [ "$runner" = "self-hosted" ]; then
-  if [[ "$version" =~ $old_versions ]]; then
-    add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
-    exit 1
-  else
-    self_hosted_setup >/dev/null 2>&1
-  fi
-fi
-
 # Setup PHP
 step_log "Setup PHP"
-if [[ "$version" =~ $old_versions ]]; then
-  curl -sSL https://github.com/shivammathur/php5-darwin/releases/latest/download/install.sh | bash -s "$nodot_version" >/dev/null 2>&1 &&
+if [ "$existing_version" != "$version" ]; then
+  setup_php >/dev/null 2>&1
   status="Installed"
-elif [ "$existing_version" != "$version" ]; then
-  setup_php "install" >/dev/null 2>&1
-  status="Installed"
-elif [ "$existing_version" = "$version" ] && [ "$update" = "true" ]; then
-  setup_php "upgrade" >/dev/null 2>&1
-  status="Updated to"
 else
   status="Found"
 fi
 ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 sudo chmod 777 "$ini_file" "$tool_path_dir"
-echo "date.timezone=UTC" >>"$ini_file"
+echo -e "date.timezone=UTC\nmemory_limit=-1" >>"$ini_file"
 ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
 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 ' ')
-if [[ ! "$version" =~ $old_versions ]]; then configure_pecl >/dev/null 2>&1; fi
+configure_pecl
+sudo mv "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/ext/blackfire.ps1

@@ -1,35 +0,0 @@
-Param (
-    [Parameter(Position = 0, Mandatory = $true)]
-    [ValidateNotNull()]
-    [string]
-    $version,
-    [Parameter(Position = 1, Mandatory = $true)]
-    [ValidateNotNull()]
-    [string]
-    $extension
-)
-
-$tick = ([char]8730)
-$php_dir = 'C:\tools\php'
-if($env:RUNNER -eq 'self-hosted') { $php_dir = "$php_dir$version" }
-$ext_dir = "$php_dir\ext"
-$arch='x64'
-if ($version -lt '7.0') { $arch='x86' }
-$version = $version.replace('.', '')
-$extension_version = $extension.split('-')[1]
-if ($extension_version -notmatch "\S") {
-    $ext_data = Invoke-WebRequest https://blackfire.io/docs/up-and-running/update | ForEach-Object { $_.tostring() -split "[`r`n]" | Select-String '<td class="version">' | Select-Object -Index 2 }
-    $extension_version = [regex]::Matches($ext_data, '<td.*?>(.+)</td>') | ForEach-Object { $_.Captures[0].Groups[1].value }
-}
-if (Test-Path $ext_dir\blackfire.dll) {
-    Enable-PhpExtension -Extension blackfire -Path $php_dir
-    $status="Enabled"
-} else {
-    $installed = Get-Php -Path $php_dir
-    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-    Invoke-WebRequest -UseBasicParsing -Uri "https://packages.blackfire.io/binaries/blackfire-php/${extension_version}/blackfire-php-windows_${arch}-php-${version}${nts}.dll" -OutFile $ext_dir\blackfire.dll > $null 2>&1
-    Enable-PhpExtension -Extension blackfire -Path $php_dir
-    $status="Installed and enabled"
-}
-printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick "blackfire" "$status"
-

src/scripts/ext/blackfire.sh

@@ -1,11 +0,0 @@
-version=${1/./}
-extension=${2}
-extension_version=$(echo "$extension" | cut -d '-' -f 2)
-if [ "$extension_version" = "blackfire" ]; then
-  extension_version=$(curl -sSL https://blackfire.io/docs/up-and-running/update | grep 'class="version"' | sed -e 's/<[^>]*>\| //g' | sed -n '3,3p')
-fi
-ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
-scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-ini_file="$scan_dir/50-blackfire.ini"
-sudo curl -o $ext_dir/blackfire.so -SL https://packages.blackfire.io/binaries/blackfire-php/$extension_version/blackfire-php-linux_amd64-php-$version.so
-echo "extension=blackfire.so" | sudo tee -a "$ini_file"

src/scripts/ext/blackfire_darwin.sh

@@ -1,11 +0,0 @@
-version=${1/./}
-extension=${2}
-extension_version=$(echo "$extension" | cut -d '-' -f 2)
-if [ "$extension_version" = "blackfire" ]; then
-  extension_version=$(curl -sSL https://blackfire.io/docs/up-and-running/update | grep 'class="version"' | sed -e "s/ //g" | sed -n '3,3p' | cut -d '>' -f 2 | cut -d '<' -f 1)
-fi
-ext_dir=$(php -i | grep -Ei "extension_dir => /usr" | sed -e "s|.*=> s*||")
-scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-ini_file="$scan_dir/50-blackfire.ini"
-sudo curl -o $ext_dir/blackfire.so -SL https://packages.blackfire.io/binaries/blackfire-php/$extension_version/blackfire-php-darwin_amd64-php-$version.so
-echo "extension=blackfire.so" | sudo tee -a "$ini_file"

src/scripts/ext/pcov.sh

@@ -1,5 +0,0 @@
-cd ~ && git clone --depth=1 https://github.com/krakjoe/pcov.git
-cd pcov && phpize
-./configure --enable-pcov
-make
-sudo make install

src/scripts/ext/phalcon.ps1

@@ -31,8 +31,7 @@ Function Install-Phalcon() {
 $tick = ([char]8730)
 $domain = 'https://github.com'
 $php_dir = 'C:\tools\php'
-if($env:RUNNER -eq 'self-hosted') { $php_dir = "$php_dir$version" }
-$ext_dir = "$php_dir\ext"
+$ext_dir = $php_dir + '\ext'
 $extension_version = $extension.substring($extension.Length - 1)
 
 if($extension_version -eq '4') {

src/scripts/ext/phalcon.sh

@@ -68,4 +68,4 @@ if [ "$extension_major_version" = "3" ]; then
   else
     install_phalcon "$1" "$2"
   fi
-fi
+fi

src/scripts/ext/phalcon_darwin.sh

@@ -44,4 +44,4 @@ if [ -e "$ext_dir/psr.so" ] && [ -e "$ext_dir/phalcon.so" ]; then
   fi
 else
   install_phalcon
-fi
+fi

src/scripts/linux.sh

@@ -1,10 +1,10 @@
-# Function to log start of a operation.
+# Function to log start of a operation
 step_log() {
   message=$1
   printf "\n\033[90;1m==> \033[0m\033[37;1m%s\033[0m\n" "$message"
 }
 
-# Function to log result of a operation.
+# Function to log result of a operation
 add_log() {
   mark=$1
   subject=$2
@@ -16,63 +16,56 @@ add_log() {
   fi
 }
 
-# Function to read env inputs.
-read_env() {
-  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
-  [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
-  [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
-  [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
+# Function to backup and cleanup package lists
+cleanup_lists() {
+  if [ ! -e /etc/apt/sources.list.d.save ]; then
+    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
+  fi
 }
 
-# Function to update the package lists.
+# Function to update php ppa
 update_lists() {
   if [ "$lists_updated" = "false" ]; then
+    cleanup_lists >/dev/null 2>&1
     sudo "$debconf_fix" apt-get update >/dev/null 2>&1
-    lists_updated="true"
   fi
 }
 
-# Function to setup environment for self-hosted runners.
-self_hosted_setup() {
-  echo "Set disable_coredump false" | sudo tee -a /etc/sudo.conf
-  if ! command -v apt-fast >/dev/null; then
-    sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
-  fi
-  update_lists && $apt_install curl make lsb-release software-properties-common unzip
-  if ! apt-cache policy | grep -q ondrej/php; then
-    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
-    if [ "$(lsb_release -r -s)" = "16.04" ]; then
-      sudo "$debconf_fix" apt-get update
-    fi
-  fi
-}
-
-# Function to configure PECL.
+# Function to configure PECL
 configure_pecl() {
   if [ "$pecl_config" = "false" ] && [ -e /usr/bin/pecl ]; then
-
     for tool in pear pecl; do
-      sudo "$tool" config-set php_ini "$scan_dir"/99-pecl.ini
-      sudo "$tool" channel-update "$tool".php.net
+      sudo "$tool" config-set php_ini "$pecl_file" >/dev/null 2>&1
+      sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
+      sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
     done
     pecl_config="true"
   fi
 }
 
-# Fuction to get the PECL version of an extension.
+# Fuction to get the PECL version
 get_pecl_version() {
   extension=$1
-  stability=$2
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
   pecl_rest='https://pecl.php.net/rest/r/'
-  response=$(curl -q -sSL "$pecl_rest$extension"/allreleases.xml)
-  pecl_version=$(echo "$response" | grep -m 1 -Po "(\d*\.\d*\.\d*$stability\d*)")
+  response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
+  pecl_version=$(echo "$response" | grep -m 1 -Pio "(\d*\.\d*\.\d*$stability\d*)")
   if [ ! "$pecl_version" ]; then
     pecl_version=$(echo "$response" | grep -m 1 -Po "(\d*\.\d*\.\d*)")
   fi
   echo "$pecl_version"
 }
 
-# Function to check if an extension is loaded.
+# Function to install PECL extensions and accept default options
+pecl_install() {
+  local extension=$1
+  yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
+}
+
+# Function to test if extension is loaded
 check_extension() {
   extension=$1
   if [ "$extension" != "mysql" ]; then
@@ -82,7 +75,7 @@ check_extension() {
   fi
 }
 
-# Function to delete extensions.
+# Function to delete extensions
 delete_extension() {
   extension=$1
   sudo sed -i "/$extension/d" "$ini_file"
@@ -91,61 +84,25 @@ delete_extension() {
   sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
 }
 
-# Function to disable and delete extensions.
+# Function to disable and delete extensions
 remove_extension() {
   extension=$1
-  if check_extension "$extension"; then
-    if [[ ! "$version" =~ $old_versions ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
-      sudo phpdismod -v "$version" "$extension" >/dev/null 2>&1
-    fi
-    delete_extension "$extension"
-    (! check_extension "$extension" && add_log "$tick" ":$extension" "Removed") ||
-    add_log "$cross" ":$extension" "Could not remove $extension on PHP $semver"
-  else
-    add_log "$tick" ":$extension" "Could not find $extension on PHP $semver"
+  if [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
+    sudo phpdismod -v "$version" "$extension"
   fi
+  delete_extension "$extension"
 }
 
-# Function to enable existing extensions.
-enable_extension() {
-  if ! check_extension "$1" && [ -e "$ext_dir/$1.so" ]; then
-    echo "$2=$1.so" >>"$pecl_file"
-  fi
-}
-
-# Funcion to add PDO extension.
-add_pdo_extension() {
-  pdo_ext="pdo_$1"
-  if check_extension "$pdo_ext"; then
-    add_log "$tick" "$pdo_ext" "Enabled"
-  else
-    read -r ext ext_name <<< "$1 $1"
-    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1 && echo "extension=pdo.so" >> "$ini_file"
-    if [ "$ext" = "mysql" ]; then
-      enable_extension "mysqlnd" "extension"
-      ext_name="mysqli"
-    elif [ "$ext" = "sqlite" ]; then
-      read -r ext ext_name <<< "sqlite3 sqlite3"
-    fi
-    add_extension "$ext_name" "$apt_install php$version-$ext" "extension" >/dev/null 2>&1
-    enable_extension "$pdo_ext" "extension"
-    (check_extension "$pdo_ext" && add_log "$tick" "$pdo_ext" "Enabled") ||
-    add_log "$cross" "$pdo_ext" "Could not install $pdo_ext on PHP $semver"
-  fi
-}
-
-# Function to add extensions.
+# Function to setup extensions
 add_extension() {
   extension=$1
   install_command=$2
   prefix=$3
-  enable_extension "$extension" "$prefix"
-  if check_extension "$extension"; then
+  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
+    echo "$prefix=$extension.so" >>"$ini_file" && add_log "$tick" "$extension" "Enabled"
+  elif check_extension "$extension"; then
     add_log "$tick" "$extension" "Enabled"
-  else
-    if [[ "$version" =~ 5.[4-5] ]]; then
-      install_command="update_lists && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
-    fi
+  elif ! check_extension "$extension"; then
     eval "$install_command" >/dev/null 2>&1 ||
     (update_lists && eval "$install_command" >/dev/null 2>&1) ||
     sudo pecl install -f "$extension" >/dev/null 2>&1
@@ -155,11 +112,14 @@ add_extension() {
   sudo chmod 777 "$ini_file"
 }
 
-# Function to install a PECL version.
+# Function to install a PECL version
 add_pecl_extension() {
   extension=$1
   pecl_version=$2
   prefix=$3
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot).* ]]; then
+    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
+  fi
   if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
     echo "$prefix=$ext_dir/$extension.so" >>"$pecl_file"
   fi
@@ -176,7 +136,7 @@ add_pecl_extension() {
   fi
 }
 
-# Function to pre-release extensions using PECL.
+# Function to pre-release extensions using PECL
 add_unstable_extension() {
   extension=$1
   stability=$2
@@ -185,18 +145,19 @@ add_unstable_extension() {
   add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }
 
-# Function to update extension.
-update_extension() {
-  extension=$1
-  latest_version=$2
-  current_version=$(php -r "echo phpversion('$extension');")
-  final_version=$(printf "%s\n%s" "$current_version" "$latest_version" | sort | tail -n 1)
-  if [ "$final_version" != "$current_version"  ]; then
-    version_exists=$(apt-cache policy -- *"$extension" | grep "$final_version")
-    if [ -z "$version_exists" ]; then
-      update_lists
-    fi
-    $apt_install php"$version"-"$extension"
+# Function to configure composer
+configure_composer() {
+  tool_path=$1
+  sudo ln -sf "$tool_path" "$tool_path.phar"
+  php -r "try {\$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception \$e) {exit(1);}"
+  if [ $? -eq 1 ]; then
+    add_log "$cross" "composer" "Could not download composer"
+    exit 1;
+  fi
+  composer -q global config process-timeout 0
+  echo "/home/$USER/.composer/vendor/bin" >> "$GITHUB_PATH"
+  if [ -n "$COMPOSER_TOKEN" ]; then
+    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
   fi
 }
 
@@ -208,38 +169,32 @@ add_tool() {
   if [ ! -e "$tool_path" ]; then
     rm -rf "$tool_path"
   fi
-  status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" -L "$url")
+  if [ "$tool" = "composer" ]; then
+    IFS="," read -r -a urls <<< "$url"
+    status_code=$(sudo curl -f -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[0]}") ||
+    status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[1]}")
+  else
+    status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "$url")
+  fi
   if [ "$status_code" = "200" ]; then
     sudo chmod a+x "$tool_path"
     if [ "$tool" = "composer" ]; then
-      composer -q global config process-timeout 0
-      echo "::add-path::/home/$USER/.composer/vendor/bin"
-      if [ -n "$COMPOSER_TOKEN" ]; then
-        composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
-      fi
-      # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
-      if [[ "$version" =~ $old_versions ]]; then
-        composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
-      fi
+      configure_composer "$tool_path"
     elif [ "$tool" = "cs2pr" ]; then
       sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
-    elif [ "$tool" = "phan" ]; then
-      add_extension fileinfo "$apt_install php$version-fileinfo" extension >/dev/null 2>&1
-      add_extension ast "$apt_install php-ast" extension >/dev/null 2>&1
     elif [ "$tool" = "phive" ]; then
       add_extension curl "$apt_install php$version-curl" extension >/dev/null 2>&1
       add_extension mbstring "$apt_install php$version-mbstring" extension >/dev/null 2>&1
       add_extension xml "$apt_install php$version-xml" extension >/dev/null 2>&1
-    elif [ "$tool" = "wp-cli" ]; then
-      sudo cp -p "$tool_path" "$tool_path_dir"/wp
     fi
     add_log "$tick" "$tool" "Added"
   else
     add_log "$cross" "$tool" "Could not setup $tool"
+    [ "$tool" = "composer" ] && exit 1
   fi
 }
 
-# Function to setup a tool using composer.
+# Function to setup a tool using composer
 add_composertool() {
   tool=$1
   release=$2
@@ -250,57 +205,32 @@ add_composertool() {
   ) || add_log "$cross" "$tool" "Could not setup $tool"
 }
 
-# Function to setup phpize and php-config.
+# Function to setup phpize and php-config
 add_devtools() {
   if ! [ -e "/usr/bin/phpize$version" ] || ! [ -e "/usr/bin/php-config$version" ]; then
     update_lists && $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
   fi
   sudo update-alternatives --set php-config /usr/bin/php-config"$version" >/dev/null 2>&1
   sudo update-alternatives --set phpize /usr/bin/phpize"$version" >/dev/null 2>&1
-  configure_pecl >/dev/null 2>&1
-}
-
-# Function to add blackfire and blackfire-agent.
-add_blackfire() {
-  sudo mkdir -p /var/run/blackfire
-  sudo curl -sSL https://packages.blackfire.io/gpg.key | sudo apt-key add - >/dev/null 2>&1
-  echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list >/dev/null 2>&1
-  sudo "$debconf_fix" apt-get update >/dev/null 2>&1
-  $apt_install blackfire-agent >/dev/null 2>&1
-  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
-    sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
-    sudo /etc/init.d/blackfire-agent restart >/dev/null 2>&1
-  fi
-  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
-    sudo blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
-  fi
-  add_log "$tick" "blackfire" "Added"
-  add_log "$tick" "blackfire-agent" "Added"
-}
-
-# Function to setup the nightly build from master branch.
-setup_master() {
-  curl -sSL "$github"/php-builder/releases/latest/download/install.sh | bash -s "$runner"
-}
-
-# Function to setup PHP 5.3, PHP 5.4 and PHP 5.5.
-setup_old_versions() {
-  curl -sSL "$github"/php5-ubuntu/releases/latest/download/install.sh | bash -s "$version"
   configure_pecl
-  release_version=$(php -v | head -n 1 | cut -d' ' -f 2)
 }
 
-# Function to add PECL.
+# Function to setup the nightly build from master branch
+setup_master() {
+  curl "${curl_opts[@]}" https://github.com/shivammathur/php-builder/releases/latest/download/install.sh | bash -s "github"
+}
+
+# Function to setup PECL
 add_pecl() {
-  add_devtools >/dev/null 2>&1
+  add_devtools
   if [ ! -e /usr/bin/pecl ]; then
     $apt_install php-pear >/dev/null 2>&1
   fi
-  configure_pecl >/dev/null 2>&1
+  configure_pecl
   add_log "$tick" "PECL" "Added"
 }
 
-# Function to switch versions of PHP binaries.
+# Function to switch versions of PHP binaries
 switch_version() {
   for tool in pear pecl php phar phar.phar php-cgi php-config phpize phpdbg; do
     if [ -e "/usr/bin/$tool$version" ]; then
@@ -309,102 +239,65 @@ switch_version() {
   done
 }
 
-# Function to get PHP version in semver format.
+# Function to get PHP version in semver format
 php_semver() {
-  if [ ! "$version" = "$master_version" ]; then
+  if [ ! "$version" = "8.0" ]; then
     php"$version" -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-'
   else
     php -v | head -n 1 | cut -f 2 -d ' '
   fi
 }
 
-# Function to install packaged PHP
-add_packaged_php() {
-  update_lists
-  IFS=' ' read -r -a packages <<< "$(echo "curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
-  $apt_install php"$version" "${packages[@]}"
-}
-
-# Function to update PHP.
-update_php() {
-  initial_version=$(php_semver)
-  add_packaged_php
-  updated_version=$(php_semver)
-  if [ "$updated_version" != "$initial_version" ]; then
-    status="Updated to"
-  else
-    status="Switched to"
-  fi
-}
-
-# Function to install PHP.
-add_php() {
-  if [ "$version" = "$master_version" ]; then
-    setup_master
-  elif [[ "$version" =~ $old_versions ]]; then
-    setup_old_versions
-  else
-    add_packaged_php
-  fi
-  status="Installed"
-}
-
 # Variables
 tick="✓"
 cross="✗"
 lists_updated="false"
 pecl_config="false"
 version=$1
-master_version="8.0"
-old_versions="5.[3-5]"
+dist=$2
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
-github="https://github.com/shivammathur"
 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)
 
-read_env
-if [ "$runner" = "self-hosted" ]; then
-  if [[ "$version" =~ $old_versions ]]; then
-    add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
-    exit 1
-  else
-    self_hosted_setup >/dev/null 2>&1
-  fi
-fi
-
 # Setup PHP
 step_log "Setup PHP"
 sudo mkdir -p /var/run /run/php
-if [ "$existing_version" != "$version" ]; then
-  if [ ! -e "/usr/bin/php$version" ]; then
-    add_php >/dev/null 2>&1
-  else
-    if [ "$update" = "true" ]; then
-      update_php >/dev/null 2>&1
-    else
-      status="Switched to"
-    fi
-  fi
-  if ! [[ "$version" =~ $old_versions ]]; then
-    switch_version >/dev/null 2>&1
-  fi
-else
-  if [ "$update" = "true" ]; then
-    update_php >/dev/null 2>&1
-  else
-    status="Found"
-    if [ "$version" = "$master_version" ]; then
-      switch_version >/dev/null 2>&1
-    fi
+. /etc/lsb-release
+if [ "$DISTRIB_RELEASE" = "20.04" ]; then
+  if ! apt-cache policy | grep -q ondrej/php; then
+    cleanup_lists >/dev/null 2>&1
+    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y >/dev/null 2>&1
   fi
 fi
 
+if [ "$existing_version" != "$version" ]; then
+  if [ ! -e "/usr/bin/php$version" ]; then
+    if [ "$version" = "8.0" ]; then
+      setup_master >/dev/null 2>&1
+    else
+      update_lists
+      IFS=' ' read -r -a packages <<< "$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
+      $apt_install "${packages[@]}" >/dev/null 2>&1
+    fi
+    status="Installed"
+  else
+    status="Switched to"
+  fi
+
+  switch_version >/dev/null 2>&1
+else
+  status="Found"
+fi
+
 semver=$(php_semver)
-ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
 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/"
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/win32.ps1

@@ -8,21 +8,18 @@ param (
   [ValidateNotNull()]
   [ValidateLength(1, [int]::MaxValue)]
   [string]
-  $dir
+  $dist
 )
 
-# Function to log start of a operation.
 Function Step-Log($message) {
   printf "\n\033[90;1m==> \033[0m\033[37;1m%s \033[0m\n" $message
 }
 
-# Function to log result of a operation.
 Function Add-Log($mark, $subject, $message) {
   $code = if ($mark -eq $cross) { "31" } else { "32" }
   printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $code $mark $subject $message
 }
 
-# Function to add a line to a powershell profile safely.
 Function Add-ToProfile {
   param(
     [Parameter(Position = 0, Mandatory = $true)]
@@ -46,48 +43,31 @@ Function Add-ToProfile {
   }
 }
 
-# Function to fetch PATH from the registry.
-Function Get-PathFromRegistry {
-  $env:Path = [System.Environment]::GetEnvironmentVariable("Path","User") + ";" +
-          [System.Environment]::GetEnvironmentVariable("Path","Machine")
-  Add-ToProfile $current_profile 'Get-PathFromRegistry' 'Function Get-PathFromRegistry { $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "User") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "Machine") }; Get-PathFromRegistry'
-}
-
-# Function to add a location to PATH.
-Function Add-Path {
-  param(
-    [string]$PathItem
-  )
-  $newPath = (Get-ItemProperty -Path 'hkcu:\Environment' -Name PATH).Path.replace("$PathItem;", '')
-  $newPath = $PathItem + ';' + $newPath
-  Set-ItemProperty -Path 'hkcu:\Environment' -Name Path -Value $newPath
-  Get-PathFromRegistry
-}
-
-# Function to get a clean Powershell profile.
-Function Get-CleanPSProfile {
-  if(-not(Test-Path -LiteralPath $profile)) {
-    New-Item -Path $profile -ItemType "file" -Force
+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
+    } else {
+      Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/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"
   }
-  Set-Content $current_profile -Value ''
-  Add-ToProfile $profile $current_profile.replace('\', '\\') ". $current_profile"
 }
 
-# Function to install PhpManager.
 Function Install-PhpManager() {
-  $repo = "mlocati/powershell-phpmanager"
-  $tag = (Invoke-RestMethod https://api.github.com/repos/$repo/tags)[0].Name
-  $module_path = "$bin_dir\PhpManager\powershell-phpmanager-$tag\PhpManager"
-  if(-not (Test-Path $module_path\PhpManager.psm1 -PathType Leaf)) {
-    $zip_file = "$bin_dir\PhpManager.zip"
-    Invoke-WebRequest -UseBasicParsing -Uri https://github.com/$repo/archive/$tag.zip -OutFile $zip_file
-    Expand-Archive -Path $zip_file -DestinationPath $bin_dir\PhpManager -Force
+  $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
+    Expand-Archive -Path $zip_file -DestinationPath $php_dir -Force
   }
   Import-Module $module_path
   Add-ToProfile $current_profile 'powershell-phpmanager' "Import-Module $module_path"
 }
 
-# Function to add PHP extensions.
 Function Add-Extension {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -99,7 +79,7 @@ Function Add-Extension {
     [ValidateNotNull()]
     [ValidateSet('stable', 'beta', 'alpha', 'devel', 'snapshot')]
     [string]
-    $mininum_stability = 'stable',
+    $stability = 'stable',
     [Parameter(Position = 2, Mandatory = $false)]
     [ValidateNotNull()]
     [ValidatePattern('^\d+(\.\d+){0,2}$')]
@@ -124,9 +104,9 @@ Function Add-Extension {
     }
     else {
       if($extension_version -ne '') {
-        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $mininum_stability -Path $php_dir
+        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $stability -MaximumStability $stability -Path $php_dir
       } else {
-        Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Path $php_dir
+        Install-PhpExtension -Extension $extension -MinimumStability $stability -MaximumStability $stability -Path $php_dir
       }
 
       Add-Log $tick $extension "Installed and enabled"
@@ -137,7 +117,6 @@ Function Add-Extension {
   }
 }
 
-# Function to remove PHP extensions.
 Function Remove-Extension() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -147,27 +126,39 @@ Function Remove-Extension() {
     $extension
   )
   if(php -m | findstr -i $extension) {
-    try {
-      Disable-PhpExtension $extension $php_dir
-      if (Test-Path $ext_dir\php_$extension.dll) {
-        Remove-Item $ext_dir\php_$extension.dll
-      }
-      Add-Log $tick ":$extension" "Removed"
-    } catch {
-      Add-Log $cross ":$extension" "Could not remove $extension on PHP $($installed.FullVersion)"
-    }
-  } else {
-    Add-Log $tick ":$extension" "Could not find $extension on PHP $($installed.FullVersion)"
+    Disable-PhpExtension $extension $php_dir
+  }
+  if (Test-Path $ext_dir\php_$extension.dll) {
+    Remove-Item $ext_dir\php_$extension.dll
   }
 }
 
-# Function to add tools.
-Function Add-Tool() {
-  Param (
+
+Function Edit-ComposerConfig() {
+  Param(
     [Parameter(Position = 0, Mandatory = $true)]
     [ValidateNotNull()]
     [ValidateLength(1, [int]::MaxValue)]
     [string]
+    $tool_path
+  )
+  Copy-Item $tool_path -Destination "$tool_path.phar"
+  php -r "try {`$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception `$e) {exit(1);}"
+  if ($? -eq $False) {
+    Add-Log "$cross" "composer" "Could not download composer"
+    exit 1;
+  }
+  composer -q global config process-timeout 0
+  Write-Output "$env:APPDATA\Composer\vendor\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
+  if (Test-Path env:COMPOSER_TOKEN) {
+    composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
+  }
+}
+
+Function Add-Tool() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
     $url,
     [Parameter(Position = 1, Mandatory = $true)]
     [ValidateNotNull()]
@@ -175,52 +166,44 @@ Function Add-Tool() {
     [string]
     $tool
   )
-  if (Test-Path $bin_dir\$tool) {
-    Remove-Item $bin_dir\$tool
+  if (Test-Path $php_dir\$tool) {
+    Remove-Item $php_dir\$tool
   }
+  if($url.Count -gt 1) { $url = $url[0] }
   if ($tool -eq "symfony") {
-    Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\$tool.exe
-    Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.exe" >$null 2>&1
+    Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool.exe
+    Add-ToProfile $current_profile $tool "New-Alias $tool $php_dir\$tool.exe" > $null 2>&1
   } else {
     try {
-      Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\$tool
+      Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool
       $bat_content = @()
       $bat_content += "@ECHO off"
       $bat_content += "setlocal DISABLEDELAYEDEXPANSION"
       $bat_content += "SET BIN_TARGET=%~dp0/" + $tool
       $bat_content += "php %BIN_TARGET% %*"
-      Set-Content -Path $bin_dir\$tool.bat -Value $bat_content
-      Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.bat" >$null 2>&1
+      Set-Content -Path $php_dir\$tool.bat -Value $bat_content
+      Add-ToProfile $current_profile $tool "New-Alias $tool $php_dir\$tool.bat" > $null 2>&1
     } catch { }
   }
-  if($tool -eq "phan") {
-    Add-Extension fileinfo >$null 2>&1
-    Add-Extension ast >$null 2>&1
-  } elseif($tool -eq "phive") {
+  if($tool -eq "phive") {
+    Add-Extension curl >$null 2>&1
+    Add-Extension mbstring >$null 2>&1
     Add-Extension xml >$null 2>&1
   } elseif($tool -eq "cs2pr") {
-    (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
+    (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
   } elseif($tool -eq "composer") {
-    composer -q global config process-timeout 0
-    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
-    }
-    # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
-    if ($version -lt 5.6) {
-      composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
-    }
+    Edit-ComposerConfig $php_dir\$tool
   } elseif($tool -eq "wp-cli") {
-    Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
+    Copy-Item $php_dir\wp-cli.bat -Destination $php_dir\wp.bat
   }
-  if (((Get-ChildItem -Path $bin_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
+
+  if (((Get-ChildItem -Path $php_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
     Add-Log $tick $tool "Added"
   } else {
     Add-Log $cross $tool "Could not add $tool"
   }
 }
 
-# Function to setup a tool using composer.
 Function Add-Composertool() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -247,82 +230,28 @@ Function Add-Composertool() {
   }
 }
 
-# Function to handle request to add PECL.
 Function Add-Pecl() {
   Add-Log $tick "PECL" "Use extensions input to setup PECL extensions on windows"
 }
 
-# Function to add blackfire and blackfire-agent.
-Function Add-Blackfire() {
-  $agent_data = Invoke-WebRequest https://blackfire.io/docs/up-and-running/update | ForEach-Object { $_.tostring() -split "[`r`n]" | Select-String '<td class="version">' | Select-Object -Index 0 }
-  $agent_version = [regex]::Matches($agent_data, '<td.*?>(.+)</td>') | ForEach-Object {$_.Captures[0].Groups[1].value }
-  $url = "https://packages.blackfire.io/binaries/blackfire-agent/${agent_version}/blackfire-agent-windows_${arch_name}.zip"
-  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\blackfire.zip >$null 2>&1
-  Expand-Archive -Path $bin_dir\blackfire.zip -DestinationPath $bin_dir -Force >$null 2>&1
-  Add-ToProfile $current_profile 'blackfire' "New-Alias blackfire $bin_dir\blackfire.exe"
-  Add-ToProfile $current_profile 'blackfire-agent' "New-Alias blackfire-agent $bin_dir\blackfire-agent.exe"
-  if ((Test-Path env:BLACKFIRE_SERVER_ID) -and (Test-Path env:BLACKFIRE_SERVER_TOKEN)) {
-    blackfire-agent --register --server-id=$env:BLACKFIRE_SERVER_ID --server-token=$env:BLACKFIRE_SERVER_TOKEN >$null 2>&1
-  }
-  if ((Test-Path env:BLACKFIRE_CLIENT_ID) -and (Test-Path env:BLACKFIRE_CLIENT_TOKEN)) {
-    blackfire config --client-id=$env:BLACKFIRE_CLIENT_ID --client-token=$env:BLACKFIRE_CLIENT_TOKEN --ca-cert=$php_dir\ssl\cacert.pem >$null 2>&1
-  }
-  Add-Log $tick "blackfire" "Added"
-  Add-Log $tick "blackfire-agent" "Added"
-}
-
 # Variables
 $tick = ([char]8730)
 $cross = ([char]10007)
 $php_dir = 'C:\tools\php'
 $ext_dir = "$php_dir\ext"
-$bin_dir = $php_dir
-$current_profile = "$env:TEMP\setup-php.ps1"
+$current_profile = "$PSHOME\Profile.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $master_version = '8.0'
-$cert_source='CurrentUser'
-
 $arch = 'x64'
-$arch_name ='amd64'
-if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
-  $arch = 'x86'
-  $arch_name = '386'
-}
-
 $ts = $env:PHPTS -eq 'ts'
 if($env:PHPTS -ne 'ts') {
   $env:PHPTS = 'nts'
 }
-
-if($env:RUNNER -eq 'self-hosted') {
-  $bin_dir = 'C:\tools\bin'
-  $php_dir = "$php_dir$version"
-  $ext_dir = "$php_dir\ext"
-  $cert_source='Curl'
-  Get-CleanPSProfile >$null 2>&1
-  New-Item $bin_dir -Type Directory 2>&1 | Out-Null
-  Add-Path -PathItem $bin_dir
-  if(-not(Test-Path $bin_dir\printf.exe)) {
-    Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/printf/releases/latest/download/printf-$arch.zip" -OutFile "$bin_dir\printf.zip" >$null 2>&1
-    Expand-Archive -Path $bin_dir\printf.zip -DestinationPath $bin_dir -Force >$null 2>&1
-  }
-  if($version -lt 5.6) {
-    Add-Log $cross "PHP" "PHP $version is not supported on self-hosted runner"
-    Start-Sleep 1
-    exit 1
-  }
-  if ((Get-InstalledModule).Name -notcontains 'VcRedist') {
-    Install-Module -Name VcRedist -Force
-  }
-  New-Item $php_dir -Type Directory 2>&1 | Out-Null
-  Add-Path -PathItem $php_dir
-  setx PHPROOT $php_dir >$null 2>&1
-} else {
-  $current_profile = "$PSHOME\Profile.ps1"
-  if(-not(Test-Path -LiteralPath $current_profile)) {
-    New-Item -Path $current_profile -ItemType "file" -Force >$null 2>&1
-  }
+if(-not(Test-Path -LiteralPath $current_profile)) {
+  New-Item -Path $current_profile -ItemType "file" -Force >$null 2>&1
 }
+
+Add-Printf >$null 2>&1
 Step-Log "Setup PhpManager"
 Install-PhpManager >$null 2>&1
 Add-Log $tick "PhpManager" "Installed"
@@ -336,34 +265,25 @@ if (Test-Path -LiteralPath $php_dir -PathType Container) {
 }
 $status = "Installed"
 if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version -replace '^(\d+(\.\d+)*).*', '$1.'))) -or $ts -ne $installed.ThreadSafe) {
-  if ($version -lt '7.0' -and (Get-InstalledModule).Name -notcontains 'VcRedist') {
+  if ($version -lt '7.0') {
     Install-Module -Name VcRedist -Force
+    $arch='x86'
   }
   if ($version -eq $master_version) {
     $version = 'master'
-  }
-
-  Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force >$null 2>&1
-} else {
-  if($env:update -eq 'true') {
-    Update-Php $php_dir >$null 2>&1
-    $status = "Updated to"
+    Invoke-WebRequest -UseBasicParsing -Uri https://dl.bintray.com/shivammathur/php/Install-PhpMaster.ps1 -OutFile $php_dir\Install-PhpMaster.ps1 > $null 2>&1
+    & $php_dir\Install-PhpMaster.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir
   } else {
-    $status = "Found"
+    Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
   }
+} else {
+  $status = "Found"
 }
 
 $installed = Get-Php -Path $php_dir
 Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
-if($version -lt "5.5") {
-  Enable-PhpExtension -Extension openssl, curl, mbstring -Path $php_dir
-} else {
-  Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
-}
-Update-PhpCAInfo -Path $php_dir -Source $cert_source
-if ($version -eq 'master') {
-  Copy-Item $dir"\..\src\bin\php_$env:PHPTS`_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
-  Set-PhpIniKey -Key 'opcache.jit_buffer_size' -Value '256M' -Path $php_dir
-  Set-PhpIniKey -Key 'opcache.jit' -Value '1235' -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
 Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)"

src/tools.ts

@@ -275,27 +275,6 @@ export async function getSymfonyUri(
   }
 }
 
-/**
- * Function to get the WP-CLI url
- *
- * @param version
- */
-export async function getWpCliUrl(version: string): Promise<string> {
-  switch (version) {
-    case 'latest':
-      return 'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true';
-    default:
-      return await getUri(
-        'wp-cli',
-        '-' + version + '.phar',
-        version,
-        'wp-cli/wp-cli/releases',
-        'v',
-        'download'
-      );
-  }
-}
-
 /**
  * Function to add/move composer in the tools list
  *
@@ -319,27 +298,26 @@ export async function addComposer(tools_list: string[]): Promise<string[]> {
 }
 
 /**
- * Function to get script to update composer
+ * Function to get composer URL for a given version
  *
  * @param version
- * @param os_version
  */
-export async function updateComposer(
-  version: string,
-  os_version: string
-): Promise<string> {
+export async function getComposerUrl(version: string): Promise<string> {
+  const cache_url =
+    'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-' +
+    version.replace('latest', 'stable') +
+    '.phar,';
   switch (version) {
     case 'snapshot':
+      return cache_url + 'https://getcomposer.org/composer.phar';
     case 'preview':
     case '1':
     case '2':
       return (
-        '\ncomposer self-update --' +
-        version +
-        (await utils.suppressOutput(os_version))
+        cache_url + 'https://getcomposer.org/composer-' + version + '.phar'
       );
     default:
-      return '';
+      return cache_url + 'https://getcomposer.org/composer-stable.phar';
   }
 }
 
@@ -357,10 +335,7 @@ export async function getCleanedToolsList(
     .map(function (extension: string) {
       return extension
         .trim()
-        .replace(
-          /symfony\/|laravel\/|robmorgan\/|hirak\/|narrowspark\/automatic-/,
-          ''
-        );
+        .replace(/robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
     })
     .filter(Boolean);
   return [...new Set(tools_list)];
@@ -370,13 +345,11 @@ export async function getCleanedToolsList(
  * Helper function to get script to setup a tool using a phar url
  *
  * @param tool
- * @param version
  * @param url
  * @param os_version
  */
 export async function addArchive(
   tool: string,
-  version: string,
   url: string,
   os_version: string
 ): Promise<string> {
@@ -466,75 +439,54 @@ export async function addTools(
     script += '\n';
     let url = '';
     switch (tool) {
-      case 'blackfire':
-      case 'blackfire-agent':
-        script += await getCommand(os_version, 'blackfire');
-        break;
-      case 'blackfire-player':
-        url = await getPharUrl('https://get.blackfire.io', tool, 'v', version);
-        script += await addArchive(tool, version, url, os_version);
-        break;
       case 'cs2pr':
         uri = await getUri(tool, '', version, 'releases', '', 'download');
         url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
-        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'infection':
-        url = github + 'infection/infection/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version);
         break;
       case 'php-cs-fixer':
         uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
         url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version);
         break;
       case 'phpcs':
       case 'phpcbf':
         url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
-        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'phan':
-        url = github + 'phan/phan/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version);
         break;
       case 'phive':
         script += await addPhive(version, os_version);
         break;
       case 'phpstan':
         url = github + 'phpstan/phpstan/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version);
         break;
       case 'phpmd':
         url = github + 'phpmd/phpmd/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version);
         break;
       case 'psalm':
         url = github + 'vimeo/psalm/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version);
         break;
       case 'composer':
-        url = 'https://getcomposer.org/composer-stable.phar';
-        script +=
-          (await addArchive('composer', version, url, os_version)) +
-          (await updateComposer(version, os_version));
+        url = await getComposerUrl(version);
+        script += await addArchive('composer', url, os_version);
         break;
       case 'codeception':
         url =
           'https://codeception.com/' +
           (await getCodeceptionUri(version, php_version));
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version);
         break;
       case 'phpcpd':
       case 'phpunit':
         url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version);
         break;
       case 'deployer':
         url = await getDeployerUrl(version);
-        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'flex':
-        script += await addPackage(tool, release, 'symfony/', os_version);
+        script += await addArchive(tool, url, os_version);
         break;
       case 'phinx':
         script += await addPackage(tool, release, 'robmorgan/', os_version);
@@ -542,9 +494,6 @@ export async function addTools(
       case 'prestissimo':
         script += await addPackage(tool, release, 'hirak/', os_version);
         break;
-      case 'vapor-cli':
-        script += await addPackage(tool, release, 'laravel/', os_version);
-        break;
       case 'composer-prefetcher':
         script += await addPackage(
           tool,
@@ -564,11 +513,7 @@ export async function addTools(
       case 'symfony-cli':
         uri = await getSymfonyUri(version, os_version);
         url = github + 'symfony/cli/' + uri;
-        script += await addArchive('symfony', version, url, os_version);
-        break;
-      case 'wp-cli':
-        url = github + (await getWpCliUrl(version));
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive('symfony', url, os_version);
         break;
       default:
         script += await utils.addLog(

src/utils.ts

@@ -2,6 +2,21 @@ 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.
  *
@@ -12,13 +27,17 @@ export async function getInput(
   name: string,
   mandatory: boolean
 ): Promise<string> {
-  const input = process.env[name];
-  switch (input) {
-    case '':
-    case undefined:
-      return core.getInput(name, {required: mandatory});
-    default:
+  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}`);
+    default:
+      return '';
   }
 }