Merge pull request #235 from shivammathur/develop

2.3.1
Bump version to 2.3.1
2025-07-04 22:23:16 +07:00 · 2020-06-22 07:33:24 +05:30 · 2020-06-22 07:33:18 +05:30 · 2020-06-22 07:33:17 +05:30 · 2020-06-22 07:33:16 +05:30 · 2020-06-22 07:33:15 +05:30
52 changed files with 1392 additions and 1206 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -1,7 +1,7 @@
 {
  "env": { "node": true, "jest": true },
  "parser": "@typescript-eslint/parser",
-  "parserOptions": { "ecmaVersion": 2020, "sourceType": "module" },
+  "parserOptions": { "ecmaVersion": 2019, "sourceType": "module" },
  "extends": [
    "eslint:recommended",
    "plugin:@typescript-eslint/eslint-recommended",
@ -12,11 +12,5 @@
    "plugin:prettier/recommended",
    "prettier/@typescript-eslint"
  ],
-  "plugins": ["@typescript-eslint", "jest"],
-  "rules": {
-    "camelcase": "off",
-    "require-atomic-updates": "off",
-    "@typescript-eslint/ban-ts-ignore": "off",
-    "@typescript-eslint/camelcase": "off"
-  }
+  "plugins": ["@typescript-eslint", "jest"]
 }
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -2,7 +2,5 @@

 tidelift: "npm/setup-php"
 community_bridge: setup-php
-issuehunt: shivammathur
 patreon: shivammathur
-liberapay: shivammathur
 custom: https://www.paypal.me/shivammathur
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -2,7 +2,7 @@
 name: Bug report
 about: Nice, you found a bug!
 title: ''
-labels: t:bug
+labels: 'bug'
 assignees: 'shivammathur'

 ---
@ -10,6 +10,11 @@ assignees: 'shivammathur'
 **Describe the bug**
 <!-- Please describe the bug concisely. -->

+**Version**
+- [ ] I have checked releases and the bug exists in the latest patch version of `v1` or `v2`.
+- [ ] `v2`
+- [ ] `v1`
+
 **Runners**
 <!-- Please mark the GitHub Action runner your workflow uses. -->
 - [ ] GitHub Hosted
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest a new feature
 title: ''
-labels: t:enhancement
+labels: 'enhancement'
 assignees: 'shivammathur'

 ---
@ -10,6 +10,9 @@ assignees: 'shivammathur'
 **Describe the feature**
 <!-- 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`.
+
 **Underlying issue**
 <!-- Please describe the issue this would solve. -->

--- a/.github/PULL_REQUEST_TEMPLATE/FIX.md
+++ b/.github/PULL_REQUEST_TEMPLATE/FIX.md
@ -1,37 +0,0 @@
---
-name: 🐞 Bug Fix
-about: You have a fix for a bug?
-labels: bug
-
---
-
-## A Pull Request should be associated with an Issue.
-
-> If you're offering a new feature or fixing anything, please provide the details in Issues,
-> so that the development can be pointed in the intended direction.
-
-Related issue: <!-- Please link the related issue -->
-
-> Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you for your contribution.
-
-### Description
-
-This PR [briefly explain what it does]
-
-> In case this PR introduced TypeScript/JavaScript code changes:
-
- [ ] I have written test cases for the changes in this pull request.
- [ ] I have run `npm run format` before the commit.
- [ ] I have run `npm run lint` before the commit.
- [ ] I have run `npm run release` before the commit.
- [ ] `npm test` returns with no unit test errors and all code covered.
-
-> In case this PR edits any scripts:
-
- [ ] I have checked the edited scripts for syntax.
- [ ] I have tested the changes in an integration test (If yes, provide workflow link).
-
-<!--
- Please target the develop branch when submitting the pull request.
-->
--- a/.github/PULL_REQUEST_TEMPLATE/IMPROVEMENT.md
+++ b/.github/PULL_REQUEST_TEMPLATE/IMPROVEMENT.md
@ -1,37 +0,0 @@
---
-name: ⚙ Improvement
-about: You have some improvement to make setup-php better?
-labels: enhancement
-
---
-
-## A Pull Request should be associated with an Issue.
-
-> If you're improving a feature please provide the details in Issues,
-> so that the development can be pointed in the intended direction.
-
-Related issue: <!-- Please link the related issue -->
-
-> Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you for your contribution.
-
-### Description
-
-This PR [briefly explain what it does]
-
-> In case this PR introduced TypeScript/JavaScript code changes:
-
- [ ] I have written test cases for the changes in this pull request.
- [ ] I have run `npm run format` before the commit.
- [ ] I have run `npm run lint` before the commit.
- [ ] I have run `npm run release` before the commit.
- [ ] `npm test` returns with no unit test errors and all code covered.
-
-> In case this PR edits any scripts:
-
- [ ] I have checked the edited scripts for syntax.
- [ ] I have tested the changes in an integration test (If yes, provide workflow link).
-
-<!--
- Please target the develop branch when submitting the pull request.
-->
--- a/.github/PULL_REQUEST_TEMPLATE/NEW_FEATURE.md
+++ b/.github/PULL_REQUEST_TEMPLATE/NEW_FEATURE.md
@ -1,37 +0,0 @@
---
-name: 🎉 New Feature
-about: You have added a new feature to setup-php?
-labels: enhancement
-
---
-
-## A Pull Request should be associated with an Issue.
-
-> If you're adding a new feature please provide the details in Issues,
-> so that the development can be pointed in the intended direction.
-
-Related issue: <!-- Please link the related issue -->
-
-> Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you for your contribution.
-
-### Description
-
-This PR [briefly explain what it does]
-
-> In case this PR introduced TypeScript/JavaScript code changes:
-
- [ ] I have written test cases for the changes in this pull request.
- [ ] I have run `npm run format` before the commit.
- [ ] I have run `npm run lint` before the commit.
- [ ] I have run `npm run release` before the commit.
- [ ] `npm test` returns with no unit test errors and all code covered.
-
-> In case this PR edits any scripts:
-
- [ ] I have checked the edited scripts for syntax.
- [ ] I have tested the changes in an integration test (If yes, provide workflow link).
-
-<!--
- Please target the develop branch when submitting the pull request.
-->
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@ -6,8 +6,8 @@ The following versions of this project are supported for security updates.

 | Version | Supported          |
 | ------- | ------------------ |
-| 1.8.x   | :white_check_mark: |
-| 2.2.x   | :white_check_mark: |
+| 1.9.x   | :white_check_mark: |
+| 2.3.x   | :white_check_mark: |

 ## Supported PHP Versions

@ -22,7 +22,7 @@ This security policy only applies to the latest patches of the following PHP ver

 ## Reporting a Vulnerability

-If you have found any issues that might have security implications in the versions supported, please send a report privately to [contact@shivammathur.com](mailto:contact@shivammathur.com)
+If you have found any issues that might have security implications in the versions supported, please send a report privately to [contact@shivammathur.com](mailto:contact@shivammathur.com).
 Do not report security reports publicly.

 ## Tidelift
--- a/.github/workflows/experimental-workflow.yml
+++ b/.github/workflows/experimental-workflow.yml
@ -1,110 +0,0 @@
-name: Experimental workflow
-on:
-  pull_request:
-    branches:
-      - nightly
-      - master
-      - develop
-      - verbose
-    paths-ignore:
-      - '**.md'
-      - 'examples/**'
-  push:
-    branches:
-      - nightly
-      - master
-      - develop
-      - verbose
-    paths-ignore:
-      - '**.md'
-      - 'examples/**'
-jobs:
-  run:
-    name: Run
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['8.0']
-    env:
-      extensions: xml, opcache, pcov
-      key: cache-v2
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Node.js 12.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Prettier Format Check
-        run: npm run format-check
-
-      - name: ESLint Check
-        run: npm run lint
-
-      - name: Run tests
-        run: npm test
-
-      - 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 }}
-
-      - name: Setup cache environment
-        id: cache-env
-        uses: shivammathur/cache-extensions@develop
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
-
-      - name: Setup PHP with extensions and custom config
-        run: node dist/index.js
-        env:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata
-          coverage: pcov
-
-      - name: Testing PHP version
-        run: |
-          php -v
-          php -r "if(strpos(phpversion(), '${{ matrix.php-versions }}') === false) {throw new Exception('Wrong PHP version Installed');}"
-
-      - name: Testing Composer version
-        run: |
-          composer -V
-          php -r "if(strpos(@exec('composer -V'), 'Composer version') === false) {throw new Exception('Composer not found');}"
-      - name: Testing Extensions
-        run: |
-          php -m
-          php -r "if(! extension_loaded('mbstring')) {throw new Exception('mbstring not found');}"
-          php -r "if(! extension_loaded('pcov')) {throw new Exception('PCOV not found');}"
-      - name: Testing ini values
-        run: |
-          php -r "if(ini_get('post_max_size')!='256M') {throw new Exception('post_max_size not added');}"
-          php -r "if(ini_get('short_open_tag')!=1) {throw new Exception('short_open_tag not added');}"
-          php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}"
-      - name: Test JIT
-        run: |
-          php -r "if(! extension_loaded('Zend OPcache')) {throw new Exception('Zend OPcache not found');}"
-          php -r "if(ini_get('opcache.jit_buffer_size')!='256M') {throw new Exception('opcache.jit_buffer_size not set');}"
-          php -r "if(ini_get('opcache.jit')!=1235) {throw new Exception('opcache.jit not set');}"
-          php -r "if(ini_get('pcre.jit')!=1) {throw new Exception('pcre.jit not set');}"
-      - name: Benchmark JIT
-        run: |
-          curl -o bench.php https://raw.githubusercontent.com/php/php-src/master/Zend/bench.php
-          php bench.php
--- a/.github/workflows/node-workflow.yml
+++ b/.github/workflows/node-workflow.yml
@ -0,0 +1,51 @@
+name: Node workflow
+on:
+  pull_request:
+    branches:
+      - master
+      - develop
+      - verbose
+    paths-ignore:
+      - '**.md'
+      - 'examples/**'
+  push:
+    branches:
+      - master
+      - develop
+      - verbose
+    paths-ignore:
+      - '**.md'
+      - 'examples/**'
+jobs:
+  run:
+    name: Run
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js 12.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Prettier Format Check
+        run: npm run format-check
+
+      - name: ESLint Check
+        run: npm run lint
+
+      - name: Run tests
+        run: npm test
+
+      - 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 }}
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@ -23,8 +23,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        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']
    env:
      extensions: xml, opcache, xdebug, pcov
      key: cache-v2
@ -32,30 +32,8 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v2

-      - name: Setup Node.js 12.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Prettier Format Check
-        run: npm run format-check
-
-      - name: ESLint Check
-        run: npm run lint
-
-      - name: Run tests
-        run: npm test
-
-      - 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 }}
-
      - name: Setup cache environment
-        id: cache-env
+        id: extcache
        uses: shivammathur/cache-extensions@develop
        with:
          php-version: ${{ matrix.php-versions }}
@ -63,11 +41,11 @@ jobs:
          key: ${{ env.key }}

      - name: Cache extensions
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
+          path: ${{ steps.extcache.outputs.dir }}
+          key: ${{ steps.extcache.outputs.key }}
+          restore-keys: ${{ steps.extcache.outputs.key }}

      - name: Setup PHP with extensions and custom config
        run: node dist/index.js
--- a/README.md
+++ b/README.md
@ -19,9 +19,11 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support

 - [PHP Support](#tada-php-support)
 - [OS/Platform Support](#cloud-osplatform-support)
+  - [GitHub-Hosted Runners](#github-hosted-runners)
+  - [Self-Hosted Runners](#self-hosted-runners)
 - [PHP Extension Support](#heavy_plus_sign-php-extension-support)
 - [Tools Support](#wrench-tools-support)
- [Coverage support](#signal_strength-coverage-support)
+- [Coverage Support](#signal_strength-coverage-support)
  - [Xdebug](#xdebug)
  - [PCOV](#pcov)
  - [Disable Coverage](#disable-coverage)
@ -29,7 +31,7 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
  - [Inputs](#inputs)
  - [Basic Setup](#basic-setup)
  - [Matrix Setup](#matrix-setup)
-  - [Experimental Setup](#experimental-setup)
+  - [Nightly Build Setup](#nightly-build-setup)
  - [Self Hosted Setup](#self-hosted-setup)
  - [Local Testing Setup](#local-testing-setup)
  - [Thread Safe Setup](#thread-safe-setup)
@ -51,30 +53,45 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support

 |PHP Version|Stability|Release Support|Runner Support|
 |--- |--- |--- |--- |
-|`5.3`|`Stable`|`End of life`|`GitHub`|
-|`5.4`|`Stable`|`End of life`|`GitHub`|
-|`5.5`|`Stable`|`End of life`|`GitHub`|
-|`5.6`|`Stable`|`End of life`|`GitHub`, `self-hosted`|
-|`7.0`|`Stable`|`End of life`|`GitHub`, `self-hosted`|
-|`7.1`|`Stable`|`End of life`|`GitHub`, `self-hosted`|
-|`7.2`|`Stable`|`Security fixes only`|`GitHub`, `self-hosted`|
-|`7.3`|`Stable`|`Active`|`GitHub`, `self-hosted`|
-|`7.4`|`Stable`|`Active`|`GitHub`, `self-hosted`|
-|`8.0`|`Experimental`|`In development`|`GitHub`, `self-hosted`|
+|`5.3`|`Stable`|`End of life`|`GitHub-hosted`|
+|`5.4`|`Stable`|`End of life`|`GitHub-hosted`|
+|`5.5`|`Stable`|`End of life`|`GitHub-hosted`|
+|`5.6`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.0`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.1`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.2`|`Stable`|`Security fixes only`|`GitHub-hosted`, `self-hosted`|
+|`7.3`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
+|`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
+|`8.0`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|

-**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 [experimental setup](#experimental-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

-|Virtual environment|matrix.operating-system|
-|--- |--- |
-|Windows Server 2019|`windows-latest` or `windows-2019`|
-|Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|
-|Ubuntu 16.04|`ubuntu-16.04`|
-|MacOS X Catalina 10.15|`macos-latest` or `macos-10.15`|
-|Self Hosted|`self-hosted`|
+Both `GitHub-hosted` runners and `self-hosted` runners are supported on the following operating systems.

-**Note:** Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.
+### GitHub-Hosted Runners
+
+|Virtual environment|YAML workflow label|Pre-installed PHP|
+|--- |--- |--- |
+|Ubuntu 16.04|`ubuntu-16.04`|`PHP 5.6` to `PHP 7.4`|
+|Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|`PHP 7.1` to `PHP 7.4`|
+|Ubuntu 20.04|`ubuntu-20.04`|`PHP 7.4`|
+|Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 7.4`|
+|macOS Catalina 10.15|`macos-latest` or `macos-10.15`|`PHP 7.4`|
+
+### Self-Hosted Runners
+
+|Host OS/Virtual environment|YAML workflow label|
+|--- |--- |
+|Ubuntu 16.04|`self-hosted` or `Linux`|
+|Ubuntu 18.04|`self-hosted` or `Linux`|
+|Ubuntu 20.04|`self-hosted` or `Linux`|
+|Windows 7 and newer|`self-hosted` or `Windows`|
+|Windows Server 2012 R2 and newer|`self-hosted` or `Windows`|
+|macOS Catalina 10.15|`self-hosted` or `macOS`|
+
+- Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.

 ## :heavy_plus_sign: PHP Extension Support

