Bump version to 2.2.1

2.2.0

.eslintrc.json

@@ -17,7 +17,6 @@
     "camelcase": "off",
     "require-atomic-updates": "off",
     "@typescript-eslint/ban-ts-ignore": "off",
-    "@typescript-eslint/camelcase": "off",
+    "@typescript-eslint/camelcase": "off"
-    "@typescript-eslint/no-unused-vars": "off"
   }
 }

.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
 

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: shivammathur
+tidelift: "npm/setup-php"
 community_bridge: setup-php
 issuehunt: shivammathur
 patreon: shivammathur

.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: ''
+labels: t:bug
-assignees: ''
+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**
+**Screenshots/Logs**
-If applicable, add screenshots to help explain your problem.
+<!-- 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. -->

.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: ''
+labels: t:enhancement
-assignees: ''
+assignees: 'shivammathur'
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+**Describe the feature**
-A clear and concise description of what the problem is. Ex. I want to improve [...]
+<!-- Please describe concisely the feature you want to add. -->
 
-**Describe the solution you'd like**
+**Underlying issue**
-A clear and concise description of what you want to happen.
+<!-- Please describe the issue this would solve. -->
 
-**Describe alternatives you've considered**
+**Describe alternatives**
-A clear and concise description of any alternative solutions or features you've considered.
+<!-- 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. -->

.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 fixing a bug, adding a new feature or improving something please provide the details in Issues,
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> so that the development can be pointed in the intended direction.
-> and potentially we'll be able to point development in a particular 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.

.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, please provide the details in Issues,
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> so that the development can be pointed in the intended direction.
-> and potentially we'll be able to point development in a particular 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.

.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 improving a feature please provide the details in Issues,
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> so that the development can be pointed in the intended direction.
-> and potentially we'll be able to point development in a particular 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.

.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 adding a new feature please provide the details in Issues,
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> so that the development can be pointed in the intended direction.
-> and potentially we'll be able to point development in a particular 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.

.github/SECURITY.md

@@ -0,0 +1,30 @@
+# Security Policy
+
+## Supported Versions
+
+The following versions of this project are supported for security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.8.x   | :white_check_mark: |
+| 2.2.x   | :white_check_mark: |
+
+## Supported PHP Versions
+
+This security policy only applies to the latest patches of the following PHP versions.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 7.2     | :white_check_mark: |
+| 7.3     | :white_check_mark: |
+| 7.4     | :white_check_mark: |
+| 8.0     | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+If you have found any issues that might have security implications in the versions supported, please send a report privately to [contact@shivammathur.com](mailto:contact@shivammathur.com)
+Do not report security reports publicly.
+
+## Tidelift
+
+If you use this GitHub Action through a Tidelift subscription, please refer to [https://tidelift.com/security](https://tidelift.com/security).

.github/workflows/experimental-workflow.yml

@@ -28,7 +28,7 @@ jobs:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
         php-versions: ['8.0']
     env:
-      extensions: xml, opcache, xdebug, pcov
+      extensions: xml, opcache, pcov
       key: cache-v2
     steps:
       - name: Checkout

.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,
+    "useTabs": false
-    "arrowParens": "avoid",
-    "parser": "typescript"
 }

README.md

