Update all lists

Merge pull request #203 from shivammathur/develop
2.1.3
2025-07-03 21:53:17 +07:00 · 2020-03-20 19:09:27 +05:30 · 2020-03-18 16:26:15 +05:30 · 2020-03-18 16:26:11 +05:30 · 2020-03-18 16:26:01 +05:30 · 2020-03-18 13:09:15 +05:30
35 changed files with 1932 additions and 1633 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -17,7 +17,6 @@
    "camelcase": "off",
    "require-atomic-updates": "off",
    "@typescript-eslint/ban-ts-ignore": "off",
-    "@typescript-eslint/camelcase": "off",
-    "@typescript-eslint/no-unused-vars": "off"
+    "@typescript-eslint/camelcase": "off"
  }
 }
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,6 +1,6 @@
 # These are supported funding model platforms

-github: shivammathur
+tidelift: "npm/setup-php"
 community_bridge: setup-php
 issuehunt: shivammathur
 patreon: shivammathur
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@ -0,0 +1,30 @@
+# Security Policy
+
+## Supported Versions
+
+The following versions of this project are supported for security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.8.x   | :white_check_mark: |
+| 2.1.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).
--- a/.github/workflows/experimental-workflow.yml
+++ b/.github/workflows/experimental-workflow.yml
@ -29,7 +29,7 @@ jobs:
        php-versions: ['8.0']
    env:
      extensions: xml, opcache, xdebug, pcov
-      key: cache-v1
+      key: cache-v2
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@ -58,7 +58,7 @@ jobs:

      - name: Setup cache environment
        id: cache-env
-        uses: shivammathur/cache-extensions@v1
+        uses: shivammathur/cache-extensions@develop
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: ${{ env.extensions }}
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@ -27,7 +27,7 @@ jobs:
        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
    env:
      extensions: xml, opcache, xdebug, pcov
-      key: cache-v1
+      key: cache-v2
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@ -56,7 +56,7 @@ jobs:

      - name: Setup cache environment
        id: cache-env
