Merge pull request #235 from shivammathur/develop

2.3.1

.eslintrc.json

@@ -1,7 +1,7 @@
 {
   "env": { "node": true, "jest": true },
   "parser": "@typescript-eslint/parser",
-  "parserOptions": { "ecmaVersion": 2020, "sourceType": "module" },
+  "parserOptions": { "ecmaVersion": 2019, "sourceType": "module" },
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
@@ -12,12 +12,5 @@
     "plugin:prettier/recommended",
     "prettier/@typescript-eslint"
   ],
-  "plugins": ["@typescript-eslint", "jest"],
+  "plugins": ["@typescript-eslint", "jest"]
-  "rules": {
-    "camelcase": "off",
-    "require-atomic-updates": "off",
-    "@typescript-eslint/ban-ts-ignore": "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,8 +1,6 @@
 # These are supported funding model platforms
 
-github: shivammathur
+tidelift: "npm/setup-php"
 community_bridge: setup-php
-issuehunt: shivammathur
 patreon: shivammathur
-liberapay: shivammathur
 custom: https://www.paypal.me/shivammathur

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,23 +1,42 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Nice, you found a bug!
 title: ''
-labels: ''
+labels: 'bug'
-assignees: ''
+assignees: 'shivammathur'
 
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- Please describe the bug concisely. -->
+
+**Version**
+- [ ] I have checked releases and the bug exists in the latest patch version of `v1` or `v2`.
+- [ ] `v2`
+- [ ] `v1`
+
+**Runners**
+<!-- Please mark the GitHub Action runner your workflow uses. -->
+- [ ] GitHub Hosted
+- [ ] Self Hosted
+
+**Operating systems**
+<!-- Please mention the operating systems your workflow uses. -->
+
+**PHP versions**
+<!-- Please mention the PHP versions your workflow uses. -->
 
 **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,26 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest a new feature
 title: ''
-labels: ''
+labels: '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**
+**Version**
-A clear and concise description of what you want to happen.
+- [ ] I have checked releases and the feature is missing in the latest patch version of `v2`.
 
-**Describe alternatives you've considered**
+**Underlying issue**
-A clear and concise description of any alternative solutions or features you've considered.
+<!-- Please describe the issue this would solve. -->
+
+**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. -->

.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

@@ -1,33 +0,0 @@
----
-name: 🐞 Bug Fix
-about: You have a fix for a bug?
-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.
-
-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
-
-### Description
-
-This PR [briefly explain what it does]
-
-> In case this PR introduced TypeScript/JavaScript code changes:
-
-- [ ] I have written test cases for the changes in this pull request.
-- [ ] I have run `npm run format` before the commit.
-- [ ] I have run `npm run lint` before the commit.
-- [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors.
-
-<!--
-- Please target the develop branch when submitting the pull request.
--->

.github/PULL_REQUEST_TEMPLATE/IMPROVEMENT.md

@@ -1,33 +0,0 @@
----
-name: ⚙ Improvement
-about: You have some improvement to make setup-php better?
-labels: enhancement
-
----
-
-## A Pull Request should be associated with an Issue.
-
-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
-> and potentially we'll be able to point development in a particular direction.
-
-Related issue: 
-
-> 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
-
-### Description
-
-This PR [briefly explain what it does]
-
-> In case this PR introduced TypeScript/JavaScript code changes:
-
-- [ ] I have written test cases for the changes in this pull request.
-- [ ] I have run `npm run format` before the commit.
-- [ ] I have run `npm run lint` before the commit.
-- [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors.
-
-<!--
-- Please target the develop branch when submitting the pull request.
--->

.github/PULL_REQUEST_TEMPLATE/NEW_FEATURE.md

@@ -1,33 +0,0 @@
----
-name: 🎉 New Feature
-about: You have implemented some neat idea that you want to make part of 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.
-
-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
-
-### Description
-
-This PR [briefly explain what it does]
-
-> In case this PR introduced TypeScript/JavaScript code changes:
-
-- [ ] I have written test cases for the changes in this pull request.
-- [ ] I have run `npm run format` before the commit.
-- [ ] I have run `npm run lint` before the commit.
-- [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors.
-
-<!--
-- 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.9.x   | :white_check_mark: |
+| 2.3.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

@@ -1,110 +0,0 @@
-name: Experimental workflow
-on:
-  pull_request:
-    branches:
-      - nightly
-      - master
-      - develop
-      - verbose
-    paths-ignore:
-      - '**.md'
-      - 'examples/**'
-  push:
-    branches:
-      - nightly
-      - master
-      - develop
-      - verbose
-    paths-ignore:
-      - '**.md'
-      - 'examples/**'
-jobs:
-  run:
-    name: Run
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['8.0']
-    env:
-      extensions: xml, opcache, xdebug, pcov
-      key: cache-v2
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Node.js 12.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Prettier Format Check
-        run: npm run format-check
-
-      - name: ESLint Check
-        run: npm run lint
-
-      - name: Run tests
-        run: npm test
-
-      - name: Send Coverage
-        continue-on-error: true
-        timeout-minutes: 1
-        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}
-
-      - name: Setup cache environment
-        id: cache-env
-        uses: shivammathur/cache-extensions@develop
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
-
-      - name: Setup PHP with extensions and custom config
-        run: node dist/index.js
-        env:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata
-          coverage: pcov
-
-      - name: Testing PHP version
-        run: |
-          php -v
-          php -r "if(strpos(phpversion(), '${{ matrix.php-versions }}') === false) {throw new Exception('Wrong PHP version Installed');}"
-
-      - name: Testing Composer version
-        run: |
-          composer -V
-          php -r "if(strpos(@exec('composer -V'), 'Composer version') === false) {throw new Exception('Composer not found');}"
-      - name: Testing Extensions
-        run: |
-          php -m
-          php -r "if(! extension_loaded('mbstring')) {throw new Exception('mbstring not found');}"
-          php -r "if(! extension_loaded('pcov')) {throw new Exception('PCOV not found');}"
-      - name: Testing ini values
-        run: |
-          php -r "if(ini_get('post_max_size')!='256M') {throw new Exception('post_max_size not added');}"
-          php -r "if(ini_get('short_open_tag')!=1) {throw new Exception('short_open_tag not added');}"
-          php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}"
-      - name: Test JIT
-        run: |
-          php -r "if(! extension_loaded('Zend OPcache')) {throw new Exception('Zend OPcache not found');}"
-          php -r "if(ini_get('opcache.jit_buffer_size')!='256M') {throw new Exception('opcache.jit_buffer_size not set');}"
-          php -r "if(ini_get('opcache.jit')!=1235) {throw new Exception('opcache.jit not set');}"
-          php -r "if(ini_get('pcre.jit')!=1) {throw new Exception('pcre.jit not set');}"
-      - name: Benchmark JIT
-        run: |
-          curl -o bench.php https://raw.githubusercontent.com/php/php-src/master/Zend/bench.php
-          php bench.php

.github/workflows/node-workflow.yml

@@ -0,0 +1,51 @@
+name: Node workflow
+on:
+  pull_request:
+    branches:
+      - master
+      - develop
+      - verbose
+    paths-ignore:
+      - '**.md'
+      - 'examples/**'
+  push:
+    branches:
+      - master
+      - develop
+      - verbose
+    paths-ignore:
+      - '**.md'
+      - 'examples/**'
+jobs:
+  run:
+    name: Run
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js 12.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Prettier Format Check
+        run: npm run format-check
+
+      - name: ESLint Check
+        run: npm run lint
+
+      - name: Run tests
+        run: npm test
+
+      - name: Send Coverage
+        continue-on-error: true
+        timeout-minutes: 1
+        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}

.github/workflows/workflow.yml

@@ -23,8 +23,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-latest, macos-latest]
-        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
     env:
       extensions: xml, opcache, xdebug, pcov
       key: cache-v2
@@ -32,30 +32,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 12.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Prettier Format Check
-        run: npm run format-check
-
-      - name: ESLint Check
-        run: npm run lint
-
-      - name: Run tests
-        run: npm test
-
-      - name: Send Coverage
-        continue-on-error: true
-        timeout-minutes: 1
-        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}
-
       - name: Setup cache environment
-        id: cache-env
+        id: extcache
         uses: shivammathur/cache-extensions@develop
         with:
           php-version: ${{ matrix.php-versions }}