@ -131,7 +148,7 @@ with:

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

-`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `flex`, `infection`, `pecl`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`, `vapor-cli`
+`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `flex`, `infection`, `pecl`, `phan`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`, `vapor-cli`

 ```yaml
 uses: shivammathur/setup-php@v2
@ -140,29 +157,35 @@ with:
  tools: php-cs-fixer, phpunit
 ```

-To setup a particular version of a tool, specify it in this form `tool:version`.  
-Version should be in semver format and a valid release of the tool.
+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.

 ```yaml
 uses: shivammathur/setup-php@v2
 with:
  php-version: '7.4'
-  tools: php-cs-fixer:2.15.5, phpunit:8.5.1
-``` 
+  tools: composer:v2
+```
+
+Version for other tools should be in `semver` format and a valid release of the tool.
+
+```yaml
+uses: shivammathur/setup-php@v2
+with:
+  php-version: '7.4'
+  tools: php-cs-fixer:2.16.2, phpunit:8.5.1
+```

 **Notes**
- `composer` is setup by default.
- Specifying version for `composer` and `pecl` has no effect, latest versions of both tools which are compatible with the PHP version will be setup.
- Both agent and client will be setup when `blackfire` is specified.
- If the version specified for the tool is not in semver format, latest version of the tool will be setup.
+- Both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified.
 - Tools which cannot be setup gracefully leave an error message in the logs, the action is not interrupted.

-## :signal_strength: Coverage support
+## :signal_strength: Coverage Support

 ### Xdebug

 Specify `coverage: xdebug` to use `Xdebug`.  
-Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action") except `8.0`.
+Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action").

 ```yaml
 uses: shivammathur/setup-php@v2
@ -174,8 +197,8 @@ with:
 ### PCOV

 Specify `coverage: pcov` to use `PCOV` and disable `Xdebug`.  
-It is much faster than `Xdebug`.  
-`PCOV` needs `PHP >= 7.1`.  
+`PCOV` supports `PHP 7.1` and newer PHP versions.  
+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
@ -285,12 +308,12 @@ jobs:
        tools: php-cs-fixer, phpunit
 ```

-### Experimental Setup
+### Nightly Build Setup

 > Setup a nightly build of `PHP 8.0.0-dev` from the [master branch](https://github.com/php/php-src/tree/master "Master branch on PHP source repository") of PHP.

- This version is currently in development and is an experimental feature on this action.
- `PECL` is installed by default with this version on `ubuntu`.
+- 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.
@ -314,10 +337,9 @@ steps:

 > Setup PHP on a self-hosted runner.

- `PHP 5.6` and newer versions are supported on self-hosted runners.
- `Windows 7` and newer, `Windows Server 2012 R2` and newer, `Ubuntu 18.04`, `Ubuntu 16.04` and `MacOS X Catalina 10.15` are supported.
 - To setup a dockerized self-hosted runner, refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Ubuntu) to setup in an `Ubuntu` container and refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Windows) to setup in a `Windows` container.
- To setup the runner directly on the host OS or in a VM, follow this [requirements guide](https://github.com/shivammathur/setup-php/wiki/Requirements-for-self-hosted-runners "Requirements guide for self-hosted runner to run setup-php") before setting up the self-hosted runner.
+- 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.
+- 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.

@ -366,8 +388,11 @@ Run the workflow locally with `act` using [`shivammathur/node`](https://github.c
 # For runs-on: ubuntu-latest
 act -P ubuntu-latest=shivammathur/node:latest

+# For runs-on: ubuntu-20.04
+act -P ubuntu-20.04=shivammathur/node:focal
+
 # For runs-on: ubuntu-18.04
-act -P ubuntu-18.04=shivammathur/node:latest
+act -P ubuntu-18.04=shivammathur/node:bionic

 # For runs-on: ubuntu-16.04
 act -P ubuntu-16.04=shivammathur/node:xenial
@ -446,7 +471,7 @@ steps:
  uses: actions/checkout@v2

 - name: Setup cache environment
-  id: cache-env
+  id: extcache
  uses: shivammathur/cache-extensions@v1
  with:
    php-version: ${{ matrix.php-versions }}
@ -454,11 +479,11 @@ steps:
    key: ${{ env.key }}

 - name: Cache extensions
-  uses: actions/cache@v1
+  uses: actions/cache@v2
  with:
-    path: ${{ steps.cache-env.outputs.dir }}
-    key: ${{ steps.cache-env.outputs.key }}
-    restore-keys: ${{ steps.cache-env.outputs.key }}
+    path: ${{ steps.extcache.outputs.dir }}
+    key: ${{ steps.extcache.outputs.key }}
+    restore-keys: ${{ steps.extcache.outputs.key }}

 - name: Setup PHP
  uses: shivammathur/setup-php@v2
@ -475,13 +500,13 @@ If your project uses composer, you can persist composer's internal cache directo

 ```yaml
 - name: Get composer cache directory
-  id: composer-cache
+  id: composercache
  run: echo "::set-output name=dir::$(composer config cache-files-dir)"

 - name: Cache dependencies
-  uses: actions/cache@v1
+  uses: actions/cache@v2
  with:
-    path: ${{ steps.composer-cache.outputs.dir }}
+    path: ${{ steps.composercache.outputs.dir }}
    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
    restore-keys: ${{ runner.os }}-composer-

@ -503,13 +528,13 @@ If your project has node.js dependencies, you can persist npm's or yarn's cache

 ```yaml
 - name: Get node.js cache directory
-  id: node-cache-dir
+  id: nodecache
  run: echo "::set-output name=dir::$(npm config get cache)" # Use $(yarn cache dir) for yarn

 - name: Cache dependencies
-  uses: actions/cache@v1
+  uses: actions/cache@v2
  with:
-    path: ${{ steps.node-cache-dir.outputs.dir }}
+    path: ${{ steps.nodecache.outputs.dir }}
    key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} # Use '**/yarn.lock' for yarn
    restore-keys: ${{ runner.os }}-node-
 ```