-        uses: shivammathur/cache-extensions@v1
+        uses: shivammathur/cache-extensions@develop
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: ${{ env.extensions }}
--- a/README.md
+++ b/README.md
@ -35,6 +35,7 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
  - [Verbose Setup](#verbose-setup)
  - [Cache Extensions](#cache-extensions)
  - [Cache Composer Dependencies](#cache-composer-dependencies)
+  - [Cache Node.js Dependencies](#cache-nodejs-dependencies)
  - [Problem Matchers](#problem-matchers)
  - [Examples](#examples)
 - [License](#scroll-license)
@ -67,10 +68,10 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 |Windows Server 2019|`windows-latest` or `windows-2019`|
 |Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|
 |Ubuntu 16.04|`ubuntu-16.04`|
-|macOS X Catalina 10.15|`macos-latest` or `macOS-10.15`|
+|macOS X Catalina 10.15|`macos-latest` or `macos-10.15`|

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

 ```yaml
 uses: shivammathur/setup-php@v2
@ -80,23 +81,23 @@ with:
  extensions: swoole
 ```

- On `windows` extensions which have `windows` binary on `PECL` can be installed.
+- On `windows` PECL extensions which have the `DLL` binary can be installed.

- On `macOS` extensions which are on `PECL` can be installed.
+- On `macOS` PECL extensions can be installed.

- Extensions which are installed along with PHP if specified are enabled.
+- Extensions installed along with PHP if specified are enabled.

- Specific versions of PECL extensions can be installed by suffixing the extension with the version. This is useful for installing old versions of extensions which support end of life PHP versions.
+- Specific versions of PECL extensions can be installed by suffixing the version. This is useful for installing old versions of extensions which support end of life PHP versions.

 ```yaml
 uses: shivammathur/setup-php@v2
 with:
-  php-version: '7.4'
+  php-version: '5.4'
  tools: pecl
-  extensions: pcov-1.0.6
+  extensions: swoole-1.9.3
 ```

- Pre-release versions of PECL extensions can be installed by suffixing the extension with its state i.e `alpha`, `beta`, `devel` or `snapshot`.
+- Pre-release versions of PECL extensions can be setup by suffixing the extension with its state i.e `alpha`, `beta`, `devel` or `snapshot`.

 ```yaml
 uses: shivammathur/setup-php@v2
@ -106,13 +107,15 @@ with:
  extensions: xdebug-beta
 ```

- Extensions which cannot be installed gracefully leave an error message in the logs, the action is not interrupted.
+- Extensions which cannot be setup 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.

 ## :wrench: Tools Support

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

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

 ```yaml
 uses: shivammathur/setup-php@v2
@ -121,7 +124,7 @@ with:
  tools: php-cs-fixer, phpunit
 ```

-To setup a particular version of a tool, specify it in the form `tool:version`.  
+To setup a particular version of a tool, specify it in this form `tool:version`.  
 Version should be in semver format and a valid release of the tool.

 ```yaml
@ -131,9 +134,10 @@ with:
  tools: php-cs-fixer:2.15.5, phpunit:8.5.1
 ``` 

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

@ -174,6 +178,7 @@ Consider disabling the coverage using this PHP action for these reasons.
 - You are not generating coverage reports while testing.
 - It will remove `Xdebug`, which will have a positive impact on PHP performance.
 - You are using `phpdbg` for running your tests.
+- You are profiling your code using `blackfire`.

 ```yaml
 uses: shivammathur/setup-php@v2
@ -291,7 +296,7 @@ steps:
 ### Thread Safe Setup

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

 ```yaml
@ -313,7 +318,7 @@ jobs:

 ### Force Update

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

 ```yaml
@ -327,7 +332,7 @@ jobs:

 ### Verbose Setup

- To debug any issues, you can use the `verbose` tag instead of `v2`.
+To debug any issues, you can use the `verbose` tag instead of `v2`.

 ```yaml
 - name: Setup PHP
@ -338,7 +343,7 @@ jobs:

 ### Cache Extensions

-You can persist PHP extensions you setup using the [`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 if cached are available in the next workflow run and enabled directly which reduces the workflow execution time.

 ```yaml
 runs-on: ${{ matrix.operating-system }}
@ -376,14 +381,14 @@ 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.
+
 ### Cache Composer Dependencies

-You can persist composer's internal cache directory using the [`action/cache`](https://github.com/actions/cache "GitHub Action to cache files") GitHub Action. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.
-
-**Note:** Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
+If your project uses composer, you can persist composer's internal cache directory. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.

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

@ -394,15 +399,36 @@ You can persist composer's internal cache directory using the [`action/cache`](h
    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
    restore-keys: ${{ runner.os }}-composer-

- name: Install Dependencies
+- name: Install dependencies
  run: composer install --prefer-dist
 ```

-In the above example, if you support a range of `composer` dependencies and do not commit `composer.lock`, you can use the hash of `composer.json` as the key for your cache.
+**Notes**
+- Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
+- In the above example, if you support a range of `composer` dependencies and do not commit `composer.lock`, you can use the hash of `composer.json` as the key for your cache.

 ```yaml
-key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} 
-``` 
+key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+```
+
+### Cache Node.js Dependencies
+
+If your project has node.js dependencies, you can persist npm's or yarn's cache directory. The cached files are available across check-runs and will reduce the workflow execution time.
+
+```yaml
+- name: Get node.js cache directory
+  id: node-cache-dir
+  run: echo "::set-output name=dir::$(npm config get cache)" # Use $(yarn cache dir) for yarn
+
+- name: Cache dependencies
+  uses: actions/cache@v1
+  with:
+    path: ${{ steps.node-cache-dir.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.

 ### Problem Matchers

@ -411,7 +437,7 @@ key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
 Setup problem matchers for your `PHP` output by adding this step after the `setup-php` step. This will scan the logs for PHP errors and warnings, and surface them prominently in the GitHub Actions UI by creating annotations and log file decorations.

 ```yaml
- name: Setup Problem Matchers for PHP
+- name: Setup problem matchers for PHP
  run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 ```

@ -420,7 +446,7 @@ Setup problem matchers for your `PHP` output by adding this step after the `setu
 Setup problem matchers for your `PHPUnit` output by adding this step after the `setup-php` step. This will scan the logs for failing tests and surface that information prominently in the GitHub Actions UI by creating annotations and log file decorations.

 ```yaml
- name: Setup Problem Matchers for PHPUnit
+- name: Setup problem matchers for PHPUnit
  run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 ```

@ -448,6 +474,8 @@ Examples for setting up this GitHub Action with different PHP Frameworks/Package

 |Framework/Package|Runs on|Workflow|
 |--- |--- |--- |
+|Blackfire|`macOS`, `ubuntu` and `windows`|[blackfire.yml](./examples/blackfire.yml "GitHub Action using Blackfire")|
+|Blackfire Player|`macOS`, `ubuntu` and `windows`|[blackfire-player.yml](./examples/blackfire-player.yml "GitHub Action using Blackfire Player")|
 |CakePHP with `MySQL` and `Redis`|`ubuntu`|[cakephp-mysql.yml](./examples/cakephp-mysql.yml "GitHub Action for CakePHP with MySQL and Redis")|
 |CakePHP with `PostgreSQL` and `Redis`|`ubuntu`|[cakephp-postgres.yml](./examples/cakephp-postgres.yml "GitHub Action for CakePHP with Postgres and Redis")|
 |CakePHP without services|`macOS`, `ubuntu` and `windows`|[cakephp.yml](./examples/cakephp.yml "GitHub Action for CakePHP without services")|
@ -472,7 +500,7 @@ Examples for setting up this GitHub Action with different PHP Frameworks/Package

 ## :scroll: License

-The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). This project has multiple [dependencies](#dependencies "Dependencies for this PHP Action"). Their licenses can be found in their respective repositories.
+The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). This project has multiple [dependencies](#bookmark-dependencies "Dependencies for this PHP Action"). Their licenses can be found in their respective repositories.

 ## :+1: Contributions

@ -482,9 +510,9 @@ 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").
 - Please star the project and share it with the community.
- If you blog, write about your experience while using this action.
- I maintain this in my free time, please support me with a [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") subscription or a one time contribution using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal").
+- 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")

 ## :bookmark: Dependencies
@ -496,7 +524,8 @@ If this action helped you.
 - [shivammathur/cache-extensions](https://github.com/shivammathur/cache-extensions "GitHub action to help with caching PHP extensions")
 - [shivammathur/homebrew-php](https://github.com/shivammathur/homebrew-php "Tap for PHP builds for MacOS")
 - [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package")
- [shivammathur/php5-ubuntu](https://github.com/shivammathur/php5-ubuntu "Scripts to setup PHP5 versions")
+- [shivammathur/php5-darwin](https://github.com/shivammathur/php5-darwin "Scripts to setup PHP5 versions on darwin")
+- [shivammathur/php5-ubuntu](https://github.com/shivammathur/php5-ubuntu "Scripts to setup PHP5 versions on ubuntu")

 ## :bookmark_tabs: Further Reading

--- a/tests/extensions.test.ts
+++ b/tests/extensions.test.ts
@ -3,17 +3,31 @@ import * as extensions from '../src/extensions';
 describe('Extension tests', () => {
  it('checking addExtensionOnWindows', async () => {
    let win32: string = await extensions.addExtension(
-      'xdebug, pcov, phalcon4, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
+      'Xdebug, pcov, sqlite, 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('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',
@ -25,20 +39,29 @@ describe('Extension tests', () => {

    win32 = await extensions.addExtension('xdebug', '7.2', 'fedora');
    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');
+
+    win32 = await extensions.addExtension('blackfire-1.31.0', '7.3', 'win32');
+    expect(win32).toContain('blackfire.ps1 7.3 1.31.0');
  });

  it('checking addExtensionOnLinux', async () => {
    let linux: string = await extensions.addExtension(
-      'xdebug, pcov, ast-beta, xdebug-alpha, grpc-1.2.3',
+      'Xdebug, pcov, sqlite, 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.2');
+    expect(linux).toContain('sudo $debconf_fix apt-get install -y php7.4-pcov');
    expect(linux).toContain(
-      'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php7.4-pcov'
+      'sudo $debconf_fix apt-get install -y php7.4-sqlite3'
    );
    expect(linux).toContain('add_unstable_extension ast beta extension');
-    expect(linux).toContain('add_pecl_extension grpc 1.2.3');
+    expect(linux).toContain('add_pdo_extension mysql');
+    expect(linux).toContain('add_pdo_extension odbc');
+    expect(linux).toContain('add_pecl_extension grpc 1.2.3 extension');
    expect(linux).toContain(
      'add_unstable_extension xdebug alpha zend_extension'
    );
@ -63,18 +86,25 @@ describe('Extension tests', () => {
    linux = await extensions.addExtension('phalcon3, phalcon4', '7.3', 'linux');
    expect(linux).toContain('phalcon.sh phalcon3 7.3');
    expect(linux).toContain('phalcon.sh phalcon4 7.3');
+
+    linux = await extensions.addExtension('blackfire', '7.3', 'linux');
+    expect(linux).toContain('blackfire.sh 7.3 1.31.0');
+
+    linux = await extensions.addExtension('blackfire-1.31.0', '7.3', 'linux');
+    expect(linux).toContain('blackfire.sh 7.3 1.31.0');
  });

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

    darwin = await extensions.addExtension('phalcon3', '7.0', 'darwin');
    expect(darwin).toContain('phalcon_darwin.sh phalcon3 7.0');
@ -120,6 +150,12 @@ describe('Extension tests', () => {
    expect(darwin).toContain('brew install pkg-config imagemagick');
    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');
+
+    darwin = await extensions.addExtension('blackfire-1.31.0', '7.3', 'darwin');
+    expect(darwin).toContain('blackfire_darwin.sh 7.3 1.31.0');
+
    darwin = await extensions.addExtension(
      'does_not_exist',
      '7.2',
--- a/tests/matchers.test.ts
+++ b/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', () => {
--- a/tests/tools.test.ts
+++ b/tests/tools.test.ts
@ -2,28 +2,10 @@ import * as tools from '../src/tools';

 describe('Tools tests', () => {
  it('checking getCommand', async () => {
-    expect(await tools.getArchiveCommand('linux')).toBe('add_tool ');
-    expect(await tools.getArchiveCommand('darwin')).toBe('add_tool ');
-    expect(await tools.getArchiveCommand('win32')).toBe('Add-Tool ');
-    expect(await tools.getArchiveCommand('fedora')).toContain(
-      'Platform fedora is not supported'
-    );
-  });
-
-  it('checking getCommand', async () => {
-    expect(await tools.getPackageCommand('linux')).toBe('add_composer_tool ');
-    expect(await tools.getPackageCommand('darwin')).toBe('add_composer_tool ');
-    expect(await tools.getPackageCommand('win32')).toBe('Add-Composer-Tool ');
-    expect(await tools.getPackageCommand('fedora')).toContain(
-      'Platform fedora is not supported'
-    );
-  });
-
-  it('checking getPECLCommand', async () => {
-    expect(await tools.getPECLCommand('linux')).toBe('add_pecl ');
-    expect(await tools.getPECLCommand('darwin')).toBe('add_pecl ');
-    expect(await tools.getPECLCommand('win32')).toBe('Add-PECL ');
-    expect(await tools.getPECLCommand('fedora')).toContain(
+    expect(await tools.getCommand('linux', 'tool')).toBe('add_tool ');
+    expect(await tools.getCommand('darwin', 'tool')).toBe('add_tool ');
+    expect(await tools.getCommand('win32', 'tool')).toBe('Add-Tool ');
+    expect(await tools.getCommand('fedora', 'tool')).toContain(
      'Platform fedora is not supported'
    );
  });
@ -205,12 +187,12 @@ describe('Tools tests', () => {
    );
  });

-  it('checking getPhpunitUri', async () => {
-    expect(await tools.getPhpunitUrl('tool', 'latest')).toBe(
-      'https://phar.phpunit.de/tool.phar'
+  it('checking getPharUri', async () => {
+    expect(await tools.getPharUrl('domain', 'tool', '', 'latest')).toBe(
+      'domain/tool.phar'
    );
-    expect(await tools.getPhpunitUrl('tool', '1.2.3')).toBe(
-      'https://phar.phpunit.de/tool-1.2.3.phar'
+    expect(await tools.getPharUrl('domain', 'tool', 'v', '1.2.3')).toBe(
+      'domain/tool-v1.2.3.phar'
    );
  });

@ -223,7 +205,7 @@ describe('Tools tests', () => {
    );
  });

-  it('checking getDeployerUri', async () => {
+  it('checking addComposer', async () => {
    expect(await tools.addComposer(['a', 'b'])).toStrictEqual([
      'composer',
      'a',
@ -276,6 +258,15 @@ describe('Tools tests', () => {
    ]);
  });

+  it('checking getWpCliUri', async () => {
+    expect(await tools.getWpCliUrl('latest')).toBe(
+      'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true'
+    );
+    expect(await tools.getWpCliUrl('2.4.0')).toBe(
+      'wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar'
+    );
+  });
+
  it('checking addArchive', async () => {
    let script: string = await tools.addArchive(
      'tool',
@ -344,13 +335,13 @@ describe('Tools tests', () => {
      'user/',
      'linux'
    );
-    expect(script).toContain('add_composer_tool tool tool:1.2.3 user/');
+    expect(script).toContain('add_composertool tool tool:1.2.3 user/');

    script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'darwin');
-    expect(script).toContain('add_composer_tool tool tool:1.2.3 user/');
+    expect(script).toContain('add_composertool tool tool:1.2.3 user/');

    script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'win32');
-    expect(script).toContain('Add-Composer-Tool tool tool:1.2.3 user/');
+    expect(script).toContain('Add-Composertool tool tool:1.2.3 user/');

    script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'fedora');
    expect(script).toContain('Platform fedora is not supported');
@ -358,12 +349,16 @@ describe('Tools tests', () => {

  it('checking addTools on linux', async () => {
    const script: string = await tools.addTools(
-      'cs2pr, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony',
+      'blackfire, blackfire-player, cs2pr, flex, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli',
      '7.4',
      'linux'
    );
+    expect(script).toContain('add_blackfire');
    expect(script).toContain(
-      'add_tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
+      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
+    );
+    expect(script).toContain(
+      'add_tool https://getcomposer.org/composer-stable.phar composer'
    );
    expect(script).toContain(
      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
@ -383,21 +378,29 @@ describe('Tools tests', () => {
    expect(script).toContain(
      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_linux_amd64 symfony'
    );
+    expect(script).toContain(
+      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
+    );
    expect(script).toContain('add_pecl');
-    expect(script).toContain('add_composer_tool phinx phinx robmorgan/');
-    expect(script).toContain('add_composer_tool phinx phinx:1.2.3 robmorgan/');
+    expect(script).toContain('add_composertool flex flex symfony/');
+    expect(script).toContain('add_composertool phinx phinx robmorgan/');
+    expect(script).toContain('add_composertool phinx phinx:1.2.3 robmorgan/');
    expect(script).toContain('add_devtools');
    expect(script).toContain('add_log "$tick" "php-config" "Added"');
    expect(script).toContain('add_log "$tick" "phpize" "Added"');
  });
  it('checking addTools on darwin', async () => {
    const script: string = await tools.addTools(
-      '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',
+      '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',
      '7.4',
      'darwin'
    );
+    expect(script).toContain('add_blackfire');
    expect(script).toContain(
-      'add_tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
+      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
+    );
+    expect(script).toContain(
+      'add_tool https://getcomposer.org/composer-stable.phar composer'
    );
    expect(script).toContain(
      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr'
@ -417,12 +420,13 @@ describe('Tools tests', () => {
    expect(script).toContain(
      'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
    );
-    expect(script).toContain('add_composer_tool phinx phinx robmorgan/');
+    expect(script).toContain('add_composertool flex flex symfony/');
+    expect(script).toContain('add_composertool phinx phinx robmorgan/');
    expect(script).toContain(
      'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
    );
    expect(script).toContain(
-      'add_composer_tool composer-prefetcher composer-prefetcher:1.2.3 narrowspark/automatic-'
+      'add_composertool composer-prefetcher composer-prefetcher:1.2.3 narrowspark/automatic-'
    );
    expect(script).toContain(
      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_darwin_amd64 symfony'
@ -430,37 +434,46 @@ describe('Tools tests', () => {
    expect(script).toContain(
      'add_tool https://github.com/symfony/cli/releases/download/v1.2.3/symfony_darwin_amd64 symfony'
    );
+    expect(script).toContain(
+      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
+    );
    expect(script).toContain('add_log "$tick" "phpize" "Added"');
    expect(script).toContain('add_log "$tick" "php-config" "Added"');
  });
  it('checking addTools on windows', async () => {
    const script: string = await tools.addTools(
-      'codeception, cs2pr, deployer, prestissimo, phpmd, phinx, phive:0.13.2, php-config, phpize, symfony, does_not_exit',
+      'blackfire, blackfire-player:1.8.1, codeception, cs2pr, deployer, flex, prestissimo, phpmd, phinx, phive:0.13.2, php-config, phpize, symfony, wp-cli, does_not_exit',
      '7.4',
      'win32'
    );
+    expect(script).toContain('Add-Blackfire 1.32.0');
    expect(script).toContain(
-      'Add-Tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
+      'Add-Tool https://get.blackfire.io/blackfire-player-v1.8.1.phar blackfire-player'
+    );
+    expect(script).toContain(
+      'Add-Tool https://getcomposer.org/composer-stable.phar composer'
    );
    expect(script).toContain(
      'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
    );
+    expect(script).toContain('Add-Composertool flex flex symfony/');
    expect(script).toContain(
      'Add-Tool https://deployer.org/deployer.phar deployer'
    );
-    expect(script).toContain(
-      'Add-Composer-Tool prestissimo prestissimo hirak/'
-    );
+    expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
    expect(script).toContain(
      'Add-Tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd'
    );
-    expect(script).toContain('Add-Composer-Tool phinx phinx robmorgan/');
+    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
    expect(script).toContain(
      'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.2/phive-0.13.2.phar phive'
    );
    expect(script).toContain(
      'Add-Tool https://github.com/symfony/cli/releases/latest/download/symfony_windows_amd64.exe symfony'
    );
+    expect(script).toContain(
+      'Add-Tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
+    );
    expect(script).toContain('phpize is not a windows tool');
    expect(script).toContain('php-config is not a windows tool');
    expect(script).toContain('Tool does_not_exit is not supported');
@ -473,14 +486,12 @@ describe('Tools tests', () => {
      'win32'
    );
    expect(script).toContain(
-      'Add-Tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
+      'Add-Tool https://getcomposer.org/composer-stable.phar composer'
    );
+    expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
+    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
    expect(script).toContain(
-      'Add-Composer-Tool prestissimo prestissimo hirak/'
-    );
-    expect(script).toContain('Add-Composer-Tool phinx phinx robmorgan/');
-    expect(script).toContain(
-      'Add-Composer-Tool composer-prefetcher composer-prefetcher narrowspark/automatic-'
+      'Add-Composertool composer-prefetcher composer-prefetcher narrowspark/automatic-'
    );
  });
 });
--- a/tests/utils.test.ts
+++ b/tests/utils.test.ts
@ -55,12 +55,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', '7.3', 'darwin')).toBe(darwin);
-    expect(await utils.readScript('linux.sh', '7.4', 'linux')).toBe(linux);
-    expect(await utils.readScript('linux.sh', '7.3', 'linux')).toBe(linux);
-    expect(await utils.readScript('win32.ps1', '7.4', 'win32')).toBe(win32);
-    expect(await utils.readScript('win32.ps1', '7.3', 'win32')).toBe(win32);
+    expect(await utils.readScript('darwin.sh')).toBe(darwin);
+    expect(await utils.readScript('darwin.sh')).toBe(darwin);
+    expect(await utils.readScript('linux.sh')).toBe(linux);
+    expect(await utils.readScript('linux.sh')).toBe(linux);
+    expect(await utils.readScript('win32.ps1')).toBe(win32);
+    expect(await utils.readScript('win32.ps1')).toBe(win32);
  });

  it('checking writeScripts', async () => {
@ -161,4 +161,14 @@ describe('Utils tests', () => {
      'Platform fedora is not supported'
    );
  });
+
+  it('checking getBlackfireVersion', async () => {
+    expect(await utils.getBlackfireVersion('')).toEqual('1.31.0');
+    expect(await utils.getBlackfireVersion(undefined)).toEqual('1.31.0');
+    expect(await utils.getBlackfireVersion(null)).toEqual('1.31.0');
+    expect(await utils.getBlackfireVersion('1.32.0')).toEqual('1.32.0');
+  });
+  it('checking getBlackfireAgentVersion', async () => {
+    expect(await utils.getBlackfireAgentVersion()).toEqual('1.32.0');
+  });
 });
--- a/action.yml
+++ b/action.yml
@ -3,6 +3,7 @@ author: shivammathur
 description: 'Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer'
 branding:
  color: 'purple'
+  icon: 'play-circle'
 inputs:
  php-version:
    description: 'Setup PHP version.'
--- a/dist/index.js
+++ b/dist/index.js
--- a/examples/blackfire-player.yml
+++ b/examples/blackfire-player.yml
@ -0,0 +1,31 @@
+# GitHub Action for Blackfire Player
+name: Play a Blackfire Scenario
+on: [push, pull_request]
+jobs:
+  blackfire-player:
+    name: Blackfire (PHP ${{ matrix.php-versions }})
+    # Add your Blackfire credentials securely using GitHub Secrets
+    env:
+      BLACKFIRE_SERVER_ID: ${{ secrets.BLACKFIRE_SERVER_ID }}
+      BLACKFIRE_SERVER_TOKEN: ${{ secrets.BLACKFIRE_SERVER_TOKEN }}
+      BLACKFIRE_CLIENT_ID: ${{ secrets.BLACKFIRE_CLIENT_ID }}
+      BLACKFIRE_CLIENT_TOKEN: ${{ secrets.BLACKFIRE_CLIENT_TOKEN }}
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        php-versions: ['7.2', '7.3', '7.4']
+        # blackfire-player supports PHP >= 5.5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: blackfire
+          tools: blackfire, blackfire-player #Setup Blackfire client, agent and player
+          coverage: none
+      - name: Play the scenario
+        run: blackfire-player run scenario.bkf # Refer to https://blackfire.io/docs/player/index#usage
--- a/examples/blackfire.yml
+++ b/examples/blackfire.yml
@ -0,0 +1,31 @@
+# GitHub Action for Blackfire
+name: Profiling with blackfire
+on: [push, pull_request]
+jobs:
+  blackfire:
+    name: Blackfire (PHP ${{ matrix.php-versions }})
+    # Add your Blackfire credentials securely using GitHub Secrets
+    env:
+      BLACKFIRE_SERVER_ID: ${{ secrets.BLACKFIRE_SERVER_ID }}
+      BLACKFIRE_SERVER_TOKEN: ${{ secrets.BLACKFIRE_SERVER_TOKEN }}
+      BLACKFIRE_CLIENT_ID: ${{ secrets.BLACKFIRE_CLIENT_ID }}
+      BLACKFIRE_CLIENT_TOKEN: ${{ secrets.BLACKFIRE_CLIENT_TOKEN }}
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        php-versions: ['7.2', '7.3', '7.4']
+        # Blackfire supports PHP >= 5.3 on ubuntu and macos and PHP >= 5.4 on windows
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: blackfire
+          tools: blackfire #Setup Blackfire client and agent
+          coverage: none
+      - name: Profile
+        run: blackfire run php my-script.php # Refer to https://blackfire.io/docs/cookbooks/profiling-cli
--- a/examples/cakephp-mysql.yml
+++ b/examples/cakephp-mysql.yml
@ -34,6 +34,8 @@ jobs:
          # Install memcached if using ext-memcached
          extensions: mbstring, intl, redis, pdo_mysql
          coverage: pcov
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
        id: composer-cache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
--- a/examples/laravel-mysql.yml
+++ b/examples/laravel-mysql.yml
@ -41,6 +41,8 @@ jobs:
          php-version: ${{ matrix.php-versions }}
          extensions: mbstring, dom, fileinfo, mysql
          coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
        id: composer-cache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
--- a/examples/lumen-mysql.yml
+++ b/examples/lumen-mysql.yml
@ -41,6 +41,8 @@ jobs:
          php-version: ${{ matrix.php-versions }}
          extensions: mbstring, dom, fileinfo, mysql
          coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
        id: composer-cache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
--- a/examples/phalcon-mysql.yml
+++ b/examples/phalcon-mysql.yml
@ -41,6 +41,8 @@ jobs:
          php-version: ${{ matrix.php-versions }}
          extensions: mbstring, dom, zip, phalcon4, mysql #use phalcon3 for the phalcon 3.x.
          coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
        id: composer-cache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
--- a/examples/symfony-mysql.yml
+++ b/examples/symfony-mysql.yml
@ -28,6 +28,8 @@ jobs:
          php-version: ${{ matrix.php-versions }}
          extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, mysql
          coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
        id: composer-cache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
--- a/examples/yii2-mysql.yml
+++ b/examples/yii2-mysql.yml
@ -38,6 +38,8 @@ jobs:
          php-version: ${{ matrix.php-versions }}
          extensions: mbstring, intl, gd, imagick, zip, dom, mysql
          coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
      - name: Get composer cache directory
        id: composer-cache
        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
--- a/jest.config.js
+++ b/jest.config.js
@ -9,4 +9,4 @@ module.exports = {
  },
  verbose: true,
  collectCoverage: true
-};
+};
--- a/package-lock.json
+++ b/package-lock.json
@ -1,13 +1,13 @@
 {
  "name": "setup-php",
-  "version": "2.0.1",
+  "version": "2.1.3",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
    "@actions/core": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.2.tgz",
-      "integrity": "sha512-IbCx7oefq+Gi6FWbSs2Fnw8VkEI6Y4gvjrYprY3RV//ksq/KPMlClOerJ4jRosyal6zkUIc8R9fS/cpRMlGClg=="
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.3.tgz",
+      "integrity": "sha512-Wp4xnyokakM45Uuj4WLUxdsa8fJjKVl1fDTsPbTEcTcuu0Nb26IPQbOtjmnfaCPGcaoPOOqId8H9NapZ8gii4w=="
    },
    "@actions/exec": {
      "version": "1.0.3",
@ -32,18 +32,18 @@
      }
    },
    "@babel/core": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.4.tgz",
-      "integrity": "sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==",
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz",
+      "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.8.4",
+        "@babel/generator": "^7.8.7",
        "@babel/helpers": "^7.8.4",
-        "@babel/parser": "^7.8.4",
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.4",
-        "@babel/types": "^7.8.3",
+        "@babel/parser": "^7.8.7",
+        "@babel/template": "^7.8.6",
+        "@babel/traverse": "^7.8.6",
+        "@babel/types": "^7.8.7",
        "convert-source-map": "^1.7.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.1",
@ -69,12 +69,12 @@
      }
    },
    "@babel/generator": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz",
-      "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz",
+      "integrity": "sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==",
      "dev": true,
      "requires": {
-        "@babel/types": "^7.8.3",
+        "@babel/types": "^7.8.7",
        "jsesc": "^2.5.1",
        "lodash": "^4.17.13",
        "source-map": "^0.5.0"
@ -198,9 +198,9 @@
      }
    },
    "@babel/parser": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz",
-      "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz",
+      "integrity": "sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==",
      "dev": true
    },
    "@babel/plugin-syntax-bigint": {
@ -222,37 +222,37 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
-      "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz",
+      "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==",
      "dev": true,
      "requires": {
-        "regenerator-runtime": "^0.13.2"
+        "regenerator-runtime": "^0.13.4"
      }
    },
    "@babel/template": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz",
-      "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==",
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.3",
-        "@babel/types": "^7.8.3"
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
      }
    },
    "@babel/traverse": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz",
-      "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==",
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz",
+      "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.8.4",
+        "@babel/generator": "^7.8.6",
        "@babel/helper-function-name": "^7.8.3",
        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/parser": "^7.8.4",
-        "@babel/types": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6",
        "debug": "^4.1.0",
        "globals": "^11.1.0",
        "lodash": "^4.17.13"
@ -267,9 +267,9 @@
      }
    },
    "@babel/types": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
-      "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz",
+      "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==",
      "dev": true,
      "requires": {
        "esutils": "^2.0.2",
@ -291,14 +291,6 @@
      "requires": {
        "exec-sh": "^0.3.2",
        "minimist": "^1.2.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
      }
    },
    "@istanbuljs/load-nyc-config": {
@ -575,18 +567,18 @@
      }
    },
    "@sinonjs/commons": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.0.tgz",
-      "integrity": "sha512-qbk9AP+cZUsKdW1GJsBpxPKFmCJ0T8swwzVje3qFd+AkQb74Q/tiuzrdfFg8AD2g5HH/XbE/I8Uc1KYHVYWfhg==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.1.tgz",
+      "integrity": "sha512-Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ==",
      "dev": true,
      "requires": {
        "type-detect": "4.0.8"
      }
    },
    "@types/babel__core": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.4.tgz",
-      "integrity": "sha512-c/5MuRz5HM4aizqL5ViYfW4iEnmfPcfbH4Xa6GgLT21dMc1NGeNnuS6egHheOmP+kCJ9CAzC4pv4SDCWTnRkbg==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz",
+      "integrity": "sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==",
      "dev": true,
      "requires": {
        "@babel/parser": "^7.1.0",
@ -616,9 +608,9 @@
      }
    },
    "@types/babel__traverse": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.8.tgz",
-      "integrity": "sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==",
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz",
+      "integrity": "sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==",
      "dev": true,
      "requires": {
        "@babel/types": "^7.3.0"
@ -662,9 +654,9 @@
      }
    },
    "@types/jest": {
-      "version": "25.1.2",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.2.tgz",
-      "integrity": "sha512-EsPIgEsonlXmYV7GzUqcvORsSS9Gqxw/OvkGwHfAdpjduNRxMlhsav0O5Kb0zijc/eXSO/uW6SJt9nwull8AUQ==",
+      "version": "25.1.4",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.4.tgz",
+      "integrity": "sha512-QDDY2uNAhCV7TMCITrxz+MRk1EizcsevzfeS6LykIlq2V1E5oO4wXG8V2ZEd9w7Snxeeagk46YbMgZ8ESHx3sw==",
      "dev": true,
      "requires": {
        "jest-diff": "^25.1.0",
@ -678,9 +670,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "13.7.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.2.tgz",
-      "integrity": "sha512-uvilvAQbdJvnSBFcKJ2td4016urcGvsiR+N4dHGU87ml8O2Vl6l+ErOi9w0kXSPiwJ1AYlIW+0pDXDWWMOiWbw==",
+      "version": "13.9.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz",
+      "integrity": "sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ==",
      "dev": true
    },
    "@types/parse-json": {
@ -696,9 +688,9 @@
      "dev": true
    },
    "@types/yargs": {
-      "version": "15.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.3.tgz",
-      "integrity": "sha512-XCMQRK6kfpNBixHLyHUsGmXrpEmFFxzMrcnSXFMziHd8CoNJo8l16FkHyQq4x+xbM7E2XL83/O78OD8u+iZTdQ==",
+      "version": "15.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz",
+      "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==",
      "dev": true,
      "requires": {
        "@types/yargs-parser": "*"
@ -711,12 +703,12 @@
      "dev": true
    },
    "@typescript-eslint/eslint-plugin": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.20.0.tgz",
-      "integrity": "sha512-cimIdVDV3MakiGJqMXw51Xci6oEDEoPkvh8ggJe2IIzcc0fYqAxOXN6Vbeanahz6dLZq64W+40iUEc9g32FLDQ==",
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz",
+      "integrity": "sha512-wJRBeaMeT7RLQ27UQkDFOu25MqFOBus8PtOa9KaT5ZuxC1kAsd7JEHqWt4YXuY9eancX0GK9C68i5OROnlIzBA==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/experimental-utils": "2.20.0",
+        "@typescript-eslint/experimental-utils": "2.24.0",
        "eslint-utils": "^1.4.3",
        "functional-red-black-tree": "^1.0.1",
        "regexpp": "^3.0.0",
@ -724,32 +716,32 @@
      }
    },
    "@typescript-eslint/experimental-utils": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.20.0.tgz",
-      "integrity": "sha512-fEBy9xYrwG9hfBLFEwGW2lKwDRTmYzH3DwTmYbT+SMycmxAoPl0eGretnBFj/s+NfYBG63w/5c3lsvqqz5mYag==",
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz",
+      "integrity": "sha512-DXrwuXTdVh3ycNCMYmWhUzn/gfqu9N0VzNnahjiDJvcyhfBy4gb59ncVZVxdp5XzBC77dCncu0daQgOkbvPwBw==",
      "dev": true,
      "requires": {
        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "2.20.0",
+        "@typescript-eslint/typescript-estree": "2.24.0",
        "eslint-scope": "^5.0.0"
      }
    },
    "@typescript-eslint/parser": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.20.0.tgz",
-      "integrity": "sha512-o8qsKaosLh2qhMZiHNtaHKTHyCHc3Triq6aMnwnWj7budm3xAY9owSZzV1uon5T9cWmJRJGzTFa90aex4m77Lw==",
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.24.0.tgz",
+      "integrity": "sha512-H2Y7uacwSSg8IbVxdYExSI3T7uM1DzmOn2COGtCahCC3g8YtM1xYAPi2MAHyfPs61VKxP/J/UiSctcRgw4G8aw==",
      "dev": true,
      "requires": {
        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "2.20.0",
-        "@typescript-eslint/typescript-estree": "2.20.0",
+        "@typescript-eslint/experimental-utils": "2.24.0",
+        "@typescript-eslint/typescript-estree": "2.24.0",
        "eslint-visitor-keys": "^1.1.0"
      }
    },
    "@typescript-eslint/typescript-estree": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.20.0.tgz",
-      "integrity": "sha512-WlFk8QtI8pPaE7JGQGxU7nGcnk1ccKAJkhbVookv94ZcAef3m6oCE/jEDL6dGte3JcD7reKrA0o55XhBRiVT3A==",
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz",
+      "integrity": "sha512-RJ0yMe5owMSix55qX7Mi9V6z2FDuuDpN6eR5fzRJrp+8in9UF41IGNQHbg5aMK4/PjVaEQksLvz0IA8n+Mr/FA==",
      "dev": true,
      "requires": {
        "debug": "^4.1.1",
@ -774,9 +766,9 @@
      "dev": true
    },
    "acorn": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-      "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
      "dev": true
    },
    "acorn-globals": {
@ -790,17 +782,17 @@
      },
      "dependencies": {
        "acorn": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-          "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
          "dev": true
        }
      }
    },
    "acorn-jsx": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
-      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
+      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
      "dev": true
    },
    "acorn-walk": {
@ -810,9 +802,9 @@
      "dev": true
    },
    "ajv": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
-      "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
+      "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
      "dev": true,
      "requires": {
        "fast-deep-equal": "^3.1.1",
@ -822,12 +814,20 @@
      }
    },
    "ansi-escapes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz",
-      "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
      "dev": true,
      "requires": {
-        "type-fest": "^0.8.1"
+        "type-fest": "^0.11.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+          "dev": true
+        }
      }
    },
    "ansi-regex": {
@ -1105,9 +1105,9 @@
      }
    },
    "browser-process-hrtime": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
-      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
      "dev": true
    },
    "browser-resolve": {
@ -1875,9 +1875,9 @@
      }
    },
    "eslint-plugin-jest": {
-      "version": "23.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.7.0.tgz",
-      "integrity": "sha512-zkiyGlvJeHNjAEz8FaIxTXNblJJ/zj3waNbYbgflK7K6uy0cpE5zJBt/JpJtOBGM/UGkC6BqsQ4n0y7kQ2HA8w==",
+      "version": "23.8.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz",
+      "integrity": "sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==",
      "dev": true,
      "requires": {
        "@typescript-eslint/experimental-utils": "^2.5.0"
@ -1918,13 +1918,13 @@
      "dev": true
    },
    "espree": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz",
-      "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
      "dev": true,
      "requires": {
-        "acorn": "^7.1.0",
-        "acorn-jsx": "^5.1.0",
+        "acorn": "^7.1.1",
+        "acorn-jsx": "^5.2.0",
        "eslint-visitor-keys": "^1.1.0"
      }
    },
@ -2387,9 +2387,9 @@
      }
    },
    "globals": {
-      "version": "12.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz",
-      "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==",
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
      "dev": true,
      "requires": {
        "type-fest": "^0.8.1"
@ -2498,9 +2498,9 @@
      }
    },
    "hosted-git-info": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
      "dev": true
    },
    "html-encoding-sniffer": {
@ -2731,74 +2731,33 @@
      "dev": true
    },
    "inquirer": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz",
-      "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
      "dev": true,
      "requires": {
        "ansi-escapes": "^4.2.1",
-        "chalk": "^2.4.2",
+        "chalk": "^3.0.0",
        "cli-cursor": "^3.1.0",
        "cli-width": "^2.0.0",
        "external-editor": "^3.0.3",
        "figures": "^3.0.0",
        "lodash": "^4.17.15",
        "mute-stream": "0.0.8",
-        "run-async": "^2.2.0",
+        "run-async": "^2.4.0",
        "rxjs": "^6.5.3",
        "string-width": "^4.1.0",
-        "strip-ansi": "^5.1.0",
+        "strip-ansi": "^6.0.0",
        "through": "^2.3.6"
      },
      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
          "dev": true,
          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
+            "ansi-regex": "^5.0.0"
          }
        }
      }
@ -3706,20 +3665,12 @@
      "dev": true
    },
    "json5": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz",
+      "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==",
      "dev": true,
      "requires": {
-        "minimist": "^1.2.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
+        "minimist": "^1.2.5"
      }
    },
    "jsprim": {
@ -3827,9 +3778,9 @@
      }
    },
    "make-error": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
-      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
      "dev": true
    },
    "makeerror": {
@ -3903,9 +3854,9 @@
      }
    },
    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
      "dev": true
    },
    "mixin-deep": {
@ -3930,12 +3881,12 @@
      }
    },
    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
