v1 maintenance release

.github/workflows/experimental-workflow.yml

@@ -2,19 +2,13 @@ name: Experimental workflow
 on:
   pull_request:
     branches:
-      - nightly
+      - releases/v1
-      - master
-      - develop
-      - verbose
     paths-ignore:
       - '**.md'
       - 'examples/**'
   push:
     branches:
-      - nightly
+      - releases/v1
-      - master
-      - develop
-      - verbose
     paths-ignore:
       - '**.md'
       - 'examples/**'
@@ -27,9 +21,6 @@ jobs:
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
         php-versions: ['8.0']
-    env:
-      extensions: xml, opcache, xdebug, pcov
-      key: cache-v1
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -56,27 +47,12 @@ jobs:
         timeout-minutes: 1
         run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}
 
-      - name: Setup cache environment
-        id: cache-env
-        uses: shivammathur/cache-extensions@develop
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
-
       - name: Setup PHP with extensions and custom config
         run: node dist/index.js
         env:
           php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
+          extensions: xml, opcache, xdebug, pcov #optional
-          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata
+          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata #optional
           coverage: pcov
 
       - name: Testing PHP version

.github/workflows/workflow.yml

@@ -2,17 +2,13 @@ name: Main workflow
 on:
   pull_request:
     branches:
-      - master
+      - releases/v1
-      - develop
-      - verbose
     paths-ignore:
       - '**.md'
       - 'examples/**'
   push:
     branches:
-      - master
+      - releases/v1
-      - develop
-      - verbose
     paths-ignore:
       - '**.md'
       - 'examples/**'
@@ -24,10 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
-    env:
-      extensions: xml, opcache, xdebug, pcov
-      key: cache-v1
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -54,27 +47,12 @@ jobs:
         timeout-minutes: 1
         run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}
 
-      - name: Setup cache environment
-        id: cache-env
-        uses: shivammathur/cache-extensions@develop
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
-
       - name: Setup PHP with extensions and custom config
         run: node dist/index.js
         env:
           php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
+          extensions: xml, opcache, xdebug, pcov #optional
-          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata
+          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata #optional
 
       - name: Testing PHP version
         run: |

README.md

@@ -10,7 +10,7 @@
   <a href="https://github.com/shivammathur/setup-php" title="GitHub action to setup PHP"><img alt="GitHub Actions status" src="https://github.com/shivammathur/setup-php/workflows/Main%20workflow/badge.svg"></a>
   <a href="https://codecov.io/gh/shivammathur/setup-php" title="Code coverage"><img alt="Codecov Code Coverage" src="https://codecov.io/gh/shivammathur/setup-php/branch/master/graph/badge.svg"></a>
   <a href="https://github.com/shivammathur/setup-php/blob/master/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg"></a>
