Add patch for PCRE2

Update readme about composer (Fixed errors)

.eslintrc.json

@@ -10,7 +10,7 @@
     "plugin:import/warnings",
     "plugin:import/typescript",
     "plugin:prettier/recommended",
-    "prettier/@typescript-eslint"
+    "prettier"
   ],
   "plugins": ["@typescript-eslint", "jest"]
 }

.github/SECURITY.md

@@ -6,8 +6,8 @@ The following versions of this project are supported for security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.10.x  | :white_check_mark: |
+| 1.11.x  | :white_check_mark: |
-| 2.8.x   | :white_check_mark: |
+| 2.11.x   | :white_check_mark: |
 
 ## Supported PHP Versions
 
@@ -15,7 +15,6 @@ 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: |

.github/workflows/docs.yml

@@ -1,8 +1,8 @@
 name: Docs workflow
 on:
-  repository_dispatch:
+  workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 2'
+    - cron: '0 15 * * 6'
 jobs:
   create:
     name: Create
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, macos-10.15, macos-11.0]
+        operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, macos-10.15]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
     steps:
       - name: Setup PHP
@@ -35,7 +35,7 @@ jobs:
           version: ${{ matrix.php-versions }}
         if: matrix.operating-system == 'windows-2019'
         run: |
-          Write-Output "## PHP $version`n" | Out-File -FilePath "$env:file"
+          Write-Output "## PHP ${{ matrix.php-versions }}`n" | Out-File -FilePath "$env:file"
           Write-Output "``````" | Out-File -FilePath "$env:file" -Append
           php -m | Out-File -FilePath "$env:file" -Append
           Write-Output "```````n" | Out-File -FilePath "$env:file" -Append
@@ -60,9 +60,13 @@ jobs:
           git config --local user.email "${{ secrets.email }}"
           git config --local user.name "${{ github.repository_owner }}"
           for os in ubuntu-20.04 ubuntu-18.04 ubuntu-16.04 windows-2019 macos-10.15 macos-11.0; do
-            echo "# PHP Extensions on $os" > Php-extensions-on-"$os".md
+            echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md
             for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
-              cat lists/php"$version"-"$os".md >> Php-extensions-on-"$os".md
+              if [ "$os" = "macos-11.0" ]; then
+                cat lists/php"$version"-macos-10.15.md >> Php-extensions-loaded-on-"$os".md
+              else
+                cat lists/php"$version"-"$os".md >> Php-extensions-loaded-on-"$os".md
+              fi
             done
           done
           rm -rf ./lists

.github/workflows/node-workflow.yml

@@ -28,10 +28,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 12.x
+      - name: Setup Node.js 15.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 15.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/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}
+        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/lcov.info -n github-actions-codecov-${{ matrix.operating-system }}

LICENSE

@@ -1,7 +1,7 @@
 
 The MIT License (MIT)
 
-Copyright (c) 2019-2020 shivammathur and contributors
+Copyright (c) 2019-2021 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

README.md

@@ -22,10 +22,10 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 
 ## Contents
 