+      "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
      "dev": true,
      "requires": {
-        "minimist": "0.0.8"
+        "minimist": "^1.2.5"
      }
    },
    "ms": {
@ -4427,9 +4378,9 @@
      "dev": true
    },
    "react-is": {
-      "version": "16.12.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz",
-      "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==",
+      "version": "16.13.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz",
+      "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==",
      "dev": true
    },
    "read-pkg": {
@ -4463,9 +4414,9 @@
      }
    },
    "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
      "dev": true
    },
    "regex-not": {
@ -4656,9 +4607,9 @@
      "dev": true
    },
    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz",
+      "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==",
      "dev": true,
      "requires": {
        "is-promise": "^2.1.0"
@ -4814,12 +4765,6 @@
            "to-regex": "^3.0.2"
          }
        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
        "normalize-path": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@ -5517,9 +5462,9 @@
      }
    },
    "ts-jest": {
-      "version": "25.2.0",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.2.0.tgz",
-      "integrity": "sha512-VaRdb0da46eorLfuHEFf0G3d+jeREcV+Wb/SvW71S4y9Oe8SHWU+m1WY/3RaMknrBsnvmVH0/rRjT8dkgeffNQ==",
+      "version": "25.2.1",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.2.1.tgz",
+      "integrity": "sha512-TnntkEEjuXq/Gxpw7xToarmHbAafgCaAzOpnajnFC6jI7oo1trMzAHA04eWpc3MhV6+yvhE8uUBAmN+teRJh0A==",
      "dev": true,
      "requires": {
        "bs-logger": "0.x",
@ -5531,15 +5476,9 @@
        "mkdirp": "0.x",
        "resolve": "1.x",
        "semver": "^5.5",
-        "yargs-parser": "10.x"
+        "yargs-parser": "^16.1.0"
      },
      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
        "semver": {
          "version": "5.7.1",
          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@ -5547,20 +5486,21 @@
          "dev": true
        },
        "yargs-parser": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+          "version": "16.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
+          "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
          "dev": true,
          "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
          }
        }
      }
    },
    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
      "dev": true
    },
    "tsutils": {
@ -5618,9 +5558,9 @@
      }
    },
    "typescript": {
-      "version": "3.7.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
-      "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+      "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
      "dev": true
    },
    "union-value": {
@ -5761,12 +5701,12 @@
      }
    },
    "w3c-hr-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