@@ -30,12 +30,15 @@ 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)
   - [Cache Extensions](#cache-extensions)
   - [Cache Composer Dependencies](#cache-composer-dependencies)
   - [Cache Node.js Dependencies](#cache-nodejs-dependencies)
+  - [Composer GitHub OAuth](#composer-github-oauth)
   - [Problem Matchers](#problem-matchers)
   - [Examples](#examples)
 - [License](#scroll-license)
@@ -46,18 +49,18 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 
 ## :tada: PHP Support
 
-|PHP Version|Stability|Release Support|
+|PHP Version|Stability|Release Support|Runner Support|
-|--- |--- |--- |
+|--- |--- |--- |--- |
-|5.3|`Stable`|`End of life`|
+|`5.3`|`Stable`|`End of life`|`GitHub`|
-|5.4|`Stable`|`End of life`|
+|`5.4`|`Stable`|`End of life`|`GitHub`|
-|5.5|`Stable`|`End of life`|
+|`5.5`|`Stable`|`End of life`|`GitHub`|
-|5.6|`Stable`|`End of life`|
+|`5.6`|`Stable`|`End of life`|`GitHub`, `self-hosted`|
-|7.0|`Stable`|`End of life`|
+|`7.0`|`Stable`|`End of life`|`GitHub`, `self-hosted`|
-|7.1|`Stable`|`End of life`|
+|`7.1`|`Stable`|`End of life`|`GitHub`, `self-hosted`|
-|7.2|`Stable`|`Security fixes only`|
+|`7.2`|`Stable`|`Security fixes only`|`GitHub`, `self-hosted`|
-|7.3|`Stable`|`Active`|
+|`7.3`|`Stable`|`Active`|`GitHub`, `self-hosted`|
-|7.4|`Stable`|`Active`|
+|`7.4`|`Stable`|`Active`|`GitHub`, `self-hosted`|
-|8.0|`Experimental`|`In development`|
+|`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.
 
@@ -68,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
@@ -107,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.
 
@@ -115,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
@@ -139,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
 
@@ -199,8 +215,9 @@ with:
 
 #### `extensions` (optional)
 
-- Specify the extensions you want to setup.
+- Specify the extensions you want to add or remove.
-- Accepts a `string` in csv-format. For example `mbstring, zip`.
+- 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)
@@ -293,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 `Ubuntu` and `macOS` only `NTS` versions are supported.
-- On `windows` both `TS` and `NTS` versions are supported.
+- On `Windows` both `TS` and `NTS` versions are supported.
 
 ```yaml
 jobs:
@@ -313,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.
 
@@ -332,6 +416,8 @@ jobs:
 
 ### Verbose Setup
 
+> Debug your workflow
+
 To debug any issues, you can use the `verbose` tag instead of `v2`.
 
 ```yaml
@@ -343,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 }}
@@ -381,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
 
@@ -430,6 +516,19 @@ If your project has node.js dependencies, you can persist npm's or yarn's cache
 
 **Note:** Please do not cache `node_modules` directory as that will have side-effects.
 
+### Composer GitHub OAuth
+
+If you have a number of workflows which setup multiple tools or have many composer dependencies, you might hit the GitHub's rate limit for composer. To avoid that you can add a `OAuth` token to the composer's config by setting `COMPOSER_TOKEN` environment variable. You can use [`GITHUB_TOKEN`](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token "GITHUB_TOKEN documentation") secret for this purpose.
+
+```yaml
+- name: Setup PHP
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+  env:
+    COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+```
+
 ### Problem Matchers
 
 #### PHP

__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(

__tests__/extensions.test.ts

@@ -3,17 +3,32 @@ import * as extensions from '../src/extensions';
 describe('Extension tests', () => {
   it('checking addExtensionOnWindows', async () => {
     let win32: string = await extensions.addExtension(
-      'xdebug, pcov, 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');
     expect(win32).toContain('Add-Extension inotify alpha 1.2.3');
 
+    win32 = await extensions.addExtension('mysql', '7.4', 'win32');
+    expect(win32).toContain('Add-Extension mysqli');
+    expect(win32).toContain('Add-Extension mysqlnd');
+
+    win32 = await extensions.addExtension('mysql', '8.0', 'win32');
+    expect(win32).toContain('Add-Extension mysqli');
+    expect(win32).toContain('Add-Extension mysqlnd');
+
+    win32 = await extensions.addExtension('mysql', '5.5', 'win32');
+    expect(win32).toContain('Add-Extension mysql');
+    expect(win32).toContain('Add-Extension mysqli');
+    expect(win32).toContain('Add-Extension mysqlnd');
+
     win32 = await extensions.addExtension(
       'phalcon3, does_not_exist',
       '7.2',
@@ -27,20 +42,26 @@ 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, 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'
     );
-    expect(linux).toContain('update_extension xdebug 2.9.1');
+    expect(linux).toContain('update_extension xdebug 2.9.3');
     expect(linux).toContain('sudo $debconf_fix apt-get install -y php7.4-pcov');
+    expect(linux).toContain(
+      'sudo $debconf_fix apt-get install -y php7.4-sqlite3'
+    );
+    expect(linux).toContain('remove_extension intl');
+    expect(linux).toContain('sudo $debconf_fix apt-get install -y php-ast');
+    expect(linux).toContain('sudo $debconf_fix apt-get install -y php-uopz');
     expect(linux).toContain('add_unstable_extension ast beta extension');
     expect(linux).toContain('add_pdo_extension mysql');
     expect(linux).toContain('add_pdo_extension odbc');
@@ -71,20 +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, 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');
 
@@ -133,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',

__tests__/matchers.test.ts

@@ -1,16 +1,6 @@
 import * as io from '@actions/io';
-import * as path from 'path';
-import * as fs from 'fs';
 import * as matchers from '../src/matchers';
 
-async function cleanup(path: string): Promise<void> {
-  fs.unlink(path, error => {
-    if (error) {
-      console.log(error);
-    }
-  });
-}
-
 jest.mock('@actions/io');
 
 describe('Matchers', () => {

__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'
     );

__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');
@@ -55,12 +57,12 @@ describe('Utils tests', () => {
       path.join(__dirname, '../src/scripts/win32.ps1'),
       'utf8'
     );
-    expect(await utils.readScript('darwin.sh', '7.4', 'darwin')).toBe(darwin);
+    expect(await utils.readScript('darwin.sh')).toBe(darwin);
-    expect(await utils.readScript('darwin.sh', '7.3', 'darwin')).toBe(darwin);
+    expect(await utils.readScript('darwin.sh')).toBe(darwin);
-    expect(await utils.readScript('linux.sh', '7.4', 'linux')).toBe(linux);
+    expect(await utils.readScript('linux.sh')).toBe(linux);
-    expect(await utils.readScript('linux.sh', '7.3', 'linux')).toBe(linux);
+    expect(await utils.readScript('linux.sh')).toBe(linux);
-    expect(await utils.readScript('win32.ps1', '7.4', 'win32')).toBe(win32);
+    expect(await utils.readScript('win32.ps1')).toBe(win32);
-    expect(await utils.readScript('win32.ps1', '7.3', 'win32')).toBe(win32);
+    expect(await utils.readScript('win32.ps1')).toBe(win32);
   });
 
   it('checking writeScripts', async () => {
@@ -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');
-  });
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "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/core": "^1.2.4",
-    "@actions/exec": "^1.0.3",
+    "@actions/exec": "^1.0.4",
     "@actions/io": "^1.0.2",
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^25.1.4",
+    "@types/jest": "^25.2.2",
-    "@types/node": "^13.9.0",
+    "@types/node": "^14.0.1",
-    "@typescript-eslint/eslint-plugin": "^2.22.0",
+    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.22.0",
+    "@typescript-eslint/parser": "^2.34.0",
-    "@zeit/ncc": "^0.21.1",
+    "@zeit/ncc": "^0.22.2",
-    "eslint": "^6.8.0",
+    "eslint": "^7.0.0",
-    "eslint-config-prettier": "^6.10.0",
+    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jest": "^23.8.2",
+    "eslint-plugin-jest": "^23.13.1",
-    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-prettier": "^3.1.3",
-    "husky": "^4.2.3",
+    "husky": "^4.2.5",
-    "jest": "^25.1.0",
+    "jest": "^26.0.1",
-    "jest-circus": "^25.1.0",
+    "jest-circus": "^26.0.1",
-    "prettier": "^1.19.1",
+    "prettier": "^2.0.5",
-    "ts-jest": "^25.2.1",
+    "ts-jest": "^26.0.0",
-    "typescript": "^3.8.3"
+    "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"
     }
   }
 }

src/config.ts

@@ -32,10 +32,7 @@ export async function addINIValuesWindows(
       (await utils.addLog('$tick', line, 'Added to php.ini', 'win32')) + '\n';
   });
   return (
-    'Add-Content C:\\tools\\php\\php.ini "' +
+    'Add-Content "$php_dir\\php.ini" "' + ini_values.join('\n') + '"' + script
-    ini_values.join('\n') +
-    '"' +
-    script
   );
 }
 
@@ -44,6 +41,7 @@ export async function addINIValuesWindows(
  *
  * @param ini_values_csv
  * @param os_version
+ * @param no_step
  */
 export async function addINIValues(
   ini_values_csv: string,

src/extensions.ts

@@ -14,67 +14,91 @@ export async function addExtensionDarwin(
   pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let script = '\n';
+  let add_script = '\n';
+  let remove_script = '\n';
   await utils.asyncForEach(extensions, async function (extension: string) {
-    extension = extension.toLowerCase();
     const version_extension: string = version + extension;
     const [ext_name, ext_version]: string[] = extension.split('-');
-    const prefix = await utils.getExtensionPrefix(ext_name);
+    const ext_prefix = await utils.getExtensionPrefix(ext_name);
-    let install_command = '';
+    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
       ):
-        install_command =
+        command =
           'bash ' +
           path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
           ' ' +
           version +
           ' ' +
-          (await utils.getBlackfireVersion(ext_version));
+          extension;
         break;
-      // match pre-release versions
+      // match pre-release versions. For example - xdebug-beta
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        script +=
+        add_script +=
           '\nadd_unstable_extension ' +
           ext_name +
           ' ' +
           ext_version +
           ' ' +
-          prefix;
+          ext_prefix;
         return;
-      // match exact versions
+      // match semver
       case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        script +=
+        add_script +=
-          '\nadd_pecl_extension ' + ext_name + ' ' + ext_version + ' ' + prefix;
+          '\nadd_pecl_extension ' +
+          ext_name +
+          ' ' +
+          ext_version +
+          ' ' +
+          ext_prefix;
         return;
+      // match 5.3xdebug
       case /5\.3xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.2.7' + pipe;
+        command = command_prefix + 'xdebug-2.2.7' + pipe;
         break;
+      // match 5.4xdebug
       case /5\.4xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.4.1' + pipe;
+        command = command_prefix + 'xdebug-2.4.1' + pipe;
         break;
+      // match 5.5xdebug and 5.6xdebug
       case /5\.[5-6]xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.5.5' + pipe;
+        command = command_prefix + 'xdebug-2.5.5' + pipe;
         break;
+      // match 7.0redis
       case /7\.0xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.9.0' + pipe;
+        command = command_prefix + 'xdebug-2.9.0' + pipe;
         break;
+      // match 5.6redis
       case /5\.6redis/.test(version_extension):
-        install_command = 'sudo pecl install -f redis-2.2.8' + pipe;
+        command = command_prefix + 'redis-2.2.8' + pipe;
         break;
-      case /[5-9]\.\dimagick/.test(version_extension):
+      // match imagick
-        install_command =
+      case /^imagick$/.test(extension):
+        command =
           'brew install pkg-config imagemagick' +
           pipe +
-          ' && sudo pecl install -f imagick' +
+          ' && ' +
+          command_prefix +
+          'imagick' +
           pipe;
         break;
+      // match sqlite
+      case /^sqlite$/.test(extension):
+        extension = 'sqlite3';
+        command = command_prefix + extension + 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 +=
+        add_script +=
-          'sh ' +
+          '\nbash ' +
           path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
           ' ' +
           extension +
@@ -82,18 +106,13 @@ export async function addExtensionDarwin(
           version;
         return;
       default:
-        install_command = 'sudo pecl install -f ' + extension + pipe;
+        command = command_prefix + extension + pipe;
         break;
     }
-    script +=
+    add_script +=
-      '\nadd_extension ' +
+      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
-      extension +
-      ' "' +
-      install_command +
-      '" ' +
-      (await utils.getExtensionPrefix(extension));
   });
-  return script;
+  return add_script + remove_script;
 }
 
 /**
@@ -101,54 +120,75 @@ export async function addExtensionDarwin(
  *
  * @param extension_csv
  * @param version
- * @param pipe
  */
 export async function addExtensionWindows(
   extension_csv: string,
-  version: string,
+  version: string
-  pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let script = '\n';
+  let add_script = '\n';
+  let remove_script = '\n';
   await utils.asyncForEach(extensions, async function (extension: string) {
-    extension = extension.toLowerCase();
     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
+      // 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 exact versions
+      // 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;
-      case /.*-(\d+\.\d+\.\d)+(beta|alpha|devel|snapshot)\d*/.test(
+      // 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(
+        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):
+        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):
+        add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
+        break;
+      // match sqlite
+      case /^sqlite$/.test(extension):
+        extension = 'sqlite3';
+        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') +
           ' ' +
@@ -158,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;
 }
 
 /**
@@ -178,46 +218,56 @@ export async function addExtensionLinux(
   pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let script = '\n';
+  let add_script = '\n';
+  let remove_script = '\n';
   await utils.asyncForEach(extensions, async function (extension: string) {
-    extension = extension.toLowerCase();
     const version_extension: string = version + extension;
     const [ext_name, ext_version]: string[] = extension.split('-');
-    const prefix = await utils.getExtensionPrefix(ext_name);
+    const ext_prefix = await utils.getExtensionPrefix(ext_name);
-    let install_command = '';
+    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
       ):
-        install_command =
+        command =
           'bash ' +
           path.join(__dirname, '../src/scripts/ext/blackfire.sh') +
           ' ' +
           version +
           ' ' +
-          (await utils.getBlackfireVersion(ext_version));
+          extension;
         break;
-      // match pre-release versions
+      // match pre-release versions. For example - xdebug-beta
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        script +=
+        add_script +=
           '\nadd_unstable_extension ' +
           ext_name +
           ' ' +
           ext_version +
           ' ' +
-          prefix;
+          ext_prefix;
         return;
-      // match exact versions
+      // match semver versions
       case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        script +=
+        add_script +=
-          '\nadd_pecl_extension ' + ext_name + ' ' + ext_version + ' ' + prefix;
+          '\nadd_pecl_extension ' +
+          ext_name +
+          ' ' +
+          ext_version +
+          ' ' +
+          ext_prefix;
         return;
       // match 5.6gearman..7.4gearman
       case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
-        install_command =
+        command =
-          'sh ' +
+          '\nbash ' +
           path.join(__dirname, '../src/scripts/ext/gearman.sh') +
           ' ' +
           version +
@@ -225,41 +275,47 @@ 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 +=
+        add_script +=
-          '\nsh ' +
+          '\nbash ' +
           path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
           ' ' +
           extension +
           ' ' +
           version;
         return;
-      // match 7.0xdebug..7.4xdebug
+      // match 7.1xdebug..7.4xdebug
-      case /^7\.[0-4]xdebug$/.test(version_extension):
+      case /^7\.[1-4]xdebug$/.test(version_extension):
-        script +=
+        add_script +=
-          '\nupdate_extension xdebug 2.9.1' +
+          '\nupdate_extension xdebug 2.9.3' +
           pipe +
           '\n' +
           (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
         return;
       // match pdo extensions
       case /.*pdo[_-].*/.test(version_extension):
-        script +=
+        extension = extension
-          '\nadd_pdo_extension ' +
+          .replace('pdo_', '')
-          extension.replace('pdo_', '').replace('pdo-', '');
+          .replace('pdo-', '')
+          .replace('sqlite3', 'sqlite');
+        add_script += '\nadd_pdo_extension ' + extension;
         return;
+      // match ast and uopz
+      case /^(ast|uopz)$/.test(extension):
+        command = command_prefix + '-' + extension + pipe;
+        break;
+      // match sqlite
+      case /^sqlite$/.test(extension):
+        extension = 'sqlite3';
+        command = command_prefix + version + '-' + extension + pipe;
+        break;
       default:
-        install_command =
+        command = command_prefix + version + '-' + extension + pipe;
-          'sudo $debconf_fix apt-get install -y php' +
-          version +
-          '-' +
-          extension +
-          pipe;
         break;
     }
-    script +=
+    add_script +=
-      '\nadd_extension ' + extension + ' "' + install_command + '" ' + prefix;
+      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
   });
-  return script;
+  return add_script + remove_script;
 }
 
 /**
@@ -268,7 +324,7 @@ export async function addExtensionLinux(
  * @param extension_csv
  * @param version
  * @param os_version
- * @param log_prefix
+ * @param no_step
  */
 export async function addExtension(
   extension_csv: string,
@@ -290,7 +346,7 @@ export async function addExtension(
 
   switch (os_version) {
     case 'win32':
-      return script + (await addExtensionWindows(extension_csv, version, pipe));
+      return script + (await addExtensionWindows(extension_csv, version));
     case 'darwin':
       return script + (await addExtensionDarwin(extension_csv, version, pipe));
     case 'linux':

src/install.ts

@@ -35,7 +35,7 @@ export async function build(
     tools_csv = 'pecl, ' + tools_csv;
   }
 
-  let script: string = await utils.readScript(filename, version, os_version);
+  let script: string = await utils.readScript(filename);
   script += await tools.addTools(tools_csv, version, os_version);
 
   if (extension_csv) {

src/scripts/darwin.sh

@@ -19,15 +19,25 @@ 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
 check_extension() {
   extension=$1
+  if [ "$extension" != "mysql" ]; then
     php -m | grep -i -q -w "$extension"
+  else
+    php -m | grep -i -q "$extension"
+  fi
 }
 
 # Fuction to get the PECL version
@@ -55,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" &&
@@ -104,6 +114,10 @@ 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
     elif [ "$tool" = "phive" ]; then
       add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1
       add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1
@@ -128,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"
 }
@@ -158,13 +171,28 @@ add_pecl() {
   add_log "$tick" "PECL" "Added"
 }
 
+# Function to fetch updated formulas
+update_formulae() {
+  brew_dir=$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula
+  for formula in httpd pkg-config apr apr-util argon2 aspell autoconf bison curl-openssl freetds freetype gettext glib gmp icu4c jpeg krb5 libffi libpng libpq libsodium libzip oniguruma openldap openssl@1.1 re2c sqlite tidyp unixodbc webp; do
+    sudo curl -o "$brew_dir"/"$formula".rb -sSL https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/"$formula".rb &
+    to_wait+=( $! )
+  done
+  wait "${to_wait[@]}"
+}
+
 # Function to setup PHP >=5.6
 setup_php() {
   action=$1
-  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE >/dev/null 2>&1
+  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-  brew tap shivammathur/homebrew-php >/dev/null 2>&1
+  brew tap shivammathur/homebrew-php
-  brew "$action" shivammathur/php/php@"$version" >/dev/null 2>&1
+  if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
-  brew link --force --overwrite php@"$version" >/dev/null 2>&1
+    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"
 }
 
 # Variables
@@ -174,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)
+existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
-[[ -z "${update}" ]] && update='false' || update="${update}"
+[[ -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"
@@ -183,10 +226,10 @@ if [[ "$version" =~ $old_versions ]]; then
   curl -sSL https://github.com/shivammathur/php5-darwin/releases/latest/download/install.sh | bash -s "$nodot_version" >/dev/null 2>&1 &&
   status="Installed"
 elif [ "$existing_version" != "$version" ]; then
-  setup_php "install"
+  setup_php "install" >/dev/null 2>&1
   status="Installed"
 elif [ "$existing_version" = "$version" ] && [ "$update" = "true" ]; then
-  setup_php "upgrade"
+  setup_php "upgrade" >/dev/null 2>&1
   status="Updated to"
 else
   status="Found"

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"

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"

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"

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') {

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
 

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

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

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*||")"

src/scripts/linux.sh

@@ -19,21 +19,39 @@ add_log() {
 # Function to update php ppa
 update_ppa() {
   if [ "$ppa_updated" = "false" ]; then
-    if [[ "$version" =~ $old_versions ]]; then
+    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
-      ppa="dotdeb-ubuntu-php*.list"
-    else
-      ppa="ondrej-ubuntu-php*.list"
-    fi
-    find /etc/apt/sources.list.d -type f -name "$ppa" -exec sudo "$debconf_fix" apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
     ppa_updated="true"
   fi
 }
 
+# Function to setup environment for self-hosted runners
+pre_setup() {
+  sudo mkdir -p /var/run /run/php
+  if [ "$runner" = "self-hosted" ]; then
+    if [[ "$version" =~ $old_versions ]] || [ "$version" = "5.3" ]; then
+      add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
+      exit 1
+    fi
+    if ! command -v apt-fast >/dev/null; then
+      sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
+    fi
+    update_ppa && $apt_install curl make lsb-release software-properties-common unzip
+    if ! apt-cache policy | grep -q ondrej/php; then
+      LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y && update_ppa
+    fi
+    if [ "$version" = "8.0" ]; then
+      IFS=' ' read -r -a libs <<< "$(echo "aspell curl4-gnutls enchant freetype6 icu jpeg png tidy webp xpm zip" | sed "s/[^ ]*/lib&-dev/g")"
+      $apt_install "${libs[@]}"
+    fi
+  fi
+}
+
 # Function to configure PECL
 configure_pecl() {
   if [ "$pecl_config" = "false" ] && [ -e /usr/bin/pecl ]; then
+
     for tool in pear pecl; do
-      sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1
+      sudo "$tool" config-set php_ini "$scan_dir"/99-pecl.ini >/dev/null 2>&1
       sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
       sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
     done
@@ -56,13 +74,19 @@ get_pecl_version() {
 
 # Function to test if extension is loaded
 check_extension() {
-  php -m | grep -i -q -w "$1"
+  extension=$1
+  if [ "$extension" != "mysql" ]; then
+    php -m | grep -i -q -w "$extension"
+  else
+    php -m | grep -i -q "$extension"
+  fi
 }
 
 # Function to delete extensions
 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
 }
@@ -70,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
 }
 
@@ -90,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"
@@ -129,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
@@ -181,6 +213,10 @@ 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
     elif [ "$tool" = "cs2pr" ]; then
       sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
     elif [ "$tool" = "phive" ]; then
@@ -203,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"
 }
@@ -211,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
@@ -234,29 +269,33 @@ add_blackfire() {
 
 # Function to setup the nightly build from master branch
 setup_master() {
+  update_ppa && $apt_install libzip-dev libwebp-dev
   tar_file=php_"$version"%2Bubuntu"$(lsb_release -r -s)".tar.xz
   install_dir=~/php/"$version"
+  bintray_url=https://dl.bintray.com/shivammathur/php/"$tar_file"
   sudo mkdir -m 777 -p ~/php
-  update_ppa && $apt_install libicu-dev >/dev/null 2>&1
+  if [ ! "$(whoami)" = "runner" ]; then
-  curl -SLO https://dl.bintray.com/shivammathur/php/"$tar_file" >/dev/null 2>&1
+    sudo rm -rf /home/runner && sudo ln -sf ~/ /home/runner;
-  sudo tar xf "$tar_file" -C ~/php >/dev/null 2>&1
+  fi
-  rm -rf "$tar_file"
+  curl -o /tmp/"$tar_file" -sSL "$bintray_url"
-  sudo ln -sf -S "$version" "$install_dir"/bin/* /usr/bin/
+  sudo tar xf /tmp/"$tar_file" -C ~/php
+  for tool_path in "$install_dir"/bin/*; do
+    tool=$(basename "$tool_path")
+    sudo cp "$tool_path" /usr/bin/"$tool$version"
+    sudo update-alternatives --install /usr/bin/"$tool" "$tool" /usr/bin/"$tool$version" 50
+  done
   sudo ln -sf "$install_dir"/etc/php.ini /etc/php.ini
 }
 
 # Function to setup PHP 5.3, PHP 5.4 and PHP 5.5
 setup_old_versions() {
-  (
+  dir=php-"$version"
-    cd /tmp || exit
+  tar_file="$dir".tar.xz
-    curl -SLO https://dl.bintray.com/shivammathur/php/php-"$version".tar.xz >/dev/null 2>&1
+  bintray_url=https://dl.bintray.com/shivammathur/php/"$tar_file"
-    sudo tar xf php-"$version".tar.xz >/dev/null 2>&1
+  curl -o /tmp/"$tar_file" -sSL "$bintray_url"
-    cd php-"$version" || exit
+  sudo tar xf /tmp/"$tar_file" -C /tmp
-    sudo chmod a+x ./*.sh
+  sudo chmod a+x /tmp/"$dir"/*.sh
-    ./install.sh >/dev/null 2>&1
+  (cd /tmp/"$dir" && ./install.sh && ./post-install.sh)
-    ./post-install.sh >/dev/null 2>&1
-  )
-  sudo rm -rf /tmp/php-"$version"
   configure_pecl
   release_version=$(php -v | head -n 1 | cut -d' ' -f 2)
 }
@@ -312,22 +351,24 @@ 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)
+existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
-[[ -z "${update}" ]] && update='false' || update="${update}"
+[[ -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
-      setup_master
+      setup_master >/dev/null 2>&1
     elif [[ "$version" =~ $old_versions ]] || [ "$version" = "5.3" ]; then
-      setup_old_versions
+      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
@@ -348,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"

src/scripts/win32.ps1

@@ -20,6 +20,48 @@ 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"
+  $tags = Invoke-WebRequest https://api.github.com/repos/$repo/tags | ConvertFrom-Json
+  $tag = $tags[0].Name
+  $module_path = "$php_dir\PhpManager\powershell-phpmanager-$tag\PhpManager"
+  Invoke-WebRequest -UseBasicParsing -Uri https://github.com/$repo/archive/$tag.zip -OutFile $zip_file
+  Expand-Archive -Path $zip_file -DestinationPath $php_dir\PhpManager
+  Import-Module $module_path
+  if($null -eq (Get-Content $current_profile | findstr 'powershell-phpmanager')) {
+    Add-Content -Path $current_profile -Value "Import-Module $module_path"
+  }
+}
+
 Function Add-Extension {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -78,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() {
@@ -103,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
@@ -113,17 +162,19 @@ 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
+    }
   } elseif($tool -eq "wp-cli") {
     Copy-Item $php_dir\wp-cli.bat -Destination $php_dir\wp.bat
   }
@@ -154,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"
@@ -167,18 +216,13 @@ Function Add-Pecl() {
 }
 
 Function Add-Blackfire() {
-  Param (
+  $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 }
-    [Parameter(Position = 0, Mandatory = $true)]
+  $agent_version = [regex]::Matches($agent_data, '<td.*?>(.+)</td>') | ForEach-Object {$_.Captures[0].Groups[1].value }
-    [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
-    [string]
-    $agent_version
-  )
   $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
+  Expand-Archive -Path $php_dir\blackfire.zip -DestinationPath $php_dir -Force >$null 2>&1
-  Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias blackfire $php_dir\blackfire.exe"
+  Add-Content -Path $current_profile -Value "New-Alias blackfire $php_dir\blackfire.exe"
-  Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias blackfire-agent $php_dir\blackfire-agent.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
   }
@@ -193,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(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
-if((Test-Path env:PHPTS) -and $env:PHPTS -eq 'ts') {
+  $arch = 'x86'
-  $ts = $true
+  $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-Module -Name PhpManager -Force -Scope CurrentUser
+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'
@@ -229,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 {
@@ -240,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
+  Enable-PhpExtension -Extension openssl, curl, mbstring -Path $php_dir
-  Add-Extension curl >$null 2>&1
 } 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_$env:PHPTS`_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
-    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"
-  }
   Set-PhpIniKey -Key 'opcache.jit_buffer_size' -Value '256M' -Path $php_dir
   Set-PhpIniKey -Key 'opcache.jit' -Value '1235' -Path $php_dir
 }

src/tools.ts

@@ -4,6 +4,7 @@ import * as utils from './utils';
  * Function to get command to setup tools
  *
  * @param os_version
+ * @param suffix
  */
 export async function getCommand(
   os_version: string,
@@ -69,6 +70,8 @@ export async function parseTool(
 /**
  * Function to get the url of tool with the given version
  *
+ * @param tool
+ * @param extension
  * @param version
  * @param prefix
  * @param version_prefix
@@ -167,16 +170,14 @@ export async function getCodeceptionUri(
     case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
       return codecept;
     default:
-      return await codecept;
+      return codecept;
   }
 }
 
 /**
  * Helper function to get script to setup phive
  *
- * @param tool
  * @param version
- * @param url
  * @param os_version
  */
 export async function addPhive(
@@ -204,6 +205,9 @@ export async function addPhive(
 /**
  * Function to get the phar url in domain/tool-version.phar format
  *
+ * @param domain
+ * @param tool
+ * @param prefix
  * @param version
  */
 export async function getPharUrl(
@@ -293,7 +297,7 @@ export async function getWpCliUrl(version: string): Promise<string> {
 /**
  * Function to add/move composer in the tools list
  *
- * @param tools
+ * @param tools_list
  */
 export async function addComposer(tools_list: string[]): Promise<string[]> {
   const regex = /^composer($|:.*)/;
@@ -323,7 +327,10 @@ export async function getCleanedToolsList(
     .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)];
@@ -402,7 +409,8 @@ export async function addPackage(
 /**
  * Setup tools
  *
- * @param tool_csv
+ * @param tools_csv
+ * @param php_version
  * @param os_version
  */
 export async function addTools(
@@ -430,10 +438,7 @@ export async function addTools(
     switch (tool) {
       case 'blackfire':
       case 'blackfire-agent':
-        script += await getCommand(
+        script += await getCommand(os_version, 'blackfire');
-          os_version,
-          'blackfire ' + (await utils.getBlackfireAgentVersion())
-        );
         break;
       case 'blackfire-player':
         url = await getPharUrl('https://get.blackfire.io', tool, 'v', version);
@@ -444,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;
@@ -500,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,

src/utils.ts

@@ -65,7 +65,6 @@ export async function color(type: string): Promise<string> {
  * @param message
  * @param os_version
  * @param log_type
- * @param prefix
  */
 export async function log(
   message: string,
@@ -121,6 +120,7 @@ export async function stepLog(
  * @param mark
  * @param subject
  * @param message
+ * @param os_version
  */
 export async function addLog(
   mark: string,
@@ -147,14 +147,8 @@ export async function addLog(
  * Read the scripts
  *
  * @param filename
- * @param version
- * @param os_version
  */
-export async function readScript(
+export async function readScript(filename: string): Promise<string> {
-  filename: string,
-  version: string,
-  os_version: string
-): Promise<string> {
   return fs.readFileSync(
     path.join(__dirname, '../src/scripts/' + filename),
     'utf8'
@@ -165,7 +159,6 @@ export async function readScript(
  * Write final script which runs
  *
  * @param filename
- * @param version
  * @param script
  */
 export async function writeScript(
@@ -196,6 +189,7 @@ export async function extensionArray(
         .map(function (extension: string) {
           return extension
             .trim()
+            .toLowerCase()
             .replace('php-', '')
             .replace('php_', '');
         })
@@ -261,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';
-}

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "ES2020",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */