Update libs for PHP 8.0 on self-hosted runners

Setup libwebp-dev with PHP8 on linux
Update PPA before phalcon setup
2025-07-02 13:13:15 +07:00 · 2020-05-18 23:50:49 +05:30 · 2020-05-18 22:44:26 +05:30 · 2020-05-18 17:55:48 +05:30 · 2020-05-18 17:25:38 +05:30 · 2020-05-17 11:37:27 +05:30
33 changed files with 2682 additions and 1311 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -9,11 +9,12 @@ Please note that this project is released with a [Contributor Code of Conduct](C
 * Fork the project.
 * Make your bug fix or feature addition.
 * Add tests for it. This is important so we don't break it in a future version unintentionally.
-* Send a pull request to the develop branch.
+* If editing the scripts, create a demo integration test.
+* Send a pull request to the develop branch with all the details.

 Please make sure that you have [set up your user name and email address](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name <root@localhost>` look really stupid in the commit history of a project.

-Due to time constraints, you may not always get a quick response. Please do not take delays personal and feel free to remind.
+Due to time constraints, you may not always get a quick response. Please do not take delays personally and feel free to remind.

 ## Coding Guidelines

--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,23 +1,37 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Nice, you found a bug!
 title: ''
-labels: ''
-assignees: ''
+labels: t:bug
+assignees: 'shivammathur'

 ---

 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- Please describe the bug concisely. -->
+
+**Runners**
+<!-- Please mark the GitHub Action runner your workflow uses. -->
+- [ ] GitHub Hosted
+- [ ] Self Hosted
+
+**Operating systems**
+<!-- Please mention the operating systems your workflow uses. -->
+
+**PHP versions**
+<!-- Please mention the PHP versions your workflow uses. -->

 **To Reproduce**
-Please provide the GitHub Action `.yml` file.
+<!-- Please provide the relevant steps of your workflow `.yml` file. -->

 **Expected behavior**
-A clear and concise description of what you expected to happen.
+<!-- A clear and concise description of what you expected to happen. -->

-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Screenshots/Logs**
+<!-- If applicable, add screenshots or logs to help explain your problem. -->

 **Additional context**
-Add any other context about the problem here.
+<!-- Add any other context about the problem here. -->
+
+**Are you willing to submit a PR?**
+<!-- We accept pull requests targeting the develop branch. -->
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,20 +1,23 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest a new feature
 title: ''
-labels: ''
-assignees: ''
+labels: t:enhancement
+assignees: 'shivammathur'

 ---

-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I want to improve [...]
+**Describe the feature**
+<!-- Please describe concisely the feature you want to add. -->

-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+**Underlying issue**
+<!-- Please describe the issue this would solve. -->

-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+**Describe alternatives**
+<!-- Please mention any alternative solutions you've considered. -->

 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->
+
+**Are you willing to submit a PR?**
+<!-- We accept pull requests targeting the develop branch. -->
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -7,14 +7,13 @@ labels: bug or enhancement

 ## A Pull Request should be associated with an Issue.

-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
-> and potentially we'll be able to point development in a particular direction.
+> If you're fixing a bug, adding a new feature or improving something please provide the details in Issues,
+> so that the development can be pointed in the intended direction.

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

 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
+> Thank you for your contribution.

 ### Description

@ -26,7 +25,12 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
- [ ] `npm test` returns with no unit test errors.
+- [ ] `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/FIX.md
+++ b/.github/PULL_REQUEST_TEMPLATE/FIX.md
@ -7,14 +7,13 @@ labels: bug

 ## A Pull Request should be associated with an Issue.

-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
-> and potentially we'll be able to point development in a particular direction.
+> 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: 
+Related issue: <!-- Please link the related issue -->

 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
+> Thank you for your contribution.

 ### Description

@ -26,7 +25,12 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
- [ ] `npm test` returns with no unit test errors.
+- [ ] `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
@ -7,14 +7,13 @@ labels: enhancement

 ## A Pull Request should be associated with an Issue.

-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
-> and potentially we'll be able to point development in a particular direction.
+> 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: 
+Related issue: <!-- Please link the related issue -->

 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
+> Thank you for your contribution.

 ### Description

@ -26,7 +25,12 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
- [ ] `npm test` returns with no unit test errors.
+- [ ] `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,20 +1,19 @@
 ---
 name: 🎉 New Feature
-about: You have implemented some neat idea that you want to make part of setup-php?
+about: You have added a new feature to setup-php?
 labels: enhancement

 ---

 ## A Pull Request should be associated with an Issue.

-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
-> and potentially we'll be able to point development in a particular direction.
+> 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: 
+Related issue: <!-- Please link the related issue -->

 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
+> Thank you for your contribution.

 ### Description

@ -26,7 +25,12 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
- [ ] `npm test` returns with no unit test errors.
+- [ ] `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
@ -7,7 +7,7 @@ The following versions of this project are supported for security updates.
 | Version | Supported          |
 | ------- | ------------------ |
 | 1.8.x   | :white_check_mark: |
-| 2.1.x   | :white_check_mark: |
+| 2.2.x   | :white_check_mark: |

 ## Supported PHP Versions

--- a/.prettierrc.json
+++ b/.prettierrc.json
@ -1,11 +1,12 @@
 {
+    "arrowParens": "avoid",
+    "bracketSpacing": false,
+    "endOfLine": "auto",
+    "parser": "typescript",
    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
    "semi": true,
    "singleQuote": true,
+    "tabWidth": 2,
    "trailingComma": "none",
-    "bracketSpacing": false,
-    "arrowParens": "avoid",
-    "parser": "typescript"
-  }
+    "useTabs": false
+}
--- a/README.md
+++ b/README.md
@ -30,6 +30,8 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
  - [Basic Setup](#basic-setup)
  - [Matrix Setup](#matrix-setup)
  - [Experimental Setup](#experimental-setup)
+  - [Self Hosted Setup](#self-hosted-setup)
+  - [Local Testing Setup](#local-testing-setup)
  - [Thread Safe Setup](#thread-safe-setup)
  - [Force Update](#force-update)
  - [Verbose Setup](#verbose-setup)
@ -47,18 +49,18 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support

 ## :tada: PHP Support

-|PHP Version|Stability|Release Support|
-|--- |--- |--- |
-|5.3|`Stable`|`End of life`|
-|5.4|`Stable`|`End of life`|
-|5.5|`Stable`|`End of life`|
-|5.6|`Stable`|`End of life`|
-|7.0|`Stable`|`End of life`|
-|7.1|`Stable`|`End of life`|
-|7.2|`Stable`|`Security fixes only`|
-|7.3|`Stable`|`Active`|
-|7.4|`Stable`|`Active`|
-|8.0|`Experimental`|`In development`|
+|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`|

 **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.

@ -69,9 +71,13 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 |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`|
+|MacOS X Catalina 10.15|`macos-latest` or `macos-10.15`|
+|Self Hosted|`self-hosted`|
+
+**Note:** Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.

 ## :heavy_plus_sign: PHP Extension Support
+
 - On `ubuntu` by default extensions which are available as a package can be installed. PECL extensions if not available as a package can be installed by specifying `pecl` in the tools input.

 ```yaml
@ -108,7 +114,16 @@ with:
  extensions: xdebug-beta
 ```

- Extensions which cannot be setup gracefully leave an error message in the logs, the action is not interrupted.
+- Non-default extensions can be removed by prefixing it with a `:`.
+
+```yaml
+uses: shivammathur/setup-php@v2
+with:
+  php-version: '7.4'  
+  extensions: :opcache
+```
+
+- Extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted.

 - These extensions have custom support - `gearman` on ubuntu, `blackfire`, `phalcon3` and `phalcon4` on all supported OS.

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

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

-`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `flex`, `pecl`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`
+`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`

 ```yaml
 uses: shivammathur/setup-php@v2
@ -140,7 +155,7 @@ with:
 - 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.
- Tools which cannot be installed gracefully leave an error message in the logs, the action is not interrupted.
+- Tools which cannot be setup gracefully leave an error message in the logs, the action is not interrupted.

 ## :signal_strength: Coverage support

@ -200,8 +215,9 @@ with:

 #### `extensions` (optional)

- Specify the extensions you want to setup.
- Accepts a `string` in csv-format. For example `mbstring, zip`.
+- Specify the extensions you want to add or remove.
+- Accepts a `string` in csv-format. For example `mbstring, :opcache`.
+- Non-default extensions prefixed with `:` are removed.
 - See [PHP extension support](#heavy_plus_sign-php-extension-support) for more info.

 #### `ini-values` (optional)
@ -294,11 +310,76 @@ steps:
    tools: php-cs-fixer, phpunit
 ```

+### Self Hosted Setup
+
+> 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.
+
+Specify the environment variable `runner` with the value `self-hosted`. Without this your workflow will fail.
+
+```yaml
+jobs:
+  run:
+    runs-on: self-hosted
+    strategy:
+      matrix:        
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+    name: PHP ${{ matrix.php-versions }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+      env:
+        runner: self-hosted # Specify the runner.
+```
+
+### Local Testing Setup
+
+> Test your `Ubuntu` workflow locally using [`nektos/act`](https://github.com/nektos/act "Project to test GitHub Actions locally").
+
+```yaml
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    name: PHP 7.4 Test
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: 7.4
+```
+
+Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker image.
+
+```bash
+# For runs-on: ubuntu-latest
+act -P ubuntu-latest=shivammathur/node:latest
+
+# For runs-on: ubuntu-18.04
+act -P ubuntu-18.04=shivammathur/node:latest
+
+# For runs-on: ubuntu-16.04
+act -P ubuntu-16.04=shivammathur/node:xenial
+```
+
 ### Thread Safe Setup

+> Setup both `TS` and `NTS` PHP on `Windows`.
+
 - `NTS` versions are setup by default.
- On `ubuntu` and `macOS` only `NTS` versions are supported.
- On `windows` both `TS` and `NTS` versions are supported.
+- On `Ubuntu` and `macOS` only `NTS` versions are supported.
+- On `Windows` both `TS` and `NTS` versions are supported.

 ```yaml
 jobs:
@ -314,11 +395,13 @@ jobs:
      with:
        php-version: '7.4'
      env:
-        PHPTS: ts # specify ts or nts
+        phpts: ts # specify ts or nts
 ```

 ### Force Update

+> Update to latest patch of PHP versions.
+
 - Pre-installed PHP versions on the GitHub Actions runner are not updated to their latest patch release by default.
 - You can specify the `update` environment variable to `true` to force update to the latest release.

@ -333,6 +416,8 @@ jobs:

 ### Verbose Setup

+> Debug your workflow
+
 To debug any issues, you can use the `verbose` tag instead of `v2`.

 ```yaml
@ -344,7 +429,7 @@ To debug any issues, you can use the `verbose` tag instead of `v2`.

 ### Cache Extensions

-You can cache PHP extensions using [`shivammathur/cache-extensions`](https://github.com/shivammathur/cache-extensions "GitHub Action to cache php extensions") and [`action/cache`](https://github.com/actions/cache "GitHub Action to cache files") GitHub Actions. Extensions which take very long to setup if cached are available in the next workflow run and enabled directly which reduces the workflow execution time.
+You can cache PHP extensions using [`shivammathur/cache-extensions`](https://github.com/shivammathur/cache-extensions "GitHub Action to cache php extensions") and [`action/cache`](https://github.com/actions/cache "GitHub Action to cache files") GitHub Actions. Extensions which take very long to setup when cached are available in the next workflow run and are enabled directly. This reduces the workflow execution time.

 ```yaml
 runs-on: ${{ matrix.operating-system }}
@ -382,7 +467,7 @@ steps:
    extensions: ${{ env.extensions }}
 ```

-**Note:** If you setup both `TS` and `NTS` PHP versions on `windows`, add `${{ env.PHPTS }}` to `key` and `restore-keys` inputs in `actions/cache` step.
+**Note:** If you setup both `TS` and `NTS` PHP versions on `windows`, add `${{ env.phpts }}` to `key` and `restore-keys` inputs in `actions/cache` step.

 ### Cache Composer Dependencies

--- a/tests/config.test.ts
+++ b/tests/config.test.ts
@ -7,7 +7,7 @@ describe('Config tests', () => {
      'win32'
    );
    expect(win32).toContain(
-      'Add-Content C:\\tools\\php\\php.ini "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
+      'Add-Content "$php_dir\\php.ini" "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
    );

    win32 = await config.addINIValues(
--- a/tests/extensions.test.ts
+++ b/tests/extensions.test.ts
@ -3,13 +3,14 @@ import * as extensions from '../src/extensions';
 describe('Extension tests', () => {
  it('checking addExtensionOnWindows', async () => {
    let win32: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, phalcon4, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
+      'Xdebug, pcov, sqlite, :intl, phalcon4, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
      '7.4',
      'win32'
    );
    expect(win32).toContain('Add-Extension xdebug');
    expect(win32).toContain('Add-Extension pcov');
    expect(win32).toContain('Add-Extension sqlite3');
+    expect(win32).toContain('Remove-Extension intl');
    expect(win32).toContain('phalcon.ps1 phalcon4');
    expect(win32).toContain('Add-Extension ast beta');
    expect(win32).toContain('Add-Extension grpc stable 1.2.3');
@ -41,15 +42,15 @@ describe('Extension tests', () => {
    expect(win32).toContain('Platform fedora is not supported');

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

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

  it('checking addExtensionOnLinux', async () => {
    let linux: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
+      'Xdebug, pcov, sqlite, :intl, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
      '7.4',
      'linux'
    );
@ -58,6 +59,7 @@ describe('Extension tests', () => {
    expect(linux).toContain(
      'sudo $debconf_fix apt-get install -y php7.4-sqlite3'
    );
+    expect(linux).toContain('remove_extension intl');
    expect(linux).toContain('sudo $debconf_fix apt-get install -y php-ast');
    expect(linux).toContain('sudo $debconf_fix apt-get install -y php-uopz');
    expect(linux).toContain('add_unstable_extension ast beta extension');
@ -90,21 +92,22 @@ describe('Extension tests', () => {
    expect(linux).toContain('phalcon.sh phalcon4 7.3');

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

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

  it('checking addExtensionOnDarwin', async () => {
    let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, ast-beta, grpc-1.2.3',
+      'Xdebug, pcov, sqlite, :intl, ast-beta, grpc-1.2.3',
      '7.2',
      'darwin'
    );
    expect(darwin).toContain('sudo pecl install -f xdebug');
    expect(darwin).toContain('sudo pecl install -f pcov');
    expect(darwin).toContain('sudo pecl install -f sqlite3');
+    expect(darwin).toContain('remove_extension intl');
    expect(darwin).toContain('add_unstable_extension ast beta extension');
    expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');

@ -153,10 +156,10 @@ describe('Extension tests', () => {
    expect(darwin).toContain('sudo pecl install -f imagick');

    darwin = await extensions.addExtension('blackfire', '7.3', 'darwin');
-    expect(darwin).toContain('blackfire_darwin.sh 7.3 1.31.0');
+    expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire');

    darwin = await extensions.addExtension('blackfire-1.31.0', '7.3', 'darwin');
-    expect(darwin).toContain('blackfire_darwin.sh 7.3 1.31.0');
+    expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire-1.31.0');

    darwin = await extensions.addExtension(
      'does_not_exist',
--- a/tests/tools.test.ts
+++ b/tests/tools.test.ts
@ -391,7 +391,7 @@ describe('Tools tests', () => {
  });
  it('checking addTools on darwin', async () => {
    const script: string = await tools.addTools(
-      'blackfire, blackfire-player, flex, phpcs, phpcbf, phpcpd, phpmd, psalm, phinx, phive:1.2.3, cs2pr:1.2.3, composer-prefetcher:1.2.3, phpize, php-config, symfony, symfony:1.2.3, wp-cli',
+      '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',
      '7.4',
      'darwin'
    );
@ -405,6 +405,9 @@ describe('Tools tests', () => {
    expect(script).toContain(
      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr'
    );
+    expect(script).toContain(
+      'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection'
+    );
    expect(script).toContain(
      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs'
    );
@ -420,6 +423,7 @@ describe('Tools tests', () => {
    expect(script).toContain(
      'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
    );
+    expect(script).toContain('add_composertool vapor-cli vapor-cli laravel/');
    expect(script).toContain('add_composertool flex flex symfony/');
    expect(script).toContain('add_composertool phinx phinx robmorgan/');
    expect(script).toContain(
@ -446,7 +450,7 @@ describe('Tools tests', () => {
      '7.4',
      'win32'
    );
-    expect(script).toContain('Add-Blackfire 1.32.0');
+    expect(script).toContain('Add-Blackfire');
    expect(script).toContain(
      'Add-Tool https://get.blackfire.io/blackfire-player-v1.8.1.phar blackfire-player'
    );
--- a/tests/utils.test.ts
+++ b/tests/utils.test.ts
@ -29,7 +29,9 @@ describe('Utils tests', () => {
  it('checking asyncForEach', async () => {
    const array: Array<string> = ['a', 'b', 'c'];
    let concat = '';
-    await utils.asyncForEach(array, async function(str: string): Promise<void> {
+    await utils.asyncForEach(array, async function (
+      str: string
+    ): Promise<void> {
      concat += str;
    });
    expect(concat).toBe('abc');
@ -68,7 +70,10 @@ describe('Utils tests', () => {
    const runner_dir: string = process.env['RUNNER_TOOL_CACHE'] || '';
    const script_path: string = path.join(runner_dir, 'test.sh');
    await utils.writeScript('test.sh', testString);
-    await fs.readFile(script_path, function(error: Error | null, data: Buffer) {
+    await fs.readFile(script_path, function (
+      error: Error | null,
+      data: Buffer
+    ) {
      expect(testString).toBe(data.toString());
    });
    await cleanup(script_path);
@ -161,14 +166,4 @@ describe('Utils tests', () => {
      'Platform fedora is not supported'
    );
  });
-
-  it('checking getBlackfireVersion', async () => {
-    expect(await utils.getBlackfireVersion('')).toEqual('1.31.0');
-    expect(await utils.getBlackfireVersion(undefined)).toEqual('1.31.0');
-    expect(await utils.getBlackfireVersion(null)).toEqual('1.31.0');
-    expect(await utils.getBlackfireVersion('1.32.0')).toEqual('1.32.0');
-  });
-  it('checking getBlackfireAgentVersion', async () => {
-    expect(await utils.getBlackfireAgentVersion()).toEqual('1.32.0');
-  });
 });
--- a/dist/index.js
+++ b/dist/index.js
@ -952,14 +952,27 @@ class ExecState extends events.EventEmitter {

 "use strict";

+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMatchers = void 0;
 const path = __importStar(__webpack_require__(622));
 const utils = __importStar(__webpack_require__(163));
 const io = __importStar(__webpack_require__(1));
@ -996,14 +1009,27 @@ module.exports = require("child_process");

 "use strict";

+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.suppressOutput = exports.getExtensionPrefix = exports.CSVArray = exports.extensionArray = exports.writeScript = exports.readScript = exports.addLog = exports.stepLog = exports.log = exports.color = exports.asyncForEach = exports.getInput = void 0;
 const fs = __importStar(__webpack_require__(747));
 const path = __importStar(__webpack_require__(622));
 const core = __importStar(__webpack_require__(470));
@ -1214,29 +1240,6 @@ async function suppressOutput(os_version) {
    }
 }
 exports.suppressOutput = suppressOutput;
-/**
- * Function to get Blackfire version
- *
- * @param blackfire_version
- */
-async function getBlackfireVersion(blackfire_version) {
-    switch (blackfire_version) {
-        case null:
-        case undefined:
-        case '':
-            return '1.31.0';
-        default:
-            return blackfire_version;
-    }
-}
-exports.getBlackfireVersion = getBlackfireVersion;
-/**
- * Function to get Blackfire Agent version
- */
-async function getBlackfireAgentVersion() {
-    return '1.32.0';
-}
-exports.getBlackfireAgentVersion = getBlackfireAgentVersion;


 /***/ }),
@ -1315,14 +1318,28 @@ class Command {
        return cmdStr;
    }
 }
+/**
+ * Sanitizes an input into a string so it can be passed into issueCommand safely
+ * @param input input to sanitize into a string
+ */
+function toCommandValue(input) {
+    if (input === null || input === undefined) {
+        return '';
+    }
+    else if (typeof input === 'string' || input instanceof String) {
+        return input;
+    }
+    return JSON.stringify(input);
+}
+exports.toCommandValue = toCommandValue;
 function escapeData(s) {
-    return (s || '')
+    return toCommandValue(s)
        .replace(/%/g, '%25')
        .replace(/\r/g, '%0D')
        .replace(/\n/g, '%0A');
 }
 function escapeProperty(s) {
-    return (s || '')
+    return toCommandValue(s)
        .replace(/%/g, '%25')
        .replace(/\r/g, '%0D')
        .replace(/\n/g, '%0A')
@ -1378,11 +1395,13 @@ var ExitCode;
 /**
 * Sets env variable for this action and future actions in the job
 * @param name the name of the variable to set
- * @param val the value of the variable
+ * @param val the value of the variable. Non-string values will be converted to a string via JSON.stringify
 */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function exportVariable(name, val) {
-    process.env[name] = val;
-    command_1.issueCommand('set-env', { name }, val);
+    const convertedVal = command_1.toCommandValue(val);
+    process.env[name] = convertedVal;
+    command_1.issueCommand('set-env', { name }, convertedVal);
 }
 exports.exportVariable = exportVariable;
 /**
@ -1421,12 +1440,22 @@ exports.getInput = getInput;
 * Sets the value of an output.
 *
 * @param     name     name of the output to set
- * @param     value    value to store
+ * @param     value    value to store. Non-string values will be converted to a string via JSON.stringify
 */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function setOutput(name, value) {
    command_1.issueCommand('set-output', { name }, value);
 }
 exports.setOutput = setOutput;
+/**
+ * Enables or disables the echoing of commands into stdout for the rest of the step.
+ * Echoing is disabled by default if ACTIONS_STEP_DEBUG is not set.
+ *
+ */
+function setCommandEcho(enabled) {
+    command_1.issue('echo', enabled ? 'on' : 'off');
+}
+exports.setCommandEcho = setCommandEcho;
 //-----------------------------------------------------------------------
 // Results
 //-----------------------------------------------------------------------
@ -1460,18 +1489,18 @@ function debug(message) {
 exports.debug = debug;
 /**
 * Adds an error issue
- * @param message error issue message
+ * @param message error issue message. Errors will be converted to string via toString()
 */
 function error(message) {
-    command_1.issue('error', message);
+    command_1.issue('error', message instanceof Error ? message.toString() : message);
 }
 exports.error = error;
 /**
 * Adds an warning issue
- * @param message warning issue message
+ * @param message warning issue message. Errors will be converted to string via toString()
 */
 function warning(message) {
-    command_1.issue('warning', message);
+    command_1.issue('warning', message instanceof Error ? message.toString() : message);
 }
 exports.warning = warning;
 /**
@ -1529,8 +1558,9 @@ exports.group = group;
 * Saves state for current action, the state can only be retrieved by this action's post job execution.
 *
 * @param     name     name of the state to store
- * @param     value    value to store
+ * @param     value    value to store. Non-string values will be converted to a string via JSON.stringify
 */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function saveState(name, value) {
    command_1.issueCommand('save-state', { name }, value);
 }
@ -1554,14 +1584,27 @@ exports.getState = getState;

 "use strict";

+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (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;
 const utils = __importStar(__webpack_require__(163));
 /**
 * Function to get command to setup tools
@ -1840,7 +1883,7 @@ async function getCleanedToolsList(tools_csv) {
        .map(function (extension) {
        return extension
            .trim()
-            .replace(/symfony\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
+            .replace(/symfony\/|laravel\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
    })
        .filter(Boolean);
    return [...new Set(tools_list)];
@ -1913,7 +1956,7 @@ async function addTools(tools_csv, php_version, os_version) {
        switch (tool) {
            case 'blackfire':
            case 'blackfire-agent':
-                script += await getCommand(os_version, 'blackfire ' + (await utils.getBlackfireAgentVersion()));
+                script += await getCommand(os_version, 'blackfire');
                break;
            case 'blackfire-player':
                url = await getPharUrl('https://get.blackfire.io', tool, 'v', version);
@ -1924,6 +1967,10 @@ async function addTools(tools_csv, php_version, os_version) {
                url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
                script += await addArchive(tool, version, url, os_version);
                break;
+            case 'infection':
+                url = github + 'infection/infection/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
            case 'php-cs-fixer':
                uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
                url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
@ -1980,6 +2027,9 @@ async function addTools(tools_csv, php_version, os_version) {
            case 'prestissimo':
                script += await addPackage(tool, release, 'hirak/', os_version);
                break;
+            case 'vapor-cli':
+                script += await addPackage(tool, release, 'laravel/', os_version);
+                break;
            case 'composer-prefetcher':
                script += await addPackage(tool, release, 'narrowspark/automatic-', os_version);
                break;
@ -2031,14 +2081,27 @@ module.exports = require("path");

 "use strict";

+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addCoverage = exports.disableCoverage = exports.addCoveragePCOV = exports.addCoverageXdebug = void 0;
 const utils = __importStar(__webpack_require__(163));
 const extensions = __importStar(__webpack_require__(911));
 const config = __importStar(__webpack_require__(641));
@ -2157,14 +2220,27 @@ exports.addCoverage = addCoverage;

 "use strict";

+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addINIValues = exports.addINIValuesWindows = exports.addINIValuesUnix = void 0;
 const utils = __importStar(__webpack_require__(163));
 /**
 * Add script to set custom ini values for unix
@ -2193,10 +2269,7 @@ async function addINIValuesWindows(ini_values_csv) {
        script +=
            (await utils.addLog('$tick', line, 'Added to php.ini', 'win32')) + '\n';
    });
-    return ('Add-Content C:\\tools\\php\\php.ini "' +
-        ini_values.join('\n') +
-        '"' +
-        script);
+    return ('Add-Content "$php_dir\\php.ini" "' + ini_values.join('\n') + '"' + script);
 }
 exports.addINIValuesWindows = addINIValuesWindows;
 /**
@ -2240,14 +2313,27 @@ exports.addINIValues = addINIValues;

 "use strict";

+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = exports.build = void 0;
 const exec_1 = __webpack_require__(986);
 const core = __importStar(__webpack_require__(470));
 const config = __importStar(__webpack_require__(641));
@ -2545,14 +2631,27 @@ module.exports = require("fs");

 "use strict";

+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
    if (mod && mod.__esModule) return mod;
    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (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;
 const path = __importStar(__webpack_require__(622));
 const utils = __importStar(__webpack_require__(163));
 /**
@ -2564,7 +2663,8 @@ const utils = __importStar(__webpack_require__(163));
 */
 async function addExtensionDarwin(extension_csv, version, pipe) {
    const extensions = await utils.extensionArray(extension_csv);
-    let script = '\n';
+    let add_script = '\n';
+    let remove_script = '\n';
    await utils.asyncForEach(extensions, async function (extension) {
        const version_extension = version + extension;
        const [ext_name, ext_version] = extension.split('-');
@ -2572,6 +2672,10 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
        const command_prefix = 'sudo pecl install -f ';
        let command = '';
        switch (true) {
+            // match :extension
+            case /^:/.test(ext_name):
+                remove_script += '\nremove_extension ' + ext_name.slice(1);
+                return;
            // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
            // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
            case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
@ -2581,11 +2685,11 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                        ' ' +
                        version +
                        ' ' +
-                        (await utils.getBlackfireVersion(ext_version));
+                        extension;
                break;
            // match pre-release versions. For example - xdebug-beta
            case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-                script +=
+                add_script +=
                    '\nadd_unstable_extension ' +
                        ext_name +
                        ' ' +
@ -2595,7 +2699,7 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                return;
            // match semver
            case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-                script +=
+                add_script +=
                    '\nadd_pecl_extension ' +
                        ext_name +
                        ' ' +
@ -2640,8 +2744,8 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                break;
            // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-                script +=
-                    'sh ' +
+                add_script +=
+                    '\nbash ' +
                        path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
                        ' ' +
                        extension +
@ -2652,10 +2756,10 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                command = command_prefix + extension + pipe;
                break;
        }
-        script +=
+        add_script +=
            '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
    });
-    return script;
+    return add_script + remove_script;
 }
 exports.addExtensionDarwin = addExtensionDarwin;
 /**
@ -2666,58 +2770,63 @@ exports.addExtensionDarwin = addExtensionDarwin;
 */
 async function addExtensionWindows(extension_csv, version) {
    const extensions = await utils.extensionArray(extension_csv);
-    let script = '\n';
+    let add_script = '\n';
+    let remove_script = '\n';
    await utils.asyncForEach(extensions, async function (extension) {
        const [ext_name, ext_version] = extension.split('-');
        const version_extension = version + extension;
        let matches;
        switch (true) {
+            // Match :extension
+            case /^:/.test(ext_name):
+                remove_script += '\nRemove-Extension ' + ext_name.slice(1);
+                return;
            // match 5.4blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
            // match 5.4blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
            case /^(5\.[4-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
-                script +=
+                add_script +=
                    '\n& ' +
                        path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
                        ' ' +
                        version +
                        ' ' +
-                        (await utils.getBlackfireVersion(ext_version));
+                        extension;
                return;
            // match pre-release versions. For example - xdebug-beta
            case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-                script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
+                add_script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
                break;
            // match semver without state
            case /.*-\d+\.\d+\.\d+$/.test(version_extension):
-                script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
+                add_script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
                return;
            // match semver with state
            case /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.test(version_extension):
                matches = /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.exec(version_extension);
-                script +=
+                add_script +=
                    '\nAdd-Extension ' + ext_name + ' ' + matches[2] + ' ' + matches[1];
                return;
            // match 5.3mysql..5.6mysql
            // match 5.3mysqli..5.6mysqli
            // match 5.3mysqlnd..5.6mysqlnd
            case /^5\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-                script +=
+                add_script +=
                    '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
                break;
            // match 7.0mysql..8.0mysql
            // match 7.0mysqli..8.0mysqli
            // match 7.0mysqlnd..8.0mysqlnd
            case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-                script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
+                add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
                break;
            // match sqlite
            case /^sqlite$/.test(extension):
                extension = 'sqlite3';
-                script += '\nAdd-Extension ' + extension;
+                add_script += '\nAdd-Extension ' + extension;
                break;
            // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-                script +=
+                add_script +=
                    '\n& ' +
                        path.join(__dirname, '../src/scripts/ext/phalcon.ps1') +
                        ' ' +
@ -2727,11 +2836,11 @@ async function addExtensionWindows(extension_csv, version) {
                        '\n';
                break;
            default:
-                script += '\nAdd-Extension ' + extension;
+                add_script += '\nAdd-Extension ' + extension;
                break;
        }
    });
-    return script;
+    return add_script + remove_script;
 }
 exports.addExtensionWindows = addExtensionWindows;
 /**
@ -2743,7 +2852,8 @@ exports.addExtensionWindows = addExtensionWindows;
 */
 async function addExtensionLinux(extension_csv, version, pipe) {
    const extensions = await utils.extensionArray(extension_csv);
-    let script = '\n';
+    let add_script = '\n';
+    let remove_script = '\n';
    await utils.asyncForEach(extensions, async function (extension) {
        const version_extension = version + extension;
        const [ext_name, ext_version] = extension.split('-');
@ -2751,8 +2861,12 @@ async function addExtensionLinux(extension_csv, version, pipe) {
        const command_prefix = 'sudo $debconf_fix apt-get install -y php';
        let command = '';
        switch (true) {
+            // Match :extension
+            case /^:/.test(ext_name):
+                remove_script += '\nremove_extension ' + ext_name.slice(1);
+                return;
            // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-            // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
+            // match 5.3blackfire-{semver}...5.6blackfire-{semver}, 7.0blackfire-{semver}...7.4blackfire-{semver}
            case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
                command =
                    'bash ' +
@ -2760,11 +2874,11 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                        ' ' +
                        version +
                        ' ' +
-                        (await utils.getBlackfireVersion(ext_version));
+                        extension;
                break;
            // match pre-release versions. For example - xdebug-beta
            case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-                script +=
+                add_script +=
                    '\nadd_unstable_extension ' +
                        ext_name +
                        ' ' +
@ -2774,7 +2888,7 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                return;
            // match semver versions
            case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-                script +=
+                add_script +=
                    '\nadd_pecl_extension ' +
                        ext_name +
                        ' ' +
@ -2785,7 +2899,7 @@ async function addExtensionLinux(extension_csv, version, pipe) {
            // match 5.6gearman..7.4gearman
            case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
                command =
-                    'sh ' +
+                    '\nbash ' +
                        path.join(__dirname, '../src/scripts/ext/gearman.sh') +
                        ' ' +
                        version +
@ -2793,8 +2907,8 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                break;
            // match 7.0phalcon3...7.3phalcon3 or 7.2phalcon4...7.4phalcon4
            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-                script +=
-                    '\nsh ' +
+                add_script +=
+                    '\nbash ' +
                        path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
                        ' ' +
                        extension +
@ -2803,7 +2917,7 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                return;
            // match 7.1xdebug..7.4xdebug
            case /^7\.[1-4]xdebug$/.test(version_extension):
-                script +=
+                add_script +=
                    '\nupdate_extension xdebug 2.9.3' +
                        pipe +
                        '\n' +
@ -2811,8 +2925,11 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                return;
            // match pdo extensions
            case /.*pdo[_-].*/.test(version_extension):
-                extension = extension.replace('pdo_', '').replace('pdo-', '');
-                script += '\nadd_pdo_extension ' + extension;
+                extension = extension
+                    .replace('pdo_', '')
+                    .replace('pdo-', '')
+                    .replace('sqlite3', 'sqlite');
+                add_script += '\nadd_pdo_extension ' + extension;
                return;
            // match ast and uopz
            case /^(ast|uopz)$/.test(extension):
@ -2827,10 +2944,10 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                command = command_prefix + version + '-' + extension + pipe;
                break;
        }
-        script +=
+        add_script +=
            '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
    });
-    return script;
+    return add_script + remove_script;
 }
 exports.addExtensionLinux = addExtensionLinux;
 /**
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "setup-php",
-  "version": "2.1.4",
+  "version": "2.2.0",
  "private": false,
  "description": "Setup PHP for use with GitHub Actions",
  "main": "dist/index.js",
@ -24,33 +24,33 @@
  "author": "shivammathur",
  "license": "MIT",
  "dependencies": {
-    "@actions/core": "^1.2.3",
-    "@actions/exec": "^1.0.3",
+    "@actions/core": "^1.2.4",
+    "@actions/exec": "^1.0.4",
    "@actions/io": "^1.0.2",
    "fs": "0.0.1-security"
  },
  "devDependencies": {
    "@types/jest": "^25.2.1",
-    "@types/node": "^13.11.1",
-    "@typescript-eslint/eslint-plugin": "^2.27.0",
-    "@typescript-eslint/parser": "^2.27.0",
+    "@types/node": "^14.0.1",
+    "@typescript-eslint/eslint-plugin": "^2.33.0",
+    "@typescript-eslint/parser": "^2.33.0",
    "@zeit/ncc": "^0.22.1",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
+    "eslint": "^7.0.0",
+    "eslint-config-prettier": "^6.11.0",
    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jest": "^23.8.2",
-    "eslint-plugin-prettier": "^3.1.2",
-    "husky": "^4.2.3",
-    "jest": "^25.3.0",
-    "jest-circus": "^25.3.0",
-    "prettier": "^1.19.1",
-    "ts-jest": "^25.3.1",
-    "typescript": "^3.8.3"
+    "eslint-plugin-jest": "^23.11.0",
+    "eslint-plugin-prettier": "^3.1.3",
+    "husky": "^4.2.5",
+    "jest": "^26.0.1",
+    "jest-circus": "^26.0.1",
+    "prettier": "^2.0.5",
+    "ts-jest": "^25.5.1",
+    "typescript": "^3.9.2"
  },
  "husky": {
    "skipCI": true,
    "hooks": {
-      "pre-commit": "npm run format && npm run lint && npm run build && npm run release"
+      "pre-commit": "npm run format && npm run lint && npm run test && npm run build && npm run release"
    }
  }
 }
--- a/src/bin/php_nts_pcov.dll
+++ b/src/bin/php_nts_pcov.dll
--- a/src/config.ts
+++ b/src/config.ts
@ -10,7 +10,7 @@ export async function addINIValuesUnix(
 ): Promise<string> {
  const ini_values: Array<string> = await utils.CSVArray(ini_values_csv);
  let script = '\n';
-  await utils.asyncForEach(ini_values, async function(line: string) {
+  await utils.asyncForEach(ini_values, async function (line: string) {
    script +=
      (await utils.addLog('$tick', line, 'Added to php.ini', 'linux')) + '\n';
  });
@ -27,15 +27,12 @@ export async function addINIValuesWindows(
 ): Promise<string> {
  const ini_values: Array<string> = await utils.CSVArray(ini_values_csv);
  let script = '\n';
-  await utils.asyncForEach(ini_values, async function(line: string) {
+  await utils.asyncForEach(ini_values, async function (line: string) {
    script +=
      (await utils.addLog('$tick', line, 'Added to php.ini', 'win32')) + '\n';
  });
  return (
-    'Add-Content C:\\tools\\php\\php.ini "' +
-    ini_values.join('\n') +
-    '"' +
-    script
+    'Add-Content "$php_dir\\php.ini" "' + ini_values.join('\n') + '"' + script
  );
 }

--- a/src/extensions.ts
+++ b/src/extensions.ts
@ -14,14 +14,19 @@ export async function addExtensionDarwin(
  pipe: string
 ): Promise<string> {
  const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let script = '\n';
-  await utils.asyncForEach(extensions, async function(extension: string) {
+  let add_script = '\n';
+  let remove_script = '\n';
+  await utils.asyncForEach(extensions, async function (extension: string) {
    const version_extension: string = version + extension;
    const [ext_name, ext_version]: string[] = extension.split('-');
    const ext_prefix = await utils.getExtensionPrefix(ext_name);
    const command_prefix = 'sudo pecl install -f ';
    let command = '';
    switch (true) {
+      // match :extension
+      case /^:/.test(ext_name):
+        remove_script += '\nremove_extension ' + ext_name.slice(1);
+        return;
      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
      // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
@ -33,11 +38,11 @@ export async function addExtensionDarwin(
          ' ' +
          version +
          ' ' +
-          (await utils.getBlackfireVersion(ext_version));
+          extension;
        break;
      // match pre-release versions. For example - xdebug-beta
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        script +=
+        add_script +=
          '\nadd_unstable_extension ' +
          ext_name +
          ' ' +
@ -47,7 +52,7 @@ export async function addExtensionDarwin(
        return;
      // match semver
      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        script +=
+        add_script +=
          '\nadd_pecl_extension ' +
          ext_name +
          ' ' +
@ -92,8 +97,8 @@ export async function addExtensionDarwin(
        break;
      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        script +=
-          'sh ' +
+        add_script +=
+          '\nbash ' +
          path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
          ' ' +
          extension +
@ -104,10 +109,10 @@ export async function addExtensionDarwin(
        command = command_prefix + extension + pipe;
        break;
    }
-    script +=
+    add_script +=
      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
  });
-  return script;
+  return add_script + remove_script;
 }

 /**
@ -121,32 +126,37 @@ export async function addExtensionWindows(
  version: string
 ): Promise<string> {
  const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let script = '\n';
-  await utils.asyncForEach(extensions, async function(extension: string) {
+  let add_script = '\n';
+  let remove_script = '\n';
+  await utils.asyncForEach(extensions, async function (extension: string) {
    const [ext_name, ext_version]: string[] = extension.split('-');
    const version_extension: string = version + extension;
    let matches: RegExpExecArray;
    switch (true) {
+      // Match :extension
+      case /^:/.test(ext_name):
+        remove_script += '\nRemove-Extension ' + ext_name.slice(1);
+        return;
      // match 5.4blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
      // match 5.4blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
      case /^(5\.[4-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
        version_extension
      ):
-        script +=
+        add_script +=
          '\n& ' +
          path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
          ' ' +
          version +
          ' ' +
-          (await utils.getBlackfireVersion(ext_version));
+          extension;
        return;
      // match pre-release versions. For example - xdebug-beta
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
+        add_script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
        break;
      // match semver without state
      case /.*-\d+\.\d+\.\d+$/.test(version_extension):
-        script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
+        add_script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
        return;
      // match semver with state
      case /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.test(
@ -155,30 +165,30 @@ export async function addExtensionWindows(
        matches = /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.exec(
          version_extension
        ) as RegExpExecArray;
-        script +=
+        add_script +=
          '\nAdd-Extension ' + ext_name + ' ' + matches[2] + ' ' + matches[1];
        return;
      // match 5.3mysql..5.6mysql
      // match 5.3mysqli..5.6mysqli
      // match 5.3mysqlnd..5.6mysqlnd
      case /^5\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-        script +=
+        add_script +=
          '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
        break;
      // match 7.0mysql..8.0mysql
      // match 7.0mysqli..8.0mysqli
      // match 7.0mysqlnd..8.0mysqlnd
      case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-        script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
+        add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
        break;
      // match sqlite
      case /^sqlite$/.test(extension):
        extension = 'sqlite3';
-        script += '\nAdd-Extension ' + extension;
+        add_script += '\nAdd-Extension ' + extension;
        break;
      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        script +=
+        add_script +=
          '\n& ' +
          path.join(__dirname, '../src/scripts/ext/phalcon.ps1') +
          ' ' +
@ -188,11 +198,11 @@ export async function addExtensionWindows(
          '\n';
        break;
      default:
-        script += '\nAdd-Extension ' + extension;
+        add_script += '\nAdd-Extension ' + extension;
        break;
    }
  });
-  return script;
+  return add_script + remove_script;
 }

 /**
@ -208,16 +218,21 @@ export async function addExtensionLinux(
  pipe: string
 ): Promise<string> {
  const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let script = '\n';
-  await utils.asyncForEach(extensions, async function(extension: string) {
+  let add_script = '\n';
+  let remove_script = '\n';
+  await utils.asyncForEach(extensions, async function (extension: string) {
    const version_extension: string = version + extension;
    const [ext_name, ext_version]: string[] = extension.split('-');
    const ext_prefix = await utils.getExtensionPrefix(ext_name);
    const command_prefix = 'sudo $debconf_fix apt-get install -y php';
    let command = '';
    switch (true) {
+      // Match :extension
+      case /^:/.test(ext_name):
+        remove_script += '\nremove_extension ' + ext_name.slice(1);
+        return;
      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
+      // match 5.3blackfire-{semver}...5.6blackfire-{semver}, 7.0blackfire-{semver}...7.4blackfire-{semver}
      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
        version_extension
      ):
@ -227,11 +242,11 @@ export async function addExtensionLinux(
          ' ' +
          version +
          ' ' +
-          (await utils.getBlackfireVersion(ext_version));
+          extension;
        break;
      // match pre-release versions. For example - xdebug-beta
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        script +=
+        add_script +=
          '\nadd_unstable_extension ' +
          ext_name +
          ' ' +
@ -241,7 +256,7 @@ export async function addExtensionLinux(
        return;
      // match semver versions
      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        script +=
+        add_script +=
          '\nadd_pecl_extension ' +
          ext_name +
          ' ' +
@ -252,7 +267,7 @@ export async function addExtensionLinux(
      // match 5.6gearman..7.4gearman
      case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
        command =
-          'sh ' +
+          '\nbash ' +
          path.join(__dirname, '../src/scripts/ext/gearman.sh') +
          ' ' +
          version +
@ -260,8 +275,8 @@ export async function addExtensionLinux(
        break;
      // match 7.0phalcon3...7.3phalcon3 or 7.2phalcon4...7.4phalcon4
      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        script +=
-          '\nsh ' +
+        add_script +=
+          '\nbash ' +
          path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
          ' ' +
          extension +
@ -270,7 +285,7 @@ export async function addExtensionLinux(
        return;
      // match 7.1xdebug..7.4xdebug
      case /^7\.[1-4]xdebug$/.test(version_extension):
-        script +=
+        add_script +=
          '\nupdate_extension xdebug 2.9.3' +
          pipe +
          '\n' +
@ -278,8 +293,11 @@ export async function addExtensionLinux(
        return;
      // match pdo extensions
      case /.*pdo[_-].*/.test(version_extension):
-        extension = extension.replace('pdo_', '').replace('pdo-', '');
-        script += '\nadd_pdo_extension ' + extension;
+        extension = extension
+          .replace('pdo_', '')
+          .replace('pdo-', '')
+          .replace('sqlite3', 'sqlite');
+        add_script += '\nadd_pdo_extension ' + extension;
        return;
      // match ast and uopz
      case /^(ast|uopz)$/.test(extension):
@ -294,10 +312,10 @@ export async function addExtensionLinux(
        command = command_prefix + version + '-' + extension + pipe;
        break;
    }
-    script +=
+    add_script +=
      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
  });
-  return script;
+  return add_script + remove_script;
 }

 /**
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@ -19,9 +19,15 @@ add_log() {
 # Function to remove extensions
 remove_extension() {
  extension=$1
+  if check_extension "$extension"; then
    sudo sed -i '' "/$extension/d" "$ini_file"
    sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
    sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
+    (! check_extension "$extension" && add_log "$tick" ":$extension" "Removed") ||
+    add_log "$cross" ":$extension" "Could not remove $extension on PHP $semver"
+  else
+    add_log "$tick" ":$extension" "Could not find $extension on PHP $semver"
+  fi
 }

 # Function to test if extension is loaded
@ -59,7 +65,7 @@ add_pecl_extension() {
  if [ "$ext_version" = "$pecl_version" ]; then
    add_log "$tick" "$extension" "Enabled"
  else
-    remove_extension "$extension"
+    remove_extension "$extension" >/dev/null 2>&1
    (
      sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
      check_extension "$extension" &&
@ -108,6 +114,7 @@ add_tool() {
    sudo chmod a+x "$tool_path"
    if [ "$tool" = "composer" ]; then
      composer -q global config process-timeout 0
+      echo "::add-path::/Users/$USER/.composer/vendor/bin"
      if [ -n "$COMPOSER_TOKEN" ]; then
        composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
      fi
@ -135,7 +142,6 @@ add_composertool() {
  prefix=$3
  (
    composer global require "$prefix$release" >/dev/null 2>&1 &&
-    sudo ln -sf "$(composer -q global config home)"/vendor/bin/"$tool" /usr/local/bin/"$tool" &&
    add_log "$tick" "$tool" "Added"
  ) || add_log "$cross" "$tool" "Could not setup $tool"
 }
@ -178,15 +184,14 @@ update_formulae() {
 # Function to setup PHP >=5.6
 setup_php() {
  action=$1
-  if [ "$version" = "8.0" ]; then
-    update_formulae
-  fi
  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
  brew tap shivammathur/homebrew-php
-  if [ "$version" = "5.6" ] || [ "$version" = "7.0" ]; then
-    brew install https://raw.githubusercontent.com/shivammathur/homebrew-php/master/Formula/icu4c.rb --force
-  fi
+  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
    brew "$action" shivammathur/php/php@"$version"
+  fi
  brew link --force --overwrite php@"$version"
 }

@ -197,8 +202,23 @@ version=$1
 nodot_version=${1/./}
 old_versions="5.[3-5]"
 tool_path_dir="/usr/local/bin"
-existing_version=$(php-config --version | cut -c 1-3)
-[[ -z "${update}" ]] && update='false' || update="${update}"
+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}"
+
+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"
+  fi
+fi

 # Setup PHP
 step_log "Setup PHP"
--- a/src/scripts/ext/blackfire.ps1
+++ b/src/scripts/ext/blackfire.ps1
@ -3,19 +3,24 @@ Param (
    [ValidateNotNull()]
    [string]
    $version,
-    [Parameter(Position = 2, Mandatory = $false)]
+    [Parameter(Position = 1, Mandatory = $true)]
    [ValidateNotNull()]
    [string]
-    $extension_version
+    $extension
 )

 $tick = ([char]8730)
 $php_dir = 'C:\tools\php'
-$ext_dir = $php_dir + '\ext'
+if($env:RUNNER -eq 'self-hosted') { $php_dir = "$php_dir$version" }
+$ext_dir = "$php_dir\ext"
 $arch='x64'
 if ($version -lt '7.0') { $arch='x86' }
 $version = $version.replace('.', '')
-
+$extension_version = $extension.split('-')[1]
+if ($extension_version -notmatch "\S") {
+    $ext_data = Invoke-WebRequest https://blackfire.io/docs/up-and-running/update | ForEach-Object { $_.tostring() -split "[`r`n]" | Select-String '<td class="version">' | Select-Object -Index 2 }
+    $extension_version = [regex]::Matches($ext_data, '<td.*?>(.+)</td>') | ForEach-Object { $_.Captures[0].Groups[1].value }
+}
 if (Test-Path $ext_dir\blackfire.dll) {
    Enable-PhpExtension -Extension blackfire -Path $php_dir
    $status="Enabled"
--- a/src/scripts/ext/blackfire.sh
+++ b/src/scripts/ext/blackfire.sh
@ -1,5 +1,9 @@
 version=${1/./}
-extension_version=$2
+extension=${2}
+extension_version=$(echo "$extension" | cut -d '-' -f 2)
+if [ "$extension_version" = "blackfire" ]; then
+  extension_version=$(curl -sSL https://blackfire.io/docs/up-and-running/update | grep 'class="version"' | sed -e 's/<[^>]*>\| //g' | sed -n '3,3p')
+fi
 ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 ini_file="$scan_dir/50-blackfire.ini"
--- a/src/scripts/ext/blackfire_darwin.sh
+++ b/src/scripts/ext/blackfire_darwin.sh
@ -1,5 +1,9 @@
 version=${1/./}
-extension_version=$2
+extension=${2}
+extension_version=$(echo "$extension" | cut -d '-' -f 2)
+if [ "$extension_version" = "blackfire" ]; then
+  extension_version=$(curl -sSL https://blackfire.io/docs/up-and-running/update | grep 'class="version"' | sed -e "s/ //g" | sed -n '3,3p' | cut -d '>' -f 2 | cut -d '<' -f 1)
+fi
 ext_dir=$(php -i | grep -Ei "extension_dir => /usr" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 ini_file="$scan_dir/50-blackfire.ini"
--- a/src/scripts/ext/phalcon.ps1
+++ b/src/scripts/ext/phalcon.ps1
@ -31,7 +31,8 @@ Function Install-Phalcon() {
 $tick = ([char]8730)
 $domain = 'https://github.com'
 $php_dir = 'C:\tools\php'
-$ext_dir = $php_dir + '\ext'
+if($env:RUNNER -eq 'self-hosted') { $php_dir = "$php_dir$version" }
+$ext_dir = "$php_dir\ext"
 $extension_version = $extension.substring($extension.Length - 1)

 if($extension_version -eq '4') {
--- a/src/scripts/ext/phalcon.sh
+++ b/src/scripts/ext/phalcon.sh
@ -22,7 +22,6 @@ update_ppa() {
 install_phalcon() {
  extension=$1
  version=$2
-  (sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "php$version-$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
  (update_ppa && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "php$version-$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
  add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
 }
@ -36,7 +35,7 @@ tick="✓"
 cross="✗"

 if [ "$extension_major_version" = "4" ]; then
-  if [ -e "$ext_dir/psr.so" ]; then
+  if [ -e "$ext_dir/psr.so" ] && ! php -m | grep -i -q -w psr; then
    echo "extension=psr.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
  fi

--- a/src/scripts/ext/phalcon_darwin.sh
+++ b/src/scripts/ext/phalcon_darwin.sh
@ -13,6 +13,7 @@ add_log() {
 # Function to install phalcon
 install_phalcon() {
  (
+    sed -i '' '/extension.*psr/d' "$ini_file"
    brew tap shivammathur/homebrew-phalcon >/dev/null 2>&1
    brew install phalcon@"$php_version"_"$extension_major" >/dev/null 2>&1
    sudo cp /usr/local/opt/psr@"$php_version"/psr.so "$ext_dir" >/dev/null 2>&1
@ -27,14 +28,17 @@ extension=$1
 extension_major=${extension: -1}
 php_version=$2
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
-ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
 if [ -e "$ext_dir/psr.so" ] && [ -e "$ext_dir/phalcon.so" ]; then
-  phalcon_version=$(php -d="extension=psr.so" -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
+  phalcon_version=$(php -d="extension=psr.so" -d="extension=phalcon.so" -r "echo phpversion('phalcon');" 2>/dev/null | cut -d'.' -f 1)
+  if php -m | grep -i -q -w psr; then
+    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" 2>/dev/null | cut -d'.' -f 1)
+  fi
  if [ "$phalcon_version" != "$extension_major" ]; then
    install_phalcon
  else
-    echo "extension=psr.so" >>"$ini_file"
+    if ! php -m | grep -i -q -w psr; then echo "extension=psr.so" >>"$ini_file"; fi
    echo "extension=phalcon.so" >>"$ini_file"
    add_log "$tick" "$extension" "Enabled"
  fi
--- a/src/scripts/ext/xdebug.sh
+++ b/src/scripts/ext/xdebug.sh
@ -1,3 +0,0 @@
-cd ~ && git clone --depth=1 https://github.com/xdebug/xdebug.git
-cd xdebug || echo "Failed to clone Xdebug"
-sudo ./rebuild.sh
--- a/src/scripts/ext/xdebug_darwin.sh
+++ b/src/scripts/ext/xdebug_darwin.sh
@ -1,6 +0,0 @@
-cd ~ && git clone --depth=1 https://github.com/xdebug/xdebug.git
-cd xdebug || echo "Failed to clone Xdebug"
-sudo phpize
-sudo ./configure
-sudo make
-sudo cp modules/xdebug.so "$(php -i | grep "extension_dir => /opt" | sed -e "s|.*=> s*||")"
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@ -24,10 +24,32 @@ update_ppa() {
  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[@]}"
+    fi
+  fi
+}
+
 # Function to configure PECL
 configure_pecl() {
  if [ "$pecl_config" = "false" ] && [ -e /usr/bin/pecl ]; then
-    sudo touch "$scan_dir"/99-pecl.ini >/dev/null 2>&1
+
    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
@ -64,6 +86,7 @@ check_extension() {
 delete_extension() {
  extension=$1
  sudo sed -i "/$extension/d" "$ini_file"
+  sudo sed -i "/$extension/d" "$pecl_file"
  sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
  sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
 }
@ -71,16 +94,22 @@ delete_extension() {
 # Function to disable and delete extensions
 remove_extension() {
  extension=$1
+  if check_extension "$extension"; then
    if [[ ! "$version" =~ $old_versions ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
-    sudo phpdismod -v "$version" "$extension"
+      sudo phpdismod -v "$version" "$extension" >/dev/null 2>&1
    fi
    delete_extension "$extension"
+    (! check_extension "$extension" && add_log "$tick" ":$extension" "Removed") ||
+    add_log "$cross" ":$extension" "Could not remove $extension on PHP $semver"
+  else
+    add_log "$tick" ":$extension" "Could not find $extension on PHP $semver"
+  fi
 }

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

@ -91,10 +120,12 @@ add_pdo_extension() {
    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 && enable_extension "pdo" "extension" >/dev/null 2>&1
+    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1 && echo "extension=pdo.so" >> "$ini_file"
    if [ "$ext" = "mysql" ]; then
      enable_extension "mysqlnd" "extension"
      ext_name="mysqli"
+    elif [ "$ext" = "sqlite" ]; then
+      read -r ext ext_name <<< "sqlite3 sqlite3"
    fi
    add_extension "$ext_name" "$apt_install php$version-$ext" "extension" >/dev/null 2>&1
    enable_extension "$pdo_ext" "extension"
@ -130,7 +161,7 @@ add_pecl_extension() {
  pecl_version=$2
  prefix=$3
  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
-    echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"
+    echo "$prefix=$ext_dir/$extension.so" >>"$pecl_file"
  fi
  ext_version=$(php -r "echo phpversion('$extension');")
  if [ "$ext_version" = "$pecl_version" ]; then
@ -182,6 +213,7 @@ add_tool() {
    sudo chmod a+x "$tool_path"
    if [ "$tool" = "composer" ]; then
      composer -q global config process-timeout 0
+      echo "::add-path::/home/$USER/.composer/vendor/bin"
      if [ -n "$COMPOSER_TOKEN" ]; then
        composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
      fi
@ -207,7 +239,6 @@ add_composertool() {
  prefix=$3
  (
    composer global require "$prefix$release" >/dev/null 2>&1 &&
-    sudo ln -sf "$(composer -q global config home)"/vendor/bin/"$tool" /usr/local/bin/"$tool" &&
    add_log "$tick" "$tool" "Added"
  ) || add_log "$cross" "$tool" "Could not setup $tool"
 }
@ -215,7 +246,7 @@ add_composertool() {
 # Function to setup phpize and php-config
 add_devtools() {
  if ! [ -e "/usr/bin/phpize$version" ] || ! [ -e "/usr/bin/php-config$version" ]; then
-    $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
+    update_ppa && $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
@ -238,14 +269,21 @@ add_blackfire() {

 # Function to setup the nightly build from master branch
 setup_master() {
-  update_ppa && $apt_install libzip-dev
+  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
-  sudo ln -sf -S "$version" "$install_dir"/bin/* /usr/bin/
+  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
 }

@ -313,13 +351,15 @@ old_versions="5.[4-5]"
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
 apt_install="sudo $debconf_fix apt-fast install -y"
 tool_path_dir="/usr/local/bin"
-existing_version=$(php-config --version | cut -c 1-3)
-[[ -z "${update}" ]] && update='false' || update="${update}"
+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}"

 # Setup PHP
 step_log "Setup PHP"
-sudo mkdir -p /var/run /run/php
-
+pre_setup >/dev/null 2>&1
 if [ "$existing_version" != "$version" ]; then
  if [ ! -e "/usr/bin/php$version" ]; then
    if [ "$version" = "8.0" ]; then
@ -328,7 +368,7 @@ if [ "$existing_version" != "$version" ]; then
      setup_old_versions >/dev/null 2>&1
    else
      update_ppa
-      $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml >/dev/null 2>&1
+      $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml php"$version"-intl >/dev/null 2>&1
    fi
    status="Installed"
  else
@ -349,12 +389,17 @@ else
    update_php
  else
    status="Found"
+    if [ "$version" = "8.0" ]; then
+      switch_version
+    fi
  fi
 fi

 semver=$(php_semver)
-ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-sudo chmod 777 "$ini_file" "$tool_path_dir"
+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
+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
@ -20,6 +20,34 @@ Function Add-Log($mark, $subject, $message) {
  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 Add-Path {
+  param(
+    [string]$PathItem
+  )
+  $newPath = (Get-ItemProperty -Path 'hkcu:\Environment' -Name PATH).Path.replace("$PathItem;", '')
+  $newPath = $PathItem + ';' + $newPath
+  Set-ItemProperty -Path 'hkcu:\Environment' -Name Path -Value $newPath
+  Get-PathFromRegistry
+}
+
+Function 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"
+  }
+}
+
 Function Install-PhpManager() {
  $repo = "mlocati/powershell-phpmanager"
  $zip_file = "$php_dir\PhpManager.zip"
@ -29,7 +57,9 @@ Function Install-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
-  Add-Content -Path $PsHome\profile.ps1 -Value "Import-Module $module_path"
+  if($null -eq (Get-Content $current_profile | findstr 'powershell-phpmanager')) {
+    Add-Content -Path $current_profile -Value "Import-Module $module_path"
+  }
 }

 Function Add-Extension {
@ -90,11 +120,18 @@ Function Remove-Extension() {
    $extension
  )
  if(php -m | findstr -i $extension) {
+    try {
      Disable-PhpExtension $extension $php_dir
-  }
      if (Test-Path $ext_dir\php_$extension.dll) {
        Remove-Item $ext_dir\php_$extension.dll
      }
+      Add-Log $tick ":$extension" "Removed"
+    } catch {
+      Add-Log $cross ":$extension" "Could not remove $extension on PHP $($installed.FullVersion)"
+    }
+  } else {
+    Add-Log $tick ":$extension" "Could not find $extension on PHP $($installed.FullVersion)"
+  }
 }

 Function Add-Tool() {
@ -115,7 +152,7 @@ Function Add-Tool() {
  }
  if ($tool -eq "symfony") {
    Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool.exe
-    Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.exe" >$null 2>&1
+    Add-Content -Path $current_profile -Value "New-Alias $tool $php_dir\$tool.exe" >$null 2>&1
  } else {
    try {
      Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool
@ -125,17 +162,16 @@ Function Add-Tool() {
      $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 $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.bat" >$null 2>&1
+      Add-Content -Path $current_profile -Value "New-Alias $tool $php_dir\$tool.bat" >$null 2>&1
    } catch { }
  }
  if($tool -eq "phive") {
-    Add-Extension curl >$null 2>&1
-    Add-Extension mbstring >$null 2>&1
    Add-Extension xml >$null 2>&1
  } elseif($tool -eq "cs2pr") {
    (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
  } elseif($tool -eq "composer") {
    composer -q global config process-timeout 0
+    Write-Output "::add-path::$env:APPDATA\Composer\vendor\bin"
    if (Test-Path env:COMPOSER_TOKEN) {
      composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
    }
@ -169,8 +205,6 @@ Function Add-Composertool() {
  )
  composer -q global require $prefix$release 2>&1 | out-null
  if($?) {
-    $composer_dir = composer -q global config home | ForEach-Object { $_ -replace "/", "\" }
-    Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $composer_dir\vendor\bin\$tool.bat"
    Add-Log $tick $tool "Added"
  } else {
    Add-Log $cross $tool "Could not setup $tool"
@ -182,18 +216,13 @@ Function Add-Pecl() {
 }

 Function Add-Blackfire() {
-  Param (
-    [Parameter(Position = 0, Mandatory = $true)]
-    [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
-    [string]
-    $agent_version
-  )
+  $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
-  7z e $php_dir\blackfire.zip -o"$php_dir" -y >$null 2>&1
-  Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias blackfire $php_dir\blackfire.exe"
-  Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias blackfire-agent $php_dir\blackfire-agent.exe"
+  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"
  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
  }
@ -208,35 +237,59 @@ Function Add-Blackfire() {
 $tick = ([char]8730)
 $cross = ([char]10007)
 $php_dir = 'C:\tools\php'
-$ext_dir = $php_dir + '\ext'
+$ext_dir = "$php_dir\ext"
+$current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $master_version = '8.0'
+
 $arch = 'x64'
-$arch_name='amd64'
-$ts = $false
-if((Test-Path env:PHPTS) -and $env:PHPTS -eq 'ts') {
-  $ts = $true
+$arch_name ='amd64'
+if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
+  $arch = 'x86'
+  $arch_name = '386'
 }

+$ts = $env:PHPTS -eq 'ts'
+if($env:PHPTS -ne 'ts') {
+  $env:PHPTS = 'nts'
+}
+
+if($env:RUNNER -eq 'self-hosted') {
+  $bin_dir = 'C:\tools\bin'
+  $php_dir = "$php_dir$version"
+  $ext_dir = "$php_dir\ext"
+  Get-CleanPSProfile >$null 2>&1
+  New-Item $bin_dir -Type Directory 2>&1 | Out-Null
+  Add-Path -PathItem $bin_dir
+  if(-not(Test-Path $bin_dir\printf.exe)) {
+    Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/printf/releases/latest/download/printf-$arch.zip" -OutFile "$bin_dir\printf.zip" >$null 2>&1
+    Expand-Archive -Path $bin_dir\printf.zip -DestinationPath $bin_dir -Force >$null 2>&1
+  }
+  if($version -lt 5.6) {
+    Add-Log $cross "PHP" "PHP $version is not supported on self-hosted runner"
+    exit 1
+  }
+  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"
+}
 Step-Log "Setup PhpManager"
 Install-PhpManager >$null 2>&1
 Add-Log $tick "PhpManager" "Installed"

+Step-Log "Setup PHP"
 $installed = $null
 if (Test-Path -LiteralPath $php_dir -PathType Container) {
  try {
    $installed = Get-Php -Path $php_dir
-  }
-  catch {
-  }
+  } catch { }
 }
-Step-Log "Setup PHP"
 $status = "Installed"
 if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version -replace '^(\d+(\.\d+)*).*', '$1.'))) -or $ts -ne $installed.ThreadSafe) {
-  if ($version -lt '7.0') {
+  if ($version -lt '7.0' -and (Get-InstalledModule).Name -notcontains 'VcRedist') {
    Install-Module -Name VcRedist -Force
-    $arch='x86'
-    $arch_name='386'
  }
  if ($version -eq $master_version) {
    $version = 'master'
@ -244,7 +297,7 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version

  Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force >$null 2>&1
 } else {
-  if((Test-Path env:update) -and $env:update -eq 'true') {
+  if($env:update -eq 'true') {
    Update-Php $php_dir >$null 2>&1
    $status = "Updated to"
  } else {
@ -255,18 +308,13 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
 $installed = Get-Php -Path $php_dir
 Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
 if($version -lt "5.5") {
-  Add-Extension openssl >$null 2>&1
-  Add-Extension curl >$null 2>&1
+  Enable-PhpExtension -Extension openssl, curl, mbstring -Path $php_dir
 } else {
-  Enable-PhpExtension -Extension openssl, curl, opcache -Path $php_dir
+  Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
 }
 Update-PhpCAInfo -Path $php_dir -Source CurrentUser
 if ($version -eq 'master') {
-  if($installed.ThreadSafe) {
-    Copy-Item $dir"\..\src\bin\php_ts_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
-  } else {
-    Copy-Item $dir"\..\src\bin\php_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
-  }
+  Copy-Item $dir"\..\src\bin\php_$env:PHPTS`_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
  Set-PhpIniKey -Key 'opcache.jit_buffer_size' -Value '256M' -Path $php_dir
  Set-PhpIniKey -Key 'opcache.jit' -Value '1235' -Path $php_dir
 }
--- a/src/tools.ts
+++ b/src/tools.ts
@ -324,10 +324,13 @@ export async function getCleanedToolsList(
  let tools_list: string[] = await utils.CSVArray(tools_csv);
  tools_list = await addComposer(tools_list);
  tools_list = tools_list
-    .map(function(extension: string) {
+    .map(function (extension: string) {
      return extension
        .trim()
-        .replace(/symfony\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
+        .replace(
+          /symfony\/|laravel\/|robmorgan\/|hirak\/|narrowspark\/automatic-/,
+          ''
+        );
    })
    .filter(Boolean);
  return [...new Set(tools_list)];
@ -417,7 +420,7 @@ export async function addTools(
 ): Promise<string> {
  let script = '\n' + (await utils.stepLog('Setup Tools', os_version));
  const tools_list: Array<string> = await getCleanedToolsList(tools_csv);
-  await utils.asyncForEach(tools_list, async function(release: string) {
+  await utils.asyncForEach(tools_list, async function (release: string) {
    const tool_data: {name: string; version: string} = await parseTool(release);
    const tool: string = tool_data.name;
    const version: string = tool_data.version;
@ -435,10 +438,7 @@ export async function addTools(
    switch (tool) {
      case 'blackfire':
      case 'blackfire-agent':
-        script += await getCommand(
-          os_version,
-          'blackfire ' + (await utils.getBlackfireAgentVersion())
-        );
+        script += await getCommand(os_version, 'blackfire');
        break;
      case 'blackfire-player':
        url = await getPharUrl('https://get.blackfire.io', tool, 'v', version);
@ -449,6 +449,10 @@ export async function addTools(
        url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
        script += await addArchive(tool, version, url, os_version);
        break;
+      case 'infection':
+        url = github + 'infection/infection/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
      case 'php-cs-fixer':
        uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
        url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
@ -505,6 +509,9 @@ export async function addTools(
      case 'prestissimo':
        script += await addPackage(tool, release, 'hirak/', os_version);
        break;
+      case 'vapor-cli':
+        script += await addPackage(tool, release, 'laravel/', os_version);
+        break;
      case 'composer-prefetcher':
        script += await addPackage(
          tool,
--- a/src/utils.ts
+++ b/src/utils.ts
@ -186,7 +186,7 @@ export async function extensionArray(
    default:
      return extension_csv
        .split(',')
-        .map(function(extension: string) {
+        .map(function (extension: string) {
          return extension
            .trim()
            .toLowerCase()
@ -211,7 +211,7 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
    default:
      return values_csv
        .split(',')
-        .map(function(value: string) {
+        .map(function (value: string) {
          return value.trim();
        })
        .filter(Boolean);
@ -255,28 +255,3 @@ export async function suppressOutput(os_version: string): Promise<string> {
      );
  }
 }
-
-/**
- * Function to get Blackfire version
- *
- * @param blackfire_version
- */
-export async function getBlackfireVersion(
-  blackfire_version: null | undefined | string
-): Promise<string> {
-  switch (blackfire_version) {
-    case null:
-    case undefined:
-    case '':
-      return '1.31.0';
-    default:
-      return blackfire_version;
-  }
-}
-
-/**
- * Function to get Blackfire Agent version
- */
-export async function getBlackfireAgentVersion(): Promise<string> {
-  return '1.32.0';
-}
Author	SHA1	Message	Date
Shivam Mathur	3bffbad95a	Update libs for PHP 8.0 on self-hosted runners	2020-05-18 23:50:49 +05:30
Shivam Mathur	18041fdab5	Setup libwebp-dev with PHP8 on linux	2020-05-18 22:44:26 +05:30
Shivam Mathur	b36d2222e6	Update PPA before phalcon setup	2020-05-18 17:55:48 +05:30
Shivam Mathur	50ffa593bb	Update PPA in add_devtools in linux.sh	2020-05-18 17:25:38 +05:30
Shivam Mathur	6cbc46fdb6	Fix sqlite logs	2020-05-17 11:37:27 +05:30
Shivam Mathur	08c60fceea	Fix to use correct $php_dir	2020-05-17 04:16:39 +05:30
Shivam Mathur	c30a9630bb	Housekeeping	2020-05-16 11:28:01 +05:30
Shivam Mathur	0158fe2782	Fix enabling pdo extension	2020-05-16 00:04:19 +05:30
Shivam Mathur	3a8557bcc6	Merge pull request #219 from shivammathur/develop 2.2.0	2020-05-13 23:15:10 +05:30
Shivam Mathur	d10d1e249b	Bump version to 2.2.0	2020-05-13 07:12:42 +05:30
Shivam Mathur	3ec1728de8	Update README	2020-05-13 05:39:40 +05:30
Shivam Mathur	9c266d4158	Fix username hardcode in composer PATH	2020-05-12 19:32:10 +05:30
Shivam Mathur	0135ee2ed1	Fix support for phalcon and gearman	2020-05-12 19:32:07 +05:30
Shivam Mathur	5c2618165a	Fetch blackfire latest versions	2020-05-12 19:32:03 +05:30
Shivam Mathur	8123132b99	Add support for removing extensions	2020-05-12 19:32:01 +05:30
Shivam Mathur	f5863fd356	Add support for vapor-cli and infection tools	2020-05-12 19:31:58 +05:30
Shivam Mathur	cf0fdf35f2	Add composer global bin directory to PATH	2020-05-12 19:31:53 +05:30
Shivam Mathur	8830cdd08c	Add support for self-hosted darwin runners	2020-05-12 19:31:50 +05:30
Shivam Mathur	4960e3179f	Add support for self-hosted windows runners	2020-05-12 19:31:39 +05:30
Shivam Mathur	0f3f604249	Add support for self-hosted ubuntu runners	2020-05-10 04:40:21 +05:30
Shivam Mathur	5915f05b06	Suppress php-config error	2020-05-05 15:26:16 +05:30