-      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
      "dev": true,
      "requires": {
-        "browser-process-hrtime": "^0.1.2"
+        "browser-process-hrtime": "^1.0.0"
      }
    },
    "w3c-xmlserializer": {
@ -5886,9 +5826,9 @@
      }
    },
    "write-file-atomic": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.1.tgz",
-      "integrity": "sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
      "dev": true,
      "requires": {
        "imurmurhash": "^0.1.4",
@ -5898,9 +5838,9 @@
      }
    },
    "ws": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz",
-      "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz",
+      "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==",
      "dev": true
    },
    "xml-name-validator": {
@ -5922,18 +5862,18 @@
      "dev": true
    },
    "yaml": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.7.2.tgz",
-      "integrity": "sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.8.2.tgz",
+      "integrity": "sha512-omakb0d7FjMo3R1D2EbTKVIk6dAVLRxFXdLZMEUToeAvuqgG/YuHMuQOZ5fgk+vQ8cx+cnGKwyg+8g8PNT0xQg==",
      "dev": true,
      "requires": {
-        "@babel/runtime": "^7.6.3"
+        "@babel/runtime": "^7.8.7"
      }
    },
    "yargs": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
-      "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+      "version": "15.3.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+      "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
      "dev": true,
      "requires": {
        "cliui": "^6.0.0",
@ -5946,7 +5886,7 @@
        "string-width": "^4.2.0",
        "which-module": "^2.0.0",
        "y18n": "^4.0.0",
-        "yargs-parser": "^16.1.0"
+        "yargs-parser": "^18.1.1"
      },
      "dependencies": {
        "find-up": {
@ -6001,9 +5941,9 @@
      }
    },
    "yargs-parser": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