@ -609,7 +634,7 @@ Contributions are welcome! See [Contributor's Guide](.github/CONTRIBUTING.md "sh

 If this action helped you.

- To support this project subscribe on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or sponsor using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal").
+- Sponsor the project by subscribing on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or by contributing using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal").
 - Please star the project and share it with the community.
 - If you blog, write about your experience of using this action.
 - If you need any help using this, please contact me using [Codementor](https://www.codementor.io/shivammathur "Shivam Mathur Codementor")
--- a/tests/coverage.test.ts
+++ b/tests/coverage.test.ts
@ -1,15 +1,9 @@
 import * as coverage from '../src/coverage';

-jest.mock('../src/extensions', () => ({
-  addExtension: jest.fn().mockImplementation(extension => {
-    return 'add_extension ' + extension + '\n';
-  })
-}));
-
 describe('Config tests', () => {
  it('checking addCoverage with PCOV on windows', async () => {
    let win32: string = await coverage.addCoverage('PCOV', '7.4', 'win32');
-    expect(win32).toContain('add_extension pcov');
+    expect(win32).toContain('Add-Extension pcov');
    expect(win32).toContain('Remove-Extension xdebug');

    win32 = await coverage.addCoverage('pcov', '7.0', 'win32');
@ -33,22 +27,30 @@ describe('Config tests', () => {

  it('checking addCoverage with Xdebug on windows', async () => {
    const win32: string = await coverage.addCoverage('xdebug', '7.4', 'win32');
-    expect(win32).toContain('add_extension xdebug');
-  });
-
-  it('checking addCoverage with Xdebug on windows', async () => {
-    const win32: string = await coverage.addCoverage('xdebug', '8.0', 'win32');
-    expect(win32).toContain('Xdebug currently only supports PHP 7.4 or lower');
-  });
-
-  it('checking addCoverage with Xdebug on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug', '7.4', 'linux');
-    expect(linux).toContain('add_extension xdebug');
+    expect(win32).toContain('Add-Extension xdebug');
  });

  it('checking addCoverage with Xdebug on linux', async () => {
    const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
-    expect(linux).toContain('Xdebug currently only supports PHP 7.4 or lower');
+    expect(linux).toContain('add_extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug3 on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug3', '7.4', 'linux');
+    expect(linux).toContain('add_extension_from_source xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
+  });
+
+  it('checking addCoverage with Xdebug3 on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug3', '8.0', '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.0', 'linux');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
  });

  it('checking addCoverage with Xdebug on darwin', async () => {
@ -60,15 +62,6 @@ describe('Config tests', () => {
    expect(darwin).toContain('add_extension xdebug');
  });

-  it('checking addCoverage with Xdebug on darwin', async () => {
-    const darwin: string = await coverage.addCoverage(
-      'xdebug',
-      '8.0',
-      'darwin'
-    );
-    expect(darwin).toContain('Xdebug currently only supports PHP 7.4 or lower');
-  });
-
  it('checking disableCoverage windows', async () => {
    const win32 = await coverage.addCoverage('none', '7.4', 'win32');
    expect(win32).toContain('Remove-Extension xdebug');
--- a/tests/extensions.test.ts
+++ b/tests/extensions.test.ts
@ -1,6 +1,12 @@
 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.9.6');
+  });
  it('checking addExtensionOnWindows', async () => {
    let win32: string = await extensions.addExtension(
      'Xdebug, pcov, sqlite, :intl, phalcon4, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
@ -50,11 +56,14 @@ describe('Extension tests', () => {

  it('checking addExtensionOnLinux', async () => {
    let linux: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
+      'Xdebug, xdebug3, pcov, sqlite, :intl, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
      '7.4',
      'linux'
    );
-    expect(linux).toContain('update_extension xdebug 2.9.3');
+    expect(linux).toContain('update_extension xdebug 2.9.6');
+    expect(linux).toContain(
+      'add_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension'
+    );
    expect(linux).toContain('sudo $debconf_fix apt-get install -y php7.4-pcov');
    expect(linux).toContain(
      'sudo $debconf_fix apt-get install -y php7.4-sqlite3'
@ -70,6 +79,11 @@ describe('Extension tests', () => {
      'add_unstable_extension xdebug alpha zend_extension'
    );

+    linux = await extensions.addExtension('xdebug3', '8.0', 'linux');
+    expect(linux).toContain(
+      'sudo $debconf_fix apt-get install -y php8.0-xdebug'
+    );
+
    linux = await extensions.addExtension('gearman', '7.0', 'linux');
    expect(linux).toContain('gearman.sh 7.0');
    linux = await extensions.addExtension('gearman', '7.1', 'linux');
@ -104,8 +118,8 @@ describe('Extension tests', () => {
      '7.2',
      'darwin'
    );
-    expect(darwin).toContain('sudo pecl install -f xdebug');
-    expect(darwin).toContain('sudo pecl install -f pcov');
+    expect(darwin).toContain('add_brew_extension xdebug');
+    expect(darwin).toContain('add_brew_extension pcov');
    expect(darwin).toContain('sudo pecl install -f sqlite3');
    expect(darwin).toContain('remove_extension intl');
    expect(darwin).toContain('add_unstable_extension ast beta extension');
@ -121,7 +135,7 @@ describe('Extension tests', () => {
    expect(darwin).toContain('sudo pecl install -f pcov');

    darwin = await extensions.addExtension('pcov', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f pcov');
+    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');
@ -133,13 +147,13 @@ describe('Extension tests', () => {
    expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');

    darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
+    expect(darwin).toContain('add_brew_extension xdebug');

    darwin = await extensions.addExtension('xdebug', '7.0', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.9.0');
+    expect(darwin).toContain('add_brew_extension xdebug');

    darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug');
+    expect(darwin).toContain('add_brew_extension xdebug');

    darwin = await extensions.addExtension('redis', '5.6', 'darwin');
    expect(darwin).toContain('sudo pecl install -f redis-2.2.8');
--- a/tests/install.test.ts
+++ b/tests/install.test.ts
@ -69,6 +69,7 @@ jest.mock('../src/install', () => ({
 * @param extension_csv
 * @param ini_values_csv
 * @param coverage_driver
+ * @param tools
 */
 function setEnv(
  version: string | number,
@ -76,8 +77,7 @@ function setEnv(
  extension_csv: string,
  ini_values_csv: string,
  coverage_driver: string,
-  tools: string,
-  pecl: string
+  tools: string
 ): void {
  process.env['php-version'] = version.toString();
  process.env['RUNNER_OS'] = os;
@ -85,26 +85,25 @@ function setEnv(
  process.env['ini-values'] = ini_values_csv;
  process.env['coverage'] = coverage_driver;
  process.env['tools'] = tools;
-  process.env['pecl'] = pecl;
 }

 describe('Install', () => {
  it('Test install on windows', async () => {
-    setEnv('7.0', 'win32', '', '', '', '', '');
-    // @ts-ignore
-    let script: string = await install.run();
+    setEnv('7.0', 'win32', '', '', '', '');
+
+    let script: string = '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('pwsh script.ps1 7.0 ' + __dirname);

-    setEnv('7.3', 'win32', '', '', '', '', '');
-    // @ts-ignore
-    script = await install.run();
+    setEnv('7.3', 'win32', '', '', '', '');
+
+    script = '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('pwsh script.ps1 7.3 ' + __dirname);

-    setEnv('7.3', 'win32', 'a, b', 'a=b', 'x', '', '');
-    // @ts-ignore
-    script = await install.run();
+    setEnv('7.3', 'win32', 'a, b', 'a=b', 'x', '');
+
+    script = '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('install extensions');
    expect(script).toContain('edit php.ini');
@ -113,25 +112,15 @@ describe('Install', () => {
  });

  it('Test install on linux', async () => {
-    setEnv('7.3', 'linux', '', '', '', '', '');
-    // @ts-ignore
-    let script: string = await install.run();
+    setEnv('7.3', 'linux', '', '', '', '');
+
+    let script: string = '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('bash script.sh 7.3 ');

-    setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit', 'true');
-    // @ts-ignore
-    script = await install.run();
-    expect(script).toContain('initial script');
-    expect(script).toContain('install extensions');
-    expect(script).toContain('edit php.ini');
-    expect(script).toContain('set coverage driver');
-    expect(script).toContain('bash script.sh 7.3');
-    expect(script).toContain('add_tool');
+    setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit');

-    setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit', '');
-    // @ts-ignore
-    script = await install.run();
+    script = '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('install extensions');
    expect(script).toContain('edit php.ini');
@ -141,15 +130,15 @@ describe('Install', () => {
  });

  it('Test install on darwin', async () => {
-    setEnv('7.3', 'darwin', '', '', '', '', '');
-    // @ts-ignore
-    let script: string = await install.run();
+    setEnv('7.3', 'darwin', '', '', '', '');
+
+    let script: string = '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('bash script.sh 7.3 ' + __dirname);

-    setEnv('7.3', 'darwin', 'a, b', 'a=b', 'x', '', '');
-    // @ts-ignore
-    script = await install.run();
+    setEnv('7.3', 'darwin', 'a, b', 'a=b', 'x', '');
+
+    script = '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('install extensions');
    expect(script).toContain('edit php.ini');
@ -158,21 +147,21 @@ describe('Install', () => {
  });

  it('Test malformed version inputs', async () => {
-    setEnv('7.4.1', 'darwin', '', '', '', '', '');
-    // @ts-ignore
-    let script: string = await install.run();
+    setEnv('7.4.1', 'darwin', '', '', '', '');
+
+    let script: string = '' + '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('bash script.sh 7.4 ' + __dirname);

-    setEnv(8.0, 'darwin', '', '', '', '', '');
-    // @ts-ignore
-    script = await install.run();
+    setEnv(8.0, 'darwin', '', '', '', '');
+
+    script = '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('bash script.sh 8.0 ' + __dirname);

-    setEnv(8, 'darwin', '', '', '', '', '');
-    // @ts-ignore
-    script = await install.run();
+    setEnv(8, 'darwin', '', '', '', '');
+
+    script = '' + (await install.run());
    expect(script).toContain('initial script');
    expect(script).toContain('bash script.sh 8.0 ' + __dirname);
  });
--- a/tests/tools.test.ts
+++ b/tests/tools.test.ts
@ -219,6 +219,41 @@ describe('Tools tests', () => {
    expect(
      await tools.addComposer(['a', 'b', 'composer:1.2.3'])
    ).toStrictEqual(['composer', 'a', 'b']);
+    expect(
+      await tools.addComposer(['a', 'b', 'composer:snapshot'])
+    ).toStrictEqual(['composer:snapshot', 'a', 'b']);
+    expect(
+      await tools.addComposer(['a', 'b', 'composer:preview'])
+    ).toStrictEqual(['composer:preview', 'a', 'b']);
+    expect(
+      await tools.addComposer(['a', 'b', 'c', 'composer:1'])
+    ).toStrictEqual(['composer:1', 'a', 'b', 'c']);
+    expect(
+      await tools.addComposer(['a', 'b', 'c', 'composer:2'])
+    ).toStrictEqual(['composer:2', 'a', 'b', 'c']);
+    expect(
+      await tools.addComposer(['a', 'b', 'c', 'composer:v1'])
+    ).toStrictEqual(['composer:1', 'a', 'b', 'c']);
+    expect(
+      await tools.addComposer(['a', 'b', 'c', 'composer:v2'])
+    ).toStrictEqual(['composer:2', 'a', 'b', 'c']);
+  });
+
+  it('checking updateComposer', async () => {
+    expect(await tools.updateComposer('latest', 'linux')).toContain('');
+    expect(await tools.updateComposer('stable', 'win32')).toContain('');
+    expect(await tools.updateComposer('snapshot', 'darwin')).toContain(
+      '\ncomposer self-update --snapshot'
+    );
+    expect(await tools.updateComposer('preview', 'linux')).toContain(
+      '\ncomposer self-update --preview'
+    );
+    expect(await tools.updateComposer('1', 'win32')).toContain(
+      '\ncomposer self-update --1'
+    );
+    expect(await tools.updateComposer('2', 'darwin')).toContain(
+      '\ncomposer self-update --2'
+    );
  });

  it('checking getSymfonyUri', async () => {
@ -391,7 +426,7 @@ describe('Tools tests', () => {
  });
  it('checking addTools on darwin', async () => {
    const script: string = await tools.addTools(
-      'blackfire, blackfire-player, flex, infection, phpcs, phpcbf, phpcpd, phpmd, psalm, phinx, vapor-cli, phive:1.2.3, cs2pr:1.2.3, composer-prefetcher:1.2.3, phpize, php-config, symfony, symfony:1.2.3, wp-cli',
+      'blackfire, blackfire-player, flex, infection, phan, phpcs, phpcbf, phpcpd, phpmd, psalm, phinx, vapor-cli, phan:2.7.2, phive:1.2.3, cs2pr:1.2.3, composer-prefetcher:1.2.3, phpize, php-config, symfony, symfony:1.2.3, wp-cli',
      '7.4',
      'darwin'
    );
@ -408,6 +443,9 @@ describe('Tools tests', () => {
    expect(script).toContain(
      'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection'
    );
+    expect(script).toContain(
+      'add_tool https://github.com/phan/phan/releases/latest/download/phan.phar phan'
+    );
    expect(script).toContain(
      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs'
    );
@ -426,6 +464,9 @@ describe('Tools tests', () => {
    expect(script).toContain('add_composertool vapor-cli vapor-cli laravel/');
    expect(script).toContain('add_composertool flex flex symfony/');
    expect(script).toContain('add_composertool phinx phinx robmorgan/');
+    expect(script).toContain(
+      'add_tool https://github.com/phan/phan/releases/download/2.7.2/phan.phar phan'
+    );
    expect(script).toContain(
      'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
    );
@ -498,4 +539,24 @@ describe('Tools tests', () => {
      'Add-Composertool composer-prefetcher composer-prefetcher narrowspark/automatic-'
    );
  });
+  it('checking composer setup', async () => {
+    let script: string = await tools.addTools(
+      'composer, composer:v1',
+      '7.4',
+      'linux'
+    );
+    expect(script).toContain(
+      'add_tool https://getcomposer.org/composer-stable.phar composer'
+    );
+    expect(script).toContain('composer self-update --1');
+
+    script = await tools.addTools('composer:preview', '7.4', 'linux');
+    expect(script).toContain('composer self-update --preview');
+    script = await tools.addTools(
+      'composer:v1, composer:preview, composer:snapshot',
+      '7.4',
+      'linux'
+    );
+    expect(script).toContain('composer self-update --snapshot');
+  });
 });
--- a/tests/utils.test.ts
+++ b/tests/utils.test.ts
@ -155,6 +155,7 @@ describe('Utils tests', () => {
    );
    expect(await utils.getExtensionPrefix('xsl')).toEqual('extension');
    expect(await utils.getExtensionPrefix('xdebug')).toEqual('zend_extension');
+    expect(await utils.getExtensionPrefix('xdebug3')).toEqual('zend_extension');
    expect(await utils.getExtensionPrefix('opcache')).toEqual('zend_extension');
  });

--- a/dist/index.js
+++ b/dist/index.js
@ -973,7 +973,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -1030,7 +1030,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -1218,13 +1218,17 @@ exports.CSVArray = CSVArray;
 * @param extension
 */
 async function getExtensionPrefix(extension) {
-    const zend = ['xdebug', 'opcache', 'ioncube', 'eaccelerator'];
+    const zend = [
+        'xdebug',
+        'xdebug3',
+        'opcache',
+        'ioncube',
+        'eaccelerator'
+    ];
    switch (zend.indexOf(extension)) {
-        case 0:
-        case 1:
+        default:
            return 'zend_extension';
        case -1:
-        default:
            return 'extension';
    }
 }
@ -1605,12 +1609,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addTools = exports.addPackage = exports.addDevTools = exports.addArchive = exports.getCleanedToolsList = exports.addComposer = exports.getWpCliUrl = exports.getSymfonyUri = exports.getDeployerUrl = exports.getPharUrl = exports.addPhive = exports.getCodeceptionUri = exports.getCodeceptionUriBuilder = exports.getUri = exports.parseTool = exports.getToolVersion = exports.getCommand = void 0;
+exports.addTools = exports.addPackage = exports.addDevTools = exports.addArchive = exports.getCleanedToolsList = exports.updateComposer = exports.addComposer = exports.getWpCliUrl = exports.getSymfonyUri = exports.getDeployerUrl = exports.getPharUrl = exports.addPhive = exports.getCodeceptionUri = exports.getCodeceptionUriBuilder = exports.getUri = exports.parseTool = exports.getToolVersion = exports.getCommand = void 0;
 const utils = __importStar(__webpack_require__(163));
 /**
 * Function to get command to setup tools
@ -1638,8 +1642,10 @@ exports.getCommand = getCommand;
 async function getToolVersion(version) {
    // semver_regex - https://semver.org/
    const semver_regex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+    const composer_regex = /^stable$|^preview$|^snapshot$|^v?[1|2]$/;
    version = version.replace(/[><=^]*/, '');
    switch (true) {
+        case composer_regex.test(version):
        case semver_regex.test(version):
            return version;
        default:
@ -1864,19 +1870,42 @@ exports.getWpCliUrl = getWpCliUrl;
 * @param tools_list
 */
 async function addComposer(tools_list) {
-    const regex = /^composer($|:.*)/;
-    const composer = tools_list.filter(tool => regex.test(tool))[0];
-    switch (composer) {
+    const regex_any = /^composer($|:.*)/;
+    const regex_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$)/;
+    const matches = 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:
            break;
        default:
-            tools_list = tools_list.filter(tool => !regex.test(tool));
+            composer = matches[matches.length - 1].replace(/v([1-2])/, '$1');
            break;
    }
-    tools_list.unshift('composer');
+    tools_list.unshift(composer);
    return tools_list;
 }
 exports.addComposer = addComposer;
+/**
+ * Function to get script to update composer
+ *
+ * @param version
+ * @param os_version
+ */
+async function updateComposer(version, os_version) {
+    switch (version) {
+        case 'snapshot':
+        case 'preview':
+        case '1':
+        case '2':
+            return ('\ncomposer self-update --' +
+                version +
+                (await utils.suppressOutput(os_version)));
+        default:
+            return '';
+    }
+}
+exports.updateComposer = updateComposer;
 /**
 * Function to get Tools list after cleanup
 *
@ -1987,6 +2016,10 @@ async function addTools(tools_csv, php_version, os_version) {
                url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
                script += await addArchive(tool, version, url, os_version);
                break;
+            case 'phan':
+                url = github + 'phan/phan/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
            case 'phive':
                script += await addPhive(version, os_version);
                break;
@ -2003,11 +2036,10 @@ async function addTools(tools_csv, php_version, os_version) {
                script += await addArchive(tool, version, url, os_version);
                break;
            case 'composer':
-                // If RC is released as latest release, switch to getcomposer.
-                // Prefered source is GitHub as it is faster.
-                // url = github + 'composer/composer/releases/latest/download/composer.phar';
                url = 'https://getcomposer.org/composer-stable.phar';
-                script += await addArchive(tool, version, url, os_version);
+                script +=
+                    (await addArchive('composer', version, url, os_version)) +
+                        (await updateComposer(version, os_version));
                break;
            case 'codeception':
                url =
@ -2102,7 +2134,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -2114,21 +2146,24 @@ const config = __importStar(__webpack_require__(641));
 /**
 * Function to setup Xdebug
 *
+ * @param extension
 * @param version
 * @param os_version
 * @param pipe
 */
-async function addCoverageXdebug(version, os_version, pipe) {
-    switch (version) {
-        case '8.0':
-            return ('\n' +
-                (await utils.addLog('$cross', 'xdebug', 'Xdebug currently only supports PHP 7.4 or lower', os_version)));
-        case '7.4':
+async function addCoverageXdebug(extension, version, os_version, pipe) {
+    const xdebug = (await extensions.addExtension(extension, version, os_version, true)) +
+        pipe;
+    const ini = (await config.addINIValues('xdebug.mode=coverage', os_version, true)) +
+        pipe;
+    const log = await utils.addLog('$tick', extension, 'Xdebug enabled as coverage driver', os_version);
+    switch (true) {
+        case /^xdebug3$/.test(extension):
+        case /^8\.0$/.test(version):
+            return '\n' + xdebug + '\n' + ini + '\n' + log;
+        case /^xdebug$/.test(extension):
        default:
-            return ((await extensions.addExtension('xdebug', version, os_version, true)) +
-                pipe +
-                '\n' +
-                (await utils.addLog('$tick', 'xdebug', 'Xdebug enabled as coverage driver', os_version)));
+            return xdebug + '\n' + log;
    }
 }
 exports.addCoverageXdebug = addCoverageXdebug;
@ -2209,7 +2244,9 @@ async function addCoverage(coverage_driver, version, os_version) {
        case 'pcov':
            return script + (await addCoveragePCOV(version, os_version, pipe));
        case 'xdebug':
-            return script + (await addCoverageXdebug(version, os_version, pipe));
+        case 'xdebug3':
+            return (script +
+                (await addCoverageXdebug(coverage_driver, version, os_version, pipe)));
        case 'none':
            return script + (await disableCoverage(version, os_version, pipe));
        default:
@ -2241,7 +2278,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -2255,10 +2292,10 @@ const utils = __importStar(__webpack_require__(163));
 */
 async function addINIValuesUnix(ini_values_csv) {
    const ini_values = await utils.CSVArray(ini_values_csv);
-    let script = '\n';
+    let script = '';
    await utils.asyncForEach(ini_values, async function (line) {
        script +=
-            (await utils.addLog('$tick', line, 'Added to php.ini', 'linux')) + '\n';
+            '\n' + (await utils.addLog('$tick', line, 'Added to php.ini', 'linux'));
    });
    return 'echo "' + ini_values.join('\n') + '" >> $ini_file' + script;
 }
@ -2334,7 +2371,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
@ -2652,14 +2689,32 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
    __setModuleDefault(result, mod);
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addExtension = exports.addExtensionLinux = exports.addExtensionWindows = exports.addExtensionDarwin = void 0;
+exports.addExtension = exports.addExtensionLinux = exports.addExtensionWindows = exports.addExtensionDarwin = exports.getXdebugVersion = void 0;
 const path = __importStar(__webpack_require__(622));
 const utils = __importStar(__webpack_require__(163));
+/**
+ * Function to get Xdebug version compatible with php versions
+ *
+ * @param version
+ */
+async function getXdebugVersion(version) {
+    switch (version) {
+        case '5.3':
+            return '2.2.7';
+        case '5.4':
+            return '2.4.1';
+        case '5.5':
+            return '2.5.5';
+        default:
+            return '2.9.6';
+    }
+}
+exports.getXdebugVersion = getXdebugVersion;
 /**
 * Install and enable extensions for darwin
 *
@ -2670,7 +2725,7 @@ const utils = __importStar(__webpack_require__(163));
 async function addExtensionDarwin(extension_csv, version, pipe) {
    const extensions = await utils.extensionArray(extension_csv);
    let add_script = '\n';
-    let remove_script = '\n';
+    let remove_script = '';
    await utils.asyncForEach(extensions, async function (extension) {
        const version_extension = version + extension;
        const [ext_name, ext_version] = extension.split('-');
@ -2713,25 +2768,22 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                        ' ' +
                        ext_prefix;
                return;
-            // match 5.3xdebug
-            case /5\.3xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.2.7' + pipe;
+            // match 5.3xdebug...5.5xdebug
+            case /5\.[3-5]xdebug/.test(version_extension):
+                command =
+                    command_prefix + 'xdebug-' + (await getXdebugVersion(version));
                break;
-            // match 5.4xdebug
-            case /5\.4xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.4.1' + pipe;
+            // match 5.6xdebug, 7.0xdebug...7.4xdebug, 8.0xdebug
+            case /(5\.6|7\.[0-4]|8\.[0-9])xdebug/.test(version_extension):
+                command = 'add_brew_extension xdebug';
                break;
-            // match 5.5xdebug and 5.6xdebug
-            case /5\.[5-6]xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.5.5' + pipe;
-                break;
-            // match 7.0redis
-            case /7\.0xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.9.0' + pipe;
+            // match 7.1pcov...7.4pcov, 8.0pcov
+            case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
+                command = 'add_brew_extension pcov';
                break;
            // match 5.6redis
            case /5\.6redis/.test(version_extension):
-                command = command_prefix + 'redis-2.2.8' + pipe;
+                command = command_prefix + 'redis-2.2.8';
                break;
            // match imagick
            case /^imagick$/.test(extension):
@ -2746,7 +2798,7 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
            // match sqlite
            case /^sqlite$/.test(extension):
                extension = 'sqlite3';
-                command = command_prefix + extension + pipe;
+                command = command_prefix + extension;
                break;
            // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
@ -2759,7 +2811,7 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                        version;
                return;
            default:
-                command = command_prefix + extension + pipe;
+                command = command_prefix + extension;
                break;
        }
        add_script +=
@ -2777,7 +2829,7 @@ exports.addExtensionDarwin = addExtensionDarwin;
 async function addExtensionWindows(extension_csv, version) {
    const extensions = await utils.extensionArray(extension_csv);
    let add_script = '\n';
-    let remove_script = '\n';
+    let remove_script = '';
    await utils.asyncForEach(extensions, async function (extension) {
        const [ext_name, ext_version] = extension.split('-');
        const version_extension = version + extension;
@ -2859,7 +2911,7 @@ exports.addExtensionWindows = addExtensionWindows;
 async function addExtensionLinux(extension_csv, version, pipe) {
    const extensions = await utils.extensionArray(extension_csv);
    let add_script = '\n';
-    let remove_script = '\n';
+    let remove_script = '';
    await utils.asyncForEach(extensions, async function (extension) {
        const version_extension = version + extension;
        const [ext_name, ext_version] = extension.split('-');
@ -2921,10 +2973,20 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                        ' ' +
                        version;
                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
+            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.3' +
+                    '\nupdate_extension xdebug 2.9.6' +
                        pipe +
                        '\n' +
                        (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
--- a/examples/bedrock.yml
+++ b/examples/bedrock.yml
@ -17,16 +17,16 @@ jobs:
        with:
          php-version: ${{ matrix.php-versions }}
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
-        run: composer install -n --prefer-dist
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: PHP test
        run: composer test
--- a/examples/cakephp-mysql.yml
+++ b/examples/cakephp-mysql.yml
@ -37,19 +37,19 @@ jobs:
      - name: Start mysql service
        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
          composer run-script post-install-cmd --no-interaction
      # Add a step to run migrations if required
      - name: Test with phpunit
@ -70,18 +70,18 @@ jobs:
          php-version: '7.3'
          extensions: mbstring, intl
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: PHP CodeSniffer
        run: composer cs-check

@ -98,17 +98,17 @@ jobs:
          extensions: mbstring, intl
          tools: phpstan
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Static Analysis using PHPStan
        run: phpstan analyse --no-progress src/
--- a/examples/cakephp-postgres.yml
+++ b/examples/cakephp-postgres.yml
@ -35,19 +35,19 @@ jobs:
          extensions: mbstring, intl, redis, pdo_pgsql
          coverage: pcov
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
          composer run-script post-install-cmd --no-interaction
      # Add a step to run migrations if required
      - name: Test with phpunit
@ -68,18 +68,18 @@ jobs:
          php-version: '7.3'
          extensions: mbstring, intl
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: PHP CodeSniffer
        run: composer cs-check

@ -96,17 +96,17 @@ jobs:
          extensions: mbstring, intl
          tools: phpstan
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Static Analysis using PHPStan
        run: phpstan analyse --no-progress src/
--- a/examples/cakephp.yml
+++ b/examples/cakephp.yml
@ -19,19 +19,19 @@ jobs:
          extensions: mbstring, intl, pdo_sqlite, pdo_mysql
          coverage: pcov #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
          composer run-script post-install-cmd --no-interaction
      - name: Test with phpunit
        run: vendor/bin/phpunit --coverage-text
@ -48,18 +48,18 @@ jobs:
          php-version: '7.3'
          extensions: mbstring, intl
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: PHP CodeSniffer
        run: composer cs-check

@ -76,17 +76,17 @@ jobs:
          extensions: mbstring, intl
          tools: phpstan
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Static Analysis using PHPStan
        run: phpstan analyse --no-progress src/
--- a/examples/codeigniter.yml
+++ b/examples/codeigniter.yml
@ -18,17 +18,17 @@ jobs:
          extensions: mbstring, intl, curl, dom
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Test with phpunit
        run: vendor/bin/phpunit --coverage-text
--- a/examples/laravel-mysql.yml
+++ b/examples/laravel-mysql.yml
@ -44,18 +44,18 @@ jobs:
      - name: Start mysql service
        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Prepare the application
        run: |
          php -r "file_exists('.env') || copy('.env.example', '.env');"
--- a/examples/laravel-postgres.yml
+++ b/examples/laravel-postgres.yml
@ -44,18 +44,18 @@ jobs:
          extensions: mbstring, dom, fileinfo, pgsql
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Prepare the application
        run: |
          php -r "file_exists('.env') || copy('.env.example', '.env');"
--- a/examples/laravel.yml
+++ b/examples/laravel.yml
@ -20,18 +20,18 @@ jobs:
          extensions: mbstring, dom, fileinfo
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Prepare the application
        run: |
          php -r "file_exists('.env') || copy('.env.example', '.env');"
--- a/examples/lumen-mysql.yml
+++ b/examples/lumen-mysql.yml
@ -44,19 +44,19 @@ jobs:
      - name: Start mysql service
        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
          composer require predis/predis illuminate/redis
      - name: Prepare the application
        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
--- a/examples/lumen-postgres.yml
+++ b/examples/lumen-postgres.yml
@ -44,19 +44,19 @@ jobs:
          extensions: mbstring, dom, fileinfo, pgsql
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
          composer require predis/predis illuminate/redis
      - name: Prepare the application
        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
--- a/examples/lumen.yml
+++ b/examples/lumen.yml
@ -20,18 +20,18 @@ jobs:
          extensions: mbstring, dom, fileinfo, mysql
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Prepare the application
        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
      - name: Test with phpunit
--- a/examples/phalcon-mysql.yml
+++ b/examples/phalcon-mysql.yml
@ -44,18 +44,18 @@ jobs:
      - name: Start mysql service
        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Prepare the application
        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
      - name: Run Migration
--- a/examples/phalcon-postgres.yml
+++ b/examples/phalcon-postgres.yml
@ -43,18 +43,18 @@ jobs:
          extensions: mbstring, dom, zip, phalcon4, pgsql #use phalcon3 for the phalcon 3.x
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Prepare the application
        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
      - name: Run Migration
--- a/examples/sage.yml
+++ b/examples/sage.yml
@ -27,18 +27,18 @@ jobs:
      - name: Get yarn cache
        id: yarn-cache
        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
        with:
          path: ${{ steps.yarn-cache.outputs.dir }}
          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
          restore-keys: ${{ runner.os }}-yarn-
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@ -46,7 +46,7 @@ jobs:
      - name: Install yarn dependencies
        run: yarn -V
      - name: Install Composer dependencies
-        run: composer install -o --prefer-dist --no-interaction
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Yarn test and build
        run: |
          yarn run test
--- a/examples/slim-framework.yml
+++ b/examples/slim-framework.yml
@ -18,17 +18,17 @@ jobs:
          extensions: mbstring, simplexml, dom
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Test with phpunit
        run: vendor/bin/phpunit --coverage-text
--- a/examples/symfony-mysql.yml
+++ b/examples/symfony-mysql.yml
@ -31,19 +31,19 @@ jobs:
      - name: Start mysql service
        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Run Migration
        run: |
          composer require symfony/orm-pack
--- a/examples/symfony-postgres.yml
+++ b/examples/symfony-postgres.yml
@ -29,19 +29,19 @@ jobs:
          extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, pgsql
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Run Migration
        run: |
          composer require symfony/orm-pack
--- a/examples/symfony.yml
+++ b/examples/symfony.yml
@ -20,12 +20,12 @@ jobs:
          extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@ -33,6 +33,6 @@ jobs:
      - name: Install Composer dependencies
        run: |
          composer require symfony/orm-pack
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Run Tests
        run: php bin/phpunit --coverage-text
--- a/examples/yii2-mysql.yml
+++ b/examples/yii2-mysql.yml
@ -41,18 +41,18 @@ jobs:
      - name: Start mysql service
        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Prepare the application
        run: |
          php -r "file_exists('.env') || copy('.env.dist', '.env');"
--- a/examples/yii2-postgres.yml
+++ b/examples/yii2-postgres.yml
@ -39,18 +39,18 @@ jobs:
          extensions: mbstring, intl, gd, imagick, zip, dom, pgsql
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
      - name: Prepare the application
        run: |
          php -r "file_exists('.env') || copy('.env.dist', '.env');"
--- a/examples/zend-framework.yml
+++ b/examples/zend-framework.yml
@ -18,19 +18,19 @@ jobs:
          extensions: mbstring, bcmath, curl, intl
          coverage: xdebug #optional
      - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
      - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
          # Use composer.json for key, if composer.lock is not committed.
          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
          restore-keys: ${{ runner.os }}-composer-
      - name: Install dependencies
        run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
          composer require --dev phpunit/phpunit squizlabs/php_codesniffer zendframework/zend-test
      - name: Test with phpunit
        run: vendor/bin/phpunit --coverage-text
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "setup-php",
-  "version": "2.2.1",
+  "version": "2.3.1",
  "private": false,
  "description": "Setup PHP for use with GitHub Actions",
  "main": "dist/index.js",
@ -30,22 +30,22 @@
    "fs": "0.0.1-security"
  },
  "devDependencies": {
-    "@types/jest": "^25.2.2",
-    "@types/node": "^14.0.1",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.34.0",
-    "@zeit/ncc": "^0.22.2",
-    "eslint": "^7.0.0",
+    "@types/jest": "^26.0.0",
+    "@types/node": "^14.0.13",
+    "@typescript-eslint/eslint-plugin": "^3.3.0",
+    "@typescript-eslint/parser": "^3.3.0",
+    "@zeit/ncc": "^0.22.3",
+    "eslint": "^7.2.0",
    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jest": "^23.13.1",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-jest": "^23.13.2",
+    "eslint-plugin-prettier": "^3.1.4",
    "husky": "^4.2.5",
    "jest": "^26.0.1",
    "jest-circus": "^26.0.1",
    "prettier": "^2.0.5",
-    "ts-jest": "^26.0.0",
-    "typescript": "^3.9.2"
+    "ts-jest": "^26.1.0",
+    "typescript": "^3.9.5"
  },
  "husky": {
    "skipCI": true,
--- a/src/bin/php_nts_pcov.dll
+++ b/src/bin/php_nts_pcov.dll
--- a/src/bin/php_ts_pcov.dll
+++ b/src/bin/php_ts_pcov.dll
--- a/src/config.ts
+++ b/src/config.ts
@ -9,10 +9,10 @@ export async function addINIValuesUnix(
  ini_values_csv: string
 ): Promise<string> {
  const ini_values: Array<string> = await utils.CSVArray(ini_values_csv);
-  let script = '\n';
+  let script = '';
  await utils.asyncForEach(ini_values, async function (line: string) {
    script +=
-      (await utils.addLog('$tick', line, 'Added to php.ini', 'linux')) + '\n';
+      '\n' + (await utils.addLog('$tick', line, 'Added to php.ini', 'linux'));
  });
  return 'echo "' + ini_values.join('\n') + '" >> $ini_file' + script;
 }
--- a/src/coverage.ts
+++ b/src/coverage.ts
@ -5,39 +5,36 @@ import * as config from './config';
 /**
 * Function to setup Xdebug
 *
+ * @param extension
 * @param version
 * @param os_version
 * @param pipe
 */
 export async function addCoverageXdebug(
+  extension: string,
  version: string,
  os_version: string,
  pipe: string
 ): Promise<string> {
-  switch (version) {
-    case '8.0':
-      return (
-        '\n' +
-        (await utils.addLog(
-          '$cross',
-          'xdebug',
-          'Xdebug currently only supports PHP 7.4 or lower',
-          os_version
-        ))
-      );
-    case '7.4':
+  const xdebug =
+    (await extensions.addExtension(extension, version, os_version, true)) +
+    pipe;
+  const ini =
+    (await config.addINIValues('xdebug.mode=coverage', os_version, true)) +
+    pipe;
+  const log = await utils.addLog(
+    '$tick',
+    extension,
+    'Xdebug enabled as coverage driver',
+    os_version
+  );
+  switch (true) {
+    case /^xdebug3$/.test(extension):
+    case /^8\.0$/.test(version):
+      return '\n' + xdebug + '\n' + ini + '\n' + log;
+    case /^xdebug$/.test(extension):
    default:
-      return (
-        (await extensions.addExtension('xdebug', version, os_version, true)) +
-        pipe +
-        '\n' +
-        (await utils.addLog(
-          '$tick',
-          'xdebug',
-          'Xdebug enabled as coverage driver',
-          os_version
-        ))
-      );
+      return xdebug + '\n' + log;
  }
 }

@ -151,7 +148,11 @@ export async function addCoverage(
    case 'pcov':
      return script + (await addCoveragePCOV(version, os_version, pipe));
    case 'xdebug':
-      return script + (await addCoverageXdebug(version, os_version, pipe));
+    case 'xdebug3':
+      return (
+        script +
+        (await addCoverageXdebug(coverage_driver, version, os_version, pipe))
+      );
    case 'none':
      return script + (await disableCoverage(version, os_version, pipe));
    default:
--- a/src/extensions.ts
+++ b/src/extensions.ts
@ -1,6 +1,24 @@
 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':
+      return '2.5.5';
+    default:
+      return '2.9.6';
+  }
+}
+
 /**
 * Install and enable extensions for darwin
 *
@ -15,7 +33,7 @@ export async function addExtensionDarwin(
 ): Promise<string> {
  const extensions: Array<string> = await utils.extensionArray(extension_csv);
  let add_script = '\n';
-  let remove_script = '\n';
+  let remove_script = '';
  await utils.asyncForEach(extensions, async function (extension: string) {
    const version_extension: string = version + extension;
    const [ext_name, ext_version]: string[] = extension.split('-');
@ -60,25 +78,22 @@ export async function addExtensionDarwin(
          ' ' +
          ext_prefix;
        return;
-      // match 5.3xdebug
-      case /5\.3xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.2.7' + pipe;
+      // match 5.3xdebug...5.5xdebug
+      case /5\.[3-5]xdebug/.test(version_extension):
+        command =
+          command_prefix + 'xdebug-' + (await getXdebugVersion(version));
        break;
-      // match 5.4xdebug
-      case /5\.4xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.4.1' + pipe;
+      // match 5.6xdebug, 7.0xdebug...7.4xdebug, 8.0xdebug
+      case /(5\.6|7\.[0-4]|8\.[0-9])xdebug/.test(version_extension):
+        command = 'add_brew_extension xdebug';
        break;
-      // match 5.5xdebug and 5.6xdebug
-      case /5\.[5-6]xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.5.5' + pipe;
-        break;
-      // match 7.0redis
-      case /7\.0xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.9.0' + pipe;
+      // match 7.1pcov...7.4pcov, 8.0pcov
+      case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
+        command = 'add_brew_extension pcov';
        break;
      // match 5.6redis
      case /5\.6redis/.test(version_extension):
-        command = command_prefix + 'redis-2.2.8' + pipe;
+        command = command_prefix + 'redis-2.2.8';
        break;
      // match imagick
      case /^imagick$/.test(extension):
@ -93,7 +108,7 @@ export async function addExtensionDarwin(
      // match sqlite
      case /^sqlite$/.test(extension):
        extension = 'sqlite3';
-        command = command_prefix + extension + pipe;
+        command = command_prefix + extension;
        break;
      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
@ -106,7 +121,7 @@ export async function addExtensionDarwin(
          version;
        return;
      default:
-        command = command_prefix + extension + pipe;
+        command = command_prefix + extension;
        break;
    }
    add_script +=
@ -127,7 +142,7 @@ export async function addExtensionWindows(
 ): Promise<string> {
  const extensions: Array<string> = await utils.extensionArray(extension_csv);
  let add_script = '\n';
-  let remove_script = '\n';
+  let remove_script = '';
  await utils.asyncForEach(extensions, async function (extension: string) {
    const [ext_name, ext_version]: string[] = extension.split('-');
    const version_extension: string = version + extension;
@ -219,7 +234,7 @@ export async function addExtensionLinux(
 ): Promise<string> {
  const extensions: Array<string> = await utils.extensionArray(extension_csv);
  let add_script = '\n';
-  let remove_script = '\n';
+  let remove_script = '';
  await utils.asyncForEach(extensions, async function (extension: string) {
    const version_extension: string = version + extension;
    const [ext_name, ext_version]: string[] = extension.split('-');
@ -283,10 +298,20 @@ export async function addExtensionLinux(
          ' ' +
          version;
        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
+      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.3' +
+          '\nupdate_extension xdebug 2.9.6' +
          pipe +
          '\n' +
          (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@ -1,10 +1,10 @@
-# Function to log start of a operation
+# Function to log start of a operation.
 step_log() {
  message=$1
  printf "\n\033[90;1m==> \033[0m\033[37;1m%s\033[0m\n" "$message"
 }

-# Function to log result of a operation
+# Function to log result of a operation.
 add_log() {
  mark=$1
  subject=$2
@ -16,7 +16,24 @@ add_log() {
  fi
 }

-# Function to remove extensions
+# Function to read env inputs.
+read_env() {
+  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
+  [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
+  [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
+  [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
+}
+
+# Function to setup environment for self-hosted runners.
+self_hosted_setup() {
+  if [[ $(command -v brew) == "" ]]; then
+      step_log "Setup Brew"
+      curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh | bash -s >/dev/null 2>&1
+      add_log "$tick" "Brew" "Installed Homebrew"
+  fi
+}
+
+# Function to remove extensions.
 remove_extension() {
  extension=$1
  if check_extension "$extension"; then
@ -30,7 +47,7 @@ remove_extension() {
  fi
 }

-# Function to test if extension is loaded
+# Function to test if extension is loaded.
 check_extension() {
  extension=$1
  if [ "$extension" != "mysql" ]; then
@ -40,7 +57,7 @@ check_extension() {
  fi
 }

-# Fuction to get the PECL version
+# Fuction to get the PECL version.
 get_pecl_version() {
  extension=$1
  stability=$2
@ -53,7 +70,7 @@ get_pecl_version() {
  echo "$pecl_version"
 }

-# Function to install a PECL version
+# Function to install a specific version of PECL extension.
 add_pecl_extension() {
  extension=$1
  pecl_version=$2
@ -74,6 +91,16 @@ add_pecl_extension() {
  fi
 }

+# Function to install a php extension from shivammathur/extensions tap.
+add_brew_extension() {
+  extension=$1
+  if ! brew tap | grep shivammathur/extensions; then
+    brew tap --shallow shivammathur/extensions
+  fi
+  brew install "$extension@$version"
+  sudo cp "$(brew --prefix)/opt/$extension@$version/$extension.so" "$ext_dir"
+}
+
 # Function to setup extensions
 add_extension() {
  extension=$1
@ -91,7 +118,7 @@ add_extension() {
  fi
 }

-# Function to pre-release extensions using PECL
+# Function to setup pre-release extensions using PECL.
 add_unstable_extension() {
  extension=$1
  stability=$2
@ -100,7 +127,7 @@ add_unstable_extension() {
  add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }

-# Function to setup a remote tool
+# Function to setup a remote tool.
 add_tool() {
  url=$1
  tool=$2
@ -118,6 +145,13 @@ add_tool() {
      if [ -n "$COMPOSER_TOKEN" ]; then
        composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
      fi
+      # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
+      if [[ "$version" =~ $old_versions ]]; then
+        composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
+      fi
+    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
    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
@ -135,7 +169,7 @@ add_tool() {
  fi
 }

-# Function to add a tool using composer
+# Function to add a tool using composer.
 add_composertool() {
  tool=$1
  release=$2
@ -148,11 +182,15 @@ add_composertool() {

 add_blackfire() {
  sudo mkdir -p usr/local/var/run
-  brew tap blackfireio/homebrew-blackfire >/dev/null 2>&1
+  brew tap --shallow blackfireio/homebrew-blackfire >/dev/null 2>&1
  brew install blackfire-agent >/dev/null 2>&1
-  sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
-  brew services start blackfire-agent >/dev/null 2>&1
-  sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
+    sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
+    brew services start blackfire-agent >/dev/null 2>&1
+  fi
+  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
+    sudo blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  fi
  add_log "$tick" "blackfire" "Added"
  add_log "$tick" "blackfire-agent" "Added"
 }
@ -160,18 +198,17 @@ add_blackfire() {
 # Function to configure PECL
 configure_pecl() {
  for tool in pear pecl; do
-    sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1
-    sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
-    sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
+    sudo "$tool" config-set php_ini "$ini_file"
+    sudo "$tool" channel-update "$tool".php.net
  done
 }

-# Function to log PECL, it is installed along with PHP
+# Function to handle request to add PECL.
 add_pecl() {
  add_log "$tick" "PECL" "Added"
 }

-# Function to fetch updated formulas
+# Function to fetch updated formulae.
 update_formulae() {
  brew_dir=$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula
  for formula in httpd pkg-config apr apr-util argon2 aspell autoconf bison curl-openssl freetds freetype gettext glib gmp icu4c jpeg krb5 libffi libpng libpq libsodium libzip oniguruma openldap openssl@1.1 re2c sqlite tidyp unixodbc webp; do
@ -181,15 +218,15 @@ update_formulae() {
  wait "${to_wait[@]}"
 }

-# Function to setup PHP >=5.6
+# Function to setup PHP 5.6 and newer.
 setup_php() {
  action=$1
  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-  brew tap shivammathur/homebrew-php
+  brew tap --shallow shivammathur/homebrew-php
  if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
    brew unlink php@"$version"
  else
-    if [ "$version" = "8.0" ]; then update_formulae; fi
+    if [ "$version" = "$master_version" ]; then update_formulae; fi
    brew "$action" shivammathur/php/php@"$version"
  fi
  brew link --force --overwrite php@"$version"
@ -200,23 +237,18 @@ tick="✓"
 cross="✗"
 version=$1
 nodot_version=${1/./}
+master_version="8.0"
 old_versions="5.[3-5]"
 tool_path_dir="/usr/local/bin"
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
-[[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
-[ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
-[[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
-[ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"

+read_env
 if [ "$runner" = "self-hosted" ]; then
  if [[ "$version" =~ $old_versions ]]; then
    add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
    exit 1
-  fi
-  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"
+  else
+    self_hosted_setup >/dev/null 2>&1
  fi
 fi

@ -241,5 +273,5 @@ ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 sudo mkdir -p "$ext_dir"
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
-if [[ ! "$version" =~ $old_versions ]]; then configure_pecl; fi
+if [[ ! "$version" =~ $old_versions ]]; then configure_pecl >/dev/null 2>&1; fi
 add_log "$tick" "PHP" "$status PHP $semver"
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@ -1,10 +1,10 @@
-# Function to log start of a operation
+# Function to log start of a operation.
 step_log() {
  message=$1
  printf "\n\033[90;1m==> \033[0m\033[37;1m%s\033[0m\n" "$message"
 }

-# Function to log result of a operation
+# Function to log result of a operation.
 add_log() {
  mark=$1
  subject=$2
@ -16,50 +16,50 @@ add_log() {
  fi
 }

-# Function to update php ppa
-update_ppa() {
-  if [ "$ppa_updated" = "false" ]; then
+# Function to read env inputs.
+read_env() {
+  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
+  [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
+  [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
+  [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
+}
+
+# Function to update the package lists.
+update_lists() {
+  if [ "$lists_updated" = "false" ]; then
    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
-    ppa_updated="true"
+    lists_updated="true"
  fi
 }

-# Function to setup environment for self-hosted runners
-pre_setup() {
-  sudo mkdir -p /var/run /run/php
-  if [ "$runner" = "self-hosted" ]; then
-    if [[ "$version" =~ $old_versions ]] || [ "$version" = "5.3" ]; then
-      add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
-      exit 1
-    fi
-    if ! command -v apt-fast >/dev/null; then
-      sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
-    fi
-    update_ppa && $apt_install curl make lsb-release software-properties-common unzip
-    if ! apt-cache policy | grep -q ondrej/php; then
-      LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y && update_ppa
-    fi
-    if [ "$version" = "8.0" ]; then
-      IFS=' ' read -r -a libs <<< "$(echo "aspell curl4-gnutls enchant freetype6 icu jpeg png tidy webp xpm zip" | sed "s/[^ ]*/lib&-dev/g")"
-      $apt_install "${libs[@]}"
+# Function to setup environment for self-hosted runners.
+self_hosted_setup() {
+  echo "Set disable_coredump false" | sudo tee -a /etc/sudo.conf
+  if ! command -v apt-fast >/dev/null; then
+    sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
+  fi
+  update_lists && $apt_install curl make lsb-release software-properties-common unzip
+  if ! apt-cache policy | grep -q ondrej/php; then
+    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
+    if [ "$(lsb_release -r -s)" = "16.04" ]; then
+      sudo "$debconf_fix" apt-get update
    fi
  fi
 }

-# Function to configure PECL
+# Function to configure PECL.
 configure_pecl() {
  if [ "$pecl_config" = "false" ] && [ -e /usr/bin/pecl ]; then

    for tool in pear pecl; do
-      sudo "$tool" config-set php_ini "$scan_dir"/99-pecl.ini >/dev/null 2>&1
-      sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
-      sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
+      sudo "$tool" config-set php_ini "$scan_dir"/99-pecl.ini
+      sudo "$tool" channel-update "$tool".php.net
    done
    pecl_config="true"
  fi
 }

-# Fuction to get the PECL version
+# Fuction to get the PECL version of an extension.
 get_pecl_version() {
  extension=$1
  stability=$2
@ -72,7 +72,7 @@ get_pecl_version() {
  echo "$pecl_version"
 }

-# Function to test if extension is loaded
+# Function to check if an extension is loaded.
 check_extension() {
  extension=$1
  if [ "$extension" != "mysql" ]; then
@ -82,7 +82,7 @@ check_extension() {
  fi
 }

-# Function to delete extensions
+# Function to delete extensions.
 delete_extension() {
  extension=$1
  sudo sed -i "/$extension/d" "$ini_file"
@ -91,7 +91,7 @@ delete_extension() {
  sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
 }

-# Function to disable and delete extensions
+# Function to disable and delete extensions.
 remove_extension() {
  extension=$1
  if check_extension "$extension"; then
@ -106,21 +106,22 @@ remove_extension() {
  fi
 }

-# Function to enable existing extension
+# Function to enable existing extensions.
 enable_extension() {
  if ! check_extension "$1" && [ -e "$ext_dir/$1.so" ]; then
    echo "$2=$1.so" >>"$pecl_file"
  fi
 }

-# Funcion to add PDO extension
+# Funcion to add PDO extension.
 add_pdo_extension() {
  pdo_ext="pdo_$1"
  if check_extension "$pdo_ext"; then
    add_log "$tick" "$pdo_ext" "Enabled"
  else
    read -r ext ext_name <<< "$1 $1"
-    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1 && echo "extension=pdo.so" >> "$ini_file"
+    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1
+    if ! check_extension "pdo"; then echo "extension=pdo.so" >> "$ini_file"; fi
    if [ "$ext" = "mysql" ]; then
      enable_extension "mysqlnd" "extension"
      ext_name="mysqli"
@ -134,20 +135,20 @@ add_pdo_extension() {
  fi
 }

-# Function to setup extensions
+# Function to add extensions.
 add_extension() {
  extension=$1
  install_command=$2
  prefix=$3
-  if [[ "$version" =~ $old_versions ]]; then
-    install_command="update_ppa && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
-  fi
  enable_extension "$extension" "$prefix"
  if check_extension "$extension"; then
    add_log "$tick" "$extension" "Enabled"
  else
+    if [[ "$version" =~ 5.[4-5] ]]; then
+      install_command="update_lists && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
+    fi
    eval "$install_command" >/dev/null 2>&1 ||
-    (update_ppa && 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"
@ -155,7 +156,7 @@ add_extension() {
  sudo chmod 777 "$ini_file"
 }

-# Function to install a PECL version
+# Function to install a PECL version.
 add_pecl_extension() {
  extension=$1
  pecl_version=$2
@ -176,7 +177,7 @@ add_pecl_extension() {
  fi
 }

-# Function to pre-release extensions using PECL
+# Function to pre-release extensions using PECL.
 add_unstable_extension() {
  extension=$1
  stability=$2
@ -185,7 +186,7 @@ add_unstable_extension() {
  add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }

-# Function to update extension
+# Function to update extension.
 update_extension() {
  extension=$1
  latest_version=$2
@ -194,13 +195,34 @@ update_extension() {
  if [ "$final_version" != "$current_version"  ]; then
    version_exists=$(apt-cache policy -- *"$extension" | grep "$final_version")
    if [ -z "$version_exists" ]; then
-      update_ppa
+      update_lists
    fi
    $apt_install php"$version"-"$extension"
  fi
 }

-# Function to setup a remote tool
+# Function to install extension from source
+add_extension_from_source() {
+  extension=$1
+  repo=$2
+  release=$3
+  args=$4
+  prefix=$5
+  (
+    add_devtools
+    delete_extension "$extension"
+    curl -o /tmp/"$extension".tar.gz -sSL 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"
+}
+
+# Function to setup a remote tool.
 add_tool() {
  url=$1
  tool=$2
@ -217,8 +239,15 @@ add_tool() {
      if [ -n "$COMPOSER_TOKEN" ]; then
        composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
      fi
+      # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
+      if [[ "$version" =~ $old_versions ]]; then
+        composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
+      fi
    elif [ "$tool" = "cs2pr" ]; then
      sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
+    elif [ "$tool" = "phan" ]; then
+      add_extension fileinfo "$apt_install php$version-fileinfo" extension >/dev/null 2>&1
+      add_extension ast "$apt_install php-ast" extension >/dev/null 2>&1
    elif [ "$tool" = "phive" ]; then
      add_extension curl "$apt_install php$version-curl" extension >/dev/null 2>&1
      add_extension mbstring "$apt_install php$version-mbstring" extension >/dev/null 2>&1
@ -232,7 +261,7 @@ add_tool() {
  fi
 }

-# Function to setup a tool using composer
+# Function to setup a tool using composer.
 add_composertool() {
  tool=$1
  release=$2
@ -243,96 +272,85 @@ add_composertool() {
  ) || add_log "$cross" "$tool" "Could not setup $tool"
 }

-# Function to setup phpize and php-config
+# Function to setup phpize and php-config.
 add_devtools() {
  if ! [ -e "/usr/bin/phpize$version" ] || ! [ -e "/usr/bin/php-config$version" ]; then
-    update_ppa && $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
+    update_lists && $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
  fi
  sudo update-alternatives --set php-config /usr/bin/php-config"$version" >/dev/null 2>&1
  sudo update-alternatives --set phpize /usr/bin/phpize"$version" >/dev/null 2>&1
-  configure_pecl
+  configure_pecl >/dev/null 2>&1
 }

+# Function to add blackfire and blackfire-agent.
 add_blackfire() {
  sudo mkdir -p /var/run/blackfire
-  sudo curl -o /tmp/blackfire-gpg.key -sSL https://packages.blackfire.io/gpg.key >/dev/null 2>&1
-  sudo apt-key add /tmp/blackfire-gpg.key >/dev/null 2>&1
+  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
-  find /etc/apt/sources.list.d -type f -name blackfire.list -exec sudo "$debconf_fix" apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
+  sudo "$debconf_fix" apt-get update >/dev/null 2>&1
  $apt_install blackfire-agent >/dev/null 2>&1
-  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
-  sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
+    sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
+    sudo /etc/init.d/blackfire-agent restart >/dev/null 2>&1
+  fi
+  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
+    sudo blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  fi
  add_log "$tick" "blackfire" "Added"
  add_log "$tick" "blackfire-agent" "Added"
 }

-# Function to setup the nightly build from master branch
+# Function to setup the nightly build from master branch.
 setup_master() {
-  update_ppa && $apt_install libzip-dev libwebp-dev
-  tar_file=php_"$version"%2Bubuntu"$(lsb_release -r -s)".tar.xz
-  install_dir=~/php/"$version"
-  bintray_url=https://dl.bintray.com/shivammathur/php/"$tar_file"
-  sudo mkdir -m 777 -p ~/php
-  if [ ! "$(whoami)" = "runner" ]; then
-    sudo rm -rf /home/runner && sudo ln -sf ~/ /home/runner;
-  fi
-  curl -o /tmp/"$tar_file" -sSL "$bintray_url"
-  sudo tar xf /tmp/"$tar_file" -C ~/php
-  for tool_path in "$install_dir"/bin/*; do
-    tool=$(basename "$tool_path")
-    sudo cp "$tool_path" /usr/bin/"$tool$version"
-    sudo update-alternatives --install /usr/bin/"$tool" "$tool" /usr/bin/"$tool$version" 50
-  done
-  sudo ln -sf "$install_dir"/etc/php.ini /etc/php.ini
+  curl -sSL "$github"/php-builder/releases/latest/download/install.sh | bash -s "$runner"
 }

-# Function to setup PHP 5.3, PHP 5.4 and PHP 5.5
+# Function to setup PHP 5.3, PHP 5.4 and PHP 5.5.
 setup_old_versions() {
-  dir=php-"$version"
-  tar_file="$dir".tar.xz
-  bintray_url=https://dl.bintray.com/shivammathur/php/"$tar_file"
-  curl -o /tmp/"$tar_file" -sSL "$bintray_url"
-  sudo tar xf /tmp/"$tar_file" -C /tmp
-  sudo chmod a+x /tmp/"$dir"/*.sh
-  (cd /tmp/"$dir" && ./install.sh && ./post-install.sh)
+  curl -sSL "$github"/php5-ubuntu/releases/latest/download/install.sh | bash -s "$version"
  configure_pecl
  release_version=$(php -v | head -n 1 | cut -d' ' -f 2)
 }

-# Function to setup PECL
+# Function to add PECL.
 add_pecl() {
-  add_devtools
+  add_devtools >/dev/null 2>&1
  if [ ! -e /usr/bin/pecl ]; then
    $apt_install php-pear >/dev/null 2>&1
  fi
-  configure_pecl
+  configure_pecl >/dev/null 2>&1
  add_log "$tick" "PECL" "Added"
 }

-# Function to switch versions of PHP binaries
+# Function to switch versions of PHP binaries.
 switch_version() {
  for tool in pear pecl php phar phar.phar php-cgi php-config phpize phpdbg; do
    if [ -e "/usr/bin/$tool$version" ]; then
-      sudo update-alternatives --set $tool /usr/bin/"$tool$version" >/dev/null 2>&1
+      sudo update-alternatives --set $tool /usr/bin/"$tool$version"
    fi
  done
 }

-# Function to get PHP version in semver format
+# Function to get PHP version in semver format.
 php_semver() {
-  if [ ! "$version" = "8.0" ]; then
+  if [ ! "$version" = "$master_version" ]; then
    php"$version" -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-'
  else
    php -v | head -n 1 | cut -f 2 -d ' '
  fi
 }

-# Function to update PHP
+# Function to install packaged PHP
+add_packaged_php() {
+  update_lists
+  IFS=' ' read -r -a packages <<< "$(echo "curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
+  $apt_install php"$version" "${packages[@]}"
+}
+
+# Function to update PHP.
 update_php() {
-  update_ppa
  initial_version=$(php_semver)
-  $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml >/dev/null 2>&1
+  add_packaged_php
  updated_version=$(php_semver)
  if [ "$updated_version" != "$initial_version" ]; then
    status="Updated to"
@ -341,56 +359,65 @@ update_php() {
  fi
 }

+# Function to install PHP.
+add_php() {
+  if [ "$version" = "$master_version" ]; then
+    setup_master
+  elif [[ "$version" =~ $old_versions ]]; then
+    setup_old_versions
+  else
+    add_packaged_php
+  fi
+  status="Installed"
+}
+
 # Variables
 tick="✓"
 cross="✗"
-ppa_updated="false"
+lists_updated="false"
 pecl_config="false"
 version=$1
-old_versions="5.[4-5]"
+master_version="8.0"
+old_versions="5.[3-5]"
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
+github="https://github.com/shivammathur"
 apt_install="sudo $debconf_fix apt-fast install -y"
 tool_path_dir="/usr/local/bin"
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
-[[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
-[ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
-[[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
-[ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
+
+read_env
+if [ "$runner" = "self-hosted" ]; then
+  if [[ "$version" =~ $old_versions ]]; then
+    add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
+    exit 1
+  else
+    self_hosted_setup >/dev/null 2>&1
+  fi
+fi

 # Setup PHP
 step_log "Setup PHP"
-pre_setup >/dev/null 2>&1
+sudo mkdir -p /var/run /run/php
 if [ "$existing_version" != "$version" ]; then
  if [ ! -e "/usr/bin/php$version" ]; then
-    if [ "$version" = "8.0" ]; then
-      setup_master >/dev/null 2>&1
-    elif [[ "$version" =~ $old_versions ]] || [ "$version" = "5.3" ]; then
-      setup_old_versions >/dev/null 2>&1
-    else
-      update_ppa
-      $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml php"$version"-intl >/dev/null 2>&1
-    fi
-    status="Installed"
+    add_php >/dev/null 2>&1
  else
    if [ "$update" = "true" ]; then
-      update_php
+      update_php >/dev/null 2>&1
    else
      status="Switched to"
    fi
  fi
-
-  # PHP 5.3 is switched by install script, for rest switch_version
-  if [ "$version" != "5.3" ]; then
-    switch_version
+  if ! [[ "$version" =~ $old_versions ]]; then
+    switch_version >/dev/null 2>&1
  fi
-
 else
  if [ "$update" = "true" ]; then
-    update_php
+    update_php >/dev/null 2>&1
  else
    status="Found"
-    if [ "$version" = "8.0" ]; then
-      switch_version
+    if [ "$version" = "$master_version" ]; then
+      switch_version >/dev/null 2>&1
    fi
  fi
 fi
@ -400,6 +427,6 @@ ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 pecl_file="$scan_dir"/99-pecl.ini
-sudo touch "$pecl_file" >/dev/null 2>&1
+echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
 sudo chmod 777 "$ini_file" "$pecl_file" "$tool_path_dir"
 add_log "$tick" "PHP" "$status PHP $semver"
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@ -11,23 +11,49 @@ param (
  $dir
 )

+# Function to log start of a operation.
 Function Step-Log($message) {
  printf "\n\033[90;1m==> \033[0m\033[37;1m%s \033[0m\n" $message
 }

+# Function to log result of a operation.
 Function Add-Log($mark, $subject, $message) {
  $code = if ($mark -eq $cross) { "31" } else { "32" }
  printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $code $mark $subject $message
 }

-Function Get-PathFromRegistry {
-  $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" +
-          [System.Environment]::GetEnvironmentVariable("Path","User")
-  if($null -eq (Get-Content $current_profile | findstr 'Get-PathFromRegistry')) {
-    Add-Content -Path $current_profile -Value 'Function Get-PathFromRegistry { $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") }; Get-PathFromRegistry'
+# Function to add a line to a powershell profile safely.
+Function Add-ToProfile {
+  param(
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $input_profile,
+    [Parameter(Position = 1, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $search,
+    [Parameter(Position = 2, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $value
+  )
+  if($null -eq (Get-Content $input_profile | findstr $search)) {
+    Add-Content -Path $input_profile -Value $value
  }
 }

+# Function to fetch PATH from the registry.
+Function Get-PathFromRegistry {
+  $env:Path = [System.Environment]::GetEnvironmentVariable("Path","User") + ";" +
+          [System.Environment]::GetEnvironmentVariable("Path","Machine")
+  Add-ToProfile $current_profile 'Get-PathFromRegistry' 'Function Get-PathFromRegistry { $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "User") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "Machine") }; Get-PathFromRegistry'
+}
+
+# Function to add a location to PATH.
 Function Add-Path {
  param(
    [string]$PathItem
@ -38,30 +64,30 @@ Function Add-Path {
  Get-PathFromRegistry
 }

+# Function to get a clean Powershell profile.
 Function Get-CleanPSProfile {
  if(-not(Test-Path -LiteralPath $profile)) {
    New-Item -Path $profile -ItemType "file" -Force
  }
  Set-Content $current_profile -Value ''
-  if ($null -eq (Get-Content $profile | FindStr $current_profile.replace('\', '\\'))) {
-    Add-Content $profile -Value ". $current_profile"
-  }
+  Add-ToProfile $profile $current_profile.replace('\', '\\') ". $current_profile"
 }

+# Function to install PhpManager.
 Function Install-PhpManager() {
  $repo = "mlocati/powershell-phpmanager"
-  $zip_file = "$php_dir\PhpManager.zip"
-  $tags = Invoke-WebRequest https://api.github.com/repos/$repo/tags | ConvertFrom-Json
-  $tag = $tags[0].Name
-  $module_path = "$php_dir\PhpManager\powershell-phpmanager-$tag\PhpManager"
-  Invoke-WebRequest -UseBasicParsing -Uri https://github.com/$repo/archive/$tag.zip -OutFile $zip_file
-  Expand-Archive -Path $zip_file -DestinationPath $php_dir\PhpManager
-  Import-Module $module_path
-  if($null -eq (Get-Content $current_profile | findstr 'powershell-phpmanager')) {
-    Add-Content -Path $current_profile -Value "Import-Module $module_path"
+  $tag = (Invoke-RestMethod https://api.github.com/repos/$repo/tags)[0].Name
+  $module_path = "$bin_dir\PhpManager\powershell-phpmanager-$tag\PhpManager"
+  if(-not (Test-Path $module_path\PhpManager.psm1 -PathType Leaf)) {
+    $zip_file = "$bin_dir\PhpManager.zip"
+    Invoke-WebRequest -UseBasicParsing -Uri https://github.com/$repo/archive/$tag.zip -OutFile $zip_file
+    Expand-Archive -Path $zip_file -DestinationPath $bin_dir\PhpManager -Force
  }
+  Import-Module $module_path
+  Add-ToProfile $current_profile 'powershell-phpmanager' "Import-Module $module_path"
 }

+# Function to add PHP extensions.
 Function Add-Extension {
  Param (
    [Parameter(Position = 0, Mandatory = $true)]
@ -111,6 +137,7 @@ Function Add-Extension {
  }
 }

+# Function to remove PHP extensions.
 Function Remove-Extension() {
  Param (
    [Parameter(Position = 0, Mandatory = $true)]
@ -134,6 +161,7 @@ Function Remove-Extension() {
  }
 }

+# Function to add tools.
 Function Add-Tool() {
  Param (
    [Parameter(Position = 0, Mandatory = $true)]
@ -147,44 +175,52 @@ Function Add-Tool() {
    [string]
    $tool
  )
-  if (Test-Path $php_dir\$tool) {
-    Remove-Item $php_dir\$tool
+  if (Test-Path $bin_dir\$tool) {
+    Remove-Item $bin_dir\$tool
  }
  if ($tool -eq "symfony") {
-    Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool.exe
-    Add-Content -Path $current_profile -Value "New-Alias $tool $php_dir\$tool.exe" >$null 2>&1
+    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
  } else {
    try {
-      Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool
+      Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\$tool
      $bat_content = @()
      $bat_content += "@ECHO off"
      $bat_content += "setlocal DISABLEDELAYEDEXPANSION"
      $bat_content += "SET BIN_TARGET=%~dp0/" + $tool
      $bat_content += "php %BIN_TARGET% %*"
-      Set-Content -Path $php_dir\$tool.bat -Value $bat_content
-      Add-Content -Path $current_profile -Value "New-Alias $tool $php_dir\$tool.bat" >$null 2>&1
+      Set-Content -Path $bin_dir\$tool.bat -Value $bat_content
+      Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.bat" >$null 2>&1
    } catch { }
  }
-  if($tool -eq "phive") {
+  if($tool -eq "phan") {
+    Add-Extension fileinfo >$null 2>&1
+    Add-Extension ast >$null 2>&1
+  } elseif($tool -eq "phive") {
    Add-Extension xml >$null 2>&1
  } elseif($tool -eq "cs2pr") {
-    (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
+    (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
  } elseif($tool -eq "composer") {
    composer -q global config process-timeout 0
    Write-Output "::add-path::$env:APPDATA\Composer\vendor\bin"
    if (Test-Path env:COMPOSER_TOKEN) {
      composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
    }
+    # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
+    if ($version -lt 5.6) {
+      composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
+    }
  } elseif($tool -eq "wp-cli") {
-    Copy-Item $php_dir\wp-cli.bat -Destination $php_dir\wp.bat
+    Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
  }
-  if (((Get-ChildItem -Path $php_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
+  if (((Get-ChildItem -Path $bin_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
    Add-Log $tick $tool "Added"
  } else {
    Add-Log $cross $tool "Could not add $tool"
  }
 }

+# Function to setup a tool using composer.
 Function Add-Composertool() {
  Param (
    [Parameter(Position = 0, Mandatory = $true)]
@ -211,23 +247,25 @@ Function Add-Composertool() {
  }
 }

+# Function to handle request to add PECL.
 Function Add-Pecl() {
  Add-Log $tick "PECL" "Use extensions input to setup PECL extensions on windows"
 }

+# Function to add blackfire and blackfire-agent.
 Function Add-Blackfire() {
  $agent_data = Invoke-WebRequest https://blackfire.io/docs/up-and-running/update | ForEach-Object { $_.tostring() -split "[`r`n]" | Select-String '<td class="version">' | Select-Object -Index 0 }
  $agent_version = [regex]::Matches($agent_data, '<td.*?>(.+)</td>') | ForEach-Object {$_.Captures[0].Groups[1].value }
  $url = "https://packages.blackfire.io/binaries/blackfire-agent/${agent_version}/blackfire-agent-windows_${arch_name}.zip"
-  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\blackfire.zip >$null 2>&1
-  Expand-Archive -Path $php_dir\blackfire.zip -DestinationPath $php_dir -Force >$null 2>&1
-  Add-Content -Path $current_profile -Value "New-Alias blackfire $php_dir\blackfire.exe"
-  Add-Content -Path $current_profile -Value "New-Alias blackfire-agent $php_dir\blackfire-agent.exe"
+  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
+    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"
@ -238,9 +276,11 @@ $tick = ([char]8730)
 $cross = ([char]10007)
 $php_dir = 'C:\tools\php'
 $ext_dir = "$php_dir\ext"
+$bin_dir = $php_dir
 $current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $master_version = '8.0'
+$cert_source='CurrentUser'

 $arch = 'x64'
 $arch_name ='amd64'
@ -258,6 +298,7 @@ if($env:RUNNER -eq 'self-hosted') {
  $bin_dir = 'C:\tools\bin'
  $php_dir = "$php_dir$version"
  $ext_dir = "$php_dir\ext"
+  $cert_source='Curl'
  Get-CleanPSProfile >$null 2>&1
  New-Item $bin_dir -Type Directory 2>&1 | Out-Null
  Add-Path -PathItem $bin_dir
@ -267,13 +308,20 @@ if($env:RUNNER -eq 'self-hosted') {
  }
  if($version -lt 5.6) {
    Add-Log $cross "PHP" "PHP $version is not supported on self-hosted runner"
+    Start-Sleep 1
    exit 1
  }
+  if ((Get-InstalledModule).Name -notcontains 'VcRedist') {
+    Install-Module -Name VcRedist -Force
+  }
  New-Item $php_dir -Type Directory 2>&1 | Out-Null
  Add-Path -PathItem $php_dir
  setx PHPROOT $php_dir >$null 2>&1
 } else {
  $current_profile = "$PSHOME\Profile.ps1"
+  if(-not(Test-Path -LiteralPath $current_profile)) {
+    New-Item -Path $current_profile -ItemType "file" -Force >$null 2>&1
+  }
 }
 Step-Log "Setup PhpManager"
 Install-PhpManager >$null 2>&1
@ -312,9 +360,10 @@ if($version -lt "5.5") {
 } else {
  Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
 }
-Update-PhpCAInfo -Path $php_dir -Source CurrentUser
+Update-PhpCAInfo -Path $php_dir -Source $cert_source
 if ($version -eq 'master') {
-  Copy-Item $dir"\..\src\bin\php_$env:PHPTS`_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
+  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
 }
--- a/src/tools.ts
+++ b/src/tools.ts
@ -33,8 +33,10 @@ export async function getCommand(
 export async function getToolVersion(version: string): Promise<string> {
  // semver_regex - https://semver.org/
  const semver_regex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+  const composer_regex = /^stable$|^preview$|^snapshot$|^v?[1|2]$/;
  version = version.replace(/[><=^]*/, '');
  switch (true) {
+    case composer_regex.test(version):
    case semver_regex.test(version):
      return version;
    default:
@ -300,19 +302,47 @@ export async function getWpCliUrl(version: string): Promise<string> {
 * @param tools_list
 */
 export async function addComposer(tools_list: string[]): Promise<string[]> {
-  const regex = /^composer($|:.*)/;
-  const composer: string = tools_list.filter(tool => regex.test(tool))[0];
-  switch (composer) {
+  const regex_any = /^composer($|:.*)/;
+  const regex_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$)/;
+  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:
      break;
    default:
-      tools_list = tools_list.filter(tool => !regex.test(tool));
+      composer = matches[matches.length - 1].replace(/v([1-2])/, '$1');
      break;
  }
-  tools_list.unshift('composer');
+  tools_list.unshift(composer);
  return tools_list;
 }

+/**
+ * Function to get script to update composer
+ *
+ * @param version
+ * @param os_version
+ */
+export async function updateComposer(
+  version: string,
+  os_version: string
+): Promise<string> {
+  switch (version) {
+    case 'snapshot':
+    case 'preview':
+    case '1':
+    case '2':
+      return (
+        '\ncomposer self-update --' +
+        version +
+        (await utils.suppressOutput(os_version))
+      );
+    default:
+      return '';
+  }
+}
+
 /**
 * Function to get Tools list after cleanup
 *
@ -463,6 +493,10 @@ export async function addTools(
        url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
        script += await addArchive(tool, version, url, os_version);
        break;
+      case 'phan':
+        url = github + 'phan/phan/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
      case 'phive':
        script += await addPhive(version, os_version);
        break;
@ -479,11 +513,10 @@ export async function addTools(
        script += await addArchive(tool, version, url, os_version);
        break;
      case 'composer':
-        // If RC is released as latest release, switch to getcomposer.
-        // Prefered source is GitHub as it is faster.
-        // url = github + 'composer/composer/releases/latest/download/composer.phar';
        url = 'https://getcomposer.org/composer-stable.phar';
-        script += await addArchive(tool, version, url, os_version);
+        script +=
+          (await addArchive('composer', version, url, os_version)) +
+          (await updateComposer(version, os_version));
        break;
      case 'codeception':
        url =
--- a/src/utils.ts
+++ b/src/utils.ts
@ -224,13 +224,17 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
 * @param extension
 */
 export async function getExtensionPrefix(extension: string): Promise<string> {
-  const zend: Array<string> = ['xdebug', 'opcache', 'ioncube', 'eaccelerator'];
+  const zend: Array<string> = [
+    'xdebug',
+    'xdebug3',
+    'opcache',
+    'ioncube',
+    'eaccelerator'
+  ];
  switch (zend.indexOf(extension)) {
-    case 0:
-    case 1:
+    default:
      return 'zend_extension';
    case -1:
-    default:
      return 'extension';
  }
 }
--- a/tsconfig.json
+++ b/tsconfig.json
@ -2,7 +2,7 @@
  "compilerOptions": {
    /* Basic Options */
    // "incremental": true,                   /* Enable incremental compilation */
-    "target": "ES2020",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "ES2019",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
    // "allowJs": true,                       /* Allow javascript files to be compiled. */
    // "checkJs": true,                       /* Report errors in .js files. */
Author	SHA1	Message	Date
Shivam Mathur	dd27d4eb81	Merge pull request #235 from shivammathur/develop 2.3.1	2020-06-22 07:33:24 +05:30
Shivam Mathur	248d04f73c	Bump version to 2.3.1	2020-06-22 07:33:18 +05:30
Shivam Mathur	c5e40d9067	Fix Xdebug coverage	2020-06-22 07:33:17 +05:30
Shivam Mathur	e0ed1ad0ef	Remove --no-suggest flag in examples	2020-06-22 07:33:16 +05:30
Shivam Mathur	2907f8a584	Remove dashes from step ids	2020-06-22 07:33:15 +05:30
Shivam Mathur	52691651dc	Add support for Xdebug3 on stable PHP	2020-06-22 07:33:14 +05:30
Shivam Mathur	b9404683e1	Improve extension support	2020-06-22 07:33:08 +05:30
Shivam Mathur	70954fb6f8	Merge pull request #232 from shivammathur/develop 2.3.0	2020-06-11 16:10:15 +05:30
Shivam Mathur	65e65163cd	Bump version to 2.3.0	2020-06-11 16:10:14 +05:30
Shivam Mathur	41397ce45e	Update docs	2020-06-11 16:10:09 +05:30
Shivam Mathur	c09954033f	Fix exit log on self-hosted	2020-06-09 08:46:21 +05:30
Shivam Mathur	7cec1987ac	Improve setup on self-hosted windows	2020-06-09 08:46:16 +05:30
Shivam Mathur	739e40fb5e	Add support for updating composer	2020-06-05 12:25:02 +05:30
Shivam Mathur	9dec5892e7	Specify runner to the PHP 8.0 script	2020-06-05 12:24:51 +05:30
Shivam Mathur	94616818f0	Fix blackfire-agent setup	2020-06-04 08:40:46 +05:30
Shivam Mathur	4f0d9003dc	Add Ubuntu 20.04 to CI	2020-06-04 08:40:45 +05:30
Shivam Mathur	b2edfc47dd	Move WA for sudo to self_hosted_setup in linux.sh	2020-06-04 08:40:39 +05:30
Shivam Mathur	6bd872ad2c	Fix composer peer fingerprint error for old PHP	2020-06-03 01:56:43 +05:30
Shivam Mathur	03eb8cc744	Update actions/cache uses to v2	2020-06-03 01:56:43 +05:30
Shivam Mathur	9687dd1d8a	Fetch scripts for old PHP and nightly	2020-06-03 01:56:42 +05:30
Shivam Mathur	2df0d2b443	Refactor scripts and improve comments	2020-06-03 01:56:37 +05:30
Shivam Mathur	0e56c0b653	Add WA for setrlimit warning with sudo in focal	2020-05-27 09:29:35 +05:30
Shivam Mathur	0469a6f681	Fix setup on self-hosted linux	2020-05-27 08:57:17 +05:30
Shivam Mathur	325413a824	Use Invoke-RestMethod to get tag	2020-05-27 08:02:21 +05:30
Shivam Mathur	b84dd3ce25	Remove empty line in logs	2020-05-26 06:41:18 +05:30
Shivam Mathur	190220c10d	Create ini file using tee instead of touch	2020-05-22 15:46:30 +05:30
Shivam Mathur	4fb049a68b	Merge pull request #225 from shivammathur/develop 2.2.2	2020-05-22 03:46:01 +05:30
Shivam Mathur	3e0678b50f	Bump version to 2.2.2	2020-05-22 02:50:45 +05:30
Shivam Mathur	5b06192e7c	Improve install.ts tests	2020-05-22 02:50:38 +05:30
Shivam Mathur	b419442896	Remove extra newline	2020-05-21 23:33:27 +05:30
Shivam Mathur	49b8b7e301	Update README	2020-05-21 20:43:35 +05:30
Shivam Mathur	b1776b79c8	Add support for phan/phan	2020-05-21 11:28:38 +05:30