Fix macos

Improve regexes for pre-release extensions
Fix php-dev setup
2025-07-02 05:03:17 +07:00 · 2020-11-28 14:59:24 +05:30 · 2020-10-31 19:04:20 +05:30 · 2020-10-31 15:25:16 +05:30 · 2020-10-31 14:55:27 +05:30 · 2020-10-30 19:25:39 +05:30
48 changed files with 3646 additions and 3588 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -8,7 +8,7 @@ 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.
+* Add tests for it, 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.

@ -18,13 +18,6 @@ Due to time constraints, you may not always get a quick response. Please do not

 ## Coding Guidelines

-This project comes with `.prettierrc.json` and `eslintrc.json` configuration files. Please run the following commands to format the code before committing it.
-
-```bash
-$ npm run format
-$ npm run lint
-```
-
 ## Using setup-php from a Git checkout

 The following commands can be used to perform the initial checkout of setup-php:
@ -41,6 +34,19 @@ Install setup-php dependencies using [npm](https://www.npmjs.com/):
 $ npm install
 ```

+If you are using `Windows` configure `git` to handle line endings.
+
+```cmd
+git config --local core.autocrlf true
+```
+
+This project comes with `.prettierrc.json` and `eslintrc.json` configuration files. Please run the following commands to fix and verify the code quality.
+
+```bash
+$ npm run format
+$ npm run lint
+```
+
 ## Running the test suite

 After following the steps shown above, The `setup-php` tests in the `__tests__` directory can be run using this command:
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,5 +1,6 @@
 # These are supported funding model platforms

+open_collective: setup-php
 tidelift: "npm/setup-php"
 community_bridge: setup-php
 patreon: shivammathur
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -11,7 +11,7 @@ assignees: 'shivammathur'
 <!-- Please describe the bug concisely. -->

 **Version**
- [ ] I have checked releases and the bug exists in the latest patch version of `v1` or `v2`.
+- [ ] I have checked releases, and the bug exists in the latest patch version of `v1` or `v2`.
 - [ ] `v2`
 - [ ] `v1`

--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -11,7 +11,7 @@ assignees: 'shivammathur'
 <!-- Please describe concisely the feature you want to add. -->

 **Version**
- [ ] I have checked releases and the feature is missing in the latest patch version of `v2`.
+- [ ] I have checked releases, and the feature is missing in the latest patch version of `v2`.

 **Underlying issue**
 <!-- Please describe the issue this would solve. -->
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -5,12 +5,12 @@ labels: bug or enhancement

 ---

-## A Pull Request should be associated with an Issue.
+## A Pull Request should be associated with a Discussion.

-> If you're fixing a bug, adding a new feature or improving something please provide the details in Issues,
+> If you're fixing a bug, adding a new feature or improving something please provide the details in discussions,
 > so that the development can be pointed in the intended direction.

-Related issue: <!-- Please link the related issue -->
+Related discussion: <!-- Please link the related discussion -->

 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
 > Thank you for your contribution.
@ -30,7 +30,7 @@ This PR [briefly explain what it does]
 > 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).
+- [ ] I have tested the changes in an integration test (If yes, provide workflow YAML and link).

 <!--
 - Please target the develop branch when submitting the pull request.
--- a/.github/SECURITY.md
+++ b/.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

--- a/.github/workflows/node-workflow.yml
+++ b/.github/workflows/node-workflow.yml
@ -48,4 +48,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 }}
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@ -25,7 +25,7 @@ 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', '8.0']
+        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
    env:
      extensions: xml, opcache, xdebug, pcov
      key: cache-v3
--- a/README.md
+++ b/README.md
@ -8,12 +8,17 @@

 <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://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="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?logo=open%20source%20initiative&logoColor=white&labelColor=555555"></a>
+  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.3%20to%208.1-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a>  
+</p>
+<p align="center">  
+  <a href="https://reddit.com/r/setup_php" title="setup-php reddit"><img alt="setup-php reddit" src="https://img.shields.io/badge/reddit-join-FF5700?logo=reddit&logoColor=FF5700&labelColor=555555"></a>
+  <a href="https://twitter.com/setup_php" title="setup-php twitter"><img alt="setup-php twitter" src="https://img.shields.io/badge/twitter-follow-1DA1F2?logo=twitter&logoColor=1DA1F2&labelColor=555555"></a>
+  <a href="https://setup-php.statuspage.io/" title="setup-php status"><img alt="setup-php status" src="https://img.shields.io/badge/status-subscribe-28A745?logo=statuspage&logoColor=28A745&labelColor=555555"></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.
+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 set up 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.

 ## Contents

@ -29,6 +34,7 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
  - [Disable Coverage](#disable-coverage)
 - [Usage](#memo-usage)
  - [Inputs](#inputs)
+  - [Flags](#flags)
  - [Basic Setup](#basic-setup)
  - [Matrix Setup](#matrix-setup)
  - [Nightly Build Setup](#nightly-build-setup)
@ -64,12 +70,14 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 |`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`|
+|`8.1`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
+
+**Note:** Specifying `8.0` and `8.1` in `php-version` input installs a nightly build of `PHP 8.0.0-dev` and `PHP 8.1.0-dev` respectively. See [nightly build setup](#nightly-build-setup) for more information.

-**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.
+The action supports both `GitHub-hosted` runners and `self-hosted` runners on the following operating systems.

 ### GitHub-Hosted Runners

@ -80,6 +88,7 @@ Both `GitHub-hosted` runners and `self-hosted` runners are supported on the foll
 |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`|
+|macOS Big Sur 11.0|`macos-11.0`|`PHP 7.4`|

 ### Self-Hosted Runners

@ -91,6 +100,7 @@ Both `GitHub-hosted` runners and `self-hosted` runners are supported on the foll
 |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`|
+|macOS Big Sur 11.0|`self-hosted` or `macOS`|

 - Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.

@ -99,11 +109,12 @@ Both `GitHub-hosted` runners and `self-hosted` runners are supported on the foll
 - 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
+- name: Setup PHP with pecl extension
+  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.
@ -115,71 +126,113 @@ with:
 - 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
+- name: Setup PHP with specific version of PECL extension
+  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
+- name: Setup PHP with pre-release PECL extension
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    tools: pecl
+    extensions: xdebug-beta
 ```

 - Shared extensions can be removed by prefixing them with a `:`.

 ```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'  
-  extensions: :opcache
+- name: Setup PHP and remove shared extension
+  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.
+- Extension `intl` can be setup with specific `ICU` version for `PHP 5.6` to `PHP 7.4` in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.

- These extensions have custom support - `gearman` on `Ubuntu`, `blackfire`, `ioncube`, `oci8`, `pdo_oci`, `phalcon3` and `phalcon4` on all supported OS.
+```yaml
+- name: Setup PHP with intl
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    extensions: intl-67.1
+```
+
+- These extensions have custom support - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`, and `blackfire`, `ioncube`, `oci8`, `pdo_oci`, `phalcon3` and `phalcon4` on all supported OS.
+
+- By default, extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`. 
+
+```yaml
+- name: Setup PHP with fail-fast
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    extensions: oci8
+  env:
+    fail-fast: true
+```

 ## :wrench: Tools Support

 These tools can be setup globally using the `tools` input.

-`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-normalize`, `composer-prefetcher`, `composer-require-checker`, `composer-unused`, `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`
+`behat`, `blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-normalize`, `composer-prefetcher`, `composer-require-checker`, `composer-unused`, `cs2pr`, `deployer`, `flex`, `grpc_php_plugin`, `infection`, `pecl`, `phan`, `phing`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpspec`, `phpstan`, `phpunit`, `prestissimo`, `protoc`, `psalm`, `symfony`, `vapor-cli`

 ```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'
-  tools: php-cs-fixer, phpunit
+- name: Setup PHP with tools
+  uses: shivammathur/setup-php@v2
+  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.
+- To set up a particular version of a tool, specify it in the form `tool:version`. The latest stable version of `composer` is set up by default. You can set up the required `composer` version by specifying `v1`, `v2`, `snapshot` or `preview` as versions or the exact version in semver format.

 ```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'
-  tools: composer:v2
+- name: Setup PHP with composer v2
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    tools: composer:v2
 ```

-Version for other tools should be in `semver` format and a valid release of the tool.
+- If you have specified composer plugins `prestissimo` or `composer-prefetcher` in tools, the latest stable version of `composer v1` will be setup. Unless some of your packages require `composer v1`, it is recommended to drop `prestissimo` and use `composer v2`.
+
+- The latest versions of both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified in tools input. Please refer to the [official documentation](https://blackfire.io/docs/integrations/ci/github-actions "Blackfire.io documentation for GitHub Actions") for using `blackfire` with GitHub Actions.
+
+- Version for other tools should be in `semver` format and a valid release of the tool. This is useful for installing tools for older versions of PHP. For example to set up `PHPUnit` on `PHP 7.2`.

 ```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'
-  tools: php-cs-fixer:2.16.2, phpunit:8.5.1
+- name: Setup PHP with tools
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.2'
+    tools: phpunit:8.5.8
+```
+
+- By default, tools which cannot be set up gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`.
+
+```yaml
+- name: Setup PHP with fail-fast
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    tools: deployer
+  env:
+    fail-fast: true
 ```

 **Notes**
- Both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified in tools input.
- Tools which cannot be setup gracefully leave an error message in the logs, the action is not interrupted.
+- Input `tools` is useful to set up tools which you only use in GitHub Actions, thus keeping your `composer.json` tidy.
+- If you do not want to use all your dev-dependencies in GitHub Actions workflow, you can run composer with `--no-dev` and install required tools using `tools` input to speed up your workflow.
+- If you have a tool in your `composer.json`, do not setup it with `tools` input as the two instances of the tool might conflict.

 ## :signal_strength: Coverage Support

@ -189,10 +242,11 @@ Specify `coverage: xdebug` to use `Xdebug`.
 Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action").

 ```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'
-  coverage: xdebug
+- name: Setup PHP with Xdebug
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    coverage: xdebug
 ```

 ### PCOV
@ -203,11 +257,23 @@ Tests with `PCOV` run much faster than with `Xdebug`.
 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
-with:
-  php-version: '7.4'
-  ini-values: pcov.directory=api #optional, see above for usage.
-  coverage: pcov
+- name: Setup PHP with PCOV
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    ini-values: pcov.directory=api #optional, see above for usage.
+    coverage: pcov
+```
+
+`PHPUnit` 8 and above supports `PCOV` out of the box.  
+If you are using `PHPUnit` 5, 6 or 7, you will need `krakjoe/pcov-clobber`.  
+Before executing your tests add the following step.
+
+```yaml
+- name: Setup PCOV
+  run: |
+    composer require pcov/clobber
+    vendor/bin/pcov clobber
 ```

 ### Disable Coverage
@ -221,20 +287,24 @@ Consider disabling the coverage using this PHP action for these reasons.
 - You are profiling your code using `blackfire`.

 ```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'
-  coverage: none
+- name: Setup PHP with no coverage driver
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    coverage: none
 ```

 ## :memo: Usage

 ### Inputs

+> Specify using `with` keyword
+
 #### `php-version` (required)

- Specify the PHP version you want to setup.
+- Specify the PHP version you want to set up.
 - Accepts a `string`. For example `'7.4'`.
+- Accepts `latest` to set up the latest stable PHP version.
 - See [PHP support](#tada-php-support) for supported PHP versions.

 #### `extensions` (optional)
@ -251,16 +321,41 @@ with:

 #### `coverage` (optional)

- Specify the code coverage driver you want to setup.
+- Specify the code coverage driver you want to set up.
 - 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`
+- Specify the tools you want to set up.
+- Accepts a `string` in csv-format. For example: `phpunit, phpcs`
 - See [tools Support](#wrench-tools-support) for tools supported.

+### Flags
+
+> Specify using `env` keyword
+
+#### `fail-fast` (optional)
+
+- Specify to mark the workflow as failed if an extension or tool fails to set up.
+- This changes the default mode from graceful warnings to fail-fast.
+- By default, it is set to `false`.
+- Accepts `true` and `false`.
+
+#### `phpts` (optional)
+
+- Specify to set up thread-safe version of PHP on windows.
+- Accepts `ts` and `nts`.
+- By default, it is set to `nts`.
+- See [thread safe setup](#thread-safe-setup) for more info.
+
+#### `update` (optional)
+
+- Specify to update PHP on the runner to the latest patch version.
+- Accepts `true` and `false`.
+- By default, it is set to `false`.
+- See [force update](#force-update) for more info.
+
 See below for more info.

 ### Basic Setup
@ -311,23 +406,23 @@ jobs:

 ### 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.
+> Setup a nightly build of `PHP 8.0` or `PHP 8.1`. 

- This version is currently in development.
- `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.
+- These versions are currently in development.
+- `PECL` is installed by default with these versions on `ubuntu` and `macOS`.
+- Some user space extensions might not support these versions currently.
+- Refer to this [RFC](https://wiki.php.net/rfc/jit "PHP JIT RFC configuration") for configuring `PHP JIT` on these versions.
+- Refer to this [list of RFCs](https://wiki.php.net/rfc#php_80 "List of RFCs implemented in PHP8") for features implemented in `PHP 8.0`.

 ```yaml
 steps:
 - name: Checkout
  uses: actions/checkout@v2

- name: Setup PHP
+- name: Setup nightly PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.0'
+    php-version: '8.1'
    extensions: mbstring
    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1
    coverage: pcov
@ -338,8 +433,8 @@ steps:

 > 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 virtual machine, 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.
+- To set up a dockerized self-hosted runner, refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Ubuntu) to set up in an `Ubuntu` container and refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Windows) to set up in a `Windows` container.
+- To set up the runner directly on the host OS or in a virtual machine, 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.
 - If your workflow uses [services](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idservices "GitHub Actions Services"), then setup the runner on a Linux host or in a Linux virtual machine. GitHub Actions does not support nested virtualization on Linux, so services will not work in a dockerized container.

 Specify the environment variable `runner` with the value `self-hosted`. Without this your workflow will fail.
@ -364,6 +459,10 @@ jobs:
        runner: self-hosted # Specify the runner.
 ```

+**Notes**
+- Do not setup multiple self-hosted runners on a single server instance as parallel workflow will conflict with each other.
+- Do not setup self-hosted runners on the side on your development environment or your production server.
+
 ### Local Testing Setup

 > Test your `Ubuntu` workflow locally using [`nektos/act`](https://github.com/nektos/act "Project to test GitHub Actions locally").
@ -401,7 +500,7 @@ act -P ubuntu-16.04=shivammathur/node:xenial

 ### Thread Safe Setup

-> Setup both `TS` and `NTS` PHP on `Windows`.
+> Setup `TS` or `NTS` PHP on `Windows`.

 - `NTS` versions are setup by default.
 - On `Ubuntu` and `macOS` only `NTS` versions are supported.
@ -426,13 +525,13 @@ jobs:

 ### Force Update

-> Update to latest patch of PHP versions.
+> Update to the latest patch of PHP versions.

 - 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
+- name: Setup PHP with latest versions
  uses: shivammathur/setup-php@v2
  with:
    php-version: '7.4'
@ -447,7 +546,7 @@ jobs:
 To debug any issues, you can use the `verbose` tag instead of `v2`.

 ```yaml
- name: Setup PHP
+- name: Setup PHP with logs
  uses: shivammathur/setup-php@verbose
  with:
    php-version: '7.4'
@ -455,49 +554,12 @@ To debug any issues, you can use the `verbose` tag instead of `v2`.

 ### 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: extcache
-  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.extcache.outputs.dir }}
-    key: ${{ steps.extcache.outputs.key }}
-    restore-keys: ${{ steps.extcache.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.
+You can cache PHP extensions using `shivammathur/cache-extensions` and `action/cache` GitHub Actions. Extensions which take very long to set up when cached are available in the next workflow run and are enabled directly. This reduces the workflow execution time.  
+Refer to [`shivammathur/cache-extensions`](https://github.com/shivammathur/cache-extensions "GitHub Action to cache php extensions") for details. 

 ### 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.
+If your project uses composer, you can persist the 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.

 ```yaml
 - name: Get composer cache directory
@ -516,7 +578,7 @@ If your project uses composer, you can persist composer's internal cache directo
 ```

 **Notes**
- Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
+- 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.

 ```yaml
@ -525,7 +587,7 @@ 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.
+If your project has node.js dependencies, you can persist NPM or yarn cache directory. The cached files are available across check-runs and will reduce the workflow execution time.

 ```yaml
 - name: Get node.js cache directory
@ -540,11 +602,11 @@ If your project has node.js dependencies, you can persist npm's or yarn's cache
    restore-keys: ${{ runner.os }}-node-
 ```

-**Note:** Please do not cache `node_modules` directory as that will have side-effects.
+**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.
+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 an `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.

 ```yaml
 - name: Setup PHP
@ -557,9 +619,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 them 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
@ -568,29 +632,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 it does not require problem matchers.

 ```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
@ -625,16 +719,16 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.

 ## :bookmark: Versioning

- It is highly recommended to use the `v2` tag as `setup-php` version. It is a rolling tag and is synced with latest minor and patch releases. With `v2` you automatically get the bug fixes, new features and support for latest PHP releases. For debugging any issues `verbose` tag can be used temporarily. It outputs all the logs and is also synced with the latest releases.
+- Use the `v2` tag as `setup-php` version. It is a rolling tag and is synced with the latest minor and patch releases. With `v2` you automatically get the bug fixes, new features and support for latest PHP releases. For debugging any issues `verbose` tag can be used temporarily. It outputs all the logs and is also synced with the latest releases.
 - Semantic release versions can also be used. It is recommended to [use dependabot](https://docs.github.com/en/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot "Setup Dependabot with GitHub Actions") with semantic versioning to keep the actions in your workflows up to date.
 - Commit SHA can also be used, but are not recommended. They have to be updated with every release manually, without which you will not get any bug fixes or new features. 
- Using the `master` branch as version is highly discouraged, it might break your workflow after major releases as they have breaking changes.
- If you are using the `v1` tag or a `1.x.y` version, it is recommended that you [switch to v2](https://github.com/shivammathur/setup-php/wiki/Switch-to-v2 "Guide for switching from setup-php v1 to v2") as `v1` only gets critical bug fixes. Maintenance support for `v1` will be dropped with the last `PHP 8.0` release.
+- It is highly discouraged to use the `master` branch as version, it might break your workflow after major releases as they have breaking changes.
+- If you are using the `v1` tag or a `1.x.y` version, you should [switch to v2](https://github.com/shivammathur/setup-php/wiki/Switch-to-v2 "Guide for switching from setup-php v1 to v2") as `v1` only gets critical bug fixes. Maintenance support for `v1` will be dropped with the last `PHP 8.0` release.

 ## :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 under the [MIT License](LICENSE "License for shivammathur/setup-php"). 
+- This project has multiple [dependencies](#package-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
@ -644,23 +738,51 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
 - See [Contributor's Guide](.github/CONTRIBUTING.md "shivammathur/setup-php contribution guide") before you start.
 - If you face any issues while using this or want to suggest a feature/improvement, create an issue [here](https://github.com/shivammathur/setup-php/issues "Issues reported").

+*Join the list of setup-php contributors*
+
+<p align="center">
+  <a href="https://github.com/shivammathur/setup-php/graphs/contributors">
+    <img src="https://opencollective.com/setup-php/contributors.svg?width=1024&button=false" alt="setup-php contributors" width="100%">
+  </a>
+</p>
+
 ## :sparkling_heart: Support This Project

-If this action helped you.
+- Please star the project and share it. If you blog, please share your experience of using this action.
+- Please consider supporting our work by sponsoring using [Open Collective](https://opencollective.com/setup-php), [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal") or [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon").
+- If you use `setup-php` at your company, please [reach out](mailto:contact@setup-php.com) to sponsor the project.

- 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.
+*Huge thanks to the following companies for supporting `setup-php`*
+
+<p>
+  <a href="https://www.jetbrains.com/?from=setup-php">
+    <img src="https://shivammathur.com/jetbrains.svg" alt="JetBrains" width="106" height="60">
+  </a>
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="https://blackfire.io/?utm_source=setup-php">
+    <img src="https://shivammathur.com/blackfire.svg" alt="Blackfire" width="212" height="60">
+  </a>
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="https://tidelift.com/subscription/pkg/npm-setup-php">
+    <img src="https://shivammathur.com/tidelift.png" alt="Tidelift" width="70" height="60">
+  </a>
+</p>

 ## :package: Dependencies

 - [Node.js dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Node.js dependencies")
+- [aaronparker/VcRedist](https://github.com/aaronparker/VcRedist "VcRedist PowerShell package")
 - [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 on MacOS")
+- [shivammathur/composer-cache](https://github.com/shivammathur/composer-cache "Cache composer releases")
 - [shivammathur/homebrew-extensions](https://github.com/shivammathur/homebrew-extensions "Tap for PHP extensions on MacOS")
- [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package")
+- [shivammathur/homebrew-php](https://github.com/shivammathur/homebrew-php "Tap for PHP builds on MacOS")
+- [shivammathur/icu-intl](https://github.com/shivammathur/icu-intl "icu4c and php-intl builds")
+- [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package for Ubuntu")
+- [shivammathur/php-builder-windows](https://github.com/shivammathur/php-builder-windows "Nightly PHP package for Windows")
+- [shivammathur/php-ubuntu](https://github.com/shivammathur/php-ubuntu "Cache stable PHP Packages for Ubuntu")
 - [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")

@ -668,4 +790,4 @@ If this action helped you.

 - [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")
--- a/tests/config.test.ts
+++ b/tests/config.test.ts
@ -12,9 +12,9 @@ describe('Config tests', () => {

    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');
  });
 });
--- a/tests/coverage.test.ts
+++ b/tests/coverage.test.ts
@ -53,6 +53,18 @@ describe('Config tests', () => {
    expect(linux).toContain('echo "xdebug.mode=coverage"');
  });

+  it('checking addCoverage with Xdebug3 on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug3', '8.1', 'linux');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
+  });
+
+  it('checking addCoverage with Xdebug on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug', '8.1', 'linux');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
+  });
+
  it('checking addCoverage with Xdebug on darwin', async () => {
    const darwin: string = await coverage.addCoverage(
      'xdebug',
--- a/tests/extensions.test.ts
+++ b/tests/extensions.test.ts
@ -1,17 +1,9 @@
 import * as extensions from '../src/extensions';

 describe('Extension tests', () => {
-  it('checking getXdebugVersion', async () => {
-    expect(await extensions.getXdebugVersion('5.3')).toContain('2.2.7');
-    expect(await extensions.getXdebugVersion('5.4')).toContain('2.4.1');
-    expect(await extensions.getXdebugVersion('5.5')).toContain('2.5.5');
-    expect(await extensions.getXdebugVersion('5.6')).toContain('2.5.5');
-    expect(await extensions.getXdebugVersion('7.0')).toContain('2.7.2');
-    expect(await extensions.getXdebugVersion('7.2')).toContain('2.9.6');
-  });
  it('checking addExtensionOnWindows', async () => {
    let win32: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, phalcon4, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
+      'Xdebug, pcov, sqlite, :intl, phalcon4, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1',
      '7.4',
      'win32'
    );
@ -19,13 +11,19 @@ describe('Extension tests', () => {
    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('ioncube.ps1 7.4');
-    expect(win32).toContain('oci.ps1 oci8 7.4');
-    expect(win32).toContain('oci.ps1 pdo_oci 7.4');
+    expect(win32).toContain('Add-Phalcon phalcon4');
+    expect(win32).toContain('Add-Ioncube');
+    expect(win32).toContain('Add-Oci oci8');
+    expect(win32).toContain('Add-Oci pdo_oci');
    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');
+    expect(win32).toContain('Add-Extension sqlsrv devel 1.2.3');
+
+    win32 = await extensions.addExtension('pcov', '5.6', 'win32');
+    expect(win32).toContain(
+      'Add-Log "$cross" "pcov" "pcov is not supported on PHP 5.6"'
+    );

    win32 = await extensions.addExtension('mysql', '7.4', 'win32');
    expect(win32).toContain('Add-Extension mysqli');
@ -46,17 +44,17 @@ describe('Extension tests', () => {
      'win32',
      true
    );
-    expect(win32).toContain('phalcon.ps1 phalcon3');
+    expect(win32).toContain('Add-Phalcon 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('xdebug', '7.2', 'openbsd');
+    expect(win32).toContain('Platform openbsd is not supported');

    win32 = await extensions.addExtension('blackfire', '7.3', 'win32');
-    expect(win32).toContain('blackfire.ps1 7.3 blackfire');
+    expect(win32).toContain('Add-Blackfire blackfire');

    win32 = await extensions.addExtension('blackfire-1.31.0', '7.3', 'win32');
-    expect(win32).toContain('blackfire.ps1 7.3 blackfire-1.31.0');
+    expect(win32).toContain('Add-Blackfire blackfire-1.31.0');
  });

  it('checking addExtensionOnLinux', async () => {
@ -65,7 +63,6 @@ describe('Extension tests', () => {
      '7.4',
      'linux'
    );
-    expect(linux).toContain('update_extension xdebug 2.9.6');
    expect(linux).toContain(
      'add_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension'
    );
@ -74,7 +71,7 @@ describe('Extension tests', () => {
      '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 php7.4-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');
@ -89,85 +86,87 @@ describe('Extension tests', () => {
      'sudo $debconf_fix apt-get install -y php8.0-xdebug'
    );

+    linux = await extensions.addExtension('pcov', '5.6', 'linux');
+    expect(linux).toContain(
+      'add_log "$cross" "pcov" "pcov is not supported on PHP 5.6"'
+    );
+
    linux = await extensions.addExtension('gearman', '7.0', 'linux');
-    expect(linux).toContain('gearman.sh 7.0');
-    linux = await extensions.addExtension('gearman', '7.1', 'linux');
-    expect(linux).toContain('gearman.sh 7.1');
-
-    linux = await extensions.addExtension('gearman', '7.2', 'linux');
-    expect(linux).toContain('gearman.sh 7.2');
-
-    linux = await extensions.addExtension('gearman', '7.3', 'linux');
-    expect(linux).toContain('gearman.sh 7.3');
-
+    expect(linux).toContain('add_gearman');
    linux = await extensions.addExtension('gearman', '7.4', 'linux');
-    expect(linux).toContain('gearman.sh 7.4');
+    expect(linux).toContain('add_gearman');

-    linux = await extensions.addExtension('xdebug', '7.2', 'fedora');
-    expect(linux).toContain('Platform fedora is not supported');
+    linux = await extensions.addExtension('pdo_cubrid', '7.0', 'linux');
+    expect(linux).toContain('add_cubrid pdo_cubrid');
+    linux = await extensions.addExtension('cubrid', '7.4', 'linux');
+    expect(linux).toContain('add_cubrid cubrid');
+
+    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');
+    expect(linux).toContain('add_phalcon phalcon3');
+    expect(linux).toContain('add_phalcon phalcon4');

    linux = await extensions.addExtension('ioncube', '7.3', 'linux');
-    expect(linux).toContain('ioncube.sh 7.3');
+    expect(linux).toContain('add_ioncube');

    linux = await extensions.addExtension('oci8, pdo_oci', '7.3', 'linux');
-    expect(linux).toContain('oci.sh oci8 7.3');
-    expect(linux).toContain('oci.sh pdo_oci 7.3');
+    expect(linux).toContain('add_oci oci8');
+    expect(linux).toContain('add_oci pdo_oci');

    linux = await extensions.addExtension('blackfire', '7.3', 'linux');
-    expect(linux).toContain('blackfire.sh 7.3 blackfire');
+    expect(linux).toContain('add_blackfire blackfire');

    linux = await extensions.addExtension('blackfire-1.31.0', '7.3', 'linux');
-    expect(linux).toContain('blackfire.sh 7.3 blackfire-1.31.0');
+    expect(linux).toContain('add_blackfire blackfire-1.31.0');
+
+    linux = await extensions.addExtension('intl-65.1', '5.6', 'linux');
+    expect(linux).toContain('add_intl intl-65.1');
+
+    linux = await extensions.addExtension('intl-67.1', '7.3', 'linux');
+    expect(linux).toContain('add_intl intl-67.1');
  });

  it('checking addExtensionOnDarwin', async () => {
    let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, grpc, protobuf, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
+      'Xdebug, pcov, grpc, igbinary, imagick, protobuf, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
      '7.2',
      'darwin'
    );
    expect(darwin).toContain('add_brew_extension xdebug');
    expect(darwin).toContain('add_brew_extension pcov');
    expect(darwin).toContain('add_brew_extension grpc');
+    expect(darwin).toContain('add_brew_extension igbinary');
+    expect(darwin).toContain('add_brew_extension imagick');
    expect(darwin).toContain('add_brew_extension protobuf');
    expect(darwin).toContain('add_brew_extension swoole');
-    expect(darwin).toContain('sudo pecl install -f sqlite3');
+    expect(darwin).toContain('pecl_install sqlite3');
    expect(darwin).toContain('remove_extension intl');
    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');
+    expect(darwin).toContain('add_phalcon phalcon3');

    darwin = await extensions.addExtension('phalcon4', '7.3', 'darwin');
-    expect(darwin).toContain('phalcon_darwin.sh phalcon4 7.3');
+    expect(darwin).toContain('add_phalcon phalcon4');

    darwin = await extensions.addExtension('ioncube', '7.3', 'darwin');
-    expect(darwin).toContain('ioncube.sh 7.3');
+    expect(darwin).toContain('add_ioncube');

    darwin = await extensions.addExtension('oci8, pdo_oci', '7.3', 'darwin');
-    expect(darwin).toContain('oci.sh oci8 7.3');
-    expect(darwin).toContain('oci.sh pdo_oci 7.3');
+    expect(darwin).toContain('add_oci oci8');
+    expect(darwin).toContain('add_oci pdo_oci');

    darwin = await extensions.addExtension('pcov', '5.6', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f pcov');
+    expect(darwin).toContain(
+      'add_log "$cross" "pcov" "pcov is not supported on PHP 5.6"'
+    );

    darwin = await extensions.addExtension('pcov', '7.2', 'darwin');
    expect(darwin).toContain('add_brew_extension 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');
-
    darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
    expect(darwin).toContain('add_brew_extension xdebug');

@ -178,24 +177,20 @@ describe('Extension tests', () => {
    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');
+    darwin = await extensions.addExtension('imagick', '5.5', 'darwin');
    expect(darwin).toContain('brew install pkg-config imagemagick');
-    expect(darwin).toContain('sudo pecl install -f 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');
+    expect(darwin).toContain('pecl_install imagick');

    darwin = await extensions.addExtension('blackfire', '7.3', 'darwin');
-    expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire');
+    expect(darwin).toContain('add_blackfire 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('add_blackfire blackfire-1.31.0');

    darwin = await extensions.addExtension(
      'does_not_exist',
@ -205,7 +200,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');
  });
 });
--- a/tests/install.test.ts
+++ b/tests/install.test.ts
@ -1,10 +1,11 @@
 import * as install from '../src/install';
+import * as utils from '../src/utils';

 /**
 * Mock install.ts
 */
 jest.mock('../src/install', () => ({
-  build: jest.fn().mockImplementation(
+  getScript: jest.fn().mockImplementation(
    async (
      filename: string,
      version: string,
@ -39,24 +40,18 @@ jest.mock('../src/install', () => ({
  run: jest.fn().mockImplementation(
    async (): Promise<string> => {
      const os_version: string = process.env['RUNNER_OS'] || '';
-      let version: string = process.env['php-version'] || '';
-      version = version.length > 1 ? version.slice(0, 3) : version + '.0';
-      let script = '';
-      switch (os_version) {
-        case 'darwin':
-        case 'linux':
-          script = await install.build(os_version + '.sh', version, os_version);
-          script += 'bash script.sh ' + version + ' ' + __dirname;
-          break;
-        case 'win32':
-          script = await install.build(os_version + '.sh', version, os_version);
-          script += 'pwsh script.ps1 ' + version + ' ' + __dirname;
-          break;
-        default:
-          script += os_version + ' is not supported';
-      }
-
-      return script;
+      const version: string = await utils.parseVersion(
+        await utils.getInput('php-version', true)
+      );
+      const tool = await utils.scriptTool(os_version);
+      const filename = os_version + (await utils.scriptExtension(os_version));
+      return [
+        await install.getScript(filename, version, os_version),
+        tool,
+        filename,
+        version,
+        __dirname
+      ].join(' ');
    }
  )
 }));
@ -93,13 +88,13 @@ describe('Install', () => {

    let script: string = '' + (await install.run());
    expect(script).toContain('initial script');
-    expect(script).toContain('pwsh script.ps1 7.0 ' + __dirname);
+    expect(script).toContain('pwsh win32.ps1 7.0 ' + __dirname);

    setEnv('7.3', 'win32', '', '', '', '');

    script = '' + (await install.run());
    expect(script).toContain('initial script');
-    expect(script).toContain('pwsh script.ps1 7.3 ' + __dirname);
+    expect(script).toContain('pwsh win32.ps1 7.3 ' + __dirname);

    setEnv('7.3', 'win32', 'a, b', 'a=b', 'x', '');

@ -108,7 +103,7 @@ describe('Install', () => {
    expect(script).toContain('install extensions');
    expect(script).toContain('edit php.ini');
    expect(script).toContain('set coverage driver');
-    expect(script).toContain('pwsh script.ps1 7.3 ' + __dirname);
+    expect(script).toContain('pwsh win32.ps1 7.3 ' + __dirname);
  });

  it('Test install on linux', async () => {
@ -116,7 +111,13 @@ describe('Install', () => {

    let script: string = '' + (await install.run());
    expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 7.3 ');
+    expect(script).toContain('bash linux.sh 7.3 ');
+
+    setEnv('latest', 'linux', '', '', '', '');
+
+    script = '' + (await install.run());
+    expect(script).toContain('initial script');
+    expect(script).toContain('bash linux.sh 7.4 ');

    setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit');

@ -125,7 +126,7 @@ describe('Install', () => {
    expect(script).toContain('install extensions');
    expect(script).toContain('edit php.ini');
    expect(script).toContain('set coverage driver');
-    expect(script).toContain('bash script.sh 7.3');
+    expect(script).toContain('bash linux.sh 7.3');
    expect(script).toContain('add_tool');
  });

@ -134,7 +135,7 @@ describe('Install', () => {

    let script: string = '' + (await install.run());
    expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 7.3 ' + __dirname);
+    expect(script).toContain('bash darwin.sh 7.3 ' + __dirname);

    setEnv('7.3', 'darwin', 'a, b', 'a=b', 'x', '');

@ -143,7 +144,7 @@ describe('Install', () => {
    expect(script).toContain('install extensions');
    expect(script).toContain('edit php.ini');
    expect(script).toContain('set coverage driver');
-    expect(script).toContain('bash script.sh 7.3 ' + __dirname);
+    expect(script).toContain('bash darwin.sh 7.3 ' + __dirname);
  });

  it('Test malformed version inputs', async () => {
@ -151,18 +152,24 @@ describe('Install', () => {

    let script: string = '' + '' + (await install.run());
    expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 7.4 ' + __dirname);
+    expect(script).toContain('bash darwin.sh 7.4 ' + __dirname);

    setEnv(8.0, 'darwin', '', '', '', '');

    script = '' + (await install.run());
    expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 8.0 ' + __dirname);
+    expect(script).toContain('bash darwin.sh 8.0 ' + __dirname);

    setEnv(8, 'darwin', '', '', '', '');

    script = '' + (await install.run());
    expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 8.0 ' + __dirname);
+    expect(script).toContain('bash darwin.sh 8.0 ' + __dirname);
+
+    setEnv(8.1, 'darwin', '', '', '', '');
+
+    script = '' + (await install.run());
+    expect(script).toContain('initial script');
+    expect(script).toContain('bash darwin.sh 8.1 ' + __dirname);
  });
 });
--- a/tests/matchers.test.ts
+++ b/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);
-  });
-});
--- a/tests/tools.test.ts
+++ b/tests/tools.test.ts
@ -1,31 +1,6 @@
-import * as httpm from '@actions/http-client';
 import * as tools from '../src/tools';

-httpm.HttpClient.prototype.get = jest.fn().mockImplementation(() => {
-  return {
-    message: null,
-    readBody: jest.fn().mockImplementation(() => {
-      return JSON.stringify({
-        stable: [{path: '/composer-stable.phar'}],
-        preview: [{path: '/composer-preview.phar'}],
-        snapshot: [{path: '/composer.phar'}],
-        '1': [{path: '/composer-1.phar'}],
-        '2': [{path: '/composer-2.phar'}]
-      });
-    })
-  };
-});
-
 describe('Tools tests', () => {
-  it('checking getCommand', async () => {
-    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'
-    );
-  });
-
  it('checking parseToolVersion', async () => {
    expect(await tools.getToolVersion('latest')).toBe('latest');
    expect(await tools.getToolVersion('1.2.3')).toBe('1.2.3');
@ -212,6 +187,21 @@ describe('Tools tests', () => {
    );
  });

+  it('checking getBlackfirePlayerUrl', async () => {
+    expect(await tools.getBlackfirePlayerUrl('latest', '7.4')).toBe(
+      'https://get.blackfire.io/blackfire-player.phar'
+    );
+    expect(await tools.getBlackfirePlayerUrl('latest', '5.5')).toBe(
+      'https://get.blackfire.io/blackfire-player-v1.9.3.phar'
+    );
+    expect(await tools.getBlackfirePlayerUrl('latest', '7.0')).toBe(
+      'https://get.blackfire.io/blackfire-player-v1.9.3.phar'
+    );
+    expect(await tools.getBlackfirePlayerUrl('1.2.3', '7.0')).toBe(
+      'https://get.blackfire.io/blackfire-player-v1.2.3.phar'
+    );
+  });
+
  it('checking getDeployerUri', async () => {
    expect(await tools.getDeployerUrl('latest')).toBe(
      'https://deployer.org/deployer.phar'
@ -232,9 +222,17 @@ describe('Tools tests', () => {
      'a',
      'b'
    ]);
+    expect(await tools.addComposer(['a', 'b', 'composer:1.2'])).toStrictEqual([
+      'composer',
+      'a',
+      'b'
+    ]);
    expect(
      await tools.addComposer(['a', 'b', 'composer:1.2.3'])
-    ).toStrictEqual(['composer', 'a', 'b']);
+    ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
+    expect(
+      await tools.addComposer(['a', 'b', 'composer:v1.2.3'])
+    ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
    expect(
      await tools.addComposer(['a', 'b', 'composer:snapshot'])
    ).toStrictEqual(['composer:snapshot', 'a', 'b']);
@ -253,6 +251,9 @@ describe('Tools tests', () => {
    expect(
      await tools.addComposer(['a', 'b', 'c', 'composer:v2'])
    ).toStrictEqual(['composer:2', 'a', 'b', 'c']);
+    expect(
+      await tools.addComposer(['hirak', 'b', 'c', 'composer:v2'])
+    ).toStrictEqual(['composer:1', 'hirak', 'b', 'c']);
  });

  it('checking getComposerUrl', async () => {
@ -274,6 +275,21 @@ describe('Tools tests', () => {
    expect(await tools.getComposerUrl('2')).toContain(
      'https://getcomposer.org/composer-2.phar'
    );
+    expect(await tools.getComposerUrl('1.7.2')).toContain(
+      'https://github.com/composer/composer/releases/download/1.7.2/composer.phar'
+    );
+    expect(await tools.getComposerUrl('1.7.2')).toContain(
+      'https://getcomposer.org/composer-1.7.2.phar'
+    );
+    expect(await tools.getComposerUrl('2.0.0-RC2')).toContain(
+      'https://github.com/composer/composer/releases/download/2.0.0-RC2/composer.phar'
+    );
+    expect(await tools.getComposerUrl('2.0.0-RC2')).toContain(
+      'https://getcomposer.org/composer-2.0.0-RC2.phar'
+    );
+    expect(await tools.getComposerUrl('wrong')).toContain(
+      'https://getcomposer.org/composer-stable.phar'
+    );
  });

  it('checking getSymfonyUri', async () => {
@ -295,21 +311,24 @@ 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'
    );
  });

  it('checking getCleanedToolsList', async () => {
    const tools_list: string[] = await tools.getCleanedToolsList(
-      'tool, composer:1.2.3, robmorgan/phinx, hirak/prestissimo, narrowspark/automatic-composer-prefetcher'
+      'tool, composer:1.2, behat/behat, icanhazstring/composer-unused, laravel/vapor-cli, robmorgan/phinx, phpspec/phpspec, symfony/flex'
    );
    expect(tools_list).toStrictEqual([
      'composer',
      'tool',
+      'behat',
+      'composer-unused',
+      'vapor-cli',
      'phinx',
-      'prestissimo',
-      'composer-prefetcher'
+      'phpspec',
+      'flex'
    ]);
  });

@ -325,62 +344,60 @@ describe('Tools tests', () => {
  it('checking addArchive', async () => {
    let script: string = await tools.addArchive(
      'tool',
-      '1.2.3',
      'https://tool.com/tool.phar',
-      'linux'
+      'linux',
+      '-v'
    );
    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'
+      'darwin',
+      '-v'
    );
    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'
+      'win32',
+      '-v'
    );
    expect(script).toContain('Add-Tool https://tool.com/tool.phar tool');

    script = await tools.addArchive(
      'tool',
-      '1.2.3',
      'https://tool.com/tool.phar',
-      'fedora'
+      'openbsd',
+      '-v'
    );
-    expect(script).toContain('Platform fedora is not supported');
+    expect(script).toContain('Platform openbsd is not supported');
  });

  it('checking addDevTools', async () => {
    let script: string = await tools.addDevTools('phpize', 'linux');
-    expect(script).toContain('add_devtools');
-    expect(script).toContain('add_log "$tick" "phpize" "Added"');
+    expect(script).toContain('add_devtools phpize');

    script = await tools.addDevTools('php-config', 'linux');
-    expect(script).toContain('add_devtools');
-    expect(script).toContain('add_log "$tick" "php-config" "Added"');
+    expect(script).toContain('add_devtools php-config');

    script = await tools.addDevTools('phpize', 'darwin');
-    expect(script).toContain('add_log "$tick" "phpize" "Added"');
+    expect(script).toContain('add_devtools phpize');

    script = await tools.addDevTools('php-config', 'darwin');
-    expect(script).toContain('add_log "$tick" "php-config" "Added"');
+    expect(script).toContain('add_devtools php-config');

    script = await tools.addDevTools('phpize', 'win32');
    expect(script).toContain(
-      'Add-Log "$cross" "phpize" "phpize is not a windows tool"'
+      'Add-Log "$tick" "phpize" "phpize is not a windows tool"'
    );

    script = await tools.addDevTools('php-config', 'win32');
    expect(script).toContain(
-      'Add-Log "$cross" "php-config" "php-config is not a windows tool"'
+      'Add-Log "$tick" "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 () => {
@ -398,66 +415,72 @@ 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, phplint, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli',
+      'blackfire, blackfire-player, cs2pr, flex, grpc_php_plugin, php-cs-fixer, phplint, phpstan, phpunit, pecl, phing, phinx, phinx:1.2.3, phive, php-config, phpize, protoc, symfony, wp-cli',
      '7.4',
      'linux'
    );
    expect(script).toContain('add_blackfire');
    expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
+      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player "-V"'
    );
    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'
+      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr "-V"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/latest/download/php-cs-fixer.phar php-cs-fixer'
+      'add_tool https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/latest/download/php-cs-fixer.phar php-cs-fixer "-V"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar phpstan'
+      'add_tool https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar phpstan "-V"'
    );
    expect(script).toContain(
-      'add_tool https://phar.io/releases/phive.phar phive'
+      'add_tool https://www.phing.info/get/phing-latest.phar phing "-v"'
    );
    expect(script).toContain(
-      'add_tool https://phar.phpunit.de/phpunit.phar phpunit'
+      'add_tool https://phar.io/releases/phive.phar phive status'
    );
    expect(script).toContain(
-      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_linux_amd64 symfony'
+      'add_tool https://phar.phpunit.de/phpunit.phar phpunit "--version"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
+      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_linux_amd64 symfony version'
    );
+    expect(script).toContain(
+      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
+    );
+    expect(script).toContain('add_protoc latest');
+    expect(script).toContain('add_grpc_php_plugin latest');
    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 phplint phplint overtrue/');
    expect(script).toContain('add_composertool phinx phinx:1.2.3 robmorgan/');
-    expect(script).toContain('add_devtools');
-    expect(script).toContain('add_log "$tick" "php-config" "Added"');
-    expect(script).toContain('add_log "$tick" "phpize" "Added"');
+    expect(script).toContain('add_devtools php-config');
+    expect(script).toContain('add_devtools phpize');
  });
  it('checking addTools on darwin', async () => {
    const listOfTools = [
+      'behat',
      'blackfire',
      'blackfire-player',
      'composer-normalize',
-      'composer-prefetcher:1.2.3',
      'composer-require-checker',
      'composer-unused',
      'cs2pr:1.2.3',
      'flex',
+      'grpc_php_plugin:1.2.3',
      'infection',
      'phan',
      'phan:2.7.2',
+      'phing:1.2.3',
      'phinx',
      'phive:1.2.3',
      'php-config',
@ -466,6 +489,8 @@ describe('Tools tests', () => {
      'phpcs',
      'phpize',
      'phpmd',
+      'phpspec',
+      'protoc:v1.2.3',
      'psalm',
      'symfony',
      'symfony:1.2.3',
@ -481,67 +506,71 @@ describe('Tools tests', () => {

    expect(script).toContain('add_blackfire');
    expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
+      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player "-V"'
    );
    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/ergebnis/composer-normalize/releases/latest/download/composer-normalize.phar composer-normalize'
+      'add_tool https://github.com/ergebnis/composer-normalize/releases/latest/download/composer-normalize.phar composer-normalize "-V"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar composer-require-checker'
+      'add_tool https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar composer-require-checker "-V"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/composer-unused/composer-unused/releases/latest/download/composer-unused.phar composer-unused'
+      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr "-V"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr'
+      'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection "-V"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection'
+      'add_tool https://github.com/phan/phan/releases/latest/download/phan.phar phan "-v"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/phan/phan/releases/latest/download/phan.phar phan'
+      'add_tool https://www.phing.info/get/phing-1.2.3.phar phing "-v"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs'
+      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs "--version"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcbf.phar phpcbf'
+      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcbf.phar phpcbf "--version"'
    );
    expect(script).toContain(
-      'add_tool https://phar.phpunit.de/phpcpd.phar phpcpd'
+      'add_tool https://phar.phpunit.de/phpcpd.phar phpcpd "--version"'
    );
    expect(script).toContain(
-      'add_tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd'
+      'add_tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd "--version"'
    );
    expect(script).toContain(
-      'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
+      'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm "-v"'
    );
+    expect(script).toContain('add_grpc_php_plugin 1.2.3');
+    expect(script).toContain('add_protoc 1.2.3');
+    expect(script).toContain('add_composertool behat behat behat/');
+    expect(script).toContain('add_composertool phpspec phpspec phpspec/');
    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'
+      'add_tool https://github.com/phan/phan/releases/download/2.7.2/phan.phar phan "-v"'
    );
    expect(script).toContain(
      'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
    );
    expect(script).toContain(
-      'add_composertool composer-prefetcher composer-prefetcher:1.2.3 narrowspark/automatic-'
+      'add_composertool composer-unused composer-unused icanhazstring/'
    );
    expect(script).toContain(
-      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_darwin_amd64 symfony'
+      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_darwin_amd64 symfony version'
    );
    expect(script).toContain(
-      'add_tool https://github.com/symfony/cli/releases/download/v1.2.3/symfony_darwin_amd64 symfony'
+      'add_tool https://github.com/symfony/cli/releases/download/v1.2.3/symfony_darwin_amd64 symfony version'
    );
    expect(script).toContain(
-      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
+      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
    );
-    expect(script).toContain('add_log "$tick" "phpize" "Added"');
-    expect(script).toContain('add_log "$tick" "php-config" "Added"');
+    expect(script).toContain('add_devtools phpize');
+    expect(script).toContain('add_devtools php-config');
  });
  it('checking addTools on windows', async () => {
    const listOfTools = [
@ -557,7 +586,6 @@ describe('Tools tests', () => {
      'php-config',
      'phpize',
      'phpmd',
-      'prestissimo',
      'symfony',
      'wp-cli'
    ];
@ -570,31 +598,30 @@ describe('Tools tests', () => {

    expect(script).toContain('Add-Blackfire');
    expect(script).toContain(
-      'Add-Tool https://get.blackfire.io/blackfire-player-v1.8.1.phar blackfire-player'
+      'Add-Tool https://get.blackfire.io/blackfire-player-v1.8.1.phar blackfire-player "-V"'
    );
    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'
+      'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr "-V"'
    );
    expect(script).toContain('Add-Composertool flex flex symfony/');
    expect(script).toContain(
-      'Add-Tool https://deployer.org/deployer.phar deployer'
+      'Add-Tool https://deployer.org/deployer.phar deployer "-V"'
    );
-    expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
    expect(script).toContain(
-      'Add-Tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd'
+      'Add-Tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd "--version"'
    );
    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
    expect(script).toContain(
-      'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.2/phive-0.13.2.phar phive'
+      'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.2/phive-0.13.2.phar phive status'
    );
    expect(script).toContain(
-      'Add-Tool https://github.com/symfony/cli/releases/latest/download/symfony_windows_amd64.exe symfony'
+      'Add-Tool https://github.com/symfony/cli/releases/latest/download/symfony_windows_amd64.exe symfony version'
    );
    expect(script).toContain(
-      'Add-Tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
+      'Add-Tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
    );
    expect(script).toContain('phpize is not a windows tool');
    expect(script).toContain('php-config is not a windows tool');
@ -614,7 +641,7 @@ describe('Tools tests', () => {
    );

    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('Add-Composertool prestissimo prestissimo hirak/');
    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
@ -632,12 +659,12 @@ describe('Tools tests', () => {
    );

    expect(script).toContain(
-      'add_tool https://getcomposer.org/composer-1.phar composer'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-1.phar,https://getcomposer.org/composer-1.phar composer'
    );

    script = await tools.addTools('composer:preview', '7.4', 'linux');
    expect(script).toContain(
-      'add_tool https://getcomposer.org/composer-preview.phar composer'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-preview.phar,https://getcomposer.org/composer-preview.phar composer preview'
    );
    script = await tools.addTools(
      'composer:v1, composer:preview, composer:snapshot',
@ -645,7 +672,7 @@ describe('Tools tests', () => {
      'linux'
    );
    expect(script).toContain(
-      'add_tool https://getcomposer.org/composer.phar composer'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-snapshot.phar,https://getcomposer.org/composer.phar composer snapshot'
    );
  });
 });
--- a/tests/utils.test.ts
+++ b/tests/utils.test.ts
@ -17,23 +17,37 @@ async function cleanup(path: string): Promise<void> {
 }

 describe('Utils tests', () => {
+  it('checking readEnv', async () => {
+    process.env['test'] = 'setup-php';
+    expect(await utils.readEnv('test')).toBe('setup-php');
+    expect(await utils.readEnv('undefined')).toBe('');
+  });
+
  it('checking getInput', async () => {
    process.env['test'] = 'setup-php';
-    process.env['undefined'] = '';
    expect(await utils.getInput('test', false)).toBe('setup-php');
-    expect(await utils.getInput('undefined', false)).toBe('');
    expect(await utils.getInput('setup-php', false)).toBe('setup-php');
    expect(await utils.getInput('DoesNotExist', false)).toBe('');
+    expect(async () => {
+      await utils.getInput('DoesNotExist', true);
+    }).rejects.toThrow('Input required and not supplied: DoesNotExist');
+  });
+
+  it('checking parseVersion', async () => {
+    expect(await utils.parseVersion('7')).toBe('7.0');
+    expect(await utils.parseVersion('7.4')).toBe('7.4');
+    expect(await utils.parseVersion('latest')).toBe('7.4');
  });

  it('checking asyncForEach', async () => {
    const array: Array<string> = ['a', 'b', 'c'];
    let concat = '';
-    await utils.asyncForEach(array, async function (
-      str: string
-    ): Promise<void> {
-      concat += str;
-    });
+    await utils.asyncForEach(
+      array,
+      async function (str: string): Promise<void> {
+        concat += str;
+      }
+    );
    expect(concat).toBe('abc');
  });

@ -70,12 +84,12 @@ describe('Utils tests', () => {
    const runner_dir: string = process.env['RUNNER_TOOL_CACHE'] || '';
    const script_path: string = path.join(runner_dir, 'test.sh');
    await utils.writeScript('test.sh', testString);
-    await fs.readFile(script_path, function (
-      error: Error | null,
-      data: Buffer
-    ) {
-      expect(testString).toBe(data.toString());
-    });
+    await fs.readFile(
+      script_path,
+      function (error: Error | null, data: Buffer) {
+        expect(testString).toBe(data.toString());
+      }
+    );
    await cleanup(script_path);
  });

@ -131,8 +145,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 +159,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 () => {
@ -163,8 +177,58 @@ 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'
    );
  });
+
+  it('checking getUnsupportedLog', async () => {
+    expect(await utils.getUnsupportedLog('ext', '5.6', 'linux')).toContain(
+      'add_log "$cross" "ext" "ext is not supported on PHP 5.6"'
+    );
+  });
+
+  it('checking getCommand', async () => {
+    expect(await utils.getCommand('linux', 'tool')).toBe('add_tool ');
+    expect(await utils.getCommand('darwin', 'tool')).toBe('add_tool ');
+    expect(await utils.getCommand('win32', 'tool')).toBe('Add-Tool ');
+    expect(await utils.getCommand('openbsd', 'tool')).toContain(
+      'Platform openbsd is not supported'
+    );
+  });
+
+  it('checking joins', async () => {
+    expect(await utils.joins('a', 'b', 'c')).toBe('a b c');
+  });
+
+  it('checking scriptExtension', async () => {
+    expect(await utils.scriptExtension('linux')).toBe('.sh');
+    expect(await utils.scriptExtension('darwin')).toBe('.sh');
+    expect(await utils.scriptExtension('win32')).toBe('.ps1');
+    expect(await utils.scriptExtension('openbsd')).toContain(
+      'Platform openbsd is not supported'
+    );
+  });
+
+  it('checking scriptTool', async () => {
+    expect(await utils.scriptTool('linux')).toBe('bash');
+    expect(await utils.scriptTool('darwin')).toBe('bash');
+    expect(await utils.scriptTool('win32')).toBe('pwsh');
+    expect(await utils.scriptTool('openbsd')).toContain(
+      'Platform openbsd is not supported'
+    );
+  });
+
+  it('checking customPackage', async () => {
+    const script_path: string = path.join('ext', 'pkg.sh');
+    expect(await utils.customPackage('pkg', 'ext', '1.2.3', 'linux')).toContain(
+      script_path + '\nadd_pkg 1.2.3'
+    );
+    expect(
+      await utils.customPackage('pdo_pkg', 'ext', '1.2.3', 'linux')
+    ).toContain(script_path + '\nadd_pkg 1.2.3');
+    expect(
+      await utils.customPackage('pkg8', 'ext', '1.2.3', 'linux')
+    ).toContain(script_path + '\nadd_pkg 1.2.3');
+  });
 });
--- a/dist/index.js
+++ b/dist/index.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,12 +1,12 @@
 {
  "name": "setup-php",
-  "version": "2.4.0",
+  "version": "2.7.0",
  "private": false,
  "description": "Setup PHP for use with GitHub Actions",
  "main": "dist/index.js",
  "scripts": {
    "build": "tsc",
-    "lint": "eslint **/*.ts --cache",
+    "lint": "eslint **/*.ts --cache --fix",
    "format": "prettier --write **/*.ts && git add .",
    "format-check": "prettier --check **/*.ts",
    "release": "ncc build src/install.ts -o dist && git add -f dist/",
@ -24,29 +24,28 @@
  "author": "shivammathur",
  "license": "MIT",
  "dependencies": {
-    "@actions/core": "^1.2.4",
+    "@actions/core": "^1.2.6",
    "@actions/exec": "^1.0.4",
-    "@actions/http-client": "^1.0.8",
    "@actions/io": "^1.0.2",
    "fs": "0.0.1-security"
  },
  "devDependencies": {
-    "@types/jest": "^26.0.5",
-    "@types/node": "^14.0.23",
-    "@typescript-eslint/eslint-plugin": "^3.6.1",
-    "@typescript-eslint/parser": "^3.6.1",
+    "@types/jest": "^26.0.14",
+    "@types/node": "^14.11.10",
+    "@typescript-eslint/eslint-plugin": "^4.4.1",
+    "@typescript-eslint/parser": "^4.4.1",
    "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.5.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jest": "^23.18.0",
+    "eslint": "^7.11.0",
+    "eslint-config-prettier": "^6.13.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jest": "^24.1.0",
    "eslint-plugin-prettier": "^3.1.4",
-    "husky": "^4.2.5",
-    "jest": "^26.1.0",
-    "jest-circus": "^26.1.0",
-    "prettier": "^2.0.5",
-    "ts-jest": "^26.1.3",
-    "typescript": "^3.9.7"
+    "husky": "^4.3.0",
+    "jest": "^26.6.0",
+    "jest-circus": "^26.6.0",
+    "prettier": "^2.1.2",
+    "ts-jest": "^26.4.1",
+    "typescript": "^4.0.3"
  },
  "husky": {
    "skipCI": true,
--- a/src/coverage.ts
+++ b/src/coverage.ts
@ -32,7 +32,7 @@ export async function addCoverageXdebug(
  );
  switch (true) {
    case /^xdebug3$/.test(extension):
-    case /^8\.0$/.test(version):
+    case /^8\.\d$/.test(version):
      return '\n' + xdebug + '\n' + ini + '\n' + log;
    case /^xdebug$/.test(extension):
    default:
--- a/src/extensions.ts
+++ b/src/extensions.ts
@ -1,27 +1,5 @@
-import * as path from 'path';
 import * as utils from './utils';

-/**
- * Function to get Xdebug version compatible with php versions
- *
- * @param version
- */
-export async function getXdebugVersion(version: string): Promise<string> {
-  switch (version) {
-    case '5.3':
-      return '2.2.7';
-    case '5.4':
-      return '2.4.1';
-    case '5.5':
-    case '5.6':
-      return '2.5.5';
-    case '7.0':
-      return '2.7.2';
-    default:
-      return '2.9.6';
-  }
-}
-
 /**
 * Install and enable extensions for darwin
 *
@ -41,7 +19,7 @@ export async function addExtensionDarwin(
    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 command_prefix = 'pecl_install ';
    let command = '';
    switch (true) {
      // match :extension
@ -49,48 +27,52 @@ export async function addExtensionDarwin(
        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
+      // match 5.3blackfire-(semver)...5.6blackfire-(semver), 7.0blackfire-(semver)...7.4blackfire-(semver)
+      // match pdo_oci and oci8
+      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
      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;
+      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+        add_script += await utils.customPackage(
+          ext_name,
+          'ext',
+          extension,
+          'darwin'
+        );
+        return;
      // match pre-release versions. For example - xdebug-beta
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script +=
-          '\nadd_unstable_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
+        add_script += await utils.joins(
+          '\nadd_unstable_extension',
+          ext_name,
+          ext_version,
+          ext_prefix
+        );
        return;
      // match semver
      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        add_script +=
-          '\nadd_pecl_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
+        add_script += await utils.joins(
+          '\nadd_pecl_extension',
+          ext_name,
+          ext_version,
+          ext_prefix
+        );
        return;
-      // match 5.3xdebug...5.5xdebug
-      case /5\.[3-5]xdebug/.test(version_extension):
-        command =
-          command_prefix + 'xdebug-' + (await getXdebugVersion(version));
-        break;
-      // 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|swoole)/.test(version_extension):
-      case /(5\.6|7\.[0-4])(grpc|protobuf)/.test(version_extension):
+      // match 5.3pcov to 7.0pcov
+      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
+        add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
+        return;
+      // match 5.6xdebug to 8.9xdebug, 5.6igbinary to 8.9igbinary
+      // match 5.6grpc to 7.4grpc, 5.6imagick to 7.4imagick, 5.6protobuf to 7.4protobuf, 5.6swoole to 7.4swoole
+      // match 7.1pcov to 8.9pcov
+      case /(5\.6|7\.[0-4]|8\.[0-9])(xdebug|igbinary)/.test(version_extension):
+      case /(5\.6|7\.[0-4])(grpc|imagick|protobuf|swoole)/.test(
+        version_extension
+      ):
      case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
        command = 'add_brew_extension ' + ext_name;
        break;
@ -98,55 +80,28 @@ export async function addExtensionDarwin(
      case /5\.6redis/.test(version_extension):
        command = command_prefix + 'redis-2.2.8';
        break;
-      // match imagick
-      case /^imagick$/.test(extension):
-        command =
-          'brew install pkg-config imagemagick' +
-          pipe +
-          ' && ' +
-          command_prefix +
-          'imagick' +
-          pipe;
+      // match 5.4imagick and 5.5imagick
+      case /^5\.[4-5]imagick$/.test(version_extension):
+        command = await utils.joins(
+          'brew install pkg-config imagemagick' + pipe,
+          '&& ' + command_prefix + 'imagick' + pipe
+        );
        break;
      // match sqlite
      case /^sqlite$/.test(extension):
        extension = 'sqlite3';
        command = command_prefix + extension;
        break;
-      // match pdo_oci and oci8
-      case /^pdo_oci$|^oci8$/.test(extension):
-        add_script +=
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/oci.sh') +
-          ' ' +
-          extension +
-          ' ' +
-          version;
-        return;
-      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
-        add_script +=
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/ioncube.sh') +
-          ' ' +
-          version;
-        return;
-      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        add_script +=
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
-          ' ' +
-          extension +
-          ' ' +
-          version;
-        return;
      default:
        command = command_prefix + extension;
        break;
    }
-    add_script +=
-      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+    add_script += await utils.joins(
+      '\nadd_extension',
+      extension,
+      '"' + command + '"',
+      ext_prefix
+    );
  });
  return add_script + remove_script;
 }
@ -172,38 +127,58 @@ export async function addExtensionWindows(
      // 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(
+        break;
+      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
+      // match 5.3blackfire-(semver)...5.6blackfire-(semver), 7.0blackfire-(semver)...7.4blackfire-(semver)
+      // match pdo_oci and oci8
+      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
        version_extension
      ):
-        add_script +=
-          '\n& ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
-          ' ' +
-          version +
-          ' ' +
-          extension;
+      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+        add_script += await utils.customPackage(
+          ext_name,
+          'ext',
+          extension,
+          'win32'
+        );
        return;
      // match pre-release versions. For example - xdebug-beta
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
+        add_script += await utils.joins(
+          '\nAdd-Extension',
+          ext_name,
+          ext_version
+        );
        break;
      // match semver without state
      case /.*-\d+\.\d+\.\d+$/.test(version_extension):
-        add_script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
-        return;
+        add_script += await utils.joins(
+          '\nAdd-Extension',
+          ext_name,
+          'stable',
+          ext_version
+        );
+        break;
      // 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(
+      case /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.test(version_extension):
+        matches = /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.exec(
          version_extension
        ) as RegExpExecArray;
-        add_script +=
-          '\nAdd-Extension ' + ext_name + ' ' + matches[2] + ' ' + matches[1];
-        return;
+        add_script += await utils.joins(
+          '\nAdd-Extension',
+          ext_name,
+          matches[2].replace('preview', 'devel'),
+          matches[1]
+        );
+        break;
+      // match 5.3pcov to 7.0pcov
+      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
+        add_script += await utils.getUnsupportedLog('pcov', version, 'win32');
+        break;
      // match 5.3mysql..5.6mysql
      // match 5.3mysqli..5.6mysqli
      // match 5.3mysqlnd..5.6mysqlnd
@ -211,47 +186,16 @@ export async function addExtensionWindows(
        add_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
+      // match 7.0mysql..8.9mysql
+      // match 7.0mysqli..8.9mysqli
+      // match 7.0mysqlnd..8.9mysqlnd
      case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
        add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
        break;
      // match sqlite
      case /^sqlite$/.test(extension):
        extension = 'sqlite3';
-        add_script += '\nAdd-Extension ' + extension;
-        break;
-      // match pdo_oci and oci8
-      case /^pdo_oci$|^oci8$/.test(extension):
-        add_script +=
-          '\n& ' +
-          path.join(__dirname, '../src/scripts/ext/oci.ps1') +
-          ' ' +
-          extension +
-          ' ' +
-          version +
-          '\n';
-        break;
-      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
-        add_script +=
-          '\n& ' +
-          path.join(__dirname, '../src/scripts/ext/ioncube.ps1') +
-          ' ' +
-          version +
-          '\n';
-        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 +=
-          '\n& ' +
-          path.join(__dirname, '../src/scripts/ext/phalcon.ps1') +
-          ' ' +
-          extension +
-          ' ' +
-          version +
-          '\n';
+        add_script += await utils.joins('\nAdd-Extension', extension);
        break;
      default:
        add_script += '\nAdd-Extension ' + extension;
@ -288,103 +232,71 @@ export async function addExtensionLinux(
        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}
+      // match 5.3blackfire-(semver)...5.6blackfire-(semver), 7.0blackfire-(semver)...7.4blackfire-(semver)
+      // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
+      // match pdo_oci and oci8
+      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      // match 5.6gearman..7.4gearman
      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;
+      case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
+        version_extension
+      ):
+      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^5\.6intl-[\d]+\.[\d]+$|^7\.[0-4]intl-[\d]+\.[\d]+$/.test(
+        version_extension
+      ):
+      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+      case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
+        add_script += await utils.customPackage(
+          ext_name,
+          'ext',
+          extension,
+          'linux'
+        );
+        return;
      // match pre-release versions. For example - xdebug-beta
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script +=
-          '\nadd_unstable_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
+        add_script += await utils.joins(
+          '\nadd_unstable_extension',
+          ext_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 +
-          ' ' +
-          ext_prefix;
+        add_script += await utils.joins(
+          '\nadd_pecl_extension',
+          ext_name,
+          ext_version,
+          ext_prefix
+        );
        return;
-      // match 5.6gearman..7.4gearman
-      case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
-        command =
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/gearman.sh') +
-          ' ' +
-          version +
-          pipe;
-        break;
-      // match pdo_oci and oci8
-      case /^pdo_oci$|^oci8$/.test(extension):
-        add_script +=
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/oci.sh') +
-          ' ' +
-          extension +
-          ' ' +
-          version;
-        return;
-      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
-        add_script +=
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/ioncube.sh') +
-          ' ' +
-          version;
-        return;
-      // match 7.0phalcon3...7.3phalcon3 or 7.2phalcon4...7.4phalcon4
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        add_script +=
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
-          ' ' +
-          extension +
-          ' ' +
-          version;
+      // match 5.3pcov to 7.0pcov
+      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
+        add_script += await utils.getUnsupportedLog('pcov', version, 'linux');
        return;
      // match 7.2xdebug3..7.4xdebug3
      case /^7\.[2-4]xdebug3$/.test(version_extension):
        add_script +=
          '\nadd_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension';
        return;
-      // match 8.0xdebug3
+      // match 8.0xdebug3...8.9xdebug3
      case /^8\.[0-9]xdebug3$/.test(version_extension):
        extension = 'xdebug';
        command = command_prefix + version + '-' + extension + pipe;
        break;
-      // match 7.1xdebug..7.4xdebug
-      case /^7\.[1-4]xdebug$/.test(version_extension):
-        add_script +=
-          '\nupdate_extension xdebug 2.9.6' +
-          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');
+        extension = extension.replace(/pdo[_-]|3/, '');
        add_script += '\nadd_pdo_extension ' + extension;
        return;
-      // match ast and uopz
-      case /^(ast|uopz)$/.test(extension):
+      // match uopz
+      case /^(uopz)$/.test(extension):
        command = command_prefix + '-' + extension + pipe;
        break;
      // match sqlite
@ -396,8 +308,12 @@ export async function addExtensionLinux(
        command = command_prefix + version + '-' + extension + pipe;
        break;
    }
-    add_script +=
-      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+    add_script += await utils.joins(
+      '\nadd_extension',
+      extension,
+      '"' + command + '"',
+      ext_prefix
+    );
  });
  return add_script + remove_script;
 }
--- a/src/install.ts
+++ b/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
@ -14,24 +13,19 @@ import * as matchers from './matchers';
 * @param version
 * @param os_version
 */
-export async function build(
+export async function getScript(
  filename: string,
  version: string,
  os_version: string
 ): Promise<string> {
+  const name = 'setup-php';
+  const url = 'https://setup-php.com/support';
  // taking inputs
-  const extension_csv: string =
-    (await utils.getInput('extensions', false)) ||
-    (await utils.getInput('extension', false));
+  const extension_csv: string = await utils.getInput('extensions', false);
  const ini_values_csv: string = await utils.getInput('ini-values', 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)
-  ) {
+  if (/.*-(beta|alpha|devel|snapshot|\d+\.\d+\.\d+).*/.test(extension_csv)) {
    tools_csv = 'pecl, ' + tools_csv;
  }

@ -48,6 +42,9 @@ export async function build(
    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,24 +53,17 @@ export async function build(
 */
 export async function run(): Promise<void> {
  try {
-    let version: string = await utils.getInput('php-version', true);
-    version = version.length > 1 ? version.slice(0, 3) : version + '.0';
+    const version: string = await utils.parseVersion(
+      await utils.getInput('php-version', true)
+    );
    const os_version: string = process.platform;
-
-    // check the os version and run the respective script
-    let script_path = '';
-    switch (os_version) {
-      case 'darwin':
-      case 'linux':
-        script_path = await build(os_version + '.sh', version, os_version);
-        await exec('bash ' + script_path + ' ' + version + ' ' + __dirname);
-        break;
-      case 'win32':
-        script_path = await build('win32.ps1', version, os_version);
-        await exec('pwsh ' + script_path + ' ' + version + ' ' + __dirname);
-        break;
-    }
-    await matchers.addMatchers();
+    const tool = await utils.scriptTool(os_version);
+    const script = os_version + (await utils.scriptExtension(os_version));
+    const location = await getScript(script, version, os_version);
+    const fail_fast = await utils.readEnv('fail-fast');
+    await exec(
+      await utils.joins(tool, location, version, __dirname, fail_fast)
+    );
  } catch (error) {
    core.setFailed(error.message);
  }
--- a/src/matchers.ts
+++ b/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);
-}
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@ -13,9 +13,20 @@ add_log() {
    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
  else
    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+    [ "$fail_fast" = "true" ] && exit 1;
  fi
 }

+# Function to log result of installing extension.
+add_extension_log() {
+  extension=$1
+  status=$2
+  extension_name=$(echo "$extension" | cut -d '-' -f 1)
+  (
+    check_extension "$extension_name" && add_log "$tick" "$extension_name" "$status"
+  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP $semver"
+}
+
 # Function to read env inputs.
 read_env() {
  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
@ -27,9 +38,9 @@ read_env() {
 # 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"
+    step_log "Setup Brew"
+    curl "${curl_opts[@]}" https://raw.githubusercontent.com/Homebrew/install/master/install.sh | bash -s >/dev/null 2>&1
+    add_log "$tick" "Brew" "Installed Homebrew"
  fi
 }

@ -41,7 +52,7 @@ remove_extension() {
    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"
+      add_log "$cross" ":$extension" "Could not remove $extension on PHP $semver"
  else
    add_log "$tick" ":$extension" "Could not find $extension on PHP $semver"
  fi
@ -57,12 +68,12 @@ check_extension() {
  fi
 }

-# Fuction to get the PECL version.
+# Function to get the PECL version.
 get_pecl_version() {
  extension=$1
-  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
  pecl_rest='https://pecl.php.net/rest/r/'
-  response=$(curl -q -sSL "$pecl_rest$extension"/allreleases.xml)
+  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*)")
@ -70,12 +81,18 @@ get_pecl_version() {
  echo "$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
+}
+
 # Function to install a specific version of PECL extension.
 add_pecl_extension() {
  extension=$1
  pecl_version=$2
  prefix=$3
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot).* ]]; then
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
  fi
  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
@ -86,11 +103,8 @@ add_pecl_extension() {
    add_log "$tick" "$extension" "Enabled"
  else
    remove_extension "$extension" >/dev/null 2>&1
-    (
-      sudo pecl install -f "$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"
+    pecl_install "$extension-$pecl_version"
+    add_extension_log "$extension-$pecl_version" "Installed and enabled"
  fi
 }

@ -115,9 +129,8 @@ add_extension() {
    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"
+      if [[ "$version" =~ $old_versions ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
+    add_extension_log "$extension" "Installed and enabled"
  fi
 }

@ -137,16 +150,30 @@ configure_composer() {
  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;
+    exit 1
  fi
  composer -q global config process-timeout 0
-  echo "::add-path::/Users/$USER/.composer/vendor/bin"
+  echo "$composer_bin" >> "$GITHUB_PATH"
  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
+}
+
+# Function to extract tool version.
+get_tool_version() {
+  tool=$1
+  param=$2
+  version_regex="[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-zA-Z0-9]+){0,1}"
+  if [ "$tool" = "composer" ]; then
+    if [ "$param" != "snapshot" ]; then
+      grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex"
+    else
+      trunk=$(grep -Ea "const\sBRANCH_ALIAS_VERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")
+      commit=$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "[a-zA-z0-9]+" | tail -n 1)
+      echo "$trunk+$commit"
+    fi
+  else
+    $tool "$param" 2>/dev/null | sed -Ee "s/[Cc]omposer(.)?$version_regex//g" | grep -Eo "$version_regex" | head -n 1
  fi
 }

@ -154,23 +181,29 @@ configure_composer() {
 add_tool() {
  url=$1
  tool=$2
+  ver_param=$3
  tool_path="$tool_path_dir/$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
      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"
@ -178,7 +211,8 @@ add_tool() {
    elif [ "$tool" = "wp-cli" ]; then
      sudo cp -p "$tool_path" "$tool_path_dir"/wp
    fi
-    add_log "$tick" "$tool" "Added"
+    tool_version=$(get_tool_version "$tool" "$ver_param")
+    add_log "$tick" "$tool" "Added $tool $tool_version"
  else
    add_log "$cross" "$tool" "Could not setup $tool"
  fi
@ -191,23 +225,19 @@ add_composertool() {
  prefix=$3
  (
    composer global require "$prefix$release" >/dev/null 2>&1 &&
-    add_log "$tick" "$tool" "Added"
+    json=$(grep "$prefix$tool" /Users/"$USER"/.composer/composer.json) &&
+    tool_version=$(get_tool_version 'echo' "$json") &&
+    add_log "$tick" "$tool" "Added $tool $tool_version"
  ) || add_log "$cross" "$tool" "Could not setup $tool"
+  if [ -e "$composer_bin/composer" ]; then
+    sudo cp -p "$tool_path_dir/composer" "$composer_bin"
+  fi
 }

-add_blackfire() {
-  sudo mkdir -p usr/local/var/run
-  brew tap --shallow 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
-    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
-    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 handle request to add phpize and php-config.
+add_devtools() {
+  tool=$1
+  add_log "$tick" "$tool" "Added $tool $semver"
 }

 # Function to configure PECL
@ -220,7 +250,19 @@ configure_pecl() {

 # Function to handle request to add PECL.
 add_pecl() {
-  add_log "$tick" "PECL" "Added"
+  pecl_version=$(get_tool_version "pecl" "version")
+  add_log "$tick" "PECL" "Found PECL $pecl_version"
+}
+
+# Function to update dependencies.
+update_dependencies() {
+  if [[ "$version" =~ $nightly_versions ]] && [ "$runner" != "self-hosted" ]; then
+    while read -r formula; do
+      curl -o "$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/$formula.rb" "${curl_opts[@]}" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb" &
+      to_wait+=( $! )
+    done < "$(brew --prefix)/Homebrew/Library/Taps/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
+    wait "${to_wait[@]}"
+  fi
 }

 # Function to setup PHP 5.6 and newer.
@ -228,10 +270,11 @@ setup_php() {
  action=$1
  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
  brew tap --shallow shivammathur/homebrew-php
-  if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
-    brew unlink php@"$version"
+  update_dependencies
+  if ! [[ "$(find "$(brew --cellar)"/php/ -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]] && [ "$action" != "upgrade" ]; then
+    brew unlink shivammathur/php/php@"$version"
  else
-    brew "$action" shivammathur/php/php@"$version"
+    brew upgrade "shivammathur/php/php@$version" 2>/dev/null || brew install "shivammathur/php/php@$version"
  fi
  brew link --force --overwrite php@"$version"
 }
@ -240,9 +283,14 @@ setup_php() {
 tick="✓"
 cross="✗"
 version=$1
+dist=$2
+fail_fast=$3
 nodot_version=${1/./}
+nightly_versions="8.[0-1]"
 old_versions="5.[3-5]"
+composer_bin="/Users/$USER/.composer/vendor/bin"
 tool_path_dir="/usr/local/bin"
+curl_opts=(-sL)
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)

 read_env
@ -258,7 +306,7 @@ 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 &&
+  curl "${curl_opts[@]}" https://github.com/shivammathur/php5-darwin/releases/latest/download/install.sh | bash -s "$nodot_version" >/dev/null 2>&1
  status="Installed"
 elif [ "$existing_version" != "$version" ]; then
  setup_php "install" >/dev/null 2>&1
@ -274,7 +322,8 @@ sudo chmod 777 "$ini_file" "$tool_path_dir"
 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"
+sudo mkdir -m 777 -p "$ext_dir" "/Users/$USER/.composer"
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
 if [[ ! "$version" =~ $old_versions ]]; then configure_pecl >/dev/null 2>&1; fi
+sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
 add_log "$tick" "PHP" "$status PHP $semver"
--- a/src/scripts/ext/blackfire.ps1
+++ b/src/scripts/ext/blackfire.ps1
@ -1,35 +1,28 @@
-Param (
+# Function to install blackfire extension.
+Function Add-Blackfire() {
+  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 }
+  )
+  try {
+    $no_dot_version = $version.replace('.', '')
+    $extension_version = $extension.split('-')[1]
+    if ($extension_version -notmatch "\S") {
+        $extension_version = (Invoke-RestMethod https://blackfire.io/api/v1/releases).probe.php
+    }
+    if (Test-Path $ext_dir\blackfire.dll) {
+        Enable-PhpExtension -Extension blackfire -Path $php_dir
+        $status="Enabled"
+    } else {
+        $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
+        Invoke-WebRequest -UseBasicParsing -Uri "https://packages.blackfire.io/binaries/blackfire-php/${extension_version}/blackfire-php-windows_${arch}-php-${no_dot_version}${nts}.dll" -OutFile $ext_dir\blackfire.dll > $null 2>&1
+        Enable-PhpExtension -Extension blackfire -Path $php_dir
+        $status="Installed and enabled"
+    }
+    Add-Log $tick $extension $status
+  } catch {
+    Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
+  }
 }
-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"
-
--- a/src/scripts/ext/blackfire.sh
+++ b/src/scripts/ext/blackfire.sh
@ -1,11 +1,17 @@
-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"
+# Function to install blackfire extension.
+add_blackfire() {
+  extension=$1
+  version=${version:?}
+  no_dot_version=${version/./}
+  platform=$(uname -s | tr '[:upper:]' '[:lower:]')
+  extension_version=$(echo "$extension" | cut -d '-' -f 2)
+  blackfire_ini_file="${scan_dir:?}/50-blackfire.ini"
+  if [ ! -e "${ext_dir:?}/blackfire.so" ]; then
+    if [ "$extension_version" = "blackfire" ]; then
+      extension_version=$(curl -sSL https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
+    fi
+    sudo curl -o "${ext_dir:?}/blackfire.so" "${curl_opts[@]:?}" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_amd64-php-"$no_dot_version".so >/dev/null 2>&1
+  fi
+  echo "extension=blackfire.so" | sudo tee -a "$blackfire_ini_file" >/dev/null 2>&1
+  add_extension_log "$extension-$extension_version" "Installed and enabled"
+}
--- a/src/scripts/ext/blackfire_darwin.sh
+++ b/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"
--- a/src/scripts/ext/cubrid.sh
+++ b/src/scripts/ext/cubrid.sh
@ -0,0 +1,50 @@
+# Function to log license details.
+add_license_log() {
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$ext" "Click to read the $ext related license information"
+  printf "Cubrid CCI package is required for %s extension.\n" "$ext"
+  printf "The extension %s and Cubrid CCI are provided under the license linked below.\n" "$ext"
+  printf "Refer to: \033[35;1m%s \033[0m\n" "https://github.com/CUBRID/cubrid-cci/blob/develop/COPYING"
+  echo "::endgroup::"
+}
+
+# Function to set cubrid repo for the extension.
+set_cubrid_repo() {
+  case "${ext:?}" in
+    "cubrid") cubrid_repo="cubrid-php";;
+    "pdo_cubrid") cubrid_repo="cubrid-pdo";;
+  esac
+}
+
+# Function to set cubrid branch for a PHP version.
+set_cubrid_branch() {
+  case "${version:?}" in
+    5.[3-6]) cubrid_branch="RB-9.3.0";;
+    *) cubrid_branch="develop";;
+  esac
+}
+
+add_cubrid_helper() {
+  if ! [ -e "${ext_dir:?}/$ext.so" ]; then
+    status='Installed and enabled'
+    set_cubrid_repo
+    set_cubrid_branch
+    (
+      git clone -b "$cubrid_branch" --recursive "https://github.com/CUBRID/$cubrid_repo" "/tmp/$cubrid_repo"
+      cd "/tmp/$cubrid_repo" || exit
+      ! [[ "$version" =~ ${old_versions:?} ]] && add_devtools
+      phpize && ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=shared
+      make -j"$(nproc)"
+      sudo make install
+    )
+    echo "extension=$ext.so" | sudo tee "${scan_dir:?}/$ext.ini"
+  fi
+}
+
+# Function to add cubrid and pdo_cubrid.
+add_cubrid() {
+  ext=$1
+  status='Enabled'
+  add_cubrid_helper >/dev/null 2>&1
+  add_extension_log "$ext" "$status"
+  check_extension "$ext" && add_license_log
+}
--- a/src/scripts/ext/gearman.sh
+++ b/src/scripts/ext/gearman.sh
@ -1,9 +1,23 @@
-release_version=$(lsb_release -s -r)
-sudo DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:ondrej/pkg-gearman -y
-sudo DEBIAN_FRONTEND=noninteractive apt-get update -y
+# Helper function to add gearman extension.
+add_gearman_helper() {
+  sudo "${debconf_fix:?}" add-apt-repository ppa:ondrej/pkg-gearman -y
+  if [ -e "${ext_dir:?}/gearman.so" ] && [ "$DISTRIB_RELEASE" != "16.04" ]; then
+    ${apt_install:?} libgearman-dev
+    echo "extension=gearman.so" | sudo tee -a "${scan_dir:?}/20-gearman.ini" >/dev/null 2>&1
+  else
+    status="Installed and enabled"
+    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+      sudo "${debconf_fix:?}" apt-get update -y
+      ${apt_install:?} php"${version:?}"-gearman
+    else
+      ${apt_install:?} libgearman-dev php"${version:?}"-gearman
+    fi
+  fi
+}

-if [ "$release_version" = "18.04" ]; then
-  sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y libgearman-dev php"$1"-gearman
-elif [ "$release_version" = "16.04" ]; then
-  sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1"-gearman
-fi
+# Function to add gearman extension.
+add_gearman() {
+  status="Enabled"
+  add_gearman_helper >/dev/null 2>&1
+  add_extension_log "gearman" "$status"
+}
--- a/src/scripts/ext/intl.sh
+++ b/src/scripts/ext/intl.sh
@ -0,0 +1,23 @@
+# Function to install ICU
+install_icu() {
+  icu=$1
+  if [ "$(php -i | grep "ICU version =>" | sed -e "s|.*=> s*||")" != "$icu" ]; then
+    sudo curl -o /tmp/icu.tar.zst -sL "https://dl.bintray.com/shivammathur/icu4c/icu4c-$icu.tar.zst"
+    sudo tar -I zstd -xf /tmp/icu.tar.zst -C /usr/local
+    sudo cp -r /usr/local/icu/lib/* /usr/lib/x86_64-linux-gnu/
+  fi
+}
+
+# Function to add ext-intl with the given version of ICU
+add_intl() {
+  icu=$(echo "$1" | cut -d'-' -f 2)
+  supported_version=$(curl "${curl_opts[@]:?}" https://api.bintray.com/packages/shivammathur/icu4c/icu4c | grep -Po "$icu" | head -n 1)
+  if [ "$icu" != "$supported_version" ]; then
+    add_log "${cross:?}" "intl" "ICU $icu is not supported"
+  else
+    install_icu "$icu" >/dev/null 2>&1
+    sudo curl "${curl_opts[@]:?}" -o "${ext_dir:?}/intl.so" "https://dl.bintray.com/shivammathur/icu4c/php${version:?}-intl-$icu.so"
+    enable_extension intl extension
+    add_extension_log intl "Installed and enabled with ICU $icu"
+  fi
+}
--- a/src/scripts/ext/ioncube.ps1
+++ b/src/scripts/ext/ioncube.ps1
@ -1,48 +1,32 @@
-Param (
-  [Parameter(Position = 0, Mandatory = $true)]
-  [ValidateNotNull()]
-  [ValidateLength(1, [int]::MaxValue)]
-  [string]
-  $version
-)
-
 # Function to log result of a operation.
-Function Add-Log($mark, $subject, $message) {
-  if ($mark -eq $tick) {
-    printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $mark $subject $message
-    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
-    Get-Content $ext_dir\ioncube\LICENSE.txt
-    Write-Output "::endgroup::"
-  } else {
-    printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "31" $mark $subject $message
-  }
+Function Add-LicenseLog() {
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
+  Get-Content $ext_dir\ioncube\LICENSE.txt
+  Write-Output "::endgroup::"
 }

-$tick = ([char]8730)
-$cross = ([char]10007)
-$status = 'Enabled'
-$php_dir = 'C:\tools\php'
-if($env:RUNNER -eq 'self-hosted') { $php_dir = "$php_dir$version" }
-$ext_dir = "$php_dir\ext"
-$installed = Get-Php $php_dir
-try {
-  if (-not(Test-Path $ext_dir\php_ioncube.dll)) {
-    $status = 'Installed and enabled'
-    $arch = 'x86-64'
-    if (-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
-      $arch = 'x86'
+# Function to add ioncube extension.
+Function Add-Ioncube() {
+  try {
+    if (-not(Test-Path $ext_dir\php_ioncube.dll)) {
+      $status = 'Installed and enabled'
+      $arch_part = $arch
+      if ($arch -eq 'x64') {
+        $arch_part = 'x86-64'
+      }
+      $vc = $installed.VCVersion
+      $ts_part = ""
+      if (-not($installed.ThreadSafe)) {
+        $ts_part = "_nonts"
+      }
+      Invoke-WebRequest -UseBasicParsing -Uri "https://downloads.ioncube.com/loader_downloads/ioncube_loaders_win$ts_part`_vc$vc`_$arch_part.zip" -OutFile $ext_dir\ioncube.zip
+      Expand-Archive -Path $ext_dir\ioncube.zip -DestinationPath $ext_dir -Force
+      Copy-Item $ext_dir\ioncube\ioncube_loader_win_$version.dll $ext_dir\php_ioncube.dll
    }
-    $vc = $installed.VCVersion
-    $ts = ""
-    if (-not($installed.ThreadSafe)) {
-      $ts = "_nonts"
-    }
-    Invoke-WebRequest -UseBasicParsing -Uri "https://downloads.ioncube.com/loader_downloads/ioncube_loaders_win$ts`_vc$vc`_$arch.zip" -OutFile $ext_dir\ioncube.zip
-    Expand-Archive -Path $ext_dir\ioncube.zip -DestinationPath $ext_dir -Force
-    Copy-Item $ext_dir\ioncube\ioncube_loader_win_$version.dll $ext_dir\php_ioncube.dll
+    "zend_extension=$ext_dir\php_ioncube.dll`r`n" + (Get-Content $php_dir\php.ini -Raw) | Set-Content $php_dir\php.ini
+    Add-Log $tick "ioncube" $status
+    Add-LicenseLog
+  } catch {
+    Add-Log $cross "ioncube" "Could not install ioncube on PHP $($installed.FullVersion)"
  }
-  "zend_extension=$ext_dir\php_ioncube.dll`r`n" + (Get-Content $php_dir\php.ini -Raw) | Set-Content $php_dir\php.ini
-  Add-Log $tick "ioncube" $status
-} catch {
-  Add-Log $cross "ioncube" "Could not install ioncube on PHP $($installed.FullVersion)"
-}
+}
--- a/src/scripts/ext/ioncube.sh
+++ b/src/scripts/ext/ioncube.sh
@ -1,41 +1,19 @@
 # Function to log result of a operation.
-add_log() {
-  mark=$1
-  subject=$2
-  message=$3
-  if [ "$mark" = "$tick" ]; then
-    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
-    cat /tmp/ioncube/LICENSE.txt
-    echo "::endgroup::"
-  else
-    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  fi
-}
-
-# Function to test if extension is loaded.
-check_extension() {
-  extension=$1
-  php -m | grep -i -q -w "$extension"
+add_license_log() {
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
+  cat /tmp/ioncube/LICENSE.txt
+  echo "::endgroup::"
 }

 # Function to install ioncube.
-install_ioncube() {
-  if [ ! -e "$ext_dir/ioncube.so" ]; then
-    os_name='lin'
+add_ioncube() {
+  if [ ! -e "${ext_dir:?}/ioncube.so" ]; then
    status='Installed and enabled'
-    [ "$(uname -s)" = "Darwin" ] && os_name='mac'
-    curl -sSL https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp
-    sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"$version".so "$ext_dir/ioncube.so"
+    os_name='lin' && [ "$(uname -s)" = "Darwin" ] && os_name='mac'
+    curl "${curl_opts[@]:?}" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp
+    sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"${version:?}".so "$ext_dir/ioncube.so"
  fi
-  echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "$scan_dir/00-ioncube.ini"
+  echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1
+  add_extension_log "ioncube" "$status"
+  check_extension "ioncube" && add_license_log
 }
-
-version=$1
-tick='✓'
-cross='✗'
-scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
-status='Enabled'
-install_ioncube >/dev/null 2>&1
-(check_extension "ioncube" && add_log "$tick" "ioncube" "$status") || add_log "$cross" "ioncube" "Could not install ioncube"
--- a/src/scripts/ext/oci.ps1
+++ b/src/scripts/ext/oci.ps1
@ -1,68 +1,58 @@
-Param (
-  [Parameter(Position = 0, Mandatory = $true)]
-  [ValidateNotNull()]
-  [ValidateSet('oci8', 'pdo_oci')]
-  [string]
-  $extension,
-  [Parameter(Position = 1, Mandatory = $true)]
-  [ValidateNotNull()]
-  [ValidateLength(1, [int]::MaxValue)]
-  [string]
-  $version
-)
-
-# Function to log result of a operation.
-Function Add-Log($mark, $subject, $message) {
-  if ($mark -eq $tick) {
-    printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $mark $subject $message
+# Function to log license information.
+Function Add-LicenseLog() {
    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $extension "Click to read the $extension related license information"
    printf "Oracle Instant Client package is required for %s extension.\n" $extension
    printf "It is provided under the Oracle Technology Network Development and Distribution License.\n"
    printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
    Write-Output "::endgroup::"
-  } else {
-    printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "31" $mark $subject $message
-  }
 }

-$tick = ([char]8730)
-$cross = ([char]10007)
-$php_dir = 'C:\tools\php'
-$status = 'Enabled'
-if($env:RUNNER -eq 'self-hosted') { $php_dir = "$php_dir$version" }
-$ext_dir = "$php_dir\ext"
-$installed = Get-Php -Path $php_dir
-try
-{
+# Function to get instantclinet.
+Function Add-InstantClient() {
  if (-not(Test-Path $php_dir\oci.dll)) {
    $suffix = 'windows'
-    if (-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0')
-    {
+    if ($arch -eq 'x86') {
      $suffix = 'nt'
    }
    Invoke-WebRequest -UseBasicParsing -Uri https://download.oracle.com/otn_software/nt/instantclient/instantclient-basiclite-$suffix.zip -OutFile $php_dir\instantclient.zip
    Expand-Archive -Path $php_dir\instantclient.zip -DestinationPath $php_dir -Force
    Copy-Item $php_dir\instantclient*\* $php_dir
  }
-  if ($extension -eq "pdo_oci") {
-    Enable-PhpExtension pdo_oci -Path $php_dir
-  } else {
-    $status = 'Installed and enabled'
-    $ociVersion = '2.2.0'
-    if ($version -eq '7.0')
-    {
-      $ociVersion = '2.1.8'
-    }
-    elseif ($version -lt '7.0')
-    {
-      $ociVersion = '2.0.12'
-    }
-    $ociUrl = Get-PeclArchiveUrl oci8 $ociVersion $installed
-    Invoke-WebRequest -UseBasicParsing -Uri $ociUrl -OutFile $php_dir\oci8.zip
-    Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
-    Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
-  }
-  Add-Log $tick $extension $status
-} catch {
-  Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
+}
+
+# Function to install oci8 and pdo_oci.
+Function Add-Oci() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateSet('oci8', 'pdo_oci')]
+    [string]
+    $extension
+  )
+  try {
+    $status = 'Enabled'
+    Add-InstantClient
+    if ($extension -eq "pdo_oci") {
+      Enable-PhpExtension pdo_oci -Path $php_dir
+    } else {
+      if(-not(Test-Path $ext_dir\php_oci8.dll)) {
+        $status = 'Installed and enabled'
+        $ociVersion = '2.2.0'
+        if ($version -eq '7.0') {
+          $ociVersion = '2.1.8'
+        } elseif ($version -lt '7.0') {
+          $ociVersion = '2.0.12'
+        }
+        $ociUrl = Get-PeclArchiveUrl oci8 $ociVersion $installed
+        Invoke-WebRequest -UseBasicParsing -Uri $ociUrl -OutFile $php_dir\oci8.zip
+        Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
+
+      }
+      Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
+    }
+    Add-Log $tick $extension $status
+    Add-LicenseLog
+  } catch {
+    Add-Log $cross $extension "Could not install $extension on PHP $( $installed.FullVersion )"
+  }
 }
--- a/src/scripts/ext/oci.sh
+++ b/src/scripts/ext/oci.sh
@ -1,38 +1,25 @@
 # Function to log result of a operation.
-add_log() {
-  mark=$1
-  subject=$2
-  message=$3
-  if [ "$mark" = "$tick" ]; then
-    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$ext" "Click to read the $ext related license information"
-    printf "Oracle Instant Client package is required for %s extension.\n" "$ext"
-    printf "It is provided under the Oracle Technology Network Development and Distribution License.\n"
-    printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
-    echo "::endgroup::"
-  else
-    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  fi
-}
-
-# Function to test if extension is loaded.
-check_extension() {
-  extension=$1
-  php -m | grep -i -q -w "$extension"
+add_license_log() {
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$ext" "Click to read the $ext related license information"
+  printf "Oracle Instant Client package is required for %s extension.\n" "$ext"
+  printf "It is provided under the Oracle Technology Network Development and Distribution License.\n"
+  printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
+  echo "::endgroup::"
 }

 # Function to get the tag for a php version.
 get_tag() {
-  master_version='8.0'
  tag='master'
-  if [ ! "$version" = "$master_version" ]; then
-      tag="php-$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')"
+  if ! [[ ${version:?} =~ $nightly_versions ]]; then
+    tag="php-$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')"
+  elif [ "${version:?}" = '8.0' ]; then
+    tag="PHP-8.0"
  fi
  echo "$tag"
 }

 # Function to install instantclient and SDK.
-install_client() {
+add_client() {
  sudo mkdir -p -m 777 "$oracle_home"
  if [ ! -e "$oracle_client" ]; then
    for package in basiclite sdk; do
@ -47,7 +34,7 @@ install_client() {
        arch='macos'
        lib_ext='dylib'
      fi
-      curl -o "/opt/oracle/$package.zip" -sSL "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-$arch.zip"
+      curl -o "/opt/oracle/$package.zip" "${curl_opts[@]:?}" "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-$arch.zip"
      unzip "/opt/oracle/$package.zip" -d "$oracle_home"
    done
    sudo ln -sf /opt/oracle/instantclient*/*.$lib_ext* $libs
@ -57,15 +44,15 @@ install_client() {

 # Function to get PHP source.
 get_php() {
-  [ ! -d "/opt/oracle/php-src-$tag" ] && curl -sSL "https://github.com/php/php-src/archive/$tag.tar.gz" | tar xzf - -C "$oracle_home/"
+  [ ! -d "/opt/oracle/php-src-$tag" ] && curl "${curl_opts[@]}" "https://github.com/php/php-src/archive/$tag.tar.gz" | tar xzf - -C "$oracle_home/"
 }

 # Function to get phpize location on darwin.
 get_phpize() {
  if [[ "$version" =~ 5.[3-5] ]]; then
-      echo '/opt/local/bin/phpize'
+    echo '/opt/local/bin/phpize'
  else
-      echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
+    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
  fi
 }

@ -86,55 +73,60 @@ restore_phpize() {

 # Function to patch pdo_oci.
 patch_pdo_oci_config() {
-  curl -sSLO https://raw.githubusercontent.com/php/php-src/master/ext/pdo_oci/config.m4
-  sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
+  curl -O "${curl_opts[@]}" https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
+  if [[ ${version:?} =~ 5.[3-6] ]]; then
+    sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 2>/dev/null || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
+  fi
 }

 # Function to install the dependencies.
-install_dependencies() {
+add_dependencies() {
  if [ "$os" = 'Linux' ]; then
-    if [ "$runner" = "self-hosted" ] || [ "$RUNNER" = "self-hosted" ]; then
-      sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y autoconf automake libaio-dev gcc g++ php"$version"-dev
+    if [ "${runner:?}" = "self-hosted" ]; then
+      if ! [[ ${version:?} =~ $nightly_versions ]]; then
+        ${apt_install:?} --no-upgrade --no-install-recommends autoconf automake libaio-dev gcc g++ php"$version"-dev
+      else
+        ${apt_install:?} --no-upgrade --no-install-recommends autoconf automake libaio-dev gcc g++
+      fi
    else
-      sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$version"-dev
+      ! [[ ${version:?} =~ $nightly_versions ]] && update_lists && ${apt_install:?} --no-upgrade --no-install-recommends php"$version"-dev
    fi
    sudo update-alternatives --set php-config /usr/bin/php-config"$version"
    sudo update-alternatives --set phpize /usr/bin/phpize"$version"
  fi
 }

-# Function to install the extension.
-install_extension() {
-  if ! [ -e "$ext_dir/$ext.so" ]; then
+# Function to install oci8 and pdo_oci.
+add_oci_helper() {
+  if ! [ -e "${ext_dir:?}/$ext.so" ]; then
+    status='Installed and enabled'
+    phpize_orig=$(get_phpize)
+    tag=$(get_tag)
+    get_php
+    patch_phpize
    (
-      status='Installed and enabled'
-      phpize_orig=$(get_phpize)
-      tag=$(get_tag)
-      get_php
-      patch_phpize
      cd "/opt/oracle/php-src-$tag/ext/$ext" || exit 1
      [ "$ext" = "pdo_oci" ] && patch_pdo_oci_config
      sudo phpize && ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=instantclient,"$oracle_client"
      sudo make -j"$(nproc)"
      sudo cp ./modules/* "$ext_dir/"
-      restore_phpize
    )
+    restore_phpize
  fi
-  echo "extension=$ext.so" | sudo tee "$scan_dir/99-$ext.ini"
+  echo "extension=$ext.so" | sudo tee "${scan_dir:?}/99-$ext.ini"
 }

-ext=$1
-version=$2
-tick='✓'
-cross='✗'
-status='Enabled'
-oracle_home='/opt/oracle'
-oracle_client=$oracle_home/instantclient
-runner="${runner:-github}" && RUNNER="${RUNNER:-github}"
-os=$(uname -s)
-scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
-install_client >/dev/null 2>&1
-install_dependencies >/dev/null 2>&1
-install_extension >/dev/null 2>&1
-(check_extension "$ext" && add_log "$tick" "$ext" "$status") || add_log "$cross" "$ext" "Could not install $ext"
+# Function to add oci extension oci8 and pdo_oci.
+add_oci() {
+  ext=$1
+  status='Enabled'
+  oracle_home='/opt/oracle'
+  oracle_client=$oracle_home/instantclient
+  os=$(uname -s)
+  nightly_versions='8.[0-1]'
+  add_client >/dev/null 2>&1
+  add_dependencies >/dev/null 2>&1
+  add_oci_helper >/dev/null 2>&1
+  add_extension_log "$ext" "$status"
+  check_extension "$ext" && add_license_log
+}
--- a/src/scripts/ext/pcov.sh
+++ b/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
--- a/src/scripts/ext/phalcon.ps1
+++ b/src/scripts/ext/phalcon.ps1
@ -1,57 +1,55 @@
-Param (
+# Function to install phalcon
+Function Add-PhalconHelper() {
+  if ($extension_version -eq '4') {
+    Install-Phpextension phalcon -MinimumStability stable -Path $php_dir
+  } else {
+    $domain = 'https://github.com'
+    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
+    $match = Invoke-WebRequest -UseBasicParsing -Uri $domain/phalcon/cphalcon/releases | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
+    $zip_file = $match.Matches[0].Groups[1].Value
+    Invoke-WebRequest -UseBasicParsing -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
+    Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1
+    Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll" -Destination "$ext_dir\php_phalcon.dll"
+    Enable-PhpExtension -Extension phalcon -Path $php_dir
+  }
+}
+
+Function Add-Phalcon() {
+  Param (
    [Parameter(Position = 0, Mandatory = $true)]
    [ValidateNotNull()]
    [ValidateSet('phalcon3', 'phalcon4')]
    [string]
-    $extension,
-    [Parameter(Position = 1, Mandatory = $true)]
-    [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
-    [string]
-    $version
-)
+    $extension
+  )
+  try {
+    $status = 'Enabled'
+    $extension_version = $extension.substring($extension.Length - 1)

-# Function to install phalcon
-Function Install-Phalcon() {
-    if ($extension_version -eq '4') {
-        Install-Phpextension phalcon -MinimumStability stable -Path $php_dir
-    } else {
-        $installed = Get-Php -Path $php_dir
-        $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-        $match = Invoke-WebRequest -UseBasicParsing -Uri $domain/phalcon/cphalcon/releases | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
-        $zip_file = $match.Matches[0].Groups[1].Value
-        Invoke-WebRequest -UseBasicParsing -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
-        Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1
-        Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll" -Destination "$ext_dir\php_phalcon.dll"
-        Enable-PhpExtension -Extension phalcon -Path $php_dir
-    }
-    printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick $extension "Installed and enabled"
-}
-
-$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"
-$extension_version = $extension.substring($extension.Length - 1)
-
-if($extension_version -eq '4') {
-    if (Test-Path $ext_dir\php_psr.dll) {
+    if($extension_version -eq '4') {
+      if (Test-Path $ext_dir\php_psr.dll) {
        Enable-PhpExtension -Extension psr -Path $php_dir
-    } else {
+      } else {
        Install-Phpextension psr -MinimumStability stable -Path $php_dir
+      }
    }
-}

-if(Test-Path $ext_dir\php_phalcon.dll) {
-    $phalcon = Get-PhpExtension $ext_dir\php_phalcon.dll
-    if($phalcon.Version[0] -eq $extension_version) {
+    if(Test-Path $ext_dir\php_phalcon.dll) {
+      $phalcon = Get-PhpExtension $ext_dir\php_phalcon.dll
+      if($phalcon.Version[0] -eq $extension_version) {
        Enable-PhpExtension -Extension phalcon -Path $php_dir
-        printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick $extension "Enabled"
-    } else {
+      } else {
+        $status = 'Installed and enabled'
        Remove-Item $ext_dir\php_phalcon.dll
-        Install-Phalcon
+        Add-PhalconHelper
+      }
+    } else {
+      $status = 'Installed and enabled'
+      Add-PhalconHelper
    }
-} else {
-    Install-Phalcon
-}
+    Add-Log $tick $extension $status
+  } catch [Exception] {
+    Write-Output $_.Exception|format-list -force
+    Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
+  }
+}
--- a/src/scripts/ext/phalcon.sh
+++ b/src/scripts/ext/phalcon.sh
@ -1,71 +1,69 @@
-# Function to log result of a operation
-add_log() {
-  mark=$1
-  subject=$2
-  message=$3
-  if [ "$mark" = "$tick" ]; then
-    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+# Helper function to add phalcon.
+add_phalcon_helper() {
+  status='Installed and enabled'
+  if [ "$os_name" = "Linux" ]; then
+    update_lists
+    if [ "$extension" = "phalcon4" ]; then
+      ${apt_install:?} "php${version:?}-psr" "php${version:?}-$extension"
+    else
+      ${apt_install:?} "php${version:?}-$extension"
+    fi
  else
-    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+    phalcon_ini_file=${ini_file:?}
+    sed -i '' '/extension.*psr/d' "${ini_file:?}"
+    brew tap shivammathur/homebrew-phalcon
+    brew install phalcon@"${version:?}"_"$extension_major_version"
+    sudo cp /usr/local/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
+    sudo cp /usr/local/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
  fi
 }

-# Function to update php ppa
-update_ppa() {
-  if [ "$ppa_updated" = "false" ]; then
-    find /etc/apt/sources.list.d -type f -name 'ondrej-ubuntu-php*.list' -exec sudo DEBIAN_FRONTEND=noninteractive apt-get update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
-    ppa_updated="true"
-  fi
+# Function to add phalcon3.
+add_phalcon3() {
+  if [ -e "${ext_dir:?}/phalcon.so" ]; then
+    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
+    if [ "$phalcon_version" != "$extension_major_version" ]; then
+      add_phalcon_helper
+    else
+      echo "extension=phalcon.so" | sudo tee -a "$phalcon_ini_file"
+    fi
+  else
+    add_phalcon_helper
+  fi  
 }

-# Function to install phalcon
-install_phalcon() {
-  extension=$1
-  version=$2
-  (update_ppa && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "php$version-$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
-  add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
-}
-
-ini_file="/etc/php/$2/cli/conf.d/50-phalcon.ini"
-ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
-semver=$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')
-extension_major_version=$(echo "$1" | grep -i -Po '\d')
-ppa_updated="false"
-tick="✓"
-cross="✗"
-
-if [ "$extension_major_version" = "4" ]; then
-  if [ -e "$ext_dir/psr.so" ] && ! php -m | grep -i -q -w psr; then
-    echo "extension=psr.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
+# Function to add phalcon4.
+add_phalcon4() {
+  if [ -e "${ext_dir:?}/psr.so" ] && ! php -m | grep -i -q -w psr; then
+    echo "extension=psr.so" | sudo tee -a "${ini_file:?}"
  fi
-
  if [ -e "$ext_dir/phalcon.so" ]; then
    if php -m | grep -i -q -w psr; then
      phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
      if [ "$phalcon_version" != "$extension_major_version" ]; then
-        install_phalcon "$1" "$2"
+        add_phalcon_helper
      else
-        echo "extension=phalcon.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
-        add_log "$tick" "$1" "Enabled"
+        echo "extension=phalcon.so" | sudo tee -a "$phalcon_ini_file"
      fi
    else
-      install_phalcon "$1" "$2"
+      add_phalcon_helper
    fi
  else
-    install_phalcon "$1" "$2"
-  fi
-fi
+    add_phalcon_helper
+  fi  
+}

-if [ "$extension_major_version" = "3" ]; then
-  if [ -e "$ext_dir/phalcon.so" ]; then
-    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
-    if [ "$phalcon_version" != "$extension_major_version" ]; then
-      install_phalcon "$1" "$2"
-    else
-      echo "extension=phalcon.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
-      add_log "$tick" "$1" "Enabled"
-    fi
-  else
-    install_phalcon "$1" "$2"
+# Function to add phalcon.
+add_phalcon() {
+  extension=$1
+  status='Enabled'
+  os_name=$(uname -s)
+  phalcon_ini_file="${scan_dir:?}/50-phalcon.ini"
+  extension_major_version=${extension: -1}
+  if [ "$extension_major_version" = "4" ]; then
+    add_phalcon4 >/dev/null 2>&1
+  elif [ "$extension_major_version" = "3" ]; then
+    add_phalcon3 >/dev/null 2>&1
  fi
-fi
+  add_extension_log "phalcon" "$status"
+}
--- a/src/scripts/ext/phalcon_darwin.sh
+++ b/src/scripts/ext/phalcon_darwin.sh
@ -1,47 +0,0 @@
-# Function to log result of a operation
-add_log() {
-  mark=$1
-  subject=$2
-  message=$3
-  if [ "$mark" = "$tick" ]; then
-    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  else
-    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  fi
-}
-
-# Function to install phalcon
-install_phalcon() {
-  (
-    sed -i '' '/extension.*psr/d' "$ini_file"
-    brew tap shivammathur/homebrew-phalcon >/dev/null 2>&1
-    brew install phalcon@"$php_version"_"$extension_major" >/dev/null 2>&1
-    sudo cp /usr/local/opt/psr@"$php_version"/psr.so "$ext_dir" >/dev/null 2>&1
-    sudo cp /usr/local/opt/phalcon@"$php_version"_"$extension_major"/phalcon.so "$ext_dir" >/dev/null 2>&1
-    add_log "$tick" "$extension" "Installed and enabled"
-  ) || add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
-}
-
-tick="✓"
-cross="✗"
-extension=$1
-extension_major=${extension: -1}
-php_version=$2
-semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
-ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
-ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
-if [ -e "$ext_dir/psr.so" ] && [ -e "$ext_dir/phalcon.so" ]; then
-  phalcon_version=$(php -d="extension=psr.so" -d="extension=phalcon.so" -r "echo phpversion('phalcon');" 2>/dev/null | cut -d'.' -f 1)
-  if php -m | grep -i -q -w psr; then
-    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" 2>/dev/null | cut -d'.' -f 1)
-  fi
-  if [ "$phalcon_version" != "$extension_major" ]; then
-    install_phalcon
-  else
-    if ! php -m | grep -i -q -w psr; then echo "extension=psr.so" >>"$ini_file"; fi
-    echo "extension=phalcon.so" >>"$ini_file"
-    add_log "$tick" "$extension" "Enabled"
-  fi
-else
-  install_phalcon
-fi
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@ -13,9 +13,20 @@ add_log() {
    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
  else
    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+    [ "$fail_fast" = "true" ] && exit 1;
  fi
 }

+# Function to log result of installing extension.
+add_extension_log() {
+  extension=$1
+  status=$2
+  extension_name=$(echo "$extension" | cut -d '-' -f 1)
+  (
+    check_extension "$extension_name" && add_log "$tick" "$extension_name" "$status"
+  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP $semver"
+}
+
 # Function to read env inputs.
 read_env() {
  . /etc/lsb-release
@ -31,16 +42,8 @@ cleanup_lists() {
    sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save
    sudo mkdir /etc/apt/sources.list.d
    sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/
-    trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/" exit
-  fi
-}
-
-# Function to update the package lists.
-update_lists() {
-  if [ "$lists_updated" = "false" ]; then
-    cleanup_lists
-    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
-    lists_updated="true"
+    sudo mv /etc/apt/sources.list.d.save/*dotdeb*.list /etc/apt/sources.list.d/ 2>/dev/null || true
+    trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/ 2>/dev/null" exit
  fi
 }

@ -55,9 +58,18 @@ add_ppa() {
  fi
 }

+# Function to update the package lists.
+update_lists() {
+  if [ ! -e /tmp/setup_php ]; then
+    [ "$DISTRIB_RELEASE" = "20.04" ] && add_ppa >/dev/null 2>&1
+    cleanup_lists
+    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
+    echo '' | sudo tee "/tmp/setup_php" >/dev/null 2>&1
+  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
@ -77,12 +89,12 @@ configure_pecl() {
  fi
 }

-# Fuction to get the PECL version of an extension.
+# Function to get the PECL version of an extension.
 get_pecl_version() {
  extension=$1
-  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
  pecl_rest='https://pecl.php.net/rest/r/'
-  response=$(curl -q -sSL "$pecl_rest$extension"/allreleases.xml)
+  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*)")
@ -90,6 +102,12 @@ get_pecl_version() {
  echo "$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
+}
+
 # Function to check if an extension is loaded.
 check_extension() {
  extension=$1
@ -107,6 +125,10 @@ delete_extension() {
  sudo sed -i "/$extension/d" "$pecl_file"
  sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
  sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
+  if [ "$runner" = "self-hosted" ]; then
+    $apt_remove "php-$extension" >/dev/null 2>&1 || true
+    $apt_remove "php$version-$extension" >/dev/null 2>&1 || true
+  fi
 }

 # Function to disable and delete extensions.
@ -131,7 +153,7 @@ enable_extension() {
  fi
 }

-# Funcion to add PDO extension.
+# Function to add PDO extension.
 add_pdo_extension() {
  pdo_ext="pdo_$1"
  if check_extension "$pdo_ext"; then
@ -147,9 +169,8 @@ add_pdo_extension() {
      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"
+    add_extension "$pdo_ext" "pecl_install $pdo_ext" "extension" >/dev/null 2>&1
+    add_extension_log "$pdo_ext" "Enabled"
  fi
 }

@ -165,11 +186,13 @@ add_extension() {
    if [[ "$version" =~ 5.[4-5] ]]; then
      install_command="update_lists && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
    fi
-    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
-    (check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
-    add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
+    if [[ "$version" =~ $nightly_versions ]]; then
+      pecl_install "$extension"
+    else
+      eval "$install_command" >/dev/null 2>&1 ||
+      (update_lists && eval "$install_command" >/dev/null 2>&1) || pecl_install "$extension"
+    fi
+    add_extension_log "$extension" "Installed and enabled"
  fi
  sudo chmod 777 "$ini_file"
 }
@ -179,7 +202,7 @@ add_pecl_extension() {
  extension=$1
  pecl_version=$2
  prefix=$3
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot).* ]]; then
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
  fi
  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
@ -190,11 +213,8 @@ add_pecl_extension() {
    add_log "$tick" "$extension" "Enabled"
  else
    delete_extension "$extension"
-    (
-      sudo pecl install -f "$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"
+    pecl_install "$extension-$pecl_version"
+    add_extension_log "$extension-$pecl_version" "Installed and enabled"
  fi
 }

@ -207,21 +227,6 @@ 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"
-  fi
-}
-
 # Function to install extension from source
 add_extension_from_source() {
  extension=$1
@ -230,17 +235,15 @@ add_extension_from_source() {
  args=$4
  prefix=$5
  (
-    add_devtools
+    add_devtools phpize
    delete_extension "$extension"
-    curl -o /tmp/"$extension".tar.gz -sSL https://github.com/"$repo"/archive/"$release".tar.gz
+    curl -o /tmp/"$extension".tar.gz  "${curl_opts[@]}" https://github.com/"$repo"/archive/"$release".tar.gz
    tar xf /tmp/"$extension".tar.gz -C /tmp
    cd /tmp/"$extension-$release" || exit 1
    phpize  && ./configure "$args" && make && sudo make install
    enable_extension "$extension" "$prefix"
  ) >/dev/null 2>&1
-  (
-    check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled"
-  ) || add_log "$cross" "$extension" "Could not install $extension-$release on PHP $semver"
+  add_extension_log "$extension-$release" "Installed and enabled"
 }

 # Function to configure composer
@ -253,13 +256,27 @@ configure_composer() {
    exit 1;
  fi
  composer -q global config process-timeout 0
-  echo "::add-path::/home/$USER/.composer/vendor/bin"
+  echo "$composer_bin" >> "$GITHUB_PATH"
  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
+}
+
+# Function to extract tool version.
+get_tool_version() {
+  tool=$1
+  param=$2
+  version_regex="[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-zA-Z0-9]+){0,1}"
+  if [ "$tool" = "composer" ]; then
+    if [ "$param" != "snapshot" ]; then
+      grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex"
+    else
+      trunk=$(grep -Ea "const\sBRANCH_ALIAS_VERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")
+      commit=$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "[a-zA-z0-9]+" | tail -n 1)
+      echo "$trunk+$commit"
+    fi
+  else
+    $tool "$param" 2>/dev/null | sed -Ee "s/[Cc]omposer(.)?$version_regex//g" | grep -Eo "$version_regex" | head -n 1
  fi
 }

@ -267,11 +284,18 @@ configure_composer() {
 add_tool() {
  url=$1
  tool=$2
+  ver_param=$3
  tool_path="$tool_path_dir/$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
@ -288,7 +312,8 @@ add_tool() {
    elif [ "$tool" = "wp-cli" ]; then
      sudo cp -p "$tool_path" "$tool_path_dir"/wp
    fi
-    add_log "$tick" "$tool" "Added"
+    tool_version=$(get_tool_version "$tool" "$ver_param")
+    add_log "$tick" "$tool" "Added $tool $tool_version"
  else
    add_log "$cross" "$tool" "Could not setup $tool"
  fi
@ -301,58 +326,48 @@ add_composertool() {
  prefix=$3
  (
    composer global require "$prefix$release" >/dev/null 2>&1 &&
-    add_log "$tick" "$tool" "Added"
+    json=$(grep "$prefix$tool" /home/"$USER"/.composer/composer.json) &&
+    tool_version=$(get_tool_version 'echo' "$json") &&
+    add_log "$tick" "$tool" "Added $tool $tool_version"
  ) || add_log "$cross" "$tool" "Could not setup $tool"
+  if [ -e "$composer_bin/composer" ]; then
+    sudo cp -p "$tool_path_dir/composer" "$composer_bin"
+  fi
 }

 # Function to setup phpize and php-config.
 add_devtools() {
+  tool=$1
  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
+    $apt_install --no-upgrade php"$version"-dev php"$version"-xml >/dev/null 2>&1 || update_lists && $apt_install --no-upgrade 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
+  add_log "$tick" "$tool" "Added $tool $semver"
 }

-# 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
-    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 the nightly build from shivammathur/php-builder
+setup_nightly() {
+  curl "${curl_opts[@]}" "$github"/php-builder/releases/latest/download/install.sh | bash -s "$runner" "$version"
 }

 # 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"
+  curl "${curl_opts[@]}" "$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.
 add_pecl() {
-  add_devtools >/dev/null 2>&1
+  add_devtools phpize >/dev/null 2>&1
  if [ ! -e /usr/bin/pecl ]; then
-    $apt_install php-pear >/dev/null 2>&1
+    $apt_install --no-upgrade php-pear >/dev/null 2>&1 || update_lists && $apt_install php-pear >/dev/null 2>&1
  fi
  configure_pecl >/dev/null 2>&1
-  add_log "$tick" "PECL" "Added"
+  pecl_version=$(get_tool_version "pecl" "version")
+  add_log "$tick" "PECL" "Added PECL $pecl_version"
 }

 # Function to switch versions of PHP binaries.
@ -366,7 +381,7 @@ switch_version() {

 # Function to get PHP version in semver format.
 php_semver() {
-  if [ ! "$version" = "$master_version" ]; then
+  if ! [[ "$version" =~ $nightly_versions ]]; 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 ' '
@ -375,14 +390,19 @@ php_semver() {

 # Function to install packaged PHP
 add_packaged_php() {
-  update_lists
-  IFS=' ' read -r -a packages <<< "$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
-  $apt_install "${packages[@]}"
+  if [ "$runner" = "self-hosted" ] || [ "${use_package_cache:-true}" = "false" ]; then
+    update_lists
+    IFS=' ' read -r -a packages <<< "$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
+    $apt_install "${packages[@]}"
+  else
+    curl "${curl_opts[@]}" "$github"/php-ubuntu/releases/latest/download/install.sh | bash -s "$version"
+  fi
 }

 # Function to update PHP.
 update_php() {
  initial_version=$(php_semver)
+  use_package_cache="false"
  add_packaged_php
  updated_version=$(php_semver)
  if [ "$updated_version" != "$initial_version" ]; then
@ -394,8 +414,8 @@ update_php() {

 # Function to install PHP.
 add_php() {
-  if [ "$version" = "$master_version" ]; then
-    setup_master
+  if [[ "$version" =~ $nightly_versions ]]; then
+    setup_nightly
  elif [[ "$version" =~ $old_versions ]]; then
    setup_old_versions
  else
@ -407,15 +427,19 @@ add_php() {
 # Variables
 tick="✓"
 cross="✗"
-lists_updated="false"
 pecl_config="false"
 version=$1
-master_version="8.0"
+dist=$2
+fail_fast=$3
+nightly_versions="8.[0-1]"
 old_versions="5.[3-5]"
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
 github="https://github.com/shivammathur"
-apt_install="sudo $debconf_fix apt-fast install -y"
+apt_install="sudo $debconf_fix apt-get install -y"
+apt_remove="sudo $debconf_fix apt-get remove -y"
+composer_bin="/home/$USER/.composer/vendor/bin"
 tool_path_dir="/usr/local/bin"
+curl_opts=(-sL)
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)

 read_env
@ -426,13 +450,11 @@ if [ "$runner" = "self-hosted" ]; then
  else
    self_hosted_setup >/dev/null 2>&1
  fi
-elif [ "$DISTRIB_RELEASE" = "20.04" ]; then
-  add_ppa >/dev/null 2>&1
 fi

 # Setup PHP
 step_log "Setup PHP"
-sudo mkdir -p /var/run /run/php
+sudo mkdir -m 777 -p /home/"$USER"/.composer /var/run /run/php
 if [ "$existing_version" != "$version" ]; then
  if [ ! -e "/usr/bin/php$version" ]; then
    add_php >/dev/null 2>&1
@ -451,7 +473,7 @@ else
    update_php >/dev/null 2>&1
  else
    status="Found"
-    if [ "$version" = "$master_version" ]; then
+    if [[ "$version" =~ $nightly_versions ]]; then
      switch_version >/dev/null 2>&1
    fi
  fi
@ -463,5 +485,7 @@ scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 pecl_file="$scan_dir"/99-pecl.ini
 echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
+sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1
 sudo chmod 777 "$ini_file" "$pecl_file" "$tool_path_dir"
+sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
 add_log "$tick" "PHP" "$status PHP $semver"
--- a/src/scripts/tools/blackfire.ps1
+++ b/src/scripts/tools/blackfire.ps1
@ -0,0 +1,21 @@
+# Function to add blackfire and blackfire-agent.
+Function Add-Blackfire() {
+  $arch_name ='amd64'
+  if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
+    $arch_name = '386'
+  }
+  $agent_version = (Invoke-RestMethod https://blackfire.io/api/v1/releases).agent
+  $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 blackfire $agent_version"
+  Add-Log $tick "blackfire-agent" "Added blackfire-agent $agent_version"
+}
--- a/src/scripts/tools/blackfire.sh
+++ b/src/scripts/tools/blackfire.sh
@ -0,0 +1,35 @@
+add_blackfire_linux() {
+  sudo mkdir -p /var/run/blackfire
+  sudo curl "${curl_opts[@]:?}" https://packages.blackfire.io/gpg.key | sudo apt-key add -
+  echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
+  sudo "${debconf_fix:?}" apt-get update
+  ${apt_install:?} blackfire-agent
+}
+
+add_blackfire_darwin() {
+  sudo mkdir -p /usr/local/var/run
+  brew tap --shallow blackfireio/homebrew-blackfire
+  brew install blackfire-agent
+}
+
+blackfire_config() {
+  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
+    sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN"
+    [ "$os" = "Linux" ] && sudo /etc/init.d/blackfire-agent restart
+    [ "$os" = "Darwin" ] && brew services start blackfire-agent
+  fi
+  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
+    blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN"
+  fi
+}
+
+# Function to add blackfire and blackfire-agent.
+add_blackfire() {
+  os="$(uname -s)"
+  [ "$os" = "Linux" ] && add_blackfire_linux >/dev/null 2>&1
+  [ "$os" = "Darwin" ] && add_blackfire_darwin >/dev/null 2>&1
+  blackfire_config >/dev/null 2>&1
+  tool_version=$(get_tool_version "blackfire" "version")
+  add_log "${tick:?}" "blackfire" "Added blackfire $tool_version"
+  add_log "${tick:?}" "blackfire-agent" "Added blackfire-agent $tool_version"
+}
--- a/src/scripts/tools/grpc_php_plugin.ps1
+++ b/src/scripts/tools/grpc_php_plugin.ps1
@ -0,0 +1,21 @@
+Function Add-Msys2() {
+  $msys_location = 'C:\msys64'
+  if (-not(Test-Path $msys_location)) {
+    choco install msys2 -y >$null 2>&1
+    $msys_location = 'C:\tools\msys64'
+  }
+  return $msys_location
+}
+
+Function Add-Grpc_php_plugin() {
+  $msys_location = Add-Msys2
+  $logs = . $msys_location\usr\bin\bash -l -c "pacman -S --noconfirm mingw-w64-x86_64-grpc" >$null 2>&1
+  $grpc_version = Get-ToolVersion 'Write-Output' "$logs"
+  Write-Output "$msys_location\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
+  Write-Output "::set-output name=grpc_php_plugin_path::$msys_location\mingw64\bin\grpc_php_plugin.exe"
+  Add-ToProfile $current_profile 'grpc_php_plugin' "New-Alias grpc_php_plugin $msys_location\mingw64\bin\grpc_php_plugin.exe"
+  Add-Log $tick "grpc_php_plugin" "Added grpc_php_plugin $grpc_version"
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "grpc_php_plugin" "Click to read the grpc_php_plugin related license information"
+  Write-Output (Invoke-WebRequest https://raw.githubusercontent.com/grpc/grpc/master/LICENSE).Content
+  Write-Output "::endgroup::"
+}
--- a/src/scripts/tools/grpc_php_plugin.sh
+++ b/src/scripts/tools/grpc_php_plugin.sh
@ -0,0 +1,51 @@
+add_bazel() {
+  if [ ! "$(command -v bazel)" ]; then
+    os=$(uname -s)
+    if [ "$os" = "Linux" ]; then
+      ${apt_install:?} curl gnupg
+      curl "${curl_opts[@]:?}" https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
+      echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
+      sudo "${debconf_fix:?}" apt-get update -y
+      ${apt_install:?} bazel
+    elif [ "$os" = "Darwin" ]; then
+      brew install bazel
+    fi
+  fi
+}
+
+get_grpc_tag() {
+  if [ "$grpc_tag" = "latest" ]; then
+    grpc_tag=$(curl "${curl_opts[@]:?}" https://grpc.io/release)
+  else
+    status_code=$(sudo curl -s -w "%{http_code}" -o /tmp/grpc.tmp "${curl_opts[@]:?}" "https://github.com/grpc/grpc/releases/tag/v$grpc_tag")
+    if [ "$status_code" = "200" ]; then
+      grpc_tag="v$grpc_tag"
+    else
+      grpc_tag=$(curl "${curl_opts[@]:?}" https://grpc.io/release)
+    fi
+  fi
+}
+
+add_grpc_php_plugin() {
+  grpc_tag=$1
+  get_grpc_tag
+  (
+    curl "${curl_opts[@]:?}" "https://github.com/grpc/grpc/archive/$grpc_tag.tar.gz" | tar -xz -C /tmp
+    cd "/tmp/grpc-${grpc_tag:1}" || exit
+    add_bazel
+    echo "os: $os"
+    echo "release: $DISTRIB_RELEASE"
+    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+      CC="$(command -v gcc)" CXX="$(command -v g++)" ./tools/bazel build src/compiler:grpc_php_plugin
+    else
+      ./tools/bazel build src/compiler:grpc_php_plugin
+    fi
+    sudo mv ./bazel-bin/src/compiler/grpc_php_plugin /usr/local/bin/grpc_php_plugin
+    sudo chmod a+x /usr/local/bin/grpc_php_plugin
+  ) >/dev/null 2>&1
+  echo "::set-output name=grpc_php_plugin_path::/usr/local/bin/grpc_php_plugin"
+  add_log "${tick:?}" "grpc_php_plugin" "Added grpc_php_plugin ${grpc_tag:1}"
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "grpc_php_plugin" "Click to read the grpc_php_plugin related license information"
+  cat "/tmp/grpc-${grpc_tag:1}/LICENSE"
+  echo "::endgroup::"
+}
--- a/src/scripts/tools/protoc.ps1
+++ b/src/scripts/tools/protoc.ps1
@ -0,0 +1,38 @@
+Function Get-ProtobufTag() {
+  if("$protobuf_tag" -eq "latest") {
+    $protobuf_tag = (Invoke-RestMethod https://api.github.com/repos/protocolbuffers/protobuf/tags).Name | Where-Object { $_ -match "v\d+.\d+.\d+$" } | Select-Object -First 1
+  } else {
+    try {
+      [net.httpWebRequest] $request = [net.webRequest]::create("https://github.com/protocolbuffers/protobuf/releases/tag/v$protobuf_tag")
+      $req.Method = "HEAD"
+      [net.httpWebResponse] $response = $request.getResponse()
+      $response.Close()
+      $protobuf_tag = "v$protobuf_tag"
+    } catch {
+      $protobuf_tag = (Invoke-RestMethod https://api.github.com/repos/protocolbuffers/protobuf/tags).Name | Where-Object { $_ -match "v\d+.\d+.\d+$" } | Select-Object -First 1
+    }
+  }
+  return $protobuf_tag
+}
+
+Function Add-Protoc() {
+  param(
+    [Parameter(Mandatory = $true, Position = 0, HelpMessage = 'The PHP version to be installed')]
+    [ValidatePattern('^latest$|^(v?)\d+\.\d+\.\d+$')]
+    [string] $protobuf_tag
+  )
+  $protobuf_tag = Get-ProtobufTag
+  $arch_num = '64'
+  if(-not([Environment]::Is64BitOperatingSystem)) {
+    $arch_num = '32'
+  }
+  $url = "https://github.com/protocolbuffers/protobuf/releases/download/$protobuf_tag/protoc-$($protobuf_tag -replace 'v', '')-win$arch_num.zip"
+  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\protoc.zip >$null 2>&1
+  Expand-Archive -Path $bin_dir\protoc.zip -DestinationPath $bin_dir\protoc -Force >$null 2>&1
+  Move-Item -Path $bin_dir\protoc\bin\protoc.exe -Destination $bin_dir\protoc.exe
+  Add-ToProfile $current_profile 'protoc' "New-Alias protoc $bin_dir\protoc.exe"
+  Add-Log $tick "protoc" "Added protoc $($protobuf_tag -replace 'v', '')"
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"
+  Write-Output (Invoke-WebRequest https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE).Content
+  Write-Output "::endgroup::"
+}
--- a/src/scripts/tools/protoc.sh
+++ b/src/scripts/tools/protoc.sh
@ -0,0 +1,28 @@
+get_protobuf_tag() {
+  if [ "$protobuf_tag" = "latest" ]; then
+    protobuf_tag=$(curl "${curl_opts[@]:?}" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+\.[0-9]+\.[0-9]+)" | head -n 1)
+  else
+    status_code=$(sudo curl -s -w "%{http_code}" -o /tmp/protobuf.tmp "${curl_opts[@]:?}" "https://github.com/protocolbuffers/protobuf/releases/tag/v$protobuf_tag")
+    if [ "$status_code" = "200" ]; then
+      protobuf_tag="v$protobuf_tag"
+    else
+      protobuf_tag=$(curl "${curl_opts[@]:?}" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+\.[0-9]+\.[0-9]+)" | head -n 1)
+    fi
+  fi
+}
+
+add_protoc() {
+  protobuf_tag=$1
+  get_protobuf_tag
+  (
+    platform='linux'
+    [ "$(uname -s)" = "Darwin" ] && platform='osx'
+    curl -o /tmp/protobuf.zip "${curl_opts[@]:?}" "https://github.com/protocolbuffers/protobuf/releases/download/$protobuf_tag/protoc-${protobuf_tag:1}-$platform-x86_64.zip"
+    sudo unzip /tmp/protobuf.zip -d /usr/local/
+    sudo chmod 777 /usr/local/bin/protoc -R /usr/local/include/google
+  ) >/dev/null 2>&1
+  add_log "${tick:?}" "protoc" "Added protoc ${protobuf_tag:1}"
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"
+  curl "${curl_opts[@]:?}" https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE
+  echo "::endgroup::"
+}
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@ -8,7 +8,10 @@ param (
  [ValidateNotNull()]
  [ValidateLength(1, [int]::MaxValue)]
  [string]
-  $dir
+  $dist,
+  [Parameter(Position = 2, Mandatory = $false)]
+  [string]
+  $fail_fast = 'false'
 )

 # Function to log start of a operation.
@ -18,8 +21,14 @@ Function Step-Log($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
+  if ($mark -eq $tick) {
+    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $mark $subject $message
+  } else {
+    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $mark $subject $message
+    if($fail_fast -eq 'true') {
+      exit 1;
+    }
+  }
 }

 # Function to add a line to a powershell profile safely.
@ -64,6 +73,20 @@ Function Add-Path {
  Get-PathFromRegistry
 }

+# Function to make sure printf is in PATH.
+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 $bin_dir\printf.exe -ItemType SymbolicLink -Value C:\msys64\usr\bin\printf.exe
+    } else {
+      Invoke-WebRequest -UseBasicParsing -Uri "$github/shivammathur/printf/releases/latest/download/printf-x64.zip" -OutFile "$bin_dir\printf.zip"
+      Expand-Archive -Path $bin_dir\printf.zip -DestinationPath $bin_dir -Force
+    }
+  } else {
+    New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value "C:\Program Files\Git\usr\bin\printf.exe"
+  }
+}
+
 # Function to get a clean Powershell profile.
 Function Get-CleanPSProfile {
  if(-not(Test-Path -LiteralPath $profile)) {
@ -73,18 +96,24 @@ Function Get-CleanPSProfile {
  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\PhpManager.psm1"
+# Function to install a powershell package from GitHub.
+Function Install-GitHubPackage() {
+  param(
+    [Parameter(Position = 0, Mandatory = $true)]
+    $package,
+    [Parameter(Position = 1, Mandatory = $true)]
+    $psm1_path,
+    [Parameter(Position = 2, Mandatory = $true)]
+    $url
+  )
+  $module_path = "$bin_dir\$psm1_path.psm1"
  if(-not (Test-Path $module_path -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
+    $zip_file = "$bin_dir\$package.zip"
+    Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $zip_file
+    Expand-Archive -Path $zip_file -DestinationPath $bin_dir -Force
  }
  Import-Module $module_path
-  Add-ToProfile $current_profile 'powershell-phpmanager' "Import-Module $module_path"
+  Add-ToProfile $current_profile "$package-search" "Import-Module $module_path"
 }

 # Function to add PHP extensions.
@ -176,14 +205,31 @@ Function Edit-ComposerConfig() {
    exit 1;
  }
  composer -q global config process-timeout 0
-  Write-Output "::add-path::$env:APPDATA\Composer\vendor\bin"
+  Write-Output $composer_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
  }
-  # 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
+}
+
+# Function to extract tool version.
+Function Get-ToolVersion() {
+  Param (
+      [Parameter(Position = 0, Mandatory = $true)]
+      $tool,
+      [Parameter(Position = 1, Mandatory = $true)]
+      $param
+  )
+  $version_regex = "[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-z0-9]+){0,1}"
+  if($tool -eq 'composer') {
+    if ($param -eq 'snapshot') {
+      $trunk = Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }
+      $commit = Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern "[a-zA-Z0-9]+" -AllMatches | ForEach-Object { $_.matches[2].Value }
+      return "$trunk+$commit"
+    } else {
+      return Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }
+    }
  }
+  return . $tool $param 2> $null | ForEach-Object { $_ -replace "composer $version_regex", '' } | Select-String -Pattern $version_regex | Select-Object -First 1 | ForEach-Object { $_.matches.Value }
 }

 # Function to add tools.
@ -191,18 +237,18 @@ Function Add-Tool() {
  Param (
    [Parameter(Position = 0, Mandatory = $true)]
    [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
-    [string]
    $url,
    [Parameter(Position = 1, Mandatory = $true)]
    [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
-    [string]
-    $tool
+    $tool,
+    [Parameter(Position = 2, Mandatory = $true)]
+    [ValidateNotNull()]
+    $ver_param
  )
  if (Test-Path $bin_dir\$tool) {
    Remove-Item $bin_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
@ -231,7 +277,8 @@ Function Add-Tool() {
    Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
  }
  if (((Get-ChildItem -Path $bin_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
-    Add-Log $tick $tool "Added"
+    $tool_version = Get-ToolVersion $tool $ver_param
+    Add-Log $tick $tool "Added $tool $tool_version"
  } else {
    Add-Log $cross $tool "Could not add $tool"
  }
@ -256,9 +303,14 @@ Function Add-Composertool() {
    [string]
    $prefix
  )
-  composer -q global require $prefix$release 2>&1 | out-null
-  if($?) {
-    Add-Log $tick $tool "Added"
+  composer global require $prefix$release 2>&1 | out-null
+  $json = findstr $prefix$tool $env:APPDATA\Composer\composer.json
+  if(Test-Path $composer_bin\composer) {
+    Copy-Item -Path "$bin_dir\composer" -Destination "$composer_bin\composer" -Force
+  }
+  if($json) {
+    $tool_version = Get-ToolVersion "Write-Output" "$json"
+    Add-Log $tick $tool "Added $tool $tool_version"
  } else {
    Add-Log $cross $tool "Could not setup $tool"
  }
@ -269,48 +321,28 @@ 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
+$github = 'https://github.com'
+$composer_bin = "$env:APPDATA\Composer\vendor\bin"
 $current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
-$master_version = '8.0'
+$nightly_version = '8.[0-9]'
 $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"
@ -319,10 +351,6 @@ if($env:RUNNER -eq 'self-hosted') {
  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
@ -340,8 +368,10 @@ if($env:RUNNER -eq 'self-hosted') {
    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
+Install-GitHubPackage PhpManager PhpManager\PhpManager "$github/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip" >$null 2>&1
 Add-Log $tick "PhpManager" "Installed"

 Step-Log "Setup PHP"
@ -354,13 +384,14 @@ 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') {
-    Install-Module -Name VcRedist -Force
+    Install-GitHubPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" >$null 2>&1
  }
-  if ($version -eq $master_version) {
-    $version = 'master'
+  if ($version -match $nightly_version) {
+    Invoke-WebRequest -UseBasicParsing -Uri https://dl.bintray.com/shivammathur/php/Install-PhpNightly.ps1 -OutFile $php_dir\Install-PhpNightly.ps1 > $null 2>&1
+    & $php_dir\Install-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir -Version $version > $null 2>&1
+  } else {
+    Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
  }
-
-  Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force >$null 2>&1
 } else {
  if($env:update -eq 'true') {
    Update-Php $php_dir >$null 2>&1
@ -382,10 +413,6 @@ if($version -lt "5.5") {
  Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
 }
 Update-PhpCAInfo -Path $php_dir -Source $cert_source
-if ($version -eq 'master') {
-  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_pcov.dll" -OutFile $ext_dir"\php_pcov.dll" >$null 2>&1
-  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_xdebug.dll" -OutFile $ext_dir"\php_xdebug.dll" >$null 2>&1
-  Set-PhpIniKey -Key 'opcache.jit_buffer_size' -Value '256M' -Path $php_dir
-  Set-PhpIniKey -Key 'opcache.jit' -Value '1235' -Path $php_dir
-}
+Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE
+New-Item -ItemType Directory -Path $composer_bin -Force 2>&1 | Out-Null
 Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)"
--- a/src/tools.ts
+++ b/src/tools.ts
@ -1,31 +1,4 @@
 import * as utils from './utils';
-import * as httpm from '@actions/http-client';
-import {IHttpClientResponse as hcr} from '@actions/http-client/interfaces';
-
-/**
- * Function to get command to setup tools
- *
- * @param os_version
- * @param suffix
- */
-export async function getCommand(
-  os_version: string,
-  suffix: string
-): Promise<string> {
-  switch (os_version) {
-    case 'linux':
-    case 'darwin':
-      return 'add_' + suffix + ' ';
-    case 'win32':
-      return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
-    default:
-      return await utils.log(
-        'Platform ' + os_version + ' is not supported',
-        os_version,
-        'error'
-      );
-  }
-}

 /**
 * Function to get tool version
@ -38,6 +11,8 @@ export async function getToolVersion(version: string): Promise<string> {
  const composer_regex = /^stable$|^preview$|^snapshot$|^v?[1|2]$/;
  version = version.replace(/[><=^]*/, '');
  switch (true) {
+    case version.charAt(0) == 'v':
+      return version.replace('v', '');
    case composer_regex.test(version):
    case semver_regex.test(version):
      return version;
@ -191,17 +166,17 @@ export async function addPhive(
  switch (version) {
    case 'latest':
      return (
-        (await getCommand(os_version, 'tool')) +
-        'https://phar.io/releases/phive.phar phive'
+        (await utils.getCommand(os_version, 'tool')) +
+        'https://phar.io/releases/phive.phar phive status'
      );
    default:
      return (
-        (await getCommand(os_version, 'tool')) +
+        (await utils.getCommand(os_version, 'tool')) +
        'https://github.com/phar-io/phive/releases/download/' +
        version +
        '/phive-' +
        version +
-        '.phar phive'
+        '.phar phive status'
      );
  }
 }
@ -228,6 +203,31 @@ export async function getPharUrl(
  }
 }

+/**
+ * Function to get blackfire player url for a PHP version.
+ *
+ * @param version
+ * @param php_version
+ */
+export async function getBlackfirePlayerUrl(
+  version: string,
+  php_version: string
+): Promise<string> {
+  switch (true) {
+    case /5\.[5-6]|7\.0/.test(php_version) && version == 'latest':
+      version = '1.9.3';
+      break;
+    default:
+      break;
+  }
+  return await getPharUrl(
+    'https://get.blackfire.io',
+    'blackfire-player',
+    'v',
+    version
+  );
+}
+
 /**
 * Function to get the Deployer url
 *
@ -305,15 +305,19 @@ export async function getWpCliUrl(version: string): Promise<string> {
 */
 export async function addComposer(tools_list: string[]): Promise<string[]> {
  const regex_any = /^composer($|:.*)/;
-  const regex_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$)/;
+  const regex_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$|v?\d+\.\d+\.\d+[\w-]*$)/;
+  const regex_composer1_tools = /hirak|prestissimo|narrowspark|composer-prefetcher/;
  const matches: string[] = tools_list.filter(tool => regex_valid.test(tool));
  let composer = 'composer';
  tools_list = tools_list.filter(tool => !regex_any.test(tool));
-  switch (matches[0]) {
-    case undefined:
+  switch (true) {
+    case regex_composer1_tools.test(tools_list.join(' ')):
+      composer = 'composer:1';
+      break;
+    case matches[0] == undefined:
      break;
    default:
-      composer = matches[matches.length - 1].replace(/v([1-2])/, '$1');
+      composer = matches[matches.length - 1].replace(/v(\d\S*)/, '$1');
      break;
  }
  tools_list.unshift(composer);
@ -326,23 +330,20 @@ export async function addComposer(tools_list: string[]): Promise<string[]> {
 * @param version
 */
 export async function getComposerUrl(version: string): Promise<string> {
-  const getComposerUrlHelper = async function (
-    version: string
-  ): Promise<string> {
-    const client: httpm.HttpClient = new httpm.HttpClient('setup-php');
-    const response: hcr = await client.get('https://getcomposer.org/versions');
-    const data = JSON.parse(await response.readBody());
-    return 'https://getcomposer.org' + data[version][0]['path'];
-  };
-  switch (version) {
-    case 'snapshot':
-      return 'https://getcomposer.org/composer.phar';
-    case 'preview':
-    case '1':
-    case '2':
-      return await getComposerUrlHelper(version);
+  let cache_url = `https://github.com/shivammathur/composer-cache/releases/latest/download/composer-${version.replace(
+    'latest',
+    'stable'
+  )}.phar`;
+  switch (true) {
+    case /^snapshot$/.test(version):
+      return `${cache_url},https://getcomposer.org/composer.phar`;
+    case /^preview$|^[1-2]$/.test(version):
+      return `${cache_url},https://getcomposer.org/composer-${version}.phar`;
+    case /^\d+\.\d+\.\d+[\w-]*$/.test(version):
+      cache_url = `https://github.com/composer/composer/releases/download/${version}/composer.phar`;
+      return `${cache_url},https://getcomposer.org/composer-${version}.phar`;
    default:
-      return 'https://getcomposer.org/composer-stable.phar';
+      return `${cache_url},https://getcomposer.org/composer-stable.phar`;
  }
 }

@ -361,7 +362,7 @@ export async function getCleanedToolsList(
      return extension
        .trim()
        .replace(
-          /hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//,
+          /-agent|behat\/|hirak\/|icanhazstring\/|laravel\/|narrowspark\/automatic-|overtrue\/|phpspec\/|robmorgan\/|symfony\//,
          ''
        );
    })
@ -373,17 +374,20 @@ 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
+ * @param ver_param
 */
 export async function addArchive(
  tool: string,
-  version: string,
  url: string,
-  os_version: string
+  os_version: string,
+  ver_param: string
 ): Promise<string> {
-  return (await getCommand(os_version, 'tool')) + url + ' ' + tool;
+  return (
+    (await utils.getCommand(os_version, 'tool')) +
+    (await utils.joins(url, tool, ver_param))
+  );
 }

 /**
@ -398,16 +402,11 @@ export async function addDevTools(
 ): Promise<string> {
  switch (os_version) {
    case 'linux':
-      return (
-        'add_devtools' +
-        '\n' +
-        (await utils.addLog('$tick', tool, 'Added', 'linux'))
-      );
    case 'darwin':
-      return await utils.addLog('$tick', tool, 'Added', 'darwin');
+      return 'add_devtools ' + tool;
    case 'win32':
      return await utils.addLog(
-        '$cross',
+        '$tick',
        tool,
        tool + ' is not a windows tool',
        'win32'
@ -435,7 +434,7 @@ export async function addPackage(
  prefix: string,
  os_version: string
 ): Promise<string> {
-  const tool_command = await getCommand(os_version, 'composertool');
+  const tool_command = await utils.getCommand(os_version, 'composertool');
  return tool_command + tool + ' ' + release + ' ' + prefix;
 }

@ -470,27 +469,32 @@ export async function addTools(
    let url = '';
    switch (tool) {
      case 'blackfire':
-      case 'blackfire-agent':
-        script += await getCommand(os_version, 'blackfire');
+      case 'grpc_php_plugin':
+      case 'protoc':
+        script += await utils.customPackage(tool, 'tools', version, os_version);
+        break;
+      case 'behat':
+      case 'phpspec':
+        script += await addPackage(tool, release, tool + '/', os_version);
        break;
      case 'blackfire-player':
-        url = await getPharUrl('https://get.blackfire.io', tool, 'v', version);
-        script += await addArchive(tool, version, url, os_version);
+        url = await getBlackfirePlayerUrl(version, php_version);
+        script += await addArchive(tool, url, os_version, '"-V"');
        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, '"-V"');
        break;
      case 'composer':
        url = await getComposerUrl(version);
-        script += await addArchive('composer', version, url, os_version);
+        script += await addArchive('composer', url, os_version, version);
        break;
      case 'composer-normalize':
        uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
        url = github + 'ergebnis/composer-normalize/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version, '"-V"');
        break;
      case 'composer-prefetcher':
        script += await addPackage(
@ -503,35 +507,37 @@ export async function addTools(
      case 'composer-require-checker':
        uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
        url = github + 'maglnet/ComposerRequireChecker/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version, '"-V"');
        break;
      case 'composer-unused':
-        uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
-        url = github + 'composer-unused/composer-unused/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addPackage(tool, release, 'icanhazstring/', 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);
+        script += await addArchive(tool, url, os_version, '"-V"');
        break;
      case 'deployer':
        url = await getDeployerUrl(version);
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version, '"-V"');
        break;
      case 'flex':
        script += await addPackage(tool, release, 'symfony/', 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, '"-V"');
        break;
      case 'pecl':
-        script += await getCommand(os_version, 'pecl');
+        script += await utils.getCommand(os_version, 'pecl');
        break;
      case 'phan':
        url = github + 'phan/phan/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version, '"-v"');
+        break;
+      case 'phing':
+        url = 'https://www.phing.info/get/phing-' + version + '.phar';
+        script += await addArchive(tool, url, os_version, '"-v"');
        break;
      case 'phinx':
        script += await addPackage(tool, release, 'robmorgan/', os_version);
@ -546,48 +552,48 @@ export async function addTools(
      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, '"-V"');
        break;
      case 'phpcbf':
      case 'phpcs':
        url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version, '"--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, '"--version"');
        break;
      case 'phplint':
        script += await addPackage(tool, release, 'overtrue/', 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, '"--version"');
        break;
      case 'phpstan':
        url = github + 'phpstan/phpstan/' + uri;
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version, '"-V"');
        break;
      case 'prestissimo':
        script += await addPackage(tool, release, 'hirak/', 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, '"-v"');
        break;
      case 'symfony':
      case 'symfony-cli':
        uri = await getSymfonyUri(version, os_version);
        url = github + 'symfony/cli/' + uri;
-        script += await addArchive('symfony', version, url, os_version);
+        script += await addArchive('symfony', url, os_version, 'version');
        break;
      case 'vapor-cli':
        script += await addPackage(tool, release, 'laravel/', os_version);
        break;
      case 'wp-cli':
        url = github + (await getWpCliUrl(version));
-        script += await addArchive(tool, version, url, os_version);
+        script += await addArchive(tool, url, os_version, '"--version"');
        break;
      default:
        script += await utils.addLog(
--- a/src/utils.ts
+++ b/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,36 @@ 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 '';
+  }
+}
+
+/**
+ * Function to parse PHP version.
+ *
+ * @param version
+ */
+export async function parseVersion(version: string): Promise<string> {
+  switch (version) {
+    case 'latest':
+      return '7.4';
+    default:
+      switch (true) {
+        case version.length > 1:
+          return version.slice(0, 3);
+        default:
+          return version + '.0';
+      }
  }
 }

@ -259,3 +297,127 @@ export async function suppressOutput(os_version: string): Promise<string> {
      );
  }
 }
+
+/**
+ * Function to get script to log unsupported extensions.
+ *
+ * @param extension
+ * @param version
+ * @param os_version
+ */
+export async function getUnsupportedLog(
+  extension: string,
+  version: string,
+  os_version: string
+): Promise<string> {
+  return (
+    '\n' +
+    (await addLog(
+      '$cross',
+      extension,
+      [extension, 'is not supported on PHP', version].join(' '),
+      os_version
+    )) +
+    '\n'
+  );
+}
+
+/**
+ * Function to get command to setup tools
+ *
+ * @param os_version
+ * @param suffix
+ */
+export async function getCommand(
+  os_version: string,
+  suffix: string
+): Promise<string> {
+  switch (os_version) {
+    case 'linux':
+    case 'darwin':
+      return 'add_' + suffix + ' ';
+    case 'win32':
+      return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
+    default:
+      return await log(
+        'Platform ' + os_version + ' is not supported',
+        os_version,
+        'error'
+      );
+  }
+}
+
+/**
+ * Function to join strings with space
+ *
+ * @param str
+ */
+export async function joins(...str: string[]): Promise<string> {
+  return [...str].join(' ');
+}
+
+/**
+ * Function to get script extensions
+ *
+ * @param os_version
+ */
+export async function scriptExtension(os_version: string): Promise<string> {
+  switch (os_version) {
+    case 'win32':
+      return '.ps1';
+    case 'linux':
+    case 'darwin':
+      return '.sh';
+    default:
+      return await log(
+        'Platform ' + os_version + ' is not supported',
+        os_version,
+        'error'
+      );
+  }
+}
+
+/**
+ * Function to get script tool
+ *
+ * @param os_version
+ */
+export async function scriptTool(os_version: string): Promise<string> {
+  switch (os_version) {
+    case 'win32':
+      return 'pwsh';
+    case 'linux':
+    case 'darwin':
+      return 'bash';
+    default:
+      return await log(
+        'Platform ' + os_version + ' is not supported',
+        os_version,
+        'error'
+      );
+  }
+}
+
+/**
+ * Function to get script to add tools with custom support.
+ *
+ * @param pkg
+ * @param type
+ * @param version
+ * @param os_version
+ */
+export async function customPackage(
+  pkg: string,
+  type: string,
+  version: string,
+  os_version: string
+): Promise<string> {
+  const pkg_name: string = pkg.replace(/\d+|pdo[_-]/, '');
+  const script_extension: string = await scriptExtension(os_version);
+  const script: string = path.join(
+    __dirname,
+    '../src/scripts/' + type + '/' + pkg_name + script_extension
+  );
+  const command: string = await getCommand(os_version, pkg_name);
+  return '\n. ' + script + '\n' + command + version;
+}
Author	SHA1	Message	Date
Shivam Mathur	c188004a52	Fix macos	2020-11-28 14:59:24 +05:30
Shivam Mathur	c596331f84	Improve regexes for pre-release extensions	2020-10-31 19:04:20 +05:30
Shivam Mathur	bb5dfb73cf	Fix php-dev setup	2020-10-31 15:25:16 +05:30
Shivam Mathur	215b040f0d	Fix contribution docs	2020-10-31 14:55:27 +05:30
Shivam Mathur	925ede2589	Refactor composer setup	2020-10-30 19:25:39 +05:30
Shivam Mathur	d1510a82d5	Merge pull request #321 from mlocati/composer-specific-version Allow installing a specific Composer version	2020-10-30 17:46:45 +05:30
Michele Locati	808e74aed5	Adjust filtered composer version	2020-10-30 12:02:36 +01:00
Michele Locati	f51d00d350	Allow installing a specific Composer version	2020-10-30 11:15:26 +01:00
Shivam Mathur	c8111b053c	Fix blackfire-player to v1.9.3 for PHP 5.5 to PHP 7.0	2020-10-30 11:40:25 +05:30
Shivam Mathur	294f03454a	Install VcRedist from GitHub	2020-10-30 11:40:24 +05:30
Shivam Mathur	5d27b8f90e	Use PECL directly for nightly versions	2020-10-28 22:21:08 +05:30
Shivam Mathur	87e62cbb7f	Fix composer version for prestissimo & composer-prefetcher to v1	2020-10-25 00:55:01 +05:30
Shivam Mathur	2c29e8b9a1	Fix version change if composer is a dependency	2020-10-24 23:40:43 +05:30
Shivam Mathur	04a9e3b562	Update dependencies as per runner on macOS	2020-10-23 07:22:04 +05:30
Shivam Mathur	4adaa73d25	Merge pull request #315 from GrahamCampbell/patch-1 PHP 8.1 supported too	2020-10-22 02:45:09 +05:30
Graham Campbell	234594684c	PHP 8.1 supported too	2020-10-21 22:08:40 +01:00
Shivam Mathur	3c0527bec1	Merge pull request #313 from shivammathur/develop 2.7.0	2020-10-19 18:26:33 +05:30
Shivam Mathur	c5d41cd3f1	Bump version to 2.7.0	2020-10-19 17:39:36 +05:30
Shivam Mathur	601cabfd2a	Update README	2020-10-19 17:06:48 +05:30
Shivam Mathur	81c750c6d7	Add support for imagick for PHP 5.6+ on macOS using shivammathur/homebrew-extensions	2020-10-19 15:55:40 +05:30
Shivam Mathur	0661130e18	Add support for igbinary on macOS using shivammathur/homebrew-extensions	2020-10-18 19:41:59 +05:30
Shivam Mathur	4244b92ac6	Fix matchers setup when action is called twice	2020-10-18 19:41:58 +05:30
Shivam Mathur	e9595da9ac	Remove patch for RLIMIT_CORE bug in sudo, fixed upstream	2020-10-18 19:41:57 +05:30
Shivam Mathur	b77ec78d01	Add support for fail-fast env variable	2020-10-18 19:41:56 +05:30
Shivam Mathur	96d8c1e901	Add support for PHP 8.1 on par with PHP 8.0	2020-10-18 19:41:55 +05:30
Shivam Mathur	8816b6ff48	Add PHP 8.1 to the main workflow	2020-10-18 19:41:54 +05:30
Shivam Mathur	9205a596c9	Add support for PHP 8.1 on Windows	2020-10-18 19:41:53 +05:30
Shivam Mathur	6fc20c9b7f	Add support for PHP 8.1 on Ubuntu	2020-10-18 19:41:52 +05:30
Michele Locati	eb07280d5c	Perform only one URL call to download latest PhpManager.zip asset	2020-10-18 19:41:51 +05:30
Shivam Mathur	eaaab1cec3	Fix oci8 and pdo_oci	2020-10-18 19:33:03 +05:30
Shivam Mathur	853381d0bb	Merge pull request #310 from shivammathur/develop Switch to apt-get	2020-10-15 14:16:50 +05:30
Shivam Mathur	1394617d60	Switch to apt-get	2020-10-15 14:16:50 +05:30
Shivam Mathur	093498a0a1	Merge pull request #307 from shivammathur/develop Specify PHP version when installing ast	2020-10-15 14:16:49 +05:30
Shivam Mathur	d2241010ef	Specify PHP version when installing ast	2020-10-15 14:16:48 +05:30
Shivam Mathur	a0f02c17c0	Merge pull request #304 from shivammathur/develop Hotfix	2020-10-15 14:16:47 +05:30
Shivam Mathur	bb5257e07d	Update Node.js dependencies	2020-10-15 14:16:47 +05:30
Shivam Mathur	f687ff8f21	Fix dependency mess in phalcon4 setup on ubuntu	2020-10-15 14:16:46 +05:30
Shivam Mathur	537c66b2ea	Minor fixes in scripts	2020-10-15 14:16:22 +05:30
Shivam Mathur	073c2e666b	Merge pull request #300 from shivammathur/develop 2.6.0	2020-10-15 14:16:21 +05:30
Shivam Mathur	465e63b28c	Bump version to 2.6.0	2020-10-15 14:16:21 +05:30
Shivam Mathur	b8f0b066dc	Add support for behat and phpspec	2020-10-15 14:16:20 +05:30
Shivam Mathur	9e663851ce	Move matchers setup to scripts	2020-10-15 14:16:19 +05:30
Shivam Mathur	ad196941ed	Refactor install.test.ts	2020-10-15 14:16:19 +05:30
Shivam Mathur	f8e867a9ff	Refactor install.ts	2020-10-15 14:16:18 +05:30
Shivam Mathur	8cb01730c7	Prioritize with over env for inputs	2020-10-15 14:16:17 +05:30
Shivam Mathur	ebba1db2c3	Add alias latest	2020-10-15 14:16:17 +05:30
Shivam Mathur	716331904e	Switch to environment files. Apply GHSA-mfwh-5m23-j46w (CVE-2020-15228)	2020-10-15 14:16:16 +05:30
Shivam Mathur	2ad63ddbd3	Merge pull request #294 from shivammathur/dependabot/npm_and_yarn/actions/core-1.2.6 Bump @actions/core from 1.2.5 to 1.2.6	2020-10-15 14:16:15 +05:30
Shivam Mathur	c4606c9269	Log versions in tools setup	2020-10-15 14:16:15 +05:30
Shivam Mathur	7dcb43c768	Improve problem matchers section in README	2020-10-15 14:16:14 +05:30
dependabot[bot]	691c5309aa	Bump @actions/core from 1.2.5 to 1.2.6 Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/actions/toolkit/releases) - [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core) Signed-off-by: dependabot[bot] <support@github.com>	2020-10-15 14:16:13 +05:30
Shivam Mathur	84b222366a	Merge pull request #292 from szepeviktor/patch-1 PHPStan is GH Actions-friendly	2020-10-15 14:16:13 +05:30
Viktor Szépe	b98ed88402	PHPStan is GH Actions-friendly no need for cs2pr	2020-10-15 14:16:12 +05:30
Shivam Mathur	0ca827ae3b	Merge pull request #283 from shivammathur/develop 2.5.0	2020-10-15 14:16:11 +05:30
Shivam Mathur	16b0a25bf6	Bump version to 2.5.0	2020-10-15 14:16:10 +05:30
Shivam Mathur	fa0af5c382	Update README	2020-10-15 14:16:09 +05:30
Shivam Mathur	db36b200b1	Fix regex in protoc.sh	2020-10-15 14:16:06 +05:30
Shivam Mathur	7cfd76cc1b	Move $arch_name to tools/blackfire.ps1	2020-10-15 14:16:05 +05:30
Shivam Mathur	682b1f5e44	Make sure printf is in PATH in Windows	2020-10-15 14:16:04 +05:30
Shivam Mathur	7b56e4491e	Improving removing extensions for Ubuntu SH runners	2020-09-07 09:36:56 +05:30
Shivam Mathur	acc1fdb337	Add support to configure icu version	2020-09-07 09:36:51 +05:30
Shivam Mathur	e3286d1234	Fix cleanup_lists in linux.sh for old PHP	2020-09-06 19:29:39 +05:30
Shivam Mathur	83019fade2	Merge pull request #279 from mlocati/win32/use-powershell-phpmanager-release-assets Download release assets for PowerShell PhpManager	2020-09-06 19:29:38 +05:30
Shivam Mathur	83b3d4a8f9	Merge pull request #278 from mlocati/win32/use-powershell-phpmanager-releases Use releases instead of tags to download PowerShell PhpManager	2020-09-06 19:29:37 +05:30
Michele Locati	56273e234f	Download release assets for PowerShell PhpManager 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	2020-09-06 19:29:37 +05:30
Michele Locati	48a00b4d3f	Use releases instead of tags to download PowerShell PhpManager I just started to publish PhpManager to GitHub Releases too	2020-09-06 19:29:36 +05:30
Shivam Mathur	f641885a8d	Add support for phing	2020-09-06 19:29:35 +05:30
Shivam Mathur	9457ce6e2b	Replace fedora with valid platform name	2020-09-06 19:29:34 +05:30
Shivam Mathur	a31f8b1a2b	Remove unnecessary parameter version from addArchive	2020-09-06 19:29:34 +05:30
Shivam Mathur	ffded4a3e8	Fix support for pecl pdo extensions on Ubuntu	2020-08-21 23:58:53 +05:30
Shivam Mathur	9e6b9d7d70	Merge pull request #274 from shivammathur/develop 2.4.3	2020-08-18 10:12:49 +05:30
Shivam Mathur	7d45057bba	Bump version to 2.4.3	2020-08-18 09:58:32 +05:30
Shivam Mathur	c4fd8b0739	Update README	2020-08-18 09:58:25 +05:30
Shivam Mathur	49088ede98	Fix composer fallback	2020-08-18 09:58:23 +05:30
Shivam Mathur	3543ed1ef8	Switch to fixed getcomposer.org links	2020-08-18 09:58:23 +05:30
Shivam Mathur	9bd0fdbc18	Remove old PHPUnit on linux	2020-08-18 09:58:22 +05:30
Shivam Mathur	c5d29cf8e3	Fix removing extensions on Ubuntu SH runners. (#271 )	2020-08-12 17:10:23 +05:30
Shivam Mathur	c5e0997b44	Merge pull request #270 from shivammathur/develop 2.4.2	2020-08-10 19:30:25 +05:30
Shivam Mathur	ee084d3176	Bump version to 2.4.2	2020-08-10 19:30:25 +05:30
Shivam Mathur	c256f0c9cb	Update README	2020-08-10 19:30:19 +05:30
Shivam Mathur	d84365cd03	Add support for oci extensions in PHP 8 on Windows Fix cache support for oci8 on Windows	2020-08-10 14:08:28 +05:30
Shivam Mathur	3c52e818b1	Add support for cubrid and pdo_cubrid on Ubuntu	2020-08-10 14:08:27 +05:30
Shivam Mathur	188598ef9d	Dry custom tools and extension code	2020-08-10 14:08:27 +05:30
Shivam Mathur	f8b8d766d5	Fix permissions in protoc setup	2020-08-10 14:08:26 +05:30
Shivam Mathur	15a6402865	Change cURL opts	2020-08-10 14:08:20 +05:30
Shivam Mathur	91bd6b26c2	Use cached composer builds	2020-08-04 21:15:25 +05:30
Shivam Mathur	9dae796baf	Merge pull request #263 from shivammathur/develop 2.4.1	2020-08-03 15:35:31 +05:30
Shivam Mathur	6d9aef83a3	Bump version to 2.4.1	2020-08-03 14:49:44 +05:30
Shivam Mathur	bd5a0d94b6	Update README	2020-08-03 11:47:11 +05:30
Shivam Mathur	5405f14867	Move blackfire setup to separate scripts	2020-08-03 11:47:11 +05:30
Shivam Mathur	cb25b9c13a	Add support for protoc and grpc_php_plugin	2020-08-03 11:47:10 +05:30
Shivam Mathur	e63d25d41f	Use blackfire API to get versions	2020-08-03 11:47:09 +05:30
Shivam Mathur	2a7ae24c8e	Dry extension code	2020-08-03 11:47:00 +05:30
Shivam Mathur	e68a74a71c	Limit swoole support to PHP 7.4	2020-08-02 19:09:48 +05:30
Shivam Mathur	67152eb712	Accept PECL default parameters	2020-08-02 19:09:47 +05:30
Shivam Mathur	83bdf158fa	Fix coverage message in node workflow	2020-08-02 19:09:46 +05:30
Shivam Mathur	5e240ab99f	Use shivammathur/php-builder-windows for PHP 8 on Windows (#261 )	2020-08-02 19:09:45 +05:30
Shivam Mathur	0fae072f07	Refactor extensions.ts	2020-08-02 19:09:45 +05:30
Shivam Mathur	e0561697dc	Fail fast PCOV on unsupported PHP versions	2020-08-02 19:09:44 +05:30
Shivam Mathur	3aa0f17b55	Remove obsolete pcov.sh	2020-08-02 19:09:43 +05:30
Shivam Mathur	8b218279a3	Improve cURL use	2020-08-02 19:09:29 +05:30
Shivam Mathur	90b6355bf0	Fix updating lists in phalcon setup on Ubuntu	2020-07-24 10:31:35 +05:30
Shivam Mathur	84f23853b7	Use default packagist mirror for old PHP	2020-07-24 10:31:35 +05:30
Shivam Mathur	a4001afbd6	Remove update_extension from linux.sh	2020-07-24 10:31:34 +05:30
Shivam Mathur	cfbb105cb6	Use cached packages to install PHP	2020-07-24 10:31:28 +05:30
Shivam Mathur	c549015370	Fix warning in cleanup_lists on first run on ubuntu-20.04	2020-07-21 18:27:07 +05:30
Shivam Mathur	9e22b87414	Bump supported version in SECURITY.md	2020-07-21 16:12:05 +05:30