-- [PHP Support](#tada-php-support)
 - [OS/Platform Support](#cloud-osplatform-support)
   - [GitHub-Hosted Runners](#github-hosted-runners)
   - [Self-Hosted Runners](#self-hosted-runners)
+- [PHP Support](#tada-php-support)  
 - [PHP Extension Support](#heavy_plus_sign-php-extension-support)
 - [Tools Support](#wrench-tools-support)
 - [Coverage Support](#signal_strength-coverage-support)
@@ -37,13 +37,14 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
   - [Flags](#flags)
   - [Basic Setup](#basic-setup)
   - [Matrix Setup](#matrix-setup)  
-  - [Multi-Arch Setup](#multi-arch-setup)
   - [Nightly Build Setup](#nightly-build-setup)
+  - [Thread Safe Setup](#thread-safe-setup)
+  - [Force Update Setup](#force-update-setup)
+  - [Verbose Setup](#verbose-setup)  
+  - [Multi-Arch Setup](#multi-arch-setup)
   - [Self Hosted Setup](#self-hosted-setup)
   - [Local Testing Setup](#local-testing-setup)
-  - [Thread Safe Setup](#thread-safe-setup)
+  - [JIT Configuration](#jit-configuration)
-  - [Force Update](#force-update)
-  - [Verbose Setup](#verbose-setup)
   - [Cache Extensions](#cache-extensions)
   - [Cache Composer Dependencies](#cache-composer-dependencies)
   - [Cache Node.js Dependencies](#cache-nodejs-dependencies)
@@ -57,8 +58,42 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 - [Dependencies](#package-dependencies)
 - [Further Reading](#bookmark_tabs-further-reading)
 
+## :cloud: OS/Platform Support
+
+Both `GitHub-hosted` and `self-hosted` runners are suppported by `setup-php` on the following OS/Platforms.
+
+### GitHub-Hosted Runners
+
+|Virtual environment|YAML workflow label|Pre-installed PHP|
+|--- |--- |--- |
+|Ubuntu 16.04 [(deprecated)](https://setup-php.com/i/452)|`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`|
+
+### Self-Hosted Runners
+
+|Host OS/Virtual environment|YAML workflow label|
+|--- |--- |
+|Ubuntu 18.04|`self-hosted` or `Linux`|
+|Ubuntu 20.04|`self-hosted` or `Linux`|
+|Windows 7 and newer|`self-hosted` or `Windows`|
+|Windows Server 2012 R2 and newer|`self-hosted` or `Windows`|
+|macOS Catalina 10.15|`self-hosted` or `macOS`|
+|macOS Big Sur 11.x x86_64/arm64|`self-hosted` or `macOS`|
+
+- Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.
+- If the requested PHP version is pre-installed, `setup-php` switches to it, otherwise it installs the PHP version.
+
 ## :tada: PHP Support
 
+On all supported OS/Platforms the following PHP versions are supported as per the runner.
+
+- PHP 5.3 to PHP 8.1 on GitHub-hosted runners.
+- PHP 5.6 to PHP 8.1 on self-hosted runners.
+
 |PHP Version|Stability|Release Support|Runner Support|
 |--- |--- |--- |--- |
 |`5.3`|`Stable`|`End of life`|`GitHub-hosted`|
@@ -67,84 +102,55 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 |`5.6`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
 |`7.0`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
 |`7.1`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.2`|`Stable`|`Security fixes only`|`GitHub-hosted`, `self-hosted`|
+|`7.2`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.3`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
+|`7.3`|`Stable`|`Security fixes only`|`GitHub-hosted`, `self-hosted`|
 |`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
-|`8.0`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
+|`8.0`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
 |`8.1`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
 
-**Note:** Specifying `8.0` and `8.1` in `php-version` input installs a nightly build of `PHP 8.0.0-dev` and `PHP 8.1.0-dev` respectively. See [nightly build setup](#nightly-build-setup) for more information.
+**Notes:** 
-
+- Specifying `8.1` in `php-version` input installs a nightly build of `PHP 8.1.0-dev`. See [nightly build setup](#nightly-build-setup) for more information.
-
+- To use JIT on `PHP 8.0` and `PHP 8.1` refer to the [JIT configuration](#jit-configuration) section.
-## :cloud: OS/Platform Support
-
-The action supports both `GitHub-hosted` runners and `self-hosted` runners on the following operating systems.
-
-### GitHub-Hosted Runners
-
-|Virtual environment|YAML workflow label|Pre-installed PHP|
-|--- |--- |--- |
-|Ubuntu 16.04|`ubuntu-16.04`|`PHP 5.6` to `PHP 7.4`|
-|Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|`PHP 7.1` to `PHP 7.4`|
-|Ubuntu 20.04|`ubuntu-20.04`|`PHP 7.4`|
-|Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 7.4`|
-|macOS Catalina 10.15|`macos-latest` or `macos-10.15`|`PHP 7.4`|
-|macOS Big Sur 11.0|`macos-11.0`|`PHP 7.4`|
-
-### 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`|
-|Windows Server 2012 R2 and newer|`self-hosted` or `Windows`|
-|macOS Catalina 10.15|`self-hosted` or `macOS`|
-|macOS Big Sur 11.0|`self-hosted` or `macOS`|
-
-- Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.
 
 ## :heavy_plus_sign: PHP Extension Support
 
-- Extensions enabled by default after `setup-php` runs can be found on the [wiki](https://github.com/shivammathur/setup-php/wiki).
+PHP extensions can be setup using the `extensions` input. It accepts a `string` in csv-format.
 
-- On `ubuntu` by default extensions which are available as a package can be installed. PECL extensions if not available as a package can be installed by specifying `pecl` in the tools input.
+- On `Ubuntu`, extensions which are available as a package, available on `PECL` or a git repository can be set up.
 
 ```yaml
-- name: Setup PHP with pecl extension
+- name: Setup PHP with PECL extension
   uses: shivammathur/setup-php@v2
   with:
     php-version: '7.4'
-    tools: pecl
+    extensions: imagick, swoole
-    extensions: swoole
 ```
 
-- On `windows` PECL extensions which have the `DLL` binary can be installed.
+- On `Windows`, extensions available on `PECL` which have the `DLL` binary can be set up.
 
-- On `macOS` PECL extensions can be installed.
+- 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").
 
 - Extensions installed along with PHP if specified are enabled.
 
-- Specific versions of PECL extensions can be installed by suffixing the version. This is useful for installing old versions of extensions which support end of life PHP versions.
+- Specific versions of extensions available on `PECL` can be setup by suffixing the extension's name with the version. This is useful for installing old versions of extensions which support end of life PHP versions.
 
 ```yaml
 - name: Setup PHP with specific version of PECL extension
   uses: shivammathur/setup-php@v2
   with:
     php-version: '5.4'
-    tools: pecl
     extensions: swoole-1.9.3
 ```
 
-- Pre-release versions of PECL extensions can be setup by suffixing the extension with its state i.e `alpha`, `beta`, `devel` or `snapshot`.
+- Pre-release versions extensions available on `PECL` can be setup by suffixing the extension's name with its state i.e `alpha`, `beta`, `devel` or `snapshot`.
 
 ```yaml
 - name: Setup PHP with pre-release PECL extension
   uses: shivammathur/setup-php@v2
   with:
     php-version: '7.4'
-    tools: pecl
     extensions: xdebug-beta
 ```
 
@@ -158,17 +164,22 @@ The action supports both `GitHub-hosted` runners and `self-hosted` runners on th
     extensions: :opcache
 ```
 
-- Extension `intl` can be setup with specific `ICU` version for `PHP 5.6` to `PHP 7.4` in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.
+- Extension `intl` can be setup with specific `ICU` version for `PHP 5.6` 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.
 
 ```yaml
 - name: Setup PHP with intl
   uses: shivammathur/setup-php@v2
   with:
     php-version: '7.4'
-    extensions: intl-67.1
+    extensions: intl-69.1
 ```
 
-- These extensions have custom support - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`, and `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_oci`, `phalcon3` and `phalcon4` on all supported OS.
+- Extensions loaded by default after `setup-php` runs can be found on the [wiki](https://github.com/shivammathur/setup-php/wiki).
+
+- These extensions have custom support:
+  - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`.
+  - `geos` on `Ubuntu` and `macOS`.
+  - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `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`. 
 
@@ -184,9 +195,9 @@ The action supports both `GitHub-hosted` runners and `self-hosted` runners on th
 
 ## :wrench: Tools Support
 
-These tools can be setup globally using the `tools` input.
+These tools can be setup globally using the `tools` input. It accepts a string in csv-format.
 
-`behat`, `blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-normalize`, `composer-prefetcher`, `composer-require-checker`, `composer-unused`, `cs2pr`, `deployer`, `flex`, `grpc_php_plugin`, `infection`, `pecl`, `phan`, `phing`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpspec`, `phpstan`, `phpunit`, `prestissimo`, `protoc`, `psalm`, `symfony`, `vapor-cli`
+`behat`, `blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-normalize`, `composer-prefetcher`, `composer-require-checker`, `composer-unused`, `cs2pr`, `deployer`, `flex`, `grpc_php_plugin`, `infection`, `pecl`, `phan`, `phing`, `phinx`, `phive`, `php-config`, `php-cs-fixer`, `phpcbf`, `phpcpd`, `phpcs`, `phpize`, `phplint`, `phpmd`, `phpspec`, `phpstan`, `phpunit`, `prestissimo`, `protoc`, `psalm`, `symfony` or `symfony-cli`, `vapor` or `vapor-cli`, `wp` or `wp-cli`
 
 ```yaml
 - name: Setup PHP with tools
@@ -196,7 +207,7 @@ These tools can be setup globally using the `tools` input.
     tools: php-cs-fixer, phpunit
 ```
 
-- To set up a particular version of a tool, specify it in the form `tool:version`. The latest stable version of `composer` is set up by default. You can set up the required `composer` version by specifying `v1`, `v2`, `snapshot` or `preview` as versions or the exact version in semver format.
+- To set up a particular version of a tool, specify it in the form `tool:version`. The latest stable version of `composer` is set up by default. You can set up the required `composer` version by specifying `v1`, `v2`, `snapshot` or `preview` as versions, or the exact version in semver format.
 
 ```yaml
 - name: Setup PHP with composer v2
@@ -206,7 +217,17 @@ These tools can be setup globally using the `tools` input.
     tools: composer:v2
 ```
 
-- If you have specified composer plugins `prestissimo` or `composer-prefetcher` in tools, the latest stable version of `composer v1` will be setup. Unless some of your packages require `composer v1`, it is recommended to drop `prestissimo` and use `composer v2`.
+- 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.
 
@@ -220,6 +241,16 @@ These tools can be setup globally using the `tools` input.
     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
@@ -241,7 +272,7 @@ These tools can be setup globally using the `tools` input.
 
 ### Xdebug
 
-Specify `coverage: xdebug` to use `Xdebug`.  
+Specify `coverage: xdebug` to use `Xdebug` and disable `PCOV`.  
 Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action").
 
 ```yaml
@@ -252,12 +283,23 @@ Runs on all [PHP versions supported](#tada-php-support "List of PHP versions sup
     coverage: xdebug
 ```
 
+- The latest version of Xdebug compatible with the PHP version is set up by default.
+- If you need Xdebug 2.x on PHP 7.2, 7.3 or 7.4, you can specify `coverage: xdebug2`.
+
+```yaml
+- name: Setup PHP with Xdebug 2.x
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    coverage: xdebug2
+```
+
 ### PCOV
 
 Specify `coverage: pcov` to use `PCOV` and disable `Xdebug`.  
-`PCOV` supports `PHP 7.1` and newer PHP versions.  
+Runs on PHP 7.1 and newer PHP versions.
-Tests with `PCOV` run much faster than with `Xdebug`.  
+
-If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  
+- If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  
 
 ```yaml
 - name: Setup PHP with PCOV
@@ -268,9 +310,8 @@ If your source code directory is other than `src`, `lib` or, `app`, specify `pco
     coverage: pcov
 ```
 
-`PHPUnit` 8 and above supports `PCOV` out of the box.  
+- PHPUnit 8.x and above supports PCOV out of the box.  
-If you are using `PHPUnit` 5, 6 or 7, you will need `krakjoe/pcov-clobber`.  
+- If you are using PHPUnit 5.x, 6.x or 7.x, you need to set up `pcov/clobber` before executing your tests.
-Before executing your tests add the following step.
 
 ```yaml
 - name: Setup PCOV
@@ -282,12 +323,14 @@ Before executing your tests add the following step.
 ### Disable Coverage
 
 Specify `coverage: none` to remove both `Xdebug` and `PCOV`.
-Consider disabling the coverage using this PHP action for these reasons.
+
+Disable coverage for these reasons:
 
 - You are not generating coverage reports while testing.
 - It will remove `Xdebug`, which will have a positive impact on PHP performance.
 - 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
@@ -308,6 +351,7 @@ Consider disabling the coverage using this PHP action for these reasons.
 - Specify the PHP version you want to set up.
 - Accepts a `string`. For example `'7.4'`.
 - Accepts `latest` to set up the latest stable PHP version.
+- Accepts the format `d.x`, where `d` is the major version. For example `5.x`, `7.x` and `8.x`.  
 - See [PHP support](#tada-php-support) for supported PHP versions.
 
 #### `extensions` (optional)
@@ -320,7 +364,8 @@ Consider disabling the coverage using this PHP action for these reasons.
 #### `ini-values` (optional)
 
 - Specify the values you want to add to `php.ini`. 
-- Accepts a `string` in csv-format. For example `post_max_size=256M, short_open_tag=On`.
+- Accepts a `string` in csv-format. For example `post_max_size=256M, max_execution_time=180`.
+- Accepts ini values with commas if wrapped in quotes. For example `xdebug.mode="develop,coverage"`.  
 
 #### `coverage` (optional)
 
@@ -347,7 +392,7 @@ Consider disabling the coverage using this PHP action for these reasons.
 
 #### `phpts` (optional)
 
-- Specify to set up thread-safe version of PHP on windows.
+- Specify to set up thread-safe version of PHP on Windows.
 - Accepts `ts` and `nts`.
 - By default, it is set to `nts`.
 - See [thread safe setup](#thread-safe-setup) for more info.
@@ -357,7 +402,7 @@ Consider disabling the coverage using this PHP action for these reasons.
 - Specify to update PHP on the runner to the latest patch version.
 - Accepts `true` and `false`.
 - By default, it is set to `false`.
-- See [force update](#force-update) for more info.
+- See [force update setup](#force-update-setup) for more info.
 
 See below for more info.
 
@@ -375,7 +420,7 @@ steps:
   with:
     php-version: '7.4'
     extensions: mbstring, intl
-    ini-values: post_max_size=256M, short_open_tag=On
+    ini-values: post_max_size=256M, max_execution_time=180
     coverage: xdebug    
     tools: php-cs-fixer, phpunit
 ```
@@ -390,9 +435,13 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: ['ubuntu-latest', 'windows-latest', 'macos-latest']
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.3', '7.4']
-    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
+        phpunit-versions: ['latest']
+        include:
+        - operating-system: 'ubuntu-latest'
+          php-versions: '7.2'
+          phpunit-versions: '8.5.13'    
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -402,11 +451,87 @@ jobs:
       with:
         php-version: ${{ matrix.php-versions }}
         extensions: mbstring, intl
-        ini-values: post_max_size=256M, short_open_tag=On
+        ini-values: post_max_size=256M, max_execution_time=180
+        coverage: xdebug        
+        tools: php-cs-fixer, phpunit:${{ matrix.phpunit-versions }}
+```
+
+### Nightly Build Setup
+
+> Setup a nightly build of `PHP 8.1`. 
+
+- This version is currently in development.
+- Some user space extensions might not support this version currently.
+
+```yaml
+steps:
+- name: Checkout
+  uses: actions/checkout@v2
+
+- name: Setup nightly PHP
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '8.1'
+    extensions: mbstring
+    ini-values: post_max_size=256M, max_execution_time=180
     coverage: xdebug
     tools: php-cs-fixer, phpunit
 ```
 
+### Thread Safe Setup
+
+> Setup `TS` or `NTS` PHP on `Windows`.
+
+- `NTS` versions are setup by default.
+- On `Ubuntu` and `macOS` only `NTS` versions are supported.
+- On `Windows` both `TS` and `NTS` versions are supported.
+
+```yaml
+jobs:
+  run:
+    runs-on: windows-latest
+    name: Setup PHP TS on Windows
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.4'
+      env:
+        phpts: ts # specify ts or nts
+```
+
+### Force Update Setup
+
+> Update to the latest patch of PHP versions.
+
+- Pre-installed PHP versions on the GitHub Actions images are not updated to their latest patch release by default.
+- You can specify the `update` environment variable to `true` for updating to the latest release.
+
+```yaml
+- name: Setup PHP with latest versions
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+  env:
+    update: true # specify true or false
+```
+
+### Verbose Setup
+
+> Debug your workflow
+
+To debug any issues, you can use the `verbose` tag instead of `v2`.
+
+```yaml
+- name: Setup PHP with logs
+  uses: shivammathur/setup-php@verbose
+  with:
+    php-version: '7.4'
+```
+
 ### Multi-Arch Setup
 
 > Setup PHP on multiple architecture on Ubuntu GitHub Runners.
@@ -433,43 +558,18 @@ jobs:
           # Install PHP
           spc --php-version "7.4" \
               --extensions "mbstring, intl" \
-              --ini-values "post_max_size=256M, short_open_tag=On" \
+              --ini-values "post_max_size=256M, max_execution_time=180" \
               --coverage "xdebug" \
               --tools "php-cs-fixer, phpunit"
 ```
 
-### Nightly Build Setup
-
-> Setup a nightly build of `PHP 8.0` or `PHP 8.1`. 
-
-- These versions are currently in development.
-- `PECL` is installed by default with these versions on `ubuntu` and `macOS`.
-- Some user space extensions might not support these versions currently.
-- Refer to this [RFC](https://wiki.php.net/rfc/jit "PHP JIT RFC configuration") for configuring `PHP JIT` on these versions.
-- Refer to this [list of RFCs](https://wiki.php.net/rfc#php_80 "List of RFCs implemented in PHP8") for features implemented in `PHP 8.0`.
-
-```yaml
-steps:
-- name: Checkout
-  uses: actions/checkout@v2
-
-- name: Setup nightly PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '8.1'
-    extensions: mbstring
-    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1
-    coverage: pcov
-    tools: php-cs-fixer, phpunit
-```
-
 ### Self Hosted Setup
 
 > Setup PHP on a self-hosted runner.
 
 - To set up a dockerized self-hosted runner, refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Ubuntu) to set up in an `Ubuntu` container and refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Windows) to set up in a `Windows` container.
 - To set up the runner directly on the host OS or in a virtual machine, follow this [requirements guide](https://github.com/shivammathur/setup-php/wiki/Requirements-for-self-hosted-runners "Requirements guide for self-hosted runner to run setup-php") before setting up the self-hosted runner.
-- If your workflow uses [services](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idservices "GitHub Actions Services"), then setup the runner on a Linux host or in a Linux virtual machine. GitHub Actions does not support nested virtualization on Linux, so services will not work in a dockerized container.
+- If your workflow uses [service containers](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idservices "GitHub Actions Services"), then setup the runner on a Linux host or in a Linux virtual machine. GitHub Actions does not support nested virtualization on Linux, so services will not work in a dockerized container.
 
 Specify the environment variable `runner` with the value `self-hosted`. Without this your workflow will fail.
 
@@ -517,74 +617,42 @@ jobs:
         php-version: 7.4
 ```
 
-Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker image.
+Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker images.
+
+Choose the image tag which matches the `runs-on` property in your workflow. For example, if you are using `ubuntu-20.04` in your workflow, run `act -P ubuntu-20.04=shivammathur/node:20.04`.
 
 ```bash
 # For runs-on: ubuntu-latest
 act -P ubuntu-latest=shivammathur/node:latest
 
 # For runs-on: ubuntu-20.04
-act -P ubuntu-20.04=shivammathur/node:focal
+act -P ubuntu-20.04=shivammathur/node:2004
 
 # For runs-on: ubuntu-18.04
-act -P ubuntu-18.04=shivammathur/node:bionic
+act -P ubuntu-18.04=shivammathur/node:1804
 
-# For runs-on: ubuntu-16.04
+# For runs-on: ubuntu-16.04 (deprecated)
-act -P ubuntu-16.04=shivammathur/node:xenial
+act -P ubuntu-16.04=shivammathur/node:1604
 ```
 
-### Thread Safe Setup
+### JIT Configuration
 
-> Setup `TS` or `NTS` PHP on `Windows`.
+> Enable Just-in-time(JIT) on PHP 8.0 and PHP 8.1.
 
-- `NTS` versions are setup by default.
+- To enable JIT, enable `opcache` in cli mode by setting `opcache.enable_cli=1`.
-- On `Ubuntu` and `macOS` only `NTS` versions are supported.
+- 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.
-- On `Windows` both `TS` and `NTS` versions are supported.
+- By default, `opcache.jit=1235` and `opcache.jit_buffer_size=256M` are set which can be changed using `ini-values` input.
+- For detailed information about JIT related directives refer to the [`official PHP documentation`](https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit "opcache.jit documentation").
+
+For example to enable JIT in `tracing` mode with buffer size of `64 MB`. 
 
 ```yaml
-jobs:
+- name: Setup PHP with JIT in tracing mode
-  run:
-    runs-on: windows-latest
-    name: Setup PHP TS on Windows
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-        php-version: '7.4'
+    php-version: '8.0'
-      env:
+    coverage: none
-        phpts: ts # specify ts or nts
+    ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M
-```
-
-### Force Update
-
-> Update to the latest patch of PHP versions.
-
-- Pre-installed PHP versions on the GitHub Actions runner are not updated to their latest patch release by default.
-- You can specify the `update` environment variable to `true` to force update to the latest release.
-
-```yaml
-- name: Setup PHP with latest versions
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-  env:
-    update: true # specify true or false
-```
-
-### Verbose Setup
-
-> Debug your workflow
-
-To debug any issues, you can use the `verbose` tag instead of `v2`.
-
-```yaml
-- name: Setup PHP with logs
-  uses: shivammathur/setup-php@verbose
-  with:
-    php-version: '7.4'
 ```
 
 ### Cache Extensions
@@ -759,9 +827,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, 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, 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.
 - 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 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, security patches 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.
 
@@ -776,35 +844,42 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
 > Contributions are welcome!
 
 - See [Contributor's Guide](.github/CONTRIBUTING.md "shivammathur/setup-php contribution guide") before you start.
-- If you face any issues while using this or want to suggest a feature/improvement, create an issue [here](https://github.com/shivammathur/setup-php/issues "Issues reported").
+- If you face any issues or want to suggest a feature/improvement, start a discussion [here](https://github.com/shivammathur/setup-php/discussions "Setup PHP discussions").
 
-*Join the list of setup-php contributors*
+*Contributors of `setup-php` and other related projects*
 
 <p align="center">
   <a href="https://github.com/shivammathur/setup-php/graphs/contributors">
-    <img src="https://opencollective.com/setup-php/contributors.svg?width=1024&button=false" alt="setup-php contributors" width="100%">
+    <img src="https://setup-php.com/contributors/?" alt="Contributors of setup-php and related projects" 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:
+  - [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 star the project and share it. If you blog, please share your experience of using this action.
-- Please consider supporting our work by sponsoring using [Open Collective](https://opencollective.com/setup-php), [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal") or [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon").
-- If you use `setup-php` at your company, please [reach out](mailto:contact@setup-php.com) to sponsor the project.
 
-*Huge thanks to the following companies for supporting `setup-php`*
+*`setup-php` is generously supported by*
 
 <p>
   <a href="https://www.jetbrains.com/?from=setup-php">
-    <img src="https://shivammathur.com/jetbrains.svg" alt="JetBrains" width="106" height="60">
+    <img src="https://setup-php.com/sponsors/jetbrains.svg" alt="JetBrains" width="106" height="60">
   </a>
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   <a href="https://blackfire.io/?utm_source=setup-php">
-    <img src="https://shivammathur.com/blackfire.svg" alt="Blackfire" width="212" height="60">
+    <img src="https://setup-php.com/sponsors//blackfire.svg" alt="Blackfire" width="212" height="60">
+  </a>
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="https://www.macstadium.com/?source=setup-php">
+    <img src="https://setup-php.com/sponsors//macstadium.png" alt="Mac Stadium" width="148" height="60">
   </a>
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   <a href="https://tidelift.com/subscription/pkg/npm-setup-php">
-    <img src="https://shivammathur.com/tidelift.png" alt="Tidelift" width="70" height="60">
+    <img src="https://setup-php.com/sponsors//tidelift.png" alt="Tidelift" width="70" height="60">
   </a>  
 </p>
 
@@ -812,7 +887,6 @@ 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")

__tests__/config.test.ts

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

__tests__/coverage.test.ts

@@ -30,39 +30,29 @@ describe('Config tests', () => {
     expect(win32).toContain('Add-Extension xdebug');
   });
 
+  it('checking addCoverage with Xdebug3 on windows', async () => {
+    const win32: string = await coverage.addCoverage('xdebug3', '7.4', 'win32');
+    expect(win32).toContain('Add-Extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug2 on windows', async () => {
+    const win32: string = await coverage.addCoverage('xdebug2', '7.4', 'win32');
+    expect(win32).toContain('Add-Extension xdebug stable 2.9.8');
+  });
+
   it('checking addCoverage with Xdebug on linux', async () => {
     const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
     expect(linux).toContain('add_extension xdebug');
   });
 
-  it('checking addCoverage with Xdebug3 on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug3', '7.4', 'linux');
-    expect(linux).toContain('add_extension_from_source xdebug');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
-  });
-
   it('checking addCoverage with Xdebug3 on linux', async () => {
     const linux: string = await coverage.addCoverage('xdebug3', '8.0', 'linux');
     expect(linux).toContain('add_extension xdebug');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
   });
 
-  it('checking addCoverage with Xdebug on linux', async () => {
+  it('checking addCoverage with Xdebug2 on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
+    const linux: string = await coverage.addCoverage('xdebug2', '7.4', 'linux');
-    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('add_pecl_extension xdebug 2.9.8 zend_extension');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
-  });
-
-  it('checking addCoverage with Xdebug3 on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug3', '8.1', 'linux');
-    expect(linux).toContain('add_extension xdebug');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
-  });
-
-  it('checking addCoverage with Xdebug on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug', '8.1', 'linux');
-    expect(linux).toContain('add_extension xdebug');
-    expect(linux).toContain('echo "xdebug.mode=coverage"');
   });
 
   it('checking addCoverage with Xdebug on darwin', async () => {
@@ -74,6 +64,24 @@ describe('Config tests', () => {
     expect(darwin).toContain('add_brew_extension xdebug');
   });
 
+  it('checking addCoverage with Xdebug3 on darwin', async () => {
+    const darwin: string = await coverage.addCoverage(
+      'xdebug3',
+      '7.4',
+      'darwin'
+    );
+    expect(darwin).toContain('add_brew_extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug2 on darwin', async () => {
+    const darwin: string = await coverage.addCoverage(
+      'xdebug2',
+      '7.4',
+      'darwin'
+    );
+    expect(darwin).toContain('add_brew_extension xdebug2');
+  });
+
   it('checking disableCoverage windows', async () => {
     const win32 = await coverage.addCoverage('none', '7.4', 'win32');
     expect(win32).toContain('Remove-Extension xdebug');

__tests__/extensions.test.ts

@@ -3,7 +3,7 @@ import * as extensions from '../src/extensions';
 describe('Extension tests', () => {
   it('checking addExtensionOnWindows', async () => {
     let win32: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, phalcon4, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1',
+      'Xdebug, pcov, sqlite, :intl, phalcon4, pecl_http, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1',
       '7.4',
       'win32'
     );
@@ -12,6 +12,7 @@ describe('Extension tests', () => {
     expect(win32).toContain('Add-Extension sqlite3');
     expect(win32).toContain('Remove-Extension intl');
     expect(win32).toContain('Add-Phalcon phalcon4');
+    expect(win32).toContain('Add-Http');
     expect(win32).toContain('Add-Ioncube');
     expect(win32).toContain('Add-Oci oci8');
     expect(win32).toContain('Add-Oci pdo_oci');
@@ -25,6 +26,9 @@ describe('Extension tests', () => {
       'Add-Log "$cross" "pcov" "pcov is not supported on PHP 5.6"'
     );
 
+    win32 = await extensions.addExtension('xdebug2', '7.2', 'win32');
+    expect(win32).toContain('Add-Extension xdebug stable 2.9.8');
+
     win32 = await extensions.addExtension('mysql', '7.4', 'win32');
     expect(win32).toContain('Add-Extension mysqli');
     expect(win32).toContain('Add-Extension mysqlnd');
@@ -55,17 +59,24 @@ describe('Extension tests', () => {
 
     win32 = await extensions.addExtension('blackfire-1.31.0', '7.3', 'win32');
     expect(win32).toContain('Add-Blackfire blackfire-1.31.0');
+
+    win32 = await extensions.addExtension(
+      'mongodb-mongodb/mongo-php-driver@master',
+      '7.3',
+      'win32'
+    );
+    expect(win32).toContain(
+      'Add-Log "$cross" "mongodb-mongodb/mongo-php-driver@master" "mongodb-mongodb/mongo-php-driver@master is not supported on PHP 7.3"'
+    );
   });
 
   it('checking addExtensionOnLinux', async () => {
     let linux: string = await extensions.addExtension(
-      'Xdebug, xdebug3, pcov, sqlite, :intl, ast, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
+      'Xdebug, pcov, sqlite, :intl, ast, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
       '7.4',
       'linux'
     );
-    expect(linux).toContain(
+    expect(linux).toContain('add_extension xdebug');
-      'add_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension'
-    );
     expect(linux).toContain('add_extension sqlite3');
     expect(linux).toContain('remove_extension intl');
     expect(linux).toContain('add_unstable_extension ast beta extension');
@@ -96,6 +107,9 @@ describe('Extension tests', () => {
     linux = await extensions.addExtension('cubrid', '7.4', 'linux');
     expect(linux).toContain('add_cubrid cubrid');
 
+    linux = await extensions.addExtension('xdebug2', '7.2', 'linux');
+    expect(linux).toContain('add_pecl_extension xdebug 2.9.8 zend_extension');
+
     linux = await extensions.addExtension('xdebug', '7.2', 'openbsd');
     expect(linux).toContain('Platform openbsd is not supported');
 
@@ -106,6 +120,15 @@ describe('Extension tests', () => {
     linux = await extensions.addExtension('ioncube', '7.3', 'linux');
     expect(linux).toContain('add_ioncube');
 
+    linux = await extensions.addExtension('geos', '7.3', 'linux');
+    expect(linux).toContain('add_geos');
+
+    linux = await extensions.addExtension('pecl_http', '7.3', 'linux');
+    expect(linux).toContain('add_http');
+
+    linux = await extensions.addExtension('http-1.2.3', '7.3', 'linux');
+    expect(linux).toContain('add_http http-1.2.3');
+
     linux = await extensions.addExtension('oci8, pdo_oci', '7.3', 'linux');
     expect(linux).toContain('add_oci oci8');
     expect(linux).toContain('add_oci pdo_oci');
@@ -121,32 +144,48 @@ describe('Extension tests', () => {
 
     linux = await extensions.addExtension('intl-67.1', '7.3', 'linux');
     expect(linux).toContain('add_intl intl-67.1');
+
+    linux = await extensions.addExtension('intl-68.2', '8.0', 'linux');
+    expect(linux).toContain('add_intl intl-68.2');
+
+    linux = await extensions.addExtension(
+      'mongodb-mongodb/mongo-php-driver@master',
+      '7.3',
+      'linux'
+    );
+    expect(linux).toContain(
+      'add_extension_from_source mongodb https://github.com mongodb mongo-php-driver master extension'
+    );
   });
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, grpc, igbinary, imagick, protobuf, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
+      'amqp, 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',
       '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');
     expect(darwin).toContain('remove_extension intl');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
     expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
 
-    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');
 
@@ -156,6 +195,15 @@ describe('Extension tests', () => {
     darwin = await extensions.addExtension('ioncube', '7.3', 'darwin');
     expect(darwin).toContain('add_ioncube');
 
+    darwin = await extensions.addExtension('geos', '7.3', 'darwin');
+    expect(darwin).toContain('add_geos');
+
+    darwin = await extensions.addExtension('pecl_http', '7.3', 'darwin');
+    expect(darwin).toContain('add_http');
+
+    darwin = await extensions.addExtension('http-1.2.3', '7.3', 'darwin');
+    expect(darwin).toContain('add_http http-1.2.3');
+
     darwin = await extensions.addExtension('oci8, pdo_oci', '7.3', 'darwin');
     expect(darwin).toContain('add_oci oci8');
     expect(darwin).toContain('add_oci pdo_oci');
@@ -177,11 +225,8 @@ describe('Extension tests', () => {
     darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
     expect(darwin).toContain('add_brew_extension xdebug');
 
-    darwin = await extensions.addExtension('redis', '5.6', 'darwin');
+    darwin = await extensions.addExtension('xdebug2', '7.2', 'darwin');
-    expect(darwin).toContain('add_extension redis-2.2.8');
+    expect(darwin).toContain('add_brew_extension xdebug2');
-
-    darwin = await extensions.addExtension('redis', '7.2', 'darwin');
-    expect(darwin).toContain('add_extension redis');
 
     darwin = await extensions.addExtension('imagick', '5.5', 'darwin');
     expect(darwin).toContain('add_extension imagick');
@@ -202,5 +247,14 @@ describe('Extension tests', () => {
 
     darwin = await extensions.addExtension('xdebug', '7.2', 'openbsd');
     expect(darwin).toContain('Platform openbsd is not supported');
+
+    darwin = await extensions.addExtension(
+      'mongodb-mongodb/mongo-php-driver@master',
+      '7.3',
+      'darwin'
+    );
+    expect(darwin).toContain(
+      'add_extension_from_source mongodb https://github.com mongodb mongo-php-driver master extension'
+    );
   });
 });

__tests__/install.test.ts

@@ -5,7 +5,9 @@ import * as utils from '../src/utils';
  * Mock install.ts
  */
 jest.mock('../src/install', () => ({
-  getScript: jest.fn().mockImplementation(
+  getScript: jest
+    .fn()
+    .mockImplementation(
       async (
         filename: string,
         version: string,
@@ -37,8 +39,7 @@ jest.mock('../src/install', () => ({
         return script;
       }
     ),
-  run: jest.fn().mockImplementation(
+  run: jest.fn().mockImplementation(async (): Promise<string> => {
-    async (): Promise<string> => {
     const os_version: string = process.env['RUNNER_OS'] || '';
     const version: string = await utils.parseVersion(
       await utils.getInput('php-version', true)
@@ -52,8 +53,7 @@ jest.mock('../src/install', () => ({
       version,
       __dirname
     ].join(' ');
-    }
+  })
-  )
 }));
 
 /**
@@ -117,7 +117,7 @@ describe('Install', () => {
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');
-    expect(script).toContain('bash linux.sh 7.4 ');
+    expect(script).toContain('bash linux.sh 8.0 ');
 
     setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit');
 

__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 parseToolVersion', async () => {
+  it('checking parseTool', async () => {
     expect(await tools.parseTool('phpunit')).toStrictEqual({
       name: 'phpunit',
       version: 'latest'
@@ -65,6 +65,10 @@ 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 () => {
@@ -79,102 +83,23 @@ describe('Tools tests', () => {
     ).toBe('releases/download/v1.2.3/tool.phar');
   });
 
-  it('checking getCodeceptionUriBuilder', async () => {
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php56')).toBe(
-      'releases/3.2.1/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php54')).toBe(
-      'releases/3.2.1/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '')).toBe(
-      'releases/3.2.1/codecept.phar'
-    );
-  });
-
-  it('checking getCodeceptionUri', async () => {
-    expect(await tools.getCodeceptionUri('latest', '5.6')).toBe(
-      'php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.0')).toBe(
-      'php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.1')).toBe(
-      'php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.2')).toBe(
-      'codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.3')).toBe(
-      'codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.4')).toBe(
-      'codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('4.0.0', '7.4')).toBe(
-      'releases/4.0.0/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('4.0.0', '5.6')).toBe(
-      'releases/4.0.0/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('4.0.0', '7.1')).toBe(
-      'releases/4.0.0/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('3.1.0', '7.4')).toBe(
-      'releases/3.1.0/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('3.1.0', '5.6')).toBe(
-      'releases/3.1.0/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.5.4', '7.4')).toBe(
-      'releases/2.5.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.5.4', '5.6')).toBe(
-      'releases/2.5.4/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.3.4', '7.4')).toBe(
-      'releases/2.3.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.3.4', '5.4')).toBe(
-      'releases/2.3.4/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.2.4', '5.6')).toBe(
-      'releases/2.2.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.2.4', '7.4')).toBe(
-      'releases/2.2.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.2.4', '5.4')).toBe(
-      'releases/2.2.4/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.7', '5.6')).toBe(
-      'releases/2.1.7/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.7', '5.4')).toBe(
-      'releases/2.1.7/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.5', '5.4')).toBe(
-      'releases/2.1.5/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.5', '7.4')).toBe(
-      'releases/2.1.5/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('1.6.9', '7.4')).toBe(
-      'releases/1.6.9/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('1.5.0', '7.4')).toBe(
-      'releases/1.5.0/codecept.phar'
-    );
-  });
-
   it('checking addPhive', async () => {
-    let script: string = await tools.addPhive('1.2.3', 'linux');
+    let script: string = await tools.addPhive('1.2.3', '7.4', 'linux');
     expect(script).toContain(
       'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
     );
 
-    script = await tools.addPhive('latest', 'win32');
+    script = await tools.addPhive('latest', '5.5', 'win32');
+    expect(script).toContain('Phive is not supported on PHP 5.5');
+
+    script = await tools.addPhive('latest', '5.6', 'win32');
     expect(script).toContain(
-      'Add-Tool https://phar.io/releases/phive.phar phive'
+      'Add-Tool https://github.com/phar-io/phive/releases/download/0.12.1/phive-0.12.1.phar phive'
+    );
+
+    script = await tools.addPhive('latest', '7.1', 'win32');
+    expect(script).toContain(
+      'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.5/phive-0.13.5.phar phive'
     );
   });
 
@@ -227,9 +152,9 @@ describe('Tools tests', () => {
       'a',
       'b'
     ]);
-    expect(
+    expect(await tools.addComposer(['a', 'b', 'composer:1.2.3'])).toStrictEqual(
-      await tools.addComposer(['a', 'b', 'composer:1.2.3'])
+      ['composer:1.2.3', 'a', 'b']
-    ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
+    );
     expect(
       await tools.addComposer(['a', 'b', 'composer:v1.2.3'])
     ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
@@ -251,9 +176,6 @@ describe('Tools tests', () => {
     expect(
       await tools.addComposer(['a', 'b', 'c', 'composer:v2'])
     ).toStrictEqual(['composer:2', 'a', 'b', 'c']);
-    expect(
-      await tools.addComposer(['hirak', 'b', 'c', 'composer:v2'])
-    ).toStrictEqual(['composer:1', 'hirak', 'b', 'c']);
   });
 
   it('checking getComposerUrl', async () => {
@@ -316,22 +238,6 @@ 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'
@@ -492,7 +398,7 @@ describe('Tools tests', () => {
       'phpspec',
       'protoc:v1.2.3',
       'psalm',
-      'symfony',
+      'symfony-cli',
       'symfony:1.2.3',
       'vapor-cli',
       'wp-cli'
@@ -576,7 +482,6 @@ describe('Tools tests', () => {
     const listOfTools = [
       'blackfire',
       'blackfire-player:1.8.1',
-      'codeception',
       'cs2pr',
       'deployer',
       'does_not_exist',
@@ -587,7 +492,7 @@ describe('Tools tests', () => {
       'phpize',
       'phpmd',
       'symfony',
-      'wp-cli'
+      'wp'
     ];
 
     const script: string = await tools.addTools(
@@ -629,9 +534,13 @@ describe('Tools tests', () => {
   });
   it('checking addTools with composer tool using user/tool as input', async () => {
     const listOfTools = [
+      'composer:v1',
+      'codeception/codeception',
+      'prestissimo',
       'hirak/prestissimo',
+      'composer-prefetcher',
       'narrowspark/automatic-composer-prefetcher',
-      'robmorgan/phinx'
+      'robmorgan/phinx: ^1.2'
     ];
 
     const script: string = await tools.addTools(
@@ -644,9 +553,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 robmorgan/');
+    expect(script).toContain('Add-Composertool phinx phinx:^1.2 robmorgan/');
     expect(script).toContain(
-      'Add-Composertool composer-prefetcher composer-prefetcher narrowspark/automatic-'
+      'Add-Composertool automatic-composer-prefetcher automatic-composer-prefetcher narrowspark/'
     );
   });
   it('checking composer setup', async () => {
@@ -674,5 +583,15 @@ 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"'
+    );
   });
 });

__tests__/utils.test.ts

@@ -8,6 +8,10 @@ jest.mock('@actions/core', () => ({
   })
 }));
 
+jest.spyOn(utils, 'fetch').mockImplementation(async (url): Promise<string> => {
+  return `{ "latest": "8.0", "5.x": "5.6", "url": "${url}" }`;
+});
+
 async function cleanup(path: string): Promise<void> {
   fs.unlink(path, error => {
     if (error) {
@@ -33,20 +37,29 @@ describe('Utils tests', () => {
     }).rejects.toThrow('Input required and not supplied: DoesNotExist');
   });
 
+  it('checking fetch', async () => {
+    expect(await utils.fetch('test_url')).toBe(
+      '{ "latest": "8.0", "5.x": "5.6", "url": "test_url" }'
+    );
+  });
+
   it('checking parseVersion', async () => {
+    expect(await utils.parseVersion('latest')).toBe('8.0');
     expect(await utils.parseVersion('7')).toBe('7.0');
     expect(await utils.parseVersion('7.4')).toBe('7.4');
-    expect(await utils.parseVersion('latest')).toBe('7.4');
+    expect(await utils.parseVersion('5.x')).toBe('5.6');
+    expect(await utils.parseVersion('4.x')).toBe(undefined);
   });
 
   it('checking asyncForEach', async () => {
     const array: Array<string> = ['a', 'b', 'c'];
     let concat = '';
-    await utils.asyncForEach(array, async function (
+    await utils.asyncForEach(
-      str: string
+      array,
-    ): Promise<void> {
+      async function (str: string): Promise<void> {
         concat += str;
-    });
+      }
+    );
     expect(concat).toBe('abc');
   });
 
@@ -83,12 +96,12 @@ describe('Utils tests', () => {
     const runner_dir: string = process.env['RUNNER_TOOL_CACHE'] || '';
     const script_path: string = path.join(runner_dir, 'test.sh');
     await utils.writeScript('test.sh', testString);
-    await fs.readFile(script_path, function (
+    await fs.readFile(
-      error: Error | null,
+      script_path,
-      data: Buffer
+      function (error: Error | null, data: Buffer) {
-    ) {
         expect(testString).toBe(data.toString());
-    });
+      }
+    );
     await cleanup(script_path);
   });
 
@@ -110,6 +123,20 @@ describe('Utils tests', () => {
       'b=2',
       'c=3'
     ]);
+    expect(await utils.CSVArray('\'a=1,2\', "b=3, 4", c=5, d=~e~')).toEqual([
+      'a=1,2',
+      'b=3, 4',
+      'c=5',
+      "d='~e~'"
+    ]);
+    expect(await utils.CSVArray('a=\'1,2\', b="3, 4", c=5')).toEqual([
+      'a=1,2',
+      'b=3, 4',
+      'c=5'
+    ]);
+    expect(
+      await utils.CSVArray('a=E_ALL, b=E_ALL & ~ E_ALL, c="E_ALL", d=\'E_ALL\'')
+    ).toEqual(['a=E_ALL', 'b=E_ALL & ~ E_ALL', 'c=E_ALL', 'd=E_ALL']);
     expect(await utils.CSVArray('')).toEqual([]);
     expect(await utils.CSVArray(' ')).toEqual([]);
   });
@@ -230,4 +257,31 @@ 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'
+    );
+  });
 });

action.yml

@@ -1,13 +1,13 @@
 name: 'Setup PHP Action'
 author: shivammathur
-description: 'Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer'
+description: 'GitHub Action for PHP'
 branding:
   color: 'purple'
   icon: 'play-circle'
 inputs:
   php-version:
     description: 'Setup PHP version.'
-    default: '7.4'
+    default: '8.0'
     required: true
   extensions:
     description: 'Setup PHP extensions.'

examples/symfony-mysql.yml

@@ -43,10 +43,11 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
+          composer require --dev symfony/orm-pack symfony/phpunit-bridge
           composer install --no-progress --prefer-dist --optimize-autoloader
+          php bin/phpunit install
       - name: Run Migration
         run: |
-          composer require symfony/orm-pack
           php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
           php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
         env:

examples/symfony-postgres.yml

@@ -41,10 +41,11 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
+          composer require --dev symfony/orm-pack symfony/phpunit-bridge
           composer install --no-progress --prefer-dist --optimize-autoloader
+          php bin/phpunit install
       - name: Run Migration
         run: |
-          composer require symfony/orm-pack
           php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
           php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
         env:

examples/symfony.yml

@@ -32,7 +32,8 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer require symfony/orm-pack
+          composer require --dev symfony/phpunit-bridge
           composer install --no-progress --prefer-dist --optimize-autoloader
+          php bin/phpunit install
       - name: Run Tests
         run: php bin/phpunit --coverage-text

package.json

@@ -1,15 +1,15 @@
 {
   "name": "setup-php",
-  "version": "2.8.0",
+  "version": "2.11.0",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
-  "main": "dist/index.js",
+  "main": "lib/install.js",
   "scripts": {
     "build": "tsc",
     "lint": "eslint **/*.ts --cache --fix",
     "format": "prettier --write **/*.ts && git add .",
     "format-check": "prettier --check **/*.ts",
-    "release": "ncc build src/install.ts -o dist && git add -f dist/",
+    "release": "ncc build -o dist && git add -f dist/",
     "test": "jest"
   },
   "repository": {
@@ -24,28 +24,28 @@
   "author": "shivammathur",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.3.0",
     "@actions/exec": "^1.0.4",
-    "@actions/io": "^1.0.2",
+    "@actions/io": "^1.1.0",
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.15",
+    "@types/jest": "^26.0.23",
-    "@types/node": "^14.14.7",
+    "@types/node": "^15.6.1",
-    "@typescript-eslint/eslint-plugin": "^4.7.0",
+    "@typescript-eslint/eslint-plugin": "^4.25.0",
-    "@typescript-eslint/parser": "^4.7.0",
+    "@typescript-eslint/parser": "^4.25.0",
-    "@zeit/ncc": "^0.22.3",
+    "@vercel/ncc": "^0.28.6",
-    "eslint": "^7.13.0",
+    "eslint": "^7.27.0",
-    "eslint-config-prettier": "^6.15.0",
+    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jest": "^24.1.3",
+    "eslint-plugin-jest": "^24.3.6",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-prettier": "^3.4.0",
-    "husky": "^4.3.0",
+    "husky": "^4.3.8",
-    "jest": "^26.6.3",
+    "jest": "^27.0.3",
-    "jest-circus": "^26.6.3",
+    "jest-circus": "^27.0.3",
-    "prettier": "^2.1.2",
+    "prettier": "^2.3.0",
-    "ts-jest": "^26.4.4",
+    "ts-jest": "^27.0.1",
-    "typescript": "^4.0.5"
+    "typescript": "^4.3.2"
   },
   "husky": {
     "skipCI": true,

src/config.ts

@@ -14,7 +14,12 @@ export async function addINIValuesUnix(
     script +=
       '\n' + (await utils.addLog('$tick', line, 'Added to php.ini', 'linux'));
   });
-  return 'echo "' + ini_values.join('\n') + '" >> $ini_file' + script;
+  return (
+    'echo "' +
+    ini_values.join('\n') +
+    '" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null 2>&1' +
+    script
+  );
 }
 
 /**

src/configs/php-versions.json

@@ -0,0 +1,6 @@
+{
+  "latest": "8.0",
+  "5.x": "5.6",
+  "7.x": "7.4",
+  "8.x": "8.0"
+}

src/coverage.ts

@@ -16,28 +16,19 @@ export async function addCoverageXdebug(
   os_version: string,
   pipe: string
 ): Promise<string> {
-  const xdebug =
+  let script = '\n';
+  script +=
+    (await extensions.addExtension(':pcov', version, os_version, true)) + pipe;
+  script +=
     (await extensions.addExtension(extension, version, os_version, true)) +
     pipe;
-  const ini = await config.addINIValues(
+  script += await utils.addLog(
-    'xdebug.mode=coverage',
-    os_version,
-    true
-  );
-  const log = await utils.addLog(
     '$tick',
     extension,
     'Xdebug enabled as coverage driver',
     os_version
   );
-  switch (true) {
+  return script;
-    case /^xdebug3$/.test(extension):
-    case /^8\.\d$/.test(version):
-      return '\n' + xdebug + '\n' + ini + '\n' + log;
-    case /^xdebug$/.test(extension):
-    default:
-      return xdebug + '\n' + log;
-  }
 }
 
 /**
@@ -55,24 +46,15 @@ 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',
@@ -109,17 +91,11 @@ export async function disableCoverage(
   pipe: string
 ): Promise<string> {
   let script = '\n';
-  switch (os_version) {
+  script +=
-    case 'linux':
+    (await extensions.addExtension(':pcov', version, os_version, true)) + pipe;
-    case 'darwin':
+  script +=
-      script += 'remove_extension xdebug' + pipe + '\n';
+    (await extensions.addExtension(':xdebug', version, os_version, true)) +
-      script += 'remove_extension pcov' + pipe + '\n';
+    pipe;
-      break;
-    case 'win32':
-      script += 'Remove-Extension xdebug' + pipe + '\n';
-      script += 'Remove-Extension pcov' + pipe + '\n';
-      break;
-  }
   script += await utils.addLog(
     '$tick',
     'none',
@@ -145,15 +121,18 @@ 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);
+  const pipe: string = (await utils.suppressOutput(os_version)) + '\n';
   switch (coverage_driver) {
     case 'pcov':
       return script + (await addCoveragePCOV(version, os_version, pipe));
     case 'xdebug':
     case 'xdebug3':
       return (
-        script +
+        script + (await addCoverageXdebug('xdebug', version, os_version, pipe))
-        (await addCoverageXdebug(coverage_driver, version, os_version, pipe))
+      );
+    case 'xdebug2':
+      return (
+        script + (await addCoverageXdebug('xdebug2', version, os_version, pipe))
       );
     case 'none':
       return script + (await disableCoverage(version, os_version, pipe));

src/extensions.ts

@@ -17,24 +17,28 @@ export async function addExtensionDarwin(
     const version_extension: string = version + extension;
     const [ext_name, ext_version]: string[] = extension.split('-');
     const ext_prefix = await utils.getExtensionPrefix(ext_name);
+
     switch (true) {
       // match :extension
       case /^:/.test(ext_name):
         remove_script += '\nremove_extension ' + ext_name.slice(1);
         return;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
+      // match extensions for compiling from source
-      // match 5.3blackfire-(semver)...5.6blackfire-(semver), 7.0blackfire-(semver)...7.4blackfire-(semver)
+      case /.+-.+\/.+@.+/.test(extension):
-      // match pdo_oci and oci8
+        add_script += await utils.parseExtensionSource(extension, ext_prefix);
-      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+        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 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      // match 5.6couchbase...7.4couchbase
+      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
-      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^couchbase$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+        extension
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+      ):
-      case /^5\.6couchbase$|^7\.[0-4]couchbase$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
           'ext',
@@ -43,7 +47,7 @@ export async function addExtensionDarwin(
         );
         return;
       // match pre-release versions. For example - xdebug-beta
-      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
+      case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
         add_script += await utils.joins(
           '\nadd_unstable_extension',
           ext_name,
@@ -52,7 +56,7 @@ export async function addExtensionDarwin(
         );
         return;
       // match semver
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
+      case /.+-\d+\.\d+\.\d+.*/.test(extension):
         add_script += await utils.joins(
           '\nadd_pecl_extension',
           ext_name,
@@ -64,24 +68,21 @@ export async function addExtensionDarwin(
       case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
         add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
         return;
-      // match 5.6xdebug to 8.9xdebug, 5.6igbinary to 8.9igbinary
+      // match 5.6 and newer - amqp, apcu, grpc, igbinary, imagick, imap, msgpack, protobuf, raphf, redis, swoole, xdebug, xdebug2, zmq
-      // match 5.6grpc to 7.4grpc, 5.6imagick to 7.4imagick, 5.6protobuf to 7.4protobuf, 5.6swoole to 7.4swoole
+      // match 7.1 and newer - pcov
-      // match 7.1pcov to 8.9pcov
+      // match 5.6 to 7.4 - propro
-      case /(5\.6|7\.[0-4]|8\.[0-9])(xdebug|igbinary)/.test(version_extension):
+      case /(?<!5\.[3-5])(amqp|apcu|grpc|igbinary|imagick|imap|memcache|memcached|msgpack|protobuf|psr|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(
-      case /(5\.6|7\.[0-4])(grpc|imagick|protobuf|swoole)/.test(
         version_extension
       ):
-      case /(7\.[1-4]|8\.[0-9])pcov/.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):
         add_script += await utils.joins(
           '\nadd_brew_extension',
           ext_name,
           ext_prefix
         );
         return;
-      // match 5.6redis
-      case /5\.6redis/.test(version_extension):
-        extension = 'redis-2.2.8';
-        break;
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
@@ -116,17 +117,19 @@ export async function addExtensionWindows(
       case /^:/.test(ext_name):
         remove_script += '\nRemove-Extension ' + ext_name.slice(1);
         break;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
+      // match 5.3blackfire...8.0blackfire
-      // match 5.3blackfire-(semver)...5.6blackfire-(semver), 7.0blackfire-(semver)...7.4blackfire-(semver)
+      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
       // match pdo_oci and oci8
-      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 5.3ioncube...7.4ioncube
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      // match 7.1pecl_http...8.0pecl_http and 7.1http...8.0http
+      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
-      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^(5\.[3-6]|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):
         add_script += await utils.customPackage(
           ext_name,
           'ext',
@@ -135,15 +138,23 @@ export async function addExtensionWindows(
         );
         return;
       // match pre-release versions. For example - xdebug-beta
-      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
+      case /.+-(stable|beta|alpha|devel|snapshot)/.test(extension):
         add_script += await utils.joins(
           '\nAdd-Extension',
           ext_name,
-          ext_version
+          ext_version.replace('stable', '')
+        );
+        break;
+      // match extensions for compiling from source
+      case /.+-.+\/.+@.+/.test(extension):
+        add_script += await utils.getUnsupportedLog(
+          extension,
+          version,
+          'win32'
         );
         break;
       // match semver without state
-      case /.*-\d+\.\d+\.\d+$/.test(version_extension):
+      case /.+-\d+\.\d+\.\d+$/.test(extension):
         add_script += await utils.joins(
           '\nAdd-Extension',
           ext_name,
@@ -152,8 +163,8 @@ export async function addExtensionWindows(
         );
         break;
       // match semver with state
-      case /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.test(version_extension):
+      case /.+-\d+\.\d+\.\d+[a-zA-Z]+\d*/.test(extension):
-        matches = /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.exec(
+        matches = /.+-(\d+\.\d+\.\d+)([a-zA-Z]+)\d*/.exec(
           version_extension
         ) as RegExpExecArray;
         add_script += await utils.joins(
@@ -163,21 +174,23 @@ export async function addExtensionWindows(
           matches[1]
         );
         break;
+      // match 7.2xdebug2 to 7.4xdebug2
+      case /7\.[2-4]xdebug2/.test(version_extension):
+        add_script += '\nAdd-Extension xdebug stable 2.9.8';
+        break;
       // match 5.3pcov to 7.0pcov
       case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
         add_script += await utils.getUnsupportedLog('pcov', version, 'win32');
         break;
-      // match 5.3mysql..5.6mysql
+      // match 5.3 to 5.6 - mysql, mysqli, mysqlnd
-      // match 5.3mysqli..5.6mysqli
+      case /^5\.[3-6](?<!pdo_)(mysql|mysqli|mysqlnd)$/.test(version_extension):
-      // match 5.3mysqlnd..5.6mysqlnd
-      case /^5\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
         add_script +=
           '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
         break;
-      // match 7.0mysql..8.9mysql
+      // match 7.0 and newer mysql, mysqli and mysqlnd
-      // match 7.0mysqli..8.9mysqli
+      case /(?<!5\.[3-6])(?<!pdo_)(mysql|mysqli|mysqlnd)$/.test(
-      // match 7.0mysqlnd..8.9mysqlnd
+        version_extension
-      case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
+      ):
         add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
         break;
       // match sqlite
@@ -210,31 +223,34 @@ export async function addExtensionLinux(
     const version_extension: string = version + extension;
     const [ext_name, ext_version]: string[] = extension.split('-');
     const ext_prefix = await utils.getExtensionPrefix(ext_name);
+
     switch (true) {
       // Match :extension
       case /^:/.test(ext_name):
         remove_script += '\nremove_extension ' + ext_name.slice(1);
         return;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
+      // match extensions for compiling from source
-      // match 5.3blackfire-(semver)...5.6blackfire-(semver), 7.0blackfire-(semver)...7.4blackfire-(semver)
+      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 pdo_oci and oci8
+      // match couchbase, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 5.3ioncube...7.4ioncube
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      // match 5.6gearman...7.4gearman, 5.6couchbase...7.4couchbase
+      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
         version_extension
       ):
-      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^couchbase$|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
-      case /^5\.6intl-[\d]+\.[\d]+$|^7\.[0-4]intl-[\d]+\.[\d]+$/.test(
+        extension
-        version_extension
       ):
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /(?<!5\.[3-5])intl-[\d]+\.[\d]+$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-      case /^((5\.6)|(7\.[0-4]))(gearman|couchbase)$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
           'ext',
@@ -243,7 +259,7 @@ export async function addExtensionLinux(
         );
         return;
       // match pre-release versions. For example - xdebug-beta
-      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
+      case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
         add_script += await utils.joins(
           '\nadd_unstable_extension',
           ext_name,
@@ -252,7 +268,7 @@ export async function addExtensionLinux(
         );
         return;
       // match semver versions
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
+      case /.+-\d+\.\d+\.\d+.*/.test(extension):
         add_script += await utils.joins(
           '\nadd_pecl_extension',
           ext_name,
@@ -264,17 +280,17 @@ export async function addExtensionLinux(
       case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
         add_script += await utils.getUnsupportedLog('pcov', version, 'linux');
         return;
-      // match 7.2xdebug3..7.4xdebug3
+      // match 7.2xdebug2...7.4xdebug2
-      case /^7\.[2-4]xdebug3$/.test(version_extension):
+      case /^7\.[2-4]xdebug2$/.test(version_extension):
-        add_script +=
+        add_script += await utils.joins(
-          '\nadd_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension';
+          '\nadd_pecl_extension',
+          'xdebug',
+          '2.9.8',
+          ext_prefix
+        );
         return;
-      // match 8.0xdebug3...8.9xdebug3
-      case /^8\.[0-9]xdebug3$/.test(version_extension):
-        extension = 'xdebug';
-        break;
       // match pdo extensions
-      case /.*pdo[_-].*/.test(version_extension):
+      case /^pdo[_-].+/.test(extension):
         extension = extension.replace(/pdo[_-]|3/, '');
         add_script += '\nadd_pdo_extension ' + extension;
         return;

src/install.ts

@@ -1,4 +1,4 @@
-import {exec} from '@actions/exec/lib/exec';
+import {exec} from '@actions/exec';
 import * as core from '@actions/core';
 import * as config from './config';
 import * as coverage from './coverage';
@@ -25,10 +25,7 @@ export async function getScript(
   const extension_csv: string = await utils.getInput('extensions', false);
   const ini_values_csv: string = await utils.getInput('ini-values', false);
   const coverage_driver: string = await utils.getInput('coverage', false);
-  let tools_csv: string = await utils.getInput('tools', false);
+  const tools_csv: string = await utils.getInput('tools', false);
-  if (/.*-(beta|alpha|devel|snapshot|\d+\.\d+\.\d+).*/.test(extension_csv)) {
-    tools_csv = 'pecl, ' + tools_csv;
-  }
 
   let script: string = await utils.readScript(filename);
   script += await tools.addTools(tools_csv, version, os_version);
@@ -54,18 +51,31 @@ 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)
     );
+    if (version) {
       const os_version: string = process.platform;
       const tool = await utils.scriptTool(os_version);
       const script = os_version + (await utils.scriptExtension(os_version));
       const location = await getScript(script, version, os_version);
       await exec(await utils.joins(tool, location, version, __dirname));
+    } else {
+      core.setFailed('Unable to get the PHP version');
+    }
   } catch (error) {
     core.setFailed(error.message);
   }
 }
 
 // call the run function
-run();
+(async () => {
+  await run();
+})().catch(error => {
+  core.setFailed(error.message);
+});

src/scripts/common.sh

@@ -2,14 +2,17 @@
 export tick="✓"
 export cross="✗"
 export curl_opts=(-sL)
-export nightly_versions="8.[0-1]"
 export old_versions="5.[3-5]"
+export jit_versions="8.[0-9]"
+export nightly_versions="8.[1-9]"
+export xdebug3_versions="7.[2-4]|8.[0-9]"
 export tool_path_dir="/usr/local/bin"
 export composer_bin="$HOME/.composer/vendor/bin"
 export composer_json="$HOME/.composer/composer.json"
+export composer_lock="$HOME/.composer/composer.lock"
 export latest="releases/latest/download"
 export github="https://github.com/shivammathur"
-export bintray="https://dl.bintray/shivammathur"
+export jsdeliver="https://cdn.jsdelivr.net/gh/shivammathur"
 
 # Function to log start of a operation.
 step_log() {
@@ -26,18 +29,15 @@ 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 "$extension_name" && add_log "$tick" "$extension_name" "$status"
+    check_extension "$(echo "$1" | cut -d '-' -f 1)" && add_log "$tick" "$1" "$2"
-  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP ${semver:?}"
+  ) || add_log "$cross" "$1" "Could not install $1 on PHP ${semver:?}"
 }
 
 # Function to read env inputs.
@@ -70,18 +70,22 @@ get() {
   fi
 }
 
-# Function to download and run scripts from GitHub releases with bintray fallback.
+# Function to download and run scripts from GitHub releases with jsdeliver fallback.
 run_script() {
   repo=$1
   shift
   args=("$@")
-  get -q -e /tmp/install.sh "$github/$repo/$latest/install.sh" "$bintray/php/$repo.sh"
+  get -q -e /tmp/install.sh "$github/$repo/$latest/install.sh" "$jsdeliver/$1@main/scripts/install.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
@@ -101,21 +105,51 @@ 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() {
-  if [ -e /tmp/setup_php_dismod ] && grep -q "$1" /tmp/setup_php_dismod; then
+  modules_dir="/var/lib/php/modules/$version"
-    sudo phpenmod -v "$version" "$1" >/dev/null 2>&1
+  [ -d "$modules_dir" ] && sudo find "$modules_dir" -path "*disabled*$1" -delete
-  fi
+  if [ -d /tmp/extcache/"$1" ]; then
-  if ! check_extension "$1" && [ -e "${ext_dir:?}/$1.so" ]; then
+    enable_cache_extension "$1" "$2"
-    echo "$2=${ext_dir:?}/$1.so" >>"${pecl_file:-$ini_file}"
+  elif ! 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
 }
 
+# Function to configure PHP
+configure_php() {
+  (
+    echo -e "date.timezone=UTC\nmemory_limit=-1"
+    [[ "$version" =~ $jit_versions ]] && echo -e "opcache.enable=1\nopcache.jit_buffer_size=256M\nopcache.jit=1235"
+    [[ "$version" =~ $xdebug3_versions ]] && echo -e "xdebug.mode=coverage"
+  ) | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null
+}
+
 # Function to configure PECL.
 configure_pecl() {
-  if ! [ -e /tmp/pecl_config ] && command -v pecl >/dev/null; then
+  if ! [ -e /tmp/pecl_config ]; then
     for script in pear pecl; do
-      sudo "$script" config-set php_ini "${pecl_file:-$ini_file}"
+      sudo "$script" config-set php_ini "${pecl_file:-${ini_file[@]}}"
       sudo "$script" channel-update "$script".php.net
     done
     echo '' | sudo tee /tmp/pecl_config >/dev/null 2>&1
@@ -125,12 +159,12 @@ configure_pecl() {
 # Function to get the PECL version of an extension.
 get_pecl_version() {
   extension=$1
-  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
+  stability="$(echo "$2" | grep -m 1 -Eio "(stable|alpha|beta|rc|snapshot|preview)")"
   pecl_rest='https://pecl.php.net/rest/r/'
   response=$(get -s -n "" "$pecl_rest$extension"/allreleases.xml)
-  pecl_version=$(echo "$response" | grep -m 1 -Pio "(\d*\.\d*\.\d*$stability\d*)")
+  pecl_version=$(echo "$response" | grep -m 1 -Eio "([0-9]+\.[0-9]+\.[0-9]+${stability}[0-9]+)")
   if [ ! "$pecl_version" ]; then
-    pecl_version=$(echo "$response" | grep -m 1 -Po "(\d*\.\d*\.\d*)")
+    pecl_version=$(echo "$response" | grep -m 1 -Eo "([0-9]+\.[0-9]+\.[0-9]+)")
   fi
   echo "$pecl_version"
 }
@@ -138,9 +172,30 @@ get_pecl_version() {
 # Function to install PECL extensions and accept default options
 pecl_install() {
   local extension=$1
+  add_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
@@ -154,7 +209,8 @@ add_unstable_extension() {
 get_tool_version() {
   tool=$1
   param=$2
-  version_regex="[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-zA-Z0-9]+){0,1}"
+  alp="[a-zA-Z0-9]"
+  version_regex="[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
   if [ "$tool" = "composer" ]; then
     if [ "$param" != "snapshot" ]; then
       composer_version="$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")"
@@ -176,10 +232,15 @@ configure_composer() {
     add_log "$cross" "composer" "Could not download composer"
     exit 1
   fi
-  composer -q global config process-timeout 0
+  if ! [ -e "$composer_json" ]; then
+    sudo mkdir -p "$(dirname "$composer_json")"
+    echo '{}' | tee "$composer_json" >/dev/null
+    sudo chmod 644 "$composer_json"
+  fi
+  composer -q config -g process-timeout 0
   echo "$composer_bin" >>"$GITHUB_PATH"
   if [ -n "$COMPOSER_TOKEN" ]; then
-    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
+    composer -q config -g github-oauth.github.com "$COMPOSER_TOKEN"
   fi
 }
 
@@ -189,6 +250,10 @@ add_tool() {
   tool=$2
   ver_param=$3
   tool_path="$tool_path_dir/$tool"
+  if ! [[ "$PATH" =~ $tool_path_dir ]]; then
+    export PATH=$PATH:"$tool_path_dir"
+    echo "export PATH=\$PATH:$tool_path_dir" | sudo tee -a "$GITHUB_ENV" >/dev/null
+  fi
   if [ ! -e "$tool_path" ]; then
     rm -rf "$tool_path"
   fi
@@ -199,21 +264,7 @@ add_tool() {
     status_code=$(get -v -e "$tool_path" "${url[0]}")
   fi
   if [ "$status_code" = "200" ]; then
-    if [ "$tool" = "composer" ]; then
+    add_tools_helper "$tool"
-      configure_composer "$tool_path"
-    elif [ "$tool" = "cs2pr" ]; then
-      sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path" 2>/dev/null ||
-      sudo sed -i '' 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
-    elif [ "$tool" = "phan" ]; then
-      add_extension fileinfo extension >/dev/null 2>&1
-      add_extension ast extension >/dev/null 2>&1
-    elif [ "$tool" = "phive" ]; then
-      add_extension curl extension >/dev/null 2>&1
-      add_extension mbstring extension >/dev/null 2>&1
-      add_extension xml extension >/dev/null 2>&1
-    elif [ "$tool" = "wp-cli" ]; then
-      sudo cp -p "$tool_path" "$tool_path_dir"/wp
-    fi
     tool_version=$(get_tool_version "$tool" "$ver_param")
     add_log "$tick" "$tool" "Added $tool $tool_version"
   else
@@ -235,11 +286,13 @@ add_composertool() {
     fi
   fi
   (
-    composer global require "$prefix$release" >/dev/null 2>&1 &&
+    sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
-    json=$(grep "$prefix$tool" "$composer_json") &&
+    composer global require "$prefix$release" 2>&1 | tee /tmp/composer.log >/dev/null 2>&1
-    tool_version=$(get_tool_version 'echo' "$json") &&
+    log=$(grep "$prefix$tool" /tmp/composer.log) &&
+      tool_version=$(get_tool_version 'echo' "$log") &&
       add_log "$tick" "$tool" "Added $tool $tool_version"
   ) || add_log "$cross" "$tool" "Could not setup $tool"
+  add_tools_helper "$tool"
   if [ -e "$composer_bin/composer" ]; then
     sudo cp -p "$tool_path_dir/composer" "$composer_bin"
   fi
@@ -249,3 +302,12 @@ add_composertool() {
 php_semver() {
   php"$version" -v | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1
 }
+
+# Function to get the tag for a php version.
+php_src_tag() {
+  php_src_tag='master'
+  if ! [[ ${version:?} =~ $nightly_versions ]]; then
+    php_src_tag="php-$semver"
+  fi
+  echo "$php_src_tag"
+}

src/scripts/darwin.sh

@@ -7,12 +7,24 @@ 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
-    sudo sed -i '' "/$extension/d" "${ini_file:?}"
+    disable_extension "$extension"
-    sudo rm -rf "${scan_dir:?}"/*"$extension"* "${ext_dir:?}"/"$extension".so >/dev/null 2>&1
+    delete_extension "$extension"
     (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") ||
       add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}"
   else
@@ -20,43 +32,53 @@ remove_extension() {
   fi
 }
 
-# Function to install a specific version of PECL extension.
+# Function to fetch a brew tap.
-add_pecl_extension() {
+fetch_brew_tap() {
-  extension=$1
+  tap=$1
-  pecl_version=$2
+  tap_user=$(dirname "$tap")
-  prefix=$3
+  tap_name=$(basename "$tap")
-  enable_extension "$extension" "$prefix"
+  mkdir -p "$tap_dir/$tap_user"
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
+  get -s -n "" "https://github.com/$tap/archive/master.tar.gz" | sudo tar -xzf - -C "$tap_dir/$tap_user"
-    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
+  if [ -d "$tap_dir/$tap_user/$tap_name-master" ]; then
+    sudo mv "$tap_dir/$tap_user/$tap_name-master" "$tap_dir/$tap_user/$tap_name"
   fi
-  ext_version=$(php -r "echo phpversion('$extension');")
+}
-  if [ "$ext_version" = "$pecl_version" ]; then
+
-    add_log "${tick:?}" "$extension" "Enabled"
+# Function to add a brew tap.
+add_brew_tap() {
+  tap=$1
+  if ! [ -d "$tap_dir/$tap" ]; then
+    if [ "${runner:?}" = "self-hosted" ]; then
+      brew tap --shallow "$tap" >/dev/null 2>&1
     else
-    remove_extension "$extension" >/dev/null 2>&1
+      fetch_brew_tap "$tap" >/dev/null 2>&1
-    pecl_install "$extension-$pecl_version"
+      if ! [ -d "$tap_dir/$tap" ]; then
-    add_extension_log "$extension-$pecl_version" "Installed and enabled"
+        brew tap --shallow "$tap" >/dev/null 2>&1
+      fi
+    fi
   fi
 }
 
 # Function to install a php extension from shivammathur/extensions tap.
 add_brew_extension() {
-  extension=$1
+  formula=$1
   prefix=$2
+  extension="$(echo "$formula" | sed -E "s/pecl_|[0-9]//g")"
   enable_extension "$extension" "$prefix"
   if check_extension "$extension"; then
     add_log "${tick:?}" "$extension" "Enabled"
   else
-    if ! brew tap | grep -q shivammathur/extensions; then
+    add_brew_tap shivammathur/homebrew-php
-      brew tap --shallow shivammathur/extensions >/dev/null 2>&1
+    add_brew_tap shivammathur/homebrew-extensions
-    fi
+    sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
-    brew install "$extension@$version" >/dev/null 2>&1
+    update_dependencies >/dev/null 2>&1
-    sudo cp "$(brew --prefix)/opt/$extension@$version/$extension.so" "$ext_dir"
+    brew install -f "$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
@@ -64,7 +86,7 @@ add_extension() {
   if check_extension "$extension"; then
     add_log "${tick:?}" "$extension" "Enabled"
   else
-    [[ "$version" =~ 5.[4-5] ]] && [ "$extension" = "imagick" ] && brew install pkg-config imagemagick >/dev/null 2>&1
+    [[ "$version" =~ 5.[4-5] ]] && [ "$extension" = "imagick" ] && brew install -f 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"
@@ -79,61 +101,118 @@ 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.
+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
+}
+
+# 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"
+}
+
 # Function to update dependencies.
 update_dependencies() {
-  if [[ "$version" =~ ${nightly_versions:?} ]] && [ "${runner:?}" != "self-hosted" ]; then
+  if ! [ -e /tmp/update_dependencies ] && [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
-    tap_dir="$(brew --prefix)/Homebrew/Library/Taps"
+    patch_brew
-    while read -r formula; do
+    while read -r dependency; do
-      get -q -n "$tap_dir/homebrew/homebrew-core/Formula/$formula.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb" &
+      update_dependencies_helper "$dependency" &
       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
-  if ! brew tap | grep -q shivammathur/php; then
+  existing_version=$2
-    brew tap --shallow shivammathur/php
+  add_brew_tap shivammathur/homebrew-php
-  fi
   update_dependencies
-  if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
+  if [ "$existing_version" != "false" ]; then
-    brew unlink php@"$version"
+    ([ "$action" = "upgrade" ] && brew upgrade -f "$php_formula") || brew unlink "$php_formula"
   else
-    brew "$action" shivammathur/php/php@"$version"
+    brew install -f "$php_formula"
   fi
-  brew link --force --overwrite php@"$version"
+  brew link --force --overwrite "$php_formula"
 }
 
-# Function to Setup PHP
+# Function to Setup PHP.
 setup_php() {
   step_log "Setup PHP"
-  existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
+  existing_version=$(get_brewed_php)
   if [[ "$version" =~ ${old_versions:?} ]]; then
     run_script "php5-darwin" "${version/./}" >/dev/null 2>&1
     status="Installed"
   elif [ "$existing_version" != "$version" ]; then
-    add_php "install" >/dev/null 2>&1
+    add_php "install" "$existing_version" >/dev/null 2>&1
     status="Installed"
   elif [ "$existing_version" = "$version" ] && [ "${update:?}" = "true" ]; then
-    add_php "upgrade" >/dev/null 2>&1
+    add_php "upgrade" "$existing_version" >/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:?}"
-  echo -e "date.timezone=UTC\nmemory_limit=-1" >>"$ini_file"
+  configure_php
   ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
   scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
   sudo mkdir -m 777 -p "$ext_dir" "$HOME/.composer"
   semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
-  if [[ ! "$version" =~ $old_versions ]]; then configure_pecl >/dev/null 2>&1; fi
+  if [ "${semver%.*}" != "$version" ]; then
+    add_log "$cross" "PHP" "Could not setup PHP $version"
+    exit 1
+  fi
   sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
   add_log "$tick" "PHP" "$status PHP $semver"
 }
@@ -141,11 +220,20 @@ 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
+scripts="${dist}"/../src/scripts
+export HOMEBREW_CHANGE_ARCH_TO_ARM=1
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 export HOMEBREW_NO_AUTO_UPDATE=1
+export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 
 # shellcheck source=.
-. "${dist}"/../src/scripts/common.sh
+. "${scripts:?}"/ext/source.sh
+. "${scripts:?}"/tools/add_tools.sh
+. "${scripts:?}"/common.sh
 read_env
 self_hosted_setup
 setup_php

src/scripts/ext/blackfire.ps1

@@ -10,8 +10,12 @@ 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
         }
+    }
     if (Test-Path $ext_dir\blackfire.dll) {
         Enable-PhpExtension -Extension blackfire -Path $php_dir
         $status="Enabled"

src/scripts/ext/blackfire.sh

@@ -5,11 +5,15 @@ add_blackfire() {
   no_dot_version=${version/./}
   platform=$(uname -s | tr '[:upper:]' '[:lower:]')
   extension_version=$(echo "$extension" | cut -d '-' -f 2)
-  blackfire_ini_file="${scan_dir:?}/50-blackfire.ini"
+  blackfire_ini_file="${pecl_file:-${ini_file[@]}}"
   if [ ! -e "${ext_dir:?}/blackfire.so" ]; then
     if [ "$extension_version" = "blackfire" ]; then
+      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
+    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
   echo "extension=blackfire.so" | sudo tee -a "$blackfire_ini_file" >/dev/null 2>&1

src/scripts/ext/couchbase.sh

@@ -1,20 +1,19 @@
 # Function to install libraries required by couchbase
 add_couchbase_libs() {
   if [ "$(uname -s)" = "Linux" ]; then
-    if [[ ${version:?} =~ 5.6|7.[0-1] ]]; then
+    trunk="https://github.com/couchbase/libcouchbase/releases"
-      trunk="http://packages.couchbase.com/ubuntu"
+    if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
-      list="deb $trunk ${DISTRIB_CODENAME:?} ${DISTRIB_CODENAME:?}/main"
+      release="2.10.9"
     else
-      trunk="http://packages.couchbase.com/clients/c/repos/deb"
+      release="$(curl -sL $trunk/latest | grep -Eo "libcouchbase-[0-9]+\.[0-9]+\.[0-9]+" | head -n 1 | cut -d'-' -f 2)"
-      list="deb $trunk/ubuntu${DISTRIB_RELEASE/./} ${DISTRIB_CODENAME:?} ${DISTRIB_CODENAME:?}/main"
     fi
-    add_pecl
+    deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${DISTRIB_RELEASE/./}_${DISTRIB_CODENAME}_amd64.tar"
-    get -s -n "" "$trunk/couchbase.key" | sudo apt-key add
+    get -q -n /tmp/libcouchbase.tar "$deb_url"
-    echo "$list" | sudo tee /etc/apt/sources.list.d/couchbase.list
+    sudo tar -xf /tmp/libcouchbase.tar -C /tmp
-    sudo apt-get update
+    install_packages libev4 libevent-dev
-    ${apt_install:?} libcouchbase-dev
+    sudo dpkg -i /tmp/libcouchbase-*/*.deb
   else
-    if [[ ${version:?} =~ 5.6|7.[0-1] ]]; then
+    if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
       brew install libcouchbase@2
       brew link --overwrite --force libcouchbase@2
     else
@@ -30,8 +29,12 @@ add_couchbase() {
   if check_extension "couchbase"; then
     add_log "${tick:?}" "couchbase" "Enabled"
   else
-    if [[ ${version:?} =~ 5.6|7.[0-1] ]]; then
+    if [[ "${version:?}" =~ ${old_versions:?} ]]; then
+      pecl_install couchbase-2.2.3 >/dev/null 2>&1
+    elif [[ "${version:?}" =~ 5.6|7.[0-1] ]]; then
       pecl_install couchbase-2.6.2 >/dev/null 2>&1
+    elif [[ "${version:?}" =~ 7.2 ]]; then
+      pecl_install couchbase-3.0.4 >/dev/null 2>&1
     else
       pecl_install couchbase >/dev/null 2>&1
     fi

src/scripts/ext/cubrid.sh

@@ -7,6 +7,15 @@ add_license_log() {
   echo "::endgroup::"
 }
 
+# Function to setup gcc-7 and g++-7
+setup_compiler() {
+  if ! command -v gcc-7 >/dev/null || ! command -v g++-7 >/dev/null; then
+    add_ppa ubuntu-toolchain-r/test
+    add_packages gcc-7 g++-7 -y
+  fi
+  printf "gcc g++" | xargs -d ' ' -I {} sudo update-alternatives --install /usr/bin/{} {} /usr/bin/{}-7 7
+}
+
 # Function to set cubrid repo for the extension.
 set_cubrid_repo() {
   case "${ext:?}" in
@@ -24,19 +33,18 @@ set_cubrid_branch() {
 }
 
 add_cubrid_helper() {
-  if ! [ -e "${ext_dir:?}/$ext.so" ]; then
+  ext=$1
+  enable_extension "$ext" extension
+  if ! check_extension "$ext"; then
     status='Installed and enabled'
     set_cubrid_repo
     set_cubrid_branch
-    (
+    [ "$DISTRIB_RELEASE" = "16.04" ] && setup_compiler
-      git clone -b "$cubrid_branch" --recursive "https://github.com/CUBRID/$cubrid_repo" "/tmp/$cubrid_repo"
+    patch_phpize
-      cd "/tmp/$cubrid_repo" || exit
+    read -r "${ext}_PREFIX_CONFIGURE_OPTS" <<< "CFLAGS=-Wno-implicit-function-declaration"
-      ! [[ "$version" =~ ${old_versions:?} ]] && add_devtools
+    read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config)"
-      phpize && ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=shared
+    add_extension_from_source "$ext" https://github.com CUBRID "$cubrid_repo" "$cubrid_branch" extension
-      make -j"$(nproc)"
+    restore_phpize
-      sudo make install
-    )
-    echo "extension=$ext.so" | sudo tee "${scan_dir:?}/$ext.ini"
   fi
 }
 
@@ -44,7 +52,10 @@ add_cubrid_helper() {
 add_cubrid() {
   ext=$1
   status='Enabled'
-  add_cubrid_helper >/dev/null 2>&1
+  add_cubrid_helper "$ext" >/dev/null 2>&1
   add_extension_log "$ext" "$status"
   check_extension "$ext" && add_license_log
 }
+
+# shellcheck source=.
+. "${scripts:?}"/ext/patches/phpize.sh

src/scripts/ext/firebird.ps1

@@ -0,0 +1,20 @@
+Function Add-Choco() {
+  try {
+    if($null -eq (Get-Command -Name choco.exe -ErrorAction SilentlyContinue)) {
+      # Source: https://docs.chocolatey.org/en-us/choco/setup
+      Set-ExecutionPolicy Bypass -Scope Process -Force
+      [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
+      Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+    }
+  } catch { }
+}
+
+Function Add-Firebird() {
+  Add-Choco > $null 2>&1
+  choco install firebird -params '/ClientAndDevTools' -y --force > $null 2>&1
+  if((Get-ChildItem $env:ProgramFiles\**\**\fbclient.dll | Measure-Object).Count -eq 1) {
+    Add-Extension pdo_firebird
+  } else {
+    Add-Log $cross pdo_firebird "Could not install pdo_firebird on PHP $( $installed.FullVersion )"
+  }
+}

src/scripts/ext/firebird.sh

@@ -0,0 +1,34 @@
+add_firebird_client_darwin() {
+  pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/latest | grep -Eo "Firebird-.*.pkg" | head -n 1)
+  get -q -e "/tmp/firebird.pkg" https://github.com/FirebirdSQL/firebird/releases/latest/download/"$pkg_name"
+  sudo installer -pkg /tmp/firebird.pkg -target /
+  sudo mkdir -p /opt/firebird/include /opt/firebird/lib
+  sudo find /Library/Frameworks/Firebird.framework -name '*.h' -exec cp "{}" /opt/firebird/include \;
+  sudo find /Library/Frameworks/Firebird.framework -name '*.dylib' -exec cp "{}" /opt/firebird/lib \;
+}
+
+add_firebird_helper() {
+  firebird_dir=$1
+  tag="$(php_src_tag)"
+  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
+}
+
+add_firebird() {
+  enable_extension pdo_firebird
+  if ! check_extension pdo_firebird; then
+    if [ "$(uname -s)" = "Linux" ]; then
+      if [[ "${version:?}" =~ 5.3|${nightly_versions:?} ]]; then
+        add_firebird_helper /usr >/dev/null 2>&1
+      else
+        add_pdo_extension firebird >/dev/null 2>&1
+      fi
+    else
+      add_firebird_client_darwin >/dev/null 2>&1
+      add_firebird_helper /opt/firebird >/dev/null 2>&1
+    fi
+    add_extension_log pdo_firebird "Installed and enabled"
+  fi
+}

src/scripts/ext/gearman.sh

@@ -1,17 +1,16 @@
 # Helper function to add gearman extension.
 add_gearman_helper() {
-  sudo "${debconf_fix:?}" add-apt-repository ppa:ondrej/pkg-gearman -y
+  add_ppa ondrej/pkg-gearman
-  if [ -e "${ext_dir:?}/gearman.so" ] && [ "$DISTRIB_RELEASE" != "16.04" ]; then
+  install_packages libgearman-dev
-    ${apt_install:?} libgearman-dev
+  enable_extension gearman extension
-    echo "extension=gearman.so" | sudo tee -a "${scan_dir:?}/20-gearman.ini" >/dev/null 2>&1
+  if ! check_extension gearman; then
-  else
     status="Installed and enabled"
-    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+    if [[ "${version:?}" =~ 5.[3-5] ]]; then
-      sudo "${debconf_fix:?}" apt-get update -y
+      pecl_install gearman-1.1.2
-      ${apt_install:?} php"${version:?}"-gearman
     else
-      ${apt_install:?} libgearman-dev php"${version:?}"-gearman
+      install_packages php"${version:?}"-gearman || pecl_install gearman
     fi
+    enable_extension gearman extension
   fi
 }
 

src/scripts/ext/geos.sh

@@ -0,0 +1,17 @@
+# 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
+}
+
+# Function to add geos
+add_geos() {
+  enable_extension "geos" "extension"
+  if check_extension "geos"; then
+    add_log "${tick:?}" "geos" "Enabled"
+  else
+    add_geos_helper >/dev/null 2>&1
+    add_extension_log "geos" "Installed and enabled"
+  fi
+}

src/scripts/ext/http.ps1

@@ -0,0 +1,55 @@
+Function Get-ICUUrl() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    $icu_version,
+    [Parameter(Position = 1, Mandatory = $true)]
+    [ValidateNotNull()]
+    $arch,
+    [Parameter(Position = 2, Mandatory = $true)]
+    [ValidateNotNull()]
+    $vs_version
+  )
+  $trunk = "https://windows.php.net"
+  $urls=@("${trunk}/downloads/php-sdk/deps/${vs_version}/${arch}", "${trunk}/downloads/php-sdk/deps/archives/${vs_version}/${arch}")
+  foreach ($url in $urls) {
+    $web_content = Invoke-WebRequest -Uri $url
+    foreach ($link in $web_content.Links) {
+      if ($link -match "/.*ICU-${icu_version}.*/") {
+        return $trunk + $link.HREF
+      }
+    }
+  }
+}
+
+Function Repair-ICU() {
+  $icu = deplister $ext_dir\php_http.dll | Select-String "icu[a-z]+(\d+).dll,([A-Z]+)" | Foreach-Object { $_.Matches }
+  if($icu -and $icu.Groups[2].Value -ne 'OK') {
+    $vs = "vs" + $installed.VCVersion
+    if ($installed.VCVersion -lt 16) {
+      $vs = "vc" + $installed.VCVersion
+    }
+    $zip_url = Get-ICUUrl $icu.Groups[1].Value $installed.Architecture $vs
+    if ($zip_url -ne '') {
+      New-Item -Path "$php_dir" -Name "icu" -ItemType "directory" | Out-Null
+      Invoke-WebRequest -Uri $zip_url -OutFile "$php_dir\icu\icu.zip"
+      Expand-Archive -Path $php_dir\icu\icu.zip -DestinationPath $php_dir\icu -Force
+      Get-ChildItem $php_dir\icu\bin -Filter *.dll | Copy-Item -Destination $php_dir -Force
+    }
+  }
+}
+
+Function Add-Http() {
+  Add-Extension raphf >$null 2>&1
+  if($version -lt '8.0') {
+    Add-Extension propro >$null 2>&1
+  }
+  Add-Extension pecl_http >$null 2>&1
+  Repair-ICU
+  try {
+    php --ri "http" 2> $null | Out-Null
+    Add-Log $tick "http" "Installed and enabled"
+  } catch {
+    Add-Log $cross "http" "Could not install http on PHP $( $installed.FullVersion )"
+  }
+}

src/scripts/ext/http.sh

@@ -0,0 +1,120 @@
+# Function to get http version for a PHP version.
+get_http_version() {
+  if [[ ${version:?} =~ 5.[3-6] ]]; then
+    echo "pecl_http-2.6.0"
+  elif [[ ${version:?} =~ 7.[0-4] ]]; then
+    echo "pecl_http-3.2.4"
+  else
+    echo "pecl_http-$(get_pecl_version "pecl_http" "stable")"
+  fi
+}
+
+# Function to enable http extension.
+enable_http() {
+  enable_extension propro extension
+  enable_extension raphf extension
+  if (! [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension propro && check_extension raphf) ||
+     ( [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension raphf); then
+    enable_extension http extension
+  fi
+}
+
+# Function to install 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() {
+  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
+  else
+    add_extension_helper raphf
+  fi
+}
+
+# Function to get configure options for http.
+get_http_configure_opts() {
+  if [ "$os" = 'Linux' ]; then
+    for lib in zlib libbrotli libcurl libevent libicu libidn2 libidn libidnkit2 libidnkit; do
+      http_opts+=( "--with-http-$lib-dir=/usr" )
+    done
+  else
+    http_opts+=( "--with-http-zlib-dir=$(xcrun --show-sdk-path)/usr" )
+    http_opts+=( "--with-http-libbrotli-dir=$(brew --prefix brotli)" )
+    http_opts+=( "--with-http-libcurl-dir=$(brew --prefix curl)" )
+    http_opts+=( "--with-http-libicu-dir=$(brew --prefix icu4c)" )
+    http_opts+=( "--with-http-libevent-dir=$(brew --prefix libevent)" )
+    http_opts+=( "--with-http-libidn2-dir=$(brew --prefix libidn2)" )
+  fi
+}
+
+# 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
+}
+
+# Function to setup latest http extension.
+add_http_latest() {
+  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"
+      else
+        add_http_helper "$(get_http_version)" "$os"
+      fi
+    else
+      if ! [[ "${version:?}" =~ ${old_versions:?} ]]; then
+        add_brew_extension pecl_http extension
+      fi
+    fi
+    status="Installed and enabled"
+  fi
+}
+
+# Function to setup http extension given a version.
+add_http_version() {
+  ext=$1
+  enable_http
+  if [ "x$(php -r "echo phpversion('http');")" != "x${ext##*-}" ]; then
+    remove_extension http >/dev/null
+    add_http_helper pecl_http-"${ext##*-}" "$os"
+    status="Installed and enabled"
+  fi
+}
+
+# Function to setup http extension
+add_http() {
+  ext=$1
+  status="Enabled"
+  if [[ "$ext" =~ ^(pecl_http|http)$ ]]; then
+    add_http_latest >/dev/null 2>&1
+  else
+    add_http_version "$ext" >/dev/null 2>&1
+  fi
+  add_extension_log "http" "$status"
+}
+
+os="$(uname -s)"

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://dl.bintray.com/shivammathur/icu4c/icu4c-$icu.tar.zst"
+    get -q -n /tmp/icu.tar.zst "https://github.com/shivammathur/icu-intl/releases/download/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.bintray.com/packages/shivammathur/icu4c/icu4c | grep -Po "$icu" | head -n 1)
+  supported_version=$(get -s -n "" https://api.github.com/repos/shivammathur/icu-intl/releases | 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://dl.bintray.com/shivammathur/icu4c/php${version:?}-intl-$icu.so"
+    get -q -n "${ext_dir:?}/intl.so" "https://github.com/shivammathur/icu-intl/releases/download/intl/php${version:?}-intl-$icu.so"
     enable_extension intl extension
     add_extension_log intl "Installed and enabled with ICU $icu"
   fi

src/scripts/ext/oci.ps1

@@ -37,11 +37,13 @@ Function Add-Oci() {
     } else {
       if(-not(Test-Path $ext_dir\php_oci8.dll)) {
         $status = 'Installed and enabled'
-        $ociVersion = '2.2.0'
+        $ociVersion = Get-PeclPackageVersion oci8 -MinimumStability stable -MaximumStability stable | Select-Object -First 1
         if ($version -eq '7.0') {
           $ociVersion = '2.1.8'
         } elseif ($version -lt '7.0') {
           $ociVersion = '2.0.12'
+        } elseif ($version -lt '8.0') {
+          $ociVersion = '2.2.0'
         }
         $ociUrl = Get-PeclArchiveUrl oci8 $ociVersion $installed
         Invoke-WebRequest -Uri $ociUrl -OutFile $php_dir\oci8.zip

src/scripts/ext/oci.sh

@@ -7,21 +7,10 @@ add_license_log() {
   echo "::endgroup::"
 }
 
-# Function to get the tag for a php version.
-get_tag() {
-  tag='master'
-  if ! [[ ${version:?} =~ $nightly_versions ]]; then
-    tag="php-$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')"
-  elif [ "${version:?}" = '8.0' ]; then
-    tag="PHP-8.0"
-  fi
-  echo "$tag"
-}
-
 # Function to install instantclient and SDK.
 add_client() {
-  sudo mkdir -p -m 777 "$oracle_home"
   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/'
@@ -35,57 +24,12 @@ 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 "/opt/oracle/$package.zip" -d "$oracle_home"
+      unzip -o "/opt/oracle/$package.zip" -d "$oracle_home"
     done
-    sudo ln -sf /opt/oracle/instantclient*/*.$lib_ext* $libs
+    for icdir in /opt/oracle/instantclient_*; do
-    sudo ln -sf /opt/oracle/instantclient* "$oracle_client"
+      sudo mv "$icdir"/* "$oracle_client"/
-  fi
+    done
-}
+    sudo ln -sf /opt/oracle/instantclient/*.$lib_ext* $libs
-
-# 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 autoconf automake libaio-dev gcc g++
-    fi
-    ! [[ ${version:?} =~ $nightly_versions ]] && add_devtools phpize
   fi
 }
 
@@ -93,20 +37,13 @@ add_dependencies() {
 add_oci_helper() {
   if ! [ -e "${ext_dir:?}/$ext.so" ]; then
     status='Installed and enabled'
-    phpize_orig=$(get_phpize)
+    read -r "${ext}_LINUX_LIBS" <<< "libaio-dev"
-    tag=$(get_tag)
+    read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client"
-    get_php
+    read -r "${ext}_PATH" <<< "ext/$ext"
     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)"
-      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.
@@ -116,10 +53,11 @@ add_oci() {
   oracle_home='/opt/oracle'
   oracle_client=$oracle_home/instantclient
   os=$(uname -s)
-  nightly_versions='8.[0-1]'
   add_client >/dev/null 2>&1
-  add_dependencies >/dev/null 2>&1
   add_oci_helper >/dev/null 2>&1
   add_extension_log "$ext" "$status"
   check_extension "$ext" && add_license_log
 }
+
+# shellcheck source=.
+. "${scripts:?}"/ext/patches/phpize.sh

src/scripts/ext/patches/firebird.sh

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

src/scripts/ext/patches/geos.sh

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

src/scripts/ext/patches/http.sh

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

src/scripts/ext/patches/pdo_oci.sh

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

src/scripts/ext/patches/phpize.sh

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

src/scripts/ext/patches/protobuf.sh

@@ -0,0 +1,4 @@
+patch_protobuf() {
+  mkdir -p third_party/wyhash
+  cp ../../../../third_party/wyhash/* third_party/wyhash
+}

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 | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
+    $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)`""
     $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

src/scripts/ext/phalcon.sh

@@ -1,21 +1,12 @@
 # Helper function to add phalcon.
 add_phalcon_helper() {
   status='Installed and enabled'
-  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
-    phalcon_ini_file=${ini_file:?}
-    sed -i '' '/extension.*psr/d' "${ini_file:?}"
-    brew tap shivammathur/homebrew-phalcon
-    brew install phalcon@"${version:?}"_"$extension_major_version"
-    sudo cp /usr/local/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
-    sudo cp /usr/local/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
-  fi
 }
 
 # Function to add phalcon3.
@@ -57,8 +48,7 @@ add_phalcon4() {
 add_phalcon() {
   extension=$1
   status='Enabled'
-  os_name=$(uname -s)
+  phalcon_ini_file="${pecl_file:-${ini_file[@]}}"
-  phalcon_ini_file="${scan_dir:?}/50-phalcon.ini"
   extension_major_version=${extension: -1}
   if [ "$extension_major_version" = "4" ]; then
     add_phalcon4 >/dev/null 2>&1

src/scripts/ext/source.sh

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

src/scripts/linux.sh

@@ -3,36 +3,41 @@ self_hosted_helper() {
   if ! command -v apt-fast >/dev/null; then
     sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
   fi
-  install_packages curl make software-properties-common unzip
+  install_packages apt-transport-https curl make software-properties-common unzip autoconf automake gcc g++
-  add_ppa
+  add_ppa ondrej/php
 }
 
 # Function to backup and cleanup package lists.
 cleanup_lists() {
+  ppa_prefix=${1-ondrej}
   if [ ! -e /etc/apt/sources.list.d.save ]; then
     sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save
     sudo mkdir /etc/apt/sources.list.d
-    sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/
+    sudo mv /etc/apt/sources.list.d.save/*"${ppa_prefix}"*.list /etc/apt/sources.list.d/
-    sudo mv /etc/apt/sources.list.d.save/*dotdeb*.list /etc/apt/sources.list.d/ 2>/dev/null || true
     trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/ 2>/dev/null" exit
   fi
 }
 
 # Function to add ppa:ondrej/php.
 add_ppa() {
-  if ! apt-cache policy | grep -q ondrej/php; then
+  ppa=${1:-ondrej/php}
-    cleanup_lists
+  if [ "$DISTRIB_RELEASE" = "16.04" ] && [ "$ppa" = "ondrej/php" ]; then
-    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
+    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
+    cleanup_lists "$(dirname "$ppa")"
+    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:"$ppa" -y
+  fi
   if [ "$DISTRIB_RELEASE" = "16.04" ]; then
     sudo "$debconf_fix" apt-get update
   fi
-  fi
 }
 
 # Function to update the package lists.
 update_lists() {
   if [ ! -e /tmp/setup_php ]; then
-    [ "$DISTRIB_RELEASE" = "20.04" ] && add_ppa >/dev/null 2>&1
+    [ "${runner:?}" != "self-hosted" ] && 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
@@ -45,15 +50,20 @@ install_packages() {
   $apt_install "${packages[@]}" >/dev/null 2>&1 || update_lists && $apt_install "${packages[@]}" >/dev/null 2>&1
 }
 
-# Function to delete extensions.
+# Function to disable an extension.
+disable_extension() {
+  extension=$1
+  sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file[@]}"
+  sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "$pecl_file"
+  sudo find "$ini_dir"/.. -name "*$extension.ini" -delete >/dev/null 2>&1 || true
+}
+
+# Function to delete an extension.
 delete_extension() {
   extension=$1
-  sudo sed -i "/$extension/d" "${ini_file:?}"
+  disable_extension "$extension"
-  sudo sed -i "/$extension/d" "${pecl_file:?}"
+  sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
-  sudo rm -rf "${scan_dir:?}"/*"$extension"* "${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.
@@ -62,7 +72,6 @@ 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") ||
@@ -79,14 +88,24 @@ add_pdo_extension() {
   if check_extension "$pdo_ext"; then
     add_log "${tick:?}" "$pdo_ext" "Enabled"
   else
-    ext=$1; ext_name=$1;
+    ext=$1
-    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1
+    ext_name=$1
-    if ! check_extension "pdo" 2>/dev/null; then echo "extension=pdo.so" >>"$ini_file"; fi
+    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
     if [ "$ext" = "mysql" ]; then
       enable_extension "mysqlnd" "extension"
-      ext_name="mysqli"
+      ext_name='mysqli'
+    elif [ "$ext" = "dblib" ]; then
+      ext_name="sybase"
+    elif [ "$ext" = "firebird" ]; then
+      install_packages libfbclient2 >/dev/null 2>&1
+      enable_extension "pdo_firebird" "extension"
+      ext_name="interbase"
     elif [ "$ext" = "sqlite" ]; then
-      ext="sqlite3"; ext_name="sqlite3";
+      ext="sqlite3"
+      ext_name="sqlite3"
     fi
     add_extension "$ext_name" "extension" >/dev/null 2>&1
     add_extension "$pdo_ext" "extension" >/dev/null 2>&1
@@ -102,54 +121,14 @@ add_extension() {
   if check_extension "$extension"; then
     add_log "${tick:?}" "$extension" "Enabled"
   else
-    if [[ "$version" =~ 5.[4-5] ]]; then
+    if [[ "$version" =~ ${nightly_versions:?} ]]; then
-      install_packages "php5-$extension=$release_version"
-    elif [[ "$version" =~ ${nightly_versions:?} ]]; then
       pecl_install "$extension"
     else
       install_packages "php$version-$extension" || pecl_install "$extension"
     fi
     add_extension_log "$extension" "Installed and enabled"
   fi
-  sudo chmod 777 "$ini_file"
+  sudo chmod 777 "${ini_file[@]}"
-}
-
-# Function to install a PECL version.
-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 install extension from source
-add_extension_from_source() {
-  extension=$1
-  repo=$2
-  release=$3
-  args=$4
-  prefix=$5
-  (
-    add_devtools phpize
-    delete_extension "$extension"
-    get -q -n "/tmp/$extension.tar.gz" "https://github.com/$repo/archive/$release.tar.gz"
-    tar xf /tmp/"$extension".tar.gz -C /tmp
-    cd /tmp/"$extension-$release" || exit 1
-    phpize && ./configure "$args" && make -j"$(nproc)" && sudo make install
-    enable_extension "$extension" "$prefix"
-  ) >/dev/null 2>&1
-  add_extension_log "$extension-$release" "Installed and enabled"
 }
 
 # Function to setup phpize and php-config.
@@ -158,24 +137,19 @@ add_devtools() {
   if ! command -v "$tool$version" >/dev/null; then
     install_packages "php$version-dev" "php$version-xml"
   fi
-  sudo update-alternatives --set php-config /usr/bin/php-config"$version" >/dev/null 2>&1
+  switch_version "phpize" "php-config"
-  sudo update-alternatives --set phpize /usr/bin/phpize"$version" >/dev/null 2>&1
-  if command -v pecl >/dev/null; then
-    configure_pecl >/dev/null 2>&1
-  fi
   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"
-  configure_pecl
-  release_version=$(php -v | head -n 1 | cut -d' ' -f 2)
 }
 
 # Function to add PECL.
@@ -191,9 +165,11 @@ add_pecl() {
 
 # Function to switch versions of PHP binaries.
 switch_version() {
-  for tool in pear pecl php phar phar.phar php-cgi php-config phpize phpdbg; do
+  tools=("$@") && ! (( ${#tools[@]} )) && tools+=(pear pecl php phar phar.phar php-cgi php-config phpize phpdbg)
+  to_wait=()
+  for tool in "${tools[@]}"; 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
@@ -214,7 +190,7 @@ add_packaged_php() {
 # Function to update PHP.
 update_php() {
   initial_version=$(php_semver)
-  use_package_cache="false" add_packaged_php
+  add_packaged_php
   updated_version=$(php_semver)
   if [ "$updated_version" != "$initial_version" ]; then
     status="Updated to"
@@ -235,6 +211,15 @@ add_php() {
   status="Installed"
 }
 
+# Function to ini file for pear and link it to each SAPI.
+link_pecl_file() {
+  echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
+  for file in "${ini_file[@]}"; do
+    sapi_scan_dir="$(realpath -m "$(dirname "$file")")/conf.d"
+    [ "$sapi_scan_dir" != "$scan_dir" ] && ! [ -h "$sapi_scan_dir" ] && sudo ln -sf "$pecl_file" "$sapi_scan_dir/99-pecl.ini"
+  done
+}
+
 # Function to Setup PHP
 setup_php() {
   step_log "Setup PHP"
@@ -259,16 +244,22 @@ setup_php() {
       status="Found"
     fi
   fi
+  if ! command -v php"$version" >/dev/null; then
+    add_log "$cross" "PHP" "Could not setup PHP $version"
+    exit 1
+  fi
   semver=$(php_semver)
   ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
   scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-  ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+  ini_dir=$(php --ini | grep "(php.ini)" | sed -e "s|.*: s*||")
   pecl_file="$scan_dir"/99-pecl.ini
-  echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
+  mapfile -t ini_file < <(sudo find "$ini_dir/.." -name "php.ini" -exec readlink -m {} +)
+  link_pecl_file
+  configure_php
   sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1
-  sudo chmod 777 "$ini_file" "$pecl_file" "${tool_path_dir:?}"
+  sudo chmod 777 "${ini_file[@]}" "$pecl_file" "${tool_path_dir:?}"
   sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
-  add_log "${tick:?}" "PHP" "$status PHP $semver"
+  add_log "${tick:?}" "PHP" "$status PHP $semver$extra_version"
 }
 
 # Variables
@@ -276,10 +267,12 @@ 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=.
-. "${dist}"/../src/scripts/common.sh
+. "${scripts:?}"/ext/source.sh
+. "${scripts:?}"/tools/add_tools.sh
+. "${scripts:?}"/common.sh
 . /etc/lsb-release
 read_env
 self_hosted_setup

src/scripts/tools/add_tools.ps1

@@ -0,0 +1,26 @@
+Function Add-ToolsHelper() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    $tool
+  )
+  if($tool -eq "codeception") {
+    Copy-Item $composer_bin\codecept.bat -Destination $composer_bin\codeception.bat
+  } elseif($tool -eq "composer") {
+    Edit-ComposerConfig $bin_dir\$tool
+  } elseif($tool -eq "cs2pr") {
+    (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
+  } elseif($tool -eq "phan") {
+    Add-Extension fileinfo >$null 2>&1
+    Add-Extension ast >$null 2>&1
+  } elseif($tool -eq "phive") {
+    Add-Extension xml >$null 2>&1
+  } elseif($tool -eq "symfony") {
+    Add-ToProfile $current_profile "symfony" "New-Alias symfony $bin_dir\$tool.exe"
+    Add-ToProfile $current_profile "symfony-cli" "New-Alias symfony-cli $bin_dir\$tool.exe"
+  } elseif($tool -eq "vapor-cli") {
+    Copy-Item $composer_bin\vapor.bat -Destination $composer_bin\vapor-cli.bat
+  } elseif($tool -eq "wp-cli") {
+    Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
+  }
+}

src/scripts/tools/add_tools.sh

@@ -0,0 +1,24 @@
+add_tools_helper() {
+  tool=$1
+  if [ "$tool" = "codeception" ]; then
+    sudo ln -s "${composer_bin:?}"/codecept "${composer_bin:?}"/codeception
+  elif [ "$tool" = "composer" ]; then
+    configure_composer "${tool_path:?}"
+  elif [ "$tool" = "cs2pr" ]; then
+    sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "${tool_path:?}" 2>/dev/null ||
+    sudo sed -i '' 's/\r$//; s/exit(9)/exit(0)/' "${tool_path:?}"
+  elif [ "$tool" = "phan" ]; then
+    add_extension fileinfo extension >/dev/null 2>&1
+    add_extension ast extension >/dev/null 2>&1
+  elif [ "$tool" = "phive" ]; then
+    add_extension curl extension >/dev/null 2>&1
+    add_extension mbstring extension >/dev/null 2>&1
+    add_extension xml extension >/dev/null 2>&1
+  elif [ "$tool" = "symfony" ]; then
+    sudo ln -s "${tool_path:?}" "${tool_path_dir:?}"/symfony-cli
+  elif [ "$tool" = "vapor-cli" ]; then
+    sudo ln -s "${tool_path:?}" "${tool_path_dir:?}"/vapor-cli
+  elif [ "$tool" = "wp-cli" ]; then
+    sudo ln -s "${tool_path:?}" "${tool_path_dir:?}"/wp
+  fi
+}

src/scripts/tools/grpc_php_plugin.sh

@@ -14,25 +14,28 @@ add_bazel() {
 
 get_grpc_tag() {
   if [ "$grpc_tag" = "latest" ]; then
-    grpc_tag=$(get -s -n "" https://grpc.io/release)
+    grpc_tag=$(get -s -n "" https://github.com/grpc/grpc/releases/latest | grep -Eo -m 1 "v[0-9]+\.[0-9]+\.[0-9]+" | head -n 1)
   else
-    status_code=$(get -v -n /tmp/grpc.tmp "https://github.com/grpc/grpc/releases/tag/v$grpc_tag")
+    if [[ ${grpc_tag:0:1} != "v" ]] ; then grpc_tag="v$grpc_tag"; fi
-    if [ "$status_code" = "200" ]; then
+    status_code=$(get -v -n /tmp/grpc.tmp "https://github.com/grpc/grpc/releases/tag/$grpc_tag")
-      grpc_tag="v$grpc_tag"
+    if [ "$status_code" != "200" ]; then
-    else
+      grpc_tag=$(get -s -n "" https://github.com/grpc/grpc/releases/latest | grep -Eo -m 1 "v[0-9]+\.[0-9]+\.[0-9]+" | head -n 1)
-      grpc_tag=$(get -s -n "" https://grpc.io/release)
     fi
   fi
 }
 
-add_grpc_php_plugin() {
+add_grpc_php_plugin_macos() {
-  grpc_tag=$1
+  brew install grpc
+  brew link --force --overwrite grpc >/dev/null 2>&1
+  grpc_tag="v$(brew info grpc | grep "grpc:" | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")"
+  license_path="$(brew --prefix grpc)/LICENSE"
+}
+
+add_grpc_php_plugin_linux() {
   get_grpc_tag
-  (
   get -s -n "" "https://github.com/grpc/grpc/archive/$grpc_tag.tar.gz" | tar -xz -C /tmp
   cd "/tmp/grpc-${grpc_tag:1}" || exit
   add_bazel
-    [ "$(uname -s)" = "Darwin" ] && sudo xcode-select -s /Applications/Xcode_11.7.app
   if [ "$DISTRIB_RELEASE" = "16.04" ]; then
     CC="$(command -v gcc)" CXX="$(command -v g++)" ./tools/bazel build src/compiler:grpc_php_plugin
   else
@@ -40,10 +43,20 @@ add_grpc_php_plugin() {
   fi
   sudo mv ./bazel-bin/src/compiler/grpc_php_plugin /usr/local/bin/grpc_php_plugin
   sudo chmod a+x /usr/local/bin/grpc_php_plugin
-  ) >/dev/null 2>&1
+  license_path="/tmp/grpc-${grpc_tag:1}/LICENSE"
-  echo "::set-output name=grpc_php_plugin_path::/usr/local/bin/grpc_php_plugin"
+}
+
+add_grpc_php_plugin() {
+  grpc_tag=$1
+  license_path=""
+  if [ "$(uname -s)" = "Darwin" ]; then
+    add_grpc_php_plugin_macos >/dev/null 2>&1
+  else
+    add_grpc_php_plugin_linux >/dev/null 2>&1
+  fi
+  echo "::set-output name=grpc_php_plugin_path::$(command -v grpc_php_plugin)"
   add_log "${tick:?}" "grpc_php_plugin" "Added grpc_php_plugin ${grpc_tag:1}"
   printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "grpc_php_plugin" "Click to read the grpc_php_plugin related license information"
-  cat "/tmp/grpc-${grpc_tag:1}/LICENSE"
+  cat "$license_path"
   echo "::endgroup::"
 }

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 777 /usr/local/bin/protoc -R /usr/local/include/google
+    sudo chmod -R 777 /usr/local/bin/protoc /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"

src/scripts/win32.ps1

@@ -8,10 +8,7 @@ param (
   [ValidateNotNull()]
   [ValidateLength(1, [int]::MaxValue)]
   [string]
-  $dist,
+  $dist
-  [Parameter(Position = 2, Mandatory = $false)]
-  [string]
-  $fail_fast = 'false'
 )
 
 # Function to log start of a operation.
@@ -25,7 +22,7 @@ Function Add-Log($mark, $subject, $message) {
     printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $mark $subject $message
   } else {
     printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $mark $subject $message
-    if($fail_fast -eq 'true') {
+    if($env:fail_fast -eq 'true') {
       exit 1;
     }
   }
@@ -104,7 +101,9 @@ Function Install-PSPackage() {
     [Parameter(Position = 1, Mandatory = $true)]
     $psm1_path,
     [Parameter(Position = 2, Mandatory = $true)]
-    $url
+    $url,
+    [Parameter(Position = 3, Mandatory = $true)]
+    $cmdlet
   )
   $module_path = "$bin_dir\$psm1_path.psm1"
   if(-not (Test-Path $module_path -PathType Leaf)) {
@@ -114,6 +113,31 @@ 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.
@@ -146,16 +170,18 @@ 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
+        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $stability -MaximumStability $stability -Path $php_dir -NoDependencies
       } else {
-        Install-PhpExtension -Extension $extension -MinimumStability $stability -MaximumStability $stability -Path $php_dir
+        Install-PhpExtension -Extension $extension -MinimumStability $stability -MaximumStability $stability -Path $php_dir -NoDependencies
       }
 
       Add-Log $tick $extension "Installed and enabled"
@@ -204,10 +230,13 @@ Function Edit-ComposerConfig() {
     Add-Log "$cross" "composer" "Could not download composer"
     exit 1;
   }
-  composer -q global config process-timeout 0
+  if (-not(Test-Path $composer_json)) {
+    Set-Content -Path $composer_json -Value "{}"
+  }
+  composer -q config -g process-timeout 0
   Write-Output $composer_bin | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
   if (Test-Path env:COMPOSER_TOKEN) {
-    composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
+    composer -q config -g github-oauth.github.com $env:COMPOSER_TOKEN
   }
 }
 
@@ -219,15 +248,16 @@ Function Get-ToolVersion() {
       [Parameter(Position = 1, Mandatory = $true)]
       $param
   )
-  $version_regex = "[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-z0-9]+){0,1}"
+  $alp = "[a-zA-Z0-9]"
+  $version_regex = "[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
   if($tool -eq 'composer') {
     if ($param -eq 'snapshot') {
-      $trunk = Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }
+      $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 })
-      $commit = Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern "[a-zA-Z0-9]+" -AllMatches | ForEach-Object { $_.matches[2].Value }
-      return "$trunk+$commit"
     } else {
-      return Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }
+      $composer_version = Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }
     }
+    Set-Variable -Name 'composer_version' -Value $composer_version -Scope Global
+    return "$composer_version"
   }
   return . $tool $param 2> $null | ForEach-Object { $_ -replace "composer $version_regex", '' } | Select-String -Pattern $version_regex | Select-Object -First 1 | ForEach-Object { $_.matches.Value }
 }
@@ -248,22 +278,23 @@ Function Add-Tool() {
   if (Test-Path $bin_dir\$tool) {
     Remove-Item $bin_dir\$tool
   }
-  if($url.Count -gt 1) { $url = $url[0] }
+  if($url.Count -gt 1) {
-  if ($tool -eq "symfony") {
+    $url = $url[0]
-    Invoke-WebRequest -Uri $url -OutFile $bin_dir\$tool.exe
+  }
-    Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.exe" >$null 2>&1
+  $tool_path = "$bin_dir\$tool"
-  } else {
+  if (($url | Split-Path -Extension) -eq ".exe") {
+    $tool_path = "$tool_path.exe"
+  }
   try {
-      Invoke-WebRequest -Uri $url -OutFile $bin_dir\$tool
+    Invoke-WebRequest -Uri $url -OutFile $tool_path
   } catch {
     if($url -match '.*github.com.*releases.*latest.*') {
       try {
         $url = $url.replace("releases/latest/download", "releases/download/" + ([regex]::match((Invoke-WebRequest -Uri ($url.split('/release')[0] + "/releases")).Content, "([0-9]+\.[0-9]+\.[0-9]+)/" + ($url.Substring($url.LastIndexOf("/") + 1))).Groups[0].Value).split('/')[0])
-          Invoke-WebRequest -Uri $url -OutFile $bin_dir\$tool
+        Invoke-WebRequest -Uri $url -OutFile $tool_path
       } catch { }
     }
   }
-  }
   if (((Get-ChildItem -Path $bin_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
     $bat_content = @()
     $bat_content += "@ECHO off"
@@ -272,18 +303,7 @@ Function Add-Tool() {
     $bat_content += "php %BIN_TARGET% %*"
     Set-Content -Path $bin_dir\$tool.bat -Value $bat_content
     Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.bat" >$null 2>&1
-    if($tool -eq "phan") {
+    Add-ToolsHelper $tool
-      Add-Extension fileinfo >$null 2>&1
-      Add-Extension ast >$null 2>&1
-    } elseif($tool -eq "phive") {
-      Add-Extension xml >$null 2>&1
-    } elseif($tool -eq "cs2pr") {
-      (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
-    } elseif($tool -eq "composer") {
-      Edit-ComposerConfig $bin_dir\$tool
-    } elseif($tool -eq "wp-cli") {
-      Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
-    }
     $tool_version = Get-ToolVersion $tool $ver_param
     Add-Log $tick $tool "Added $tool $tool_version"
   } else {
@@ -310,13 +330,23 @@ Function Add-Composertool() {
     [string]
     $prefix
   )
-  composer global require $prefix$release 2>&1 | out-null
+  if($tool -match "prestissimo|composer-prefetcher" -and $composer_version.split('.')[0] -ne "1") {
+    Write-Output "::warning:: Skipping $tool, as it does not support Composer $composer_version. Specify composer:v1 in tools to use $tool"
+    Add-Log $cross $tool "Skipped"
+    Return
+  }
+  if(Test-Path $composer_lock) {
+    Remove-Item -Path $composer_lock -Force
+  }
+  (composer global require $prefix$release 2>&1 | Tee-Object -FilePath $env:APPDATA\Composer\composer.log) >$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" "$json"
+    $tool_version = Get-ToolVersion "Write-Output" "$log"
     Add-Log $tick $tool "Added $tool $tool_version"
   } else {
     Add-Log $cross $tool "Could not setup $tool"
@@ -334,12 +364,15 @@ $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"
 $current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
-$nightly_version = '8.[0-9]'
+$jit_versions = '8.[0-9]'
+$nightly_versions = '8.[1-9]'
 $cert_source='CurrentUser'
 $enable_extensions = ('openssl', 'curl', 'mbstring')
 
@@ -378,9 +411,11 @@ if($env:RUNNER -eq 'self-hosted') {
   }
 }
 
+. $dist\..\src\scripts\tools\add_tools.ps1
+
 Add-Printf >$null 2>&1
 Step-Log "Setup PhpManager"
-Install-PSPackage PhpManager PhpManager\PhpManager "$github/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip" >$null 2>&1
+Install-PSPackage PhpManager PhpManager\PhpManager "$github/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip" Get-Php >$null 2>&1
 Add-Log $tick "PhpManager" "Installed"
 
 Step-Log "Setup PHP"
@@ -393,15 +428,20 @@ 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" >$null 2>&1
+    Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" Get-VcList >$null 2>&1
   }
-  if ($version -match $nightly_version) {
+  try {
-    Invoke-WebRequest -Uri $bintray/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1
+    if ($version -match $nightly_versions) {
-    & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir -Version $version > $null 2>&1
+      Invoke-WebRequest -UseBasicParsing -Uri $php_builder/releases/latest/download/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1
+      & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir > $null 2>&1
     } else {
       Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
     }
+  } catch { }
 } else {
+  if($version -match $jit_versions) {
+    ('opcache.enable=1', 'opcache.jit_buffer_size=256M', 'opcache.jit=1235') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
+  }
   if($env:update -eq 'true') {
     Update-Php $php_dir >$null 2>&1
     $status = "Updated to"
@@ -411,9 +451,13 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
 }
 
 $installed = Get-Php -Path $php_dir
-('date.timezone=UTC', 'memory_limit=-1') | foreach { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
+if($installed.MajorMinorVersion -ne $version) {
+  Add-Log $cross "PHP" "Could not setup PHP $version"
+  exit 1
+}
+('date.timezone=UTC', 'memory_limit=-1', 'xdebug.mode=coverage') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
 if($version -lt "5.5") {
-  ('libeay32.dll', 'ssleay32.dll') | ForEach { Invoke-WebRequest -Uri $bintray/$_ -OutFile $php_dir\$_ >$null 2>&1 }
+  ('libeay32.dll', 'ssleay32.dll') | ForEach-Object { Invoke-WebRequest -Uri "$php_builder/releases/download/openssl-1.0.2u/$_" -OutFile $php_dir\$_ >$null 2>&1 }
 } else {
   $enable_extensions += ('opcache')
 }

src/tools.ts

@@ -7,7 +7,8 @@ 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) {
@@ -32,12 +33,17 @@ export async function parseTool(
   const parts: string[] = release.split(':');
   const tool: string = parts[0];
   const version: string | undefined = parts[1];
-  switch (version) {
+  switch (true) {
-    case undefined:
+    case version === undefined:
       return {
         name: tool,
         version: 'latest'
       };
+    case /^[\w.-]+\/[\w.-]+$/.test(tool):
+      return {
+        name: tool,
+        version: version
+      };
     default:
       return {
         name: tool,
@@ -76,93 +82,33 @@ export async function getUri(
   }
 }
 
-/**
- * Helper function to get the codeception url
- *
- * @param version
- * @param suffix
- */
-export async function getCodeceptionUriBuilder(
-  version: string,
-  suffix: string
-): Promise<string> {
-  return ['releases', version, suffix, 'codecept.phar']
-    .filter(Boolean)
-    .join('/');
-}
-
-/**
- * Function to get the codeception url
- *
- * @param version
- * @param php_version
- */
-export async function getCodeceptionUri(
-  version: string,
-  php_version: string
-): Promise<string> {
-  const codecept: string = await getCodeceptionUriBuilder(version, '');
-  const codecept54: string = await getCodeceptionUriBuilder(version, 'php54');
-  const codecept56: string = await getCodeceptionUriBuilder(version, 'php56');
-  // Refer to https://codeception.com/builds
-  switch (true) {
-    case /latest/.test(version):
-      switch (true) {
-        case /5\.6|7\.[0|1]/.test(php_version):
-          return 'php56/codecept.phar';
-        case /7\.[2-4]/.test(php_version):
-        default:
-          return 'codecept.phar';
-      }
-    case /(^[4-9]|\d{2,})\..*/.test(version):
-      switch (true) {
-        case /5\.6|7\.[0|1]/.test(php_version):
-          return codecept56;
-        case /7\.[2-4]/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /(^2\.[4-5]\.\d+|^3\.[0-1]\.\d+).*/.test(version):
-      switch (true) {
-        case /5\.6/.test(php_version):
-          return codecept54;
-        case /7\.[0-4]/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /^2\.3\.\d+.*/.test(version):
-      switch (true) {
-        case /5\.[4-6]/.test(php_version):
-          return codecept54;
-        case /^7\.[0-4]$/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /(^2\.(1\.([6-9]|\d{2,}))|^2\.2\.\d+).*/.test(version):
-      switch (true) {
-        case /5\.[4-5]/.test(php_version):
-          return codecept54;
-        case /5.6|7\.[0-4]/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
-      return codecept;
-    default:
-      return codecept;
-  }
-}
-
 /**
  * Helper function to get script to setup phive
  *
  * @param version
+ * @param php_version
  * @param os_version
  */
 export async function addPhive(
   version: string,
+  php_version: string,
   os_version: string
 ): Promise<string> {
+  switch (true) {
+    case /5\.[3-5]/.test(php_version):
+      return await utils.addLog(
+        '$cross',
+        'phive',
+        'Phive is not supported on PHP ' + php_version,
+        os_version
+      );
+    case /5\.6|7\.0/.test(php_version):
+      version = version.replace('latest', '0.12.1');
+      break;
+    case /7\.1/.test(php_version):
+      version = version.replace('latest', '0.13.5');
+      break;
+  }
   switch (version) {
     case 'latest':
       return (
@@ -305,15 +251,12 @@ 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 =
-  const regex_composer1_tools = /hirak|prestissimo|narrowspark|composer-prefetcher/;
+    /^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));
   switch (true) {
-    case regex_composer1_tools.test(tools_list.join(' ')):
-      composer = 'composer:1';
-      break;
     case matches[0] == undefined:
       break;
     default:
@@ -347,29 +290,6 @@ 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\/|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
  *
@@ -450,8 +370,13 @@ export async function addTools(
   php_version: string,
   os_version: string
 ): Promise<string> {
-  let script = '\n' + (await utils.stepLog('Setup Tools', os_version));
+  let script = '\n';
-  const tools_list: Array<string> = await getCleanedToolsList(tools_csv);
+  if (tools_csv === 'none') {
+    return '';
+  } else {
+    script += await utils.stepLog('Setup Tools', os_version);
+  }
+  const tools_list = await addComposer(await utils.CSVArray(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;
@@ -467,133 +392,143 @@ export async function addTools(
     );
     script += '\n';
     let url = '';
-    switch (tool) {
+    switch (true) {
-      case 'blackfire':
+      case /^blackfire(-agent)?$/.test(tool):
-      case 'grpc_php_plugin':
+        script += await utils.customPackage(
-      case 'protoc':
+          'blackfire',
+          'tools',
+          version,
+          os_version
+        );
+        break;
+      case /^grpc_php_plugin$|^protoc$/.test(tool):
         script += await utils.customPackage(tool, 'tools', version, os_version);
         break;
-      case 'behat':
+      case /^behat$|^codeception$|^phpspec$/.test(tool):
-      case 'phpspec':
         script += await addPackage(tool, release, tool + '/', os_version);
         break;
-      case 'blackfire-player':
+      case /^blackfire-player$/.test(tool):
         url = await getBlackfirePlayerUrl(version, php_version);
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'codeception':
+      case /^composer$/.test(tool):
-        url =
-          'https://codeception.com/' +
-          (await getCodeceptionUri(version, php_version));
-        script += await addArchive(tool, url, os_version, '"-V"');
-        break;
-      case 'composer':
         url = await getComposerUrl(version);
         script += await addArchive('composer', url, os_version, version);
         break;
-      case 'composer-normalize':
+      case /^composer-normalize$/.test(tool):
         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':
+      case /^composer-prefetcher$/.test(tool):
         script += await addPackage(
-          tool,
+          'automatic-' + tool,
           release,
-          'narrowspark/automatic-',
+          'narrowspark/',
           os_version
         );
         break;
-      case 'composer-require-checker':
+      case /^composer-require-checker$/.test(tool):
         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':
+      case /^composer-unused$/.test(tool):
         script += await addPackage(tool, release, 'icanhazstring/', os_version);
         break;
-      case 'cs2pr':
+      case /^cs2pr$/.test(tool):
         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':
+      case /^deployer$/.test(tool):
         url = await getDeployerUrl(version);
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'flex':
+      case /^flex$/.test(tool):
         script += await addPackage(tool, release, 'symfony/', os_version);
         break;
-      case 'infection':
+      case /^infection$/.test(tool):
         url = github + 'infection/infection/' + uri;
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'pecl':
+      case /^pecl/.test(tool):
         script += await utils.getCommand(os_version, 'pecl');
         break;
-      case 'phan':
+      case /^phan$/.test(tool):
         url = github + 'phan/phan/' + uri;
         script += await addArchive(tool, url, os_version, '"-v"');
         break;
-      case 'phing':
+      case /^phing$/.test(tool):
         url = 'https://www.phing.info/get/phing-' + version + '.phar';
         script += await addArchive(tool, url, os_version, '"-v"');
         break;
-      case 'phinx':
+      case /^phinx$/.test(tool):
         script += await addPackage(tool, release, 'robmorgan/', os_version);
         break;
-      case 'phive':
+      case /^phive$/.test(tool):
-        script += await addPhive(version, os_version);
+        script += await addPhive(version, php_version, os_version);
         break;
-      case 'php-config':
+      case /^php(-config|ize)$/.test(tool):
-      case 'phpize':
         script += await addDevTools(tool, os_version);
         break;
-      case 'php-cs-fixer':
+      case /^php-cs-fixer$/.test(tool):
         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 'phpcbf':
+      case /^php(cbf|cs)$/.test(tool):
-      case 'phpcs':
         url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
         script += await addArchive(tool, url, os_version, '"--version"');
         break;
-      case 'phpcpd':
+      case /^php(cpd|unit)$/.test(tool):
-      case 'phpunit':
         url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
         script += await addArchive(tool, url, os_version, '"--version"');
         break;
-      case 'phplint':
+      case /^phplint$/.test(tool):
         script += await addPackage(tool, release, 'overtrue/', os_version);
         break;
-      case 'phpmd':
+      case /^phpmd$/.test(tool):
         url = github + 'phpmd/phpmd/' + uri;
         script += await addArchive(tool, url, os_version, '"--version"');
         break;
-      case 'phpstan':
+      case /^phpstan$/.test(tool):
         url = github + 'phpstan/phpstan/' + uri;
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'prestissimo':
+      case /^prestissimo$/.test(tool):
         script += await addPackage(tool, release, 'hirak/', os_version);
         break;
-      case 'psalm':
+      case /^psalm$/.test(tool):
         url = github + 'vimeo/psalm/' + uri;
         script += await addArchive(tool, url, os_version, '"-v"');
         break;
-      case 'symfony':
+      case /^symfony(-cli)?$/.test(tool):
-      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':
+      case /^vapor(-cli)?$/.test(tool):
-        script += await addPackage(tool, release, 'laravel/', os_version);
+        script += await addPackage(
+          'vapor-cli',
+          release,
+          'laravel/',
+          os_version
+        );
         break;
-      case 'wp-cli':
+      case /^wp(-cli)?$/.test(tool):
         url = github + (await getWpCliUrl(version));
-        script += await addArchive(tool, url, os_version, '"--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(

src/utils.ts

@@ -1,4 +1,6 @@
+import {IncomingMessage} from 'http';
 import * as fs from 'fs';
+import * as https from 'https';
 import * as path from 'path';
 import * as core from '@actions/core';
 
@@ -41,15 +43,35 @@ export async function getInput(
   }
 }
 
+/**
+ * Function to fetch an URL
+ *
+ * @param url
+ */
+export async function fetch(url: string): Promise<string> {
+  const fetch_promise: Promise<string> = new Promise(resolve => {
+    const req = https.get(url, (res: IncomingMessage) => {
+      res.setEncoding('utf8');
+      let body = '';
+      res.on('data', chunk => (body += chunk));
+      res.on('end', () => resolve(body));
+    });
+    req.end();
+  });
+  return await fetch_promise;
+}
+
 /**
  * Function to parse PHP version.
  *
  * @param version
  */
 export async function parseVersion(version: string): Promise<string> {
-  switch (version) {
+  const manifest =
-    case 'latest':
+    'https://raw.githubusercontent.com/shivammathur/setup-php/develop/src/configs/php-versions.json';
-      return '7.4';
+  switch (true) {
+    case /^(latest|\d+\.x)$/.test(version):
+      return JSON.parse(await fetch(manifest))[version];
     default:
       switch (true) {
         case version.length > 1:
@@ -225,11 +247,13 @@ export async function extensionArray(
       return extension_csv
         .split(',')
         .map(function (extension: string) {
+          if (/.+-.+\/.+@.+/.test(extension)) {
+            return extension;
+          }
           return extension
             .trim()
             .toLowerCase()
-            .replace('php-', '')
+            .replace(/^php[-_]/, '');
-            .replace('php_', '');
         })
         .filter(Boolean);
   }
@@ -248,9 +272,12 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
       return [];
     default:
       return values_csv
-        .split(',')
+        .split(/,(?=(?:(?:[^"']*["']){2})*[^"']*$)/)
-        .map(function (value: string) {
+        .map(function (value) {
-          return value.trim();
+          return value
+            .trim()
+            .replace(/^["']|["']$|(?<==)["']/g, '')
+            .replace(/=(((?!E_).)*[?{}|&~![()^]+((?!E_).)+)/, "='$1'");
         })
         .filter(Boolean);
   }
@@ -262,18 +289,11 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
  * @param extension
  */
 export async function getExtensionPrefix(extension: string): Promise<string> {
-  const zend: Array<string> = [
+  switch (true) {
-    'xdebug',
-    'xdebug3',
-    'opcache',
-    'ioncube',
-    'eaccelerator'
-  ];
-  switch (zend.indexOf(extension)) {
     default:
-      return 'zend_extension';
-    case -1:
       return 'extension';
+    case /xdebug([2-3])?$|opcache|ioncube|eaccelerator/.test(extension):
+      return 'zend_extension';
   }
 }
 
@@ -412,7 +432,7 @@ export async function customPackage(
   version: string,
   os_version: string
 ): Promise<string> {
-  const pkg_name: string = pkg.replace(/\d+|pdo[_-]/, '');
+  const pkg_name: string = pkg.replace(/\d+|(pdo|pecl)[_-]/, '');
   const script_extension: string = await scriptExtension(os_version);
   const script: string = path.join(
     __dirname,
@@ -421,3 +441,24 @@ 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
+  );
+}

tsconfig.json

@@ -1,63 +1,18 @@
 {
   "compilerOptions": {
-    /* Basic Options */
+    "esModuleInterop": true,
-    // "incremental": true,                   /* Enable incremental compilation */
+    "lib": [
-    "target": "ES2019",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+      "ESNext"
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    ],
-    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    "module": "commonjs",
-    // "checkJs": true,                       /* Report errors in .js files. */
+    "moduleResolution": "node",
-    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    "noImplicitAny": true,
-    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    "outDir": "./lib",
-    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    "removeComments": true,
-    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    "rootDir": "./src",
-    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    "sourceMap": true,
-    "outDir": "./lib",                        /* Redirect output structure to the directory. */
+    "strict": true,
-    "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    "target": "ESNext"
-    // "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": ["node_modules", "**/*.test.ts"]
+  "exclude": ["__tests__", "lib", "node_modules"]
 }