-  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-%3E%3D%205.3-8892BF.svg"></a>
+  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg"></a>
 </p>
 
 Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer in [GitHub Actions](https://github.com/features/actions "GitHub Actions"). This action gives you a cross platform interface to setup the PHP environment you need to test your application. Refer to [Usage](#memo-usage "How to use this") section and [examples](#examples "Examples of use") to see how to use this.
@@ -24,33 +24,25 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 - [Coverage support](#signal_strength-coverage-support)
   - [Xdebug](#xdebug)
   - [PCOV](#pcov)
-  - [Disable Coverage](#disable-coverage)
+  - [Disable coverage](#disable-coverage)
 - [Usage](#memo-usage)
-  - [Inputs](#inputs)
   - [Basic Setup](#basic-setup)
   - [Matrix Setup](#matrix-setup)
-  - [Experimental Setup](#experimental-setup)  
+  - [Experimental Setup](#experimental-setup)
-  - [Thread Safe Setup](#thread-safe-setup)
+  - [Thread Safe Setup](#thread-safe-setup)  
-  - [Force Update](#force-update)
+  - [Cache dependencies](#cache-dependencies)
-  - [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)
 - [Contributions](#1-contributions)
-- [Support This Project](#sparkling_heart-support-this-project)
+- [Support this project](#sparkling_heart-support-this-project)
-- [Dependencies](#bookmark-dependencies)
+- [This action uses the following works](#bookmark-this-action-uses-the-following-works)
 - [Further Reading](#bookmark_tabs-further-reading)
 
 ## :tada: PHP Support
 
 |PHP Version|Stability|Release Support|
 |--- |--- |--- |
-|5.3|`Stable`|`End of life`|
-|5.4|`Stable`|`End of life`|
-|5.5|`Stable`|`End of life`|
 |5.6|`Stable`|`End of life`|
 |7.0|`Stable`|`End of life`|
 |7.1|`Stable`|`End of life`|
@@ -71,73 +63,39 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 |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. PECL extensions if not available as a package can be installed by specifying `pecl` in the tools input.
+- 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 `windows` extensions which have `windows` binary on `PECL` can be installed.
-```yaml
+- On `macOS` extensions which are on `PECL` can be installed.
-uses: shivammathur/setup-php@v2
+- Extensions which are installed along with PHP if specified are enabled.
-with:
+- Extensions on `PECL` which do not have a latest stable version, their pre-release versions can be installed by suffixing the extension with its state i.e `alpha`, `beta`, `devel` or `snapshot` separated by a `-` like `msgpack-beta`.
-  php-version: '7.4'
+- Extensions which cannot be installed gracefully leave an error message in the logs, the action is not interrupted.
-  tools: pecl
-  extensions: swoole
-```
-
-- On `windows` PECL extensions which have the `DLL` binary can be installed.
-
-- On `macOS` PECL extensions can be installed.
-
-- Extensions installed along with PHP if specified are enabled.
-
-- 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: '5.4'
-  tools: pecl
-  extensions: swoole-1.9.3
-```
-
-- 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
-with:
-  php-version: '7.4'
-  tools: pecl
-  extensions: xdebug-beta
-```
-
-- 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.
 
-`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`
+`codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `pecl`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   tools: php-cs-fixer, phpunit
 ```
 
-To setup a particular version of a tool, specify it in this form `tool:version`.  
+To setup a particular version of a tool, specify it in the form `tool:version`.  
 Version should be in semver format and a valid release of the tool.
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   tools: php-cs-fixer:2.15.5, phpunit:8.5.1
 ``` 
 
-**Notes**
+**Note**
 - `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.
+- Specifying version for `composer` and `pecl` has no effect, latest version of both tools 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.
 
@@ -149,7 +107,7 @@ Specify `coverage: xdebug` to use `Xdebug`.
 Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action") except `8.0`.
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   coverage: xdebug
@@ -162,26 +120,26 @@ It is much faster than `Xdebug`.
 `PCOV` needs `PHP >= 7.1`.  
 If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  
 
+
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   ini-values: pcov.directory=api #optional, see above for usage.
   coverage: pcov
 ```
 
-### Disable Coverage
+### Disable coverage
 
-Specify `coverage: none` to remove both `Xdebug` and `PCOV`.  
+Specify `coverage: none` to disable both `Xdebug` and `PCOV`.  
 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
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   coverage: none
@@ -189,38 +147,15 @@ with:
 
 ## :memo: Usage
 
-### Inputs
+Inputs supported by this GitHub Action.
 
-#### `php-version` (required)
+- php-version `required`
+- extensions `optional`
+- ini-values `optional`
+- coverage `optional`
+- tools `optional`
 
-- Specify the PHP version you want to setup.
+See [action.yml](action.yml "Metadata for this GitHub Action") and usage below for more info.
-- Accepts a `string`. For example `'7.4'`.
-- See [PHP support](#tada-php-support) for supported PHP versions.
-
-#### `extensions` (optional)
-
-- Specify the extensions you want to setup.
-- Accepts a `string` in csv-format. For example `mbstring, zip`.
-- See [PHP extension support](#heavy_plus_sign-php-extension-support) for more info.
-
-#### `ini-values` (optional)
-
-- Specify the values you want to add to `php.ini`.
-- Accepts a `string` in csv-format. For example `post_max_size=256M, short_open_tag=On`.
-
-#### `coverage` (optional)
-
-- Specify the code coverage driver you want to setup.
-- Accepts `xdebug`, `pcov` or `none`.
-- See [coverage support](#signal_strength-coverage-support) for more info.
-
-#### `tools` (optional)
-
-- Specify the tools you want to setup.
-- Accepts a `string` in csv-format. For example `phpunit, phpcs`
-- See [tools Support](#wrench-tools-support) for tools supported.
-
-See below for more info.
 
 ### Basic Setup
 
@@ -232,13 +167,13 @@ steps:
   uses: actions/checkout@v2
 
 - name: Setup PHP
-  uses: shivammathur/setup-php@v2
+  uses: shivammathur/setup-php@v1
   with:
     php-version: '7.4'
-    extensions: mbstring, intl
+    extensions: mbstring, intl #optional, setup extensions
-    ini-values: post_max_size=256M, short_open_tag=On
+    ini-values: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
-    coverage: xdebug    
+    coverage: xdebug #optional, setup coverage driver
-    tools: php-cs-fixer, phpunit
+    tools: php-cs-fixer, phpunit #optional, setup tools globally
 ```
 
 ### Matrix Setup
@@ -259,13 +194,13 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: shivammathur/setup-php@v1
       with:
         php-version: ${{ matrix.php-versions }}
-        extensions: mbstring, intl
+        extensions: mbstring, intl #optional, setup extensions
-        ini-values: post_max_size=256M, short_open_tag=On
+        ini-values: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
-        coverage: xdebug        
+        coverage: xdebug #optional, setup coverage driver
-        tools: php-cs-fixer, phpunit
+        tools: php-cs-fixer, phpunit #optional, setup tools globally
 ```
 
 ### Experimental Setup
@@ -284,19 +219,19 @@ steps:
   uses: actions/checkout@v2
 
 - name: Setup PHP
-  uses: shivammathur/setup-php@v2
+  uses: shivammathur/setup-php@v1
   with:
     php-version: '8.0'
-    extensions: mbstring
+    extensions: mbstring #optional, setup extensions
-    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1
+    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1 #optional, setup php.ini configuration
-    coverage: pcov
+    coverage: pcov #optional, setup PCOV, Xdebug does not support this version yet.
-    tools: php-cs-fixer, phpunit
+    tools: php-cs-fixer, phpunit #optional, setup tools globally    
 ```
 
 ### 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
@@ -309,86 +244,21 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: shivammathur/setup-php@v1
       with:
         php-version: '7.4'
       env:
         PHPTS: ts # specify ts or nts
 ```
 
-### Force Update
+### Cache dependencies
 
-- Pre-installed PHP versions on the GitHub Actions runner are not updated to their latest patch release by default.
+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.
-- You can specify the `update` environment variable to `true` to force update to the latest release.
+
+**Note:** Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
 
 ```yaml
-- name: Setup PHP
+- name: Get Composer Cache Directory
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-  env:
-    update: true # specify true or false
-```
-
-### Verbose Setup
-
-To debug any issues, you can use the `verbose` tag instead of `v2`.
-
-```yaml
-- name: Setup PHP
-  uses: shivammathur/setup-php@verbose
-  with:
-    php-version: '7.4'
-```
-
-### Cache Extensions
-
-You can cache PHP extensions using [`shivammathur/cache-extensions`](https://github.com/shivammathur/cache-extensions "GitHub Action to cache php extensions") and [`action/cache`](https://github.com/actions/cache "GitHub Action to cache files") GitHub Actions. Extensions which take very long to setup if cached are available in the next workflow run and enabled directly which reduces the workflow execution time.
-
-```yaml
-runs-on: ${{ matrix.operating-system }}
-strategy:
-  matrix:
-    operating-system: [ubuntu-latest, windows-latest, macos-latest]
-    php-versions: ['7.2', '7.3', '7.4']
-name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
-env:
-  extensions: intl, pcov
-  key: cache-v1 # can be any string, change to clear the extension cache.
-steps:
-- name: Checkout
-  uses: actions/checkout@v2
-
-- name: Setup cache environment
-  id: cache-env
-  uses: shivammathur/cache-extensions@v1
-  with:
-    php-version: ${{ matrix.php-versions }}
-    extensions: ${{ env.extensions }}
-    key: ${{ env.key }}
-
-- name: Cache extensions
-  uses: actions/cache@v1
-  with:
-    path: ${{ steps.cache-env.outputs.dir }}
-    key: ${{ steps.cache-env.outputs.key }}
-    restore-keys: ${{ steps.cache-env.outputs.key }}
-
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: ${{ matrix.php-versions }}
-    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
-
-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
   id: composer-cache
   run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
@@ -399,58 +269,28 @@ If your project uses composer, you can persist composer's internal cache directo
     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
     restore-keys: ${{ runner.os }}-composer-
 
-- name: Install dependencies
+- name: Install Dependencies
   run: composer install --prefer-dist
 ```
 
-**Notes**
+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.
-- 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
 
-#### PHP
-
-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
-  run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-```
-
 #### PHPUnit
 
-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.
+You can 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"
 ```
 
-#### Other Tools
+#### Other tools
 
 For tools that support `checkstyle` reporting like `phpstan`, `psalm`, `php-cs-fixer` and `phpcs` you can use `cs2pr` to annotate your code.  
 For examples refer to [cs2pr documentation](https://github.com/staabm/annotate-pull-request-from-checkstyle).  
@@ -459,7 +299,7 @@ For examples refer to [cs2pr documentation](https://github.com/staabm/annotate-p
 
 ```yaml
 - name: Setup PHP
-  uses: shivammathur/setup-php@v2
+  uses: shivammathur/setup-php@v1
   with:
     php-version: '7.4'
     tools: cs2pr, phpstan
@@ -474,8 +314,6 @@ 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")|
@@ -500,32 +338,27 @@ 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](#bookmark-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](https://github.com/shivammathur/setup-php/network/dependencies "Dependencies for this PHP Action") and uses [various works](#bookmark-this-action-uses-the-following-works "Tools used by this action"). Their licenses can be found in their respective repositories.
 
 ## :+1: Contributions
 
 Contributions are welcome! See [Contributor's Guide](.github/CONTRIBUTING.md "shivammathur/setup-php contribution guide"). If you face any issues while using this or want to suggest a feature/improvement, create an issue [here](https://github.com/shivammathur/setup-php/issues "Issues reported").
 
-## :sparkling_heart: Support This Project
+## :sparkling_heart: Support this project
 
 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 of using this action.
+- 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 need any help using this, please contact me using [Codementor](https://www.codementor.io/shivammathur "Shivam Mathur Codementor")
 
-## :bookmark: Dependencies
+## :bookmark: This action uses the following works
 
-- [Node.js dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Node.js dependencies")
+- [ppa:ondrej/php](https://launchpad.net/~ondrej/+archive/ubuntu/php "Pre-compiled ubuntu packages")
-- [gplessis/dotdeb-php](https://github.com/gplessis/dotdeb-php "Packaging for end of life PHP versions")
+- [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Pre-compiled nightly PHP builds")
 - [mlocati/powershell-phpmanager](https://github.com/mlocati/powershell-phpmanager "Package to handle PHP on windows")
-- [ppa:ondrej/php](https://launchpad.net/~ondrej/+archive/ubuntu/php "Packaging active PHP packages")
-- [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-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
 

__tests__/extensions.test.ts

@@ -3,7 +3,7 @@ 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, phalcon4, ast-beta',
       '7.4',
       'win32'
     );
@@ -11,8 +11,6 @@ describe('Extension tests', () => {
     expect(win32).toContain('Add-Extension pcov');
     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(
       'phalcon3, does_not_exist',
@@ -25,26 +23,19 @@ 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, ast-beta, xdebug-alpha',
       '7.4',
       'linux'
     );
-    expect(linux).toContain('update_extension xdebug 2.9.1');
+    expect(linux).toContain('update_extension xdebug 2.9.0');
     expect(linux).toContain(
       'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php7.4-pcov'
     );
     expect(linux).toContain('add_unstable_extension ast beta extension');
-    expect(linux).toContain('add_pecl_extension grpc 1.2.3 extension');
     expect(linux).toContain(
       'add_unstable_extension xdebug alpha zend_extension'
     );
@@ -69,24 +60,17 @@ 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, ast-beta',
       '7.2',
       'darwin'
     );
     expect(darwin).toContain('sudo pecl install -f xdebug');
     expect(darwin).toContain('sudo pecl install -f pcov');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
-    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');
@@ -100,15 +84,6 @@ describe('Extension tests', () => {
     darwin = await extensions.addExtension('pcov', '7.2', 'darwin');
     expect(darwin).toContain('sudo pecl install -f pcov');
 
-    darwin = await extensions.addExtension('xdebug', '5.3', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.2.7');
-
-    darwin = await extensions.addExtension('xdebug', '5.4', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.4.1');
-
-    darwin = await extensions.addExtension('xdebug', '5.5', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
-
     darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
     expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
 
@@ -132,12 +107,6 @@ 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',

__tests__/install.test.ts

@@ -46,7 +46,7 @@ jest.mock('../src/install', () => ({
         case 'darwin':
         case 'linux':
           script = await install.build(os_version + '.sh', version, os_version);
-          script += 'bash script.sh ' + version + ' ' + __dirname;
+          script += 'sh script.sh ' + version + ' ' + __dirname;
           break;
         case 'win32':
           script = await install.build(os_version + '.sh', version, os_version);
@@ -117,7 +117,7 @@ describe('Install', () => {
     // @ts-ignore
     let script: string = await install.run();
     expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 7.3 ');
+    expect(script).toContain('sh script.sh 7.3 ');
 
     setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit', 'true');
     // @ts-ignore
@@ -126,7 +126,7 @@ describe('Install', () => {
     expect(script).toContain('install extensions');
     expect(script).toContain('edit php.ini');
     expect(script).toContain('set coverage driver');
-    expect(script).toContain('bash script.sh 7.3');
+    expect(script).toContain('sh script.sh 7.3');
     expect(script).toContain('add_tool');
 
     setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit', '');
@@ -136,7 +136,7 @@ describe('Install', () => {
     expect(script).toContain('install extensions');
     expect(script).toContain('edit php.ini');
     expect(script).toContain('set coverage driver');
-    expect(script).toContain('bash script.sh 7.3');
+    expect(script).toContain('sh script.sh 7.3');
     expect(script).toContain('add_tool');
   });
 
@@ -145,7 +145,7 @@ describe('Install', () => {
     // @ts-ignore
     let script: string = await install.run();
     expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 7.3 ' + __dirname);
+    expect(script).toContain('sh script.sh 7.3 ' + __dirname);
 
     setEnv('7.3', 'darwin', 'a, b', 'a=b', 'x', '', '');
     // @ts-ignore
@@ -154,7 +154,7 @@ describe('Install', () => {
     expect(script).toContain('install extensions');
     expect(script).toContain('edit php.ini');
     expect(script).toContain('set coverage driver');
-    expect(script).toContain('bash script.sh 7.3 ' + __dirname);
+    expect(script).toContain('sh script.sh 7.3 ' + __dirname);
   });
 
   it('Test malformed version inputs', async () => {
@@ -162,18 +162,18 @@ describe('Install', () => {
     // @ts-ignore
     let script: string = await install.run();
     expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 7.4 ' + __dirname);
+    expect(script).toContain('sh script.sh 7.4 ' + __dirname);
 
     setEnv(8.0, 'darwin', '', '', '', '', '');
     // @ts-ignore
     script = await install.run();
     expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 8.0 ' + __dirname);
+    expect(script).toContain('sh script.sh 8.0 ' + __dirname);
 
     setEnv(8, 'darwin', '', '', '', '', '');
     // @ts-ignore
     script = await install.run();
     expect(script).toContain('initial script');
-    expect(script).toContain('bash script.sh 8.0 ' + __dirname);
+    expect(script).toContain('sh script.sh 8.0 ' + __dirname);
   });
 });

__tests__/matchers.test.ts

@@ -18,10 +18,10 @@ describe('Matchers', () => {
     process.env['RUNNER_TOOL_CACHE'] = __dirname;
     await matchers.addMatchers();
     const spy = jest.spyOn(io, 'cp');
-    expect(spy).toHaveBeenCalledTimes(2);
+    expect(spy).toHaveBeenCalledTimes(1);
   });
 
-  it('Test PHPUnit Regex', async () => {
+  it('Test Regex', async () => {
     const regex1 = /^\d+\)\s.*$/;
     const regex2 = /^(.*Failed\sasserting\sthat.*)$/;
     const regex3 = /^\s*$/;
@@ -31,21 +31,4 @@ describe('Matchers', () => {
     expect(regex3.test('\n')).toBe(true);
     expect(regex4.test('/path/to/file.php:42')).toBe(true);
   });
-
-  it('Test PHP Regex', async () => {
-    const regex1 = /^(.*error):\s+\s+(.+) in (.+) on line (\d+)$/;
-    const regex2 = /^(.*Warning|.*Deprecated|.*Notice):\s+\s+(.+) in (.+) on line (\d+)$/;
-    expect(
-      regex1.test('PHP Parse error:  error_message in file.php on line 10')
-    ).toBe(true);
-    expect(
-      regex2.test('PHP Notice:  info_message in file.php on line 10')
-    ).toBe(true);
-    expect(
-      regex2.test('PHP Warning:  warning_message in file.php on line 10')
-    ).toBe(true);
-    expect(
-      regex2.test('PHP Deprecated:  deprecated_message in file.php on line 10')
-    ).toBe(true);
-  });
 });

__tests__/tools.test.ts

@@ -2,10 +2,28 @@ import * as tools from '../src/tools';
 
 describe('Tools tests', () => {
   it('checking getCommand', async () => {
-    expect(await tools.getCommand('linux', 'tool')).toBe('add_tool ');
+    expect(await tools.getArchiveCommand('linux')).toBe('add_tool ');
-    expect(await tools.getCommand('darwin', 'tool')).toBe('add_tool ');
+    expect(await tools.getArchiveCommand('darwin')).toBe('add_tool ');
-    expect(await tools.getCommand('win32', 'tool')).toBe('Add-Tool ');
+    expect(await tools.getArchiveCommand('win32')).toBe('Add-Tool ');
-    expect(await tools.getCommand('fedora', 'tool')).toContain(
+    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(
       'Platform fedora is not supported'
     );
   });
@@ -89,13 +107,22 @@ describe('Tools tests', () => {
   });
 
   it('checking getCodeceptionUriBuilder', async () => {
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php56')).toBe(
+    expect(await tools.getCodeceptionUriBuilder('3.2.1', '5.6', 'php56')).toBe(
       'releases/3.2.1/php56/codecept.phar'
     );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php54')).toBe(
+    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.0', 'php54')).toBe(
       'releases/3.2.1/php54/codecept.phar'
     );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '')).toBe(
+    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.1', 'php56')).toBe(
+      'releases/3.2.1/php56/codecept.phar'
+    );
+    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.2', 'php56')).toBe(
+      'releases/3.2.1/codecept.phar'
+    );
+    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.3', 'php56')).toBe(
+      'releases/3.2.1/codecept.phar'
+    );
+    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.4', 'php56')).toBe(
       'releases/3.2.1/codecept.phar'
     );
   });
@@ -119,59 +146,17 @@ describe('Tools tests', () => {
     expect(await tools.getCodeceptionUri('latest', '7.4')).toBe(
       'codecept.phar'
     );
-    expect(await tools.getCodeceptionUri('4.0.0', '7.4')).toBe(
+    expect(await tools.getCodeceptionUri('3.2.1', '5.6')).toBe(
-      'releases/4.0.0/codecept.phar'
+      'releases/3.2.1/php54/codecept.phar'
     );
-    expect(await tools.getCodeceptionUri('4.0.0', '5.6')).toBe(
+    expect(await tools.getCodeceptionUri('4.3.2', '5.6')).toBe(
-      'releases/4.0.0/php56/codecept.phar'
+      'releases/4.3.2/php56/codecept.phar'
     );
-    expect(await tools.getCodeceptionUri('4.0.0', '7.1')).toBe(
+    expect(await tools.getCodeceptionUri('3.2.1', '7.4')).toBe(
-      'releases/4.0.0/php56/codecept.phar'
+      'releases/3.2.1/codecept.phar'
     );
-    expect(await tools.getCodeceptionUri('3.1.0', '7.4')).toBe(
+    expect(await tools.getCodeceptionUri('4.3.2', '7.4')).toBe(
-      'releases/3.1.0/codecept.phar'
+      'releases/4.3.2/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('3.1.0', '5.6')).toBe(
-      'releases/3.1.0/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.5.4', '7.4')).toBe(
-      'releases/2.5.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.5.4', '5.6')).toBe(
-      'releases/2.5.4/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.3.4', '7.4')).toBe(
-      'releases/2.3.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.3.4', '5.4')).toBe(
-      'releases/2.3.4/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.2.4', '5.6')).toBe(
-      'releases/2.2.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.2.4', '7.4')).toBe(
-      'releases/2.2.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.2.4', '5.4')).toBe(
-      'releases/2.2.4/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.7', '5.6')).toBe(
-      'releases/2.1.7/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.7', '5.4')).toBe(
-      'releases/2.1.7/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.5', '5.4')).toBe(
-      'releases/2.1.5/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.5', '7.4')).toBe(
-      'releases/2.1.5/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('1.6.9', '7.4')).toBe(
-      'releases/1.6.9/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('1.5.0', '7.4')).toBe(
-      'releases/1.5.0/codecept.phar'
     );
   });
 
@@ -187,12 +172,12 @@ describe('Tools tests', () => {
     );
   });
 
-  it('checking getPharUri', async () => {
+  it('checking getPhpunitUri', async () => {
-    expect(await tools.getPharUrl('domain', 'tool', '', 'latest')).toBe(
+    expect(await tools.getPhpunitUrl('tool', 'latest')).toBe(
-      'domain/tool.phar'
+      'https://phar.phpunit.de/tool.phar'
     );
-    expect(await tools.getPharUrl('domain', 'tool', 'v', '1.2.3')).toBe(
+    expect(await tools.getPhpunitUrl('tool', '1.2.3')).toBe(
-      'domain/tool-v1.2.3.phar'
+      'https://phar.phpunit.de/tool-1.2.3.phar'
     );
   });
 
@@ -205,7 +190,7 @@ describe('Tools tests', () => {
     );
   });
 
-  it('checking addComposer', async () => {
+  it('checking getDeployerUri', async () => {
     expect(await tools.addComposer(['a', 'b'])).toStrictEqual([
       'composer',
       'a',
@@ -258,15 +243,6 @@ 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',
@@ -335,13 +311,13 @@ describe('Tools tests', () => {
       'user/',
       'linux'
     );
-    expect(script).toContain('add_composertool tool tool:1.2.3 user/');
+    expect(script).toContain('add_composer_tool tool tool:1.2.3 user/');
 
     script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'darwin');
-    expect(script).toContain('add_composertool tool tool:1.2.3 user/');
+    expect(script).toContain('add_composer_tool tool tool:1.2.3 user/');
 
     script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'win32');
-    expect(script).toContain('Add-Composertool tool tool:1.2.3 user/');
+    expect(script).toContain('Add-Composer-Tool 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');
@@ -349,16 +325,12 @@ describe('Tools tests', () => {
 
   it('checking addTools on linux', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, cs2pr, flex, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli',
+      'cs2pr, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony',
       '7.4',
       'linux'
     );
-    expect(script).toContain('add_blackfire');
     expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
+      'add_tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
-    );
-    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'
@@ -378,29 +350,21 @@ 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_composertool flex flex symfony/');
+    expect(script).toContain('add_composer_tool phinx phinx robmorgan/');
-    expect(script).toContain('add_composertool phinx phinx robmorgan/');
+    expect(script).toContain('add_composer_tool phinx phinx:1.2.3 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(
-      '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',
+      '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',
       '7.4',
       'darwin'
     );
-    expect(script).toContain('add_blackfire');
     expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
+      'add_tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
-    );
-    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'
@@ -420,13 +384,12 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
     );
-    expect(script).toContain('add_composertool flex flex symfony/');
+    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/1.2.3/phive-1.2.3.phar phive'
     );
     expect(script).toContain(
-      'add_composertool composer-prefetcher composer-prefetcher:1.2.3 narrowspark/automatic-'
+      'add_composer_tool 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'
@@ -434,46 +397,37 @@ 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(
-      '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',
+      'codeception, cs2pr, deployer, prestissimo, phpmd, phinx, phive:0.13.2, php-config, phpize, symfony, does_not_exit',
       '7.4',
       'win32'
     );
-    expect(script).toContain('Add-Blackfire 1.32.0');
     expect(script).toContain(
-      'Add-Tool https://get.blackfire.io/blackfire-player-v1.8.1.phar blackfire-player'
+      'Add-Tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
-    );
-    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-Composertool prestissimo prestissimo hirak/');
+    expect(script).toContain(
+      'Add-Composer-Tool prestissimo prestissimo hirak/'
+    );
     expect(script).toContain(
       'Add-Tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd'
     );
-    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
+    expect(script).toContain('Add-Composer-Tool 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');
@@ -486,12 +440,14 @@ describe('Tools tests', () => {
       'win32'
     );
     expect(script).toContain(
-      'Add-Tool https://getcomposer.org/composer-stable.phar composer'
+      'Add-Tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
     );
-    expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
-    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
     expect(script).toContain(
-      'Add-Composertool composer-prefetcher composer-prefetcher narrowspark/automatic-'
+      '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-'
     );
   });
 });

__tests__/utils.test.ts

@@ -161,14 +161,4 @@ describe('Utils tests', () => {
       'Platform fedora is not supported'
     );
   });
-
-  it('checking getBlackfireVersion', async () => {
-    expect(await utils.getBlackfireVersion('')).toEqual('1.31.0');
-    expect(await utils.getBlackfireVersion(undefined)).toEqual('1.31.0');
-    expect(await utils.getBlackfireVersion(null)).toEqual('1.31.0');
-    expect(await utils.getBlackfireVersion('1.32.0')).toEqual('1.32.0');
-  });
-  it('checking getBlackfireAgentVersion', async () => {
-    expect(await utils.getBlackfireAgentVersion()).toEqual('1.32.0');
-  });
 });

action.yml

@@ -3,7 +3,6 @@ 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.'
@@ -21,6 +20,18 @@ inputs:
   tools:
     description: 'Setup popular tools globally.'
     required: false
+  extension-csv:
+    description: 'Deprecated! Use extensions instead.'
+    deprecationMessage: 'The extension-csv property is deprecated. Use extensions instead.'
+    required: false
+  ini-values-csv:
+    description: 'Deprecated! Use ini-values instead.'
+    deprecationMessage: 'The ini-values-csv property is deprecated. Use ini-values instead.'
+    required: false
+  pecl:
+    description: 'Deprecated! Use tools instead to setup PECL.'
+    deprecationMessage: 'The pecl property is deprecated. Specify pecl in tools instead.'
+    required: false
 runs:
   using: 'node12'
   main: 'dist/index.js'

dist/index.js

@@ -964,10 +964,9 @@ const io = __importStar(__webpack_require__(1));
  */
 function addMatchers() {
     return __awaiter(this, void 0, void 0, function* () {
-        const config_path = path.join(__dirname, '..', 'src', 'configs');
+        const config_path = path.join(__dirname, '..', 'src', 'configs', 'phpunit.json');
         const runner_dir = yield utils.getInput('RUNNER_TOOL_CACHE', false);
-        yield io.cp(path.join(config_path, 'phpunit.json'), runner_dir);
+        yield io.cp(config_path, runner_dir);
-        yield io.cp(path.join(config_path, 'php.json'), runner_dir);
     });
 }
 exports.addMatchers = addMatchers;
@@ -1247,33 +1246,6 @@ function suppressOutput(os_version) {
     });
 }
 exports.suppressOutput = suppressOutput;
-/**
- * Function to get Blackfire version
- *
- * @param blackfire_version
- */
-function getBlackfireVersion(blackfire_version) {
-    return __awaiter(this, void 0, void 0, function* () {
-        switch (blackfire_version) {
-            case null:
-            case undefined:
-            case '':
-                return '1.31.0';
-            default:
-                return blackfire_version;
-        }
-    });
-}
-exports.getBlackfireVersion = getBlackfireVersion;
-/**
- * Function to get Blackfire Agent version
- */
-function getBlackfireAgentVersion() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return '1.32.0';
-    });
-}
-exports.getBlackfireAgentVersion = getBlackfireAgentVersion;
 
 
 /***/ }),
@@ -1480,13 +1452,6 @@ exports.setFailed = setFailed;
 //-----------------------------------------------------------------------
 // Logging Commands
 //-----------------------------------------------------------------------
-/**
- * Gets whether Actions Step Debug is on or not
- */
-function isDebug() {
-    return process.env['RUNNER_DEBUG'] === '1';
-}
-exports.isDebug = isDebug;
 /**
  * Writes debug message to user log
  * @param message debug message
@@ -1610,24 +1575,63 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils = __importStar(__webpack_require__(163));
 /**
- * Function to get command to setup tools
+ * Function to get command to setup tool
  *
  * @param os_version
  */
-function getCommand(os_version, suffix) {
+function getArchiveCommand(os_version) {
     return __awaiter(this, void 0, void 0, function* () {
         switch (os_version) {
             case 'linux':
             case 'darwin':
-                return 'add_' + suffix + ' ';
+                return 'add_tool ';
             case 'win32':
-                return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
+                return 'Add-Tool ';
             default:
                 return yield utils.log('Platform ' + os_version + ' is not supported', os_version, 'error');
         }
     });
 }
-exports.getCommand = getCommand;
+exports.getArchiveCommand = getArchiveCommand;
+/**
+ * Function to get command to setup tools using composer
+ *
+ * @param os_version
+ */
+function getPackageCommand(os_version) {
+    return __awaiter(this, void 0, void 0, function* () {
+        switch (os_version) {
+            case 'linux':
+            case 'darwin':
+                return 'add_composer_tool ';
+            case 'win32':
+                return 'Add-Composer-Tool ';
+            default:
+                return yield utils.log('Platform ' + os_version + ' is not supported', os_version, 'error');
+        }
+    });
+}
+exports.getPackageCommand = getPackageCommand;
+/**
+ *
+ * Function to get command to setup PECL
+ *
+ * @param os_version
+ */
+function getPECLCommand(os_version) {
+    return __awaiter(this, void 0, void 0, function* () {
+        switch (os_version) {
+            case 'linux':
+            case 'darwin':
+                return 'add_pecl ';
+            case 'win32':
+                return 'Add-PECL ';
+            default:
+                return yield utils.log('Platform ' + os_version + ' is not supported', os_version, 'error');
+        }
+    });
+}
+exports.getPECLCommand = getPECLCommand;
 /**
  * Function to get tool version
  *
@@ -1699,13 +1703,20 @@ exports.getUri = getUri;
  * Helper function to get the codeception url
  *
  * @param version
+ * @param php_version
  * @param suffix
  */
-function getCodeceptionUriBuilder(version, suffix) {
+function getCodeceptionUriBuilder(version, php_version, suffix) {
     return __awaiter(this, void 0, void 0, function* () {
-        return ['releases', version, suffix, 'codecept.phar']
+        switch (true) {
-            .filter(Boolean)
+            case /^5\.6$|^7\.[0|1]$/.test(php_version):
-            .join('/');
+                return ['releases', version, suffix, 'codecept.phar']
+                    .filter(Boolean)
+                    .join('/');
+            case /^7\.[2-4]$/.test(php_version):
+            default:
+                return ['releases', version, 'codecept.phar'].filter(Boolean).join('/');
+        }
     });
 }
 exports.getCodeceptionUriBuilder = getCodeceptionUriBuilder;
@@ -1717,55 +1728,19 @@ exports.getCodeceptionUriBuilder = getCodeceptionUriBuilder;
  */
 function getCodeceptionUri(version, php_version) {
     return __awaiter(this, void 0, void 0, function* () {
-        const codecept = yield getCodeceptionUriBuilder(version, '');
-        const codecept54 = yield getCodeceptionUriBuilder(version, 'php54');
-        const codecept56 = yield getCodeceptionUriBuilder(version, 'php56');
-        // Refer to https://codeception.com/builds
         switch (true) {
             case /latest/.test(version):
                 switch (true) {
-                    case /5\.6|7\.[0|1]/.test(php_version):
+                    case /^5\.6$|^7\.[0|1]$/.test(php_version):
                         return 'php56/codecept.phar';
-                    case /7\.[2-4]/.test(php_version):
+                    case /^7\.[2-4]$/.test(php_version):
                     default:
                         return 'codecept.phar';
                 }
-            case /(^[4-9]|\d{2,})\..*/.test(version):
+            case /([4-9]|\d{2,})\..*/.test(version):
-                switch (true) {
+                return yield getCodeceptionUriBuilder(version, php_version, 'php56');
-                    case /5\.6|7\.[0|1]/.test(php_version):
-                        return codecept56;
-                    case /7\.[2-4]/.test(php_version):
-                    default:
-                        return codecept;
-                }
-            case /(^2\.[4-5]\.\d+|^3\.[0-1]\.\d+).*/.test(version):
-                switch (true) {
-                    case /5\.6/.test(php_version):
-                        return codecept54;
-                    case /7\.[0-4]/.test(php_version):
-                    default:
-                        return codecept;
-                }
-            case /^2\.3\.\d+.*/.test(version):
-                switch (true) {
-                    case /5\.[4-6]/.test(php_version):
-                        return codecept54;
-                    case /^7\.[0-4]$/.test(php_version):
-                    default:
-                        return codecept;
-                }
-            case /(^2\.(1\.([6-9]|\d{2,}))|^2\.2\.\d+).*/.test(version):
-                switch (true) {
-                    case /5\.[4-5]/.test(php_version):
-                        return codecept54;
-                    case /5.6|7\.[0-4]/.test(php_version):
-                    default:
-                        return codecept;
-                }
-            case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
-                return codecept;
             default:
-                return yield codecept;
+                return yield getCodeceptionUriBuilder(version, php_version, 'php54');
         }
     });
 }
@@ -1782,10 +1757,10 @@ function addPhive(version, os_version) {
     return __awaiter(this, void 0, void 0, function* () {
         switch (version) {
             case 'latest':
-                return ((yield getCommand(os_version, 'tool')) +
+                return ((yield getArchiveCommand(os_version)) +
                     'https://phar.io/releases/phive.phar phive');
             default:
-                return ((yield getCommand(os_version, 'tool')) +
+                return ((yield getArchiveCommand(os_version)) +
                     'https://github.com/phar-io/phive/releases/download/' +
                     version +
                     '/phive-' +
@@ -1796,21 +1771,22 @@ function addPhive(version, os_version) {
 }
 exports.addPhive = addPhive;
 /**
- * Function to get the phar url in domain/tool-version.phar format
+ * Function to get the PHPUnit url
  *
  * @param version
  */
-function getPharUrl(domain, tool, prefix, version) {
+function getPhpunitUrl(tool, version) {
     return __awaiter(this, void 0, void 0, function* () {
+        const phpunit = 'https://phar.phpunit.de';
         switch (version) {
             case 'latest':
-                return domain + '/' + tool + '.phar';
+                return phpunit + '/' + tool + '.phar';
             default:
-                return domain + '/' + tool + '-' + prefix + version + '.phar';
+                return phpunit + '/' + tool + '-' + version + '.phar';
         }
     });
 }
-exports.getPharUrl = getPharUrl;
+exports.getPhpunitUrl = getPhpunitUrl;
 /**
  * Function to get the Deployer url
  *
@@ -1857,22 +1833,6 @@ function getSymfonyUri(version, os_version) {
     });
 }
 exports.getSymfonyUri = getSymfonyUri;
-/**
- * Function to get the WP-CLI url
- *
- * @param version
- */
-function getWpCliUrl(version) {
-    return __awaiter(this, void 0, void 0, function* () {
-        switch (version) {
-            case 'latest':
-                return 'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true';
-            default:
-                return yield getUri('wp-cli', '-' + version + '.phar', version, 'wp-cli/wp-cli/releases', 'v', 'download');
-        }
-    });
-}
-exports.getWpCliUrl = getWpCliUrl;
 /**
  * Function to add/move composer in the tools list
  *
@@ -1907,7 +1867,7 @@ function getCleanedToolsList(tools_csv) {
             .map(function (extension) {
             return extension
                 .trim()
-                .replace(/symfony\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
+                .replace(/robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
         })
             .filter(Boolean);
         return [...new Set(tools_list)];
@@ -1924,7 +1884,7 @@ exports.getCleanedToolsList = getCleanedToolsList;
  */
 function addArchive(tool, version, url, os_version) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield getCommand(os_version, 'tool')) + url + ' ' + tool;
+        return (yield getArchiveCommand(os_version)) + url + ' ' + tool;
     });
 }
 exports.addArchive = addArchive;
@@ -1961,7 +1921,7 @@ exports.addDevTools = addDevTools;
  */
 function addPackage(tool, release, prefix, os_version) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tool_command = yield getCommand(os_version, 'composertool');
+        const tool_command = yield getPackageCommand(os_version);
         return tool_command + tool + ' ' + release + ' ' + prefix;
     });
 }
@@ -1986,14 +1946,6 @@ function addTools(tools_csv, php_version, os_version) {
                 script += '\n';
                 let url = '';
                 switch (tool) {
-                    case 'blackfire':
-                    case 'blackfire-agent':
-                        script += yield getCommand(os_version, 'blackfire ' + (yield utils.getBlackfireAgentVersion()));
-                        break;
-                    case 'blackfire-player':
-                        url = yield getPharUrl('https://get.blackfire.io', tool, 'v', version);
-                        script += yield addArchive(tool, version, url, os_version);
-                        break;
                     case 'cs2pr':
                         uri = yield getUri(tool, '', version, 'releases', '', 'download');
                         url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
@@ -2025,10 +1977,8 @@ function addTools(tools_csv, php_version, os_version) {
                         script += yield addArchive(tool, version, url, os_version);
                         break;
                     case 'composer':
-                        // If RC is released as latest release, switch to getcomposer.
+                        url =
-                        // Prefered source is GitHub as it is faster.
+                            github + 'composer/composer/releases/latest/download/composer.phar';
-                        // url = github + 'composer/composer/releases/latest/download/composer.phar';
-                        url = 'https://getcomposer.org/composer-stable.phar';
                         script += yield addArchive(tool, version, url, os_version);
                         break;
                     case 'codeception':
@@ -2039,16 +1989,13 @@ function addTools(tools_csv, php_version, os_version) {
                         break;
                     case 'phpcpd':
                     case 'phpunit':
-                        url = yield getPharUrl('https://phar.phpunit.de', tool, '', version);
+                        url = yield getPhpunitUrl(tool, version);
                         script += yield addArchive(tool, version, url, os_version);
                         break;
                     case 'deployer':
                         url = yield getDeployerUrl(version);
                         script += yield addArchive(tool, version, url, os_version);
                         break;
-                    case 'flex':
-                        script += yield addPackage(tool, release, 'symfony/', os_version);
-                        break;
                     case 'phinx':
                         script += yield addPackage(tool, release, 'robmorgan/', os_version);
                         break;
@@ -2059,7 +2006,7 @@ function addTools(tools_csv, php_version, os_version) {
                         script += yield addPackage(tool, release, 'narrowspark/automatic-', os_version);
                         break;
                     case 'pecl':
-                        script += yield getCommand(os_version, 'pecl');
+                        script += yield getPECLCommand(os_version);
                         break;
                     case 'php-config':
                     case 'phpize':
@@ -2071,10 +2018,6 @@ function addTools(tools_csv, php_version, os_version) {
                         url = github + 'symfony/cli/' + uri;
                         script += yield addArchive('symfony', version, url, os_version);
                         break;
-                    case 'wp-cli':
-                        url = github + (yield getWpCliUrl(version));
-                        script += yield addArchive(tool, version, url, os_version);
-                        break;
                     default:
                         script += yield utils.addLog('$cross', tool, 'Tool ' + tool + ' is not supported', os_version);
                         break;
@@ -2161,7 +2104,7 @@ exports.addCoverageXdebug = addCoverageXdebug;
 function addCoveragePCOV(version, os_version, pipe) {
     return __awaiter(this, void 0, void 0, function* () {
         let script = '\n';
-        switch (true) {
+        switch (version) {
             default:
                 script +=
                     (yield extensions.addExtension('pcov', version, os_version, true)) +
@@ -2183,7 +2126,8 @@ function addCoveragePCOV(version, os_version, pipe) {
                 script += yield utils.addLog('$tick', 'coverage: pcov', 'PCOV enabled as coverage driver', os_version);
                 // version is not supported
                 break;
-            case /5\.[3-6]|7\.0/.test(version):
+            case '5.6':
+            case '7.0':
                 script += yield utils.addLog('$cross', 'pcov', 'PHP 7.1 or newer is required', os_version);
                 break;
         }
@@ -2388,14 +2332,15 @@ function build(filename, version, os_version) {
     return __awaiter(this, void 0, void 0, function* () {
         // taking inputs
         const extension_csv = (yield utils.getInput('extensions', false)) ||
-            (yield utils.getInput('extension', false));
+            (yield utils.getInput('extension', false)) ||
-        const ini_values_csv = yield utils.getInput('ini-values', false);
+            (yield utils.getInput('extension-csv', false));
+        const ini_values_csv = (yield utils.getInput('ini-values', false)) ||
+            (yield utils.getInput('ini-values-csv', false));
         const coverage_driver = yield utils.getInput('coverage', false);
         const pecl = yield utils.getInput('pecl', false);
         let tools_csv = yield utils.getInput('tools', false);
         if (pecl == 'true' ||
-            /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv) ||
+            /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv)) {
-            /.*-(\d+\.\d+\.\d+).*/.test(extension_csv)) {
             tools_csv = 'pecl, ' + tools_csv;
         }
         let script = yield utils.readScript(filename, version, os_version);
@@ -2419,16 +2364,16 @@ exports.build = build;
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            const os_version = process.platform;
             let version = yield utils.getInput('php-version', true);
             version = version.length > 1 ? version.slice(0, 3) : version + '.0';
-            const os_version = process.platform;
             // check the os version and run the respective script
             let script_path = '';
             switch (os_version) {
                 case 'darwin':
                 case 'linux':
                     script_path = yield build(os_version + '.sh', version, os_version);
-                    yield exec_1.exec('bash ' + script_path + ' ' + version + ' ' + __dirname);
+                    yield exec_1.exec('sh ' + script_path + ' ' + version + ' ' + __dirname);
                     break;
                 case 'win32':
                     script_path = yield build('win32.ps1', version, os_version);
@@ -2704,43 +2649,21 @@ function addExtensionDarwin(extension_csv, version, pipe) {
             return __awaiter(this, void 0, void 0, function* () {
                 extension = extension.toLowerCase();
                 const version_extension = version + extension;
-                const [ext_name, ext_version] = extension.split('-');
+                const [extension_name, stability] = extension.split('-');
-                const prefix = yield utils.getExtensionPrefix(ext_name);
+                const prefix = yield utils.getExtensionPrefix(extension_name);
                 let install_command = '';
                 switch (true) {
-                    // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-                    // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-                    case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
-                        install_command =
-                            'bash ' +
-                                path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
-                                ' ' +
-                                version +
-                                ' ' +
-                                (yield utils.getBlackfireVersion(ext_version));
-                        break;
                     // match pre-release versions
                     case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
                         script +=
                             '\nadd_unstable_extension ' +
-                                ext_name +
+                                extension_name +
                                 ' ' +
-                                ext_version +
+                                stability +
                                 ' ' +
                                 prefix;
                         return;
-                    // match exact versions
+                    case /5\.6xdebug/.test(version_extension):
-                    case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-                        script +=
-                            '\nadd_pecl_extension ' + ext_name + ' ' + ext_version + ' ' + prefix;
-                        return;
-                    case /5\.3xdebug/.test(version_extension):
-                        install_command = 'sudo pecl install -f xdebug-2.2.7' + pipe;
-                        break;
-                    case /5\.4xdebug/.test(version_extension):
-                        install_command = 'sudo pecl install -f xdebug-2.4.1' + pipe;
-                        break;
-                    case /5\.[5-6]xdebug/.test(version_extension):
                         install_command = 'sudo pecl install -f xdebug-2.5.5' + pipe;
                         break;
                     case /7\.0xdebug/.test(version_extension):
@@ -2796,34 +2719,13 @@ function addExtensionWindows(extension_csv, version, pipe) {
         yield utils.asyncForEach(extensions, function (extension) {
             return __awaiter(this, void 0, void 0, function* () {
                 extension = extension.toLowerCase();
-                const [ext_name, ext_version] = extension.split('-');
+                const [extension_name, stability] = extension.split('-');
                 const version_extension = version + extension;
-                let matches;
                 switch (true) {
-                    // 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 +
-                                ' ' +
-                                (yield utils.getBlackfireVersion(ext_version));
-                        return;
                     // match pre-release versions
                     case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-                        script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
+                        script += '\nAdd-Extension ' + extension_name + ' ' + stability;
                         break;
-                    // match exact versions
-                    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(version_extension):
-                        matches = /.*-(\d+\.\d+\.\d)+(beta|alpha|devel|snapshot)\d*/.exec(version_extension);
-                        script +=
-                            '\nAdd-Extension ' + ext_name + ' ' + matches[2] + ' ' + matches[1];
-                        return;
                     // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
                     case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
                         script +=
@@ -2860,36 +2762,20 @@ function addExtensionLinux(extension_csv, version, pipe) {
             return __awaiter(this, void 0, void 0, function* () {
                 extension = extension.toLowerCase();
                 const version_extension = version + extension;
-                const [ext_name, ext_version] = extension.split('-');
+                const [extension_name, stability] = extension.split('-');
-                const prefix = yield utils.getExtensionPrefix(ext_name);
+                const prefix = yield utils.getExtensionPrefix(extension_name);
                 let install_command = '';
                 switch (true) {
-                    // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-                    // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-                    case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
-                        install_command =
-                            'bash ' +
-                                path.join(__dirname, '../src/scripts/ext/blackfire.sh') +
-                                ' ' +
-                                version +
-                                ' ' +
-                                (yield utils.getBlackfireVersion(ext_version));
-                        break;
                     // match pre-release versions
                     case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
                         script +=
                             '\nadd_unstable_extension ' +
-                                ext_name +
+                                extension_name +
                                 ' ' +
-                                ext_version +
+                                stability +
                                 ' ' +
                                 prefix;
                         return;
-                    // match exact versions
-                    case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-                        script +=
-                            '\nadd_pecl_extension ' + ext_name + ' ' + ext_version + ' ' + prefix;
-                        return;
                     // match 5.6gearman..7.4gearman
                     case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
                         install_command =
@@ -2912,7 +2798,7 @@ function addExtensionLinux(extension_csv, version, pipe) {
                     // 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.0' +
                                 pipe +
                                 '\n' +
                                 (yield utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));

examples/bedrock.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
       - name: Get composer cache directory

examples/blackfire-player.yml

@@ -1,31 +0,0 @@
-# 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

examples/blackfire.yml

@@ -1,31 +0,0 @@
-# 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

examples/cakephp-mysql.yml

@@ -27,15 +27,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: ${{ matrix.php-versions }}
           # You can also use ext-apcu or ext-memcached instead of ext-redis
           # 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)"
@@ -65,7 +63,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl
@@ -92,7 +90,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl

examples/cakephp-postgres.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: ${{ matrix.php-versions }}
           # You can also use ext-apcu or ext-memcached instead of ext-redis
@@ -63,7 +63,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl
@@ -90,7 +90,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl

examples/cakephp.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl, pdo_sqlite, pdo_mysql
@@ -43,7 +43,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl
@@ -70,7 +70,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v1
         with:
           php-version: '7.3'
           extensions: mbstring, intl

examples/codeigniter.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl, curl, dom

examples/laravel-mysql.yml

@@ -36,13 +36,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           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)"

examples/laravel-postgres.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, pgsql

examples/laravel.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo

examples/lumen-mysql.yml

@@ -36,13 +36,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           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)"

examples/lumen-postgres.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, pgsql

examples/lumen.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, mysql

examples/phalcon-mysql.yml

@@ -36,13 +36,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           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)"

examples/phalcon-postgres.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, zip, phalcon4, pgsql #use phalcon3 for the phalcon 3.x

examples/sage.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-versions }}
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring

examples/slim-framework.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, simplexml, dom

examples/symfony-mysql.yml

@@ -23,13 +23,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           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)"

examples/symfony-postgres.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, pgsql

examples/symfony.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite

examples/yii2-mysql.yml

@@ -33,13 +33,11 @@ jobs:
         with:
           node-version: 10.x
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           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)"

examples/yii2-postgres.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           node-version: 10.x
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl, gd, imagick, zip, dom, pgsql

examples/zend-framework.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, bcmath, curl, intl

package-lock.json

@@ -1,13 +1,13 @@
 {
   "name": "setup-php",
-  "version": "2.1.0",
+  "version": "1.8.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@actions/core": {
-      "version": "1.2.3",
+      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.2.tgz",
-      "integrity": "sha512-Wp4xnyokakM45Uuj4WLUxdsa8fJjKVl1fDTsPbTEcTcuu0Nb26IPQbOtjmnfaCPGcaoPOOqId8H9NapZ8gii4w=="
+      "integrity": "sha512-IbCx7oefq+Gi6FWbSs2Fnw8VkEI6Y4gvjrYprY3RV//ksq/KPMlClOerJ4jRosyal6zkUIc8R9fS/cpRMlGClg=="
     },
     "@actions/exec": {
       "version": "1.0.3",
@@ -32,18 +32,18 @@
       }
     },
     "@babel/core": {
-      "version": "7.8.6",
+      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.4.tgz",
-      "integrity": "sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg==",
+      "integrity": "sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.8.6",
+        "@babel/generator": "^7.8.4",
         "@babel/helpers": "^7.8.4",
-        "@babel/parser": "^7.8.6",
+        "@babel/parser": "^7.8.4",
-        "@babel/template": "^7.8.6",
+        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.6",
+        "@babel/traverse": "^7.8.4",
-        "@babel/types": "^7.8.6",
+        "@babel/types": "^7.8.3",
         "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.6",
+      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz",
-      "integrity": "sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==",
+      "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.6",
+        "@babel/types": "^7.8.3",
         "jsesc": "^2.5.1",
         "lodash": "^4.17.13",
         "source-map": "^0.5.0"
@@ -198,9 +198,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.8.6",
+      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz",
-      "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==",
+      "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==",
       "dev": true
     },
     "@babel/plugin-syntax-bigint": {
@@ -231,28 +231,28 @@
       }
     },
     "@babel/template": {
-      "version": "7.8.6",
+      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+      "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
+        "@babel/parser": "^7.8.3",
-        "@babel/types": "^7.8.6"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/traverse": {
-      "version": "7.8.6",
+      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz",
-      "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==",
+      "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.8.6",
+        "@babel/generator": "^7.8.4",
         "@babel/helper-function-name": "^7.8.3",
         "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/parser": "^7.8.6",
+        "@babel/parser": "^7.8.4",
-        "@babel/types": "^7.8.6",
+        "@babel/types": "^7.8.3",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.13"
@@ -267,9 +267,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.8.6",
+      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
-      "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==",
+      "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2",
@@ -575,18 +575,18 @@
       }
     },
     "@sinonjs/commons": {
-      "version": "1.7.1",
+      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.0.tgz",
-      "integrity": "sha512-Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ==",
+      "integrity": "sha512-qbk9AP+cZUsKdW1GJsBpxPKFmCJ0T8swwzVje3qFd+AkQb74Q/tiuzrdfFg8AD2g5HH/XbE/I8Uc1KYHVYWfhg==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
       }
     },
     "@types/babel__core": {
-      "version": "7.1.6",
+      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.4.tgz",
-      "integrity": "sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==",
+      "integrity": "sha512-c/5MuRz5HM4aizqL5ViYfW4iEnmfPcfbH4Xa6GgLT21dMc1NGeNnuS6egHheOmP+kCJ9CAzC4pv4SDCWTnRkbg==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -616,9 +616,9 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.0.9",
+      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.8.tgz",
-      "integrity": "sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==",
+      "integrity": "sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
@@ -662,9 +662,9 @@
       }
     },
     "@types/jest": {
-      "version": "25.1.3",
+      "version": "25.1.2",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.2.tgz",
-      "integrity": "sha512-jqargqzyJWgWAJCXX96LBGR/Ei7wQcZBvRv0PLEu9ZByMfcs23keUJrKv9FMR6YZf9YCbfqDqgmY+JUBsnqhrg==",
+      "integrity": "sha512-EsPIgEsonlXmYV7GzUqcvORsSS9Gqxw/OvkGwHfAdpjduNRxMlhsav0O5Kb0zijc/eXSO/uW6SJt9nwull8AUQ==",
       "dev": true,
       "requires": {
         "jest-diff": "^25.1.0",
@@ -678,9 +678,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "13.7.7",
+      "version": "13.7.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.7.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz",
-      "integrity": "sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg==",
+      "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==",
       "dev": true
     },
     "@types/parse-json": {
@@ -696,9 +696,9 @@
       "dev": true
     },
     "@types/yargs": {
-      "version": "15.0.4",
+      "version": "15.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.3.tgz",
-      "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==",
+      "integrity": "sha512-XCMQRK6kfpNBixHLyHUsGmXrpEmFFxzMrcnSXFMziHd8CoNJo8l16FkHyQq4x+xbM7E2XL83/O78OD8u+iZTdQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
@@ -711,12 +711,12 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "2.21.0",
+      "version": "2.19.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.19.2.tgz",
-      "integrity": "sha512-b5jjjDMxzcjh/Sbjuo7WyhrQmVJg0WipTHQgXh5Xwx10uYm6nPWqN1WGOsaNq4HR3Zh4wUx4IRQdDkCHwyewyw==",
+      "integrity": "sha512-HX2qOq2GOV04HNrmKnTpSIpHjfl7iwdXe3u/Nvt+/cpmdvzYvY0NHSiTkYN257jHnq4OM/yo+OsFgati+7LqJA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "2.21.0",
+        "@typescript-eslint/experimental-utils": "2.19.2",
         "eslint-utils": "^1.4.3",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
@@ -724,32 +724,32 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "2.21.0",
+      "version": "2.19.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.19.2.tgz",
-      "integrity": "sha512-olKw9JP/XUkav4lq0I7S1mhGgONJF9rHNhKFn9wJlpfRVjNo3PPjSvybxEldvCXnvD+WAshSzqH5cEjPp9CsBA==",
+      "integrity": "sha512-B88QuwT1wMJR750YvTJBNjMZwmiPpbmKYLm1yI7PCc3x0NariqPwqaPsoJRwU9DmUi0cd9dkhz1IqEnwfD+P1A==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "2.21.0",
+        "@typescript-eslint/typescript-estree": "2.19.2",
         "eslint-scope": "^5.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "2.21.0",
+      "version": "2.19.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.19.2.tgz",
-      "integrity": "sha512-VrmbdrrrvvI6cPPOG7uOgGUFXNYTiSbnRq8ZMyuGa4+qmXJXVLEEz78hKuqupvkpwJQNk1Ucz1TenrRP90gmBg==",
+      "integrity": "sha512-8uwnYGKqX9wWHGPGdLB9sk9+12sjcdqEEYKGgbS8A0IvYX59h01o8os5qXUHMq2na8vpDRaV0suTLM7S8wraTA==",
       "dev": true,
       "requires": {
         "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "2.21.0",
+        "@typescript-eslint/experimental-utils": "2.19.2",
-        "@typescript-eslint/typescript-estree": "2.21.0",
+        "@typescript-eslint/typescript-estree": "2.19.2",
         "eslint-visitor-keys": "^1.1.0"
       }
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "2.21.0",
+      "version": "2.19.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.19.2.tgz",
-      "integrity": "sha512-NC/nogZNb9IK2MEFQqyDBAciOT8Lp8O3KgAfvHx2Skx6WBo+KmDqlU3R9KxHONaijfTIKtojRe3SZQyMjr3wBw==",
+      "integrity": "sha512-Xu/qa0MDk6upQWqE4Qy2X16Xg8Vi32tQS2PR0AvnT/ZYS4YGDvtn2MStOh5y8Zy2mg4NuL06KUHlvCh95j9C6Q==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
@@ -774,9 +774,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "7.1.1",
+      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
+      "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
       "dev": true
     },
     "acorn-globals": {
@@ -798,9 +798,9 @@
       }
     },
     "acorn-jsx": {
-      "version": "5.2.0",
+      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
-      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
       "dev": true
     },
     "acorn-walk": {
@@ -810,9 +810,9 @@
       "dev": true
     },
     "ajv": {
-      "version": "6.12.0",
+      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
-      "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+      "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -822,20 +822,12 @@
       }
     },
     "ansi-escapes": {
-      "version": "4.3.1",
+      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==",
       "dev": true,
       "requires": {
-        "type-fest": "^0.11.0"
+        "type-fest": "^0.8.1"
-      },
-      "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": {
@@ -1883,9 +1875,9 @@
       }
     },
     "eslint-plugin-jest": {
-      "version": "23.8.1",
+      "version": "23.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.8.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.7.0.tgz",
-      "integrity": "sha512-OycLNqPo/2EfO6kTqnmsu1khz1gTIOxGl3ThIVwL5/oycDF4pm5uNDyvFelNLdpr4COUuM8PVi3963NEG1Efpw==",
+      "integrity": "sha512-zkiyGlvJeHNjAEz8FaIxTXNblJJ/zj3waNbYbgflK7K6uy0cpE5zJBt/JpJtOBGM/UGkC6BqsQ4n0y7kQ2HA8w==",
       "dev": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "^2.5.0"
@@ -2506,9 +2498,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.8",
+      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
       "dev": true
     },
     "html-encoding-sniffer": {
@@ -2739,33 +2731,74 @@
       "dev": true
     },
     "inquirer": {
-      "version": "7.0.5",
+      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz",
-      "integrity": "sha512-6Z5cP+LAO0rzNE7xWjWtT84jxKa5ScLEGLgegPXeO3dGeU8lNe5Ii7SlXH6KVtLGlDuaEhsvsFjrjWjw8j5lFg==",
+      "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==",
       "dev": true,
       "requires": {
         "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
+        "chalk": "^2.4.2",
         "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.4.0",
+        "run-async": "^2.2.0",
         "rxjs": "^6.5.3",
         "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^5.1.0",
         "through": "^2.3.6"
       },
       "dependencies": {
-        "strip-ansi": {
+        "ansi-styles": {
-          "version": "6.0.0",
+          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^5.0.0"
+            "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"
           }
         }
       }
@@ -3794,9 +3827,9 @@
       }
     },
     "make-error": {
-      "version": "1.3.6",
+      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
       "dev": true
     },
     "makeerror": {
@@ -4394,9 +4427,9 @@
       "dev": true
     },
     "react-is": {
-      "version": "16.13.0",
+      "version": "16.12.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz",
-      "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==",
+      "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==",
       "dev": true
     },
     "read-pkg": {
@@ -4623,9 +4656,9 @@
       "dev": true
     },
     "run-async": {
-      "version": "2.4.0",
+      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "dev": true,
       "requires": {
         "is-promise": "^2.1.0"
@@ -5484,9 +5517,9 @@
       }
     },
     "ts-jest": {
-      "version": "25.2.1",
+      "version": "25.2.0",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.2.0.tgz",
-      "integrity": "sha512-TnntkEEjuXq/Gxpw7xToarmHbAafgCaAzOpnajnFC6jI7oo1trMzAHA04eWpc3MhV6+yvhE8uUBAmN+teRJh0A==",
+      "integrity": "sha512-VaRdb0da46eorLfuHEFf0G3d+jeREcV+Wb/SvW71S4y9Oe8SHWU+m1WY/3RaMknrBsnvmVH0/rRjT8dkgeffNQ==",
       "dev": true,
       "requires": {
         "bs-logger": "0.x",
@@ -5498,21 +5531,36 @@
         "mkdirp": "0.x",
         "resolve": "1.x",
         "semver": "^5.5",
-        "yargs-parser": "^16.1.0"
+        "yargs-parser": "10.x"
       },
       "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",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "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==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
         }
       }
     },
     "tslib": {
-      "version": "1.11.1",
+      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
       "dev": true
     },
     "tsutils": {
@@ -5570,9 +5618,9 @@
       }
     },
     "typescript": {
-      "version": "3.8.3",
+      "version": "3.7.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
-      "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
+      "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
       "dev": true
     },
     "union-value": {
@@ -5838,9 +5886,9 @@
       }
     },
     "write-file-atomic": {
-      "version": "3.0.3",
+      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.1.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "integrity": "sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw==",
       "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.1.0",
+  "version": "1.8.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.3",
+    "@actions/core": "^1.2.2",
     "@actions/exec": "^1.0.3",
     "@actions/io": "^1.0.2",
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^25.1.3",
+    "@types/jest": "^25.1.2",
-    "@types/node": "^13.7.7",
+    "@types/node": "^13.7.1",
-    "@typescript-eslint/eslint-plugin": "^2.21.0",
+    "@typescript-eslint/eslint-plugin": "^2.19.2",
-    "@typescript-eslint/parser": "^2.21.0",
+    "@typescript-eslint/parser": "^2.19.2",
     "@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.8.1",
+    "eslint-plugin-jest": "^23.7.0",
     "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.1",
+    "ts-jest": "^25.2.0",
-    "typescript": "^3.8.3"
+    "typescript": "^3.7.5"
   },
   "husky": {
     "skipCI": true,

src/configs/php.json

@@ -1,29 +0,0 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "php_native_error",
-      "severity": "error",
-      "pattern": [
-        {
-          "regexp": "^(.*error):\\s+\\s+(.+) in (.+) on line (\\d+)$",
-          "code": 1,
-          "message": 2,
-          "file": 3,
-          "line": 4
-        }
-      ]
-    }, {
-      "owner": "php_native_warning",
-      "severity": "warning",
-      "pattern": [
-        {
-          "regexp": "^(.*Warning|.*Deprecated|.*Notice):\\s+\\s+(.+) in (.+) on line (\\d+)$",
-          "code": 1,
-          "message": 2,
-          "file": 3,
-          "line": 4
-        }
-      ]
-    }
-  ]
-}

src/coverage.ts

@@ -54,7 +54,7 @@ export async function addCoveragePCOV(
   pipe: string
 ): Promise<string> {
   let script = '\n';
-  switch (true) {
+  switch (version) {
     default:
       script +=
         (await extensions.addExtension('pcov', version, os_version, true)) +
@@ -83,8 +83,8 @@ export async function addCoveragePCOV(
       );
       // version is not supported
       break;
-
+    case '5.6':
-    case /5\.[3-6]|7\.0/.test(version):
+    case '7.0':
       script += await utils.addLog(
         '$cross',
         'pcov',

src/extensions.ts

@@ -18,45 +18,21 @@ export async function addExtensionDarwin(
   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 [extension_name, stability]: string[] = extension.split('-');
-    const prefix = await utils.getExtensionPrefix(ext_name);
+    const prefix = await utils.getExtensionPrefix(extension_name);
     let install_command = '';
     switch (true) {
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-        version_extension
-      ):
-        install_command =
-          'bash ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
-          ' ' +
-          version +
-          ' ' +
-          (await utils.getBlackfireVersion(ext_version));
-        break;
       // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
         script +=
           '\nadd_unstable_extension ' +
-          ext_name +
+          extension_name +
           ' ' +
-          ext_version +
+          stability +
           ' ' +
           prefix;
         return;
-      // match exact versions
+      case /5\.6xdebug/.test(version_extension):
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        script +=
-          '\nadd_pecl_extension ' + ext_name + ' ' + ext_version + ' ' + prefix;
-        return;
-      case /5\.3xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.2.7' + pipe;
-        break;
-      case /5\.4xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.4.1' + pipe;
-        break;
-      case /5\.[5-6]xdebug/.test(version_extension):
         install_command = 'sudo pecl install -f xdebug-2.5.5' + pipe;
         break;
       case /7\.0xdebug/.test(version_extension):
@@ -112,40 +88,13 @@ export async function addExtensionWindows(
   let script = '\n';
   await utils.asyncForEach(extensions, async function(extension: string) {
     extension = extension.toLowerCase();
-    const [ext_name, ext_version]: string[] = extension.split('-');
+    const [extension_name, stability]: string[] = extension.split('-');
     const version_extension: string = version + extension;
-    let matches: RegExpExecArray;
     switch (true) {
-      // 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
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
+        script += '\nAdd-Extension ' + extension_name + ' ' + stability;
         break;
-      // match exact versions
-      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(
-        version_extension
-      ):
-        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 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
         script +=
@@ -182,38 +131,20 @@ export async function addExtensionLinux(
   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 [extension_name, stability]: string[] = extension.split('-');
-    const prefix = await utils.getExtensionPrefix(ext_name);
+    const prefix = await utils.getExtensionPrefix(extension_name);
     let install_command = '';
     switch (true) {
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-        version_extension
-      ):
-        install_command =
-          'bash ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire.sh') +
-          ' ' +
-          version +
-          ' ' +
-          (await utils.getBlackfireVersion(ext_version));
-        break;
       // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
         script +=
           '\nadd_unstable_extension ' +
-          ext_name +
+          extension_name +
           ' ' +
-          ext_version +
+          stability +
           ' ' +
           prefix;
         return;
-      // match exact versions
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        script +=
-          '\nadd_pecl_extension ' + ext_name + ' ' + ext_version + ' ' + prefix;
-        return;
       // match 5.6gearman..7.4gearman
       case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
         install_command =
@@ -236,7 +167,7 @@ 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.0' +
           pipe +
           '\n' +
           (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));

src/install.ts

@@ -22,15 +22,17 @@ export async function build(
   // taking inputs
   const extension_csv: string =
     (await utils.getInput('extensions', false)) ||
-    (await utils.getInput('extension', false));
+    (await utils.getInput('extension', false)) ||
-  const ini_values_csv: string = await utils.getInput('ini-values', false);
+    (await utils.getInput('extension-csv', false));
+  const ini_values_csv: string =
+    (await utils.getInput('ini-values', false)) ||
+    (await utils.getInput('ini-values-csv', false));
   const coverage_driver: string = await utils.getInput('coverage', false);
   const pecl: string = await utils.getInput('pecl', false);
   let tools_csv: string = await utils.getInput('tools', false);
   if (
     pecl == 'true' ||
-    /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv) ||
+    /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv)
-    /.*-(\d+\.\d+\.\d+).*/.test(extension_csv)
   ) {
     tools_csv = 'pecl, ' + tools_csv;
   }
@@ -56,17 +58,16 @@ export async function build(
  */
 export async function run(): Promise<void> {
   try {
+    const os_version: string = process.platform;
     let version: string = await utils.getInput('php-version', true);
     version = version.length > 1 ? version.slice(0, 3) : version + '.0';
-    const os_version: string = process.platform;
-
     // check the os version and run the respective script
     let script_path = '';
     switch (os_version) {
       case 'darwin':
       case 'linux':
         script_path = await build(os_version + '.sh', version, os_version);
-        await exec('bash ' + script_path + ' ' + version + ' ' + __dirname);
+        await exec('sh ' + script_path + ' ' + version + ' ' + __dirname);
         break;
       case 'win32':
         script_path = await build('win32.ps1', version, os_version);

src/matchers.ts

@@ -6,8 +6,13 @@ import * as io from '@actions/io';
  * Cache json files for problem matchers
  */
 export async function addMatchers(): Promise<void> {
-  const config_path = path.join(__dirname, '..', 'src', 'configs');
+  const config_path = path.join(
+    __dirname,
+    '..',
+    'src',
+    'configs',
+    'phpunit.json'
+  );
   const runner_dir: string = await utils.getInput('RUNNER_TOOL_CACHE', false);
-  await io.cp(path.join(config_path, 'phpunit.json'), runner_dir);
+  await io.cp(config_path, runner_dir);
-  await io.cp(path.join(config_path, 'php.json'), runner_dir);
 }

src/scripts/darwin.sh

@@ -20,14 +20,22 @@ 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 test if extension is loaded
+# Function to setup extensions
-check_extension() {
+add_extension() {
   extension=$1
-  php -m | grep -i -q -w "$extension"
+  install_command=$2
+  prefix=$3
+  if ! php -m | grep -i -q -w "$extension" && [ -e "$ext_dir/$extension.so" ]; then
+    echo "$prefix=$extension" >>"$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") ||
+    add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
+  fi
 }
 
 # Fuction to get the PECL version
@@ -43,87 +51,68 @@ 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 &&
-      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")
-  add_pecl_extension "$extension" "$pecl_version" "$prefix"
+  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
 }
 
 # Function to setup a remote tool
 add_tool() {
   url=$1
   tool=$2
-  tool_path="$tool_path_dir/$tool"
+  if [ "$tool" = "composer" ]; then
-  if [ ! -e "$tool_path" ]; then
+    brew install composer >/dev/null 2>&1
-    rm -rf "$tool_path"
+    composer -q global config process-timeout 0
-  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
-    add_log "$cross" "$tool" "Could not setup $tool"
+    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
   fi
 }
 
 # Function to add a tool using composer
-add_composertool() {
+add_composer_tool() {
   tool=$1
   release=$2
   prefix=$3
@@ -134,17 +123,6 @@ add_composertool() {
   ) || 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() {
   for tool in pear pecl; do
@@ -159,12 +137,11 @@ add_pecl() {
   add_log "$tick" "PECL" "Added"
 }
 
-# Function to setup PHP >=5.6
+# Function to setup PHP and composer
-setup_php() {
+setup_php_and_composer() {
-  action=$1
+  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-  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 install shivammathur/php/php@"$version" >/dev/null 2>&1
   brew link --force --overwrite php@"$version" >/dev/null 2>&1
 }
 
@@ -172,32 +149,23 @@ setup_php() {
 tick="✓"
 cross="✗"
 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
+if [ "$existing_version" != "$version" ]; then
-  script="https://github.com/shivammathur/php5-darwin/releases/latest/download/install.sh"
+  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE >/dev/null 2>&1
-  curl -sSL "$script" | bash -s "$version" >/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
   status="Installed"
-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" "$tool_path_dir"
+sudo chmod 777 "$ini_file"
 echo "date.timezone=UTC" >>"$ini_file"
-echo "detect_unicode=Off" >>"$ini_file"
+ext_dir=$(php -i | grep -Ei "extension_dir => /(usr|opt)" | sed -e "s|.*=> s*||")
-ext_dir=$(php -i | grep -Ei "extension_dir => /usr" | 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

src/scripts/ext/blackfire.ps1

@@ -1,30 +0,0 @@
-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"
-

src/scripts/ext/blackfire.sh

@@ -1,7 +0,0 @@
-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"

src/scripts/ext/blackfire_darwin.sh

@@ -1,7 +0,0 @@
-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"

src/scripts/ext/phalcon_darwin.sh

@@ -40,4 +40,4 @@ if [ -e "$ext_dir/psr.so" ] && [ -e "$ext_dir/phalcon.so" ]; then
   fi
 else
   install_phalcon
-fi
+fi

src/scripts/linux.sh

@@ -19,17 +19,11 @@ add_log() {
 # Function to update php ppa
 update_ppa() {
   if [ "$ppa_updated" = "false" ]; then
-    if [[ "$version" =~ $old_versions ]]; then
+    find /etc/apt/sources.list.d -type f -name 'ondrej-ubuntu-php*.list' -exec sudo DEBIAN_FRONTEND=noninteractive apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
-      ppa="dotdeb-ubuntu-php*.list"
-    else
-      ppa="ondrej-ubuntu-php*.list"
-    fi
-    find /etc/apt/sources.list.d -type f -name "$ppa" -exec sudo "$debconf_fix" apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
     ppa_updated="true"
   fi
 }
 
-# Function to configure PECL
 configure_pecl() {
   if [ "$pecl_config" = "false" ] && [ -e /usr/bin/pecl ]; then
     for tool in pear pecl; do
@@ -54,70 +48,50 @@ get_pecl_version() {
   echo "$pecl_version"
 }
 
-# Function to test if extension is loaded
+# Function to setup extensions
-check_extension() {
+add_extension() {
   extension=$1
-  php -m | grep -i -q -w "$extension"
+  install_command=$2
+  prefix=$3
+  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" | awk '/Depends:/{print$2}') >/dev/null 2>&1
+    echo "$prefix=$extension" >>"$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" && add_log "$tick" "$extension" "Installed and enabled") ||
+    (update_ppa && eval "$install_command" && add_log "$tick" "$extension" "Installed and enabled") ||
+    (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
 delete_extension() {
   extension=$1
   sudo sed -i "/$extension/d" "$ini_file"
-  sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
+  sudo rm -rf /etc/php/"$version"/cli/conf.d/*"$extension"* >/dev/null 2>&1
   sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
 }
 
 # Function to disable and delete extensions
 remove_extension() {
   extension=$1
-  if [[ ! "$version" =~ $old_versions ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
+  if [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
     sudo phpdismod -v "$version" "$extension"
   fi
   delete_extension "$extension"
 }
 
-# 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
-  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
-    echo "$prefix=$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 ||
-    (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
-  prefix=$3
+  (sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
-  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
+  add_log "$tick" "$extension" "Installed and enabled") ||
-    echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"
+  add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"
-  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
@@ -126,7 +100,25 @@ add_unstable_extension() {
   stability=$2
   prefix=$3
   pecl_version=$(get_pecl_version "$extension" "$stability")
-  add_pecl_extension "$extension" "$pecl_version" "$prefix"
+  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
+      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
 }
 
 # Function to update extension
@@ -148,7 +140,7 @@ update_extension() {
 add_tool() {
   url=$1
   tool=$2
-  tool_path="$tool_path_dir/$tool"
+  tool_path=/usr/local/bin/"$tool"
   if [ ! -e "$tool_path" ]; then
     rm -rf "$tool_path"
   fi
@@ -160,11 +152,9 @@ add_tool() {
     elif [ "$tool" = "cs2pr" ]; then
       sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
     elif [ "$tool" = "phive" ]; then
-      add_extension curl "$apt_install php$version-curl" extension >/dev/null 2>&1
+      add_extension curl >/dev/null 2>&1
-      add_extension mbstring "$apt_install php$version-mbstring" extension >/dev/null 2>&1
+      add_extension mbstring >/dev/null 2>&1
-      add_extension xml "$apt_install php$version-xml" extension >/dev/null 2>&1
+      add_extension xml >/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 +163,7 @@ add_tool() {
 }
 
 # Function to setup a tool using composer
-add_composertool() {
+add_composer_tool() {
   tool=$1
   release=$2
   prefix=$3
@@ -194,49 +184,19 @@ 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
-  update_ppa && $apt_install libicu-dev >/dev/null 2>&1
+  $apt_install libicu-dev >/dev/null 2>&1
-  curl -SLO https://dl.bintray.com/shivammathur/php/"$tar_file" >/dev/null 2>&1
+  curl -o "$tar_file" -L https://bintray.com/shivammathur/php/download_file?file_path="$tar_file" >/dev/null 2>&1
   sudo tar xf "$tar_file" -C ~/php >/dev/null 2>&1
   rm -rf "$tar_file"
   sudo ln -sf -S "$version" "$install_dir"/bin/* /usr/bin/
   sudo ln -sf "$install_dir"/etc/php.ini /etc/php.ini
 }
 
-# Function to setup PHP 5.3, PHP 5.4 and PHP 5.5
-setup_old_versions() {
-  (
-    cd /tmp || exit
-    curl -SLO https://dl.bintray.com/shivammathur/php/php-"$version".tar.xz >/dev/null 2>&1
-    sudo tar xf php-"$version".tar.xz >/dev/null 2>&1
-    cd php-"$version" || exit
-    sudo chmod a+x ./*.sh
-    ./install.sh >/dev/null 2>&1
-    ./post-install.sh >/dev/null 2>&1
-  )
-  sudo rm -rf /tmp/php-"$version"
-  configure_pecl
-  release_version=$(php -v | head -n 1 | cut -d' ' -f 2)
-}
-
 # Function to setup PECL
 add_pecl() {
   add_devtools
@@ -256,80 +216,52 @@ 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="✗"
 ppa_updated="false"
 pecl_config="false"
 version=$1
-old_versions="5.[4-5]"
+apt_install="sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y"
-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}"
 
 # Setup PHP
 step_log "Setup PHP"
-sudo mkdir -p /var/run /run/php
+sudo mkdir -p /var/run
+sudo mkdir -p /run/php
 
 if [ "$existing_version" != "$version" ]; then
   if [ ! -e "/usr/bin/php$version" ]; then
+    update_ppa
     if [ "$version" = "8.0" ]; then
       setup_master
-    elif [[ "$version" =~ $old_versions ]] || [ "$version" = "5.3" ]; then
-      setup_old_versions
     else
-      update_ppa
       $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml >/dev/null 2>&1
     fi
-    status="Installed"
+    status="installed"
   else
-    if [ "$update" = "true" ]; then
+    status="switched"
-      update_php
-    else
-      status="Switched to"
-    fi
   fi
 
-  # PHP 5.3 is switched by install script, for rest switch_version
+  switch_version
-  if [ "$version" != "5.3" ]; then
+
-    switch_version
+  if [ "$version" = "8.0" ]; then
+    semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
+  else
+    semver=$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')
   fi
 
+  if [ "$status" != "switched" ]; then
+    status="Installed PHP $semver"
+  else
+    status="Switched to PHP $semver"
+  fi
 else
-  if [ "$update" = "true" ]; then
+  semver=$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')
-    update_php
+  status="PHP $semver Found"
-  else
-    status="Found"
-  fi
 fi
 
-semver=$(php_semver)
 ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
-ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
+ext_dir=$(php -i | grep "extension_dir => /usr" | 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"
-add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/win32.ps1

@@ -31,12 +31,7 @@ Function Add-Extension {
     [ValidateNotNull()]
     [ValidateSet('stable', 'beta', 'alpha', 'devel', 'snapshot')]
     [string]
-    $mininum_stability = 'stable',
+    $mininum_stability = 'stable'
-    [Parameter(Position = 2, Mandatory = $false)]
-    [ValidateNotNull()]
-    [ValidatePattern('^\d+(\.\d+){0,2}$')]
-    [string]
-    $extension_version = ''
   )
   try {
     $extension_info = Get-PhpExtension -Path $php_dir | Where-Object { $_.Name -eq $extension -or $_.Handle -eq $extension }
@@ -55,12 +50,7 @@ Function Add-Extension {
       }
     }
     else {
-      if($extension_version -ne '') {
+      Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Path $php_dir
-        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $mininum_stability -Path $php_dir
-      } else {
-        Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Path $php_dir
-      }
-
       Add-Log $tick $extension "Installed and enabled"
     }
   }
@@ -101,9 +91,12 @@ Function Add-Tool() {
   if (Test-Path $php_dir\$tool) {
     Remove-Item $php_dir\$tool
   }
-  if ($tool -eq "symfony") {
+  if ($tool -eq "composer") {
+    Install-Composer -Scope System -Path $php_dir -PhpPath $php_dir
+    composer -q global config process-timeout 0
+  } elseif ($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,19 +106,16 @@ Function Add-Tool() {
       $bat_content += "SET BIN_TARGET=%~dp0/" + $tool
       $bat_content += "php %BIN_TARGET% %*"
       Set-Content -Path $php_dir\$tool.bat -Value $bat_content
-      Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.bat" >$null 2>&1
+      Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.bat" > $null 2>&1
     } catch { }
   }
   if($tool -eq "phive") {
     Add-Extension curl >$null 2>&1
     Add-Extension mbstring >$null 2>&1
     Add-Extension xml >$null 2>&1
-  } elseif($tool -eq "cs2pr") {
+  }
+  if($tool -eq "cs2pr") {
     (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
-  } elseif($tool -eq "composer") {
-    composer -q global config process-timeout 0
-  } 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"
@@ -134,7 +124,7 @@ Function Add-Tool() {
   }
 }
 
-Function Add-Composertool() {
+Function Add-Composer-Tool() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
     [ValidateNotNull()]
@@ -162,33 +152,10 @@ Function Add-Composertool() {
   }
 }
 
-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)
@@ -197,7 +164,6 @@ $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
@@ -221,7 +187,6 @@ 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'
@@ -229,22 +194,15 @@ 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') {
+  $updated = Update-Php $php_dir >$null 2>&1
-    Update-Php $php_dir >$null 2>&1
+  if($updated -eq $False) {
-    $status = "Updated to"
-  } else {
     $status = "Found"
   }
 }
 
 $installed = Get-Php -Path $php_dir
 Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
-if($version -lt "5.5") {
+Enable-PhpExtension -Extension openssl, curl, opcache -Path $php_dir
-  Add-Extension openssl >$null 2>&1
-  Add-Extension curl >$null 2>&1
-} else {
-  Enable-PhpExtension -Extension openssl, curl, opcache -Path $php_dir
-}
 Update-PhpCAInfo -Path $php_dir -Source CurrentUser
 if ($version -eq 'master') {
   if($installed.ThreadSafe) {

src/tools.ts

@@ -1,20 +1,60 @@
 import * as utils from './utils';
 
 /**
- * Function to get command to setup tools
+ * Function to get command to setup tool
  *
  * @param os_version
  */
-export async function getCommand(
+export async function getArchiveCommand(os_version: string): Promise<string> {
-  os_version: string,
-  suffix: string
-): Promise<string> {
   switch (os_version) {
     case 'linux':
     case 'darwin':
-      return 'add_' + suffix + ' ';
+      return 'add_tool ';
     case 'win32':
-      return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
+      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 ';
     default:
       return await utils.log(
         'Platform ' + os_version + ' is not supported',
@@ -98,15 +138,23 @@ export async function getUri(
  * Helper function to get the codeception url
  *
  * @param version
+ * @param php_version
  * @param suffix
  */
 export async function getCodeceptionUriBuilder(
   version: string,
+  php_version: string,
   suffix: string
 ): Promise<string> {
-  return ['releases', version, suffix, 'codecept.phar']
+  switch (true) {
-    .filter(Boolean)
+    case /^5\.6$|^7\.[0|1]$/.test(php_version):
-    .join('/');
+      return ['releases', version, suffix, 'codecept.phar']
+        .filter(Boolean)
+        .join('/');
+    case /^7\.[2-4]$/.test(php_version):
+    default:
+      return ['releases', version, 'codecept.phar'].filter(Boolean).join('/');
+  }
 }
 
 /**
@@ -119,55 +167,19 @@ export async function getCodeceptionUri(
   version: string,
   php_version: string
 ): Promise<string> {
-  const codecept: string = await getCodeceptionUriBuilder(version, '');
-  const codecept54: string = await getCodeceptionUriBuilder(version, 'php54');
-  const codecept56: string = await getCodeceptionUriBuilder(version, 'php56');
-  // Refer to https://codeception.com/builds
   switch (true) {
     case /latest/.test(version):
       switch (true) {
-        case /5\.6|7\.[0|1]/.test(php_version):
+        case /^5\.6$|^7\.[0|1]$/.test(php_version):
           return 'php56/codecept.phar';
-        case /7\.[2-4]/.test(php_version):
+        case /^7\.[2-4]$/.test(php_version):
         default:
           return 'codecept.phar';
       }
-    case /(^[4-9]|\d{2,})\..*/.test(version):
+    case /([4-9]|\d{2,})\..*/.test(version):
-      switch (true) {
+      return await getCodeceptionUriBuilder(version, php_version, 'php56');
-        case /5\.6|7\.[0|1]/.test(php_version):
-          return codecept56;
-        case /7\.[2-4]/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /(^2\.[4-5]\.\d+|^3\.[0-1]\.\d+).*/.test(version):
-      switch (true) {
-        case /5\.6/.test(php_version):
-          return codecept54;
-        case /7\.[0-4]/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /^2\.3\.\d+.*/.test(version):
-      switch (true) {
-        case /5\.[4-6]/.test(php_version):
-          return codecept54;
-        case /^7\.[0-4]$/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /(^2\.(1\.([6-9]|\d{2,}))|^2\.2\.\d+).*/.test(version):
-      switch (true) {
-        case /5\.[4-5]/.test(php_version):
-          return codecept54;
-        case /5.6|7\.[0-4]/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
-      return codecept;
     default:
-      return await codecept;
+      return await getCodeceptionUriBuilder(version, php_version, 'php54');
   }
 }
 
@@ -186,12 +198,12 @@ export async function addPhive(
   switch (version) {
     case 'latest':
       return (
-        (await getCommand(os_version, 'tool')) +
+        (await getArchiveCommand(os_version)) +
         'https://phar.io/releases/phive.phar phive'
       );
     default:
       return (
-        (await getCommand(os_version, 'tool')) +
+        (await getArchiveCommand(os_version)) +
         'https://github.com/phar-io/phive/releases/download/' +
         version +
         '/phive-' +
@@ -202,21 +214,20 @@ export async function addPhive(
 }
 
 /**
- * Function to get the phar url in domain/tool-version.phar format
+ * Function to get the PHPUnit url
  *
  * @param version
  */
-export async function getPharUrl(
+export async function getPhpunitUrl(
-  domain: string,
   tool: string,
-  prefix: string,
   version: string
 ): Promise<string> {
+  const phpunit = 'https://phar.phpunit.de';
   switch (version) {
     case 'latest':
-      return domain + '/' + tool + '.phar';
+      return phpunit + '/' + tool + '.phar';
     default:
-      return domain + '/' + tool + '-' + prefix + version + '.phar';
+      return phpunit + '/' + tool + '-' + version + '.phar';
   }
 }
 
@@ -269,27 +280,6 @@ 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
  *
@@ -323,7 +313,7 @@ export async function getCleanedToolsList(
     .map(function(extension: string) {
       return extension
         .trim()
-        .replace(/symfony\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
+        .replace(/robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
     })
     .filter(Boolean);
   return [...new Set(tools_list)];
@@ -343,7 +333,7 @@ export async function addArchive(
   url: string,
   os_version: string
 ): Promise<string> {
-  return (await getCommand(os_version, 'tool')) + url + ' ' + tool;
+  return (await getArchiveCommand(os_version)) + url + ' ' + tool;
 }
 
 /**
@@ -395,7 +385,7 @@ export async function addPackage(
   prefix: string,
   os_version: string
 ): Promise<string> {
-  const tool_command = await getCommand(os_version, 'composertool');
+  const tool_command = await getPackageCommand(os_version);
   return tool_command + tool + ' ' + release + ' ' + prefix;
 }
 
@@ -428,17 +418,6 @@ 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;
@@ -470,10 +449,8 @@ export async function addTools(
         script += await addArchive(tool, version, url, os_version);
         break;
       case 'composer':
-        // If RC is released as latest release, switch to getcomposer.
+        url =
-        // Prefered source is GitHub as it is faster.
+          github + 'composer/composer/releases/latest/download/composer.phar';
-        // 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':
@@ -484,16 +461,13 @@ export async function addTools(
         break;
       case 'phpcpd':
       case 'phpunit':
-        url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
+        url = await getPhpunitUrl(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;
@@ -509,7 +483,7 @@ export async function addTools(
         );
         break;
       case 'pecl':
-        script += await getCommand(os_version, 'pecl');
+        script += await getPECLCommand(os_version);
         break;
       case 'php-config':
       case 'phpize':
@@ -521,10 +495,6 @@ 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',

src/utils.ts

@@ -261,28 +261,3 @@ export async function suppressOutput(os_version: string): Promise<string> {
       );
   }
 }
-
-/**
- * Function to get Blackfire version
- *
- * @param blackfire_version
- */
-export async function getBlackfireVersion(
-  blackfire_version: null | undefined | string
-): Promise<string> {
-  switch (blackfire_version) {
-    case null:
-    case undefined:
-    case '':
-      return '1.31.0';
-    default:
-      return blackfire_version;
-  }
-}
-
-/**
- * Function to get Blackfire Agent version
- */
-export async function getBlackfireAgentVersion(): Promise<string> {
-  return '1.32.0';
-}