-      "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz",
+      "integrity": "sha512-KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA==",
      "dev": true,
      "requires": {
        "camelcase": "^5.0.0",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "setup-php",
-  "version": "2.0.1",
+  "version": "2.1.3",
  "private": false,
  "description": "Setup PHP for use with GitHub Actions",
  "main": "dist/index.js",
@ -24,28 +24,28 @@
  "author": "shivammathur",
  "license": "MIT",
  "dependencies": {
-    "@actions/core": "^1.2.2",
+    "@actions/core": "^1.2.3",
    "@actions/exec": "^1.0.3",
    "@actions/io": "^1.0.2",
    "fs": "0.0.1-security"
  },
  "devDependencies": {
-    "@types/jest": "^25.1.2",
-    "@types/node": "^13.7.2",
-    "@typescript-eslint/eslint-plugin": "^2.20.0",
-    "@typescript-eslint/parser": "^2.20.0",
+    "@types/jest": "^25.1.4",
+    "@types/node": "^13.9.1",
+    "@typescript-eslint/eslint-plugin": "^2.24.0",
+    "@typescript-eslint/parser": "^2.24.0",
    "@zeit/ncc": "^0.21.1",
    "eslint": "^6.8.0",
    "eslint-config-prettier": "^6.10.0",
    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jest": "^23.7.0",
+    "eslint-plugin-jest": "^23.8.2",
    "eslint-plugin-prettier": "^3.1.2",
    "husky": "^4.2.3",
    "jest": "^25.1.0",
    "jest-circus": "^25.1.0",
    "prettier": "^1.19.1",
-    "ts-jest": "^25.2.0",
-    "typescript": "^3.7.5"
+    "ts-jest": "^25.2.1",
+    "typescript": "^3.8.3"
  },
  "husky": {
    "skipCI": true,
--- a/src/config.ts
+++ b/src/config.ts
@ -44,6 +44,7 @@ export async function addINIValuesWindows(
 *
 * @param ini_values_csv
 * @param os_version
+ * @param no_step
 */
 export async function addINIValues(
  ini_values_csv: string,
--- a/src/extensions.ts
+++ b/src/extensions.ts
@ -16,13 +16,26 @@ export async function addExtensionDarwin(
  const extensions: Array<string> = await utils.extensionArray(extension_csv);
  let script = '\n';
  await utils.asyncForEach(extensions, async function(extension: string) {
-    extension = extension.toLowerCase();
    const version_extension: string = version + extension;
    const [ext_name, ext_version]: string[] = extension.split('-');
-    const prefix = await utils.getExtensionPrefix(ext_name);
-    let install_command = '';
+    const ext_prefix = await utils.getExtensionPrefix(ext_name);
+    const command_prefix = 'sudo pecl install -f ';
+    let command = '';
    switch (true) {
-      // match pre-release versions
+      // 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
+      ):
+        command =
+          'bash ' +
+          path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
+          ' ' +
+          version +
+          ' ' +
+          (await utils.getBlackfireVersion(ext_version));
+        break;
+      // match pre-release versions. For example - xdebug-beta
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
        script +=
          '\nadd_unstable_extension ' +
@ -30,30 +43,54 @@ export async function addExtensionDarwin(
          ' ' +
          ext_version +
          ' ' +
-          prefix;
+          ext_prefix;
        return;
+      // match semver
+      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
+        script +=
+          '\nadd_pecl_extension ' +
+          ext_name +
+          ' ' +
+          ext_version +
+          ' ' +
+          ext_prefix;
+        return;
+      // match 5.3xdebug
      case /5\.3xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.2.7' + pipe;
+        command = command_prefix + 'xdebug-2.2.7' + pipe;
        break;
+      // match 5.4xdebug
      case /5\.4xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.4.1' + pipe;
+        command = command_prefix + 'xdebug-2.4.1' + pipe;
        break;
+      // match 5.5xdebug and 5.6xdebug
      case /5\.[5-6]xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.5.5' + pipe;
+        command = command_prefix + 'xdebug-2.5.5' + pipe;
        break;
+      // match 7.0redis
      case /7\.0xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.9.0' + pipe;
+        command = command_prefix + 'xdebug-2.9.0' + pipe;
        break;
+      // match 5.6redis
      case /5\.6redis/.test(version_extension):
-        install_command = 'sudo pecl install -f redis-2.2.8' + pipe;
+        command = command_prefix + 'redis-2.2.8' + pipe;
        break;
-      case /[5-9]\.\dimagick/.test(version_extension):
-        install_command =
+      // match imagick
+      case /^imagick$/.test(extension):
+        command =
          'brew install pkg-config imagemagick' +
          pipe +
-          ' && sudo pecl install -f imagick' +
+          ' && ' +
+          command_prefix +
+          'imagick' +
          pipe;
        break;
+      // match sqlite
+      case /^sqlite$/.test(extension):
+        extension = 'sqlite3';
+        command = command_prefix + extension + pipe;
+        break;
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
        script +=
          'sh ' +
@ -64,16 +101,11 @@ export async function addExtensionDarwin(
          version;
        return;
      default:
-        install_command = 'sudo pecl install -f ' + extension + pipe;
+        command = command_prefix + extension + pipe;
        break;
    }
    script +=
-      '\nadd_extension ' +
-      extension +
-      ' "' +
-      install_command +
-      '" ' +
-      (await utils.getExtensionPrefix(extension));
+      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
  });
  return script;
 }
@ -83,38 +115,67 @@ export async function addExtensionDarwin(
 *
 * @param extension_csv
 * @param version
- * @param pipe
 */
 export async function addExtensionWindows(
  extension_csv: string,
-  version: string,
-  pipe: string
+  version: string
 ): Promise<string> {
  const extensions: Array<string> = await utils.extensionArray(extension_csv);
  let script = '\n';
  await utils.asyncForEach(extensions, async function(extension: string) {
-    extension = extension.toLowerCase();
    const [ext_name, ext_version]: string[] = extension.split('-');
    const version_extension: string = version + extension;
    let matches: RegExpExecArray;
    switch (true) {
-      // match pre-release versions
+      // 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 +=
+          '\n& ' +
+          path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
+          ' ' +
+          version +
+          ' ' +
+          (await utils.getBlackfireVersion(ext_version));
+        return;
+      // match pre-release versions. For example - xdebug-beta
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
        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;
        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 +=
          '\nAdd-Extension ' + ext_name + ' ' + matches[2] + ' ' + matches[1];
        return;
+      // match 5.3mysql..5.6mysql
+      // match 5.3mysqli..5.6mysqli
+      // match 5.3mysqlnd..5.6mysqlnd
+      case /^5\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
+        script +=
+          '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
+        break;
+      // match 7.0mysql..8.0mysql
+      // match 7.0mysqli..8.0mysqli
+      // match 7.0mysqlnd..8.0mysqlnd
+      case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
+        script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
+        break;
+      // match sqlite
+      case /^sqlite$/.test(extension):
+        extension = 'sqlite3';
+        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 +=
@ -149,13 +210,26 @@ export async function addExtensionLinux(
  const extensions: Array<string> = await utils.extensionArray(extension_csv);
  let script = '\n';
  await utils.asyncForEach(extensions, async function(extension: string) {
-    extension = extension.toLowerCase();
    const version_extension: string = version + extension;
    const [ext_name, ext_version]: string[] = extension.split('-');
-    const prefix = await utils.getExtensionPrefix(ext_name);
-    let install_command = '';
+    const ext_prefix = await utils.getExtensionPrefix(ext_name);
+    const command_prefix = 'sudo $debconf_fix apt-get install -y php';
+    let command = '';
    switch (true) {
-      // match pre-release versions
+      // 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
+      ):
+        command =
+          'bash ' +
+          path.join(__dirname, '../src/scripts/ext/blackfire.sh') +
+          ' ' +
+          version +
+          ' ' +
+          (await utils.getBlackfireVersion(ext_version));
+        break;
+      // match pre-release versions. For example - xdebug-beta
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
        script +=
          '\nadd_unstable_extension ' +
@ -163,15 +237,21 @@ export async function addExtensionLinux(
          ' ' +
          ext_version +
          ' ' +
-          prefix;
+          ext_prefix;
        return;
-      // match exact versions
+      // match semver versions
      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        script += '\nadd_pecl_extension ' + ext_name + ' ' + ext_version;
+        script +=
+          '\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 ' +
          path.join(__dirname, '../src/scripts/ext/gearman.sh') +
          ' ' +
@ -191,22 +271,27 @@ export async function addExtensionLinux(
      // match 7.0xdebug..7.4xdebug
      case /^7\.[0-4]xdebug$/.test(version_extension):
        script +=
-          '\nupdate_extension xdebug 2.9.1' +
+          '\nupdate_extension xdebug 2.9.2' +
          pipe +
          '\n' +
          (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
        return;
+      // match pdo extensions
+      case /.*pdo[_-].*/.test(version_extension):
+        extension = extension.replace('pdo_', '').replace('pdo-', '');
+        script += '\nadd_pdo_extension ' + extension;
+        return;
+      // match sqlite
+      case /^sqlite$/.test(extension):
+        extension = 'sqlite3';
+        command = command_prefix + version + '-' + extension + pipe;
+        break;
      default:
-        install_command =
-          'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
-          version +
-          '-' +
-          extension.replace('pdo_', '').replace('pdo-', '') +
-          pipe;
+        command = command_prefix + version + '-' + extension + pipe;
        break;
    }
    script +=
-      '\nadd_extension ' + extension + ' "' + install_command + '" ' + prefix;
+      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
  });
  return script;
 }
@ -217,7 +302,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,
@ -239,7 +324,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':
--- a/src/install.ts
+++ b/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) {
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@ -20,27 +20,17 @@ add_log() {
 remove_extension() {
  extension=$1
  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
 }

-# Function to setup extensions
-add_extension() {
+# Function to test if extension is loaded
+check_extension() {
  extension=$1
-  install_command=$2
-  prefix=$3
-  if ! php -m | grep -i -q -w "$extension" && [ -e "$ext_dir/$extension.so" ]; then
-    echo "$prefix=$ext_dir/$extension.so" >>"$ini_file" && add_log "$tick" "$extension" "Enabled"
-  elif php -m | grep -i -q -w "$extension"; then
-    add_log "$tick" "$extension" "Enabled"
-  elif ! php -m | grep -i -q -w "$extension"; then
-    if [[ "$version" =~ $old_versions ]]; then
-      (sudo port install php"$nodot_version"-"$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
-      (eval "$install_command" >/dev/null 2>&1 && echo "$prefix=$ext_dir/$extension.so" >>"$ini_file" && add_log "$tick" "$extension" "Installed and enabled") ||
-      add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
-    else
-      (eval "$install_command" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
-      add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
-    fi
+  if [ "$extension" != "mysql" ]; then
+    php -m | grep -i -q -w "$extension"
+  else
+    php -m | grep -i -q "$extension"
  fi
 }

@ -57,68 +47,86 @@ get_pecl_version() {
  echo "$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"
+  fi
+  ext_version=$(php -r "echo phpversion('$extension');")
+  if [ "$ext_version" = "$pecl_version" ]; then
+    add_log "$tick" "$extension" "Enabled"
+  else
+    remove_extension "$extension"
+    (
+      sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
+      check_extension "$extension" &&
+      add_log "$tick" "$extension" "Installed and enabled"
+    ) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"
+  fi
+}
+
+# Function to setup extensions
+add_extension() {
+  extension=$1
+  install_command=$2
+  prefix=$3
+  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
+    echo "$prefix=$ext_dir/$extension.so" >>"$ini_file" && add_log "$tick" "$extension" "Enabled"
+  elif check_extension "$extension"; then
+    add_log "$tick" "$extension" "Enabled"
+  elif ! check_extension "$extension"; then
+    eval "$install_command" >/dev/null 2>&1 &&
+    if [[ "$version" =~ $old_versions ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
+    (check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
+    add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
+  fi
+}
+
 # Function to pre-release extensions using PECL
 add_unstable_extension() {
  extension=$1
  stability=$2
  prefix=$3
  pecl_version=$(get_pecl_version "$extension" "$stability")
-  if ! php -m | grep -i -q -w "$extension" && [ -e "$ext_dir/$extension.so" ]; then
-    extension_version=$(php -d="$prefix=$extension" -r "echo phpversion('$extension');")
-    if [ "$extension_version" = "$pecl_version" ]; then
-      echo "$prefix=$extension" >>"$ini_file" && add_log "$tick" "$extension" "Enabled"
-    else
-      remove_extension "$extension"
-      add_extension "$extension" "sudo pecl install -f $extension-$pecl_version" "$prefix"
-    fi
-  elif php -m | grep -i -q -w "$extension"; then
-    extension_version=$(php -r "echo phpversion('$extension');")
-    if [ "$extension_version" = "$pecl_version" ]; then
-      add_log "$tick" "$extension" "Enabled"
-    else
-      remove_extension "$extension"
-      add_extension "$extension" "sudo pecl install -f $extension-$pecl_version" "$prefix"
-    fi
-  else
-    add_extension "$extension" "sudo pecl install -f $extension-$pecl_version" "$prefix"
-  fi
+  add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }

 # Function to setup a remote tool
 add_tool() {
  url=$1
  tool=$2
-  if [ "$tool" = "composer" ]; then
-    brew install composer >/dev/null 2>&1
-    composer -q global config process-timeout 0
+  tool_path="$tool_path_dir/$tool"
+  if [ ! -e "$tool_path" ]; then
+    rm -rf "$tool_path"
+  fi
+
+  status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" -L "$url")
+  if [ "$status_code" = "200" ]; then
+    sudo chmod a+x "$tool_path"
+    if [ "$tool" = "composer" ]; then
+      composer -q global config process-timeout 0
+    elif [ "$tool" = "phive" ]; then
+      add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1
+      add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1
+      add_extension xml "sudo pecl install -f xml" extension >/dev/null 2>&1
+    elif [ "$tool" = "cs2pr" ]; then
+      sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
+      tr -d '\r' <"$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"
+      sudo chmod a+x "$tool_path"
+    elif [ "$tool" = "wp-cli" ]; then
+      sudo cp -p "$tool_path" "$tool_path_dir"/wp
+    fi
    add_log "$tick" "$tool" "Added"
  else
-    tool_path=/usr/local/bin/"$tool"
-    if [ ! -e "$tool_path" ]; then
-      rm -rf "$tool_path"
-    fi
-
-    status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" -L "$url")
-    if [ "$status_code" = "200" ]; then
-      sudo chmod a+x "$tool_path"
-      if [ "$tool" = "phive" ]; then
-        add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1
-        add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1
-        add_extension xml "sudo pecl install -f xml" extension >/dev/null 2>&1
-      elif [ "$tool" = "cs2pr" ]; then
-        sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
-        tr -d '\r' < "$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"
-        sudo chmod a+x "$tool_path"
-      fi
-      add_log "$tick" "$tool" "Added"
-    else
-      add_log "$cross" "$tool" "Could not setup $tool"
-    fi
+    add_log "$cross" "$tool" "Could not setup $tool"
  fi
 }

 # Function to add a tool using composer
-add_composer_tool() {
+add_composertool() {
  tool=$1
  release=$2
  prefix=$3
@ -129,15 +137,24 @@ add_composer_tool() {
  ) || 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 install blackfire-agent >/dev/null 2>&1
+  sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
+  brew services start blackfire-agent >/dev/null 2>&1
+  sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  add_log "$tick" "blackfire" "Added"
+  add_log "$tick" "blackfire-agent" "Added"
+}
+
 # Function to configure PECL
 configure_pecl() {
-  if [[ ! "$version" =~ $old_versions ]]; then
-    for tool in pear pecl; do
-      sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1
-      sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
-      sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
-    done
-  fi
+  for tool in pear pecl; do
+    sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1
+    sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
+    sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
+  done
 }

 # Function to log PECL, it is installed along with PHP
@ -145,39 +162,13 @@ add_pecl() {
  add_log "$tick" "PECL" "Added"
 }

-# Function to add PECL when macports is used
-add_pecl_old() {
-  pecl_version='master'
-  if [ "$1" = "53" ]; then
-    pecl_version='v1.9.5'
-  fi
-  curl -o pear.phar -sSL https://github.com/pear/pearweb_phars/raw/$pecl_version/install-pear-nozlib.phar
-  sudo php pear.phar -d /opt/local/lib/php$1 -b /usr/local/bin && rm -rf pear.phar
-}
-
-add_macports() {
-  uri=$(curl -sSL https://github.com/macports/macports-base/releases | grep -Eo "(\/.*Catalina.pkg)" | head -n 1)
-  curl -o port.pkg -sSL https://github.com"$uri"
-  sudo installer -pkg port.pkg -target / && rm -rf port.pkg
-}
-
-sync_macports() {
-  while true; do
-    status=0
-    sudo port sync || status=$?
-    if [[ "$status" -eq 0 ]]; then
-      break
-    fi
-    sleep 2
-  done
-}
-
-port_setup_php() {
-  sudo port install php$1 php$1-curl php$1-mbstring php$1-xmlrpc php$1-openssl php$1-opcache
-  sudo cp /opt/local/etc/php$1/php.ini-development /opt/local/etc/php$1/php.ini
-  sudo port select --set php php$1
-  sudo ln -sf /opt/local/bin/* /usr/local/bin
-  add_pecl_old "$1"
+# Function to setup PHP >=5.6
+setup_php() {
+  action=$1
+  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE >/dev/null 2>&1
+  brew tap shivammathur/homebrew-php >/dev/null 2>&1
+  brew "$action" shivammathur/php/php@"$version" >/dev/null 2>&1
+  brew link --force --overwrite php@"$version" >/dev/null 2>&1
 }

 # Variables
@ -186,40 +177,30 @@ cross="✗"
 version=$1
 nodot_version=${1/./}
 old_versions="5.[3-5]"
+tool_path_dir="/usr/local/bin"
 existing_version=$(php-config --version | cut -c 1-3)
 [[ -z "${update}" ]] && update='false' || update="${update}"

 # Setup PHP
 step_log "Setup PHP"
 if [[ "$version" =~ $old_versions ]]; then
-  export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
-  export TERM=xterm
-  step_log "Setup Macports"
-  add_macports >/dev/null 2>&1
-  add_log "$tick" "Macports" "Installed"
-  sync_macports >/dev/null 2>&1
-  add_log "$tick" "Macports" "Synced"
-  step_log "Setup PHP"
-  port_setup_php $nodot_version >/dev/null 2>&1
+  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" ] || [ "$update" = "true" ]; then
-  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE >/dev/null 2>&1
-  brew tap shivammathur/homebrew-php >/dev/null 2>&1
-  brew install shivammathur/php/php@"$version" >/dev/null 2>&1
-  brew link --force --overwrite php@"$version" >/dev/null 2>&1
-  if [ "$update" = "true" ]; then
-    status="Updated to"
-  else
-    status="Installed"
-  fi
+elif [ "$existing_version" != "$version" ]; then
+  setup_php "install"
+  status="Installed"
+elif [ "$existing_version" = "$version" ] && [ "$update" = "true" ]; then
+  setup_php "upgrade"
+  status="Updated to"
 else
  status="Found"
 fi
 ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
-sudo chmod 777 "$ini_file"
+sudo chmod 777 "$ini_file" "$tool_path_dir"
 echo "date.timezone=UTC" >>"$ini_file"
-ext_dir=$(php -i | grep -Ei "extension_dir => /(usr|opt)" | sed -e "s|.*=> s*||")
+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 ' ')
-configure_pecl
-add_log "$tick" "PHP" "$status PHP $semver"
+if [[ ! "$version" =~ $old_versions ]]; then configure_pecl; fi
+add_log "$tick" "PHP" "$status PHP $semver"
--- a/src/scripts/ext/blackfire.ps1
+++ b/src/scripts/ext/blackfire.ps1
@ -0,0 +1,30 @@
+Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [string]
+    $version,
+    [Parameter(Position = 2, Mandatory = $false)]
+    [ValidateNotNull()]
+    [string]
+    $extension_version
+)
+
+$tick = ([char]8730)
+$php_dir = 'C:\tools\php'
+$ext_dir = $php_dir + '\ext'
+$arch='x64'
+if ($version -lt '7.0') { $arch='x86' }
+$version = $version.replace('.', '')
+
+if (Test-Path $ext_dir\blackfire.dll) {
+    Enable-PhpExtension -Extension blackfire -Path $php_dir
+    $status="Enabled"
+} else {
+    $installed = Get-Php -Path $php_dir
+    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
+    Invoke-WebRequest -UseBasicParsing -Uri "https://packages.blackfire.io/binaries/blackfire-php/${extension_version}/blackfire-php-windows_${arch}-php-${version}${nts}.dll" -OutFile $ext_dir\blackfire.dll > $null 2>&1
+    Enable-PhpExtension -Extension blackfire -Path $php_dir
+    $status="Installed and enabled"
+}
+printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick "blackfire" "$status"
+
--- a/src/scripts/ext/blackfire.sh
+++ b/src/scripts/ext/blackfire.sh
@ -0,0 +1,7 @@
+version=${1/./}
+extension_version=$2
+ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
+scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
+ini_file="$scan_dir/50-blackfire.ini"
+sudo curl -o $ext_dir/blackfire.so -SL https://packages.blackfire.io/binaries/blackfire-php/$extension_version/blackfire-php-linux_amd64-php-$version.so
+echo "extension=blackfire.so" | sudo tee -a "$ini_file"
--- a/src/scripts/ext/blackfire_darwin.sh
+++ b/src/scripts/ext/blackfire_darwin.sh
@ -0,0 +1,7 @@
+version=${1/./}
+extension_version=$2
+ext_dir=$(php -i | grep -Ei "extension_dir => /usr" | sed -e "s|.*=> s*||")
+scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
+ini_file="$scan_dir/50-blackfire.ini"
+sudo curl -o $ext_dir/blackfire.so -SL https://packages.blackfire.io/binaries/blackfire-php/$extension_version/blackfire-php-darwin_amd64-php-$version.so
+echo "extension=blackfire.so" | sudo tee -a "$ini_file"
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@ -19,12 +19,14 @@ add_log() {
 # Function to update php ppa
 update_ppa() {
  if [ "$ppa_updated" = "false" ]; then
-    if [[ "$version" =~ $old_versions ]]; then
-      ppa="dotdeb-ubuntu-php*.list"
-    else
-      ppa="ondrej-ubuntu-php*.list"
-    fi
-    find /etc/apt/sources.list.d -type f -name "$ppa" -exec sudo "$debconf_fix" apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
+    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
+#    if [[ "$version" =~ $old_versions ]]; then
+#      ppa="dotdeb-ubuntu-php*.list"
+#    else
+#      ppa="ondrej-ubuntu-php*.list"
+#    fi
+#    find /etc/apt/sources.list.d -type f -name "$ppa" -exec sudo "$debconf_fix" apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
+    ppa_updated="true"
  fi
 }

@ -53,27 +55,14 @@ get_pecl_version() {
  echo "$pecl_version"
 }

-# Function to setup extensions
-add_extension() {
+# Function to test if extension is loaded
+check_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} && ppa_updated='true'"
+  if [ "$extension" != "mysql" ]; then
+    php -m | grep -i -q -w "$extension"
+  else
+    php -m | grep -i -q "$extension"
  fi
-  if ! php -m | grep -i -q -w "$extension" && [ -e "$ext_dir/$extension.so" ]; then
-    # shellcheck disable=SC2046
-    $apt_install $(apt-cache depends php"$version"-"$extension" 2>/dev/null | awk '/Depends:/{print$2}') >/dev/null 2>&1
-    echo "$prefix=$extension.so" >>"$ini_file" && add_log "$tick" "$extension" "Enabled"
-  elif php -m | grep -i -q -w "$extension"; then
-    add_log "$tick" "$extension" "Enabled"
-  elif ! php -m | grep -i -q -w "$extension"; then
-    (eval "$install_command" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
-    (update_ppa && eval "$install_command" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled" && ppa_updated="true") ||
-    (sudo pecl install -f "$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
-    add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
-  fi
-  sudo chmod 777 "$ini_file"
 }

 # Function to delete extensions
@ -93,14 +82,72 @@ remove_extension() {
  delete_extension "$extension"
 }

+# Function to enable existing extension
+enable_extension() {
+  if ! check_extension "$1" && [ -e "$ext_dir/$1.so" ]; then
+    echo "$2=$1.so" >>"$ini_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
+    if [ "$ext" = "mysql" ]; then
+      enable_extension "mysqlnd" "extension"
+      ext_name="mysqli"
+    fi
+    add_extension "$ext_name" "$apt_install php$version-$ext" "extension" >/dev/null 2>&1
+    enable_extension "$pdo_ext" "extension"
+    (check_extension "$pdo_ext" && add_log "$tick" "$pdo_ext" "Enabled") ||
+    add_log "$cross" "$pdo_ext" "Could not install $pdo_ext on PHP $semver"
+  fi
+}
+
+# Function to setup 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
+    eval "$install_command" >/dev/null 2>&1 ||
+    (update_ppa && 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"
+  fi
+  sudo chmod 777 "$ini_file"
+}
+
 # Function to install a PECL version
 add_pecl_extension() {
  extension=$1
  pecl_version=$2
-  delete_extension "$extension"
-  (sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
-  add_log "$tick" "$extension" "Installed and enabled") ||
-  add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"
+  prefix=$3
+  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
+    echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"
+  fi
+  ext_version=$(php -r "echo phpversion('$extension');")
+  if [ "$ext_version" = "$pecl_version" ]; then
+    add_log "$tick" "$extension" "Enabled"
+  else
+    delete_extension "$extension"
+    (
+      sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
+      check_extension "$extension" &&
+      add_log "$tick" "$extension" "Installed and enabled"
+    ) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"
+  fi
 }

 # Function to pre-release extensions using PECL
@ -109,25 +156,7 @@ add_unstable_extension() {
  stability=$2
  prefix=$3
  pecl_version=$(get_pecl_version "$extension" "$stability")
-  if ! php -m | grep -i -q -w "$extension" && [ -e "$ext_dir/$extension.so" ]; then
-    extension_version=$(php -d="$prefix=$extension" -r "echo phpversion('$extension');")
-    if [ "$extension_version" = "$pecl_version" ]; then
-      echo "$prefix=$extension.so" >>"$ini_file" && add_log "$tick" "$extension" "Enabled"
-    else
-      delete_extension "$extension"
-      add_pecl_extension "$extension" "$pecl_version"
-    fi
-  elif php -m | grep -i -q -w "$extension"; then
-    extension_version=$(php -r "echo phpversion('$extension');")
-    if [ "$extension_version" = "$pecl_version" ]; then
-      add_log "$tick" "$extension" "Enabled"
-    else
-      delete_extension "$extension"
-      add_pecl_extension "$extension" "$pecl_version"
-    fi
-  else
-    add_pecl_extension "$extension" "$pecl_version"
-  fi
+  add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }

 # Function to update extension
@ -140,7 +169,6 @@ update_extension() {
    version_exists=$(apt-cache policy -- *"$extension" | grep "$final_version")
    if [ -z "$version_exists" ]; then
      update_ppa
-      ppa_updated="true"
    fi
    $apt_install php"$version"-"$extension"
  fi
@ -150,7 +178,7 @@ update_extension() {
 add_tool() {
  url=$1
  tool=$2
-  tool_path=/usr/local/bin/"$tool"
+  tool_path="$tool_path_dir/$tool"
  if [ ! -e "$tool_path" ]; then
    rm -rf "$tool_path"
  fi
@ -165,6 +193,8 @@ add_tool() {
      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
      add_extension xml "$apt_install php$version-xml" extension >/dev/null 2>&1
+    elif [ "$tool" = "wp-cli" ]; then
+      sudo cp -p "$tool_path" "$tool_path_dir"/wp
    fi
    add_log "$tick" "$tool" "Added"
  else
@ -173,7 +203,7 @@ add_tool() {
 }

 # Function to setup a tool using composer
-add_composer_tool() {
+add_composertool() {
  tool=$1
  release=$2
  prefix=$3
@ -194,12 +224,26 @@ add_devtools() {
  configure_pecl
 }

+add_blackfire() {
+  sudo mkdir -p /var/run/blackfire
+  sudo curl -o /tmp/blackfire-gpg.key -sSL https://packages.blackfire.io/gpg.key >/dev/null 2>&1
+  sudo apt-key add /tmp/blackfire-gpg.key >/dev/null 2>&1
+  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
+  $apt_install blackfire-agent >/dev/null 2>&1
+  sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
+  sudo /etc/init.d/blackfire-agent restart >/dev/null 2>&1
+  sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
+  add_log "$tick" "blackfire" "Added"
+  add_log "$tick" "blackfire-agent" "Added"
+}
+
 # Function to setup the nightly build from master branch
 setup_master() {
  tar_file=php_"$version"%2Bubuntu"$(lsb_release -r -s)".tar.xz
  install_dir=~/php/"$version"
  sudo mkdir -m 777 -p ~/php
-  $apt_install libicu-dev >/dev/null 2>&1
+  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"
@ -242,6 +286,28 @@ switch_version() {
  done
 }

+# Function to get PHP version in semver format
+php_semver() {
+  if [ ! "$version" = "8.0" ]; 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
+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
+  updated_version=$(php_semver)
+  if [ "$updated_version" != "$initial_version" ]; then
+    status="Updated to"
+  else
+    status="Switched to"
+  fi
+}
+
 # Variables
 tick="✓"
 cross="✗"
@ -251,6 +317,7 @@ version=$1
 old_versions="5.[4-5]"
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
 apt_install="sudo $debconf_fix apt-fast install -y"
+tool_path_dir="/usr/local/bin"
 existing_version=$(php-config --version | cut -c 1-3)
 [[ -z "${update}" ]] && update='false' || update="${update}"

@ -265,18 +332,13 @@ if [ "$existing_version" != "$version" ]; then
    elif [[ "$version" =~ $old_versions ]] || [ "$version" = "5.3" ]; then
      setup_old_versions
    else
-      version_exists=$(apt-cache policy -- php"$version" | grep "$version")
-      if [ -z "$version_exists" ]; then
-        update_ppa
-        ppa_updated="true"
-      fi
+      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
-      $apt_install php"$version" >/dev/null 2>&1
-      status="Updated to"
+      update_php
    else
      status="Switched to"
    fi
@ -289,20 +351,15 @@ if [ "$existing_version" != "$version" ]; then

 else
  if [ "$update" = "true" ]; then
-    $apt_install php"$version" >/dev/null 2>&1
-    status="Updated to"
+    update_php
  else
    status="Found"
  fi
 fi

-semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
-if [ ! "$version" = "8.0" ]; then
-  semver=$(echo "$semver" | cut -f 1 -d '-')
-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"
+sudo chmod 777 "$ini_file" "$tool_path_dir"
 add_log "$tick" "PHP" "$status PHP $semver"
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@ -20,6 +20,18 @@ Function Add-Log($mark, $subject, $message) {
  printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $code $mark $subject $message
 }

+Function Install-PhpManager() {
+  $repo = "mlocati/powershell-phpmanager"
+  $zip_file = "$php_dir\PhpManager.zip"
+  $tags = Invoke-WebRequest https://api.github.com/repos/$repo/tags | ConvertFrom-Json
+  $tag = $tags[0].Name
+  $module_path = "$php_dir\PhpManager\powershell-phpmanager-$tag\PhpManager"
+  Invoke-WebRequest -UseBasicParsing -Uri https://github.com/$repo/archive/$tag.zip -OutFile $zip_file
+  Expand-Archive -Path $zip_file -DestinationPath $php_dir\PhpManager
+  Import-Module $module_path
+  Add-Content -Path $PsHome\profile.ps1 -Value "Import-Module $module_path"
+}
+
 Function Add-Extension {
  Param (
    [Parameter(Position = 0, Mandatory = $true)]
@ -103,7 +115,7 @@ Function Add-Tool() {
  }
  if ($tool -eq "symfony") {
    Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool.exe
-    Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.exe" > $null 2>&1
+    Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.exe" >$null 2>&1
  } else {
    try {
      Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool
@ -113,7 +125,7 @@ Function Add-Tool() {
      $bat_content += "SET BIN_TARGET=%~dp0/" + $tool
      $bat_content += "php %BIN_TARGET% %*"
      Set-Content -Path $php_dir\$tool.bat -Value $bat_content
-      Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.bat" > $null 2>&1
+      Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.bat" >$null 2>&1
    } catch { }
  }
  if($tool -eq "phive") {
@ -124,6 +136,8 @@ Function Add-Tool() {
    (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
  } elseif($tool -eq "composer") {
    composer -q global config process-timeout 0
+  } elseif($tool -eq "wp-cli") {
+    Copy-Item $php_dir\wp-cli.bat -Destination $php_dir\wp.bat
  }
  if (((Get-ChildItem -Path $php_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
    Add-Log $tick $tool "Added"
@ -132,7 +146,7 @@ Function Add-Tool() {
  }
 }

-Function Add-Composer-Tool() {
+Function Add-Composertool() {
  Param (
    [Parameter(Position = 0, Mandatory = $true)]
    [ValidateNotNull()]
@ -160,10 +174,33 @@ Function Add-Composer-Tool() {
  }
 }

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

+Function Add-Blackfire() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $agent_version
+  )
+  $url = "https://packages.blackfire.io/binaries/blackfire-agent/${agent_version}/blackfire-agent-windows_${arch_name}.zip"
+  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\blackfire.zip >$null 2>&1
+  7z e $php_dir\blackfire.zip -o"$php_dir" -y >$null 2>&1
+  Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias blackfire $php_dir\blackfire.exe"
+  Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias blackfire-agent $php_dir\blackfire-agent.exe"
+  if ((Test-Path env:BLACKFIRE_SERVER_ID) -and (Test-Path env:BLACKFIRE_SERVER_TOKEN)) {
+    blackfire-agent --register --server-id=$env:BLACKFIRE_SERVER_ID --server-token=$env:BLACKFIRE_SERVER_TOKEN >$null 2>&1
+  }
+  if ((Test-Path env:BLACKFIRE_CLIENT_ID) -and (Test-Path env:BLACKFIRE_CLIENT_TOKEN)) {
+    blackfire --config --client-id=$env:BLACKFIRE_CLIENT_ID --client-token=$env:BLACKFIRE_CLIENT_TOKEN --ca-cert=$php_dir\ssl\cacert.pem >$null 2>&1
+  }
+  Add-Log $tick "blackfire" "Added"
+  Add-Log $tick "blackfire-agent" "Added"
+}
+
 # Variables
 $tick = ([char]8730)
 $cross = ([char]10007)
@ -172,13 +209,14 @@ $ext_dir = $php_dir + '\ext'
 $ProgressPreference = 'SilentlyContinue'
 $master_version = '8.0'
 $arch = 'x64'
+$arch_name='amd64'
 $ts = $false
 if((Test-Path env:PHPTS) -and $env:PHPTS -eq 'ts') {
  $ts = $true
 }

 Step-Log "Setup PhpManager"
-Install-Module -Name PhpManager -Force -Scope CurrentUser
+Install-PhpManager >$null 2>&1
 Add-Log $tick "PhpManager" "Installed"

 $installed = $null
@ -195,6 +233,7 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
  if ($version -lt '7.0') {
    Install-Module -Name VcRedist -Force
    $arch='x86'
+    $arch_name='386'
  }
  if ($version -eq $master_version) {
    $version = 'master'
@ -203,7 +242,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') {
-    Update-Php $php_dir > $null 2>&1
+    Update-Php $php_dir >$null 2>&1
    $status = "Updated to"
  } else {
    $status = "Found"
--- a/src/tools.ts
+++ b/src/tools.ts
@ -1,60 +1,21 @@
 import * as utils from './utils';

 /**
- * Function to get command to setup tool
+ * Function to get command to setup tools
 *
 * @param os_version
+ * @param suffix
 */
-export async function getArchiveCommand(os_version: string): Promise<string> {
+export async function getCommand(
+  os_version: string,
+  suffix: string
+): Promise<string> {
  switch (os_version) {
    case 'linux':
    case 'darwin':
-      return 'add_tool ';
+      return 'add_' + suffix + ' ';
    case 'win32':
-      return 'Add-Tool ';
-    default:
-      return await utils.log(
-        'Platform ' + os_version + ' is not supported',
-        os_version,
-        'error'
-      );
-  }
-}
-
-/**
- * Function to get command to setup tools using composer
- *
- * @param os_version
- */
-export async function getPackageCommand(os_version: string): Promise<string> {
-  switch (os_version) {
-    case 'linux':
-    case 'darwin':
-      return 'add_composer_tool ';
-    case 'win32':
-      return 'Add-Composer-Tool ';
-    default:
-      return await utils.log(
-        'Platform ' + os_version + ' is not supported',
-        os_version,
-        'error'
-      );
-  }
-}
-
-/**
- *
- * Function to get command to setup PECL
- *
- * @param os_version
- */
-export async function getPECLCommand(os_version: string): Promise<string> {
-  switch (os_version) {
-    case 'linux':
-    case 'darwin':
-      return 'add_pecl ';
-    case 'win32':
-      return 'Add-PECL ';
+      return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
    default:
      return await utils.log(
        'Platform ' + os_version + ' is not supported',
@ -109,6 +70,8 @@ export async function parseTool(
 /**
 * Function to get the url of tool with the given version
 *
+ * @param tool
+ * @param extension
 * @param version
 * @param prefix
 * @param version_prefix
@ -207,16 +170,14 @@ export async function getCodeceptionUri(
    case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
      return codecept;
    default:
-      return await codecept;
+      return codecept;
  }
 }

 /**
 * Helper function to get script to setup phive
 *
- * @param tool
 * @param version
- * @param url
 * @param os_version
 */
 export async function addPhive(
@ -226,12 +187,12 @@ export async function addPhive(
  switch (version) {
    case 'latest':
      return (
-        (await getArchiveCommand(os_version)) +
+        (await getCommand(os_version, 'tool')) +
        'https://phar.io/releases/phive.phar phive'
      );
    default:
      return (
-        (await getArchiveCommand(os_version)) +
+        (await getCommand(os_version, 'tool')) +
        'https://github.com/phar-io/phive/releases/download/' +
        version +
        '/phive-' +
@ -242,20 +203,24 @@ export async function addPhive(
 }

 /**
- * Function to get the PHPUnit url
+ * Function to get the phar url in domain/tool-version.phar format
 *
+ * @param domain
+ * @param tool
+ * @param prefix
 * @param version
 */
-export async function getPhpunitUrl(
+export async function getPharUrl(
+  domain: string,
  tool: string,
+  prefix: string,
  version: string
 ): Promise<string> {
-  const phpunit = 'https://phar.phpunit.de';
  switch (version) {
    case 'latest':
-      return phpunit + '/' + tool + '.phar';
+      return domain + '/' + tool + '.phar';
    default:
-      return phpunit + '/' + tool + '-' + version + '.phar';
+      return domain + '/' + tool + '-' + prefix + version + '.phar';
  }
 }

@ -308,10 +273,31 @@ export async function getSymfonyUri(
  }
 }

+/**
+ * Function to get the WP-CLI url
+ *
+ * @param version
+ */
+export async function getWpCliUrl(version: string): Promise<string> {
+  switch (version) {
+    case 'latest':
+      return 'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true';
+    default:
+      return await getUri(
+        'wp-cli',
+        '-' + version + '.phar',
+        version,
+        'wp-cli/wp-cli/releases',
+        'v',
+        'download'
+      );
+  }
+}
+
 /**
 * 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($|:.*)/;
@ -341,7 +327,7 @@ export async function getCleanedToolsList(
    .map(function(extension: string) {
      return extension
        .trim()
-        .replace(/robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
+        .replace(/symfony\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
    })
    .filter(Boolean);
  return [...new Set(tools_list)];
@ -361,7 +347,7 @@ export async function addArchive(
  url: string,
  os_version: string
 ): Promise<string> {
-  return (await getArchiveCommand(os_version)) + url + ' ' + tool;
+  return (await getCommand(os_version, 'tool')) + url + ' ' + tool;
 }

 /**
@ -413,14 +399,15 @@ export async function addPackage(
  prefix: string,
  os_version: string
 ): Promise<string> {
-  const tool_command = await getPackageCommand(os_version);
+  const tool_command = await getCommand(os_version, 'composertool');
  return tool_command + tool + ' ' + release + ' ' + prefix;
 }

 /**
 * Setup tools
 *
- * @param tool_csv
+ * @param tools_csv
+ * @param php_version
 * @param os_version
 */
 export async function addTools(
@ -446,6 +433,17 @@ export async function addTools(
    script += '\n';
    let url = '';
    switch (tool) {
+      case 'blackfire':
+      case 'blackfire-agent':
+        script += await getCommand(
+          os_version,
+          'blackfire ' + (await utils.getBlackfireAgentVersion())
+        );
+        break;
+      case 'blackfire-player':
+        url = await getPharUrl('https://get.blackfire.io', tool, 'v', version);
+        script += await addArchive(tool, version, url, os_version);
+        break;
      case 'cs2pr':
        uri = await getUri(tool, '', version, 'releases', '', 'download');
        url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
@ -477,8 +475,10 @@ export async function addTools(
        script += await addArchive(tool, version, url, os_version);
        break;
      case 'composer':
-        url =
-          github + 'composer/composer/releases/latest/download/composer.phar';
+        // 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);
        break;
      case 'codeception':
@ -489,13 +489,16 @@ export async function addTools(
        break;
      case 'phpcpd':
      case 'phpunit':
-        url = await getPhpunitUrl(tool, version);
+        url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
        script += await addArchive(tool, version, url, os_version);
        break;
      case 'deployer':
        url = await getDeployerUrl(version);
        script += await addArchive(tool, version, url, os_version);
        break;
+      case 'flex':
+        script += await addPackage(tool, release, 'symfony/', os_version);
+        break;
      case 'phinx':
        script += await addPackage(tool, release, 'robmorgan/', os_version);
        break;
@ -511,7 +514,7 @@ export async function addTools(
        );
        break;
      case 'pecl':
-        script += await getPECLCommand(os_version);
+        script += await getCommand(os_version, 'pecl');
        break;
      case 'php-config':
      case 'phpize':
@ -523,6 +526,10 @@ export async function addTools(
        url = github + 'symfony/cli/' + uri;
        script += await addArchive('symfony', version, url, os_version);
        break;
+      case 'wp-cli':
+        url = github + (await getWpCliUrl(version));
+        script += await addArchive(tool, version, url, os_version);
+        break;
      default:
        script += await utils.addLog(
          '$cross',
--- a/src/utils.ts
+++ b/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(
-  filename: string,
-  version: string,
-  os_version: string
-): Promise<string> {
+export async function readScript(filename: string): Promise<string> {
  return fs.readFileSync(
    path.join(__dirname, '../src/scripts/' + filename),
    'utf8'
@ -165,7 +159,6 @@ export async function readScript(
 * Write final script which runs
 *
 * @param filename
- * @param version
 * @param script
 */
 export async function writeScript(
@ -196,6 +189,7 @@ export async function extensionArray(
        .map(function(extension: string) {
          return extension
            .trim()
+            .toLowerCase()
            .replace('php-', '')
            .replace('php_', '');
        })
@ -261,3 +255,28 @@ 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';
+}
--- a/tsconfig.json
+++ b/tsconfig.json
@ -2,7 +2,7 @@
  "compilerOptions": {
    /* Basic Options */
    // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "ES2020",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
    // "allowJs": true,                       /* Allow javascript files to be compiled. */
    // "checkJs": true,                       /* Report errors in .js files. */
Author	SHA1	Message	Date
Shivam Mathur	f58dc6eca1	Update all lists	2020-03-20 19:09:27 +05:30
Shivam Mathur	5326f2302f	Merge pull request #203 from shivammathur/develop 2.1.3	2020-03-18 16:26:15 +05:30
Shivam Mathur	b9a78a31fb	Bump version to 2.1.3	2020-03-18 16:26:11 +05:30
Shivam Mathur	ba69b25cab	Install PhpManager from GitHub repo	2020-03-18 16:26:01 +05:30
Shivam Mathur	a6533acdd4	Update FUNDING.yml	2020-03-18 13:09:15 +05:30
Shivam Mathur	d3b37e3d0d	Add SECURITY.md	2020-03-18 13:09:07 +05:30
Shivam Mathur	f3a1262ff6	Fix db extensions	2020-03-16 08:13:25 +05:30
Shivam Mathur	933abd531a	Merge pull request #201 from shivammathur/develop 2.1.2	2020-03-14 15:29:33 +05:30
Shivam Mathur	67ed7f234b	Bump version to 2.1.2	2020-03-14 15:04:10 +05:30
Shivam Mathur	f90accffb3	Change case in README	2020-03-14 14:58:34 +05:30
dependabot-preview[bot]	93441b70bf	[Security] Bump acorn from 6.4.0 to 6.4.1 Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1. This update includes a security fix. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-14 14:58:18 +05:30
Shivam Mathur	67f23b6380	Improve code quality	2020-03-14 14:57:21 +05:30
Shivam Mathur	2937ad6e7a	Improve extension support	2020-03-14 14:55:28 +05:30
Shivam Mathur	a5e5d07fcb	Merge pull request #199 from shivammathur/develop 2.1.1	2020-03-14 14:48:42 +05:30
Shivam Mathur	30d8b321f4	Bump version to 2.1.1	2020-03-14 14:48:27 +05:30
Shivam Mathur	405e57e429	Switch to macports based builds for old PHP on darwin	2020-03-08 08:10:10 +05:30
Shivam Mathur	58f376b118	Fix caching PDO extensions on linux	2020-03-07 17:00:39 +05:30
Shivam Mathur	b7d68d8225	Merge pull request #196 from shivammathur/develop Hotfix 2.1.0	2020-03-02 20:11:17 +05:30
Shivam Mathur	9252820289	Fix logs of blackfire setup	2020-03-02 19:56:53 +05:30
Shivam Mathur	a5cc9fab25	Merge pull request #195 from shivammathur/develop 2.1.0	2020-02-29 22:30:50 +05:30
Shivam Mathur	4e5685a75d	Bump version to 2.1.0	2020-02-29 21:38:22 +05:30
Shivam Mathur	d475227ba5	Improve README	2020-02-29 21:38:22 +05:30
Shivam Mathur	38cb8b924d	Use shivammathur/php5-darwin for PHP5 on darwin	2020-02-29 01:17:20 +05:30
Shivam Mathur	fdd83e94df	Update tools in README	2020-02-29 00:26:00 +05:30
Shivam Mathur	ad112b7981	Fix support for symfony/flex	2020-02-28 16:51:00 +05:30
Shivam Mathur	2b0d6e221f	Improve blackfire examples	2020-02-28 15:42:17 +05:30
Shivam Mathur	acee5b203f	Add support for blackfire client, agent and player	2020-02-28 14:43:57 +05:30
Shivam Mathur	84e88e382f	Fix and refactor ext-blackfire	2020-02-27 19:27:11 +05:30
Shivam Mathur	bbdc4e3b67	Merge pull request #193 from jaapio/feature/ext-blackfire 🎉 Add blackfire extenstion	2020-02-27 15:50:29 +05:30
Jaapio	311eb9f3ba	Add example	2020-02-27 11:12:57 +01:00
Jaapio	3dfd7a648b	Add blackfire support on windows	2020-02-27 11:12:56 +01:00
Jaapio	943f491830	Add blackfire on OSX	2020-02-27 11:12:52 +01:00
Jaapio	dc9461a053	Add blackfire to linux install Add logging about install process Fix formating of semversion blackfire Only add version when needed Pass phpversion	2020-02-27 10:38:52 +01:00
Shivam Mathur	f2720d7b82	Update examples to start mysql service	2020-02-26 22:15:27 +05:30
Shivam Mathur	99161b7790	Add perimission for composer self-update	2020-02-25 23:01:49 +05:30
Shivam Mathur	5de6285e1f	Fix composer version	2020-02-25 22:05:48 +05:30
Shivam Mathur	14d702e830	Fix test name	2020-02-25 17:58:15 +05:30
Shivam Mathur	9539b27b4a	Add symfony/flex to supported tools	2020-02-25 10:00:07 +05:30
Shivam Mathur	a4f7326577	Move dependency setup to cache-extensions	2020-02-25 09:38:53 +05:30
Shivam Mathur	9b297384e1	Fix versioned extensions	2020-02-24 21:14:54 +05:30
Shivam Mathur	9d77946f60	Switch to liip for old PHP on darwin	2020-02-24 20:24:08 +05:30
Shivam Mathur	6d21e6dc05	Revert instllaing libicu64	2020-02-23 01:46:35 +05:30
Shivam Mathur	68c827cfcf	Fix wp-cli support	2020-02-23 01:19:07 +05:30
Geoff Taylor	d95ca49e8d	WP-CLI tool support added	2020-02-23 01:18:24 +05:30
Shivam Mathur	03fd0b8719	Merge pull request #190 from shivammathur/develop Hotfix: Force install libicu64 for PHP 8.0	2020-02-23 00:43:53 +05:30
Shivam Mathur	ebe1c12c21	Hotfix: Force install libicu64 for PHP 8.0	2020-02-23 00:28:35 +05:30
Shivam Mathur	b46021d870	Merge pull request #186 from shivammathur/develop Update ppa before installing PHP	2020-02-22 00:30:07 +05:30
Shivam Mathur	64ba54fc1b	Hotfix: Force update ppa	2020-02-22 00:16:22 +05:30
Shivam Mathur	71571f685a	Merge pull request #185 from shivammathur/develop 2.0.2	2020-02-21 14:19:53 +05:30
Shivam Mathur	10f86cb1a1	Bump version to 2.0.2	2020-02-21 14:06:08 +05:30
Shivam Mathur	0f694c5087	Update README	2020-02-21 14:06:08 +05:30
Shivam Mathur	9dfebd1adb	Refactor scripts	2020-02-21 11:33:58 +05:30
Shivam Mathur	3781acab4b	Fix link in README	2020-02-20 04:15:24 +05:30