Add support for SAPI setup

Use GitHub releases for libcouchbase 2 on linux
Fix cubrid setup on Ubuntu 16.04
2025-07-04 14:13:16 +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
50 changed files with 9016 additions and 5464 deletions
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@ -6,8 +6,8 @@ The following versions of this project are supported for security updates.

 | Version | Supported          |
 | ------- | ------------------ |
-| 1.11.x  | :white_check_mark: |
-| 2.11.x   | :white_check_mark: |
+| 1.10.x  | :white_check_mark: |
+| 2.8.x   | :white_check_mark: |

 ## Supported PHP Versions

@ -15,6 +15,7 @@ This security policy only applies to the latest patches of the following PHP ver

 | Version | Supported          |
 | ------- | ------------------ |
+| 7.2     | :white_check_mark: |
 | 7.3     | :white_check_mark: |
 | 7.4     | :white_check_mark: |
 | 8.0     | :white_check_mark: |
--- 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 15.x
+      - name: Setup Node.js 14.x
        uses: actions/setup-node@v1
        with:
-          node-version: 15.x
+          node-version: 14.x

      - name: Install dependencies
        run: npm install
@ -48,4 +48,4 @@ jobs:
      - name: Send Coverage
        continue-on-error: true
        timeout-minutes: 1
-        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/lcov.info -n github-actions-codecov-${{ matrix.operating-system }}
+        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}
--- a/2
+++ b/2
@ -1,7 +1,7 @@

 The MIT License (MIT)

-Copyright (c) 2019-2021 shivammathur and contributors
+Copyright (c) 2019-2020 shivammathur and contributors

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@ -66,17 +66,18 @@ Both `GitHub-hosted` and `self-hosted` runners are suppported by `setup-php` on

 |Virtual environment|YAML workflow label|Pre-installed PHP|
 |--- |--- |--- |
-|Ubuntu 16.04 [(deprecated)](https://setup-php.com/i/452)|`ubuntu-16.04`|`PHP 5.6` to `PHP 8.0`|
+|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.x|`macos-11.0`|`PHP 8.0`|
+|macOS Big Sur 11.0|`macos-11.0`|`PHP 8.0`|

 ### Self-Hosted Runners

 |Host OS/Virtual environment|YAML workflow label|
 |--- |--- |
+|Ubuntu 16.04|`self-hosted` or `Linux`|
 |Ubuntu 18.04|`self-hosted` or `Linux`|
 |Ubuntu 20.04|`self-hosted` or `Linux`|
 |Windows 7 and newer|`self-hosted` or `Windows`|
@ -116,7 +117,7 @@ On all supported OS/Platforms the following PHP versions are supported as per th

 PHP extensions can be setup using the `extensions` input. It accepts a `string` in csv-format.

- On `Ubuntu`, extensions which are available as a package, available on `PECL` or a git repository can be set up.
+- 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
@ -126,11 +127,9 @@ PHP extensions can be setup using the `extensions` input. It accepts a `string`
    extensions: imagick, swoole
 ```

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

- On `macOS`, extensions available on `PECL` or a git repository can be set up.
-
- On `Ubuntu` and `macOS` to compile and install an extension from a git repository follow this [guide](https://github.com/shivammathur/setup-php/wiki/Add-extension-from-source "Guide to compile and install PHP extensions in setup-php").
+- On `macOS`, extensions available on `PECL` or hosted on GitHub can be installed.

 - Extensions installed along with PHP if specified are enabled.

@ -164,14 +163,14 @@ PHP extensions can be setup using the `extensions` input. It accepts a `string`
    extensions: :opcache
 ```

- Extension `intl` can be setup with specific `ICU` version for `PHP 5.6` and above 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-69.1
+    extensions: intl-68.2
 ```

 - Extensions loaded by default after `setup-php` runs can be found on the [wiki](https://github.com/shivammathur/setup-php/wiki).
@ -179,7 +178,7 @@ PHP extensions can be setup using the `extensions` input. It accepts a `string`
 - These extensions have custom support:
  - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`.
  - `geos` on `Ubuntu` and `macOS`.
-  - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3` and `phalcon4` on all supported OS.
+  - `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`. 

@ -193,6 +192,18 @@ PHP extensions can be setup using the `extensions` input. It accepts a `string`
    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. It accepts a string in csv-format.
@ -217,16 +228,6 @@ These tools can be setup globally using the `tools` input. It accepts a string i
    tools: composer:v2
 ```

- If you do not use composer in your workflow, you can specify `tools: none` to skip it.
-
-```yaml
- name: Setup PHP without composer
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-    tools: none
-```
-
 - 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.
@ -241,16 +242,6 @@ These tools can be setup globally using the `tools` input. It accepts a string i
    tools: phpunit:8.5.8
 ```

- Any composer tool or package can also be set up globally by specifying it as `vendor/package`. For example to set up `psalm`.
-
-```yaml
- name: Setup PHP with tools
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-    tools: vimeo/psalm
-```
-
 - By default, tools which cannot be set up 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`.

 ```yaml
@ -266,13 +257,13 @@ These tools can be setup globally using the `tools` input. It accepts a string i
 **Notes**
 - Input `tools` is useful to set up tools which you only use in GitHub Actions, thus keeping your `composer.json` tidy.
 - If you do not want to use all your dev-dependencies in GitHub Actions workflow, you can run composer with `--no-dev` and install required tools using `tools` input to speed up your workflow.
- If you have a tool in your `composer.json`, do not set up it with `tools` input as the two instances of the tool might conflict.
+- If you have a tool in your `composer.json`, do not setup it with `tools` input as the two instances of the tool might conflict.

 ## :signal_strength: Coverage Support

 ### Xdebug

-Specify `coverage: xdebug` to use `Xdebug` and disable `PCOV`.  
+Specify `coverage: xdebug` to use `Xdebug`.  
 Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action").

 ```yaml
@ -296,9 +287,10 @@ Runs on all [PHP versions supported](#tada-php-support "List of PHP versions sup

 ### PCOV

-Specify `coverage: pcov` to use `PCOV` and disable `Xdebug`.  
+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
@ -330,7 +322,6 @@ Disable coverage for these reasons:
 - It will remove `Xdebug`, which will have a positive impact on PHP performance.
 - You are using `phpdbg` for running your tests.
 - You are profiling your code using `blackfire`.
- You are using PHP in JIT mode. Please refer to [JIT configuration](#jit-configuration) section for more details.

 ```yaml
 - name: Setup PHP with no coverage driver
@ -619,20 +610,20 @@ jobs:

 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. For example, if you are using `ubuntu-20.04` in your workflow, run `act -P ubuntu-20.04=shivammathur/node:20.04`.
+Choose the image tag which matches the `runs-on` property in your workflow:

 ```bash
 # For runs-on: ubuntu-latest
 act -P ubuntu-latest=shivammathur/node:latest

 # For runs-on: ubuntu-20.04
-act -P ubuntu-20.04=shivammathur/node:2004
+act -P ubuntu-20.04=shivammathur/node:focal

 # For runs-on: ubuntu-18.04
-act -P ubuntu-18.04=shivammathur/node:1804
+act -P ubuntu-18.04=shivammathur/node:bionic

-# For runs-on: ubuntu-16.04 (deprecated)
-act -P ubuntu-16.04=shivammathur/node:1604
+# For runs-on: ubuntu-16.04
+act -P ubuntu-16.04=shivammathur/node:xenial
 ```

 ### JIT Configuration
@ -640,7 +631,6 @@ act -P ubuntu-16.04=shivammathur/node:1604
 > Enable Just-in-time(JIT) on PHP 8.0 and PHP 8.1.

 - To enable JIT, enable `opcache` in cli mode by setting `opcache.enable_cli=1`.
- JIT conflicts with `Xdebug`, `PCOV`, and any other extension which overrides `zend_execute_ex` function, so set `coverage: none` and remove those extensions if added.
 - 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").

@ -651,7 +641,6 @@ For example to enable JIT in `tracing` mode with buffer size of `64 MB`.
  uses: shivammathur/setup-php@v2
  with:
    php-version: '8.0'
-    coverage: none
    ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M
 ```

@ -827,9 +816,9 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.

 ## :bookmark: Versioning

- Use the `v2` tag as `setup-php` version. It is a rolling tag and is synced with the latest minor and patch releases. With `v2` you automatically get the bug fixes, security patches, new features and support for latest PHP releases. For debugging any issues `verbose` tag can be used temporarily. It outputs all the logs and is also synced with the latest releases.
+- Use the `v2` tag as `setup-php` version. It is a rolling tag and is synced with the latest minor and patch releases. With `v2` you automatically get the bug fixes, new features and support for latest PHP releases. For debugging any issues `verbose` tag can be used temporarily. It outputs all the logs and is also synced with the latest releases.
 - Semantic release versions can also be used. It is recommended to [use dependabot](https://docs.github.com/en/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot "Setup Dependabot with GitHub Actions") with semantic versioning to keep the actions in your workflows up to date.
- Commit SHA can also be used, but are not recommended. They have to be updated with every release manually, without which you will not get any bug fixes, security patches or new features. 
+- Commit SHA can also be used, but are not recommended. They have to be updated with every release manually, without which you will not get any bug fixes or new features. 
 - It is highly discouraged to use the `master` branch as version, it might break your workflow after major releases as they have breaking changes.
 - If you are using the `v1` tag or a `1.x.y` version, you should [switch to v2](https://github.com/shivammathur/setup-php/wiki/Switch-to-v2 "Guide for switching from setup-php v1 to v2") as `v1` only gets critical bug fixes. Maintenance support for `v1` will be dropped with the last `PHP 8.0` release.

@ -846,24 +835,24 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
 - See [Contributor's Guide](.github/CONTRIBUTING.md "shivammathur/setup-php contribution guide") before you start.
 - 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").

-*Contributors of `setup-php` and other related projects*
+*Join the list of setup-php contributors*

 <p align="center">
  <a href="https://github.com/shivammathur/setup-php/graphs/contributors">
-    <img src="https://setup-php.com/contributors/?" alt="Contributors of setup-php and related projects" width="100%">
+    <img src="https://opencollective.com/setup-php/contributors.svg?width=1024&button=false" alt="setup-php contributors" width="100%">
  </a>
 </p>

 ## :sparkling_heart: Support This Project

- This project is provided as Free and Open-Source software. We need funds to maintain and do future improvements. Please sponsor setup-php using the below options:
+- 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 about sponsoring setup-php.
+- 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.

-*`setup-php` is generously supported by*
+*Huge thanks to the following companies for supporting `setup-php`*

 <p>
  <a href="https://www.jetbrains.com/?from=setup-php">
@ -887,6 +876,7 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.

 - [Node.js dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Node.js dependencies")
 - [aaronparker/VcRedist](https://github.com/aaronparker/VcRedist "VcRedist PowerShell package")
+- [gplessis/dotdeb-php](https://github.com/gplessis/dotdeb-php "Packaging for end of life PHP versions")
 - [mlocati/powershell-phpmanager](https://github.com/mlocati/powershell-phpmanager "Package to handle PHP on windows")
 - [ppa:ondrej/php](https://launchpad.net/~ondrej/+archive/ubuntu/php "Packaging active PHP packages")
 - [shivammathur/cache-extensions](https://github.com/shivammathur/cache-extensions "GitHub action to help with caching PHP extensions")
--- a/tests/extensions.test.ts
+++ b/tests/extensions.test.ts
@ -154,31 +154,25 @@ describe('Extension tests', () => {
      'linux'
    );
    expect(linux).toContain(
-      'add_extension_from_source mongodb https://github.com mongodb mongo-php-driver master extension'
+      'add_extension_from_github mongodb mongodb mongo-php-driver master'
    );
  });

  it('checking addExtensionOnDarwin', async () => {
    let darwin: string = await extensions.addExtension(
-      'amqp, apcu, Xdebug, pcov, grpc, igbinary, imagick, imap, memcache, memcached, msgpack, phalcon3, phalcon4, protobuf, psr, redis, 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 apcu 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 memcache extension');
-    expect(darwin).toContain('add_brew_extension memcached extension');
    expect(darwin).toContain('add_brew_extension msgpack extension');
-    expect(darwin).toContain('add_brew_extension phalcon3 extension');
-    expect(darwin).toContain('add_brew_extension phalcon4 extension');
    expect(darwin).toContain('add_brew_extension protobuf extension');
-    expect(darwin).toContain('add_brew_extension psr extension');
    expect(darwin).toContain('add_brew_extension redis extension');
    expect(darwin).toContain('add_brew_extension swoole extension');
    expect(darwin).toContain('add_extension sqlite3');
@ -186,6 +180,12 @@ describe('Extension tests', () => {
    expect(darwin).toContain('add_unstable_extension ast beta extension');
    expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');

+    darwin = await extensions.addExtension('phalcon3', '7.0', 'darwin');
+    expect(darwin).toContain('add_phalcon phalcon3');
+
+    darwin = await extensions.addExtension('phalcon4', '7.3', 'darwin');
+    expect(darwin).toContain('add_phalcon phalcon4');
+
    darwin = await extensions.addExtension('couchbase', '5.6', 'darwin');
    expect(darwin).toContain('add_couchbase');

@ -254,7 +254,7 @@ describe('Extension tests', () => {
      'darwin'
    );
    expect(darwin).toContain(
-      'add_extension_from_source mongodb https://github.com mongodb mongo-php-driver master extension'
+      'add_extension_from_github mongodb mongodb mongo-php-driver master'
    );
  });
 });
--- a/tests/install.test.ts
+++ b/tests/install.test.ts
@ -5,55 +5,55 @@ import * as utils from '../src/utils';
 * Mock install.ts
 */
 jest.mock('../src/install', () => ({
-  getScript: jest
-    .fn()
-    .mockImplementation(
-      async (
-        filename: string,
-        version: string,
-        os_version: string
-      ): Promise<string> => {
-        const extension_csv: string = process.env['extensions'] || '';
-        const ini_values_csv: string = process.env['ini-values'] || '';
-        const coverage_driver: string = process.env['coverage'] || '';
-        let tools_csv: string = process.env['tools'] || '';
-        const pecl: string = process.env['pecl'] || '';
-        if (pecl == 'true') {
-          tools_csv = 'pecl, ' + tools_csv;
-        }
-
-        let script = 'initial script ' + filename + version + os_version;
-        if (tools_csv) {
-          script += 'add_tool';
-        }
-        if (extension_csv) {
-          script += 'install extensions';
-        }
-        if (coverage_driver) {
-          script += 'set coverage driver';
-        }
-        if (ini_values_csv) {
-          script += 'edit php.ini';
-        }
-
-        return script;
+  getScript: jest.fn().mockImplementation(
+    async (
+      filename: string,
+      version: string,
+      os_version: string
+    ): Promise<string> => {
+      const extension_csv: string = process.env['extensions'] || '';
+      const ini_values_csv: string = process.env['ini-values'] || '';
+      const coverage_driver: string = process.env['coverage'] || '';
+      let tools_csv: string = process.env['tools'] || '';
+      const pecl: string = process.env['pecl'] || '';
+      if (pecl == 'true') {
+        tools_csv = 'pecl, ' + tools_csv;
      }
-    ),
-  run: jest.fn().mockImplementation(async (): Promise<string> => {
-    const os_version: string = process.env['RUNNER_OS'] || '';
-    const version: string = await utils.parseVersion(
-      await utils.getInput('php-version', true)
-    );
-    const tool = await utils.scriptTool(os_version);
-    const filename = os_version + (await utils.scriptExtension(os_version));
-    return [
-      await install.getScript(filename, version, os_version),
-      tool,
-      filename,
-      version,
-      __dirname
-    ].join(' ');
-  })
+
+      let script = 'initial script ' + filename + version + os_version;
+      if (tools_csv) {
+        script += 'add_tool';
+      }
+      if (extension_csv) {
+        script += 'install extensions';
+      }
+      if (coverage_driver) {
+        script += 'set coverage driver';
+      }
+      if (ini_values_csv) {
+        script += 'edit php.ini';
+      }
+
+      return script;
+    }
+  ),
+  run: jest.fn().mockImplementation(
+    async (): Promise<string> => {
+      const os_version: string = process.env['RUNNER_OS'] || '';
+      const version: string = await utils.parseVersion(
+        await utils.getInput('php-version', true)
+      );
+      const tool = await utils.scriptTool(os_version);
+      const filename = os_version + (await utils.scriptExtension(os_version));
+      return [
+        await install.getScript(filename, version, os_version),
+        tool,
+        filename,
+        version,
+        __dirname
+      ].join(' ');
+    }
+  )
 }));

 /**
--- a/tests/tools.test.ts
+++ b/tests/tools.test.ts
@ -16,7 +16,7 @@ describe('Tools tests', () => {
    expect(await tools.getToolVersion('1.2.3-alpha.1')).toBe('1.2.3-alpha.1');
  });

-  it('checking parseTool', async () => {
+  it('checking parseToolVersion', async () => {
    expect(await tools.parseTool('phpunit')).toStrictEqual({
      name: 'phpunit',
      version: 'latest'
@ -65,10 +65,6 @@ describe('Tools tests', () => {
      name: 'phpunit',
      version: '1.2.3-alpha.1'
    });
-    expect(await tools.parseTool('phpunit/phpunit:^1.2.3')).toStrictEqual({
-      name: 'phpunit/phpunit',
-      version: '^1.2.3'
-    });
  });

  it('checking getUri', async () => {
@ -152,9 +148,9 @@ describe('Tools tests', () => {
      'a',
      'b'
    ]);
-    expect(await tools.addComposer(['a', 'b', 'composer:1.2.3'])).toStrictEqual(
-      ['composer:1.2.3', 'a', 'b']
-    );
+    expect(
+      await tools.addComposer(['a', 'b', 'composer:1.2.3'])
+    ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
    expect(
      await tools.addComposer(['a', 'b', 'composer:v1.2.3'])
    ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
@ -238,6 +234,22 @@ describe('Tools tests', () => {
    );
  });

+  it('checking getCleanedToolsList', async () => {
+    const tools_list: string[] = await tools.getCleanedToolsList(
+      'tool, composer:1.2, behat/behat, icanhazstring/composer-unused, laravel/vapor-cli, robmorgan/phinx, phpspec/phpspec, symfony/flex'
+    );
+    expect(tools_list).toStrictEqual([
+      'composer',
+      'tool',
+      'behat',
+      'composer-unused',
+      'vapor-cli',
+      'phinx',
+      'phpspec',
+      'flex'
+    ]);
+  });
+
  it('checking getWpCliUri', async () => {
    expect(await tools.getWpCliUrl('latest')).toBe(
      'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true'
@ -536,11 +548,9 @@ describe('Tools tests', () => {
    const listOfTools = [
      'composer:v1',
      'codeception/codeception',
-      'prestissimo',
      'hirak/prestissimo',
-      'composer-prefetcher',
      'narrowspark/automatic-composer-prefetcher',
-      'robmorgan/phinx: ^1.2'
+      'robmorgan/phinx'
    ];

    const script: string = await tools.addTools(
@ -553,9 +563,9 @@ describe('Tools tests', () => {
      'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-1.phar,https://getcomposer.org/composer-1.phar composer'
    );
    expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
-    expect(script).toContain('Add-Composertool phinx phinx:^1.2 robmorgan/');
+    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
    expect(script).toContain(
-      'Add-Composertool automatic-composer-prefetcher automatic-composer-prefetcher narrowspark/'
+      'Add-Composertool composer-prefetcher composer-prefetcher narrowspark/automatic-'
    );
  });
  it('checking composer setup', async () => {
@ -583,15 +593,5 @@ describe('Tools tests', () => {
    expect(script).toContain(
      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-snapshot.phar,https://getcomposer.org/composer.phar composer snapshot'
    );
-
-    script = await tools.addTools('none', '7.4', 'linux');
-    expect(script).toStrictEqual('');
-
-    script = await tools.addTools('none, phpunit', '7.4', 'linux');
-    expect(script).toStrictEqual(
-      '\nstep_log "Setup Tools"' +
-        '\nadd_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer latest\n' +
-        '\nadd_tool https://phar.phpunit.de/phpunit.phar phpunit "--version"'
-    );
  });
 });
--- a/tests/utils.test.ts
+++ b/tests/utils.test.ts
@ -8,9 +8,11 @@ jest.mock('@actions/core', () => ({
  })
 }));

-jest.spyOn(utils, 'fetch').mockImplementation(async (url): Promise<string> => {
-  return `{ "latest": "8.0", "5.x": "5.6", "url": "${url}" }`;
-});
+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 => {
@ -105,16 +107,16 @@ describe('Utils tests', () => {
    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 () => {
@ -257,31 +259,4 @@ describe('Utils tests', () => {
      await utils.customPackage('pkg8', 'ext', '1.2.3', 'linux')
    ).toContain(script_path + '\nadd_pkg 1.2.3');
  });
-
-  it('checking parseExtensionSource', async () => {
-    expect(
-      await utils.parseExtensionSource(
-        'ext-org-name/repo-name@release',
-        'extension'
-      )
-    ).toContain(
-      '\nadd_extension_from_source ext https://github.com org-name repo-name release extension'
-    );
-    expect(
-      await utils.parseExtensionSource(
-        'ext-https://sub.domain.tld/org/repo@release',
-        'extension'
-      )
-    ).toContain(
-      '\nadd_extension_from_source ext https://sub.domain.tld org repo release extension'
-    );
-    expect(
-      await utils.parseExtensionSource(
-        'ext-https://sub.domain.XN--tld/org/repo@release',
-        'extension'
-      )
-    ).toContain(
-      '\nadd_extension_from_source ext https://sub.domain.XN--tld org repo release extension'
-    );
-  });
 });
--- a/action.yml
+++ b/action.yml
@ -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/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,15 +1,15 @@
 {
  "name": "setup-php",
-  "version": "2.11.0",
+  "version": "2.10.0",
  "private": false,
  "description": "Setup PHP for use with GitHub Actions",
-  "main": "lib/install.js",
+  "main": "dist/index.js",
  "scripts": {
    "build": "tsc",
    "lint": "eslint **/*.ts --cache --fix",
    "format": "prettier --write **/*.ts && git add .",
    "format-check": "prettier --check **/*.ts",
-    "release": "ncc build -o dist && git add -f dist/",
+    "release": "ncc build src/install.ts -o dist && git add -f dist/",
    "test": "jest"
  },
  "repository": {
@ -24,28 +24,28 @@
  "author": "shivammathur",
  "license": "MIT",
  "dependencies": {
-    "@actions/core": "^1.3.0",
+    "@actions/core": "^1.2.6",
    "@actions/exec": "^1.0.4",
-    "@actions/io": "^1.1.0",
+    "@actions/io": "^1.0.2",
    "fs": "0.0.1-security"
  },
  "devDependencies": {
-    "@types/jest": "^26.0.23",
-    "@types/node": "^15.6.1",
-    "@typescript-eslint/eslint-plugin": "^4.25.0",
-    "@typescript-eslint/parser": "^4.25.0",
-    "@vercel/ncc": "^0.28.6",
-    "eslint": "^7.27.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jest": "^24.3.6",
-    "eslint-plugin-prettier": "^3.4.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.5",
+    "eslint-plugin-prettier": "^3.3.1",
    "husky": "^4.3.8",
-    "jest": "^27.0.3",
-    "jest-circus": "^27.0.3",
-    "prettier": "^2.3.0",
-    "ts-jest": "^27.0.1",
-    "typescript": "^4.3.2"
+    "jest": "^26.6.3",
+    "jest-circus": "^26.6.3",
+    "prettier": "^2.2.1",
+    "ts-jest": "^26.5.1",
+    "typescript": "^4.1.5"
  },
  "husky": {
    "skipCI": true,
--- 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/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
@ -16,19 +16,16 @@ export async function addCoverageXdebug(
  os_version: string,
  pipe: string
 ): Promise<string> {
-  let script = '\n';
-  script +=
-    (await extensions.addExtension(':pcov', version, os_version, true)) + pipe;
-  script +=
+  const xdebug =
    (await extensions.addExtension(extension, version, os_version, true)) +
    pipe;
-  script += await utils.addLog(
+  const log = await utils.addLog(
    '$tick',
    extension,
    'Xdebug enabled as coverage driver',
    os_version
  );
-  return script;
+  return xdebug + '\n' + log;
 }

 /**
@ -46,15 +43,24 @@ export async function addCoveragePCOV(
  let script = '\n';
  switch (true) {
    default:
-      script +=
-        (await extensions.addExtension(':xdebug', version, os_version, true)) +
-        pipe;
      script +=
        (await extensions.addExtension('pcov', version, os_version, true)) +
-        pipe;
+        pipe +
+        '\n';
      script +=
        (await config.addINIValues('pcov.enabled=1', os_version, true)) + '\n';

+      // add command to disable xdebug and enable pcov
+      switch (os_version) {
+        case 'linux':
+        case 'darwin':
+          script += 'remove_extension xdebug' + pipe + '\n';
+          break;
+        case 'win32':
+          script += 'Remove-Extension xdebug' + pipe + '\n';
+          break;
+      }
+
      // success
      script += await utils.addLog(
        '$tick',
@ -91,11 +97,17 @@ export async function disableCoverage(
  pipe: string
 ): Promise<string> {
  let script = '\n';
-  script +=
-    (await extensions.addExtension(':pcov', version, os_version, true)) + pipe;
-  script +=
-    (await extensions.addExtension(':xdebug', version, os_version, true)) +
-    pipe;
+  switch (os_version) {
+    case 'linux':
+    case 'darwin':
+      script += 'remove_extension xdebug' + pipe + '\n';
+      script += 'remove_extension pcov' + pipe + '\n';
+      break;
+    case 'win32':
+      script += 'Remove-Extension xdebug' + pipe + '\n';
+      script += 'Remove-Extension pcov' + pipe + '\n';
+      break;
+  }
  script += await utils.addLog(
    '$tick',
    'none',
@ -121,7 +133,7 @@ export async function addCoverage(
  coverage_driver = coverage_driver.toLowerCase();
  const script: string =
    '\n' + (await utils.stepLog('Setup Coverage', os_version));
-  const pipe: string = (await utils.suppressOutput(os_version)) + '\n';
+  const pipe: string = await utils.suppressOutput(os_version);
  switch (coverage_driver) {
    case 'pcov':
      return script + (await addCoveragePCOV(version, os_version, pipe));
--- a/src/extensions.ts
+++ b/src/extensions.ts
@ -10,35 +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 extensions for compiling from source
-      case /.+-.+\/.+@.+/.test(extension):
-        add_script += await utils.parseExtensionSource(extension, ext_prefix);
-        return;
      // match 5.3blackfire...8.0blackfire
      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
-      // match couchbase, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...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
      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
        version_extension
      ):
-      case /^couchbase$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
+      case /^couchbase$|^pdo_oci$|^oci8$|^http|^pecl_http|^pdo_firebird$/.test(
        extension
      ):
-      case /^(5\.[3-6]|7\.[0-4])ioncube$/.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):
        add_script += await utils.customPackage(
          ext_name,
          'ext',
@ -55,6 +53,19 @@ 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(extension):
        add_script += await utils.joins(
@ -68,15 +79,14 @@ 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.6 and newer - amqp, apcu, grpc, igbinary, imagick, imap, msgpack, protobuf, raphf, redis, swoole, xdebug, xdebug2, zmq
-      // match 7.1 and newer - pcov
-      // match 5.6 to 7.4 - propro
-      case /(?<!5\.[3-5])(amqp|apcu|grpc|igbinary|imagick|imap|memcache|memcached|msgpack|protobuf|psr|raphf|redis|swoole|xdebug|xdebug2|zmq)/.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 /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension):
-      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
+      case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
        add_script += await utils.joins(
          '\nadd_brew_extension',
          ext_name,
@ -105,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) {
@ -127,9 +137,9 @@ export async function addExtensionWindows(
        version_extension
      ):
      case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
-      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_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)(pecl_)?http/.test(version_extension):
+      case /^(7\.[1-4]|8\.0)(http|pecl_http)$/.test(version_extension):
        add_script += await utils.customPackage(
          ext_name,
          'ext',
@ -145,7 +155,8 @@ export async function addExtensionWindows(
          ext_version.replace('stable', '')
        );
        break;
-      // match extensions for compiling from source
+      // 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,
@ -182,15 +193,17 @@ export async function addExtensionWindows(
      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
        add_script += await utils.getUnsupportedLog('pcov', version, 'win32');
        break;
-      // match 5.3 to 5.6 - mysql, mysqli, mysqlnd
-      case /^5\.[3-6](?<!pdo_)(mysql|mysqli|mysqlnd)$/.test(version_extension):
+      // match 5.3mysql..5.6mysql
+      // match 5.3mysqli..5.6mysqli
+      // match 5.3mysqlnd..5.6mysqlnd
+      case /^5\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
        add_script +=
          '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
        break;
-      // match 7.0 and newer mysql, mysqli and mysqlnd
-      case /(?<!5\.[3-6])(?<!pdo_)(mysql|mysqli|mysqlnd)$/.test(
-        version_extension
-      ):
+      // 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):
        add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
        break;
      // match sqlite
@ -216,41 +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 extensions for compiling from source
-      case /.+-.+\/.+@.+/.test(extension):
-        add_script += await utils.parseExtensionSource(extension, ext_prefix);
-        return;
      // match 5.3blackfire...8.0blackfire
      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
      // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
-      // match couchbase, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...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...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 /^couchbase$|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
+      case /^couchbase$|^pdo_oci$|^oci8$|^http|^pecl_http|^pdo_firebird$/.test(
        extension
      ):
-      case /(?<!5\.[3-5])intl-[\d]+\.[\d]+$/.test(version_extension):
-      case /^(5\.[3-6]|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\.[3-6]|7\.[0-4]|8\.[0-9])gearman$/.test(version_extension):
        add_script += await utils.customPackage(
          ext_name,
          'ext',
@ -267,6 +279,19 @@ 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(extension):
        add_script += await utils.joins(
--- a/src/install.ts
+++ b/src/install.ts
@ -3,6 +3,7 @@ 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';

@ -26,10 +27,13 @@ export async function getScript(
  const ini_values_csv: string = await utils.getInput('ini-values', false);
  const coverage_driver: string = await utils.getInput('coverage', false);
  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);
  }
@ -51,11 +55,6 @@ export async function getScript(
 */
 export async function run(): Promise<void> {
  try {
-    if ((await utils.readEnv('ImageOS')) == 'ubuntu16') {
-      core.warning(
-        'Ubuntu 16.04 is deprecated.\nPlease upgrade to Ubuntu 18.04 or Ubuntu 20.04 - https://setup-php.com/i/452'
-      );
-    }
    const version: string = await utils.parseVersion(
      await utils.getInput('php-version', true)
    );
--- 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
@ -12,7 +12,7 @@ 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 jsdeliver="https://cdn.jsdelivr.net/gh/shivammathur"
+export bintray="https://dl.bintray/shivammathur"

 # Function to log start of a operation.
 step_log() {
@ -29,15 +29,18 @@ add_log() {
    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"
-    [ "$fail_fast" = "true" ] && exit 1
+    [ "$fail_fast" = "true" ] && exit 1;
  fi
 }

 # Function to log result of installing extension.
 add_extension_log() {
+  extension=$1
+  status=$2
+  extension_name=$(echo "$extension" | cut -d '-' -f 1)
  (
-    check_extension "$(echo "$1" | cut -d '-' -f 1)" && add_log "$tick" "$1" "$2"
-  ) || add_log "$cross" "$1" "Could not install $1 on PHP ${semver:?}"
+    check_extension "$extension_name" && add_log "$tick" "$extension_name" "$status"
+  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP ${semver:?}"
 }

 # Function to read env inputs.
@ -70,22 +73,18 @@ get() {
  fi
 }

-# Function to download and run scripts from GitHub releases with jsdeliver fallback.
+# Function to download and run scripts from GitHub releases with bintray fallback.
 run_script() {
  repo=$1
  shift
  args=("$@")
-  get -q -e /tmp/install.sh "$github/$repo/$latest/install.sh" "$jsdeliver/$1@main/scripts/install.sh"
+  get -q -e /tmp/install.sh "$github/$repo/$latest/install.sh" "$bintray/php/$repo.sh"
  bash /tmp/install.sh "${args[@]}"
 }

 # Function to install required packages on self-hosted runners.
 self_hosted_setup() {
  if [ "$runner" = "self-hosted" ]; then
-    if [ "$DISTRIB_RELEASE" = "16.04" ] && [ "$CONTAINER" != "shivammathur/node" ]; then
-      add_log "$cross" "Ubuntu" "Ubuntu 16.04 (Xenial Xerus) is no longer supported on self-hosted runner"
-      exit 1
-    fi
    if [[ "${version:?}" =~ $old_versions ]]; then
      add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
      exit 1
@ -105,33 +104,12 @@ check_extension() {
  fi
 }

-# Function to enable cached extensions.
-enable_cache_extension() {
-  deps=()
-  for ext in /tmp/extcache/"$1"/*; do
-    deps+=("$(basename "$ext")")
-  done
-  if [ "x${deps[*]}" = "x" ]; then
-    sudo rm -rf /tmp/extcache/"$1"
-    enable_extension "$1" "$2"
-  else
-    deps+=("$1")
-    if php "${deps[@]/#/-d ${2}=}" -m 2>/dev/null | grep -i -q "$1"; then
-      for ext in "${deps[@]}"; do
-        sudo rm -rf /tmp/extcache/"$ext"
-        enable_extension "$ext" "$2"
-      done
-    fi
-  fi
-}
-
 # Function to enable existing extensions.
 enable_extension() {
-  modules_dir="/var/lib/php/modules/$version"
-  [ -d "$modules_dir" ] && sudo find "$modules_dir" -path "*disabled*$1" -delete
-  if [ -d /tmp/extcache/"$1" ]; then
-    enable_cache_extension "$1" "$2"
-  elif ! check_extension "$1" && [ -e "${ext_dir:?}/$1.so" ]; then
+  if [ -e /tmp/setup_php_dismod ] && grep -q "$1" /tmp/setup_php_dismod; then
+    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" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null
  fi
 }
@ -148,6 +126,9 @@ configure_php() {
 # Function to configure PECL.
 configure_pecl() {
  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" channel-update "$script".php.net
@ -172,30 +153,10 @@ get_pecl_version() {
 # Function to install PECL extensions and accept default options
 pecl_install() {
  local extension=$1
-  add_pecl >/dev/null 2>&1
+  configure_pecl >/dev/null 2>&1
  yes '' 2>/dev/null | sudo pecl install -f "$extension" >/dev/null 2>&1
 }

-# Function to install a specific version of PECL extension.
-add_pecl_extension() {
-  extension=$1
-  pecl_version=$2
-  prefix=$3
-  enable_extension "$extension" "$prefix"
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
-    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
-  fi
-  ext_version=$(php -r "echo phpversion('$extension');")
-  if [ "$ext_version" = "$pecl_version" ]; then
-    add_log "${tick:?}" "$extension" "Enabled"
-  else
-    disable_extension "$extension" >/dev/null 2>&1
-    delete_extension "$extension" >/dev/null 2>&1
-    pecl_install "$extension-$pecl_version"
-    add_extension_log "$extension-$pecl_version" "Installed and enabled"
-  fi
-}
-
 # Function to setup pre-release extensions using PECL.
 add_unstable_extension() {
  extension=$1
@ -209,8 +170,7 @@ add_unstable_extension() {
 get_tool_version() {
  tool=$1
  param=$2
-  alp="[a-zA-Z0-9]"
-  version_regex="[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
+  version_regex="[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-zA-Z0-9]+){0,1}"
  if [ "$tool" = "composer" ]; then
    if [ "$param" != "snapshot" ]; then
      composer_version="$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")"
@ -233,12 +193,11 @@ configure_composer() {
    exit 1
  fi
  if ! [ -e "$composer_json" ]; then
-    sudo mkdir -p "$(dirname "$composer_json")"
-    echo '{}' | tee "$composer_json" >/dev/null
+    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"
+  echo "$composer_bin" >> "$GITHUB_PATH"
  if [ -n "$COMPOSER_TOKEN" ]; then
    composer -q config -g github-oauth.github.com "$COMPOSER_TOKEN"
  fi
@ -250,14 +209,14 @@ add_tool() {
  tool=$2
  ver_param=$3
  tool_path="$tool_path_dir/$tool"
-  if ! [[ "$PATH" =~ $tool_path_dir ]]; then
+  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
-  IFS="," read -r -a url <<<"$url"
+  IFS="," read -r -a url <<< "$url"
  status_code=$(get -v -e "$tool_path" "${url[@]}")
  if [ "$status_code" != "200" ] && [[ "${url[0]}" =~ .*github.com.*releases.*latest.* ]]; then
    url[0]="${url[0]//releases\/latest\/download/releases/download/$(get -s -n "" "$(echo "${url[0]}" | cut -d '/' -f '1-5')/releases" | grep -Eo -m 1 "([0-9]+\.[0-9]+\.[0-9]+)/$(echo "${url[0]}" | sed -e "s/.*\///")" | cut -d '/' -f 1)}"
@ -287,10 +246,10 @@ add_composertool() {
  fi
  (
    sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
-    composer global require "$prefix$release" 2>&1 | tee /tmp/composer.log >/dev/null 2>&1
-    log=$(grep "$prefix$tool" /tmp/composer.log) &&
-      tool_version=$(get_tool_version 'echo' "$log") &&
-      add_log "$tick" "$tool" "Added $tool $tool_version"
+    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
@ -298,9 +257,11 @@ add_composertool() {
  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.
@ -311,3 +272,23 @@ php_src_tag() {
  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
@ -7,24 +7,12 @@ self_hosted_helper() {
  fi
 }

-# Function to delete extension.
-delete_extension() {
-  extension=$1
-  sudo rm -rf "${scan_dir:?}"/*"$extension"* "${ext_dir:?}"/"$extension".so >/dev/null 2>&1
-}
-
-# Function to disable extension.
-disable_extension() {
-  extension=$1
-  sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}"
-}
-
 # Function to remove extensions.
 remove_extension() {
  extension=$1
  if check_extension "$extension"; then
-    disable_extension "$extension"
-    delete_extension "$extension"
+    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:?}"
  else
@ -32,7 +20,26 @@ remove_extension() {
  fi
 }

-# Function to fetch a brew tap.
+# Function to install a specific version of PECL extension.
+add_pecl_extension() {
+  extension=$1
+  pecl_version=$2
+  prefix=$3
+  enable_extension "$extension" "$prefix"
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
+    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
+  fi
+  ext_version=$(php -r "echo phpversion('$extension');")
+  if [ "$ext_version" = "$pecl_version" ]; then
+    add_log "${tick:?}" "$extension" "Enabled"
+  else
+    remove_extension "$extension" >/dev/null 2>&1
+    pecl_install "$extension-$pecl_version"
+    add_extension_log "$extension-$pecl_version" "Installed and enabled"
+  fi
+}
+
+# Function to fetch a brew tap
 fetch_brew_tap() {
  tap=$1
  tap_user=$(dirname "$tap")
@ -71,14 +78,13 @@ add_brew_extension() {
    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
-    update_dependencies >/dev/null 2>&1
-    brew install -f "$formula@$version" >/dev/null 2>&1
+    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
 }

-# Function to setup extensions.
+# Function to setup extensions
 add_extension() {
  extension=$1
  prefix=$2
@ -86,7 +92,7 @@ add_extension() {
  if check_extension "$extension"; then
    add_log "${tick:?}" "$extension" "Enabled"
  else
-    [[ "$version" =~ 5.[4-5] ]] && [ "$extension" = "imagick" ] && brew install -f pkg-config imagemagick >/dev/null 2>&1
+    [[ "$version" =~ 5.[4-5] ]] && [ "$extension" = "imagick" ] && brew install pkg-config imagemagick >/dev/null 2>&1
    pecl_install "$extension" >/dev/null 2>&1 &&
      if [[ "$version" =~ ${old_versions:?} ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
    add_extension_log "$extension" "Installed and enabled"
@ -101,106 +107,63 @@ add_devtools() {

 # Function to handle request to add PECL.
 add_pecl() {
-  configure_pecl >/dev/null 2>&1
  pecl_version=$(get_tool_version "pecl" "version")
  add_log "${tick:?}" "PECL" "Found PECL $pecl_version"
 }

-# Function to link all libraries of a formula.
+# Function to link all libraries of a formula
 link_libraries() {
  formula=$1
  formula_prefix="$(brew --prefix "$formula")"
  sudo mkdir -p "$formula_prefix"/lib
-  for lib in "$formula_prefix"/lib/*.dylib; do
-    lib_name=$(basename "$lib")
-    sudo cp -a "$lib" "$brew_prefix/lib/$lib_name" 2>/dev/null || true
-  done
+  sudo cp -a "$formula_prefix"/lib/*.dylib "$brew_prefix/lib" 2>/dev/null || true
 }

-# Patch brew to overwrite packages.
-patch_brew() {
-  formula_installer="$brew_repo"/Library/Homebrew/formula_installer.rb
-  code=" keg.link(verbose: verbose?"
-  sudo sed -i '' "s/$code)/$code, overwrite: true)/" "$formula_installer"
-  # shellcheck disable=SC2064
-  trap "sudo sed -i '' 's/$code, overwrite: true)/$code)/' $formula_installer" exit
-}
-
-# Helper function to update the dependencies.
 update_dependencies_helper() {
-  dependency=$1
-  get -q -n "$tap_dir/homebrew/homebrew-core/Formula/$dependency.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$dependency.rb"
-  link_libraries "$dependency"
+  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 ! [ -e /tmp/update_dependencies ] && [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
-    patch_brew
-    while read -r dependency; do
-      update_dependencies_helper "$dependency" &
+  if [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
+    while read -r formula; do
+      update_dependencies_helper "$formula" &
      to_wait+=($!)
    done <"$tap_dir/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
    wait "${to_wait[@]}"
-
-    # Remove when PCRE2 on macOS images is updated to PCRE2 10.37
-    brew reinstall pcre2 >/dev/null 2>&1
-
-    echo '' | sudo tee /tmp/update_dependencies >/dev/null 2>&1
-  fi
-}
-
-# Function to fix dependencies on install PHP version.
-fix_dependencies() {
-  broken_deps_paths=$(php -v 2>&1 | grep -Eo '/opt/[a-zA-Z0-9@\.]+')
-  if [ "x$broken_deps_paths" != "x" ]; then
-    update_dependencies
-    IFS=" " read -r -a formulae <<< "$(echo "$broken_deps_paths" | tr '\n' ' ' | sed 's|/opt/||g' 2>&1)$php_formula"
-    brew reinstall "${formulae[@]}"
-    brew link --force --overwrite "$php_formula" || true
-  fi
-}
-
-# Function to get PHP version if it is already installed using Homebrew.
-get_brewed_php() {
-  php_cellar="$brew_prefix"/Cellar/php
-  if [ -d "$php_cellar" ] && ! [[ "$(find "$php_cellar" -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]]; then
-    php-config --version 2>/dev/null | cut -c 1-3
-  else
-    echo 'false';
  fi
 }

 # Function to setup PHP 5.6 and newer using Homebrew.
 add_php() {
  action=$1
-  existing_version=$2
  add_brew_tap shivammathur/homebrew-php
  update_dependencies
-  if [ "$existing_version" != "false" ]; then
-    ([ "$action" = "upgrade" ] && brew upgrade -f "$php_formula") || brew unlink "$php_formula"
+  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 install -f "$php_formula"
+    brew upgrade "shivammathur/php/php@$version" 2>/dev/null || brew install "shivammathur/php/php@$version"
  fi
-  brew link --force --overwrite "$php_formula"
+  brew link --force --overwrite shivammathur/php/php@"$version"
 }

-# Function to Setup PHP.
+# Function to Setup PHP
 setup_php() {
  step_log "Setup PHP"
-  existing_version=$(get_brewed_php)
+  existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
  if [[ "$version" =~ ${old_versions:?} ]]; then
    run_script "php5-darwin" "${version/./}" >/dev/null 2>&1
    status="Installed"
  elif [ "$existing_version" != "$version" ]; then
-    add_php "install" "$existing_version" >/dev/null 2>&1
+    add_php "install" >/dev/null 2>&1
    status="Installed"
  elif [ "$existing_version" = "$version" ] && [ "${update:?}" = "true" ]; then
-    add_php "upgrade" "$existing_version" >/dev/null 2>&1
+    add_php "upgrade" >/dev/null 2>&1
    status="Updated to"
  else
    status="Found"
-    fix_dependencies >/dev/null 2>&1
  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:?}"
@ -220,7 +183,6 @@ setup_php() {
 # Variables
 version=$1
 dist=$2
-php_formula=shivammathur/php/php@"$version"
 brew_prefix="$(brew --prefix)"
 brew_repo="$(brew --repository)"
 tap_dir="$brew_repo"/Library/Taps
@ -231,7 +193,6 @@ export HOMEBREW_NO_AUTO_UPDATE=1
 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1

 # shellcheck source=.
-. "${scripts:?}"/ext/source.sh
 . "${scripts:?}"/tools/add_tools.sh
 . "${scripts:?}"/common.sh
 read_env
--- a/src/scripts/ext/blackfire.ps1
+++ b/src/scripts/ext/blackfire.ps1
@ -10,11 +10,7 @@ Function Add-Blackfire() {
    $no_dot_version = $version.replace('.', '')
    $extension_version = $extension.split('-')[1]
    if ($extension_version -notmatch "\S") {
-        if($version -lt '7.0') {
-            $extension_version = '1.50.0'
-        } else {
-            $extension_version = (Invoke-RestMethod https://blackfire.io/api/v1/releases).probe.php
-        }
+        $extension_version = (Invoke-RestMethod https://blackfire.io/api/v1/releases).probe.php
    }
    if (Test-Path $ext_dir\blackfire.dll) {
        Enable-PhpExtension -Extension blackfire -Path $php_dir
--- a/src/scripts/ext/blackfire.sh
+++ b/src/scripts/ext/blackfire.sh
@ -8,11 +8,7 @@ add_blackfire() {
  blackfire_ini_file="${pecl_file:-${ini_file[@]}}"
  if [ ! -e "${ext_dir:?}/blackfire.so" ]; then
    if [ "$extension_version" = "blackfire" ]; then
-      if [[ ${version:?} =~ 5.[3-6] ]]; then
-        extension_version='1.50.0'
-      else
-        extension_version=$(get -s -n "" https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
-      fi
+      extension_version=$(get -s -n "" https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
    fi
    get -q -n "${ext_dir:?}/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_amd64-php-"$no_dot_version".so >/dev/null 2>&1
  fi
--- a/src/scripts/ext/couchbase.sh
+++ b/src/scripts/ext/couchbase.sh
@ -1,17 +1,22 @@
 # Function to install libraries required by couchbase
 add_couchbase_libs() {
  if [ "$(uname -s)" = "Linux" ]; then
-    trunk="https://github.com/couchbase/libcouchbase/releases"
    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
-      release="$(curl -sL $trunk/latest | grep -Eo "libcouchbase-[0-9]+\.[0-9]+\.[0-9]+" | head -n 1 | cut -d'-' -f 2)"
+      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
-    deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${DISTRIB_RELEASE/./}_${DISTRIB_CODENAME}_amd64.tar"
-    get -q -n /tmp/libcouchbase.tar "$deb_url"
-    sudo tar -xf /tmp/libcouchbase.tar -C /tmp
-    install_packages libev4 libevent-dev
-    sudo dpkg -i /tmp/libcouchbase-*/*.deb
+    ${apt_install:?} libcouchbase-dev
  else
    if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
      brew install libcouchbase@2
--- a/src/scripts/ext/cubrid.sh
+++ b/src/scripts/ext/cubrid.sh
@ -40,11 +40,16 @@ add_cubrid_helper() {
    set_cubrid_repo
    set_cubrid_branch
    [ "$DISTRIB_RELEASE" = "16.04" ] && setup_compiler
-    patch_phpize
-    read -r "${ext}_PREFIX_CONFIGURE_OPTS" <<< "CFLAGS=-Wno-implicit-function-declaration"
-    read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config)"
-    add_extension_from_source "$ext" https://github.com CUBRID "$cubrid_repo" "$cubrid_branch" extension
-    restore_phpize
+    (
+      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
+      sudo ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=shared
+      make -j"$(nproc)"
+      sudo make install
+    )
+    echo "extension=$ext.so" | sudo tee "${scan_dir:?}/$ext.ini"
  fi
 }

@ -55,7 +60,4 @@ add_cubrid() {
  add_cubrid_helper "$ext" >/dev/null 2>&1
  add_extension_log "$ext" "$status"
  check_extension "$ext" && add_license_log
-}
-
-# shellcheck source=.
-. "${scripts:?}"/ext/patches/phpize.sh
+}
--- a/src/scripts/ext/firebird.sh
+++ b/src/scripts/ext/firebird.sh
@ -10,10 +10,18 @@ add_firebird_client_darwin() {
 add_firebird_helper() {
  firebird_dir=$1
  tag="$(php_src_tag)"
-  export PDO_FIREBIRD_CONFIGURE_OPTS="--with-pdo-firebird=$firebird_dir"
-  export PDO_FIREBIRD_LINUX_LIBS="firebird-dev"
-  export PDO_FIREBIRD_PATH="ext/pdo_firebird"
-  add_extension_from_source pdo_firebird https://github.com php php-src "$tag" extension get
+  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() {
@ -21,6 +29,10 @@ add_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
--- a/src/scripts/ext/geos.sh
+++ b/src/scripts/ext/geos.sh
@ -1,12 +1,46 @@
+# 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() {
-  export GEOS_LINUX_LIBS='libgeos-dev'
-  export GEOS_DARWIN_LIBS='geos'
-  add_extension_from_source geos https://github.com libgeos php-geos 1.0.0 extension get
+  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"
--- a/src/scripts/ext/http.sh
+++ b/src/scripts/ext/http.sh
@ -19,30 +19,48 @@ enable_http() {
  fi
 }

-# Function to install extensions.
-add_extension_helper() {
-  if [ "$os" = "Linux" ]; then
-    add_extension "$1" extension
-  else
-    add_brew_extension "$1" extension
-  fi
-}
-
-# Function to install http dependencies.
-add_http_dependencies() {
+# 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_helper propro
-    add_extension_helper raphf
+  elif [[ ${version:?} =~ 5.6|7.[0-4] ]]; then  
+    add_extension propro extension
+    add_extension raphf extension
  else
-    add_extension_helper raphf
+    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" )
@ -57,31 +75,59 @@ get_http_configure_opts() {
  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
-  http_opts=() && get_http_configure_opts
-  export HTTP_PREFIX_CONFIGURE_OPTS="CFLAGS=-Wno-implicit-function-declaration"
-  http_configure_opts="--with-http --with-php-config=$(command -v php-config) ${http_opts[*]}"
-  export HTTP_CONFIGURE_OPTS="$http_configure_opts"
-  export HTTP_LINUX_LIBS="zlib1g libbrotli-dev libcurl4-openssl-dev libevent-dev libicu-dev libidn2-dev"
-  export HTTP_DARWIN_LIBS="brotli curl icu4c libevent libidn2"
-  if [[ "${version:?}" =~ ${nightly_versions:?} ]]; then
-    add_extension_from_source http https://github.com m6w6 ext-http master extension
-  else
-    add_extension_from_source pecl_http https://pecl.php.net http http "${ext##*-}" extension pecl
-  fi
+  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
-    add_http_dependencies
    if [ "$os" = "Linux" ]; then
      if ! [[ "${version:?}" =~ ${old_versions:?}|${nightly_versions:?} ]]; then
-        install_packages "php$version-http"
+        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
@ -97,6 +143,7 @@ add_http_latest() {
 # 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
@ -108,13 +155,12 @@ add_http_version() {
 # Function to setup http extension
 add_http() {
  ext=$1
+  os="$(uname -s)"
  status="Enabled"
  if [[ "$ext" =~ ^(pecl_http|http)$ ]]; then
-    add_http_latest >/dev/null 2>&1
+    add_http_latest "$os" >/dev/null 2>&1
  else
-    add_http_version "$ext" >/dev/null 2>&1
+    add_http_version "$ext" "$os" >/dev/null 2>&1
  fi
  add_extension_log "http" "$status"
 }
-
-os="$(uname -s)"
--- a/src/scripts/ext/intl.sh
+++ b/src/scripts/ext/intl.sh
@ -2,7 +2,7 @@
 install_icu() {
  icu=$1
  if [ "$(php -i | grep "ICU version =>" | sed -e "s|.*=> s*||")" != "$icu" ]; then
-    get -q -n /tmp/icu.tar.zst "https://github.com/shivammathur/icu-intl/releases/download/icu4c/icu4c-$icu.tar.zst"
+    get -q -n /tmp/icu.tar.zst "https://dl.bintray.com/shivammathur/icu4c/icu4c-$icu.tar.zst"
    sudo tar -I zstd -xf /tmp/icu.tar.zst -C /usr/local
    sudo cp -r /usr/local/icu/lib/* /usr/lib/x86_64-linux-gnu/
  fi
@ -11,12 +11,12 @@ install_icu() {
 # Function to add ext-intl with the given version of ICU
 add_intl() {
  icu=$(echo "$1" | cut -d'-' -f 2)
-  supported_version=$(get -s -n "" https://api.github.com/repos/shivammathur/icu-intl/releases | grep -Po "${icu//./\\.}" | head -n 1)
+  supported_version=$(get -s -n "" https://api.bintray.com/packages/shivammathur/icu4c/icu4c | grep -Po "$icu" | head -n 1)
  if [ "$icu" != "$supported_version" ]; then
    add_log "${cross:?}" "intl" "ICU $icu is not supported"
  else
    install_icu "$icu" >/dev/null 2>&1
-    get -q -n "${ext_dir:?}/intl.so" "https://github.com/shivammathur/icu-intl/releases/download/intl/php${version:?}-intl-$icu.so"
+    get -q -n "${ext_dir:?}/intl.so" "https://dl.bintray.com/shivammathur/icu4c/php${version:?}-intl-$icu.so"
    enable_extension intl extension
    add_extension_log intl "Installed and enabled with ICU $icu"
  fi
--- a/src/scripts/ext/oci.sh
+++ b/src/scripts/ext/oci.sh
@ -9,8 +9,8 @@ add_license_log() {

 # Function to install instantclient and SDK.
 add_client() {
+  sudo mkdir -p -m 777 "$oracle_home"
  if [ ! -e "$oracle_client" ]; then
-    sudo mkdir -p -m 777 "$oracle_home" "$oracle_client"
    for package in basiclite sdk; do
      if [ "$os" = 'Linux' ]; then
        libs='/usr/lib/'
@ -24,12 +24,57 @@ add_client() {
        lib_ext='dylib'
      fi
      get -q -n "/opt/oracle/$package.zip" "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-$arch.zip"
-      unzip -o "/opt/oracle/$package.zip" -d "$oracle_home"
+      unzip "/opt/oracle/$package.zip" -d "$oracle_home"
    done
-    for icdir in /opt/oracle/instantclient_*; do
-      sudo mv "$icdir"/* "$oracle_client"/
-    done
-    sudo ln -sf /opt/oracle/instantclient/*.$lib_ext* $libs
+    sudo ln -sf /opt/oracle/instantclient*/*.$lib_ext* $libs
+    sudo ln -sf /opt/oracle/instantclient* "$oracle_client"
+  fi
+}
+
+# Function to get PHP source.
+get_php() {
+  [ ! -d "/opt/oracle/php-src-$tag" ] && get -s -n "" "https://github.com/php/php-src/archive/$tag.tar.gz" | tar xzf - -C "$oracle_home/"
+}
+
+# Function to get phpize location on darwin.
+get_phpize() {
+  if [[ "${version:?}" =~ 5.[3-5] ]]; then
+    echo '/opt/local/bin/phpize'
+  else
+    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
+  fi
+}
+
+# Function to patch phpize to link to php headers on darwin.
+patch_phpize() {
+  if [ "$os" = "Darwin" ]; then
+    sudo cp "$phpize_orig" "$phpize_orig.bck"
+    sudo sed -i '' 's~includedir=.*~includedir="$(xcrun --show-sdk-path)/usr/include/php"~g' "$phpize_orig"
+  fi
+}
+
+# Function to restore phpize.
+restore_phpize() {
+  if [ "$os" = "Darwin" ]; then
+    sudo mv "$phpize_orig.bck" "$phpize_orig" || true
+  fi
+}
+
+# Function to patch pdo_oci.
+patch_pdo_oci_config() {
+  get -q -n config.m4 https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
+  if [[ ${version:?} =~ 5.[3-6] ]]; 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
+}
+
+# Function to install the dependencies.
+add_dependencies() {
+  if [ "$os" = 'Linux' ]; then
+    if [ "${runner:?}" = "self-hosted" ]; then
+      ${apt_install:?} --no-upgrade --no-install-recommends libaio-dev
+    fi
+    ! [[ ${version:?} =~ $nightly_versions ]] && add_devtools phpize
  fi
 }

@ -37,13 +82,20 @@ add_client() {
 add_oci_helper() {
  if ! [ -e "${ext_dir:?}/$ext.so" ]; then
    status='Installed and enabled'
-    read -r "${ext}_LINUX_LIBS" <<< "libaio-dev"
-    read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client"
-    read -r "${ext}_PATH" <<< "ext/$ext"
+    phpize_orig=$(get_phpize)
+    tag=$(php_src_tag)
+    get_php
    patch_phpize
-    add_extension_from_source "$ext" https://github.com php php-src "$(php_src_tag)" extension get
+    (
+      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 2>/dev/null || sysctl -n hw.ncpu)"
+      sudo cp ./modules/* "$ext_dir/"
+    )
    restore_phpize
  fi
+  echo "extension=$ext.so" | sudo tee "${scan_dir:?}/99-$ext.ini"
 }

 # Function to add oci extension oci8 and pdo_oci.
@ -54,10 +106,8 @@ add_oci() {
  oracle_client=$oracle_home/instantclient
  os=$(uname -s)
  add_client >/dev/null 2>&1
+  add_dependencies >/dev/null 2>&1
  add_oci_helper >/dev/null 2>&1
  add_extension_log "$ext" "$status"
  check_extension "$ext" && add_license_log
 }
-
-# shellcheck source=.
-. "${scripts:?}"/ext/patches/phpize.sh
--- a/src/scripts/ext/patches/firebird.sh
+++ b/src/scripts/ext/patches/firebird.sh
@ -1,11 +0,0 @@
-patch_firebird() {
-  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
-  lib_arch=$(gcc -dumpmachine)
-  lib_dir=/usr/lib/"$lib_arch"
-  if [ -d "$lib_dir" ]; then
-    sudo ln -sf "$lib_dir"/libfbclient.so.2 /usr/lib/libfbclient.so
-    sudo ln -sf "$lib_dir"/libib_util.so /usr/lib/
-  fi
-}
--- a/src/scripts/ext/patches/geos.sh
+++ b/src/scripts/ext/patches/geos.sh
@ -1,7 +0,0 @@
-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 /" geos.c
-  fi
-  get -q -n /tmp/php8.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
-  patch -p1 < /tmp/php8.patch 2>/dev/null || true
-}
--- a/src/scripts/ext/patches/http.sh
+++ b/src/scripts/ext/patches/http.sh
@ -1,11 +0,0 @@
-patch_pecl_http() {
-  if [ "$(uname -s)" = '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:?}|" "./src/php_http_api.h"
-    fi
-    sed -i '' -e "s|ext/raphf|$(brew --prefix raphf@"${version:?}")/include/php/ext/raphf@${version:?}|" "./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|" "./config9.m4"
-    fi
-  fi
-}
--- a/src/scripts/ext/patches/pdo_oci.sh
+++ b/src/scripts/ext/patches/pdo_oci.sh
@ -1,6 +0,0 @@
-patch_pdo_oci() {
-  get -q -n config.m4 https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
-  if [[ ${version:?} =~ 5.[3-6] ]]; 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
-}
--- a/src/scripts/ext/patches/phpize.sh
+++ b/src/scripts/ext/patches/phpize.sh
@ -1,26 +0,0 @@
-# Function to get phpize location on darwin.
-get_phpize() {
-  if [[ "${version:?}" =~ 5.[3-5] ]]; then
-    echo '/opt/local/bin/phpize'
-  else
-    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
-  fi
-}
-
-# Function to patch phpize to link to php headers on darwin.
-patch_phpize() {
-  if [ "$(uname -s)" = "Darwin" ]; then
-    sudo cp "$phpize_orig" "$phpize_orig.bck"
-    sudo sed -i '' 's~includedir=.*~includedir="$(xcrun --show-sdk-path)/usr/include/php"~g' "$phpize_orig"
-  fi
-}
-
-# Function to restore phpize.
-restore_phpize() {
-  if [ "$os" = "Darwin" ]; then
-    sudo mv "$phpize_orig.bck" "$phpize_orig" || true
-  fi
-}
-
-os="$(uname -s)"
-phpize_orig="$(get_phpize)"
--- a/src/scripts/ext/patches/protobuf.sh
+++ b/src/scripts/ext/patches/protobuf.sh
@ -1,4 +0,0 @@
-patch_protobuf() {
-  mkdir -p third_party/wyhash
-  cp ../../../../third_party/wyhash/* third_party/wyhash
-}
--- a/src/scripts/ext/phalcon.ps1
+++ b/src/scripts/ext/phalcon.ps1
@ -5,7 +5,7 @@ Function Add-PhalconHelper() {
  } else {
    $domain = 'https://github.com'
    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-    $match = Invoke-WebRequest -Uri "$domain/phalcon/cphalcon/releases/v3.4.5" | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
+    $match = Invoke-WebRequest -Uri $domain/phalcon/cphalcon/releases | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
    $zip_file = $match.Matches[0].Groups[1].Value
    Invoke-WebRequest -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
    Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1
--- a/src/scripts/ext/phalcon.sh
+++ b/src/scripts/ext/phalcon.sh
@ -1,11 +1,19 @@
 # Helper function to add phalcon.
 add_phalcon_helper() {
  status='Installed and enabled'
-  update_lists
-  if [ "$extension" = "phalcon4" ]; then
-    ${apt_install:?} "php${version:?}-psr" "php${version:?}-$extension"
+  if [ "$os_name" = "Linux" ]; then
+    update_lists
+    if [ "$extension" = "phalcon4" ]; then
+      ${apt_install:?} "php${version:?}-psr" "php${version:?}-$extension"
+    else
+      ${apt_install:?} "php${version:?}-$extension"
+    fi
  else
-    ${apt_install:?} "php${version:?}-$extension"
+    sed -i '' '/extension.*psr/d' "${ini_file:?}"
+    add_brew_tap shivammathur/homebrew-phalcon
+    brew install phalcon@"${version:?}"_"$extension_major_version"
+    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
 }

@ -48,6 +56,7 @@ add_phalcon4() {
 add_phalcon() {
  extension=$1
  status='Enabled'
+  os_name=$(uname -s)
  phalcon_ini_file="${pecl_file:-${ini_file[@]}}"
  extension_major_version=${extension: -1}
  if [ "$extension_major_version" = "4" ]; then
--- a/src/scripts/ext/source.sh
+++ b/src/scripts/ext/source.sh
@ -1,144 +0,0 @@
-# Function to parse extension environment variables
-parse_args() {
-  extension=$1
-  suffix=$(echo "$2" | tr '[:lower:]' '[:upper:]')
-  up_ext_name=$(echo "$extension" | tr '[:lower:]' '[:upper:]')
-  var="${extension}_${suffix}"
-  up_var="${up_ext_name}_${suffix}"
-  ! [[ "$suffix" =~ .*PREFIX|LIBS|PATH.* ]] && hyp='-'
-  output=$(echo "${!var} ${!up_var}" | sed "s/, *$hyp/ $hyp/g" | sed -E "s/^,|,$//g")
-  echo "$output" | xargs -n 1 | sort | uniq | xargs
-}
-
-# Function to log if a library is installed
-add_lib_log() {
-  lib=$1
-  if check_lib "$lib"; then
-    add_log "${tick:?}" "$lib" "Installed"
-  else
-    add_log "${cross:?}" "$lib" "Could not install $lib"
-  fi
-}
-
-# Function to check if a library is installed
-check_lib() {
-  lib=$1
-  if [ "$(uname -s)" = "Linux" ]; then
-    [ "x$(dpkg -s "$lib" 2>/dev/null | grep Status)" != "x" ]
-  else
-    [ "x$(find "${brew_prefix:?}"/Cellar -maxdepth 1 -name "$lib")" != "x" ]
-  fi
-}
-
-# Function to add a library on linux
-add_linux_libs() {
-  lib=$1
-  if ! check_lib "$lib"; then
-    install_packages "$lib" >/dev/null 2>&1 || true
-  fi
-  add_lib_log "$lib"
-}
-
-# Function to add a library on macOS
-add_darwin_libs() {
-  lib=$1
-  if ! check_lib "$lib"; then
-    brew install "$lib" >/dev/null 2>&1 || true
-    if [[ "$lib" = *@* ]]; then
-      brew link --overwrite --force "$lib" >/dev/null 2>&1 || true
-    fi
-  fi
-  add_lib_log "$lib"
-}
-
-# Function to add required libraries
-add_libs() {
-  all_libs=("$@")
-  for lib in "${all_libs[@]}"; do
-    if [ "$(uname -s)" = "Linux" ]; then
-      add_linux_libs "$lib"
-    else
-      add_darwin_libs "$lib"
-    fi
-  done
-}
-
-# Function to run command in a group
-run_group() {
-  command=$1
-  log=$2
-  echo "$command" | sudo tee ./run_group.sh >/dev/null 2>&1
-  echo "::group::$log"
-  . ./run_group.sh
-  rm ./run_group.sh
-  echo "::endgroup::"
-}
-
-patch_extension() {
-  extension=$1
-  if [ -e "${scripts:?}"/ext/patches/"$extension".sh ]; then
-    # shellcheck source=.
-    . "${scripts:?}"/ext/patches/"$extension".sh
-    patch_"${extension}"
-  fi
-}
-
-fetch_extension() {
-  fetch=$1
-  if [ "$fetch" = "clone" ]; then
-    run_group "git clone -nv $url/$org/$repo /tmp/$repo-$release" "git clone"
-    cd /tmp/"$repo-$release" || exit 1
-    git checkout -q "$release"
-    cd "$sub_dir" || exit 1
-    if [ -e .gitmodules ]; then
-      jobs="$(grep -c "\[submodule" .gitmodules)"
-      run_group "git submodule update --jobs $jobs --init --recursive" "git submodule"
-    fi
-  elif [ "$fetch" = "get" ]; then
-    get -q -n /tmp/"$extension".tar.gz "$url/$org/$repo/archive/$release.tar.gz"
-    tar -xzf /tmp/"$extension".tar.gz -C /tmp
-    cd /tmp/"$repo"-"$release"/"$sub_dir" || exit
-  elif [ "$fetch" = "pecl" ]; then
-    source="pecl"
-    pecl_name=${extension/http/pecl_http}
-    get -q -n /tmp/"$pecl_name".tgz https://pecl.php.net/get/"$pecl_name"-"$release".tgz
-    tar -xzf /tmp/"$pecl_name".tgz -C /tmp
-    cd /tmp/"$pecl_name"-"$release" || exit
-  fi
-}
-
-# Function to install extension from a git repository
-add_extension_from_source() {
-  extension="${1/pecl_/}"
-  url=$2
-  org=$3
-  repo=$4
-  release=$5
-  prefix=$6
-  fetch=${7:-clone}
-  slug="$extension-$release"
-  source="$url/$org/$repo"
-  libraries="$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
-  opts="$(parse_args "$extension" CONFIGURE_OPTS)"
-  prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS)"
-  suffix_opts="$(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)"
-  sub_dir="$(parse_args "$extension" PATH)"
-  step_log "Setup $slug"
-  (
-    add_devtools phpize >/dev/null 2>&1
-    delete_extension "$extension"
-    fetch_extension "$fetch"
-    if ! [ "$(find . -maxdepth 1 -name '*.m4' -exec grep -H 'PHP_NEW_EXTENSION' {} \; | wc -l)" != "0" ]; then
-      add_log "${cross:?}" "$source" "$source does not have a PHP extension"
-    else
-      [[ -n "${libraries// }" ]] && run_group "add_libs $libraries" "add libraries"
-      patch_extension "$extension" >/dev/null 2>&1
-      run_group "phpize" "phpize"
-      run_group "sudo $prefix_opts ./configure $suffix_opts $opts" "configure"
-      run_group "sudo make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu)" "make"
-      run_group "sudo make install" "make install"
-      enable_extension "$extension" "$prefix"
-    fi
-  )
-  add_extension_log "$slug" "Installed from $source and enabled"
-}
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@ -3,8 +3,8 @@ 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 apt-transport-https curl make software-properties-common unzip autoconf automake gcc g++
-  add_ppa ondrej/php
+  install_packages curl make software-properties-common unzip autoconf automake gcc g++
+  add_ppa ondrej/ppa
 }

 # Function to backup and cleanup package lists.
@ -14,6 +14,7 @@ cleanup_lists() {
    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/*"${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
 }
@ -21,23 +22,36 @@ cleanup_lists() {
 # Function to add ppa:ondrej/php.
 add_ppa() {
  ppa=${1:-ondrej/php}
-  if [ "$DISTRIB_RELEASE" = "16.04" ] && [ "$ppa" = "ondrej/php" ]; then
-    LC_ALL=C.UTF-8 sudo apt-add-repository --remove ppa:"$ppa" -y || true
-    LC_ALL=C.UTF-8 sudo apt-add-repository http://setup-php.com/ondrej/php/ubuntu -y
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 4f4ea0aae5267a6c
-  elif ! apt-cache policy | grep -q "$ppa"; then
+  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
-  if [ "$DISTRIB_RELEASE" = "16.04" ]; then
-    sudo "$debconf_fix" apt-get update
+}
+
+# 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
-    [ "${runner:?}" != "self-hosted" ] && add_ppa >/dev/null 2>&1
+    [ "$DISTRIB_RELEASE" = "20.04" ] && add_ppa >/dev/null 2>&1
    cleanup_lists
    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
    echo '' | sudo tee /tmp/setup_php >/dev/null 2>&1
@ -63,7 +77,9 @@ delete_extension() {
  extension=$1
  disable_extension "$extension"
  sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
-  sudo sed -i "/Package: php$version-$extension/,/^$/d" /var/lib/dpkg/status
+  if [ "${runner:?}" = "self-hosted" ]; then
+    $apt_remove "php-$extension" "php$version-$extension" >/dev/null 2>&1 || true
+  fi
 }

 # Function to disable and delete extensions.
@ -72,6 +88,7 @@ remove_extension() {
  if check_extension "$extension"; then
    if [[ ! "$version" =~ ${old_versions:?} ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
      sudo phpdismod -v "$version" "$extension" >/dev/null 2>&1
+      echo "$extension" | sudo tee -a /tmp/setup_php_dismod >/dev/null 2>&1
    fi
    delete_extension "$extension"
    (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") ||
@ -90,10 +107,8 @@ add_pdo_extension() {
  else
    ext=$1
    ext_name=$1
-    if [ -e "$ext_dir"/pdo.so ]; then
-      disable_extension pdo
-      echo "extension=pdo.so" | sudo tee "${ini_file[@]/php.ini/conf.d/10-pdo.ini}" >/dev/null 2>&1
-    fi
+    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'
@ -121,7 +136,9 @@ add_extension() {
  if check_extension "$extension"; then
    add_log "${tick:?}" "$extension" "Enabled"
  else
-    if [[ "$version" =~ ${nightly_versions:?} ]]; then
+    if [[ "$version" =~ 5.[4-5] ]]; then
+      install_packages "php5-$extension=$release_version"
+    elif [[ "$version" =~ ${nightly_versions:?} ]]; then
      pecl_install "$extension"
    else
      install_packages "php$version-$extension" || pecl_install "$extension"
@ -131,25 +148,46 @@ add_extension() {
  sudo chmod 777 "${ini_file[@]}"
 }

+# Function to install a PECL version.
+add_pecl_extension() {
+  extension=$1
+  pecl_version=$2
+  prefix=$3
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
+    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
+  fi
+  enable_extension "$extension" "$prefix"
+  ext_version=$(php -r "echo phpversion('$extension');")
+  if [ "$ext_version" = "$pecl_version" ]; then
+    add_log "${tick:?}" "$extension" "Enabled"
+  else
+    delete_extension "$extension"
+    pecl_install "$extension-$pecl_version"
+    add_extension_log "$extension-$pecl_version" "Installed and enabled"
+  fi
+}
+
 # Function to setup phpize and php-config.
 add_devtools() {
  tool=$1
  if ! command -v "$tool$version" >/dev/null; then
    install_packages "php$version-dev" "php$version-xml"
  fi
-  switch_version "phpize" "php-config"
+  sudo update-alternatives --set php-config /usr/bin/php-config"$version" >/dev/null 2>&1
+  sudo update-alternatives --set phpize /usr/bin/phpize"$version" >/dev/null 2>&1
+  configure_pecl >/dev/null 2>&1
  add_log "${tick:?}" "$tool" "Added $tool $semver"
 }

 # Function to setup the nightly build from shivammathur/php-builder
 setup_nightly() {
  run_script "php-builder" "$runner" "$version"
-  extra_version="-dev ($(cat "/etc/php/$version/COMMIT"))"
 }

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

 # Function to add PECL.
@ -165,11 +203,9 @@ add_pecl() {

 # Function to switch versions of PHP binaries.
 switch_version() {
-  tools=("$@") && ! (( ${#tools[@]} )) && tools+=(pear pecl php phar phar.phar php-cgi php-config phpize phpdbg)
-  to_wait=()
-  for tool in "${tools[@]}"; do
+  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" &
+      sudo update-alternatives --set $tool /usr/bin/"$tool$version" &
      to_wait+=($!)
    fi
  done
@ -183,7 +219,7 @@ 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
 }

@ -259,7 +295,7 @@ setup_php() {
  sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1
  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$extra_version"
+  add_log "${tick:?}" "PHP" "$status PHP $semver"
 }

 # Variables
@ -267,10 +303,10 @@ version=$1
 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=.
-. "${scripts:?}"/ext/source.sh
 . "${scripts:?}"/tools/add_tools.sh
 . "${scripts:?}"/common.sh
 . /etc/lsb-release
--- 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/protoc.sh
+++ b/src/scripts/tools/protoc.sh
@ -19,7 +19,7 @@ add_protoc() {
    [ "$(uname -s)" = "Darwin" ] && platform='osx'
    get -q -n /tmp/protobuf.zip "https://github.com/protocolbuffers/protobuf/releases/download/$protobuf_tag/protoc-${protobuf_tag:1}-$platform-x86_64.zip"
    sudo unzip /tmp/protobuf.zip -d /usr/local/
-    sudo chmod -R 777 /usr/local/bin/protoc /usr/local/include/google
+    sudo chmod 777 /usr/local/bin/protoc -R /usr/local/include/google
  ) >/dev/null 2>&1
  add_log "${tick:?}" "protoc" "Added protoc ${protobuf_tag:1}"
  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@ -101,9 +101,7 @@ Function Install-PSPackage() {
    [Parameter(Position = 1, Mandatory = $true)]
    $psm1_path,
    [Parameter(Position = 2, Mandatory = $true)]
-    $url,
-    [Parameter(Position = 3, Mandatory = $true)]
-    $cmdlet
+    $url
  )
  $module_path = "$bin_dir\$psm1_path.psm1"
  if(-not (Test-Path $module_path -PathType Leaf)) {
@ -113,31 +111,6 @@ Function Install-PSPackage() {
  }
  Import-Module $module_path
  Add-ToProfile $current_profile "$package-search" "Import-Module $module_path"
-
-  if($null -eq (Get-Command $cmdlet -ErrorAction SilentlyContinue)) {
-    Install-Module -Name $cmdlet -Force
-  }
-}
-
-Function Add-ExtensionPrerequisites{
-  Param (
-    [Parameter(Position = 0, Mandatory = $true)]
-    [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
-    [string]
-    $extension
-  )
-  $deps_dir = "$ext_dir\$extension-vc$installed.VCVersion-$arch"
-  $extensions_with_dependencies = ('imagick')
-  if($extensions_with_dependencies.Contains($extension)) {
-    if(-not(Test-Path $deps_dir)) {
-      New-Item $deps_dir -Type Directory 2>&1 | Out-Null
-      Install-PhpExtensionPrerequisite -Extension $extension -InstallPath $deps_dir -PhpPath $php_dir
-    }
-    Get-ChildItem -Recurse -Path $deps_dir | ForEach-Object {
-      New-Item -Itemtype SymbolicLink -Path $php_dir -Name $_.Name -Target $_.FullName -Force >$null 2>&1
-    }
-  }
 }

 # Function to add PHP extensions.
@ -170,18 +143,16 @@ Function Add-Extension {
          Add-Log $tick $extension "Enabled"
        }
        default {
-          Add-ExtensionPrerequisites $extension
          Enable-PhpExtension -Extension $extension_info.Handle -Path $php_dir
          Add-Log $tick $extension "Enabled"
        }
      }
    }
    else {
-      Add-ExtensionPrerequisites $extension
      if($extension_version -ne '') {
-        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $stability -MaximumStability $stability -Path $php_dir -NoDependencies
+        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $stability -MaximumStability $stability -Path $php_dir
      } else {
-        Install-PhpExtension -Extension $extension -MinimumStability $stability -MaximumStability $stability -Path $php_dir -NoDependencies
+        Install-PhpExtension -Extension $extension -MinimumStability $stability -MaximumStability $stability -Path $php_dir
      }

      Add-Log $tick $extension "Installed and enabled"
@ -248,8 +219,7 @@ Function Get-ToolVersion() {
      [Parameter(Position = 1, Mandatory = $true)]
      $param
  )
-  $alp = "[a-zA-Z0-9]"
-  $version_regex = "[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
+  $version_regex = "[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-z0-9]+){0,1}"
  if($tool -eq 'composer') {
    if ($param -eq 'snapshot') {
      $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 })
@ -338,15 +308,14 @@ Function Add-Composertool() {
  if(Test-Path $composer_lock) {
    Remove-Item -Path $composer_lock -Force
  }
-  (composer global require $prefix$release 2>&1 | Tee-Object -FilePath $env:APPDATA\Composer\composer.log) >$null 2>&1
+  composer global require $prefix$release >$null 2>&1
  $json = findstr $prefix$tool $env:APPDATA\Composer\composer.json
-  $log = findstr $prefix$tool $env:APPDATA\Composer\composer.log
  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" "$log"
+    $tool_version = Get-ToolVersion "Write-Output" "$json"
    Add-Log $tick $tool "Added $tool $tool_version"
  } else {
    Add-Log $cross $tool "Could not setup $tool"
@ -364,8 +333,8 @@ $cross = ([char]10007)
 $php_dir = 'C:\tools\php'
 $ext_dir = "$php_dir\ext"
 $bin_dir = $php_dir
+$bintray = 'https://dl.bintray.com/shivammathur/php'
 $github = 'https://github.com'
-$php_builder = "$github/shivammathur/php-builder-windows"
 $composer_bin = "$env:APPDATA\Composer\vendor\bin"
 $composer_json = "$env:APPDATA\Composer\composer.json"
 $composer_lock = "$env:APPDATA\Composer\composer.lock"
@ -415,7 +384,7 @@ if($env:RUNNER -eq 'self-hosted') {

 Add-Printf >$null 2>&1
 Step-Log "Setup PhpManager"
-Install-PSPackage PhpManager PhpManager\PhpManager "$github/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip" Get-Php >$null 2>&1
+Install-PSPackage PhpManager PhpManager\PhpManager "$github/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip" >$null 2>&1
 Add-Log $tick "PhpManager" "Installed"

 Step-Log "Setup PHP"
@ -428,11 +397,11 @@ if (Test-Path -LiteralPath $php_dir -PathType Container) {
 $status = "Installed"
 if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version -replace '^(\d+(\.\d+)*).*', '$1.'))) -or $ts -ne $installed.ThreadSafe) {
  if ($version -lt '7.0' -and (Get-InstalledModule).Name -notcontains 'VcRedist') {
-    Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" Get-VcList >$null 2>&1
+    Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" >$null 2>&1
  }
  try {
    if ($version -match $nightly_versions) {
-      Invoke-WebRequest -UseBasicParsing -Uri $php_builder/releases/latest/download/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1
+      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
@ -457,10 +426,14 @@ if($installed.MajorMinorVersion -ne $version) {
 }
 ('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-Object { Invoke-WebRequest -Uri "$php_builder/releases/download/openssl-1.0.2u/$_" -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
@ -7,8 +7,7 @@ import * as utils from './utils';
 */
 export async function getToolVersion(version: string): Promise<string> {
  // semver_regex - https://semver.org/
-  const semver_regex =
-    /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+  const semver_regex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
  const composer_regex = /^stable$|^preview$|^snapshot$|^v?[1|2]$/;
  version = version.replace(/[><=^]*/, '');
  switch (true) {
@ -33,17 +32,12 @@ export async function parseTool(
  const parts: string[] = release.split(':');
  const tool: string = parts[0];
  const version: string | undefined = parts[1];
-  switch (true) {
-    case version === undefined:
+  switch (version) {
+    case undefined:
      return {
        name: tool,
        version: 'latest'
      };
-    case /^[\w.-]+\/[\w.-]+$/.test(tool):
-      return {
-        name: tool,
-        version: version
-      };
    default:
      return {
        name: tool,
@ -251,8 +245,7 @@ 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_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$|v?\d+\.\d+\.\d+[\w-]*$)/;
  const matches: string[] = tools_list.filter(tool => regex_valid.test(tool));
  let composer = 'composer';
  tools_list = tools_list.filter(tool => !regex_any.test(tool));
@ -290,6 +283,29 @@ export async function getComposerUrl(version: string): Promise<string> {
  }
 }

+/**
+ * Function to get Tools list after cleanup
+ *
+ * @param tools_csv
+ */
+export async function getCleanedToolsList(
+  tools_csv: string
+): Promise<string[]> {
+  let tools_list: string[] = await utils.CSVArray(tools_csv);
+  tools_list = await addComposer(tools_list);
+  tools_list = tools_list
+    .map(function (extension: string) {
+      return extension
+        .trim()
+        .replace(
+          /-agent|behat\/|codeception\/|hirak\/|icanhazstring\/|laravel\/|narrowspark\/automatic-|overtrue\/|phpspec\/|robmorgan\/|symfony\//,
+          ''
+        );
+    })
+    .filter(Boolean);
+  return [...new Set(tools_list)];
+}
+
 /**
 * Helper function to get script to setup a tool using a phar url
 *
@ -370,13 +386,8 @@ export async function addTools(
  php_version: string,
  os_version: string
 ): Promise<string> {
-  let script = '\n';
-  if (tools_csv === 'none') {
-    return '';
-  } else {
-    script += await utils.stepLog('Setup Tools', os_version);
-  }
-  const tools_list = await addComposer(await utils.CSVArray(tools_csv));
+  let script = '\n' + (await utils.stepLog('Setup Tools', os_version));
+  const tools_list: Array<string> = await getCleanedToolsList(tools_csv);
  await utils.asyncForEach(tools_list, async function (release: string) {
    const tool_data: {name: string; version: string} = await parseTool(release);
    const tool: string = tool_data.name;
@ -392,123 +403,124 @@ export async function addTools(
    );
    script += '\n';
    let url = '';
-    switch (true) {
-      case /^blackfire(-agent)?$/.test(tool):
-        script += await utils.customPackage(
-          'blackfire',
-          'tools',
-          version,
-          os_version
-        );
-        break;
-      case /^grpc_php_plugin$|^protoc$/.test(tool):
+    switch (tool) {
+      case 'blackfire':
+      case 'grpc_php_plugin':
+      case 'protoc':
        script += await utils.customPackage(tool, 'tools', version, os_version);
        break;
-      case /^behat$|^codeception$|^phpspec$/.test(tool):
+      case 'behat':
+      case 'codeception':
+      case 'phpspec':
        script += await addPackage(tool, release, tool + '/', os_version);
        break;
-      case /^blackfire-player$/.test(tool):
+      case 'blackfire-player':
        url = await getBlackfirePlayerUrl(version, php_version);
        script += await addArchive(tool, url, os_version, '"-V"');
        break;
-      case /^composer$/.test(tool):
+      case 'composer':
        url = await getComposerUrl(version);
        script += await addArchive('composer', url, os_version, version);
        break;
-      case /^composer-normalize$/.test(tool):
+      case 'composer-normalize':
        uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
        url = github + 'ergebnis/composer-normalize/' + uri;
        script += await addArchive(tool, url, os_version, '"-V"');
        break;
-      case /^composer-prefetcher$/.test(tool):
+      case 'composer-prefetcher':
        script += await addPackage(
-          'automatic-' + tool,
+          tool,
          release,
-          'narrowspark/',
+          'narrowspark/automatic-',
          os_version
        );
        break;
-      case /^composer-require-checker$/.test(tool):
+      case 'composer-require-checker':
        uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
        url = github + 'maglnet/ComposerRequireChecker/' + uri;
        script += await addArchive(tool, url, os_version, '"-V"');
        break;
-      case /^composer-unused$/.test(tool):
+      case 'composer-unused':
        script += await addPackage(tool, release, 'icanhazstring/', os_version);
        break;
-      case /^cs2pr$/.test(tool):
+      case 'cs2pr':
        uri = await getUri(tool, '', version, 'releases', '', 'download');
        url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
        script += await addArchive(tool, url, os_version, '"-V"');
        break;
-      case /^deployer$/.test(tool):
+      case 'deployer':
        url = await getDeployerUrl(version);
        script += await addArchive(tool, url, os_version, '"-V"');
        break;
-      case /^flex$/.test(tool):
+      case 'flex':
        script += await addPackage(tool, release, 'symfony/', os_version);
        break;
-      case /^infection$/.test(tool):
+      case 'infection':
        url = github + 'infection/infection/' + uri;
        script += await addArchive(tool, url, os_version, '"-V"');
        break;
-      case /^pecl/.test(tool):
+      case 'pecl':
        script += await utils.getCommand(os_version, 'pecl');
        break;
-      case /^phan$/.test(tool):
+      case 'phan':
        url = github + 'phan/phan/' + uri;
        script += await addArchive(tool, url, os_version, '"-v"');
        break;
-      case /^phing$/.test(tool):
+      case 'phing':
        url = 'https://www.phing.info/get/phing-' + version + '.phar';
        script += await addArchive(tool, url, os_version, '"-v"');
        break;
-      case /^phinx$/.test(tool):
+      case 'phinx':
        script += await addPackage(tool, release, 'robmorgan/', os_version);
        break;
-      case /^phive$/.test(tool):
+      case 'phive':
        script += await addPhive(version, php_version, os_version);
        break;
-      case /^php(-config|ize)$/.test(tool):
+      case 'php-config':
+      case 'phpize':
        script += await addDevTools(tool, os_version);
        break;
-      case /^php-cs-fixer$/.test(tool):
+      case 'php-cs-fixer':
        uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
        url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
        script += await addArchive(tool, url, os_version, '"-V"');
        break;
-      case /^php(cbf|cs)$/.test(tool):
+      case 'phpcbf':
+      case 'phpcs':
        url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
        script += await addArchive(tool, url, os_version, '"--version"');
        break;
-      case /^php(cpd|unit)$/.test(tool):
+      case 'phpcpd':
+      case 'phpunit':
        url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
        script += await addArchive(tool, url, os_version, '"--version"');
        break;
-      case /^phplint$/.test(tool):
+      case 'phplint':
        script += await addPackage(tool, release, 'overtrue/', os_version);
        break;
-      case /^phpmd$/.test(tool):
+      case 'phpmd':
        url = github + 'phpmd/phpmd/' + uri;
        script += await addArchive(tool, url, os_version, '"--version"');
        break;
-      case /^phpstan$/.test(tool):
+      case 'phpstan':
        url = github + 'phpstan/phpstan/' + uri;
        script += await addArchive(tool, url, os_version, '"-V"');
        break;
-      case /^prestissimo$/.test(tool):
+      case 'prestissimo':
        script += await addPackage(tool, release, 'hirak/', os_version);
        break;
-      case /^psalm$/.test(tool):
+      case 'psalm':
        url = github + 'vimeo/psalm/' + uri;
        script += await addArchive(tool, url, os_version, '"-v"');
        break;
-      case /^symfony(-cli)?$/.test(tool):
+      case 'symfony':
+      case 'symfony-cli':
        uri = await getSymfonyUri(version, os_version);
        url = github + 'symfony/cli/' + uri;
        script += await addArchive('symfony', url, os_version, 'version');
        break;
-      case /^vapor(-cli)?$/.test(tool):
+      case 'vapor-cli':
+      case 'vapor':
        script += await addPackage(
          'vapor-cli',
          release,
@ -516,20 +528,11 @@ export async function addTools(
          os_version
        );
        break;
-      case /^wp(-cli)?$/.test(tool):
+      case 'wp':
+      case 'wp-cli':
        url = github + (await getWpCliUrl(version));
        script += await addArchive('wp-cli', url, os_version, '"--version"');
        break;
-      case /^none$/.test(tool):
-        break;
-      case /^[\w.-]+\/[\w.-]+$/.test(tool):
-        script += await addPackage(
-          tool.split('/')[1],
-          release.split('/')[1].replace(/\s+/, ''),
-          tool.split('/')[0] + '/',
-          os_version
-        );
-        break;
      default:
        script += await utils.addLog(
          '$cross',
--- a/src/utils.ts
+++ b/src/utils.ts
@ -234,23 +234,20 @@ 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) {
-          if (/.+-.+\/.+@.+/.test(extension)) {
-            return extension;
-          }
-          return extension
+        .map(function (package_name: string) {
+          return package_name
            .trim()
            .toLowerCase()
            .replace(/^php[-_]/, '');
@ -441,24 +438,3 @@ export async function customPackage(
  const command: string = await getCommand(os_version, pkg_name);
  return '\n. ' + script + '\n' + command + version;
 }
-
-/**
- * Function to extension input for installation from source.
- *
- * @param extension
- * @param prefix
- */
-export async function parseExtensionSource(
-  extension: string,
-  prefix: string
-): Promise<string> {
-  // Groups: extension, domain url, org, repo, release
-  const regex = /(\w+)-(.+:\/\/.+(?:[.:].+)+\/)?([\w.-]+)\/([\w.-]+)@(.+)/;
-  const matches = regex.exec(extension) as RegExpExecArray;
-  matches[2] = matches[2] ? matches[2].slice(0, -1) : 'https://github.com';
-  return await joins(
-    '\nadd_extension_from_source',
-    ...matches.splice(1, matches.length),
-    prefix
-  );
-}
--- a/tsconfig.json
+++ b/tsconfig.json
@ -1,18 +1,63 @@
 {
  "compilerOptions": {
-    "esModuleInterop": true,
-    "lib": [
-      "ESNext"
-    ],
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "outDir": "./lib",
-    "removeComments": true,
-    "rootDir": "./src",
-    "sourceMap": true,
-    "strict": true,
-    "target": "ESNext"
+    /* Basic Options */
+    // "incremental": true,                   /* Enable incremental compilation */
+    "target": "ES2019",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    "outDir": "./lib",                        /* Redirect output structure to the directory. */
+    "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true,                           /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
  },
-  "exclude": ["__tests__", "lib", "node_modules"]
+  "exclude": ["node_modules", "**/*.test.ts"]
 }
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