Add support for SAPI setup

Use GitHub releases for libcouchbase 2 on linux
Fix cubrid setup on Ubuntu 16.04
2025-07-02 13:13:15 +07:00 · 2021-03-06 17:40:05 +05:30 · 2021-03-06 02:48:36 +05:30 · 2021-03-06 01:55:47 +05:30 · 2021-03-06 01:55:23 +05:30 · 2021-03-06 01:55:21 +05:30
52 changed files with 13247 additions and 4150 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -10,7 +10,7 @@
    "plugin:import/warnings",
    "plugin:import/typescript",
    "plugin:prettier/recommended",
-    "prettier/@typescript-eslint"
+    "prettier"
  ],
  "plugins": ["@typescript-eslint", "jest"]
 }
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@ -1,8 +1,8 @@
 name: Docs workflow
 on:
-  repository_dispatch:
+  workflow_dispatch:
  schedule:
-    - cron: '0 0 * * 2'
+    - cron: '0 15 * * 6'
 jobs:
  create:
    name: Create
@ -10,7 +10,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, macos-10.15, macos-11.0]
+        operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, macos-10.15]
        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
    steps:
      - name: Setup PHP
@ -35,7 +35,7 @@ jobs:
          version: ${{ matrix.php-versions }}
        if: matrix.operating-system == 'windows-2019'
        run: |
-          Write-Output "## PHP $version`n" | Out-File -FilePath "$env:file"
+          Write-Output "## PHP ${{ matrix.php-versions }}`n" | Out-File -FilePath "$env:file"
          Write-Output "``````" | Out-File -FilePath "$env:file" -Append
          php -m | Out-File -FilePath "$env:file" -Append
          Write-Output "```````n" | Out-File -FilePath "$env:file" -Append
@ -60,9 +60,13 @@ jobs:
          git config --local user.email "${{ secrets.email }}"
          git config --local user.name "${{ github.repository_owner }}"
          for os in ubuntu-20.04 ubuntu-18.04 ubuntu-16.04 windows-2019 macos-10.15 macos-11.0; do
-            echo "# PHP Extensions on $os" > Php-extensions-on-"$os".md
+            echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md
            for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
-              cat lists/php"$version"-"$os".md >> Php-extensions-on-"$os".md
+              if [ "$os" = "macos-11.0" ]; then
+                cat lists/php"$version"-macos-10.15.md >> Php-extensions-loaded-on-"$os".md
+              else
+                cat lists/php"$version"-"$os".md >> Php-extensions-loaded-on-"$os".md
+              fi
            done
          done
          rm -rf ./lists
--- a/.github/workflows/node-workflow.yml
+++ b/.github/workflows/node-workflow.yml
@ -28,10 +28,10 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v2

-      - name: Setup Node.js 12.x
+      - name: Setup Node.js 14.x
        uses: actions/setup-node@v1
        with:
-          node-version: 12.x
+          node-version: 14.x

      - name: Install dependencies
        run: npm install
--- a/README.md
+++ b/README.md
@ -22,10 +22,10 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support

 ## Contents

- [PHP Support](#tada-php-support)
 - [OS/Platform Support](#cloud-osplatform-support)
  - [GitHub-Hosted Runners](#github-hosted-runners)
  - [Self-Hosted Runners](#self-hosted-runners)
+- [PHP Support](#tada-php-support)  
 - [PHP Extension Support](#heavy_plus_sign-php-extension-support)
 - [Tools Support](#wrench-tools-support)
 - [Coverage Support](#signal_strength-coverage-support)
@ -36,14 +36,15 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
  - [Inputs](#inputs)
  - [Flags](#flags)
  - [Basic Setup](#basic-setup)
-  - [Matrix Setup](#matrix-setup)
-  - [Multi-Arch Setup](#multi-arch-setup)
+  - [Matrix Setup](#matrix-setup)  
  - [Nightly Build Setup](#nightly-build-setup)
+  - [Thread Safe Setup](#thread-safe-setup)
+  - [Force Update Setup](#force-update-setup)
+  - [Verbose Setup](#verbose-setup)  
+  - [Multi-Arch Setup](#multi-arch-setup)
  - [Self Hosted Setup](#self-hosted-setup)
  - [Local Testing Setup](#local-testing-setup)
-  - [Thread Safe Setup](#thread-safe-setup)
-  - [Force Update](#force-update)
-  - [Verbose Setup](#verbose-setup)
+  - [JIT Configuration](#jit-configuration)
  - [Cache Extensions](#cache-extensions)
  - [Cache Composer Dependencies](#cache-composer-dependencies)
  - [Cache Node.js Dependencies](#cache-nodejs-dependencies)
@ -57,39 +58,20 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 - [Dependencies](#package-dependencies)
 - [Further Reading](#bookmark_tabs-further-reading)

-## :tada: PHP Support
-
-|PHP Version|Stability|Release Support|Runner Support|
-|--- |--- |--- |--- |
-|`5.3`|`Stable`|`End of life`|`GitHub-hosted`|
-|`5.4`|`Stable`|`End of life`|`GitHub-hosted`|
-|`5.5`|`Stable`|`End of life`|`GitHub-hosted`|
-|`5.6`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.0`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.1`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.2`|`Stable`|`Security fixes only`|`GitHub-hosted`, `self-hosted`|
-|`7.3`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
-|`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
-|`8.0`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
-|`8.1`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
-
-**Note:** Specifying `8.0` and `8.1` in `php-version` input installs a nightly build of `PHP 8.0.0-dev` and `PHP 8.1.0-dev` respectively. See [nightly build setup](#nightly-build-setup) for more information.
-
-
 ## :cloud: OS/Platform Support

-The action supports both `GitHub-hosted` runners and `self-hosted` runners on the following operating systems.
+Both `GitHub-hosted` and `self-hosted` runners are suppported by `setup-php` on the following OS/Platforms.

 ### GitHub-Hosted Runners

 |Virtual environment|YAML workflow label|Pre-installed PHP|
 |--- |--- |--- |
-|Ubuntu 16.04|`ubuntu-16.04`|`PHP 5.6` to `PHP 7.4`|
-|Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|`PHP 7.1` to `PHP 7.4`|
-|Ubuntu 20.04|`ubuntu-20.04`|`PHP 7.4`|
-|Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 7.4`|
-|macOS Catalina 10.15|`macos-latest` or `macos-10.15`|`PHP 7.4`|
-|macOS Big Sur 11.0|`macos-11.0`|`PHP 7.4`|
+|Ubuntu 16.04|`ubuntu-16.04`|`PHP 5.6` to `PHP 8.0`|
+|Ubuntu 18.04|`ubuntu-18.04`|`PHP 7.1` to `PHP 8.0`|
+|Ubuntu 20.04|`ubuntu-latest` or `ubuntu-20.04`|`PHP 7.4` to `PHP 8.0`|
+|Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 8.0`|
+|macOS Catalina 10.15|`macos-latest` or `macos-10.15`|`PHP 8.0`|
+|macOS Big Sur 11.0|`macos-11.0`|`PHP 8.0`|

 ### Self-Hosted Runners

@ -101,50 +83,73 @@ The action supports both `GitHub-hosted` runners and `self-hosted` runners on th
 |Windows 7 and newer|`self-hosted` or `Windows`|
 |Windows Server 2012 R2 and newer|`self-hosted` or `Windows`|
 |macOS Catalina 10.15|`self-hosted` or `macOS`|
-|macOS Big Sur 11.0|`self-hosted` or `macOS`|
+|macOS Big Sur 11.x x86_64/arm64|`self-hosted` or `macOS`|

 - Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.
+- If the requested PHP version is pre-installed, `setup-php` switches to it, otherwise it installs the PHP version.
+
+## :tada: PHP Support
+
+On all supported OS/Platforms the following PHP versions are supported as per the runner.
+
+- PHP 5.3 to PHP 8.1 on GitHub-hosted runners.
+- PHP 5.6 to PHP 8.1 on self-hosted runners.
+
+|PHP Version|Stability|Release Support|Runner Support|
+|--- |--- |--- |--- |
+|`5.3`|`Stable`|`End of life`|`GitHub-hosted`|
+|`5.4`|`Stable`|`End of life`|`GitHub-hosted`|
+|`5.5`|`Stable`|`End of life`|`GitHub-hosted`|
+|`5.6`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.0`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.1`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.2`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.3`|`Stable`|`Security fixes only`|`GitHub-hosted`, `self-hosted`|
+|`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
+|`8.0`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
+|`8.1`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
+
+**Notes:** 
+- Specifying `8.1` in `php-version` input installs a nightly build of `PHP 8.1.0-dev`. See [nightly build setup](#nightly-build-setup) for more information.
+- To use JIT on `PHP 8.0` and `PHP 8.1` refer to the [JIT configuration](#jit-configuration) section.

 ## :heavy_plus_sign: PHP Extension Support

- Extensions enabled by default after `setup-php` runs can be found on the [wiki](https://github.com/shivammathur/setup-php/wiki).
+PHP extensions can be setup using the `extensions` input. It accepts a `string` in csv-format.

- 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`, extensions which are available as a package, available on `PECL`, or hosted on GitHub can be setup.

 ```yaml
- name: Setup PHP with pecl extension
+- name: Setup PHP with PECL extension
  uses: shivammathur/setup-php@v2
  with:
    php-version: '7.4'
-    tools: pecl
-    extensions: swoole
+    extensions: imagick, swoole
 ```

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

- On `macOS` PECL extensions can be installed.
+- On `macOS`, extensions available on `PECL` or hosted on GitHub 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.
+- Specific versions of extensions available on `PECL` can be setup by suffixing the extension's name with the version. This is useful for installing old versions of extensions which support end of life PHP versions.

 ```yaml
 - name: Setup PHP with specific version of PECL extension
  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`.
+- Pre-release versions extensions available on `PECL` can be setup by suffixing the extension's name with its state i.e `alpha`, `beta`, `devel` or `snapshot`.

 ```yaml
 - name: Setup PHP with pre-release PECL extension
  uses: shivammathur/setup-php@v2
  with:
    php-version: '7.4'
-    tools: pecl
    extensions: xdebug-beta
 ```

@ -158,17 +163,22 @@ The action supports both `GitHub-hosted` runners and `self-hosted` runners on th
    extensions: :opcache
 ```

- Extension `intl` can be setup with specific `ICU` version for `PHP 5.6` to `PHP 7.4` in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.
+- Extension `intl` can be setup with specific `ICU` version for `PHP 5.6` to `PHP 8.0` in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.

 ```yaml
 - name: Setup PHP with intl
  uses: shivammathur/setup-php@v2
  with:
    php-version: '7.4'
-    extensions: intl-67.1
+    extensions: intl-68.2
 ```

- These extensions have custom support - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`, and `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_oci`, `phalcon3` and `phalcon4` on all supported OS.
+- Extensions loaded by default after `setup-php` runs can be found on the [wiki](https://github.com/shivammathur/setup-php/wiki).
+
+- These extensions have custom support:
+  - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`.
+  - `geos` on `Ubuntu` and `macOS`.
+  - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_oci`, `pecl_http`, `phalcon3` and `phalcon4` on all supported OS.

 - By default, extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`. 

@ -182,11 +192,23 @@ The action supports both `GitHub-hosted` runners and `self-hosted` runners on th
    fail-fast: true
 ```

+- Extensions can be compiled from source if they are hosted on GitHub. In this case, the version specification contains the repository and branch/tag to clone: 
+
+```yaml
+- name: Setup PHP and remove shared extension
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'  
+    extensions: mongodb-mongodb/mongo-php-driver@v1.9
+```
+
+The version can be a branch name or tag as supported by `git clone -b <name>`. The clone is performed recursively, i.e. submodules will be cloned as well.
+
 ## :wrench: Tools Support

-These tools can be setup globally using the `tools` input.
+These tools can be setup globally using the `tools` input. It accepts a string in csv-format.

-`behat`, `blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-normalize`, `composer-prefetcher`, `composer-require-checker`, `composer-unused`, `cs2pr`, `deployer`, `flex`, `grpc_php_plugin`, `infection`, `pecl`, `phan`, `phing`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpspec`, `phpstan`, `phpunit`, `prestissimo`, `protoc`, `psalm`, `symfony`, `vapor-cli`
+`behat`, `blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-normalize`, `composer-prefetcher`, `composer-require-checker`, `composer-unused`, `cs2pr`, `deployer`, `flex`, `grpc_php_plugin`, `infection`, `pecl`, `phan`, `phing`, `phinx`, `phive`, `php-config`, `php-cs-fixer`, `phpcbf`, `phpcpd`, `phpcs`, `phpize`, `phplint`, `phpmd`, `phpspec`, `phpstan`, `phpunit`, `prestissimo`, `protoc`, `psalm`, `symfony` or `symfony-cli`, `vapor` or `vapor-cli`, `wp` or `wp-cli`

 ```yaml
 - name: Setup PHP with tools
@ -196,7 +218,7 @@ These tools can be setup globally using the `tools` input.
    tools: php-cs-fixer, phpunit
 ```

- To set up a particular version of a tool, specify it in the form `tool:version`. The latest stable version of `composer` is set up by default. You can set up the required `composer` version by specifying `v1`, `v2`, `snapshot` or `preview` as versions or the exact version in semver format.
+- To set up a particular version of a tool, specify it in the form `tool:version`. The latest stable version of `composer` is set up by default. You can set up the required `composer` version by specifying `v1`, `v2`, `snapshot` or `preview` as versions, or the exact version in semver format.

 ```yaml
 - name: Setup PHP with composer v2
@ -206,7 +228,7 @@ These tools can be setup globally using the `tools` input.
    tools: composer:v2
 ```

- If you have specified composer plugins `prestissimo` or `composer-prefetcher` in tools, the latest stable version of `composer v1` will be setup. Unless some of your packages require `composer v1`, it is recommended to drop `prestissimo` and use `composer v2`.
+- Tools `prestissimo` and `composer-prefetcher` will be skipped unless `composer:v1` is also specified in tools input. It is recommended to drop `prestissimo` and use `composer v2`.

 - The latest versions of both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified in tools input. Please refer to the [official documentation](https://blackfire.io/docs/integrations/ci/github-actions "Blackfire.io documentation for GitHub Actions") for using `blackfire` with GitHub Actions.

@ -252,12 +274,24 @@ Runs on all [PHP versions supported](#tada-php-support "List of PHP versions sup
    coverage: xdebug
 ```

+- The latest version of Xdebug compatible with the PHP version is set up by default.
+- If you need Xdebug 2.x on PHP 7.2, 7.3 or 7.4, you can specify `coverage: xdebug2`.
+
+```yaml
+- name: Setup PHP with Xdebug 2.x
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    coverage: xdebug2
+```
+
 ### PCOV

-Specify `coverage: pcov` to use `PCOV` and disable `Xdebug`.  
-`PCOV` supports `PHP 7.1` and newer PHP versions.  
-Tests with `PCOV` run much faster than with `Xdebug`.  
-If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  
+Specify `coverage: pcov` to use PCOV and disable Xdebug.  
+Runs on PHP 7.1 and newer PHP versions.
+  
+- In most cases, tests with `PCOV` execute much faster than with `Xdebug`.  
+- If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  

 ```yaml
 - name: Setup PHP with PCOV
@ -268,9 +302,8 @@ If your source code directory is other than `src`, `lib` or, `app`, specify `pco
    coverage: pcov
 ```

-`PHPUnit` 8 and above supports `PCOV` out of the box.  
-If you are using `PHPUnit` 5, 6 or 7, you will need `krakjoe/pcov-clobber`.  
-Before executing your tests add the following step.
+- PHPUnit 8.x and above supports PCOV out of the box.  
+- If you are using PHPUnit 5.x, 6.x or 7.x, you need to set up `pcov/clobber` before executing your tests.

 ```yaml
 - name: Setup PCOV
@ -281,8 +314,9 @@ Before executing your tests add the following step.

 ### Disable Coverage

-Specify `coverage: none` to remove both `Xdebug` and `PCOV`.  
-Consider disabling the coverage using this PHP action for these reasons.
+Specify `coverage: none` to remove both `Xdebug` and `PCOV`.
+
+Disable coverage for these reasons:

 - You are not generating coverage reports while testing.
 - It will remove `Xdebug`, which will have a positive impact on PHP performance.
@ -308,6 +342,7 @@ Consider disabling the coverage using this PHP action for these reasons.
 - Specify the PHP version you want to set up.
 - Accepts a `string`. For example `'7.4'`.
 - Accepts `latest` to set up the latest stable PHP version.
+- Accepts the format `d.x`, where `d` is the major version. For example `5.x`, `7.x` and `8.x`.  
 - See [PHP support](#tada-php-support) for supported PHP versions.

 #### `extensions` (optional)
@ -319,8 +354,9 @@ Consider disabling the coverage using this PHP action for these reasons.

 #### `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`.
+- Specify the values you want to add to `php.ini`. 
+- Accepts a `string` in csv-format. For example `post_max_size=256M, max_execution_time=180`.
+- Accepts ini values with commas if wrapped in quotes. For example `xdebug.mode="develop,coverage"`.  

 #### `coverage` (optional)

@ -347,7 +383,7 @@ Consider disabling the coverage using this PHP action for these reasons.

 #### `phpts` (optional)

- Specify to set up thread-safe version of PHP on windows.
+- Specify to set up thread-safe version of PHP on Windows.
 - Accepts `ts` and `nts`.
 - By default, it is set to `nts`.
 - See [thread safe setup](#thread-safe-setup) for more info.
@ -357,7 +393,7 @@ Consider disabling the coverage using this PHP action for these reasons.
 - Specify to update PHP on the runner to the latest patch version.
 - Accepts `true` and `false`.
 - By default, it is set to `false`.
- See [force update](#force-update) for more info.
+- See [force update setup](#force-update-setup) for more info.

 See below for more info.

@ -375,7 +411,7 @@ steps:
  with:
    php-version: '7.4'
    extensions: mbstring, intl
-    ini-values: post_max_size=256M, short_open_tag=On
+    ini-values: post_max_size=256M, max_execution_time=180
    coverage: xdebug    
    tools: php-cs-fixer, phpunit
 ```
@ -390,9 +426,13 @@ jobs:
    runs-on: ${{ matrix.operating-system }}
    strategy:
      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
-    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
+        operating-system: ['ubuntu-latest', 'windows-latest', 'macos-latest']
+        php-versions: ['7.3', '7.4']
+        phpunit-versions: ['latest']
+        include:
+        - operating-system: 'ubuntu-latest'
+          php-versions: '7.2'
+          phpunit-versions: '8.5.13'    
    steps:
    - name: Checkout
      uses: actions/checkout@v2
@ -402,9 +442,85 @@ jobs:
      with:
        php-version: ${{ matrix.php-versions }}
        extensions: mbstring, intl
-        ini-values: post_max_size=256M, short_open_tag=On
+        ini-values: post_max_size=256M, max_execution_time=180
        coverage: xdebug        
-        tools: php-cs-fixer, phpunit
+        tools: php-cs-fixer, phpunit:${{ matrix.phpunit-versions }}
+```
+
+### Nightly Build Setup
+
+> Setup a nightly build of `PHP 8.1`. 
+
+- This version is currently in development.
+- Some user space extensions might not support this version currently.
+
+```yaml
+steps:
+- name: Checkout
+  uses: actions/checkout@v2
+
+- name: Setup nightly PHP
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '8.1'
+    extensions: mbstring
+    ini-values: post_max_size=256M, max_execution_time=180
+    coverage: xdebug
+    tools: php-cs-fixer, phpunit
+```
+
+### Thread Safe Setup
+
+> Setup `TS` or `NTS` PHP on `Windows`.
+
+- `NTS` versions are setup by default.
+- On `Ubuntu` and `macOS` only `NTS` versions are supported.
+- On `Windows` both `TS` and `NTS` versions are supported.
+
+```yaml
+jobs:
+  run:
+    runs-on: windows-latest
+    name: Setup PHP TS on Windows
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.4'
+      env:
+        phpts: ts # specify ts or nts
+```
+
+### Force Update Setup
+
+> Update to the latest patch of PHP versions.
+
+- Pre-installed PHP versions on the GitHub Actions images are not updated to their latest patch release by default.
+- You can specify the `update` environment variable to `true` for updating to the latest release.
+
+```yaml
+- name: Setup PHP with latest versions
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+  env:
+    update: true # specify true or false
+```
+
+### Verbose Setup
+
+> Debug your workflow
+
+To debug any issues, you can use the `verbose` tag instead of `v2`.
+
+```yaml
+- name: Setup PHP with logs
+  uses: shivammathur/setup-php@verbose
+  with:
+    php-version: '7.4'
 ```

 ### Multi-Arch Setup
@ -433,43 +549,18 @@ jobs:
          # Install PHP
          spc --php-version "7.4" \
              --extensions "mbstring, intl" \
-              --ini-values "post_max_size=256M, short_open_tag=On" \
+              --ini-values "post_max_size=256M, max_execution_time=180" \
              --coverage "xdebug" \
              --tools "php-cs-fixer, phpunit"
 ```

-### Nightly Build Setup
-
-> Setup a nightly build of `PHP 8.0` or `PHP 8.1`. 
-
- These versions are currently in development.
- `PECL` is installed by default with these versions on `ubuntu` and `macOS`.
- Some user space extensions might not support these versions currently.
- Refer to this [RFC](https://wiki.php.net/rfc/jit "PHP JIT RFC configuration") for configuring `PHP JIT` on these versions.
- Refer to this [list of RFCs](https://wiki.php.net/rfc#php_80 "List of RFCs implemented in PHP8") for features implemented in `PHP 8.0`.
-
-```yaml
-steps:
- name: Checkout
-  uses: actions/checkout@v2
-
- name: Setup nightly PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '8.1'
-    extensions: mbstring
-    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1
-    coverage: pcov
-    tools: php-cs-fixer, phpunit
-```
-
 ### Self Hosted Setup

 > Setup PHP on a self-hosted runner.

 - To set up a dockerized self-hosted runner, refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Ubuntu) to set up in an `Ubuntu` container and refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Windows) to set up in a `Windows` container.
 - To set up the runner directly on the host OS or in a virtual machine, follow this [requirements guide](https://github.com/shivammathur/setup-php/wiki/Requirements-for-self-hosted-runners "Requirements guide for self-hosted runner to run setup-php") before setting up the self-hosted runner.
- If your workflow uses [services](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idservices "GitHub Actions Services"), then setup the runner on a Linux host or in a Linux virtual machine. GitHub Actions does not support nested virtualization on Linux, so services will not work in a dockerized container.
+- If your workflow uses [service containers](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idservices "GitHub Actions Services"), then setup the runner on a Linux host or in a Linux virtual machine. GitHub Actions does not support nested virtualization on Linux, so services will not work in a dockerized container.

 Specify the environment variable `runner` with the value `self-hosted`. Without this your workflow will fail.

@ -494,8 +585,8 @@ jobs:
 ```

 **Notes**
- Do not setup multiple self-hosted runners on a single server instance as parallel workflow will conflict with each other.
- Do not setup self-hosted runners on the side on your development environment or your production server.
+- Do not set up multiple self-hosted runners on a single server instance as parallel workflow will conflict with each other.
+- Do not set up self-hosted runners on the side on your development environment or your production server.
 - Avoid using the same labels for your `self-hosted` runners which are used by `GitHub-hosted` runners.

 ### Local Testing Setup
@ -517,7 +608,9 @@ jobs:
        php-version: 7.4
 ```

-Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker image.
+Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker images.
+
+Choose the image tag which matches the `runs-on` property in your workflow:

 ```bash
 # For runs-on: ubuntu-latest
@ -533,58 +626,22 @@ act -P ubuntu-18.04=shivammathur/node:bionic
 act -P ubuntu-16.04=shivammathur/node:xenial
 ```

-### Thread Safe Setup
+### JIT Configuration

-> Setup `TS` or `NTS` PHP on `Windows`.
+> Enable Just-in-time(JIT) on PHP 8.0 and PHP 8.1.

- `NTS` versions are setup by default.
- On `Ubuntu` and `macOS` only `NTS` versions are supported.
- On `Windows` both `TS` and `NTS` versions are supported.
+- To enable JIT, enable `opcache` in cli mode by setting `opcache.enable_cli=1`.
+- By default, `opcache.jit=1235` and `opcache.jit_buffer_size=256M` are set which can be changed using `ini-values` input.
+- For detailed information about JIT related directives refer to the [`official PHP documentation`](https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit "opcache.jit documentation").
+
+For example to enable JIT in `tracing` mode with buffer size of `64 MB`. 

 ```yaml
-jobs:
-  run:
-    runs-on: windows-latest
-    name: Setup PHP TS on Windows
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: '7.4'
-      env:
-        phpts: ts # specify ts or nts
-```
-
-### Force Update
-
-> Update to the latest patch of PHP versions.
-
- Pre-installed PHP versions on the GitHub Actions runner are not updated to their latest patch release by default.
- You can specify the `update` environment variable to `true` to force update to the latest release.
-
-```yaml
- name: Setup PHP with latest versions
+- name: Setup PHP with JIT in tracing mode
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '7.4'
-  env:
-    update: true # specify true or false
-```
-
-### Verbose Setup
-
-> Debug your workflow
-
-To debug any issues, you can use the `verbose` tag instead of `v2`.
-
-```yaml
- name: Setup PHP with logs
-  uses: shivammathur/setup-php@verbose
-  with:
-    php-version: '7.4'
+    php-version: '8.0'
+    ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M
 ```

 ### Cache Extensions
@ -776,7 +833,7 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
 > Contributions are welcome!

 - See [Contributor's Guide](.github/CONTRIBUTING.md "shivammathur/setup-php contribution guide") before you start.
- 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").
+- If you face any issues or want to suggest a feature/improvement, start a discussion [here](https://github.com/shivammathur/setup-php/discussions "Setup PHP discussions").

 *Join the list of setup-php contributors*

@ -788,24 +845,31 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.

 ## :sparkling_heart: Support This Project

+- If setup-php saved your developer time, please consider sponsoring setup-php:
+  - [Open Collective](https://opencollective.com/setup-php "setup-php Open Collective")
+  - [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal")
+  - [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon")
+- Please [reach out](mailto:contact@setup-php.com) if you have any questions regarding sponsoring setup-php.
 - Please star the project and share it. If you blog, please share your experience of using this action.
- Please consider supporting our work by sponsoring using [Open Collective](https://opencollective.com/setup-php), [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal") or [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon").
- If you use `setup-php` at your company, please [reach out](mailto:contact@setup-php.com) to sponsor the project.

 *Huge thanks to the following companies for supporting `setup-php`*

 <p>
  <a href="https://www.jetbrains.com/?from=setup-php">
-    <img src="https://shivammathur.com/jetbrains.svg" alt="JetBrains" width="106" height="60">
+    <img src="https://setup-php.com/sponsors/jetbrains.svg" alt="JetBrains" width="106" height="60">
  </a>
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  <a href="https://blackfire.io/?utm_source=setup-php">
-    <img src="https://shivammathur.com/blackfire.svg" alt="Blackfire" width="212" height="60">
+    <img src="https://setup-php.com/sponsors//blackfire.svg" alt="Blackfire" width="212" height="60">
+  </a>
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="https://www.macstadium.com/?source=setup-php">
+    <img src="https://setup-php.com/sponsors//macstadium.png" alt="Mac Stadium" width="148" height="60">
  </a>
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  <a href="https://tidelift.com/subscription/pkg/npm-setup-php">
-    <img src="https://shivammathur.com/tidelift.png" alt="Tidelift" width="70" height="60">
-  </a>
+    <img src="https://setup-php.com/sponsors//tidelift.png" alt="Tidelift" width="70" height="60">
+  </a>  
 </p>

 ## :package: Dependencies
--- a/tests/config.test.ts
+++ b/tests/config.test.ts
@ -24,7 +24,7 @@ describe('Config tests', () => {
      true
    );
    expect(linux).toContain(
-      'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
+      'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'
    );

    linux = await config.addINIValues(
@ -40,7 +40,7 @@ describe('Config tests', () => {
      'darwin'
    );
    expect(darwin).toContain(
-      'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
+      'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'
    );

    darwin = await config.addINIValues(
--- a/tests/coverage.test.ts
+++ b/tests/coverage.test.ts
@ -30,39 +30,29 @@ describe('Config tests', () => {
    expect(win32).toContain('Add-Extension xdebug');
  });

+  it('checking addCoverage with Xdebug3 on windows', async () => {
+    const win32: string = await coverage.addCoverage('xdebug3', '7.4', 'win32');
+    expect(win32).toContain('Add-Extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug2 on windows', async () => {
+    const win32: string = await coverage.addCoverage('xdebug2', '7.4', 'win32');
+    expect(win32).toContain('Add-Extension xdebug stable 2.9.8');
+  });
+
  it('checking addCoverage with Xdebug on linux', async () => {
    const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
    expect(linux).toContain('add_extension xdebug');
  });

-  it('checking addCoverage with Xdebug3 on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug3', '7.4', 'linux');
-    expect(linux).toContain('add_extension_from_source xdebug');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
-  });
-
  it('checking addCoverage with Xdebug3 on linux', async () => {
    const linux: string = await coverage.addCoverage('xdebug3', '8.0', 'linux');
    expect(linux).toContain('add_extension xdebug');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
  });

-  it('checking addCoverage with Xdebug on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
-    expect(linux).toContain('add_extension xdebug');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
-  });
-
-  it('checking addCoverage with Xdebug3 on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug3', '8.1', 'linux');
-    expect(linux).toContain('add_extension xdebug');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
-  });
-
-  it('checking addCoverage with Xdebug on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug', '8.1', 'linux');
-    expect(linux).toContain('add_extension xdebug');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
+  it('checking addCoverage with Xdebug2 on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug2', '7.4', 'linux');
+    expect(linux).toContain('add_pecl_extension xdebug 2.9.8 zend_extension');
  });

  it('checking addCoverage with Xdebug on darwin', async () => {
@ -74,6 +64,24 @@ describe('Config tests', () => {
    expect(darwin).toContain('add_brew_extension xdebug');
  });

+  it('checking addCoverage with Xdebug3 on darwin', async () => {
+    const darwin: string = await coverage.addCoverage(
+      'xdebug3',
+      '7.4',
+      'darwin'
+    );
+    expect(darwin).toContain('add_brew_extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug2 on darwin', async () => {
+    const darwin: string = await coverage.addCoverage(
+      'xdebug2',
+      '7.4',
+      'darwin'
+    );
+    expect(darwin).toContain('add_brew_extension xdebug2');
+  });
+
  it('checking disableCoverage windows', async () => {
    const win32 = await coverage.addCoverage('none', '7.4', 'win32');
    expect(win32).toContain('Remove-Extension xdebug');
--- a/tests/extensions.test.ts
+++ b/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, sqlite, :intl, phalcon4, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1',
+      'Xdebug, pcov, sqlite, :intl, phalcon4, pecl_http, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1',
      '7.4',
      'win32'
    );
@ -12,6 +12,7 @@ describe('Extension tests', () => {
    expect(win32).toContain('Add-Extension sqlite3');
    expect(win32).toContain('Remove-Extension intl');
    expect(win32).toContain('Add-Phalcon phalcon4');
+    expect(win32).toContain('Add-Http');
    expect(win32).toContain('Add-Ioncube');
    expect(win32).toContain('Add-Oci oci8');
    expect(win32).toContain('Add-Oci pdo_oci');
@ -25,6 +26,9 @@ describe('Extension tests', () => {
      'Add-Log "$cross" "pcov" "pcov is not supported on PHP 5.6"'
    );

+    win32 = await extensions.addExtension('xdebug2', '7.2', 'win32');
+    expect(win32).toContain('Add-Extension xdebug stable 2.9.8');
+
    win32 = await extensions.addExtension('mysql', '7.4', 'win32');
    expect(win32).toContain('Add-Extension mysqli');
    expect(win32).toContain('Add-Extension mysqlnd');
@ -55,17 +59,24 @@ describe('Extension tests', () => {

    win32 = await extensions.addExtension('blackfire-1.31.0', '7.3', 'win32');
    expect(win32).toContain('Add-Blackfire blackfire-1.31.0');
+
+    win32 = await extensions.addExtension(
+      'mongodb-mongodb/mongo-php-driver@master',
+      '7.3',
+      'win32'
+    );
+    expect(win32).toContain(
+      'Add-Log "$cross" "mongodb-mongodb/mongo-php-driver@master" "mongodb-mongodb/mongo-php-driver@master is not supported on PHP 7.3"'
+    );
  });

  it('checking addExtensionOnLinux', async () => {
    let linux: string = await extensions.addExtension(
-      'Xdebug, xdebug3, pcov, sqlite, :intl, ast, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
+      'Xdebug, pcov, sqlite, :intl, ast, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
      '7.4',
      'linux'
    );
-    expect(linux).toContain(
-      'add_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension'
-    );
+    expect(linux).toContain('add_extension xdebug');
    expect(linux).toContain('add_extension sqlite3');
    expect(linux).toContain('remove_extension intl');
    expect(linux).toContain('add_unstable_extension ast beta extension');
@ -96,6 +107,9 @@ describe('Extension tests', () => {
    linux = await extensions.addExtension('cubrid', '7.4', 'linux');
    expect(linux).toContain('add_cubrid cubrid');

+    linux = await extensions.addExtension('xdebug2', '7.2', 'linux');
+    expect(linux).toContain('add_pecl_extension xdebug 2.9.8 zend_extension');
+
    linux = await extensions.addExtension('xdebug', '7.2', 'openbsd');
    expect(linux).toContain('Platform openbsd is not supported');

@ -106,6 +120,15 @@ describe('Extension tests', () => {
    linux = await extensions.addExtension('ioncube', '7.3', 'linux');
    expect(linux).toContain('add_ioncube');

+    linux = await extensions.addExtension('geos', '7.3', 'linux');
+    expect(linux).toContain('add_geos');
+
+    linux = await extensions.addExtension('pecl_http', '7.3', 'linux');
+    expect(linux).toContain('add_http');
+
+    linux = await extensions.addExtension('http-1.2.3', '7.3', 'linux');
+    expect(linux).toContain('add_http http-1.2.3');
+
    linux = await extensions.addExtension('oci8, pdo_oci', '7.3', 'linux');
    expect(linux).toContain('add_oci oci8');
    expect(linux).toContain('add_oci pdo_oci');
@ -121,20 +144,36 @@ describe('Extension tests', () => {

    linux = await extensions.addExtension('intl-67.1', '7.3', 'linux');
    expect(linux).toContain('add_intl intl-67.1');
+
+    linux = await extensions.addExtension('intl-68.2', '8.0', 'linux');
+    expect(linux).toContain('add_intl intl-68.2');
+
+    linux = await extensions.addExtension(
+      'mongodb-mongodb/mongo-php-driver@master',
+      '7.3',
+      'linux'
+    );
+    expect(linux).toContain(
+      'add_extension_from_github mongodb mongodb mongo-php-driver master'
+    );
  });

  it('checking addExtensionOnDarwin', async () => {
    let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, grpc, igbinary, imagick, protobuf, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
+      'amqp, Xdebug, pcov, grpc, igbinary, imagick, imap, msgpack, protobuf, redis, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
      '7.2',
      'darwin'
    );
+    expect(darwin).toContain('add_brew_extension amqp extension');
    expect(darwin).toContain('add_brew_extension xdebug zend_extension');
    expect(darwin).toContain('add_brew_extension pcov extension');
    expect(darwin).toContain('add_brew_extension grpc extension');
    expect(darwin).toContain('add_brew_extension igbinary extension');
    expect(darwin).toContain('add_brew_extension imagick extension');
+    expect(darwin).toContain('add_brew_extension imap extension');
+    expect(darwin).toContain('add_brew_extension msgpack extension');
    expect(darwin).toContain('add_brew_extension protobuf extension');
+    expect(darwin).toContain('add_brew_extension redis extension');
    expect(darwin).toContain('add_brew_extension swoole extension');
    expect(darwin).toContain('add_extension sqlite3');
    expect(darwin).toContain('remove_extension intl');
@ -156,6 +195,15 @@ describe('Extension tests', () => {
    darwin = await extensions.addExtension('ioncube', '7.3', 'darwin');
    expect(darwin).toContain('add_ioncube');

+    darwin = await extensions.addExtension('geos', '7.3', 'darwin');
+    expect(darwin).toContain('add_geos');
+
+    darwin = await extensions.addExtension('pecl_http', '7.3', 'darwin');
+    expect(darwin).toContain('add_http');
+
+    darwin = await extensions.addExtension('http-1.2.3', '7.3', 'darwin');
+    expect(darwin).toContain('add_http http-1.2.3');
+
    darwin = await extensions.addExtension('oci8, pdo_oci', '7.3', 'darwin');
    expect(darwin).toContain('add_oci oci8');
    expect(darwin).toContain('add_oci pdo_oci');
@ -177,11 +225,8 @@ describe('Extension tests', () => {
    darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
    expect(darwin).toContain('add_brew_extension xdebug');

-    darwin = await extensions.addExtension('redis', '5.6', 'darwin');
-    expect(darwin).toContain('add_extension redis-2.2.8');
-
-    darwin = await extensions.addExtension('redis', '7.2', 'darwin');
-    expect(darwin).toContain('add_extension redis');
+    darwin = await extensions.addExtension('xdebug2', '7.2', 'darwin');
+    expect(darwin).toContain('add_brew_extension xdebug2');

    darwin = await extensions.addExtension('imagick', '5.5', 'darwin');
    expect(darwin).toContain('add_extension imagick');
@ -202,5 +247,14 @@ describe('Extension tests', () => {

    darwin = await extensions.addExtension('xdebug', '7.2', 'openbsd');
    expect(darwin).toContain('Platform openbsd is not supported');
+
+    darwin = await extensions.addExtension(
+      'mongodb-mongodb/mongo-php-driver@master',
+      '7.3',
+      'darwin'
+    );
+    expect(darwin).toContain(
+      'add_extension_from_github mongodb mongodb mongo-php-driver master'
+    );
  });
 });
--- a/tests/install.test.ts
+++ b/tests/install.test.ts
@ -117,7 +117,7 @@ describe('Install', () => {

    script = '' + (await install.run());
    expect(script).toContain('initial script');
-    expect(script).toContain('bash linux.sh 7.4 ');
+    expect(script).toContain('bash linux.sh 8.0 ');

    setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit');

--- a/tests/tools.test.ts
+++ b/tests/tools.test.ts
@ -79,102 +79,23 @@ describe('Tools tests', () => {
    ).toBe('releases/download/v1.2.3/tool.phar');
  });

-  it('checking getCodeceptionUriBuilder', async () => {
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php56')).toBe(
-      'releases/3.2.1/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php54')).toBe(
-      'releases/3.2.1/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '')).toBe(
-      'releases/3.2.1/codecept.phar'
-    );
-  });
-
-  it('checking getCodeceptionUri', async () => {
-    expect(await tools.getCodeceptionUri('latest', '5.6')).toBe(
-      'php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.0')).toBe(
-      'php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.1')).toBe(
-      'php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.2')).toBe(
-      'codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.3')).toBe(
-      'codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.4')).toBe(
-      'codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('4.0.0', '7.4')).toBe(
-      'releases/4.0.0/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('4.0.0', '5.6')).toBe(
-      'releases/4.0.0/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('4.0.0', '7.1')).toBe(
-      'releases/4.0.0/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('3.1.0', '7.4')).toBe(
-      'releases/3.1.0/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'
-    );
-  });
-
  it('checking addPhive', async () => {
-    let script: string = await tools.addPhive('1.2.3', 'linux');
+    let script: string = await tools.addPhive('1.2.3', '7.4', 'linux');
    expect(script).toContain(
      'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
    );

-    script = await tools.addPhive('latest', 'win32');
+    script = await tools.addPhive('latest', '5.5', 'win32');
+    expect(script).toContain('Phive is not supported on PHP 5.5');
+
+    script = await tools.addPhive('latest', '5.6', 'win32');
    expect(script).toContain(
-      'Add-Tool https://phar.io/releases/phive.phar phive'
+      'Add-Tool https://github.com/phar-io/phive/releases/download/0.12.1/phive-0.12.1.phar phive'
+    );
+
+    script = await tools.addPhive('latest', '7.1', 'win32');
+    expect(script).toContain(
+      'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.5/phive-0.13.5.phar phive'
    );
  });

@ -251,9 +172,6 @@ describe('Tools tests', () => {
    expect(
      await tools.addComposer(['a', 'b', 'c', 'composer:v2'])
    ).toStrictEqual(['composer:2', 'a', 'b', 'c']);
-    expect(
-      await tools.addComposer(['hirak', 'b', 'c', 'composer:v2'])
-    ).toStrictEqual(['composer:1', 'hirak', 'b', 'c']);
  });

  it('checking getComposerUrl', async () => {
@ -492,7 +410,7 @@ describe('Tools tests', () => {
      'phpspec',
      'protoc:v1.2.3',
      'psalm',
-      'symfony',
+      'symfony-cli',
      'symfony:1.2.3',
      'vapor-cli',
      'wp-cli'
@ -576,7 +494,6 @@ describe('Tools tests', () => {
    const listOfTools = [
      'blackfire',
      'blackfire-player:1.8.1',
-      'codeception',
      'cs2pr',
      'deployer',
      'does_not_exist',
@ -587,7 +504,7 @@ describe('Tools tests', () => {
      'phpize',
      'phpmd',
      'symfony',
-      'wp-cli'
+      'wp'
    ];

    const script: string = await tools.addTools(
@ -629,6 +546,8 @@ describe('Tools tests', () => {
  });
  it('checking addTools with composer tool using user/tool as input', async () => {
    const listOfTools = [
+      'composer:v1',
+      'codeception/codeception',
      'hirak/prestissimo',
      'narrowspark/automatic-composer-prefetcher',
      'robmorgan/phinx'
--- a/tests/utils.test.ts
+++ b/tests/utils.test.ts
@ -8,6 +8,12 @@ jest.mock('@actions/core', () => ({
  })
 }));

+jest.spyOn(utils, 'fetch').mockImplementation(
+  async (url): Promise<string> => {
+    return `{ "latest": "8.0", "5.x": "5.6", "url": "${url}" }`;
+  }
+);
+
 async function cleanup(path: string): Promise<void> {
  fs.unlink(path, error => {
    if (error) {
@ -33,20 +39,29 @@ describe('Utils tests', () => {
    }).rejects.toThrow('Input required and not supplied: DoesNotExist');
  });

+  it('checking fetch', async () => {
+    expect(await utils.fetch('test_url')).toBe(
+      '{ "latest": "8.0", "5.x": "5.6", "url": "test_url" }'
+    );
+  });
+
  it('checking parseVersion', async () => {
+    expect(await utils.parseVersion('latest')).toBe('8.0');
    expect(await utils.parseVersion('7')).toBe('7.0');
    expect(await utils.parseVersion('7.4')).toBe('7.4');
-    expect(await utils.parseVersion('latest')).toBe('7.4');
+    expect(await utils.parseVersion('5.x')).toBe('5.6');
+    expect(await utils.parseVersion('4.x')).toBe(undefined);
  });

  it('checking asyncForEach', async () => {
    const array: Array<string> = ['a', 'b', 'c'];
    let concat = '';
-    await utils.asyncForEach(array, async function (
-      str: string
-    ): Promise<void> {
-      concat += str;
-    });
+    await utils.asyncForEach(
+      array,
+      async function (str: string): Promise<void> {
+        concat += str;
+      }
+    );
    expect(concat).toBe('abc');
  });

@ -83,25 +98,25 @@ describe('Utils tests', () => {
    const runner_dir: string = process.env['RUNNER_TOOL_CACHE'] || '';
    const script_path: string = path.join(runner_dir, 'test.sh');
    await utils.writeScript('test.sh', testString);
-    await fs.readFile(script_path, function (
-      error: Error | null,
-      data: Buffer
-    ) {
-      expect(testString).toBe(data.toString());
-    });
+    await fs.readFile(
+      script_path,
+      function (error: Error | null, data: Buffer) {
+        expect(testString).toBe(data.toString());
+      }
+    );
    await cleanup(script_path);
  });

-  it('checking extensionArray', async () => {
-    expect(await utils.extensionArray('a, b, php_c, php-d')).toEqual([
+  it('checking packageArray', async () => {
+    expect(await utils.packageArray('a, b, php_c, php-d')).toEqual([
      'a',
      'b',
      'c',
      'd'
    ]);

-    expect(await utils.extensionArray('')).toEqual([]);
-    expect(await utils.extensionArray(' ')).toEqual([]);
+    expect(await utils.packageArray('')).toEqual([]);
+    expect(await utils.packageArray(' ')).toEqual([]);
  });

  it('checking INIArray', async () => {
@ -110,6 +125,20 @@ describe('Utils tests', () => {
      'b=2',
      'c=3'
    ]);
+    expect(await utils.CSVArray('\'a=1,2\', "b=3, 4", c=5, d=~e~')).toEqual([
+      'a=1,2',
+      'b=3, 4',
+      'c=5',
+      "d='~e~'"
+    ]);
+    expect(await utils.CSVArray('a=\'1,2\', b="3, 4", c=5')).toEqual([
+      'a=1,2',
+      'b=3, 4',
+      'c=5'
+    ]);
+    expect(
+      await utils.CSVArray('a=E_ALL, b=E_ALL & ~ E_ALL, c="E_ALL", d=\'E_ALL\'')
+    ).toEqual(['a=E_ALL', 'b=E_ALL & ~ E_ALL', 'c=E_ALL', 'd=E_ALL']);
    expect(await utils.CSVArray('')).toEqual([]);
    expect(await utils.CSVArray(' ')).toEqual([]);
  });
--- a/action.yml
+++ b/action.yml
@ -1,13 +1,13 @@
 name: 'Setup PHP Action'
 author: shivammathur
-description: 'Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer'
+description: 'GitHub Action for PHP'
 branding:
  color: 'purple'
  icon: 'play-circle'
 inputs:
  php-version:
    description: 'Setup PHP version.'
-    default: '7.4'
+    default: '8.0'
    required: true
  extensions:
    description: 'Setup PHP extensions.'
@ -18,6 +18,9 @@ inputs:
  coverage: 
    description: 'Setup code coverage driver.'
    required: false
+  sapi:
+    description: 'Setup PHP Server API.'
+    required: false
  tools:
    description: 'Setup popular tools globally.'
    required: false
--- a/dist/index.js
+++ b/dist/index.js
--- a/examples/symfony-mysql.yml
+++ b/examples/symfony-mysql.yml
@ -43,13 +43,14 @@ jobs:
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
        run: |
+          composer require --dev symfony/orm-pack symfony/phpunit-bridge
          composer install --no-progress --prefer-dist --optimize-autoloader
+          php bin/phpunit install
      - name: Run Migration
        run: |
-          composer require symfony/orm-pack
          php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
          php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
        env:
          DATABASE_URL: mysql://root:symfony@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony
      - name: Run Tests
-        run: php bin/phpunit --coverage-text
+        run: php bin/phpunit --coverage-text
--- a/examples/symfony-postgres.yml
+++ b/examples/symfony-postgres.yml
@ -41,13 +41,14 @@ jobs:
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
        run: |
+          composer require --dev symfony/orm-pack symfony/phpunit-bridge
          composer install --no-progress --prefer-dist --optimize-autoloader
+          php bin/phpunit install
      - name: Run Migration
        run: |
-          composer require symfony/orm-pack
          php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
          php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
        env:
          DATABASE_URL: postgres://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports[5432] }}/postgres?charset=UTF-8
      - name: Run Tests
-        run: php bin/phpunit --coverage-text
+        run: php bin/phpunit --coverage-text
--- a/examples/symfony.yml
+++ b/examples/symfony.yml
@ -32,7 +32,8 @@ jobs:
          restore-keys: ${{ runner.os }}-composer-
      - name: Install Composer dependencies
        run: |
-          composer require symfony/orm-pack
+          composer require --dev symfony/phpunit-bridge
          composer install --no-progress --prefer-dist --optimize-autoloader
+          php bin/phpunit install
      - name: Run Tests
-        run: php bin/phpunit --coverage-text
+        run: php bin/phpunit --coverage-text
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "setup-php",
-  "version": "2.8.0",
+  "version": "2.10.0",
  "private": false,
  "description": "Setup PHP for use with GitHub Actions",
  "main": "dist/index.js",
@ -30,22 +30,22 @@
    "fs": "0.0.1-security"
  },
  "devDependencies": {
-    "@types/jest": "^26.0.15",
-    "@types/node": "^14.14.7",
-    "@typescript-eslint/eslint-plugin": "^4.7.0",
-    "@typescript-eslint/parser": "^4.7.0",
-    "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.13.0",
-    "eslint-config-prettier": "^6.15.0",
+    "@types/jest": "^26.0.20",
+    "@types/node": "^14.14.31",
+    "@typescript-eslint/eslint-plugin": "^4.15.1",
+    "@typescript-eslint/parser": "^4.15.1",
+    "@vercel/ncc": "^0.27.0",
+    "eslint": "^7.20.0",
+    "eslint-config-prettier": "^8.0.0",
    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-prettier": "^3.1.4",
-    "husky": "^4.3.0",
+    "eslint-plugin-jest": "^24.1.5",
+    "eslint-plugin-prettier": "^3.3.1",
+    "husky": "^4.3.8",
    "jest": "^26.6.3",
    "jest-circus": "^26.6.3",
-    "prettier": "^2.1.2",
-    "ts-jest": "^26.4.4",
-    "typescript": "^4.0.5"
+    "prettier": "^2.2.1",
+    "ts-jest": "^26.5.1",
+    "typescript": "^4.1.5"
  },
  "husky": {
    "skipCI": true,
--- a/src/config.ts
+++ b/src/config.ts
@ -14,7 +14,12 @@ export async function addINIValuesUnix(
    script +=
      '\n' + (await utils.addLog('$tick', line, 'Added to php.ini', 'linux'));
  });
-  return 'echo "' + ini_values.join('\n') + '" >> $ini_file' + script;
+  return (
+    'echo "' +
+    ini_values.join('\n') +
+    '" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null 2>&1' +
+    script
+  );
 }

 /**
--- a/src/configs/httpd-php-apache.conf
+++ b/src/configs/httpd-php-apache.conf
@ -0,0 +1,3 @@
+LoadModule phpPHP_MAJOR_module PHP_DIR\PHP_APACHE_DLL
+AddHandler application/x-httpd-php .php
+PHPIniDir PHP_DIR
--- a/src/configs/httpd-php-cgi.conf
+++ b/src/configs/httpd-php-cgi.conf
@ -0,0 +1,8 @@
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
+<FilesMatch "\.php$">
+  <If "-f %{REQUEST_FILENAME}">
+    SetHandler "proxy:fcgi://127.0.0.1:9000/"
+  </If>
+</FilesMatch>
--- a/src/configs/nginx.conf
+++ b/src/configs/nginx.conf
@ -0,0 +1,36 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    sendfile        on;
+
+    keepalive_timeout  65;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        location / {
+            root   html;
+            index  index.php index.html index.htm;
+        }
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+        location ~ \.php$ {
+            root           html;
+            fastcgi_pass   127.0.0.1:9000;
+            fastcgi_index  index.php;
+            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+            include        fastcgi_params;
+        }
+    }
+}
--- a/src/configs/php-versions.json
+++ b/src/configs/php-versions.json
@ -0,0 +1,6 @@
+{
+  "latest": "8.0",
+  "5.x": "5.6",
+  "7.x": "7.4",
+  "8.x": "8.0"
+}
--- a/src/configs/virtual_hosts/darwin/httpd-vhosts.conf
+++ b/src/configs/virtual_hosts/darwin/httpd-vhosts.conf
@ -0,0 +1,5 @@
+<VirtualHost *:80>
+    ServerAdmin webmaster@localhost
+    DocumentRoot "/var/www/html"
+    ServerName localhost
+</VirtualHost>
--- a/src/configs/virtual_hosts/linux/default_apache
+++ b/src/configs/virtual_hosts/linux/default_apache
@ -0,0 +1,7 @@
+<VirtualHost *:80>
+        ServerName localhost
+        ServerAdmin webmaster@localhost
+        DocumentRoot /var/www/html
+        ErrorLog ${APACHE_LOG_DIR}/error.log
+        CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
--- a/src/configs/virtual_hosts/linux/default_nginx
+++ b/src/configs/virtual_hosts/linux/default_nginx
@ -0,0 +1,22 @@
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    root /var/www/html;
+    index index.html index.htm index.php;
+
+    server_name localhost;
+
+    location / {
+        try_files $uri $uri/ =404;
+    }
+
+    location ~ \.php$ {
+        include snippets/fastcgi-php.conf;
+        fastcgi_pass unix:/run/php/phpPHP_VERSION-fpm.sock;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}
--- a/src/coverage.ts
+++ b/src/coverage.ts
@ -19,25 +19,13 @@ export async function addCoverageXdebug(
  const xdebug =
    (await extensions.addExtension(extension, version, os_version, true)) +
    pipe;
-  const ini = await config.addINIValues(
-    'xdebug.mode=coverage',
-    os_version,
-    true
-  );
  const log = await utils.addLog(
    '$tick',
    extension,
    'Xdebug enabled as coverage driver',
    os_version
  );
-  switch (true) {
-    case /^xdebug3$/.test(extension):
-    case /^8\.\d$/.test(version):
-      return '\n' + xdebug + '\n' + ini + '\n' + log;
-    case /^xdebug$/.test(extension):
-    default:
-      return xdebug + '\n' + log;
-  }
+  return xdebug + '\n' + log;
 }

 /**
@ -152,8 +140,11 @@ export async function addCoverage(
    case 'xdebug':
    case 'xdebug3':
      return (
-        script +
-        (await addCoverageXdebug(coverage_driver, version, os_version, pipe))
+        script + (await addCoverageXdebug('xdebug', version, os_version, pipe))
+      );
+    case 'xdebug2':
+      return (
+        script + (await addCoverageXdebug('xdebug2', version, os_version, pipe))
      );
    case 'none':
      return script + (await disableCoverage(version, os_version, pipe));
--- a/src/extensions.ts
+++ b/src/extensions.ts
@ -10,31 +10,33 @@ export async function addExtensionDarwin(
  extension_csv: string,
  version: string
 ): Promise<string> {
-  const extensions: Array<string> = await utils.extensionArray(extension_csv);
+  const extensions: Array<string> = await utils.packageArray(extension_csv);
  let add_script = '\n';
  let remove_script = '';
  await utils.asyncForEach(extensions, async function (extension: string) {
    const version_extension: string = version + extension;
    const [ext_name, ext_version]: string[] = extension.split('-');
    const ext_prefix = await utils.getExtensionPrefix(ext_name);
+    let matches: RegExpExecArray;
+
    switch (true) {
      // match :extension
      case /^:/.test(ext_name):
        remove_script += '\nremove_extension ' + ext_name.slice(1);
        return;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-(semver)...5.6blackfire-(semver), 7.0blackfire-(semver)...7.4blackfire-(semver)
-      // match pdo_oci and oci8
-      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 5.3blackfire...8.0blackfire
+      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
+      // match couchbase, pdo_oci, oci8, http, pecl_http
+      // match 5.3ioncube...7.4ioncube, 5.3geos...7.4geos
      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      // match 5.6couchbase...7.4couchbase
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
        version_extension
      ):
-      case /^pdo_oci$|^oci8$/.test(extension):
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^couchbase$|^pdo_oci$|^oci8$|^http|^pecl_http|^pdo_firebird$/.test(
+        extension
+      ):
+      case /^(5\.[3-6]|7\.[0-4])(ioncube|geos)$/.test(version_extension):
      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-      case /^5\.6couchbase$|^7\.[0-4]couchbase$/.test(version_extension):
        add_script += await utils.customPackage(
          ext_name,
          'ext',
@ -43,7 +45,7 @@ export async function addExtensionDarwin(
        );
        return;
      // match pre-release versions. For example - xdebug-beta
-      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
+      case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
        add_script += await utils.joins(
          '\nadd_unstable_extension',
          ext_name,
@ -51,8 +53,21 @@ export async function addExtensionDarwin(
          ext_prefix
        );
        return;
+      // match extensions from GitHub. Do this before checking for semver as
+      // the version may match that as well
+      case /.+-.+\/.+@.+/.test(extension):
+        matches = /.+-(.+)\/(.+)@(.+)/.exec(extension) as RegExpExecArray;
+        add_script += await utils.joins(
+          '\nadd_extension_from_github',
+          ext_name,
+          matches[1],
+          matches[2],
+          matches[3],
+          ext_prefix
+        );
+        return;
      // match semver
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
+      case /.+-\d+\.\d+\.\d+.*/.test(extension):
        add_script += await utils.joins(
          '\nadd_pecl_extension',
          ext_name,
@ -64,13 +79,13 @@ export async function addExtensionDarwin(
      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
        add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
        return;
-      // match 5.6xdebug to 8.9xdebug, 5.6igbinary to 8.9igbinary
-      // match 5.6grpc to 7.4grpc, 5.6imagick to 7.4imagick, 5.6protobuf to 7.4protobuf, 5.6swoole to 7.4swoole
-      // match 7.1pcov to 8.9pcov
-      case /(5\.6|7\.[0-4]|8\.[0-9])(xdebug|igbinary)/.test(version_extension):
-      case /(5\.6|7\.[0-4])(grpc|imagick|protobuf|swoole)/.test(
+      // match 5.6 to 8.9 for amqp, grpc, igbinary, imagick, imap, msgpack, protobuf, raphf, redis, swoole, xdebug, xdebug2, zmq
+      // match 7.1 to 8.9 for pcov
+      // match 5.6 to 7.4 for propro
+      case /(5\.6|7\.[0-4]|8\.[0-9])(amqp|grpc|igbinary|imagick|imap|msgpack|protobuf|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(
        version_extension
      ):
+      case /(5\.6|7\.[0-4])propro/.test(version_extension):
      case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
        add_script += await utils.joins(
          '\nadd_brew_extension',
@ -78,10 +93,6 @@ export async function addExtensionDarwin(
          ext_prefix
        );
        return;
-      // match 5.6redis
-      case /5\.6redis/.test(version_extension):
-        extension = 'redis-2.2.8';
-        break;
      // match sqlite
      case /^sqlite$/.test(extension):
        extension = 'sqlite3';
@ -104,7 +115,7 @@ export async function addExtensionWindows(
  extension_csv: string,
  version: string
 ): Promise<string> {
-  const extensions: Array<string> = await utils.extensionArray(extension_csv);
+  const extensions: Array<string> = await utils.packageArray(extension_csv);
  let add_script = '\n';
  let remove_script = '';
  await utils.asyncForEach(extensions, async function (extension: string) {
@ -116,17 +127,19 @@ export async function addExtensionWindows(
      case /^:/.test(ext_name):
        remove_script += '\nRemove-Extension ' + ext_name.slice(1);
        break;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-(semver)...5.6blackfire-(semver), 7.0blackfire-(semver)...7.4blackfire-(semver)
+      // match 5.3blackfire...8.0blackfire
+      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
      // match pdo_oci and oci8
-      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 5.3ioncube...7.4ioncube
      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      // match 7.1pecl_http...8.0pecl_http and 7.1http...8.0http
+      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
        version_extension
      ):
-      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+      case /^(7\.[1-4]|8\.0)(http|pecl_http)$/.test(version_extension):
        add_script += await utils.customPackage(
          ext_name,
          'ext',
@ -135,15 +148,24 @@ export async function addExtensionWindows(
        );
        return;
      // match pre-release versions. For example - xdebug-beta
-      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
+      case /.+-(stable|beta|alpha|devel|snapshot)/.test(extension):
        add_script += await utils.joins(
          '\nAdd-Extension',
          ext_name,
-          ext_version
+          ext_version.replace('stable', '')
+        );
+        break;
+      // match extensions from GitHub. Do this before checking for semver as
+      // the version may match that as well
+      case /.+-.+\/.+@.+/.test(extension):
+        add_script += await utils.getUnsupportedLog(
+          extension,
+          version,
+          'win32'
        );
        break;
      // match semver without state
-      case /.*-\d+\.\d+\.\d+$/.test(version_extension):
+      case /.+-\d+\.\d+\.\d+$/.test(extension):
        add_script += await utils.joins(
          '\nAdd-Extension',
          ext_name,
@ -152,8 +174,8 @@ export async function addExtensionWindows(
        );
        break;
      // match semver with state
-      case /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.test(version_extension):
-        matches = /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.exec(
+      case /.+-\d+\.\d+\.\d+[a-zA-Z]+\d*/.test(extension):
+        matches = /.+-(\d+\.\d+\.\d+)([a-zA-Z]+)\d*/.exec(
          version_extension
        ) as RegExpExecArray;
        add_script += await utils.joins(
@ -163,6 +185,10 @@ export async function addExtensionWindows(
          matches[1]
        );
        break;
+      // match 7.2xdebug2 to 7.4xdebug2
+      case /7\.[2-4]xdebug2/.test(version_extension):
+        add_script += '\nAdd-Extension xdebug stable 2.9.8';
+        break;
      // match 5.3pcov to 7.0pcov
      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
        add_script += await utils.getUnsupportedLog('pcov', version, 'win32');
@ -177,7 +203,7 @@ export async function addExtensionWindows(
      // match 7.0mysql..8.9mysql
      // match 7.0mysqli..8.9mysqli
      // match 7.0mysqlnd..8.9mysqlnd
-      case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
+      case /[7-8]\.\d+(mysql|mysqli|mysqlnd)$/.test(version_extension):
        add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
        break;
      // match sqlite
@ -203,38 +229,40 @@ export async function addExtensionLinux(
  extension_csv: string,
  version: string
 ): Promise<string> {
-  const extensions: Array<string> = await utils.extensionArray(extension_csv);
+  const extensions: Array<string> = await utils.packageArray(extension_csv);
  let add_script = '\n';
  let remove_script = '';
  await utils.asyncForEach(extensions, async function (extension: string) {
    const version_extension: string = version + extension;
    const [ext_name, ext_version]: string[] = extension.split('-');
    const ext_prefix = await utils.getExtensionPrefix(ext_name);
+    let matches: RegExpExecArray;
+
    switch (true) {
      // Match :extension
      case /^:/.test(ext_name):
        remove_script += '\nremove_extension ' + ext_name.slice(1);
        return;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-(semver)...5.6blackfire-(semver), 7.0blackfire-(semver)...7.4blackfire-(semver)
+      // match 5.3blackfire...8.0blackfire
+      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
      // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
-      // match pdo_oci and oci8
-      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match couchbase, pdo_oci, oci8, http, pecl_http
+      // match 5.3ioncube...7.4ioncube, 5.3geos...7.4geos
      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      // match 5.6gearman...7.4gearman, 5.6couchbase...7.4couchbase
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      // match 5.6gearman...8.1gearman
+      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
        version_extension
      ):
      case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
        version_extension
      ):
-      case /^pdo_oci$|^oci8$/.test(extension):
-      case /^5\.6intl-[\d]+\.[\d]+$|^7\.[0-4]intl-[\d]+\.[\d]+$/.test(
-        version_extension
+      case /^couchbase$|^pdo_oci$|^oci8$|^http|^pecl_http|^pdo_firebird$/.test(
+        extension
      ):
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^(5\.6|7\.[0-4]|8\.0)intl-[\d]+\.[\d]+$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4])(ioncube|geos)$/.test(version_extension):
      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-      case /^((5\.6)|(7\.[0-4]))(gearman|couchbase)$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-9])gearman$/.test(version_extension):
        add_script += await utils.customPackage(
          ext_name,
          'ext',
@ -243,7 +271,7 @@ export async function addExtensionLinux(
        );
        return;
      // match pre-release versions. For example - xdebug-beta
-      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
+      case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
        add_script += await utils.joins(
          '\nadd_unstable_extension',
          ext_name,
@ -251,8 +279,21 @@ export async function addExtensionLinux(
          ext_prefix
        );
        return;
+      // match extensions from GitHub. Do this before checking for semver as
+      // the version may match that as well
+      case /.+-.+\/.+@.+/.test(extension):
+        matches = /.+-(.+)\/(.+)@(.+)/.exec(extension) as RegExpExecArray;
+        add_script += await utils.joins(
+          '\nadd_extension_from_github',
+          ext_name,
+          matches[1],
+          matches[2],
+          matches[3],
+          ext_prefix
+        );
+        return;
      // match semver versions
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
+      case /.+-\d+\.\d+\.\d+.*/.test(extension):
        add_script += await utils.joins(
          '\nadd_pecl_extension',
          ext_name,
@ -264,17 +305,17 @@ export async function addExtensionLinux(
      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
        add_script += await utils.getUnsupportedLog('pcov', version, 'linux');
        return;
-      // match 7.2xdebug3..7.4xdebug3
-      case /^7\.[2-4]xdebug3$/.test(version_extension):
-        add_script +=
-          '\nadd_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension';
+      // match 7.2xdebug2...7.4xdebug2
+      case /^7\.[2-4]xdebug2$/.test(version_extension):
+        add_script += await utils.joins(
+          '\nadd_pecl_extension',
+          'xdebug',
+          '2.9.8',
+          ext_prefix
+        );
        return;
-      // match 8.0xdebug3...8.9xdebug3
-      case /^8\.[0-9]xdebug3$/.test(version_extension):
-        extension = 'xdebug';
-        break;
      // match pdo extensions
-      case /.*pdo[_-].*/.test(version_extension):
+      case /^pdo[_-].+/.test(extension):
        extension = extension.replace(/pdo[_-]|3/, '');
        add_script += '\nadd_pdo_extension ' + extension;
        return;
--- a/src/install.ts
+++ b/src/install.ts
@ -1,8 +1,9 @@
-import {exec} from '@actions/exec/lib/exec';
+import {exec} from '@actions/exec';
 import * as core from '@actions/core';
 import * as config from './config';
 import * as coverage from './coverage';
 import * as extensions from './extensions';
+import * as sapi from './sapi';
 import * as tools from './tools';
 import * as utils from './utils';

@ -25,14 +26,14 @@ export async function getScript(
  const extension_csv: string = await utils.getInput('extensions', false);
  const ini_values_csv: string = await utils.getInput('ini-values', false);
  const coverage_driver: string = await utils.getInput('coverage', false);
-  let tools_csv: string = await utils.getInput('tools', false);
-  if (/.*-(beta|alpha|devel|snapshot|\d+\.\d+\.\d+).*/.test(extension_csv)) {
-    tools_csv = 'pecl, ' + tools_csv;
-  }
+  const tools_csv: string = await utils.getInput('tools', false);
+  const sapi_csv: string = await utils.getInput('sapi', false);

  let script: string = await utils.readScript(filename);
+  if (sapi_csv) {
+    script += await sapi.addSAPI(sapi_csv, os_version);
+  }
  script += await tools.addTools(tools_csv, version, os_version);
-
  if (extension_csv) {
    script += await extensions.addExtension(extension_csv, version, os_version);
  }
@ -57,15 +58,23 @@ export async function run(): Promise<void> {
    const version: string = await utils.parseVersion(
      await utils.getInput('php-version', true)
    );
-    const os_version: string = process.platform;
-    const tool = await utils.scriptTool(os_version);
-    const script = os_version + (await utils.scriptExtension(os_version));
-    const location = await getScript(script, version, os_version);
-    await exec(await utils.joins(tool, location, version, __dirname));
+    if (version) {
+      const os_version: string = process.platform;
+      const tool = await utils.scriptTool(os_version);
+      const script = os_version + (await utils.scriptExtension(os_version));
+      const location = await getScript(script, version, os_version);
+      await exec(await utils.joins(tool, location, version, __dirname));
+    } else {
+      core.setFailed('Unable to get the PHP version');
+    }
  } catch (error) {
    core.setFailed(error.message);
  }
 }

 // call the run function
-run();
+(async () => {
+  await run();
+})().catch(error => {
+  core.setFailed(error.message);
+});
--- a/src/sapi.ts
+++ b/src/sapi.ts
@ -0,0 +1,51 @@
+import * as utils from './utils';
+
+export async function getSapiList(sapi_csv: string): Promise<Array<string>> {
+  const sapi_list: Array<string> = await utils.packageArray(sapi_csv);
+  const servers: Array<string> = sapi_list.filter(sapi => /.*:.*/.test(sapi));
+  return [servers[servers.length - 1]].concat(
+    sapi_list.filter(sapi => /.*[^:].*/.test(sapi))
+  );
+}
+
+/**
+ * Function to set sapi
+ *
+ * @param sapi_csv
+ * @param os_version
+ */
+export async function addSAPI(
+  sapi_csv: string,
+  os_version: string
+): Promise<string> {
+  let script: string = '\n' + (await utils.stepLog('Setup SAPI', os_version));
+  let sapi_list: Array<string>;
+  switch (true) {
+    case sapi_csv.split(':').length - 1 > 1:
+      sapi_list = await getSapiList(sapi_csv);
+      script +=
+        '\n' +
+        utils.log(
+          'Multiple SAPI with web servers specified, choosing the last one ' +
+            sapi_list[0],
+          os_version,
+          'warning'
+        );
+      break;
+    default:
+      sapi_list = await utils.packageArray(sapi_csv);
+  }
+  await utils.asyncForEach(sapi_list, async function (sapi: string) {
+    sapi = sapi.toLowerCase();
+    switch (os_version) {
+      case 'linux':
+      case 'darwin':
+        script += '\nadd_sapi ' + sapi;
+        break;
+      case 'win32':
+        script += '\nAdd-Sapi ' + sapi;
+        break;
+    }
+  });
+  return script;
+}
--- a/src/scripts/common.sh
+++ b/src/scripts/common.sh
@ -2,11 +2,14 @@
 export tick="✓"
 export cross="✗"
 export curl_opts=(-sL)
-export nightly_versions="8.[0-1]"
 export old_versions="5.[3-5]"
+export jit_versions="8.[0-9]"
+export nightly_versions="8.[1-9]"
+export xdebug3_versions="7.[2-4]|8.[0-9]"
 export tool_path_dir="/usr/local/bin"
 export composer_bin="$HOME/.composer/vendor/bin"
 export composer_json="$HOME/.composer/composer.json"
+export composer_lock="$HOME/.composer/composer.lock"
 export latest="releases/latest/download"
 export github="https://github.com/shivammathur"
 export bintray="https://dl.bintray/shivammathur"
@ -107,15 +110,27 @@ enable_extension() {
    sudo phpenmod -v "$version" "$1" >/dev/null 2>&1
  fi
  if ! check_extension "$1" && [ -e "${ext_dir:?}/$1.so" ]; then
-    echo "$2=${ext_dir:?}/$1.so" >>"${pecl_file:-$ini_file}"
+    echo "$2=${ext_dir:?}/$1.so" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null
  fi
 }

+# Function to configure PHP
+configure_php() {
+  (
+    echo -e "date.timezone=UTC\nmemory_limit=-1"
+    [[ "$version" =~ $jit_versions ]] && echo -e "opcache.enable=1\nopcache.jit_buffer_size=256M\nopcache.jit=1235"
+    [[ "$version" =~ $xdebug3_versions ]] && echo -e "xdebug.mode=coverage"
+  ) | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null
+}
+
 # Function to configure PECL.
 configure_pecl() {
-  if ! [ -e /tmp/pecl_config ] && command -v pecl >/dev/null; then
+  if ! [ -e /tmp/pecl_config ]; then
+    if ! command -v pecl >/dev/null || ! command -v pear >/dev/null; then
+      add_pecl >/dev/null 2>&1
+    fi
    for script in pear pecl; do
-      sudo "$script" config-set php_ini "${pecl_file:-$ini_file}"
+      sudo "$script" config-set php_ini "${pecl_file:-${ini_file[@]}}"
      sudo "$script" channel-update "$script".php.net
    done
    echo '' | sudo tee /tmp/pecl_config >/dev/null 2>&1
@ -125,12 +140,12 @@ configure_pecl() {
 # Function to get the PECL version of an extension.
 get_pecl_version() {
  extension=$1
-  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
+  stability="$(echo "$2" | grep -m 1 -Eio "(stable|alpha|beta|rc|snapshot|preview)")"
  pecl_rest='https://pecl.php.net/rest/r/'
  response=$(get -s -n "" "$pecl_rest$extension"/allreleases.xml)
-  pecl_version=$(echo "$response" | grep -m 1 -Pio "(\d*\.\d*\.\d*$stability\d*)")
+  pecl_version=$(echo "$response" | grep -m 1 -Eio "([0-9]+\.[0-9]+\.[0-9]+${stability}[0-9]+)")
  if [ ! "$pecl_version" ]; then
-    pecl_version=$(echo "$response" | grep -m 1 -Po "(\d*\.\d*\.\d*)")
+    pecl_version=$(echo "$response" | grep -m 1 -Eo "([0-9]+\.[0-9]+\.[0-9]+)")
  fi
  echo "$pecl_version"
 }
@ -138,6 +153,7 @@ get_pecl_version() {
 # Function to install PECL extensions and accept default options
 pecl_install() {
  local extension=$1
+  configure_pecl >/dev/null 2>&1
  yes '' 2>/dev/null | sudo pecl install -f "$extension" >/dev/null 2>&1
 }

@ -176,10 +192,14 @@ configure_composer() {
    add_log "$cross" "composer" "Could not download composer"
    exit 1
  fi
-  composer -q global config process-timeout 0
+  if ! [ -e "$composer_json" ]; then
+    echo '{}' | tee "$composer_json" >/dev/null 2>&1
+    sudo chmod 644 "$composer_json"
+  fi
+  composer -q config -g process-timeout 0
  echo "$composer_bin" >> "$GITHUB_PATH"
  if [ -n "$COMPOSER_TOKEN" ]; then
-    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
+    composer -q config -g github-oauth.github.com "$COMPOSER_TOKEN"
  fi
 }

@ -189,6 +209,10 @@ add_tool() {
  tool=$2
  ver_param=$3
  tool_path="$tool_path_dir/$tool"
+  if ! [[ "$PATH" =~ $tool_path_dir ]] ; then
+    export PATH=$PATH:"$tool_path_dir"
+    echo "export PATH=\$PATH:$tool_path_dir" | sudo tee -a "$GITHUB_ENV" >/dev/null
+  fi
  if [ ! -e "$tool_path" ]; then
    rm -rf "$tool_path"
  fi
@ -199,21 +223,7 @@ add_tool() {
    status_code=$(get -v -e "$tool_path" "${url[0]}")
  fi
  if [ "$status_code" = "200" ]; then
-    if [ "$tool" = "composer" ]; then
-      configure_composer "$tool_path"
-    elif [ "$tool" = "cs2pr" ]; then
-      sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path" 2>/dev/null ||
-      sudo sed -i '' 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
-    elif [ "$tool" = "phan" ]; then
-      add_extension fileinfo extension >/dev/null 2>&1
-      add_extension ast extension >/dev/null 2>&1
-    elif [ "$tool" = "phive" ]; then
-      add_extension curl extension >/dev/null 2>&1
-      add_extension mbstring extension >/dev/null 2>&1
-      add_extension xml extension >/dev/null 2>&1
-    elif [ "$tool" = "wp-cli" ]; then
-      sudo cp -p "$tool_path" "$tool_path_dir"/wp
-    fi
+    add_tools_helper "$tool"
    tool_version=$(get_tool_version "$tool" "$ver_param")
    add_log "$tick" "$tool" "Added $tool $tool_version"
  else
@ -235,17 +245,50 @@ add_composertool() {
    fi
  fi
  (
-    composer global require "$prefix$release" >/dev/null 2>&1 &&
+    sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
+    composer global require "$prefix$release" >/dev/null 2>&1
    json=$(grep "$prefix$tool" "$composer_json") &&
    tool_version=$(get_tool_version 'echo' "$json") &&
    add_log "$tick" "$tool" "Added $tool $tool_version"
  ) || add_log "$cross" "$tool" "Could not setup $tool"
+  add_tools_helper "$tool"
  if [ -e "$composer_bin/composer" ]; then
    sudo cp -p "$tool_path_dir/composer" "$composer_bin"
  fi
 }

-# Function to get PHP version in semver format.
+# Function to get versions of PHP binaries in semver format.
 php_semver() {
-  php"$version" -v | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1
-}
+  binary=${1:-"php$version"}
+  arg=${2:-'-v'}
+  "$binary" "$arg" | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1
+}
+
+# Function to get the tag for a php version.
+php_src_tag() {
+  php_src_tag='master'
+  if ! [[ ${version:?} =~ $nightly_versions ]]; then
+    php_src_tag="php-$semver"
+  fi
+  echo "$php_src_tag"
+}
+
+# Function to install extension from a GitHub repository
+add_extension_from_github() {
+  extension=$1
+  org=$2
+  repo=$3
+  release=$4
+  prefix=$5
+  (
+    add_devtools phpize
+    delete_extension "$extension"
+    git clone -n https://github.com/"$org"/"$repo" /tmp/"$repo-$release" || exit 1
+    cd /tmp/"$repo-$release" || exit 1
+    git checkout "$release" || exit 1
+    git submodule update --init --recursive || exit 1
+    phpize && ./configure && make -j"$(nproc)" && sudo make install
+    enable_extension "$extension" "$prefix"
+  ) >/dev/null 2>&1
+  add_extension_log "$extension-$org/$repo@$release" "Installed and enabled"
+}
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@ -11,7 +11,7 @@ self_hosted_helper() {
 remove_extension() {
  extension=$1
  if check_extension "$extension"; then
-    sudo sed -i '' "/$extension/d" "${ini_file:?}"
+    sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}"
    sudo rm -rf "${scan_dir:?}"/*"$extension"* "${ext_dir:?}"/"$extension".so >/dev/null 2>&1
    (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") ||
      add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}"
@ -39,19 +39,47 @@ add_pecl_extension() {
  fi
 }

+# Function to fetch a brew tap
+fetch_brew_tap() {
+  tap=$1
+  tap_user=$(dirname "$tap")
+  tap_name=$(basename "$tap")
+  mkdir -p "$tap_dir/$tap_user"
+  get -s -n "" "https://github.com/$tap/archive/master.tar.gz" | sudo tar -xzf - -C "$tap_dir/$tap_user"
+  if [ -d "$tap_dir/$tap_user/$tap_name-master" ]; then
+    sudo mv "$tap_dir/$tap_user/$tap_name-master" "$tap_dir/$tap_user/$tap_name"
+  fi
+}
+
+# Function to add a brew tap.
+add_brew_tap() {
+  tap=$1
+  if ! [ -d "$tap_dir/$tap" ]; then
+    if [ "${runner:?}" = "self-hosted" ]; then
+      brew tap --shallow "$tap" >/dev/null 2>&1
+    else
+      fetch_brew_tap "$tap" >/dev/null 2>&1
+      if ! [ -d "$tap_dir/$tap" ]; then
+        brew tap --shallow "$tap" >/dev/null 2>&1
+      fi
+    fi
+  fi
+}
+
 # Function to install a php extension from shivammathur/extensions tap.
 add_brew_extension() {
-  extension=$1
+  formula=$1
  prefix=$2
+  extension="$(echo "$formula" | sed -E "s/pecl_|[0-9]//g")"
  enable_extension "$extension" "$prefix"
  if check_extension "$extension"; then
    add_log "${tick:?}" "$extension" "Enabled"
  else
-    if ! brew tap | grep -q shivammathur/extensions; then
-      brew tap --shallow shivammathur/extensions >/dev/null 2>&1
-    fi
-    brew install "$extension@$version" >/dev/null 2>&1
-    sudo cp "$(brew --prefix)/opt/$extension@$version/$extension.so" "$ext_dir"
+    add_brew_tap shivammathur/homebrew-php
+    add_brew_tap shivammathur/homebrew-extensions
+    sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
+    brew install "$formula@$version" >/dev/null 2>&1
+    sudo cp "$brew_prefix/opt/$formula@$version/$extension.so" "$ext_dir"
    add_extension_log "$extension" "Installed and enabled"
  fi
 }
@ -83,12 +111,25 @@ add_pecl() {
  add_log "${tick:?}" "PECL" "Found PECL $pecl_version"
 }

+# Function to link all libraries of a formula
+link_libraries() {
+  formula=$1
+  formula_prefix="$(brew --prefix "$formula")"
+  sudo mkdir -p "$formula_prefix"/lib
+  sudo cp -a "$formula_prefix"/lib/*.dylib "$brew_prefix/lib" 2>/dev/null || true
+}
+
+update_dependencies_helper() {
+  formula=$1
+  get -q -n "$tap_dir/homebrew/homebrew-core/Formula/$formula.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb"
+  link_libraries "$formula"
+}
+
 # Function to update dependencies.
 update_dependencies() {
-  if [[ "$version" =~ ${nightly_versions:?} ]] && [ "${runner:?}" != "self-hosted" ]; then
-    tap_dir="$(brew --prefix)/Homebrew/Library/Taps"
+  if [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
    while read -r formula; do
-      get -q -n "$tap_dir/homebrew/homebrew-core/Formula/$formula.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb" &
+      update_dependencies_helper "$formula" &
      to_wait+=($!)
    done <"$tap_dir/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
    wait "${to_wait[@]}"
@ -98,16 +139,14 @@ update_dependencies() {
 # Function to setup PHP 5.6 and newer using Homebrew.
 add_php() {
  action=$1
-  if ! brew tap | grep -q shivammathur/php; then
-    brew tap --shallow shivammathur/php
-  fi
+  add_brew_tap shivammathur/homebrew-php
  update_dependencies
-  if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
-    brew unlink php@"$version"
+  if ! [[ "$(find "$(brew --cellar)"/php/ -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]] && [ "$action" != "upgrade" ]; then
+    brew unlink shivammathur/php/php@"$version"
  else
-    brew "$action" shivammathur/php/php@"$version"
+    brew upgrade "shivammathur/php/php@$version" 2>/dev/null || brew install "shivammathur/php/php@$version"
  fi
-  brew link --force --overwrite php@"$version"
+  brew link --force --overwrite shivammathur/php/php@"$version"
 }

 # Function to Setup PHP
@ -128,12 +167,15 @@ setup_php() {
  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:?}"
-  echo -e "date.timezone=UTC\nmemory_limit=-1" >>"$ini_file"
+  configure_php
  ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
  scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
  sudo mkdir -m 777 -p "$ext_dir" "$HOME/.composer"
  semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
-  if [[ ! "$version" =~ $old_versions ]]; then configure_pecl >/dev/null 2>&1; fi
+  if [ "${semver%.*}" != "$version" ]; then
+    add_log "$cross" "PHP" "Could not setup PHP $version"
+    exit 1
+  fi
  sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
  add_log "$tick" "PHP" "$status PHP $semver"
 }
@ -141,11 +183,18 @@ setup_php() {
 # Variables
 version=$1
 dist=$2
+brew_prefix="$(brew --prefix)"
+brew_repo="$(brew --repository)"
+tap_dir="$brew_repo"/Library/Taps
+scripts="${dist}"/../src/scripts
+export HOMEBREW_CHANGE_ARCH_TO_ARM=1
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 export HOMEBREW_NO_AUTO_UPDATE=1
+export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1

 # shellcheck source=.
-. "${dist}"/../src/scripts/common.sh
+. "${scripts:?}"/tools/add_tools.sh
+. "${scripts:?}"/common.sh
 read_env
 self_hosted_setup
 setup_php
--- a/src/scripts/ext/blackfire.sh
+++ b/src/scripts/ext/blackfire.sh
@ -5,7 +5,7 @@ add_blackfire() {
  no_dot_version=${version/./}
  platform=$(uname -s | tr '[:upper:]' '[:lower:]')
  extension_version=$(echo "$extension" | cut -d '-' -f 2)
-  blackfire_ini_file="${scan_dir:?}/50-blackfire.ini"
+  blackfire_ini_file="${pecl_file:-${ini_file[@]}}"
  if [ ! -e "${ext_dir:?}/blackfire.so" ]; then
    if [ "$extension_version" = "blackfire" ]; then
      extension_version=$(get -s -n "" https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
--- a/src/scripts/ext/couchbase.sh
+++ b/src/scripts/ext/couchbase.sh
@ -1,20 +1,24 @@
 # Function to install libraries required by couchbase
 add_couchbase_libs() {
  if [ "$(uname -s)" = "Linux" ]; then
-    if [[ ${version:?} =~ 5.6|7.[0-1] ]]; then
-      trunk="http://packages.couchbase.com/ubuntu"
-      list="deb $trunk ${DISTRIB_CODENAME:?} ${DISTRIB_CODENAME:?}/main"
+    if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
+      release="2.10.9"
+      trunk="https://github.com/couchbase/libcouchbase/releases/download"
+      package="libcouchbase-${release}_ubuntu${DISTRIB_RELEASE/./}_${DISTRIB_CODENAME}_amd64.tar"
+      get -q -n /tmp/libcouchbase.tar "$trunk/$release/$package"
+      sudo tar -xf /tmp/libcouchbase.tar -C /tmp
+      install_packages libev4
+      sudo dpkg -i /tmp/libcouchbase-*/*.deb
    else
      trunk="http://packages.couchbase.com/clients/c/repos/deb"
      list="deb $trunk/ubuntu${DISTRIB_RELEASE/./} ${DISTRIB_CODENAME:?} ${DISTRIB_CODENAME:?}/main"
+      get -s -n "" "$trunk/couchbase.key" | sudo apt-key add
+      echo "$list" | sudo tee /etc/apt/sources.list.d/couchbase.list
+      sudo apt-get update
    fi
-    add_pecl
-    get -s -n "" "$trunk/couchbase.key" | sudo apt-key add
-    echo "$list" | sudo tee /etc/apt/sources.list.d/couchbase.list
-    sudo apt-get update
    ${apt_install:?} libcouchbase-dev
  else
-    if [[ ${version:?} =~ 5.6|7.[0-1] ]]; then
+    if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
      brew install libcouchbase@2
      brew link --overwrite --force libcouchbase@2
    else
@ -30,8 +34,12 @@ add_couchbase() {
  if check_extension "couchbase"; then
    add_log "${tick:?}" "couchbase" "Enabled"
  else
-    if [[ ${version:?} =~ 5.6|7.[0-1] ]]; then
+    if [[ "${version:?}" =~ ${old_versions:?} ]]; then
+      pecl_install couchbase-2.2.3 >/dev/null 2>&1
+    elif [[ "${version:?}" =~ 5.6|7.[0-1] ]]; then
      pecl_install couchbase-2.6.2 >/dev/null 2>&1
+    elif [[ "${version:?}" =~ 7.2 ]]; then
+      pecl_install couchbase-3.0.4 >/dev/null 2>&1
    else
      pecl_install couchbase >/dev/null 2>&1
    fi
--- a/src/scripts/ext/cubrid.sh
+++ b/src/scripts/ext/cubrid.sh
@ -7,6 +7,15 @@ add_license_log() {
  echo "::endgroup::"
 }

+# Function to setup gcc-7 and g++-7
+setup_compiler() {
+  if ! command -v gcc-7 >/dev/null || ! command -v g++-7 >/dev/null; then
+    add_ppa ubuntu-toolchain-r/test
+    add_packages gcc-7 g++-7 -y
+  fi
+  printf "gcc g++" | xargs -d ' ' -I {} sudo update-alternatives --install /usr/bin/{} {} /usr/bin/{}-7 7
+}
+
 # Function to set cubrid repo for the extension.
 set_cubrid_repo() {
  case "${ext:?}" in
@ -24,15 +33,19 @@ set_cubrid_branch() {
 }

 add_cubrid_helper() {
-  if ! [ -e "${ext_dir:?}/$ext.so" ]; then
+  ext=$1
+  enable_extension "$ext" extension
+  if ! check_extension "$ext"; then
    status='Installed and enabled'
    set_cubrid_repo
    set_cubrid_branch
+    [ "$DISTRIB_RELEASE" = "16.04" ] && setup_compiler
    (
      git clone -b "$cubrid_branch" --recursive "https://github.com/CUBRID/$cubrid_repo" "/tmp/$cubrid_repo"
      cd "/tmp/$cubrid_repo" || exit
      ! [[ "$version" =~ ${old_versions:?} ]] && add_devtools
-      phpize && ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=shared
+      phpize
+      sudo ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=shared
      make -j"$(nproc)"
      sudo make install
    )
@ -44,7 +57,7 @@ add_cubrid_helper() {
 add_cubrid() {
  ext=$1
  status='Enabled'
-  add_cubrid_helper >/dev/null 2>&1
+  add_cubrid_helper "$ext" >/dev/null 2>&1
  add_extension_log "$ext" "$status"
  check_extension "$ext" && add_license_log
 }
--- a/src/scripts/ext/firebird.ps1
+++ b/src/scripts/ext/firebird.ps1
@ -0,0 +1,20 @@
+Function Add-Choco() {
+  try {
+    if($null -eq (Get-Command -Name choco.exe -ErrorAction SilentlyContinue)) {
+      # Source: https://docs.chocolatey.org/en-us/choco/setup
+      Set-ExecutionPolicy Bypass -Scope Process -Force
+      [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
+      Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+    }
+  } catch { }
+}
+
+Function Add-Firebird() {
+  Add-Choco > $null 2>&1
+  choco install firebird -params '/ClientAndDevTools' -y --force > $null 2>&1
+  if((Get-ChildItem $env:ProgramFiles\**\**\fbclient.dll | Measure-Object).Count -eq 1) {
+    Add-Extension pdo_firebird
+  } else {
+    Add-Log $cross pdo_firebird "Could not install pdo_firebird on PHP $( $installed.FullVersion )"
+  }
+}
--- a/src/scripts/ext/firebird.sh
+++ b/src/scripts/ext/firebird.sh
@ -0,0 +1,46 @@
+add_firebird_client_darwin() {
+  pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/latest | grep -Eo "Firebird-.*.pkg" | head -n 1)
+  get -q -e "/tmp/firebird.pkg" https://github.com/FirebirdSQL/firebird/releases/latest/download/"$pkg_name"
+  sudo installer -pkg /tmp/firebird.pkg -target /
+  sudo mkdir -p /opt/firebird/include /opt/firebird/lib
+  sudo find /Library/Frameworks/Firebird.framework -name '*.h' -exec cp "{}" /opt/firebird/include \;
+  sudo find /Library/Frameworks/Firebird.framework -name '*.dylib' -exec cp "{}" /opt/firebird/lib \;
+}
+
+add_firebird_helper() {
+  firebird_dir=$1
+  tag="$(php_src_tag)"
+  get -s -n "" https://github.com/php/php-src/archive/"$tag".tar.gz | tar -xzf - -C /tmp
+  (
+    cd /tmp/php-src-"$tag"/ext/pdo_firebird || exit
+    if [[ "${version:?}" =~ ${old_versions:?} ]]; then
+      sudo sed -i '' '/PHP_CHECK_PDO_INCLUDES/d' config.m4 2>/dev/null || sudo sed -i '/PHP_CHECK_PDO_INCLUDES/d' config.m4
+    fi
+    sudo phpize
+    sudo ./configure --with-pdo-firebird="$firebird_dir"
+    sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
+    sudo make install
+    enable_extension pdo_firebird extension
+  )
+}
+
+add_firebird() {
+  enable_extension pdo_firebird
+  if ! check_extension pdo_firebird; then
+    if [ "$(uname -s)" = "Linux" ]; then
+      if [[ "${version:?}" =~ 5.3|${nightly_versions:?} ]]; then
+        lib_arch=$(gcc -dumpmachine)
+        install_packages firebird-dev >/dev/null 2>&1
+        sudo ln -sf /usr/lib/"$lib_arch"/libfbclient.so.2 /usr/lib/libfbclient.so >/dev/null 2>&1
+        sudo ln -sf /usr/lib/"$lib_arch"/libib_util.so /usr/lib/ >/dev/null 2>&1
+        add_firebird_helper /usr >/dev/null 2>&1
+      else
+        add_pdo_extension firebird >/dev/null 2>&1
+      fi
+    else
+      add_firebird_client_darwin >/dev/null 2>&1
+      add_firebird_helper /opt/firebird >/dev/null 2>&1
+    fi
+    add_extension_log pdo_firebird "Installed and enabled"
+  fi
+}
--- a/src/scripts/ext/gearman.sh
+++ b/src/scripts/ext/gearman.sh
@ -1,17 +1,16 @@
 # Helper function to add gearman extension.
 add_gearman_helper() {
-  sudo "${debconf_fix:?}" add-apt-repository ppa:ondrej/pkg-gearman -y
-  if [ -e "${ext_dir:?}/gearman.so" ] && [ "$DISTRIB_RELEASE" != "16.04" ]; then
-    ${apt_install:?} libgearman-dev
-    echo "extension=gearman.so" | sudo tee -a "${scan_dir:?}/20-gearman.ini" >/dev/null 2>&1
-  else
+  add_ppa ondrej/pkg-gearman
+  install_packages libgearman-dev
+  enable_extension gearman extension
+  if ! check_extension gearman; then
    status="Installed and enabled"
-    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
-      sudo "${debconf_fix:?}" apt-get update -y
-      ${apt_install:?} php"${version:?}"-gearman
+    if [[ "${version:?}" =~ 5.[3-5] ]]; then
+      pecl_install gearman-1.1.2
    else
-      ${apt_install:?} libgearman-dev php"${version:?}"-gearman
+      install_packages php"${version:?}"-gearman || pecl_install gearman
    fi
+    enable_extension gearman extension
  fi
 }

--- a/src/scripts/ext/geos.sh
+++ b/src/scripts/ext/geos.sh
@ -0,0 +1,51 @@
+# Helper function install geos library and headers
+add_geos_libs() {
+  if [ "$(uname -s)" = "Darwin" ]; then
+    brew install geos
+  else
+    sudo apt-get install libgeos-dev
+    if [ "${runner:?}" = "self-hosted" ]; then
+      ${apt_install:?} --no-upgrade --no-install-recommends autoconf automake gcc g++
+    fi
+  fi
+}
+
+# Patch geos for PHP 7
+patch_geos() {
+  if [ "$(php -r "echo PHP_VERSION_ID;")" -ge 70000 ]; then
+    sed -i~ -e "s/, ce->name/, ZSTR_VAL(ce->name)/; s/ulong /zend_ulong /" /tmp/php-geos-"$geos_tag"/geos.c
+  fi
+}
+
+# Get geos source
+get_geos() {
+  curl -o /tmp/geos.tar.gz -sL https://github.com/libgeos/php-geos/archive/"$geos_tag".tar.gz
+  tar -xzf /tmp/geos.tar.gz -C /tmp
+  patch_geos
+}
+
+# Helper function to compile and install geos
+add_geos_helper() {
+  get_geos
+  (
+    cd /tmp/php-geos-"$geos_tag" || exit
+    phpize
+    ./configure --enable-geos --with-geos-config="$(command -v geos-config)"
+    sudo make -j"$(nproc)"
+    sudo make install
+    enable_extension geos extension
+  )
+}
+
+# Function to add geos
+add_geos() {
+  geos_tag='1.0.0'
+  add_geos_libs >/dev/null 2>&1
+  enable_extension "geos" "extension"
+  if check_extension "geos"; then
+    add_log "${tick:?}" "geos" "Enabled"
+  else
+    add_geos_helper >/dev/null 2>&1
+    add_extension_log "geos" "Installed and enabled"
+  fi
+}
--- a/src/scripts/ext/http.ps1
+++ b/src/scripts/ext/http.ps1
@ -0,0 +1,55 @@
+Function Get-ICUUrl() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    $icu_version,
+    [Parameter(Position = 1, Mandatory = $true)]
+    [ValidateNotNull()]
+    $arch,
+    [Parameter(Position = 2, Mandatory = $true)]
+    [ValidateNotNull()]
+    $vs_version
+  )
+  $trunk = "https://windows.php.net"
+  $urls=@("${trunk}/downloads/php-sdk/deps/${vs_version}/${arch}", "${trunk}/downloads/php-sdk/deps/archives/${vs_version}/${arch}")
+  foreach ($url in $urls) {
+    $web_content = Invoke-WebRequest -Uri $url
+    foreach ($link in $web_content.Links) {
+      if ($link -match "/.*ICU-${icu_version}.*/") {
+        return $trunk + $link.HREF
+      }
+    }
+  }
+}
+
+Function Repair-ICU() {
+  $icu = deplister $ext_dir\php_http.dll | Select-String "icu[a-z]+(\d+).dll,([A-Z]+)" | Foreach-Object { $_.Matches }
+  if($icu -and $icu.Groups[2].Value -ne 'OK') {
+    $vs = "vs" + $installed.VCVersion
+    if ($installed.VCVersion -lt 16) {
+      $vs = "vc" + $installed.VCVersion
+    }
+    $zip_url = Get-ICUUrl $icu.Groups[1].Value $installed.Architecture $vs
+    if ($zip_url -ne '') {
+      New-Item -Path "$php_dir" -Name "icu" -ItemType "directory" | Out-Null
+      Invoke-WebRequest -Uri $zip_url -OutFile "$php_dir\icu\icu.zip"
+      Expand-Archive -Path $php_dir\icu\icu.zip -DestinationPath $php_dir\icu -Force
+      Get-ChildItem $php_dir\icu\bin -Filter *.dll | Copy-Item -Destination $php_dir -Force
+    }
+  }
+}
+
+Function Add-Http() {
+  Add-Extension raphf >$null 2>&1
+  if($version -lt '8.0') {
+    Add-Extension propro >$null 2>&1
+  }
+  Add-Extension pecl_http >$null 2>&1
+  Repair-ICU
+  try {
+    php --ri "http" 2> $null | Out-Null
+    Add-Log $tick "http" "Installed and enabled"
+  } catch {
+    Add-Log $cross "http" "Could not install http on PHP $( $installed.FullVersion )"
+  }
+}
--- a/src/scripts/ext/http.sh
+++ b/src/scripts/ext/http.sh
@ -0,0 +1,166 @@
+# Function to get http version for a PHP version.
+get_http_version() {
+  if [[ ${version:?} =~ 5.[3-6] ]]; then
+    echo "pecl_http-2.6.0"
+  elif [[ ${version:?} =~ 7.[0-4] ]]; then
+    echo "pecl_http-3.2.4"
+  else
+    echo "pecl_http-$(get_pecl_version "pecl_http" "stable")"
+  fi
+}
+
+# Function to enable http extension.
+enable_http() {
+  enable_extension propro extension
+  enable_extension raphf extension
+  if (! [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension propro && check_extension raphf) ||
+     ( [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension raphf); then
+    enable_extension http extension
+  fi
+}
+
+# Function to install linux dependencies.
+add_http_dependencies_linux() {
+  ! [[ ${version:?} =~ ${nightly_versions:?} ]] && add_devtools phpize
+  install_packages zlib1g libbrotli-dev libcurl4-openssl-dev libevent-dev libicu-dev libidn2-dev
+  if [[ ${version:?} =~ ${old_versions:?} ]]; then
+    add_pecl_extension raphf 1.1.2 extension
+    add_pecl_extension propro 1.0.2 extension
+  elif [[ ${version:?} =~ 5.6|7.[0-4] ]]; then  
+    add_extension propro extension
+    add_extension raphf extension
+  else
+    add_extension raphf extension
+  fi
+}
+
+# Function to install darwin dependencies.
+add_http_dependencies_darwin() {
+  brew install brotli curl icu4c libevent libidn2
+  if ! [[ ${version:?} =~ ${old_versions:?} ]]; then
+    if [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
+      add_brew_extension propro extension
+    fi
+    add_brew_extension raphf extension
+  else
+    add_pecl_extension raphf 1.1.2 extension
+    add_pecl_extension propro 1.0.2 extension
+  fi
+}
+
+# Function to install the dependencies.
+add_http_dependencies() {
+  os=$1
+  if [ "$os" = 'Linux' ]; then
+    add_http_dependencies_linux
+  else
+    add_http_dependencies_darwin
+  fi
+}
+
+# Function to get configure options for http.
+get_http_configure_opts() {
+  os=$1
+  if [ "$os" = 'Linux' ]; then
+    for lib in zlib libbrotli libcurl libevent libicu libidn2 libidn libidnkit2 libidnkit; do
+      http_opts+=( "--with-http-$lib-dir=/usr" )
+    done
+  else
+    http_opts+=( "--with-http-zlib-dir=$(xcrun --show-sdk-path)/usr" )
+    http_opts+=( "--with-http-libbrotli-dir=$(brew --prefix brotli)" )
+    http_opts+=( "--with-http-libcurl-dir=$(brew --prefix curl)" )
+    http_opts+=( "--with-http-libicu-dir=$(brew --prefix icu4c)" )
+    http_opts+=( "--with-http-libevent-dir=$(brew --prefix libevent)" )
+    http_opts+=( "--with-http-libidn2-dir=$(brew --prefix libidn2)" )
+  fi
+}
+
+patch_http_source() {
+  ext=$1
+  os=$2
+  if [ "$os" = 'Darwin' ] && ! [[ ${version:?} =~ ${old_versions:?} ]]; then
+    if [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
+      sed -i '' -e "s|ext/propro|$(brew --prefix propro@"${version:?}")/include/php/ext/propro@${version:?}|" "/tmp/pecl_http-${ext##*-}/src/php_http_api.h"
+    fi
+    sed -i '' -e "s|ext/raphf|$(brew --prefix raphf@"${version:?}")/include/php/ext/raphf@${version:?}|" "/tmp/pecl_http-${ext##*-}/src/php_http_api.h"
+    if [ "${version:?}" = "5.6" ]; then
+      sed -i '' -e "s|\$abs_srcdir|\$abs_srcdir ${brew_prefix:?}/include|" -e "s|/ext/propro|/php/ext/propro@5.6|" -e "s|/ext/raphf|/php/ext/raphf@5.6|" "/tmp/pecl_http-${ext##*-}/config9.m4"
+    fi
+  fi
+}
+
+# Helper function to compile and install http.
+build_http() {
+  ext=$1
+  os=$2
+  (
+    http_opts=() && get_http_configure_opts "$os"
+    c_opts="CFLAGS=-Wno-implicit-function-declaration"
+    cd /tmp/pecl_http-"${ext##*-}" || exit
+    sudo phpize
+    sudo "$c_opts" ./configure --with-http --with-php-config="$(command -v php-config)" "${http_opts[@]}"
+    sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
+    sudo make install
+  )
+}
+
+# Compile and install http explicitly.
+# This is done as pecl compiles raphf and propro as well.
+add_http_helper() {
+  ext=$1
+  os=$2
+  add_http_dependencies "$os"
+  get -q -n /tmp/http.tgz https://pecl.php.net/get/pecl_http-"${ext##*-}".tgz
+  tar -xzf /tmp/http.tgz -C /tmp
+  patch_http_source "$ext" "$os"
+  build_http "$ext" "$os"
+  enable_extension http extension
+}
+
+# Function to setup latest http extension.
+add_http_latest() {
+  os=$1
+  enable_http
+  if ! check_extension http; then
+    if [ "$os" = "Linux" ]; then
+      if ! [[ "${version:?}" =~ ${old_versions:?}|${nightly_versions:?} ]]; then
+        if [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
+          install_packages "php$version-propro"
+        fi
+        install_packages "php$version-raphf" "php$version-http"
+      else
+        add_http_helper "$(get_http_version)" "$os"
+      fi
+    else
+      if ! [[ "${version:?}" =~ ${old_versions:?} ]]; then
+        add_brew_extension pecl_http extension
+      fi
+    fi
+    status="Installed and enabled"
+  fi
+}
+
+# Function to setup http extension given a version.
+add_http_version() {
+  ext=$1
+  os=$2
+  enable_http
+  if [ "x$(php -r "echo phpversion('http');")" != "x${ext##*-}" ]; then
+    remove_extension http >/dev/null
+    add_http_helper pecl_http-"${ext##*-}" "$os"
+    status="Installed and enabled"
+  fi
+}
+
+# Function to setup http extension
+add_http() {
+  ext=$1
+  os="$(uname -s)"
+  status="Enabled"
+  if [[ "$ext" =~ ^(pecl_http|http)$ ]]; then
+    add_http_latest "$os" >/dev/null 2>&1
+  else
+    add_http_version "$ext" "$os" >/dev/null 2>&1
+  fi
+  add_extension_log "http" "$status"
+}
--- a/src/scripts/ext/oci.ps1
+++ b/src/scripts/ext/oci.ps1
@ -37,11 +37,13 @@ Function Add-Oci() {
    } else {
      if(-not(Test-Path $ext_dir\php_oci8.dll)) {
        $status = 'Installed and enabled'
-        $ociVersion = '2.2.0'
+        $ociVersion = Get-PeclPackageVersion oci8 -MinimumStability stable -MaximumStability stable | Select-Object -First 1
        if ($version -eq '7.0') {
          $ociVersion = '2.1.8'
        } elseif ($version -lt '7.0') {
          $ociVersion = '2.0.12'
+        } elseif ($version -lt '8.0') {
+          $ociVersion = '2.2.0'
        }
        $ociUrl = Get-PeclArchiveUrl oci8 $ociVersion $installed
        Invoke-WebRequest -Uri $ociUrl -OutFile $php_dir\oci8.zip
--- a/src/scripts/ext/oci.sh
+++ b/src/scripts/ext/oci.sh
@ -7,17 +7,6 @@ add_license_log() {
  echo "::endgroup::"
 }

-# Function to get the tag for a php version.
-get_tag() {
-  tag='master'
-  if ! [[ ${version:?} =~ $nightly_versions ]]; then
-    tag="php-$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')"
-  elif [ "${version:?}" = '8.0' ]; then
-    tag="PHP-8.0"
-  fi
-  echo "$tag"
-}
-
 # Function to install instantclient and SDK.
 add_client() {
  sudo mkdir -p -m 777 "$oracle_home"
@ -49,7 +38,7 @@ get_php() {

 # Function to get phpize location on darwin.
 get_phpize() {
-  if [[ "$version" =~ 5.[3-5] ]]; then
+  if [[ "${version:?}" =~ 5.[3-5] ]]; then
    echo '/opt/local/bin/phpize'
  else
    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
@ -83,7 +72,7 @@ patch_pdo_oci_config() {
 add_dependencies() {
  if [ "$os" = 'Linux' ]; then
    if [ "${runner:?}" = "self-hosted" ]; then
-      ${apt_install:?} --no-upgrade --no-install-recommends autoconf automake libaio-dev gcc g++
+      ${apt_install:?} --no-upgrade --no-install-recommends libaio-dev
    fi
    ! [[ ${version:?} =~ $nightly_versions ]] && add_devtools phpize
  fi
@ -94,14 +83,14 @@ add_oci_helper() {
  if ! [ -e "${ext_dir:?}/$ext.so" ]; then
    status='Installed and enabled'
    phpize_orig=$(get_phpize)
-    tag=$(get_tag)
+    tag=$(php_src_tag)
    get_php
    patch_phpize
    (
      cd "/opt/oracle/php-src-$tag/ext/$ext" || exit 1
      [ "$ext" = "pdo_oci" ] && patch_pdo_oci_config
      sudo phpize && ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=instantclient,"$oracle_client"
-      sudo make -j"$(nproc)"
+      sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
      sudo cp ./modules/* "$ext_dir/"
    )
    restore_phpize
@ -116,7 +105,6 @@ add_oci() {
  oracle_home='/opt/oracle'
  oracle_client=$oracle_home/instantclient
  os=$(uname -s)
-  nightly_versions='8.[0-1]'
  add_client >/dev/null 2>&1
  add_dependencies >/dev/null 2>&1
  add_oci_helper >/dev/null 2>&1
--- a/src/scripts/ext/phalcon.sh
+++ b/src/scripts/ext/phalcon.sh
@ -9,12 +9,11 @@ add_phalcon_helper() {
      ${apt_install:?} "php${version:?}-$extension"
    fi
  else
-    phalcon_ini_file=${ini_file:?}
    sed -i '' '/extension.*psr/d' "${ini_file:?}"
-    brew tap shivammathur/homebrew-phalcon
+    add_brew_tap shivammathur/homebrew-phalcon
    brew install phalcon@"${version:?}"_"$extension_major_version"
-    sudo cp /usr/local/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
-    sudo cp /usr/local/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
+    sudo cp "${brew_prefix:?}"/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
+    sudo cp "${brew_prefix:?}"/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
  fi
 }

@ -29,7 +28,7 @@ add_phalcon3() {
    fi
  else
    add_phalcon_helper
-  fi  
+  fi
 }

 # Function to add phalcon4.
@ -50,7 +49,7 @@ add_phalcon4() {
    fi
  else
    add_phalcon_helper
-  fi  
+  fi
 }

 # Function to add phalcon.
@ -58,7 +57,7 @@ add_phalcon() {
  extension=$1
  status='Enabled'
  os_name=$(uname -s)
-  phalcon_ini_file="${scan_dir:?}/50-phalcon.ini"
+  phalcon_ini_file="${pecl_file:-${ini_file[@]}}"
  extension_major_version=${extension: -1}
  if [ "$extension_major_version" = "4" ]; then
    add_phalcon4 >/dev/null 2>&1
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@ -3,16 +3,17 @@ self_hosted_helper() {
  if ! command -v apt-fast >/dev/null; then
    sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
  fi
-  install_packages curl make software-properties-common unzip
-  add_ppa
+  install_packages curl make software-properties-common unzip autoconf automake gcc g++
+  add_ppa ondrej/ppa
 }

 # Function to backup and cleanup package lists.
 cleanup_lists() {
+  ppa_prefix=${1-ondrej}
  if [ ! -e /etc/apt/sources.list.d.save ]; then
    sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save
    sudo mkdir /etc/apt/sources.list.d
-    sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/
+    sudo mv /etc/apt/sources.list.d.save/*"${ppa_prefix}"*.list /etc/apt/sources.list.d/
    sudo mv /etc/apt/sources.list.d.save/*dotdeb*.list /etc/apt/sources.list.d/ 2>/dev/null || true
    trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/ 2>/dev/null" exit
  fi
@ -20,15 +21,33 @@ cleanup_lists() {

 # Function to add ppa:ondrej/php.
 add_ppa() {
-  if ! apt-cache policy | grep -q ondrej/php; then
-    cleanup_lists
-    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
+  ppa=${1:-ondrej/php}
+  if ! apt-cache policy | grep -q "$ppa"; then
+    cleanup_lists "$(dirname "$ppa")"
+    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:"$ppa" -y
    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
      sudo "$debconf_fix" apt-get update
    fi
  fi
 }

+# Function to add SAPI
+add_sapi() {
+  sapi=$1
+  status='true'
+  if [ "$sapi" != "cli" ]; then
+    # shellcheck source=.
+    . "${dist}"/../src/scripts/sapi.sh
+    setup_sapi "$sapi" >/dev/null 2>&1
+  fi
+  check_sapi "$sapi"
+  if check_sapi "$sapi"; then
+    add_log "${tick:?}" "$sapi" "Added $sapi"
+  else
+    add_log "${cross:?}" "$sapi" "Could not setup $sapi"
+  fi
+}
+
 # Function to update the package lists.
 update_lists() {
  if [ ! -e /tmp/setup_php ]; then
@ -45,12 +64,19 @@ install_packages() {
  $apt_install "${packages[@]}" >/dev/null 2>&1 || update_lists && $apt_install "${packages[@]}" >/dev/null 2>&1
 }

-# Function to delete extensions.
+# Function to disable an extension.
+disable_extension() {
+  extension=$1
+  sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file[@]}"
+  sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "$pecl_file"
+  sudo find "$ini_dir"/.. -name "*$extension.ini" -delete >/dev/null 2>&1 || true
+}
+
+# Function to delete an extension.
 delete_extension() {
  extension=$1
-  sudo sed -i "/$extension/d" "${ini_file:?}"
-  sudo sed -i "/$extension/d" "${pecl_file:?}"
-  sudo rm -rf "${scan_dir:?}"/*"$extension"* "${ext_dir:?}"/"$extension".so >/dev/null 2>&1
+  disable_extension "$extension"
+  sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
  if [ "${runner:?}" = "self-hosted" ]; then
    $apt_remove "php-$extension" "php$version-$extension" >/dev/null 2>&1 || true
  fi
@ -79,14 +105,22 @@ add_pdo_extension() {
  if check_extension "$pdo_ext"; then
    add_log "${tick:?}" "$pdo_ext" "Enabled"
  else
-    ext=$1; ext_name=$1;
-    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1
-    if ! check_extension "pdo" 2>/dev/null; then echo "extension=pdo.so" >>"$ini_file"; fi
+    ext=$1
+    ext_name=$1
+    disable_extension pdo
+    echo "extension=pdo.so" | sudo tee "${ini_file[@]/php.ini/conf.d/10-pdo.ini}" >/dev/null 2>&1
    if [ "$ext" = "mysql" ]; then
      enable_extension "mysqlnd" "extension"
-      ext_name="mysqli"
+      ext_name='mysqli'
+    elif [ "$ext" = "dblib" ]; then
+      ext_name="sybase"
+    elif [ "$ext" = "firebird" ]; then
+      install_packages libfbclient2 >/dev/null 2>&1
+      enable_extension "pdo_firebird" "extension"
+      ext_name="interbase"
    elif [ "$ext" = "sqlite" ]; then
-      ext="sqlite3"; ext_name="sqlite3";
+      ext="sqlite3"
+      ext_name="sqlite3"
    fi
    add_extension "$ext_name" "extension" >/dev/null 2>&1
    add_extension "$pdo_ext" "extension" >/dev/null 2>&1
@ -111,7 +145,7 @@ add_extension() {
    fi
    add_extension_log "$extension" "Installed and enabled"
  fi
-  sudo chmod 777 "$ini_file"
+  sudo chmod 777 "${ini_file[@]}"
 }

 # Function to install a PECL version.
@ -133,25 +167,6 @@ add_pecl_extension() {
  fi
 }

-# Function to install extension from source
-add_extension_from_source() {
-  extension=$1
-  repo=$2
-  release=$3
-  args=$4
-  prefix=$5
-  (
-    add_devtools phpize
-    delete_extension "$extension"
-    get -q -n "/tmp/$extension.tar.gz" "https://github.com/$repo/archive/$release.tar.gz"
-    tar xf /tmp/"$extension".tar.gz -C /tmp
-    cd /tmp/"$extension-$release" || exit 1
-    phpize && ./configure "$args" && make -j"$(nproc)" && sudo make install
-    enable_extension "$extension" "$prefix"
-  ) >/dev/null 2>&1
-  add_extension_log "$extension-$release" "Installed and enabled"
-}
-
 # Function to setup phpize and php-config.
 add_devtools() {
  tool=$1
@ -160,9 +175,7 @@ add_devtools() {
  fi
  sudo update-alternatives --set php-config /usr/bin/php-config"$version" >/dev/null 2>&1
  sudo update-alternatives --set phpize /usr/bin/phpize"$version" >/dev/null 2>&1
-  if command -v pecl >/dev/null; then
-    configure_pecl >/dev/null 2>&1
-  fi
+  configure_pecl >/dev/null 2>&1
  add_log "${tick:?}" "$tool" "Added $tool $semver"
 }

@ -174,7 +187,6 @@ setup_nightly() {
 # Function to setup PHP 5.3, PHP 5.4 and PHP 5.5.
 setup_old_versions() {
  run_script "php5-ubuntu" "$version"
-  configure_pecl
  release_version=$(php -v | head -n 1 | cut -d' ' -f 2)
 }

@ -194,7 +206,7 @@ switch_version() {
  for tool in pear pecl php phar phar.phar php-cgi php-config phpize phpdbg; do
    if [ -e "/usr/bin/$tool$version" ]; then
      sudo update-alternatives --set $tool /usr/bin/"$tool$version" &
-      to_wait+=( $! )
+      to_wait+=($!)
    fi
  done
  wait "${to_wait[@]}"
@ -207,14 +219,14 @@ add_packaged_php() {
    IFS=' ' read -r -a packages <<<"$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
    $apt_install "${packages[@]}"
  else
-    run_script "php-ubuntu" "$version"
+    run_script "test-setup-php" "$version"
  fi
 }

 # Function to update PHP.
 update_php() {
  initial_version=$(php_semver)
-  use_package_cache="false" add_packaged_php
+  add_packaged_php
  updated_version=$(php_semver)
  if [ "$updated_version" != "$initial_version" ]; then
    status="Updated to"
@ -235,6 +247,15 @@ add_php() {
  status="Installed"
 }

+# Function to ini file for pear and link it to each SAPI.
+link_pecl_file() {
+  echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
+  for file in "${ini_file[@]}"; do
+    sapi_scan_dir="$(realpath -m "$(dirname "$file")")/conf.d"
+    [ "$sapi_scan_dir" != "$scan_dir" ] && ! [ -h "$sapi_scan_dir" ] && sudo ln -sf "$pecl_file" "$sapi_scan_dir/99-pecl.ini"
+  done
+}
+
 # Function to Setup PHP
 setup_php() {
  step_log "Setup PHP"
@ -259,14 +280,20 @@ setup_php() {
      status="Found"
    fi
  fi
+  if ! command -v php"$version" >/dev/null; then
+    add_log "$cross" "PHP" "Could not setup PHP $version"
+    exit 1
+  fi
  semver=$(php_semver)
  ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
  scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-  ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+  ini_dir=$(php --ini | grep "(php.ini)" | sed -e "s|.*: s*||")
  pecl_file="$scan_dir"/99-pecl.ini
-  echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
+  mapfile -t ini_file < <(sudo find "$ini_dir/.." -name "php.ini" -exec readlink -m {} +)
+  link_pecl_file
+  configure_php
  sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1
-  sudo chmod 777 "$ini_file" "$pecl_file" "${tool_path_dir:?}"
+  sudo chmod 777 "${ini_file[@]}" "$pecl_file" "${tool_path_dir:?}"
  sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
  add_log "${tick:?}" "PHP" "$status PHP $semver"
 }
@ -277,9 +304,11 @@ dist=$2
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
 apt_install="sudo $debconf_fix apt-fast install -y"
 apt_remove="sudo $debconf_fix apt-fast remove -y"
+scripts="${dist}"/../src/scripts

 # shellcheck source=.
-. "${dist}"/../src/scripts/common.sh
+. "${scripts:?}"/tools/add_tools.sh
+. "${scripts:?}"/common.sh
 . /etc/lsb-release
 read_env
 self_hosted_setup
--- a/src/scripts/sapi/sapi_darwin.sh
+++ b/src/scripts/sapi/sapi_darwin.sh
@ -0,0 +1,116 @@
+#!/bin/bash
+
+install_httpd() {
+  sudo mkdir -p /var/www/html
+  sudo chown -R _www:_www /var/www
+  brew services stop nginx 2>/dev/null || true
+  if ! command -v httpd >/dev/null; then
+    brew install httpd
+  fi
+  sudo sed -Ei '' 's/Listen.*/Listen 80/' "$httpd_conf"
+  sudo sed -Ei '' 's/DirectoryIndex.*/DirectoryIndex index.php index.html/' "$httpd_conf"
+}
+
+install_nginx() {
+  sudo mkdir -p /var/www/html
+  sudo chown -R "$(id -un)":"$(id -gn)" /var/www
+  brew services stop httpd 2>/dev/null || true
+  if ! command -v nginx >/dev/null; then
+    brew install nginx
+  fi
+  sudo sed -Ei '' 's/listen.*/listen 80;/' "$nginx_conf"
+}
+
+setup_sapi() {
+  sapi=$1
+  conf_dir="${dist:?}"/../src/configs
+
+  case $sapi in
+  apache*:apache*)
+    install_httpd
+    (
+      echo "LoadModule proxy_module lib/httpd/modules/mod_proxy.so"
+      echo "LoadModule proxy_module lib/httpd/modules/mod_proxy_fcgi.so"
+    ) | sudo tee -a "$httpd_conf"
+    echo "Include $httpd_extra/httpd-php.conf" | sudo tee -a "$httpd_conf"
+
+
+    sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
+    sudo a2dismod mpm_event 2>/dev/null || true
+    sudo a2enmod mpm_prefork php"${version:?}"
+    sudo service apache2 restart
+    ;;
+  fpm:apache*)
+    install_httpd
+    sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
+    sudo a2dismod php"${version:?}" 2>/dev/null || true
+    sudo a2enmod proxy_fcgi
+    sudo a2enconf php"${version:?}"-fpm
+    sudo service apache2 restart
+    ;;
+  cgi:apache*)
+    install_httpd
+    sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
+    echo "Action application/x-httpd-php /cgi-bin/php${version:?}" | sudo tee -a /etc/apache2/conf-available/php"${version:?}"-cgi.conf
+    sudo a2dismod php"${version:?}" mpm_event 2>/dev/null || true
+    sudo a2enmod mpm_prefork actions cgi
+    sudo a2disconf php"${version:?}"-fpm 2>/dev/null || true
+    sudo a2enconf php"${version:?}"-cgi
+    sudo service apache2 restart
+    ;;
+  fpm:nginx)
+    install_nginx
+    sudo cp "$conf_dir"/default_nginx /etc/nginx/sites-available/default
+    sudo sed -i "s/PHP_VERSION/${version:?}/" /etc/nginx/sites-available/default
+    sudo service nginx restart
+    ;;
+  apache* | fpm | cgi | phpdbg) ;;
+
+  esac
+}
+
+check_service() {
+  service=$1
+  if ! pidof "$service"; then
+    return 1
+  fi
+  (
+    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$service" "Click to check $service status"
+    sudo service "$service" status
+    echo "::endgroup::"
+  ) | sudo tee -a /tmp/sapi.log >/dev/null 2>&1
+  return 0
+}
+
+check_version() {
+  sapi=$1
+  sapi_version=$(php_semver "$sapi")
+  if [ ${sapi_version%.*} != "${version:?}" ]; then
+    return 1
+  fi
+  add_log "${tick:?}" "$sapi" "Added $sapi $sapi_version" | sudo tee -a /tmp/sapi.log >/dev/null 2>&1
+  return 0
+}
+
+check_sapi() {
+  sapi=$1
+  sudo rm /tmp/sapi.log
+  if [[ "$sapi" =~ fpm|cgi ]]; then status=$(check_version php-"$sapi"); fi
+  if [[ "$sapi" =~ ^phpdbg$ ]]; then status=$(check_version phpdbg); fi
+  if [[ "$sapi" =~ .*fpm.* ]]; then status=$(check_service php"${version:?}"-fpm); fi
+  if [[ "$sapi" =~ .*:apache.* ]]; then status=$(check_service apache2); fi
+  if [[ "$sapi" =~ .*:nginx.* ]]; then status=$(check_service nginx); fi
+
+  if [ "$status" = "0" ]; then
+    if [[ "$sapi" =~ .*:.* ]]; then
+      add_log "${tick:?}" "$sapi" "Added $sapi"
+    fi
+    cat /tmp/sapi.log && sudo rm /tmp/sapi.log
+  else
+    add_log "${cross:?}" "$sapi" "Could not setup $sapi"
+  fi
+}
+
+httpd_conf=${brew_prefix:?}/etc/httpd/httpd.conf
+httpd_extra=${brew_prefix:?}/etc/httpd/extra
+nginx_conf=${brew_prefix:?}/etc/nginx/nginx.conf
--- a/src/scripts/sapi/sapi_linux.sh
+++ b/src/scripts/sapi/sapi_linux.sh
@ -0,0 +1,117 @@
+#!/bin/bash
+
+install_apache2() {
+  sudo mkdir -p /var/www/html
+  sudo service nginx stop 2>/dev/null || true
+  if ! command -v apache2 >/dev/null; then
+    install_packages apache2-bin apache2 -y;
+  else
+    if ! [[ "$(apache2 -v 2>/dev/null | grep -Eo "([0-9]+\.[0-9]+)")" =~ 2.[4-9] ]]; then
+      sudo "${debconf_fix:?}" apt-get purge apache* apache-* >/dev/null
+      install_packages apache2-bin apache2 -y;
+    fi
+  fi
+}
+
+install_nginx() {
+  sudo mkdir -p /var/www/html
+  sudo service apache2 stop 2>/dev/null || true
+  if ! command -v nginx >/dev/null; then
+    install_packages nginx -y
+  fi
+}
+
+setup_sapi() {
+  sapi=$1
+  conf_dir="${dist:?}"/../src/configs
+
+  if [[ "${version:?}" =~ ${old_versions:?}|${nightly_versions:?} ]]; then
+    switch_sapi "$sapi"
+  else
+    case $sapi in
+      apache*:apache*)
+        install_apache2
+        sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
+        install_packages libapache2-mod-php"${version:?}" -y
+        sudo a2dismod mpm_event 2>/dev/null || true
+        sudo a2enmod mpm_prefork php"${version:?}"
+        sudo service apache2 restart
+        ;;
+      fpm:apache*)
+        install_apache2
+        sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
+        install_packages libapache2-mod-fcgid php"${version:?}"-fpm -y
+        sudo a2dismod php"${version:?}" 2>/dev/null || true
+        sudo a2enmod proxy_fcgi
+        sudo a2enconf php"${version:?}"-fpm
+        sudo service apache2 restart
+        ;;
+      cgi:apache*)
+        install_apache2
+        install_packages php"${version:?}"-cgi -y
+        sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
+        echo "Action application/x-httpd-php /cgi-bin/php${version:?}" | sudo tee -a /etc/apache2/conf-available/php"${version:?}"-cgi.conf
+        sudo a2dismod php"${version:?}" mpm_event 2>/dev/null || true
+        sudo a2enmod mpm_prefork actions cgi
+        sudo a2disconf php"${version:?}"-fpm 2>/dev/null || true
+        sudo a2enconf php"${version:?}"-cgi
+        sudo service apache2 restart
+        ;;
+      fpm:nginx)
+        install_nginx
+        install_packages php"${version:?}"-fpm -y
+        sudo cp "$conf_dir"/default_nginx /etc/nginx/sites-available/default
+        sudo sed -i "s/PHP_VERSION/${version:?}/" /etc/nginx/sites-available/default
+        sudo service nginx restart
+        ;;
+      apache*)
+        install_packages libapache2-mod-php"${version:?}" -y
+        ;;
+      fpm|embed|cgi|phpdbg)
+        install_packages php"${version:?}"-"$sapi" -y
+        ;;
+    esac
+  fi
+}
+
+check_service() {
+  service=$1
+  if ! pidof "$service"; then
+    return 1
+  fi
+  (
+    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$service" "Click to check $service status"
+    sudo service "$service" status
+    echo "::endgroup::"
+  ) | sudo tee -a /tmp/sapi.log >/dev/null 2>&1
+  return 0
+}
+
+check_version() {
+  sapi=$1
+  sapi_version=$(php_semver "$sapi")
+  if [ "${sapi_version%.*}" != "${version:?}" ]; then
+    return 1;
+  fi
+  add_log "${tick:?}" "$sapi" "Added $sapi $sapi_version" | sudo tee -a /tmp/sapi.log >/dev/null 2>&1
+  return 0
+}
+
+check_sapi() {
+  sapi=$1
+  sudo rm /tmp/sapi.log
+  if [[ "$sapi" =~ fpm|cgi ]]; then status=$(check_version php-"$sapi"); fi
+  if [[ "$sapi" =~ ^phpdbg$ ]]; then status=$(check_version phpdbg); fi
+  if [[ "$sapi" =~ .*fpm.* ]]; then status=$(check_service php"${version:?}"-fpm); fi
+  if [[ "$sapi" =~ .*:apache.* ]]; then status=$(check_service apache2); fi
+  if [[ "$sapi" =~ .*:nginx.* ]]; then status=$(check_service nginx); fi
+
+  if [ "$status" = "0" ]; then
+    if [[ "$sapi" =~ .*:.* ]]; then
+      add_log "${tick:?}" "$sapi" "Added $sapi"
+    fi
+    cat /tmp/sapi.log && sudo rm /tmp/sapi.log
+  else
+    add_log "${cross:?}" "$sapi" "Could not setup $sapi"
+  fi
+}
--- a/src/scripts/tools/add_tools.ps1
+++ b/src/scripts/tools/add_tools.ps1
@ -0,0 +1,26 @@
+Function Add-ToolsHelper() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    $tool
+  )
+  if($tool -eq "codeception") {
+    Copy-Item $composer_bin\codecept.bat -Destination $composer_bin\codeception.bat
+  } elseif($tool -eq "composer") {
+    Edit-ComposerConfig $bin_dir\$tool
+  } elseif($tool -eq "cs2pr") {
+    (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
+  } elseif($tool -eq "phan") {
+    Add-Extension fileinfo >$null 2>&1
+    Add-Extension ast >$null 2>&1
+  } elseif($tool -eq "phive") {
+    Add-Extension xml >$null 2>&1
+  } elseif($tool -eq "symfony") {
+    Add-ToProfile $current_profile "symfony" "New-Alias symfony $bin_dir\$tool.exe"
+    Add-ToProfile $current_profile "symfony-cli" "New-Alias symfony-cli $bin_dir\$tool.exe"
+  } elseif($tool -eq "vapor-cli") {
+    Copy-Item $composer_bin\vapor.bat -Destination $composer_bin\vapor-cli.bat
+  } elseif($tool -eq "wp-cli") {
+    Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
+  }
+}
--- a/src/scripts/tools/add_tools.sh
+++ b/src/scripts/tools/add_tools.sh
@ -0,0 +1,24 @@
+add_tools_helper() {
+  tool=$1
+  if [ "$tool" = "codeception" ]; then
+    sudo ln -s "${composer_bin:?}"/codecept "${composer_bin:?}"/codeception
+  elif [ "$tool" = "composer" ]; then
+    configure_composer "${tool_path:?}"
+  elif [ "$tool" = "cs2pr" ]; then
+    sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "${tool_path:?}" 2>/dev/null ||
+    sudo sed -i '' 's/\r$//; s/exit(9)/exit(0)/' "${tool_path:?}"
+  elif [ "$tool" = "phan" ]; then
+    add_extension fileinfo extension >/dev/null 2>&1
+    add_extension ast extension >/dev/null 2>&1
+  elif [ "$tool" = "phive" ]; then
+    add_extension curl extension >/dev/null 2>&1
+    add_extension mbstring extension >/dev/null 2>&1
+    add_extension xml extension >/dev/null 2>&1
+  elif [ "$tool" = "symfony" ]; then
+    sudo ln -s "${tool_path:?}" "${tool_path_dir:?}"/symfony-cli
+  elif [ "$tool" = "vapor-cli" ]; then
+    sudo ln -s "${tool_path:?}" "${tool_path_dir:?}"/vapor-cli
+  elif [ "$tool" = "wp-cli" ]; then
+    sudo ln -s "${tool_path:?}" "${tool_path_dir:?}"/wp
+  fi
+}
--- a/src/scripts/tools/grpc_php_plugin.sh
+++ b/src/scripts/tools/grpc_php_plugin.sh
@ -14,36 +14,49 @@ add_bazel() {

 get_grpc_tag() {
  if [ "$grpc_tag" = "latest" ]; then
-    grpc_tag=$(get -s -n "" https://grpc.io/release)
+    grpc_tag=$(get -s -n "" https://github.com/grpc/grpc/releases/latest | grep -Eo -m 1 "v[0-9]+\.[0-9]+\.[0-9]+" | head -n 1)
  else
-    status_code=$(get -v -n /tmp/grpc.tmp "https://github.com/grpc/grpc/releases/tag/v$grpc_tag")
-    if [ "$status_code" = "200" ]; then
-      grpc_tag="v$grpc_tag"
-    else
-      grpc_tag=$(get -s -n "" https://grpc.io/release)
+    if [[ ${grpc_tag:0:1} != "v" ]] ; then grpc_tag="v$grpc_tag"; fi
+    status_code=$(get -v -n /tmp/grpc.tmp "https://github.com/grpc/grpc/releases/tag/$grpc_tag")
+    if [ "$status_code" != "200" ]; then
+      grpc_tag=$(get -s -n "" https://github.com/grpc/grpc/releases/latest | grep -Eo -m 1 "v[0-9]+\.[0-9]+\.[0-9]+" | head -n 1)
    fi
  fi
 }

+add_grpc_php_plugin_macos() {
+  brew install grpc
+  brew link --force --overwrite grpc >/dev/null 2>&1
+  grpc_tag="v$(brew info grpc | grep "grpc:" | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")"
+  license_path="$(brew --prefix grpc)/LICENSE"
+}
+
+add_grpc_php_plugin_linux() {
+  get_grpc_tag
+  get -s -n "" "https://github.com/grpc/grpc/archive/$grpc_tag.tar.gz" | tar -xz -C /tmp
+  cd "/tmp/grpc-${grpc_tag:1}" || exit
+  add_bazel
+  if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+    CC="$(command -v gcc)" CXX="$(command -v g++)" ./tools/bazel build src/compiler:grpc_php_plugin
+  else
+    ./tools/bazel build src/compiler:grpc_php_plugin
+  fi
+  sudo mv ./bazel-bin/src/compiler/grpc_php_plugin /usr/local/bin/grpc_php_plugin
+  sudo chmod a+x /usr/local/bin/grpc_php_plugin
+  license_path="/tmp/grpc-${grpc_tag:1}/LICENSE"
+}
+
 add_grpc_php_plugin() {
  grpc_tag=$1
-  get_grpc_tag
-  (
-    get -s -n "" "https://github.com/grpc/grpc/archive/$grpc_tag.tar.gz" | tar -xz -C /tmp
-    cd "/tmp/grpc-${grpc_tag:1}" || exit
-    add_bazel
-    [ "$(uname -s)" = "Darwin" ] && sudo xcode-select -s /Applications/Xcode_11.7.app
-    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
-      CC="$(command -v gcc)" CXX="$(command -v g++)" ./tools/bazel build src/compiler:grpc_php_plugin
-    else
-      ./tools/bazel build src/compiler:grpc_php_plugin
-    fi
-    sudo mv ./bazel-bin/src/compiler/grpc_php_plugin /usr/local/bin/grpc_php_plugin
-    sudo chmod a+x /usr/local/bin/grpc_php_plugin
-  ) >/dev/null 2>&1
-  echo "::set-output name=grpc_php_plugin_path::/usr/local/bin/grpc_php_plugin"
+  license_path=""
+  if [ "$(uname -s)" = "Darwin" ]; then
+    add_grpc_php_plugin_macos >/dev/null 2>&1
+  else
+    add_grpc_php_plugin_linux >/dev/null 2>&1
+  fi
+  echo "::set-output name=grpc_php_plugin_path::$(command -v grpc_php_plugin)"
  add_log "${tick:?}" "grpc_php_plugin" "Added grpc_php_plugin ${grpc_tag:1}"
  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "grpc_php_plugin" "Click to read the grpc_php_plugin related license information"
-  cat "/tmp/grpc-${grpc_tag:1}/LICENSE"
+  cat "$license_path"
  echo "::endgroup::"
 }
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@ -8,10 +8,7 @@ param (
  [ValidateNotNull()]
  [ValidateLength(1, [int]::MaxValue)]
  [string]
-  $dist,
-  [Parameter(Position = 2, Mandatory = $false)]
-  [string]
-  $fail_fast = 'false'
+  $dist
 )

 # Function to log start of a operation.
@ -25,7 +22,7 @@ Function Add-Log($mark, $subject, $message) {
    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $mark $subject $message
  } else {
    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $mark $subject $message
-    if($fail_fast -eq 'true') {
+    if($env:fail_fast -eq 'true') {
      exit 1;
    }
  }
@ -204,10 +201,13 @@ Function Edit-ComposerConfig() {
    Add-Log "$cross" "composer" "Could not download composer"
    exit 1;
  }
-  composer -q global config process-timeout 0
+  if (-not(Test-Path $composer_json)) {
+    Set-Content -Path $composer_json -Value "{}"
+  }
+  composer -q config -g process-timeout 0
  Write-Output $composer_bin | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
  if (Test-Path env:COMPOSER_TOKEN) {
-    composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
+    composer -q config -g github-oauth.github.com $env:COMPOSER_TOKEN
  }
 }

@ -222,12 +222,12 @@ Function Get-ToolVersion() {
  $version_regex = "[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-z0-9]+){0,1}"
  if($tool -eq 'composer') {
    if ($param -eq 'snapshot') {
-      $trunk = Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }
-      $commit = Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern "[a-zA-Z0-9]+" -AllMatches | ForEach-Object { $_.matches[2].Value }
-      return "$trunk+$commit"
+      $composer_version = (Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }) + '+' + (Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern "[a-zA-Z0-9]+" -AllMatches | ForEach-Object { $_.matches[2].Value })
    } else {
-      return Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }
+      $composer_version = Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }
    }
+    Set-Variable -Name 'composer_version' -Value $composer_version -Scope Global
+    return "$composer_version"
  }
  return . $tool $param 2> $null | ForEach-Object { $_ -replace "composer $version_regex", '' } | Select-String -Pattern $version_regex | Select-Object -First 1 | ForEach-Object { $_.matches.Value }
 }
@ -248,20 +248,21 @@ Function Add-Tool() {
  if (Test-Path $bin_dir\$tool) {
    Remove-Item $bin_dir\$tool
  }
-  if($url.Count -gt 1) { $url = $url[0] }
-  if ($tool -eq "symfony") {
-    Invoke-WebRequest -Uri $url -OutFile $bin_dir\$tool.exe
-    Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.exe" >$null 2>&1
-  } else {
-    try {
-      Invoke-WebRequest -Uri $url -OutFile $bin_dir\$tool
-    } catch {
-      if($url -match '.*github.com.*releases.*latest.*') {
-        try {
-          $url = $url.replace("releases/latest/download", "releases/download/" + ([regex]::match((Invoke-WebRequest -Uri ($url.split('/release')[0] + "/releases")).Content, "([0-9]+\.[0-9]+\.[0-9]+)/" + ($url.Substring($url.LastIndexOf("/") + 1))).Groups[0].Value).split('/')[0])
-          Invoke-WebRequest -Uri $url -OutFile $bin_dir\$tool
-        } catch { }
-      }
+  if($url.Count -gt 1) {
+    $url = $url[0]
+  }
+  $tool_path = "$bin_dir\$tool"
+  if (($url | Split-Path -Extension) -eq ".exe") {
+    $tool_path = "$tool_path.exe"
+  }
+  try {
+    Invoke-WebRequest -Uri $url -OutFile $tool_path
+  } catch {
+    if($url -match '.*github.com.*releases.*latest.*') {
+      try {
+        $url = $url.replace("releases/latest/download", "releases/download/" + ([regex]::match((Invoke-WebRequest -Uri ($url.split('/release')[0] + "/releases")).Content, "([0-9]+\.[0-9]+\.[0-9]+)/" + ($url.Substring($url.LastIndexOf("/") + 1))).Groups[0].Value).split('/')[0])
+        Invoke-WebRequest -Uri $url -OutFile $tool_path
+      } catch { }
    }
  }
  if (((Get-ChildItem -Path $bin_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
@ -272,18 +273,7 @@ Function Add-Tool() {
    $bat_content += "php %BIN_TARGET% %*"
    Set-Content -Path $bin_dir\$tool.bat -Value $bat_content
    Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.bat" >$null 2>&1
-    if($tool -eq "phan") {
-      Add-Extension fileinfo >$null 2>&1
-      Add-Extension ast >$null 2>&1
-    } elseif($tool -eq "phive") {
-      Add-Extension xml >$null 2>&1
-    } elseif($tool -eq "cs2pr") {
-      (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
-    } elseif($tool -eq "composer") {
-      Edit-ComposerConfig $bin_dir\$tool
-    } elseif($tool -eq "wp-cli") {
-      Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
-    }
+    Add-ToolsHelper $tool
    $tool_version = Get-ToolVersion $tool $ver_param
    Add-Log $tick $tool "Added $tool $tool_version"
  } else {
@ -310,11 +300,20 @@ Function Add-Composertool() {
    [string]
    $prefix
  )
-  composer global require $prefix$release 2>&1 | out-null
+  if($tool -match "prestissimo|composer-prefetcher" -and $composer_version.split('.')[0] -ne "1") {
+    Write-Output "::warning:: Skipping $tool, as it does not support Composer $composer_version. Specify composer:v1 in tools to use $tool"
+    Add-Log $cross $tool "Skipped"
+    Return
+  }
+  if(Test-Path $composer_lock) {
+    Remove-Item -Path $composer_lock -Force
+  }
+  composer global require $prefix$release >$null 2>&1
  $json = findstr $prefix$tool $env:APPDATA\Composer\composer.json
  if(Test-Path $composer_bin\composer) {
    Copy-Item -Path "$bin_dir\composer" -Destination "$composer_bin\composer" -Force
  }
+  Add-ToolsHelper $tool
  if($json) {
    $tool_version = Get-ToolVersion "Write-Output" "$json"
    Add-Log $tick $tool "Added $tool $tool_version"
@ -337,9 +336,12 @@ $bin_dir = $php_dir
 $bintray = 'https://dl.bintray.com/shivammathur/php'
 $github = 'https://github.com'
 $composer_bin = "$env:APPDATA\Composer\vendor\bin"
+$composer_json = "$env:APPDATA\Composer\composer.json"
+$composer_lock = "$env:APPDATA\Composer\composer.lock"
 $current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
-$nightly_version = '8.[0-9]'
+$jit_versions = '8.[0-9]'
+$nightly_versions = '8.[1-9]'
 $cert_source='CurrentUser'
 $enable_extensions = ('openssl', 'curl', 'mbstring')

@ -378,6 +380,8 @@ if($env:RUNNER -eq 'self-hosted') {
  }
 }

+. $dist\..\src\scripts\tools\add_tools.ps1
+
 Add-Printf >$null 2>&1
 Step-Log "Setup PhpManager"
 Install-PSPackage PhpManager PhpManager\PhpManager "$github/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip" >$null 2>&1
@ -395,13 +399,18 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
  if ($version -lt '7.0' -and (Get-InstalledModule).Name -notcontains 'VcRedist') {
    Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" >$null 2>&1
  }
-  if ($version -match $nightly_version) {
-    Invoke-WebRequest -Uri $bintray/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1
-    & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir -Version $version > $null 2>&1
-  } else {
-    Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
-  }
+  try {
+    if ($version -match $nightly_versions) {
+      Invoke-WebRequest -UseBasicParsing -Uri https://github.com/shivammathur/php-builder-windows/releases/latest/download/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1
+      & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir > $null 2>&1
+    } else {
+      Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
+    }
+  } catch { }
 } else {
+  if($version -match $jit_versions) {
+    ('opcache.enable=1', 'opcache.jit_buffer_size=256M', 'opcache.jit=1235') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
+  }
  if($env:update -eq 'true') {
    Update-Php $php_dir >$null 2>&1
    $status = "Updated to"
@ -411,12 +420,20 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
 }

 $installed = Get-Php -Path $php_dir
-('date.timezone=UTC', 'memory_limit=-1') | foreach { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
+if($installed.MajorMinorVersion -ne $version) {
+  Add-Log $cross "PHP" "Could not setup PHP $version"
+  exit 1
+}
+('date.timezone=UTC', 'memory_limit=-1', 'xdebug.mode=coverage') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
 if($version -lt "5.5") {
-  ('libeay32.dll', 'ssleay32.dll') | ForEach { Invoke-WebRequest -Uri $bintray/$_ -OutFile $php_dir\$_ >$null 2>&1 }
+  ('libeay32.dll', 'ssleay32.dll') | ForEach-Object { Invoke-WebRequest -Uri $bintray/$_ -OutFile $php_dir\$_ >$null 2>&1 }
 } else {
  $enable_extensions += ('opcache')
 }
+# Patch till there is a pcov DLL for PHP 8.0 on pecl
+if ($version -eq '8.0') {
+  Invoke-WebRequest -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php$version`_$env:PHPTS`_$arch`_pcov.dll" -OutFile $php_dir"\ext\php`_pcov.dll"
+}
 Enable-PhpExtension -Extension $enable_extensions -Path $php_dir
 Update-PhpCAInfo -Path $php_dir -Source $cert_source
 Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE
--- a/src/tools.ts
+++ b/src/tools.ts
@ -76,93 +76,33 @@ export async function getUri(
  }
 }

-/**
- * Helper function to get the codeception url
- *
- * @param version
- * @param suffix
- */
-export async function getCodeceptionUriBuilder(
-  version: string,
-  suffix: string
-): Promise<string> {
-  return ['releases', version, suffix, 'codecept.phar']
-    .filter(Boolean)
-    .join('/');
-}
-
-/**
- * Function to get the codeception url
- *
- * @param version
- * @param php_version
- */
-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):
-          return 'php56/codecept.phar';
-        case /7\.[2-4]/.test(php_version):
-        default:
-          return 'codecept.phar';
-      }
-    case /(^[4-9]|\d{2,})\..*/.test(version):
-      switch (true) {
-        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 codecept;
-  }
-}
-
 /**
 * Helper function to get script to setup phive
 *
 * @param version
+ * @param php_version
 * @param os_version
 */
 export async function addPhive(
  version: string,
+  php_version: string,
  os_version: string
 ): Promise<string> {
+  switch (true) {
+    case /5\.[3-5]/.test(php_version):
+      return await utils.addLog(
+        '$cross',
+        'phive',
+        'Phive is not supported on PHP ' + php_version,
+        os_version
+      );
+    case /5\.6|7\.0/.test(php_version):
+      version = version.replace('latest', '0.12.1');
+      break;
+    case /7\.1/.test(php_version):
+      version = version.replace('latest', '0.13.5');
+      break;
+  }
  switch (version) {
    case 'latest':
      return (
@ -306,14 +246,10 @@ export async function getWpCliUrl(version: string): Promise<string> {
 export async function addComposer(tools_list: string[]): Promise<string[]> {
  const regex_any = /^composer($|:.*)/;
  const regex_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$|v?\d+\.\d+\.\d+[\w-]*$)/;
-  const regex_composer1_tools = /hirak|prestissimo|narrowspark|composer-prefetcher/;
  const matches: string[] = tools_list.filter(tool => regex_valid.test(tool));
  let composer = 'composer';
  tools_list = tools_list.filter(tool => !regex_any.test(tool));
  switch (true) {
-    case regex_composer1_tools.test(tools_list.join(' ')):
-      composer = 'composer:1';
-      break;
    case matches[0] == undefined:
      break;
    default:
@ -362,7 +298,7 @@ export async function getCleanedToolsList(
      return extension
        .trim()
        .replace(
-          /-agent|behat\/|hirak\/|icanhazstring\/|laravel\/|narrowspark\/automatic-|overtrue\/|phpspec\/|robmorgan\/|symfony\//,
+          /-agent|behat\/|codeception\/|hirak\/|icanhazstring\/|laravel\/|narrowspark\/automatic-|overtrue\/|phpspec\/|robmorgan\/|symfony\//,
          ''
        );
    })
@ -474,6 +410,7 @@ export async function addTools(
        script += await utils.customPackage(tool, 'tools', version, os_version);
        break;
      case 'behat':
+      case 'codeception':
      case 'phpspec':
        script += await addPackage(tool, release, tool + '/', os_version);
        break;
@ -481,12 +418,6 @@ export async function addTools(
        url = await getBlackfirePlayerUrl(version, php_version);
        script += await addArchive(tool, url, os_version, '"-V"');
        break;
-      case 'codeception':
-        url =
-          'https://codeception.com/' +
-          (await getCodeceptionUri(version, php_version));
-        script += await addArchive(tool, url, os_version, '"-V"');
-        break;
      case 'composer':
        url = await getComposerUrl(version);
        script += await addArchive('composer', url, os_version, version);
@ -543,7 +474,7 @@ export async function addTools(
        script += await addPackage(tool, release, 'robmorgan/', os_version);
        break;
      case 'phive':
-        script += await addPhive(version, os_version);
+        script += await addPhive(version, php_version, os_version);
        break;
      case 'php-config':
      case 'phpize':
@ -589,11 +520,18 @@ export async function addTools(
        script += await addArchive('symfony', url, os_version, 'version');
        break;
      case 'vapor-cli':
-        script += await addPackage(tool, release, 'laravel/', os_version);
+      case 'vapor':
+        script += await addPackage(
+          'vapor-cli',
+          release,
+          'laravel/',
+          os_version
+        );
        break;
+      case 'wp':
      case 'wp-cli':
        url = github + (await getWpCliUrl(version));
-        script += await addArchive(tool, url, os_version, '"--version"');
+        script += await addArchive('wp-cli', url, os_version, '"--version"');
        break;
      default:
        script += await utils.addLog(
--- a/src/utils.ts
+++ b/src/utils.ts
@ -1,4 +1,6 @@
+import {IncomingMessage} from 'http';
 import * as fs from 'fs';
+import * as https from 'https';
 import * as path from 'path';
 import * as core from '@actions/core';

@ -41,15 +43,35 @@ export async function getInput(
  }
 }

+/**
+ * Function to fetch an URL
+ *
+ * @param url
+ */
+export async function fetch(url: string): Promise<string> {
+  const fetch_promise: Promise<string> = new Promise(resolve => {
+    const req = https.get(url, (res: IncomingMessage) => {
+      res.setEncoding('utf8');
+      let body = '';
+      res.on('data', chunk => (body += chunk));
+      res.on('end', () => resolve(body));
+    });
+    req.end();
+  });
+  return await fetch_promise;
+}
+
 /**
 * Function to parse PHP version.
 *
 * @param version
 */
 export async function parseVersion(version: string): Promise<string> {
-  switch (version) {
-    case 'latest':
-      return '7.4';
+  const manifest =
+    'https://raw.githubusercontent.com/shivammathur/setup-php/develop/src/configs/php-versions.json';
+  switch (true) {
+    case /^(latest|\d+\.x)$/.test(version):
+      return JSON.parse(await fetch(manifest))[version];
    default:
      switch (true) {
        case version.length > 1:
@ -212,24 +234,23 @@ export async function writeScript(
 /**
 * Function to break extension csv into an array
 *
- * @param extension_csv
+ * @param package_csv
 */
-export async function extensionArray(
-  extension_csv: string
+export async function packageArray(
+  package_csv: string
 ): Promise<Array<string>> {
-  switch (extension_csv) {
+  switch (package_csv) {
    case '':
    case ' ':
      return [];
    default:
-      return extension_csv
+      return package_csv
        .split(',')
-        .map(function (extension: string) {
-          return extension
+        .map(function (package_name: string) {
+          return package_name
            .trim()
            .toLowerCase()
-            .replace('php-', '')
-            .replace('php_', '');
+            .replace(/^php[-_]/, '');
        })
        .filter(Boolean);
  }
@ -248,9 +269,12 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
      return [];
    default:
      return values_csv
-        .split(',')
-        .map(function (value: string) {
-          return value.trim();
+        .split(/,(?=(?:(?:[^"']*["']){2})*[^"']*$)/)
+        .map(function (value) {
+          return value
+            .trim()
+            .replace(/^["']|["']$|(?<==)["']/g, '')
+            .replace(/=(((?!E_).)*[?{}|&~![()^]+((?!E_).)+)/, "='$1'");
        })
        .filter(Boolean);
  }
@ -262,18 +286,11 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
 * @param extension
 */
 export async function getExtensionPrefix(extension: string): Promise<string> {
-  const zend: Array<string> = [
-    'xdebug',
-    'xdebug3',
-    'opcache',
-    'ioncube',
-    'eaccelerator'
-  ];
-  switch (zend.indexOf(extension)) {
+  switch (true) {
    default:
-      return 'zend_extension';
-    case -1:
      return 'extension';
+    case /xdebug([2-3])?$|opcache|ioncube|eaccelerator/.test(extension):
+      return 'zend_extension';
  }
 }

@ -412,7 +429,7 @@ export async function customPackage(
  version: string,
  os_version: string
 ): Promise<string> {
-  const pkg_name: string = pkg.replace(/\d+|pdo[_-]/, '');
+  const pkg_name: string = pkg.replace(/\d+|(pdo|pecl)[_-]/, '');
  const script_extension: string = await scriptExtension(os_version);
  const script: string = path.join(
    __dirname,
Author	SHA1	Message	Date
Shivam Mathur	6e94dfca93	Add support for SAPI setup	2021-03-06 17:40:05 +05:30
Shivam Mathur	7e68292070	Use GitHub releases for libcouchbase 2 on linux	2021-03-06 02:48:36 +05:30
Shivam Mathur	51d5ac37df	Fix cubrid setup on Ubuntu 16.04	2021-03-06 01:55:47 +05:30
Shivam Mathur	51c455198d	Fix gearman setup	2021-03-06 01:55:23 +05:30
Shivam Mathur	b95ad9e061	Add parameters to ppa/lists functions in linux.sh	2021-03-06 01:55:21 +05:30
Shivam Mathur	c9a96cbdd1	Use cached packages for PHP updates on GHR	2021-03-06 01:35:51 +05:30
Shivam Mathur	60a4a89981	Revert to ppa:ondrej/ppa for phalcon3	2021-03-06 01:35:50 +05:30
Shivam Mathur	a36d464b4a	testing	2021-03-06 01:35:49 +05:30
Shivam Mathur	669a423ff1	Fix warning in install.ts	2021-03-03 10:28:50 +05:30
Shivam Mathur	113fcc64e3	Fix docs workflow Do not run docs workflow on macos-11.0 Run docs workflow on saturday	2021-03-03 09:16:13 +05:30
Shivam Mathur	afefcaf556	Update OS/Platform Support in README	2021-03-03 08:23:41 +05:30
Shivam Mathur	df4388ca60	Link libs of updated PHP dependencies on macOS	2021-02-28 19:20:28 +05:30
Shivam Mathur	fa18c2b29f	Remove bintray from manifest and win32.ps1 Fix JIT ini values in win32.ps1	2021-02-23 14:34:03 +05:30
Shivam Mathur	399ab79d14	Improve support for couchbase, pdo_firdbird, pdo_oci and phalcon3 Downgrade husky to 4.x	2021-02-23 13:07:17 +05:30
Shivam Mathur	9601a19811	Bump version to 2.10.0 Update dependencies Fix eslint config	2021-02-22 15:57:16 +05:30
Shivam Mathur	60ff151fc1	Update README	2021-02-22 08:01:32 +05:30
Shivam Mathur	121cb19a65	Fix composer tools setup	2021-02-20 17:54:40 +05:30
Shivam Mathur	739ccacdc4	Refactor tools Improve support for tool aliases	2021-02-20 16:11:20 +05:30
Shivam Mathur	cff0bdeaa3	Use composer for codeception setup	2021-02-19 13:49:58 +05:30
Shivam Mathur	70d858dd49	Add support for msgpack and redis on macOS for PHP 5.6+	2021-02-19 13:49:57 +05:30
Shivam Mathur	3340d60d91	Improve support for pecl_http on linux and macOS	2021-02-19 13:49:56 +05:30
Shivam Mathur	57c17e3349	Add support for pecl_http on Windows for PHP 7.1 to 8.0	2021-02-19 13:49:55 +05:30
Shivam Mathur	356e1a5128	Add support for pecl_http, propro, raphf, xdebug2 and zmq using shivammathur/extensions tap	2021-02-19 13:49:54 +05:30
Shivam Mathur	633920d001	Merge pull request #409 from dingo-d/master Update readme with additional tools support	2021-02-19 13:49:53 +05:30
Shivam Mathur	406f3c410a	Revert "Update brew for all PHP versions until updated on images" This reverts commit `2ea6ca5b36`.	2021-02-19 13:49:52 +05:30
Shivam Mathur	17349dafc1	Improve regexes in extensions.ts	2021-02-19 13:49:51 +05:30
Denis Žoljom	962f570776	Update README.md Add wp-cli to the list of supported tools.	2021-02-19 13:49:50 +05:30
Shivam Mathur	f66ac5d5a6	Merge pull request #399 from alcaeus/allow-github-extension-installs Allow extensions to be compiled from GitHub sources	2021-02-19 13:49:50 +05:30
Andreas Braun	3f466981fc	Address review feedback	2021-02-19 13:49:49 +05:30
Andreas Braun	fd62612e9e	Allow building specific commits	2021-02-19 13:49:42 +05:30
Andreas Braun	26791e8412	Address code review feedback	2021-02-19 13:49:41 +05:30
Andreas Braun	f42065d568	Allow extensions to be compiled from GitHub sources	2021-02-19 13:49:40 +05:30
Shivam Mathur	912f27c42c	Improve regex in utils.parseVersion	2021-02-19 13:49:39 +05:30
Shivam Mathur	86e1ccdd8d	Fix pdo setup	2021-02-19 13:30:02 +05:30
Shivam Mathur	36ec0200a6	Fix cache support for cubrid and pdo_cubrid	2021-02-19 07:18:39 +05:30
Shivam Mathur	1686147b24	Do not quote ini values with error constants	2021-02-04 13:01:05 +05:30
Shivam Mathur	ecc8611061	Update README	2021-02-04 11:00:28 +05:30
Shivam Mathur	abefdb50ee	Fix composer config syntax	2021-02-04 11:00:27 +05:30
Shivam Mathur	2ea6ca5b36	Update brew for all PHP versions until updated on images	2021-02-04 11:00:20 +05:30
Shivam Mathur	a83d4379b1	Fix pcov on PHP 8.0 on Windows	2021-01-19 20:36:17 +05:30
Shivam Mathur	fbc8407035	Add support to specify version in \d.x notation	2021-01-16 11:16:13 +05:30
Shivam Mathur	6972aed899	Add support for quoted csv in ini-values	2021-01-15 13:52:18 +05:30
Shivam Mathur	d2f58713aa	Use GITHUB_ENV to append to PATH	2021-01-07 21:53:45 +05:30
Shivam Mathur	068c794af7	Change Node.js version in the workflow	2021-01-07 00:14:26 +05:30
Shivam Mathur	1e119b6d1a	Fix add_pdo_extension in linux.sh	2021-01-07 00:13:05 +05:30
Shivam Mathur	77721f6637	Make sure tool path is always in PATH	2020-12-26 01:25:36 +05:30
Shivam Mathur	d731e56579	Add support for macOS ARM	2020-12-26 01:25:30 +05:30
Shivam Mathur	e5b90e33c6	Add support for coverage: xdebug2	2020-12-24 18:20:42 +05:30
Shivam Mathur	849315646a	Add support for brewed extensions on PHP 8.0 and 8.1 on macOS	2020-12-24 15:48:35 +05:30
Shivam Mathur	d891a81b7f	Fix add_brew_tap in darwin.sh Fix shellcheck in darwin.sh	2020-12-24 03:34:39 +05:30
Shivam Mathur	5098017251	Update js dependencies	2020-12-21 22:51:36 +05:30
Shivam Mathur	2da85f306f	Add support for specifying ICU version on PHP 8.0	2020-12-19 18:47:19 +05:30
Shivam Mathur	1f94ad201f	Improve symfony example workflows	2020-12-19 18:41:33 +05:30
Shivam Mathur	862f206cd2	Merge pull request #377 from smoqadam/master issue #376 - Install phpunit dependencies before runs the tests	2020-12-19 04:36:39 -08:00
smoqadam	81964ae791	issue #376 - Install phpunit dependencies before runs the tests	2020-12-19 20:18:12 +08:00
Shivam Mathur	b7d1d9c9a9	Adjust $nightly_versions on linux	2020-12-18 22:45:12 +05:30
Shivam Mathur	c5e4d55c3b	Add devtools on self-hosted workflows	2020-12-18 22:40:16 +05:30
Shivam Mathur	d74064b67a	Fix setting xdebug.mode	2020-12-17 21:08:00 +05:30
Shivam Mathur	8862a73fdd	Update Pre-installed PHP in README	2020-12-17 19:03:15 +05:30
Shivam Mathur	7b44f7e007	Fix couchbase on PHP 7.2	2020-12-17 16:29:01 +05:30
Shivam Mathur	ff5499165a	Set JIT related ini values on PHP 8	2020-12-17 14:02:00 +05:30
Shivam Mathur	b3cd6b4dab	Improve pecl support	2020-12-17 12:54:01 +05:30
Shivam Mathur	ce02569aea	Exit on failing to setup PHP	2020-12-17 04:43:16 +05:30
Shivam Mathur	f1c04eb1eb	Update sponsor logos	2020-12-15 16:22:21 +05:30
Shivam Mathur	77aeac1761	Fix logging in add_pdo_extension in linux.sh	2020-12-14 22:33:39 +05:30
Shivam Mathur	569522d50d	Fetch homebrew taps manually	2020-12-14 19:34:32 +05:30
Shivam Mathur	ea8be20255	Improve support for phive	2020-12-14 15:43:12 +05:30
Shivam Mathur	d6f700217a	Fix comments in extensions.ts	2020-12-14 15:42:58 +05:30
Shivam Mathur	1015b3659d	Add support for blackfire on PHP 8	2020-12-14 14:53:27 +05:30
Shivam Mathur	03359ef1ab	Improve README	2020-12-14 14:53:26 +05:30
Shivam Mathur	fd9aae59b0	Add support for geos on unix	2020-12-14 14:53:19 +05:30
Shivam Mathur	9af1e7006f	Use shivammathur/extensions tap for imap and amqp on macOS	2020-12-03 15:01:13 +05:30
Shivam Mathur	5efdcae81a	Use brew for grpc_php_plugin on macOS	2020-12-02 10:09:22 +05:30
Shivam Mathur	f0fb8731a5	Update ini files for all available SAPI	2020-12-02 05:50:56 +05:30
Shivam Mathur	5a15252e66	Fix docs workflow	2020-12-01 08:48:41 +05:30
Shivam Mathur	c0c6e403b6	Merge pull request #347 from shivammathur/develop 2.9.0	2020-11-28 15:08:28 +05:30
Shivam Mathur	d0677c93b9	Bump version to 2.9.0	2020-11-28 15:08:27 +05:30
Shivam Mathur	466908db61	Set 8.0 as the latest version	2020-11-28 15:08:26 +05:30
Shivam Mathur	8dbd6b7684	Improve PECL support	2020-11-28 02:13:43 +05:30
Shivam Mathur	5a40a5875d	Fix xdebug setup Co-authored-by: Owen Voke <development@voke.dev> Co-authored-by: Shivam Mathur <shivam_jpr@hotmail.com>	2020-11-28 02:13:42 +05:30
Shivam Mathur	790a41a722	Fix getting grpc latest tag	2020-11-28 02:13:41 +05:30
Shivam Mathur	62c7ba2bee	Improve darwin.sh	2020-11-28 02:13:36 +05:30
Shivam Mathur	41797e3af9	Prioritize bintray over GitHub releases for scripts	2020-11-25 11:12:07 +05:30
Shivam Mathur	c6150c6a2b	Fix fail-fast in Windows	2020-11-25 05:39:44 +05:30
Shivam Mathur	19b09596c6	Fix fetching extension version from PECL on macOS	2020-11-25 05:32:15 +05:30
Shivam Mathur	4ec398d39a	Fix deleting extensions	2020-11-25 05:23:27 +05:30
Shivam Mathur	6bbaac9c49	Change description in actions.yml	2020-11-24 16:28:41 +05:30
Shivam Mathur	012f269570	Improve README	2020-11-24 11:03:03 +05:30
Shivam Mathur	09222f42ae	Skip prestissimo and composer-prefetcher unless composer:v1 is specified	2020-11-21 11:11:33 +05:30
Shivam Mathur	403191b6b6	Sync dependencies from tap in add_brew_extension	2020-11-21 10:54:39 +05:30