@@ -63,11 +41,11 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ steps.cache-env.outputs.dir }}
+          path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
+          key: ${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
+          restore-keys: ${{ steps.extcache.outputs.key }}
 
       - name: Setup PHP with extensions and custom config
         run: node dist/index.js

.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

@@ -19,9 +19,11 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 
 - [PHP Support](#tada-php-support)
 - [OS/Platform Support](#cloud-osplatform-support)
+  - [GitHub-Hosted Runners](#github-hosted-runners)
+  - [Self-Hosted Runners](#self-hosted-runners)
 - [PHP Extension Support](#heavy_plus_sign-php-extension-support)
 - [Tools Support](#wrench-tools-support)
-- [Coverage support](#signal_strength-coverage-support)
+- [Coverage Support](#signal_strength-coverage-support)
   - [Xdebug](#xdebug)
   - [PCOV](#pcov)
   - [Disable Coverage](#disable-coverage)
@@ -29,13 +31,16 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
   - [Inputs](#inputs)
   - [Basic Setup](#basic-setup)
   - [Matrix Setup](#matrix-setup)
-  - [Experimental Setup](#experimental-setup)  
+  - [Nightly Build Setup](#nightly-build-setup)
+  - [Self Hosted Setup](#self-hosted-setup)
+  - [Local Testing Setup](#local-testing-setup)
   - [Thread Safe Setup](#thread-safe-setup)
   - [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,31 +51,50 @@ 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-hosted`|
-|5.4|`Stable`|`End of life`|
+|`5.4`|`Stable`|`End of life`|`GitHub-hosted`|
-|5.5|`Stable`|`End of life`|
+|`5.5`|`Stable`|`End of life`|`GitHub-hosted`|
-|5.6|`Stable`|`End of life`|
+|`5.6`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|7.0|`Stable`|`End of life`|
+|`7.0`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|7.1|`Stable`|`End of life`|
+|`7.1`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|7.2|`Stable`|`Security fixes only`|
+|`7.2`|`Stable`|`Security fixes only`|`GitHub-hosted`, `self-hosted`|
-|7.3|`Stable`|`Active`|
+|`7.3`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
-|7.4|`Stable`|`Active`|
+|`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
-|8.0|`Experimental`|`In development`|
+|`8.0`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
 
-**Note:** Specifying `8.0` in `php-version` input installs a nightly build of `PHP 8.0.0-dev` with `PHP JIT`, `Union Types v2` and other [new features](https://wiki.php.net/rfc#php_80 "New features implemented in PHP 8"). See [experimental setup](#experimental-setup) for more information.
+**Note:** Specifying `8.0` in `php-version` input installs a nightly build of `PHP 8.0.0-dev` with `PHP JIT`, `Union Types v2` and other [new features](https://wiki.php.net/rfc#php_80 "New features implemented in PHP 8"). See [nightly build setup](#nightly-build-setup) for more information.
 
 ## :cloud: OS/Platform Support
 
-|Virtual environment|matrix.operating-system|
+Both `GitHub-hosted` runners and `self-hosted` runners are supported on the following operating systems.
+
+### GitHub-Hosted Runners
+
+|Virtual environment|YAML workflow label|Pre-installed PHP|
+|--- |--- |--- |
+|Ubuntu 16.04|`ubuntu-16.04`|`PHP 5.6` to `PHP 7.4`|
+|Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|`PHP 7.1` to `PHP 7.4`|
+|Ubuntu 20.04|`ubuntu-20.04`|`PHP 7.4`|
+|Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 7.4`|
+|macOS Catalina 10.15|`macos-latest` or `macos-10.15`|`PHP 7.4`|
+
+### Self-Hosted Runners
+
+|Host OS/Virtual environment|YAML workflow label|
 |--- |--- |
-|Windows Server 2019|`windows-latest` or `windows-2019`|
+|Ubuntu 16.04|`self-hosted` or `Linux`|
-|Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|
+|Ubuntu 18.04|`self-hosted` or `Linux`|
-|Ubuntu 16.04|`ubuntu-16.04`|
+|Ubuntu 20.04|`self-hosted` or `Linux`|
-|macOS X Catalina 10.15|`macos-latest` or `macOS-10.15`|
+|Windows 7 and newer|`self-hosted` or `Windows`|
+|Windows Server 2012 R2 and newer|`self-hosted` or `Windows`|
+|macOS Catalina 10.15|`self-hosted` or `macOS`|
+
+- Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.
 
 ## :heavy_plus_sign: PHP Extension Support
+
 - 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 +131,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 +148,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`, `phan`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`, `vapor-cli`
 
 ```yaml
 uses: shivammathur/setup-php@v2
@@ -124,29 +157,35 @@ with:
   tools: php-cs-fixer, phpunit
 ```
 
-To setup a particular version of a tool, specify it in this form `tool:version`.  
+To setup a particular version of a tool, specify it in the form `tool:version`.  
-Version should be in semver format and a valid release of the tool.
+Latest stable version of `composer` is setup by default. You can setup the required version by specifying `v1`, `v2`, `snapshot` or `preview` as version.
 
 ```yaml
 uses: shivammathur/setup-php@v2
 with:
   php-version: '7.4'
-  tools: php-cs-fixer:2.15.5, phpunit:8.5.1
+  tools: composer:v2
+```
+
+Version for other tools should be in `semver` format and a valid release of the tool.
+
+```yaml
+uses: shivammathur/setup-php@v2
+with:
+  php-version: '7.4'
+  tools: php-cs-fixer:2.16.2, phpunit:8.5.1
 ```
 
 **Notes**
-- `composer` is setup by default.
+- Both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified.
-- Specifying version for `composer` and `pecl` has no effect, latest versions of both tools which are compatible with the PHP version will be setup.
+- Tools which cannot be setup gracefully leave an error message in the logs, the action is not interrupted.
-- 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.
 
-## :signal_strength: Coverage support
+## :signal_strength: Coverage Support
 
 ### Xdebug
 
 Specify `coverage: xdebug` to use `Xdebug`.  
-Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action") except `8.0`.
+Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action").
 
 ```yaml
 uses: shivammathur/setup-php@v2
@@ -158,8 +197,8 @@ with:
 ### PCOV
 
 Specify `coverage: pcov` to use `PCOV` and disable `Xdebug`.  
-It is much faster than `Xdebug`.  
+`PCOV` supports `PHP 7.1` and newer PHP versions.  
-`PCOV` needs `PHP >= 7.1`.  
+Tests with `PCOV` run much faster than with `Xdebug`.  
 If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  
 
 ```yaml
@@ -199,8 +238,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)
@@ -268,12 +308,12 @@ jobs:
         tools: php-cs-fixer, phpunit
 ```
 
-### Experimental Setup
+### Nightly Build Setup
 
 > Setup a nightly build of `PHP 8.0.0-dev` from the [master branch](https://github.com/php/php-src/tree/master "Master branch on PHP source repository") of PHP.
 
-- This version is currently in development and is an experimental feature on this action.
+- This version is currently in development.
-- `PECL` is installed by default with this version on `ubuntu`.
+- `PECL` is installed by default with this version on `ubuntu` and `macOS`.
 - Some extensions might not support this version currently.
 - Refer to this [RFC](https://wiki.php.net/rfc/jit "PHP JIT RFC configuration") for configuring `PHP JIT` on this version.
 - Refer to this [list of RFCs](https://wiki.php.net/rfc#php_80 "List of RFCs implemented in PHP8") implemented in this version.
@@ -293,11 +333,78 @@ steps:
     tools: php-cs-fixer, phpunit
 ```
 
+### Self Hosted Setup
+
+> Setup PHP on a self-hosted runner.
+
+- To setup a dockerized self-hosted runner, refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Ubuntu) to setup in an `Ubuntu` container and refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Windows) to setup in a `Windows` container.
+- To setup the runner directly on the host OS or in a virtual machine, follow this [requirements guide](https://github.com/shivammathur/setup-php/wiki/Requirements-for-self-hosted-runners "Requirements guide for self-hosted runner to run setup-php") before setting up the self-hosted runner.
+- If your workflow uses [services](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idservices "GitHub Actions Services"), then setup the runner on a Linux host or in a Linux virtual machine. GitHub Actions does not support nested virtualization on Linux, so services will not work in a dockerized container.
+
+Specify the environment variable `runner` with the value `self-hosted`. Without this your workflow will fail.
+
+```yaml
+jobs:
+  run:
+    runs-on: self-hosted
+    strategy:
+      matrix:        
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+    name: PHP ${{ matrix.php-versions }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+      env:
+        runner: self-hosted # Specify the runner.
+```
+
+### Local Testing Setup
+
+> Test your `Ubuntu` workflow locally using [`nektos/act`](https://github.com/nektos/act "Project to test GitHub Actions locally").
+
+```yaml
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    name: PHP 7.4 Test
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: 7.4
+```
+
+Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker image.
+
+```bash
+# For runs-on: ubuntu-latest
+act -P ubuntu-latest=shivammathur/node:latest
+
+# For runs-on: ubuntu-20.04
+act -P ubuntu-20.04=shivammathur/node:focal
+
+# For runs-on: ubuntu-18.04
+act -P ubuntu-18.04=shivammathur/node:bionic
+
+# For runs-on: ubuntu-16.04
+act -P ubuntu-16.04=shivammathur/node:xenial
+```
+
 ### 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 +420,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 +441,8 @@ jobs:
 
 ### Verbose Setup
 
+> Debug your workflow
+
 To debug any issues, you can use the `verbose` tag instead of `v2`.
 
 ```yaml
@@ -343,7 +454,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 }}
@@ -360,7 +471,7 @@ steps:
   uses: actions/checkout@v2
 
 - name: Setup cache environment
-  id: cache-env
+  id: extcache
   uses: shivammathur/cache-extensions@v1
   with:
     php-version: ${{ matrix.php-versions }}
@@ -368,11 +479,11 @@ steps:
     key: ${{ env.key }}
 
 - name: Cache extensions
-  uses: actions/cache@v1
+  uses: actions/cache@v2
   with:
-    path: ${{ steps.cache-env.outputs.dir }}
+    path: ${{ steps.extcache.outputs.dir }}
-    key: ${{ steps.cache-env.outputs.key }}
+    key: ${{ steps.extcache.outputs.key }}
-    restore-keys: ${{ steps.cache-env.outputs.key }}
+    restore-keys: ${{ steps.extcache.outputs.key }}
 
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
@@ -381,7 +492,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
 
@@ -389,13 +500,13 @@ If your project uses composer, you can persist composer's internal cache directo
 
 ```yaml
 - name: Get composer cache directory
-  id: composer-cache
+  id: composercache
   run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
 - name: Cache dependencies
-  uses: actions/cache@v1
+  uses: actions/cache@v2
   with:
-    path: ${{ steps.composer-cache.outputs.dir }}
+    path: ${{ steps.composercache.outputs.dir }}
     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
     restore-keys: ${{ runner.os }}-composer-
 
@@ -417,19 +528,32 @@ If your project has node.js dependencies, you can persist npm's or yarn's cache
 
 ```yaml
 - name: Get node.js cache directory
-  id: node-cache-dir
+  id: nodecache
   run: echo "::set-output name=dir::$(npm config get cache)" # Use $(yarn cache dir) for yarn
 
 - name: Cache dependencies
-  uses: actions/cache@v1
+  uses: actions/cache@v2
   with:
-    path: ${{ steps.node-cache-dir.outputs.dir }}
+    path: ${{ steps.nodecache.outputs.dir }}
     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} # Use '**/yarn.lock' for yarn
     restore-keys: ${{ runner.os }}-node-
 ```
 
 **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
@@ -510,7 +634,7 @@ Contributions are welcome! See [Contributor's Guide](.github/CONTRIBUTING.md "sh
 
 If this action helped you.
 
-- To support this project subscribe on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or sponsor using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal").
+- Sponsor the project by subscribing on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or by contributing using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal").
 - Please star the project and share it with the community.
 - If you blog, write about your experience of using this action.
 - If you need any help using this, please contact me using [Codementor](https://www.codementor.io/shivammathur "Shivam Mathur Codementor")

__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__/coverage.test.ts

@@ -1,15 +1,9 @@
 import * as coverage from '../src/coverage';
 
-jest.mock('../src/extensions', () => ({
-  addExtension: jest.fn().mockImplementation(extension => {
-    return 'add_extension ' + extension + '\n';
-  })
-}));
-
 describe('Config tests', () => {
   it('checking addCoverage with PCOV on windows', async () => {
     let win32: string = await coverage.addCoverage('PCOV', '7.4', 'win32');
-    expect(win32).toContain('add_extension pcov');
+    expect(win32).toContain('Add-Extension pcov');
     expect(win32).toContain('Remove-Extension xdebug');
 
     win32 = await coverage.addCoverage('pcov', '7.0', 'win32');
@@ -33,22 +27,30 @@ describe('Config tests', () => {
 
   it('checking addCoverage with Xdebug on windows', async () => {
     const win32: string = await coverage.addCoverage('xdebug', '7.4', 'win32');
-    expect(win32).toContain('add_extension xdebug');
+    expect(win32).toContain('Add-Extension xdebug');
-  });
-
-  it('checking addCoverage with Xdebug on windows', async () => {
-    const win32: string = await coverage.addCoverage('xdebug', '8.0', 'win32');
-    expect(win32).toContain('Xdebug currently only supports PHP 7.4 or lower');
-  });
-
-  it('checking addCoverage with Xdebug on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug', '7.4', 'linux');
-    expect(linux).toContain('add_extension xdebug');
   });
 
   it('checking addCoverage with Xdebug on linux', async () => {
     const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
-    expect(linux).toContain('Xdebug currently only supports PHP 7.4 or lower');
+    expect(linux).toContain('add_extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug3 on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug3', '7.4', 'linux');
+    expect(linux).toContain('add_extension_from_source xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
+  });
+
+  it('checking addCoverage with Xdebug3 on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug3', '8.0', 'linux');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
+  });
+
+  it('checking addCoverage with Xdebug on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
   });
 
   it('checking addCoverage with Xdebug on darwin', async () => {
@@ -60,15 +62,6 @@ describe('Config tests', () => {
     expect(darwin).toContain('add_extension xdebug');
   });
 
-  it('checking addCoverage with Xdebug on darwin', async () => {
-    const darwin: string = await coverage.addCoverage(
-      'xdebug',
-      '8.0',
-      'darwin'
-    );
-    expect(darwin).toContain('Xdebug currently only supports PHP 7.4 or lower');
-  });
-
   it('checking disableCoverage windows', async () => {
     const win32 = await coverage.addCoverage('none', '7.4', 'win32');
     expect(win32).toContain('Remove-Extension xdebug');

__tests__/extensions.test.ts

@@ -1,19 +1,40 @@
 import * as extensions from '../src/extensions';
 
 describe('Extension tests', () => {
+  it('checking getXdebugVersion', async () => {
+    expect(await extensions.getXdebugVersion('5.3')).toContain('2.2.7');
+    expect(await extensions.getXdebugVersion('5.4')).toContain('2.4.1');
+    expect(await extensions.getXdebugVersion('5.5')).toContain('2.5.5');
+    expect(await extensions.getXdebugVersion('5.6')).toContain('2.9.6');
+  });
   it('checking addExtensionOnWindows', async () => {
     let win32: string = await extensions.addExtension(
-      'xdebug, pcov, 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 +48,29 @@ 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, xdebug3, pcov, sqlite, :intl, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
       '7.4',
       'linux'
     );
-    expect(linux).toContain('update_extension xdebug 2.9.1');
+    expect(linux).toContain('update_extension xdebug 2.9.6');
+    expect(linux).toContain(
+      'add_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension'
+    );
     expect(linux).toContain('sudo $debconf_fix apt-get install -y php7.4-pcov');
+    expect(linux).toContain(
+      'sudo $debconf_fix apt-get install -y php7.4-sqlite3'
+    );
+    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');
@@ -49,6 +79,11 @@ describe('Extension tests', () => {
       'add_unstable_extension xdebug alpha zend_extension'
     );
 
+    linux = await extensions.addExtension('xdebug3', '8.0', 'linux');
+    expect(linux).toContain(
+      'sudo $debconf_fix apt-get install -y php8.0-xdebug'
+    );
+
     linux = await extensions.addExtension('gearman', '7.0', 'linux');
     expect(linux).toContain('gearman.sh 7.0');
     linux = await extensions.addExtension('gearman', '7.1', 'linux');
@@ -71,20 +106,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('add_brew_extension xdebug');
-    expect(darwin).toContain('sudo pecl install -f pcov');
+    expect(darwin).toContain('add_brew_extension pcov');
+    expect(darwin).toContain('sudo pecl install -f sqlite3');
+    expect(darwin).toContain('remove_extension intl');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
     expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
 
@@ -98,7 +135,7 @@ describe('Extension tests', () => {
     expect(darwin).toContain('sudo pecl install -f pcov');
 
     darwin = await extensions.addExtension('pcov', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f pcov');
+    expect(darwin).toContain('add_brew_extension pcov');
 
     darwin = await extensions.addExtension('xdebug', '5.3', 'darwin');
     expect(darwin).toContain('sudo pecl install -f xdebug-2.2.7');
@@ -110,13 +147,13 @@ describe('Extension tests', () => {
     expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
 
     darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
+    expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('xdebug', '7.0', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.9.0');
+    expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug');
+    expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('redis', '5.6', 'darwin');
     expect(darwin).toContain('sudo pecl install -f redis-2.2.8');
@@ -133,10 +170,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__/install.test.ts

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

__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

@@ -219,6 +219,41 @@ describe('Tools tests', () => {
     expect(
       await tools.addComposer(['a', 'b', 'composer:1.2.3'])
     ).toStrictEqual(['composer', 'a', 'b']);
+    expect(
+      await tools.addComposer(['a', 'b', 'composer:snapshot'])
+    ).toStrictEqual(['composer:snapshot', 'a', 'b']);
+    expect(
+      await tools.addComposer(['a', 'b', 'composer:preview'])
+    ).toStrictEqual(['composer:preview', 'a', 'b']);
+    expect(
+      await tools.addComposer(['a', 'b', 'c', 'composer:1'])
+    ).toStrictEqual(['composer:1', 'a', 'b', 'c']);
+    expect(
+      await tools.addComposer(['a', 'b', 'c', 'composer:2'])
+    ).toStrictEqual(['composer:2', 'a', 'b', 'c']);
+    expect(
+      await tools.addComposer(['a', 'b', 'c', 'composer:v1'])
+    ).toStrictEqual(['composer:1', 'a', 'b', 'c']);
+    expect(
+      await tools.addComposer(['a', 'b', 'c', 'composer:v2'])
+    ).toStrictEqual(['composer:2', 'a', 'b', 'c']);
+  });
+
+  it('checking updateComposer', async () => {
+    expect(await tools.updateComposer('latest', 'linux')).toContain('');
+    expect(await tools.updateComposer('stable', 'win32')).toContain('');
+    expect(await tools.updateComposer('snapshot', 'darwin')).toContain(
+      '\ncomposer self-update --snapshot'
+    );
+    expect(await tools.updateComposer('preview', 'linux')).toContain(
+      '\ncomposer self-update --preview'
+    );
+    expect(await tools.updateComposer('1', 'win32')).toContain(
+      '\ncomposer self-update --1'
+    );
+    expect(await tools.updateComposer('2', 'darwin')).toContain(
+      '\ncomposer self-update --2'
+    );
   });
 
   it('checking getSymfonyUri', async () => {
@@ -391,7 +426,7 @@ describe('Tools tests', () => {
   });
   it('checking addTools on darwin', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, flex, 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, phan, phpcs, phpcbf, phpcpd, phpmd, psalm, phinx, vapor-cli, phan:2.7.2, phive:1.2.3, cs2pr:1.2.3, composer-prefetcher:1.2.3, phpize, php-config, symfony, symfony:1.2.3, wp-cli',
       '7.4',
       'darwin'
     );
@@ -405,6 +440,12 @@ 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/phan/phan/releases/latest/download/phan.phar phan'
+    );
     expect(script).toContain(
       'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs'
     );
@@ -420,8 +461,12 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
     );
+    expect(script).toContain('add_composertool vapor-cli vapor-cli laravel/');
     expect(script).toContain('add_composertool flex flex symfony/');
     expect(script).toContain('add_composertool phinx phinx robmorgan/');
+    expect(script).toContain(
+      'add_tool https://github.com/phan/phan/releases/download/2.7.2/phan.phar phan'
+    );
     expect(script).toContain(
       'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
     );
@@ -446,7 +491,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'
     );
@@ -494,4 +539,24 @@ describe('Tools tests', () => {
       'Add-Composertool composer-prefetcher composer-prefetcher narrowspark/automatic-'
     );
   });
+  it('checking composer setup', async () => {
+    let script: string = await tools.addTools(
+      'composer, composer:v1',
+      '7.4',
+      'linux'
+    );
+    expect(script).toContain(
+      'add_tool https://getcomposer.org/composer-stable.phar composer'
+    );
+    expect(script).toContain('composer self-update --1');
+
+    script = await tools.addTools('composer:preview', '7.4', 'linux');
+    expect(script).toContain('composer self-update --preview');
+    script = await tools.addTools(
+      'composer:v1, composer:preview, composer:snapshot',
+      '7.4',
+      'linux'
+    );
+    expect(script).toContain('composer self-update --snapshot');
+  });
 });

__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);
@@ -150,6 +155,7 @@ describe('Utils tests', () => {
     );
     expect(await utils.getExtensionPrefix('xsl')).toEqual('extension');
     expect(await utils.getExtensionPrefix('xdebug')).toEqual('zend_extension');
+    expect(await utils.getExtensionPrefix('xdebug3')).toEqual('zend_extension');
     expect(await utils.getExtensionPrefix('opcache')).toEqual('zend_extension');
   });
 
@@ -161,14 +167,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');
-  });
 });

examples/bedrock.yml

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

examples/cakephp-mysql.yml

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

examples/cakephp-postgres.yml

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

examples/cakephp.yml

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

examples/codeigniter.yml

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

examples/laravel-mysql.yml

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

examples/laravel-postgres.yml

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

examples/laravel.yml

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

examples/lumen-mysql.yml

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

examples/lumen-postgres.yml

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

examples/lumen.yml

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

examples/phalcon-mysql.yml

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

examples/phalcon-postgres.yml

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

examples/sage.yml

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

examples/slim-framework.yml

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

examples/symfony-mysql.yml

@@ -31,19 +31,19 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Run Migration
         run: |
           composer require symfony/orm-pack

examples/symfony-postgres.yml

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

examples/symfony.yml

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

examples/yii2-mysql.yml

@@ -41,18 +41,18 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.dist', '.env');"

examples/yii2-postgres.yml

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

examples/zend-framework.yml

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.1.1",
+  "version": "2.3.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": "^26.0.0",
-    "@types/node": "^13.9.0",
+    "@types/node": "^14.0.13",
-    "@typescript-eslint/eslint-plugin": "^2.22.0",
+    "@typescript-eslint/eslint-plugin": "^3.3.0",
-    "@typescript-eslint/parser": "^2.22.0",
+    "@typescript-eslint/parser": "^3.3.0",
-    "@zeit/ncc": "^0.21.1",
+    "@zeit/ncc": "^0.22.3",
-    "eslint": "^6.8.0",
+    "eslint": "^7.2.0",
-    "eslint-config-prettier": "^6.10.0",
+    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-import": "^2.21.2",
-    "eslint-plugin-jest": "^23.8.2",
+    "eslint-plugin-jest": "^23.13.2",
-    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-prettier": "^3.1.4",
-    "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.1.0",
-    "typescript": "^3.8.3"
+    "typescript": "^3.9.5"
   },
   "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

@@ -9,10 +9,10 @@ export async function addINIValuesUnix(
   ini_values_csv: string
 ): Promise<string> {
   const ini_values: Array<string> = await utils.CSVArray(ini_values_csv);
-  let script = '\n';
+  let script = '';
   await utils.asyncForEach(ini_values, async function (line: string) {
     script +=
-      (await utils.addLog('$tick', line, 'Added to php.ini', 'linux')) + '\n';
+      '\n' + (await utils.addLog('$tick', line, 'Added to php.ini', 'linux'));
   });
   return 'echo "' + ini_values.join('\n') + '" >> $ini_file' + script;
 }
@@ -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/coverage.ts

@@ -5,39 +5,36 @@ import * as config from './config';
 /**
  * Function to setup Xdebug
  *
+ * @param extension
  * @param version
  * @param os_version
  * @param pipe
  */
 export async function addCoverageXdebug(
+  extension: string,
   version: string,
   os_version: string,
   pipe: string
 ): Promise<string> {
-  switch (version) {
+  const xdebug =
-    case '8.0':
+    (await extensions.addExtension(extension, version, os_version, true)) +
-      return (
+    pipe;
-        '\n' +
+  const ini =
-        (await utils.addLog(
+    (await config.addINIValues('xdebug.mode=coverage', os_version, true)) +
-          '$cross',
+    pipe;
-          'xdebug',
+  const log = await utils.addLog(
-          'Xdebug currently only supports PHP 7.4 or lower',
-          os_version
-        ))
-      );
-    case '7.4':
-    default:
-      return (
-        (await extensions.addExtension('xdebug', version, os_version, true)) +
-        pipe +
-        '\n' +
-        (await utils.addLog(
     '$tick',
-          'xdebug',
+    extension,
     'Xdebug enabled as coverage driver',
     os_version
-        ))
   );
+  switch (true) {
+    case /^xdebug3$/.test(extension):
+    case /^8\.0$/.test(version):
+      return '\n' + xdebug + '\n' + ini + '\n' + log;
+    case /^xdebug$/.test(extension):
+    default:
+      return xdebug + '\n' + log;
   }
 }
 
@@ -151,7 +148,11 @@ export async function addCoverage(
     case 'pcov':
       return script + (await addCoveragePCOV(version, os_version, pipe));
     case 'xdebug':
-      return script + (await addCoverageXdebug(version, os_version, pipe));
+    case 'xdebug3':
+      return (
+        script +
+        (await addCoverageXdebug(coverage_driver, version, os_version, pipe))
+      );
     case 'none':
       return script + (await disableCoverage(version, os_version, pipe));
     default:

src/extensions.ts

@@ -1,6 +1,24 @@
 import * as path from 'path';
 import * as utils from './utils';
 
+/**
+ * Function to get Xdebug version compatible with php versions
+ *
+ * @param version
+ */
+export async function getXdebugVersion(version: string): Promise<string> {
+  switch (version) {
+    case '5.3':
+      return '2.2.7';
+    case '5.4':
+      return '2.4.1';
+    case '5.5':
+      return '2.5.5';
+    default:
+      return '2.9.6';
+  }
+}
+
 /**
  * Install and enable extensions for darwin
  *
@@ -14,67 +32,88 @@ 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 = '';
   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;
-      case /5\.3xdebug/.test(version_extension):
+      // match 5.3xdebug...5.5xdebug
-        install_command = 'sudo pecl install -f xdebug-2.2.7' + pipe;
+      case /5\.[3-5]xdebug/.test(version_extension):
+        command =
+          command_prefix + 'xdebug-' + (await getXdebugVersion(version));
         break;
-      case /5\.4xdebug/.test(version_extension):
+      // match 5.6xdebug, 7.0xdebug...7.4xdebug, 8.0xdebug
-        install_command = 'sudo pecl install -f xdebug-2.4.1' + pipe;
+      case /(5\.6|7\.[0-4]|8\.[0-9])xdebug/.test(version_extension):
+        command = 'add_brew_extension xdebug';
         break;
-      case /5\.[5-6]xdebug/.test(version_extension):
+      // match 7.1pcov...7.4pcov, 8.0pcov
-        install_command = 'sudo pecl install -f xdebug-2.5.5' + pipe;
+      case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
-        break;
+        command = 'add_brew_extension pcov';
-      case /7\.0xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f 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';
         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;
+        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 +121,13 @@ export async function addExtensionDarwin(
           version;
         return;
       default:
-        install_command = 'sudo pecl install -f ' + extension + pipe;
+        command = command_prefix + extension;
         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 +135,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 = '';
   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 +213,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 +233,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 = '';
   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 +290,57 @@ 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.2xdebug3..7.4xdebug3
-      case /^7\.[0-4]xdebug$/.test(version_extension):
+      case /^7\.[2-4]xdebug3$/.test(version_extension):
-        script +=
+        add_script +=
-          '\nupdate_extension xdebug 2.9.1' +
+          '\nadd_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension';
+        return;
+      // match 8.0xdebug3
+      case /^8\.[0-9]xdebug3$/.test(version_extension):
+        extension = 'xdebug';
+        command = command_prefix + version + '-' + extension + pipe;
+        break;
+      // match 7.1xdebug..7.4xdebug
+      case /^7\.[1-4]xdebug$/.test(version_extension):
+        add_script +=
+          '\nupdate_extension xdebug 2.9.6' +
           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 +349,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 +371,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

@@ -1,10 +1,10 @@
-# Function to log start of a operation
+# Function to log start of a operation.
 step_log() {
   message=$1
   printf "\n\033[90;1m==> \033[0m\033[37;1m%s\033[0m\n" "$message"
 }
 
-# Function to log result of a operation
+# Function to log result of a operation.
 add_log() {
   mark=$1
   subject=$2
@@ -16,21 +16,48 @@ add_log() {
   fi
 }
 
-# Function to remove extensions
+# Function to read env inputs.
+read_env() {
+  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
+  [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
+  [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
+  [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
+}
+
+# Function to setup environment for self-hosted runners.
+self_hosted_setup() {
+  if [[ $(command -v brew) == "" ]]; then
+      step_log "Setup Brew"
+      curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh | bash -s >/dev/null 2>&1
+      add_log "$tick" "Brew" "Installed Homebrew"
+  fi
+}
+
+# Function to remove extensions.
 remove_extension() {
   extension=$1
+  if check_extension "$extension"; then
     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
+# 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
+# Fuction to get the PECL version.
 get_pecl_version() {
   extension=$1
   stability=$2
@@ -43,7 +70,7 @@ get_pecl_version() {
   echo "$pecl_version"
 }
 
-# Function to install a PECL version
+# Function to install a specific version of PECL extension.
 add_pecl_extension() {
   extension=$1
   pecl_version=$2
@@ -55,7 +82,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" &&
@@ -64,6 +91,16 @@ add_pecl_extension() {
   fi
 }
 
+# Function to install a php extension from shivammathur/extensions tap.
+add_brew_extension() {
+  extension=$1
+  if ! brew tap | grep shivammathur/extensions; then
+    brew tap --shallow shivammathur/extensions
+  fi
+  brew install "$extension@$version"
+  sudo cp "$(brew --prefix)/opt/$extension@$version/$extension.so" "$ext_dir"
+}
+
 # Function to setup extensions
 add_extension() {
   extension=$1
@@ -81,7 +118,7 @@ add_extension() {
   fi
 }
 
-# Function to pre-release extensions using PECL
+# Function to setup pre-release extensions using PECL.
 add_unstable_extension() {
   extension=$1
   stability=$2
@@ -90,7 +127,7 @@ add_unstable_extension() {
   add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }
 
-# Function to setup a remote tool
+# Function to setup a remote tool.
 add_tool() {
   url=$1
   tool=$2
@@ -104,6 +141,17 @@ 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
+      # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
+      if [[ "$version" =~ $old_versions ]]; then
+        composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
+      fi
+    elif [ "$tool" = "phan" ]; then
+      add_extension fileinfo "sudo pecl install -f fileinfo" extension >/dev/null 2>&1
+      add_extension ast "sudo pecl install -f ast" extension >/dev/null 2>&1
     elif [ "$tool" = "phive" ]; then
       add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1
       add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1
@@ -121,25 +169,28 @@ add_tool() {
   fi
 }
 
-# Function to add a tool using composer
+# Function to add a tool using composer.
 add_composertool() {
   tool=$1
   release=$2
   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"
 }
 
 add_blackfire() {
   sudo mkdir -p usr/local/var/run
-  brew tap blackfireio/homebrew-blackfire >/dev/null 2>&1
+  brew tap --shallow blackfireio/homebrew-blackfire >/dev/null 2>&1
   brew install blackfire-agent >/dev/null 2>&1
+  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
     sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
     brew services start blackfire-agent >/dev/null 2>&1
-  sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  fi
+  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
+    sudo blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  fi
   add_log "$tick" "blackfire" "Added"
   add_log "$tick" "blackfire-agent" "Added"
 }
@@ -147,24 +198,38 @@ add_blackfire() {
 # Function to configure PECL
 configure_pecl() {
   for tool in pear pecl; do
-    sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1
+    sudo "$tool" config-set php_ini "$ini_file"
-    sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
+    sudo "$tool" channel-update "$tool".php.net
-    sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
   done
 }
 
-# Function to log PECL, it is installed along with PHP
+# Function to handle request to add PECL.
 add_pecl() {
   add_log "$tick" "PECL" "Added"
 }
 
-# Function to setup PHP >=5.6
+# Function to fetch updated formulae.
+update_formulae() {
+  brew_dir=$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula
+  for formula in httpd pkg-config apr apr-util argon2 aspell autoconf bison curl-openssl freetds freetype gettext glib gmp icu4c jpeg krb5 libffi libpng libpq libsodium libzip oniguruma openldap openssl@1.1 re2c sqlite tidyp unixodbc webp; do
+    sudo curl -o "$brew_dir"/"$formula".rb -sSL https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/"$formula".rb &
+    to_wait+=( $! )
+  done
+  wait "${to_wait[@]}"
+}
+
+# Function to setup PHP 5.6 and newer.
 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 --shallow 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" = "$master_version" ]; then update_formulae; fi
+    brew "$action" shivammathur/php/php@"$version"
+  fi
+  brew link --force --overwrite php@"$version"
 }
 
 # Variables
@@ -172,10 +237,20 @@ tick="✓"
 cross="✗"
 version=$1
 nodot_version=${1/./}
+master_version="8.0"
 old_versions="5.[3-5]"
 tool_path_dir="/usr/local/bin"
-existing_version=$(php-config --version | cut -c 1-3)
+existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
-[[ -z "${update}" ]] && update='false' || update="${update}"
+
+read_env
+if [ "$runner" = "self-hosted" ]; then
+  if [[ "$version" =~ $old_versions ]]; then
+    add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
+    exit 1
+  else
+    self_hosted_setup >/dev/null 2>&1
+  fi
+fi
 
 # Setup PHP
 step_log "Setup PHP"
@@ -183,10 +258,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"
@@ -198,5 +273,5 @@ ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 sudo mkdir -p "$ext_dir"
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
-if [[ ! "$version" =~ $old_versions ]]; then configure_pecl; fi
+if [[ ! "$version" =~ $old_versions ]]; then configure_pecl >/dev/null 2>&1; fi
 add_log "$tick" "PHP" "$status PHP $semver"

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

@@ -1,10 +1,10 @@
-# Function to log start of a operation
+# Function to log start of a operation.
 step_log() {
   message=$1
   printf "\n\033[90;1m==> \033[0m\033[37;1m%s\033[0m\n" "$message"
 }
 
-# Function to log result of a operation
+# Function to log result of a operation.
 add_log() {
   mark=$1
   subject=$2
@@ -16,32 +16,50 @@ add_log() {
   fi
 }
 
-# Function to update php ppa
+# Function to read env inputs.
-update_ppa() {
+read_env() {
-  if [ "$ppa_updated" = "false" ]; then
+  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
-    if [[ "$version" =~ $old_versions ]]; then
+  [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
-      ppa="dotdeb-ubuntu-php*.list"
+  [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
-    else
+  [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
-      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
+# Function to update the package lists.
-    ppa_updated="true"
+update_lists() {
+  if [ "$lists_updated" = "false" ]; then
+    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
+    lists_updated="true"
   fi
 }
 
-# Function to configure PECL
+# Function to setup environment for self-hosted runners.
+self_hosted_setup() {
+  echo "Set disable_coredump false" | sudo tee -a /etc/sudo.conf
+  if ! command -v apt-fast >/dev/null; then
+    sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
+  fi
+  update_lists && $apt_install curl make lsb-release software-properties-common unzip
+  if ! apt-cache policy | grep -q ondrej/php; then
+    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
+    if [ "$(lsb_release -r -s)" = "16.04" ]; then
+      sudo "$debconf_fix" apt-get update
+    fi
+  fi
+}
+
+# Function to configure PECL.
 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
-      sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
+      sudo "$tool" channel-update "$tool".php.net
-      sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
     done
     pecl_config="true"
   fi
 }
 
-# Fuction to get the PECL version
+# Fuction to get the PECL version of an extension.
 get_pecl_version() {
   extension=$1
   stability=$2
@@ -54,46 +72,61 @@ get_pecl_version() {
   echo "$pecl_version"
 }
 
-# Function to test if extension is loaded
+# Function to check if an 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
+# 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
 }
 
-# Function to disable and delete extensions
+# Function to disable and delete extensions.
 remove_extension() {
   extension=$1
+  if check_extension "$extension"; then
     if [[ ! "$version" =~ $old_versions ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
-    sudo phpdismod -v "$version" "$extension"
+      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"
-# Function to enable existing extension
+  else
-enable_extension() {
+    add_log "$tick" ":$extension" "Could not find $extension on PHP $semver"
-  if ! check_extension "$1" && [ -e "$ext_dir/$1.so" ]; then
-    echo "$2=$1.so" >>"$ini_file"
   fi
 }
 
-# Funcion to add PDO extension
+# Function to enable existing extensions.
+enable_extension() {
+  if ! check_extension "$1" && [ -e "$ext_dir/$1.so" ]; then
+    echo "$2=$1.so" >>"$pecl_file"
+  fi
+}
+
+# Funcion to add PDO extension.
 add_pdo_extension() {
   pdo_ext="pdo_$1"
   if check_extension "$pdo_ext"; then
     add_log "$tick" "$pdo_ext" "Enabled"
   else
     read -r ext ext_name <<< "$1 $1"
-    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1 && enable_extension "pdo" "extension" >/dev/null 2>&1
+    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1
+    if ! check_extension "pdo"; then echo "extension=pdo.so" >> "$ini_file"; fi
     if [ "$ext" = "mysql" ]; then
       enable_extension "mysqlnd" "extension"
       ext_name="mysqli"
+    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"
@@ -102,20 +135,20 @@ add_pdo_extension() {
   fi
 }
 
-# Function to setup extensions
+# Function to add extensions.
 add_extension() {
   extension=$1
   install_command=$2
   prefix=$3
-  if [[ "$version" =~ $old_versions ]]; then
-    install_command="update_ppa && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
-  fi
   enable_extension "$extension" "$prefix"
   if check_extension "$extension"; then
     add_log "$tick" "$extension" "Enabled"
   else
+    if [[ "$version" =~ 5.[4-5] ]]; then
+      install_command="update_lists && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
+    fi
     eval "$install_command" >/dev/null 2>&1 ||
-    (update_ppa && eval "$install_command" >/dev/null 2>&1) ||
+    (update_lists && eval "$install_command" >/dev/null 2>&1) ||
     sudo pecl install -f "$extension" >/dev/null 2>&1
     (check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
     add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
@@ -123,13 +156,13 @@ add_extension() {
   sudo chmod 777 "$ini_file"
 }
 
-# Function to install a PECL version
+# Function to install a PECL version.
 add_pecl_extension() {
   extension=$1
   pecl_version=$2
   prefix=$3
   if ! 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
@@ -144,7 +177,7 @@ add_pecl_extension() {
   fi
 }
 
-# Function to pre-release extensions using PECL
+# Function to pre-release extensions using PECL.
 add_unstable_extension() {
   extension=$1
   stability=$2
@@ -153,7 +186,7 @@ add_unstable_extension() {
   add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }
 
-# Function to update extension
+# Function to update extension.
 update_extension() {
   extension=$1
   latest_version=$2
@@ -162,13 +195,34 @@ update_extension() {
   if [ "$final_version" != "$current_version"  ]; then
     version_exists=$(apt-cache policy -- *"$extension" | grep "$final_version")
     if [ -z "$version_exists" ]; then
-      update_ppa
+      update_lists
     fi
     $apt_install php"$version"-"$extension"
   fi
 }
 
-# Function to setup a remote tool
+# Function to install extension from source
+add_extension_from_source() {
+  extension=$1
+  repo=$2
+  release=$3
+  args=$4
+  prefix=$5
+  (
+    add_devtools
+    delete_extension "$extension"
+    curl -o /tmp/"$extension".tar.gz -sSL https://github.com/"$repo"/archive/"$release".tar.gz
+    tar xf /tmp/"$extension".tar.gz -C /tmp
+    cd /tmp/"$extension-$release" || exit 1
+    phpize  && ./configure "$args" && make && sudo make install
+    enable_extension "$extension" "$prefix"
+  ) >/dev/null 2>&1
+  (
+    check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled"
+  ) || add_log "$cross" "$extension" "Could not install $extension-$release on PHP $semver"
+}
+
+# Function to setup a remote tool.
 add_tool() {
   url=$1
   tool=$2
@@ -181,8 +235,19 @@ 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
+      # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
+      if [[ "$version" =~ $old_versions ]]; then
+        composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
+      fi
     elif [ "$tool" = "cs2pr" ]; then
       sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
+    elif [ "$tool" = "phan" ]; then
+      add_extension fileinfo "$apt_install php$version-fileinfo" extension >/dev/null 2>&1
+      add_extension ast "$apt_install php-ast" extension >/dev/null 2>&1
     elif [ "$tool" = "phive" ]; then
       add_extension curl "$apt_install php$version-curl" extension >/dev/null 2>&1
       add_extension mbstring "$apt_install php$version-mbstring" extension >/dev/null 2>&1
@@ -196,104 +261,96 @@ add_tool() {
   fi
 }
 
-# Function to setup a tool using composer
+# Function to setup a tool using composer.
 add_composertool() {
   tool=$1
   release=$2
   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"
 }
 
-# Function to setup phpize and php-config
+# Function to setup phpize and php-config.
 add_devtools() {
   if ! [ -e "/usr/bin/phpize$version" ] || ! [ -e "/usr/bin/php-config$version" ]; then
-    $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
+    update_lists && $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
   fi
   sudo update-alternatives --set php-config /usr/bin/php-config"$version" >/dev/null 2>&1
   sudo update-alternatives --set phpize /usr/bin/phpize"$version" >/dev/null 2>&1
-  configure_pecl
+  configure_pecl >/dev/null 2>&1
 }
 
+# Function to add blackfire and blackfire-agent.
 add_blackfire() {
   sudo mkdir -p /var/run/blackfire
-  sudo curl -o /tmp/blackfire-gpg.key -sSL https://packages.blackfire.io/gpg.key >/dev/null 2>&1
+  sudo curl -sSL https://packages.blackfire.io/gpg.key | sudo apt-key add - >/dev/null 2>&1
-  sudo apt-key add /tmp/blackfire-gpg.key >/dev/null 2>&1
   echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list >/dev/null 2>&1
-  find /etc/apt/sources.list.d -type f -name blackfire.list -exec sudo "$debconf_fix" apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
+  sudo "$debconf_fix" apt-get update >/dev/null 2>&1
   $apt_install blackfire-agent >/dev/null 2>&1
+  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
     sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
     sudo /etc/init.d/blackfire-agent restart >/dev/null 2>&1
-  sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  fi
+  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
+    sudo blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  fi
   add_log "$tick" "blackfire" "Added"
   add_log "$tick" "blackfire-agent" "Added"
 }
 
-# Function to setup the nightly build from master branch
+# Function to setup the nightly build from master branch.
 setup_master() {
-  tar_file=php_"$version"%2Bubuntu"$(lsb_release -r -s)".tar.xz
+  curl -sSL "$github"/php-builder/releases/latest/download/install.sh | bash -s "$runner"
-  install_dir=~/php/"$version"
-  sudo mkdir -m 777 -p ~/php
-  update_ppa && $apt_install libicu-dev >/dev/null 2>&1
-  curl -SLO https://dl.bintray.com/shivammathur/php/"$tar_file" >/dev/null 2>&1
-  sudo tar xf "$tar_file" -C ~/php >/dev/null 2>&1
-  rm -rf "$tar_file"
-  sudo ln -sf -S "$version" "$install_dir"/bin/* /usr/bin/
-  sudo ln -sf "$install_dir"/etc/php.ini /etc/php.ini
 }
 
-# Function to setup PHP 5.3, PHP 5.4 and PHP 5.5
+# Function to setup PHP 5.3, PHP 5.4 and PHP 5.5.
 setup_old_versions() {
-  (
+  curl -sSL "$github"/php5-ubuntu/releases/latest/download/install.sh | bash -s "$version"
-    cd /tmp || exit
-    curl -SLO https://dl.bintray.com/shivammathur/php/php-"$version".tar.xz >/dev/null 2>&1
-    sudo tar xf php-"$version".tar.xz >/dev/null 2>&1
-    cd php-"$version" || exit
-    sudo chmod a+x ./*.sh
-    ./install.sh >/dev/null 2>&1
-    ./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)
 }
 
-# Function to setup PECL
+# Function to add PECL.
 add_pecl() {
-  add_devtools
+  add_devtools >/dev/null 2>&1
   if [ ! -e /usr/bin/pecl ]; then
     $apt_install php-pear >/dev/null 2>&1
   fi
-  configure_pecl
+  configure_pecl >/dev/null 2>&1
   add_log "$tick" "PECL" "Added"
 }
 
-# Function to switch versions of PHP binaries
+# Function to switch versions of PHP binaries.
 switch_version() {
   for tool in pear pecl php phar phar.phar php-cgi php-config phpize phpdbg; do
     if [ -e "/usr/bin/$tool$version" ]; then
-      sudo update-alternatives --set $tool /usr/bin/"$tool$version" >/dev/null 2>&1
+      sudo update-alternatives --set $tool /usr/bin/"$tool$version"
     fi
   done
 }
 
-# Function to get PHP version in semver format
+# Function to get PHP version in semver format.
 php_semver() {
-  if [ ! "$version" = "8.0" ]; then
+  if [ ! "$version" = "$master_version" ]; then
     php"$version" -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-'
   else
     php -v | head -n 1 | cut -f 2 -d ' '
   fi
 }
 
-# Function to update PHP
+# Function to install packaged PHP
+add_packaged_php() {
+  update_lists
+  IFS=' ' read -r -a packages <<< "$(echo "curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
+  $apt_install php"$version" "${packages[@]}"
+}
+
+# Function to update PHP.
 update_php() {
-  update_ppa
   initial_version=$(php_semver)
-  $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml >/dev/null 2>&1
+  add_packaged_php
   updated_version=$(php_semver)
   if [ "$updated_version" != "$initial_version" ]; then
     status="Updated to"
@@ -302,58 +359,74 @@ update_php() {
   fi
 }
 
+# Function to install PHP.
+add_php() {
+  if [ "$version" = "$master_version" ]; then
+    setup_master
+  elif [[ "$version" =~ $old_versions ]]; then
+    setup_old_versions
+  else
+    add_packaged_php
+  fi
+  status="Installed"
+}
+
 # Variables
 tick="✓"
 cross="✗"
-ppa_updated="false"
+lists_updated="false"
 pecl_config="false"
 version=$1
-old_versions="5.[4-5]"
+master_version="8.0"
+old_versions="5.[3-5]"
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
+github="https://github.com/shivammathur"
 apt_install="sudo $debconf_fix apt-fast install -y"
 tool_path_dir="/usr/local/bin"
-existing_version=$(php-config --version | cut -c 1-3)
+existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
-[[ -z "${update}" ]] && update='false' || update="${update}"
+
+read_env
+if [ "$runner" = "self-hosted" ]; then
+  if [[ "$version" =~ $old_versions ]]; then
+    add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
+    exit 1
+  else
+    self_hosted_setup >/dev/null 2>&1
+  fi
+fi
 
 # Setup PHP
 step_log "Setup PHP"
 sudo mkdir -p /var/run /run/php
-
 if [ "$existing_version" != "$version" ]; then
   if [ ! -e "/usr/bin/php$version" ]; then
-    if [ "$version" = "8.0" ]; then
+    add_php >/dev/null 2>&1
-      setup_master
-    elif [[ "$version" =~ $old_versions ]] || [ "$version" = "5.3" ]; then
-      setup_old_versions
-    else
-      update_ppa
-      $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml >/dev/null 2>&1
-    fi
-    status="Installed"
   else
     if [ "$update" = "true" ]; then
-      update_php
+      update_php >/dev/null 2>&1
     else
       status="Switched to"
     fi
   fi
-
+  if ! [[ "$version" =~ $old_versions ]]; then
-  # PHP 5.3 is switched by install script, for rest switch_version
+    switch_version >/dev/null 2>&1
-  if [ "$version" != "5.3" ]; then
-    switch_version
   fi
-
 else
   if [ "$update" = "true" ]; then
-    update_php
+    update_php >/dev/null 2>&1
   else
     status="Found"
+    if [ "$version" = "$master_version" ]; then
+      switch_version >/dev/null 2>&1
+    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
+echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
+sudo chmod 777 "$ini_file" "$pecl_file" "$tool_path_dir"
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/win32.ps1

@@ -11,15 +11,83 @@ param (
   $dir
 )
 
+# Function to log start of a operation.
 Function Step-Log($message) {
   printf "\n\033[90;1m==> \033[0m\033[37;1m%s \033[0m\n" $message
 }
 
+# Function to log result of a operation.
 Function Add-Log($mark, $subject, $message) {
   $code = if ($mark -eq $cross) { "31" } else { "32" }
   printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $code $mark $subject $message
 }
 
+# Function to add a line to a powershell profile safely.
+Function Add-ToProfile {
+  param(
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $input_profile,
+    [Parameter(Position = 1, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $search,
+    [Parameter(Position = 2, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $value
+  )
+  if($null -eq (Get-Content $input_profile | findstr $search)) {
+    Add-Content -Path $input_profile -Value $value
+  }
+}
+
+# Function to fetch PATH from the registry.
+Function Get-PathFromRegistry {
+  $env:Path = [System.Environment]::GetEnvironmentVariable("Path","User") + ";" +
+          [System.Environment]::GetEnvironmentVariable("Path","Machine")
+  Add-ToProfile $current_profile 'Get-PathFromRegistry' 'Function Get-PathFromRegistry { $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "User") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "Machine") }; Get-PathFromRegistry'
+}
+
+# Function to add a location to PATH.
+Function Add-Path {
+  param(
+    [string]$PathItem
+  )
+  $newPath = (Get-ItemProperty -Path 'hkcu:\Environment' -Name PATH).Path.replace("$PathItem;", '')
+  $newPath = $PathItem + ';' + $newPath
+  Set-ItemProperty -Path 'hkcu:\Environment' -Name Path -Value $newPath
+  Get-PathFromRegistry
+}
+
+# Function to get a clean Powershell profile.
+Function Get-CleanPSProfile {
+  if(-not(Test-Path -LiteralPath $profile)) {
+    New-Item -Path $profile -ItemType "file" -Force
+  }
+  Set-Content $current_profile -Value ''
+  Add-ToProfile $profile $current_profile.replace('\', '\\') ". $current_profile"
+}
+
+# Function to install PhpManager.
+Function Install-PhpManager() {
+  $repo = "mlocati/powershell-phpmanager"
+  $tag = (Invoke-RestMethod https://api.github.com/repos/$repo/tags)[0].Name
+  $module_path = "$bin_dir\PhpManager\powershell-phpmanager-$tag\PhpManager"
+  if(-not (Test-Path $module_path\PhpManager.psm1 -PathType Leaf)) {
+    $zip_file = "$bin_dir\PhpManager.zip"
+    Invoke-WebRequest -UseBasicParsing -Uri https://github.com/$repo/archive/$tag.zip -OutFile $zip_file
+    Expand-Archive -Path $zip_file -DestinationPath $bin_dir\PhpManager -Force
+  }
+  Import-Module $module_path
+  Add-ToProfile $current_profile 'powershell-phpmanager' "Import-Module $module_path"
+}
+
+# Function to add PHP extensions.
 Function Add-Extension {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -69,6 +137,7 @@ Function Add-Extension {
   }
 }
 
+# Function to remove PHP extensions.
 Function Remove-Extension() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -78,13 +147,21 @@ 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 to add tools.
 Function Add-Tool() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -98,42 +175,52 @@ Function Add-Tool() {
     [string]
     $tool
   )
-  if (Test-Path $php_dir\$tool) {
+  if (Test-Path $bin_dir\$tool) {
-    Remove-Item $php_dir\$tool
+    Remove-Item $bin_dir\$tool
   }
   if ($tool -eq "symfony") {
-    Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool.exe
+    Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\$tool.exe
-    Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.exe" >$null 2>&1
+    Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.exe" >$null 2>&1
   } else {
     try {
-      Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool
+      Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\$tool
       $bat_content = @()
       $bat_content += "@ECHO off"
       $bat_content += "setlocal DISABLEDELAYEDEXPANSION"
       $bat_content += "SET BIN_TARGET=%~dp0/" + $tool
       $bat_content += "php %BIN_TARGET% %*"
-      Set-Content -Path $php_dir\$tool.bat -Value $bat_content
+      Set-Content -Path $bin_dir\$tool.bat -Value $bat_content
-      Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.bat" >$null 2>&1
+      Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.bat" >$null 2>&1
     } catch { }
   }
-  if($tool -eq "phive") {
+  if($tool -eq "phan") {
-    Add-Extension curl >$null 2>&1
+    Add-Extension fileinfo >$null 2>&1
-    Add-Extension mbstring >$null 2>&1
+    Add-Extension ast >$null 2>&1
+  } elseif($tool -eq "phive") {
     Add-Extension xml >$null 2>&1
   } elseif($tool -eq "cs2pr") {
-    (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
+    (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
   } elseif($tool -eq "composer") {
     composer -q global config process-timeout 0
-  } elseif($tool -eq "wp-cli") {
+    Write-Output "::add-path::$env:APPDATA\Composer\vendor\bin"
-    Copy-Item $php_dir\wp-cli.bat -Destination $php_dir\wp.bat
+    if (Test-Path env:COMPOSER_TOKEN) {
+      composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
     }
-  if (((Get-ChildItem -Path $php_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
+    # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
+    if ($version -lt 5.6) {
+      composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
+    }
+  } elseif($tool -eq "wp-cli") {
+    Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
+  }
+  if (((Get-ChildItem -Path $bin_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
     Add-Log $tick $tool "Added"
   } else {
     Add-Log $cross $tool "Could not add $tool"
   }
 }
 
+# Function to setup a tool using composer.
 Function Add-Composertool() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -154,36 +241,31 @@ 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"
   }
 }
 
+# Function to handle request to add PECL.
 Function Add-Pecl() {
   Add-Log $tick "PECL" "Use extensions input to setup PECL extensions on windows"
 }
 
+# Function to add blackfire and blackfire-agent.
 Function Add-Blackfire() {
-  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
+  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\blackfire.zip >$null 2>&1
-  7z e $php_dir\blackfire.zip -o"$php_dir" -y >$null 2>&1
+  Expand-Archive -Path $bin_dir\blackfire.zip -DestinationPath $bin_dir -Force >$null 2>&1
-  Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias blackfire $php_dir\blackfire.exe"
+  Add-ToProfile $current_profile 'blackfire' "New-Alias blackfire $bin_dir\blackfire.exe"
-  Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias blackfire-agent $php_dir\blackfire-agent.exe"
+  Add-ToProfile $current_profile 'blackfire-agent' "New-Alias blackfire-agent $bin_dir\blackfire-agent.exe"
   if ((Test-Path env:BLACKFIRE_SERVER_ID) -and (Test-Path env:BLACKFIRE_SERVER_TOKEN)) {
     blackfire-agent --register --server-id=$env:BLACKFIRE_SERVER_ID --server-token=$env:BLACKFIRE_SERVER_TOKEN >$null 2>&1
   }
   if ((Test-Path env:BLACKFIRE_CLIENT_ID) -and (Test-Path env:BLACKFIRE_CLIENT_TOKEN)) {
-    blackfire --config --client-id=$env:BLACKFIRE_CLIENT_ID --client-token=$env:BLACKFIRE_CLIENT_TOKEN --ca-cert=$php_dir\ssl\cacert.pem >$null 2>&1
+    blackfire config --client-id=$env:BLACKFIRE_CLIENT_ID --client-token=$env:BLACKFIRE_CLIENT_TOKEN --ca-cert=$php_dir\ssl\cacert.pem >$null 2>&1
   }
   Add-Log $tick "blackfire" "Added"
   Add-Log $tick "blackfire-agent" "Added"
@@ -193,35 +275,69 @@ Function Add-Blackfire() {
 $tick = ([char]8730)
 $cross = ([char]10007)
 $php_dir = 'C:\tools\php'
-$ext_dir = $php_dir + '\ext'
+$ext_dir = "$php_dir\ext"
+$bin_dir = $php_dir
+$current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $master_version = '8.0'
+$cert_source='CurrentUser'
+
 $arch = 'x64'
 $arch_name ='amd64'
-$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"
+  $cert_source='Curl'
+  Get-CleanPSProfile >$null 2>&1
+  New-Item $bin_dir -Type Directory 2>&1 | Out-Null
+  Add-Path -PathItem $bin_dir
+  if(-not(Test-Path $bin_dir\printf.exe)) {
+    Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/printf/releases/latest/download/printf-$arch.zip" -OutFile "$bin_dir\printf.zip" >$null 2>&1
+    Expand-Archive -Path $bin_dir\printf.zip -DestinationPath $bin_dir -Force >$null 2>&1
+  }
+  if($version -lt 5.6) {
+    Add-Log $cross "PHP" "PHP $version is not supported on self-hosted runner"
+    Start-Sleep 1
+    exit 1
+  }
+  if ((Get-InstalledModule).Name -notcontains 'VcRedist') {
+    Install-Module -Name VcRedist -Force
+  }
+  New-Item $php_dir -Type Directory 2>&1 | Out-Null
+  Add-Path -PathItem $php_dir
+  setx PHPROOT $php_dir >$null 2>&1
+} else {
+  $current_profile = "$PSHOME\Profile.ps1"
+  if(-not(Test-Path -LiteralPath $current_profile)) {
+    New-Item -Path $current_profile -ItemType "file" -Force >$null 2>&1
+  }
+}
 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 +345,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 +356,14 @@ 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
+Update-PhpCAInfo -Path $php_dir -Source $cert_source
 if ($version -eq 'master') {
-  if($installed.ThreadSafe) {
+  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_pcov.dll" -OutFile $ext_dir"\php_pcov.dll" >$null 2>&1
-    Copy-Item $dir"\..\src\bin\php_ts_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
+  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_xdebug.dll" -OutFile $ext_dir"\php_xdebug.dll" >$null 2>&1
-  } 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,
@@ -32,8 +33,10 @@ export async function getCommand(
 export async function getToolVersion(version: string): Promise<string> {
   // semver_regex - https://semver.org/
   const semver_regex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+  const composer_regex = /^stable$|^preview$|^snapshot$|^v?[1|2]$/;
   version = version.replace(/[><=^]*/, '');
   switch (true) {
+    case composer_regex.test(version):
     case semver_regex.test(version):
       return version;
     default:
@@ -69,6 +72,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 +172,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 +207,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,22 +299,50 @@ 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($|:.*)/;
+  const regex_any = /^composer($|:.*)/;
-  const composer: string = tools_list.filter(tool => regex.test(tool))[0];
+  const regex_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$)/;
-  switch (composer) {
+  const matches: string[] = tools_list.filter(tool => regex_valid.test(tool));
+  let composer = 'composer';
+  tools_list = tools_list.filter(tool => !regex_any.test(tool));
+  switch (matches[0]) {
     case undefined:
       break;
     default:
-      tools_list = tools_list.filter(tool => !regex.test(tool));
+      composer = matches[matches.length - 1].replace(/v([1-2])/, '$1');
       break;
   }
-  tools_list.unshift('composer');
+  tools_list.unshift(composer);
   return tools_list;
 }
 
+/**
+ * Function to get script to update composer
+ *
+ * @param version
+ * @param os_version
+ */
+export async function updateComposer(
+  version: string,
+  os_version: string
+): Promise<string> {
+  switch (version) {
+    case 'snapshot':
+    case 'preview':
+    case '1':
+    case '2':
+      return (
+        '\ncomposer self-update --' +
+        version +
+        (await utils.suppressOutput(os_version))
+      );
+    default:
+      return '';
+  }
+}
+
 /**
  * Function to get Tools list after cleanup
  *
@@ -323,7 +357,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 +439,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 +468,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 +479,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;
@@ -454,6 +493,10 @@ export async function addTools(
         url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
         script += await addArchive(tool, version, url, os_version);
         break;
+      case 'phan':
+        url = github + 'phan/phan/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
       case 'phive':
         script += await addPhive(version, os_version);
         break;
@@ -470,11 +513,10 @@ export async function addTools(
         script += await addArchive(tool, version, url, os_version);
         break;
       case 'composer':
-        // If RC is released as latest release, switch to getcomposer.
-        // Prefered source is GitHub as it is faster.
-        // url = github + 'composer/composer/releases/latest/download/composer.phar';
         url = 'https://getcomposer.org/composer-stable.phar';
-        script += await addArchive(tool, version, url, os_version);
+        script +=
+          (await addArchive('composer', version, url, os_version)) +
+          (await updateComposer(version, os_version));
         break;
       case 'codeception':
         url =
@@ -500,6 +542,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_', '');
         })
@@ -230,13 +224,17 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
  * @param extension
  */
 export async function getExtensionPrefix(extension: string): Promise<string> {
-  const zend: Array<string> = ['xdebug', 'opcache', 'ioncube', 'eaccelerator'];
+  const zend: Array<string> = [
+    'xdebug',
+    'xdebug3',
+    'opcache',
+    'ioncube',
+    'eaccelerator'
+  ];
   switch (zend.indexOf(extension)) {
-    case 0:
+    default:
-    case 1:
       return 'zend_extension';
     case -1:
-    default:
       return 'extension';
   }
 }
@@ -261,28 +259,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": "ES2019",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */